Merge pull request #781 from braddr/fix

fix latent bug with Lexer::peek and recently introduced bug in Lexer::scan
dlang · Mar 4, 2012 · bb06024 · bb06024
2 parents dcb113c + 06bf3d3
commit bb06024
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/lexer.c b/src/lexer.c
@@ -370,7 +370,6 @@ Token *Lexer::peek(Token *ct)
     {
         t = new Token();
         scan(t);
-        t->next = NULL;
         ct->next = t;
     }
     return t;
@@ -1231,7 +1230,7 @@ void Lexer::scan(Token *t)
             case '#':
             {
                 p++;
-                Token *n = peek(&token);
+                Token *n = peek(t);
                 if (n->value == TOKidentifier && n->ident == Id::line)
                 {
                     nextToken();

diff --git a/src/lexer.h b/src/lexer.h
@@ -252,6 +252,7 @@ struct Token
     static const char *tochars[TOKMAX];
     static void *operator new(size_t sz);
 
+    Token() : next(NULL) {}
     int isKeyword();
     void print();
     const char *toChars();