diff --git a/oscar64/Scanner.cpp b/oscar64/Scanner.cpp index 0fa48a3..90cbb4c 100644 --- a/oscar64/Scanner.cpp +++ b/oscar64/Scanner.cpp @@ -145,7 +145,8 @@ const char* TokenNames[] = "'#assign'", "'#repeat'", "'#until'", - "'#embed'" + "'#embed'", + "'##'" }; @@ -806,6 +807,9 @@ void Scanner::NextToken(void) } else { + while (mTokenChar == ' ') + NextChar(); + while (mTokenChar == '#' && mLine[mOffset] == '#') { mOffset++; diff --git a/oscar64/Scanner.h b/oscar64/Scanner.h index 317485c..00a92c7 100644 --- a/oscar64/Scanner.h +++ b/oscar64/Scanner.h @@ -145,6 +145,8 @@ enum Token TK_PREP_UNTIL, TK_PREP_EMBED, + TK_PREP_CONCAT, + NUM_TOKENS };