diff options
Diffstat (limited to 'src/parse/tokenstream.cpp')
| -rw-r--r-- | src/parse/tokenstream.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/parse/tokenstream.cpp b/src/parse/tokenstream.cpp index 5322822f..8cb9a910 100644 --- a/src/parse/tokenstream.cpp +++ b/src/parse/tokenstream.cpp @@ -24,7 +24,7 @@ TokenStream::~TokenStream() Token TokenStream::innerGetToken() { Token ret = this->realGetToken(); - if( ret.get_pos().filename == "" ) + if( ret != TOK_EOF && ret.get_pos().filename == "" ) ret.set_pos( this->getPosition() ); //DEBUG("ret.get_pos() = " << ret.get_pos()); return ret; @@ -109,9 +109,8 @@ ProtoSpan TokenStream::start_span() const { auto p = this->getPosition(); return ProtoSpan { - .filename = p.filename, - .start_line = p.line, - .start_ofs = p.ofs, + p.filename, + p.line, p.ofs }; } Span TokenStream::end_span(ProtoSpan ps) const |