Use first() and last() methods in primitiveEntry.

This commit is contained in:
Mark Olesen
2009-12-15 09:37:09 +01:00
parent 3f0b6ec830
commit 02ef85faef

View File

@ -60,34 +60,39 @@ Foam::primitiveEntry::primitiveEntry
Foam::label Foam::primitiveEntry::startLineNumber() const Foam::label Foam::primitiveEntry::startLineNumber() const
{ {
if (size()) const tokenList& tokens = *this;
if (tokens.empty())
{ {
return operator[](0).lineNumber(); return -1;
} }
else else
{ {
return -1; return tokens.first().lineNumber();
} }
} }
Foam::label Foam::primitiveEntry::endLineNumber() const Foam::label Foam::primitiveEntry::endLineNumber() const
{ {
if (size()) const tokenList& tokens = *this;
if (tokens.empty())
{ {
return operator[](size()-1).lineNumber(); return -1;
} }
else else
{ {
return -1; return tokens.last().lineNumber();
} }
} }
Foam::ITstream& Foam::primitiveEntry::stream() const Foam::ITstream& Foam::primitiveEntry::stream() const
{ {
ITstream& dataStream = const_cast<primitiveEntry&>(*this); ITstream& is = const_cast<primitiveEntry&>(*this);
dataStream.rewind(); is.rewind();
return dataStream; return is;
} }