X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fcc65%2Fscanner.c;h=73ce35aed1db9887338b47ef4d4b3a0aacda35fe;hb=1ec972d0c4657942ca842d0457f0a1a8c1ebdd01;hp=5ca35d4c77cc9d7d9cf2c4c217c2d4d3c2c28501;hpb=53dd513176425872128ef26031d00952ef7a0628;p=cc65 diff --git a/src/cc65/scanner.c b/src/cc65/scanner.c index 5ca35d4c7..73ce35aed 100644 --- a/src/cc65/scanner.c +++ b/src/cc65/scanner.c @@ -1,8 +1,35 @@ -/* - * scanner.c - * - * Ullrich von Bassewitz, 07.06.1998 - */ +/*****************************************************************************/ +/* */ +/* scanner.c */ +/* */ +/* Source file line info structure */ +/* */ +/* */ +/* */ +/* (C) 1998-2003 Ullrich von Bassewitz */ +/* Römerstrasse 52 */ +/* D-70794 Filderstadt */ +/* EMail: uz@cc65.org */ +/* */ +/* */ +/* This software is provided 'as-is', without any expressed or implied */ +/* warranty. In no event will the authors be held liable for any damages */ +/* arising from the use of this software. */ +/* */ +/* Permission is granted to anyone to use this software for any purpose, */ +/* including commercial applications, and to alter it and redistribute it */ +/* freely, subject to the following restrictions: */ +/* */ +/* 1. The origin of this software must not be misrepresented; you must not */ +/* claim that you wrote the original software. If you use this software */ +/* in a product, an acknowledgment in the product documentation would be */ +/* appreciated but is not required. */ +/* 2. Altered source versions must be plainly marked as such, and must not */ +/* be misrepresented as being the original software. */ +/* 3. This notice may not be removed or altered from any source */ +/* distribution. */ +/* */ +/*****************************************************************************/ @@ -12,13 +39,18 @@ #include #include -#include "ctrans.h" +/* common */ +#include "chartype.h" +#include "tgttrans.h" + +/* cc65 */ #include "datatype.h" #include "error.h" #include "function.h" #include "global.h" +#include "hexval.h" #include "ident.h" -#include "io.h" +#include "input.h" #include "litpool.h" #include "preproc.h" #include "symtab.h" @@ -43,49 +75,59 @@ Token NextTok; /* The next token */ #define TT_EXT 1 /* cc65 extension */ /* Token table */ -static struct Keyword { +static const struct Keyword { char* Key; /* Keyword name */ unsigned char Tok; /* The token */ unsigned char Type; /* Token type */ } Keywords [] = { - { "__AX__", AX, TT_C }, - { "__EAX__", EAX, TT_C }, - { "__asm__", ASM, TT_C }, - { "__fastcall__", FASTCALL, TT_C }, - { "asm", ASM, TT_EXT }, - { "auto", AUTO, TT_C }, - { "break", BREAK, TT_C }, - { "case", CASE, TT_C }, - { "char", CHAR, TT_C }, - { "const", CONST, TT_C }, - { "continue", CONTINUE, TT_C }, - { "default", DEFAULT, TT_C }, - { "do", DO, TT_C }, - { "double", DOUBLE, TT_C }, - { "else", ELSE, TT_C }, - { "enum", ENUM, TT_C }, - { "extern", EXTERN, TT_C }, - { "fastcall", FASTCALL, TT_EXT }, - { "float", FLOAT, TT_C }, - { "for", FOR, TT_C }, - { "goto", GOTO, TT_C }, - { "if", IF, TT_C }, - { "int", INT, TT_C }, - { "long", LONG, TT_C }, - { "register", REGISTER, TT_C }, - { "return", RETURN, TT_C }, - { "short", SHORT, TT_C }, - { "signed", SIGNED, TT_C }, - { "sizeof", SIZEOF, TT_C }, - { "static", STATIC, TT_C }, - { "struct", STRUCT, TT_C }, - { "switch", SWITCH, TT_C }, - { "typedef", TYPEDEF, TT_C }, - { "union", UNION, TT_C }, - { "unsigned", UNSIGNED, TT_C }, - { "void", VOID, TT_C }, - { "volatile", VOLATILE, TT_C }, - { "while", WHILE, TT_C }, + { "_Pragma", TOK_PRAGMA, TT_C }, + { "__AX__", TOK_AX, TT_C }, + { "__A__", TOK_A, TT_C }, + { "__EAX__", TOK_EAX, TT_C }, + { "__X__", TOK_X, TT_C }, + { "__Y__", TOK_Y, TT_C }, + { "__asm__", TOK_ASM, TT_C }, + { "__attribute__", TOK_ATTRIBUTE, TT_C }, + { "__far__", TOK_FAR, TT_C }, + { "__fastcall__", TOK_FASTCALL, TT_C }, + { "__near__", TOK_NEAR, TT_C }, + { "asm", TOK_ASM, TT_EXT }, + { "auto", TOK_AUTO, TT_C }, + { "break", TOK_BREAK, TT_C }, + { "case", TOK_CASE, TT_C }, + { "char", TOK_CHAR, TT_C }, + { "const", TOK_CONST, TT_C }, + { "continue", TOK_CONTINUE, TT_C }, + { "default", TOK_DEFAULT, TT_C }, + { "do", TOK_DO, TT_C }, + { "double", TOK_DOUBLE, TT_C }, + { "else", TOK_ELSE, TT_C }, + { "enum", TOK_ENUM, TT_C }, + { "extern", TOK_EXTERN, TT_C }, + { "far", TOK_FAR, TT_EXT }, + { "fastcall", TOK_FASTCALL, TT_EXT }, + { "float", TOK_FLOAT, TT_C }, + { "for", TOK_FOR, TT_C }, + { "goto", TOK_GOTO, TT_C }, + { "if", TOK_IF, TT_C }, + { "int", TOK_INT, TT_C }, + { "long", TOK_LONG, TT_C }, + { "near", TOK_NEAR, TT_EXT }, + { "register", TOK_REGISTER, TT_C }, + { "restrict", TOK_RESTRICT, TT_C }, + { "return", TOK_RETURN, TT_C }, + { "short", TOK_SHORT, TT_C }, + { "signed", TOK_SIGNED, TT_C }, + { "sizeof", TOK_SIZEOF, TT_C }, + { "static", TOK_STATIC, TT_C }, + { "struct", TOK_STRUCT, TT_C }, + { "switch", TOK_SWITCH, TT_C }, + { "typedef", TOK_TYPEDEF, TT_C }, + { "union", TOK_UNION, TT_C }, + { "unsigned", TOK_UNSIGNED, TT_C }, + { "void", TOK_VOID, TT_C }, + { "volatile", TOK_VOLATILE, TT_C }, + { "while", TOK_WHILE, TT_C }, }; #define KEY_COUNT (sizeof (Keywords) / sizeof (Keywords [0])) @@ -113,7 +155,7 @@ static int CmpKey (const void* Key, const void* Elem) -static int FindKey (char* Key) +static int FindKey (const char* Key) /* Find a keyword and return the token. Return IDENT if the token is not a * keyword. */ @@ -123,26 +165,26 @@ static int FindKey (char* Key) if (K && (K->Type != TT_EXT || ANSI == 0)) { return K->Tok; } else { - return IDENT; + return TOK_IDENT; } } -static int skipwhite (void) +static int SkipWhite (void) /* Skip white space in the input stream, reading and preprocessing new lines * if necessary. Return 0 if end of file is reached, return 1 otherwise. */ { while (1) { - while (*lptr == 0) { - if (readline () == 0) { + while (CurC == 0) { + if (NextLine () == 0) { return 0; } - preprocess (); + Preprocess (); } - if (*lptr == ' ' || *lptr == '\r') { - ++lptr; + if (IsSpace (CurC)) { + NextChar (); } else { return 1; } @@ -151,27 +193,27 @@ static int skipwhite (void) -void symname (char *s) +void SymName (char* s) /* Get symbol from input stream */ { unsigned k = 0; do { - if (k != MAX_IDENTLEN) { - ++k; - *s++ = *lptr; + if (k != MAX_IDENTLEN) { + ++k; + *s++ = CurC; } - ++lptr; - } while (IsIdent (*lptr) || isdigit (*lptr)); + NextChar (); + } while (IsIdent (CurC) || IsDigit (CurC)); *s = '\0'; } -int issym (char *s) +int IsSym (char *s) /* Get symbol from input stream or return 0 if not a symbol. */ { - if (IsIdent (*lptr)) { - symname (s); + if (IsIdent (CurC)) { + SymName (s); return 1; } else { return 0; @@ -180,108 +222,119 @@ int issym (char *s) -static void unknown (unsigned char c) +static void UnknownChar (char C) /* Error message for unknown character */ { - Error (ERR_INVALID_CHAR, c); - gch (); /* Skip */ -} - - - -static unsigned hexval (int c) -/* Convert a hex digit into a value */ -{ - if (!isxdigit (c)) { - Error (ERR_ILLEGAL_HEX_DIGIT); - } - if (isdigit (c)) { - return c - '0'; - } else { - return toupper (c) - 'A' + 10; - } + Error ("Invalid input character with code %02X", C & 0xFF); + NextChar (); /* Skip */ } static void SetTok (int tok) -/* set nxttok and bump line ptr */ -{ - nxttok = tok; - ++lptr; -} - - - -static int SignExtendChar (int C) -/* Do correct sign extension of a character */ +/* Set NextTok.Tok and bump line ptr */ { - if (SignedChars && (C & 0x80) != 0) { - return C | ~0xFF; - } else { - return C & 0xFF; - } + NextTok.Tok = tok; + NextChar (); } -static int parsechar (int c) +static int ParseChar (void) /* Parse a character. Converts \n into EOL, etc. */ { - int i; - int val; + int I; + unsigned Val; + int C; /* Check for escape chars */ - if (c == '\\') { - switch (c = gch ()) { + if (CurC == '\\') { + NextChar (); + switch (CurC) { + case '?': + C = '\?'; + break; + case 'a': + C = '\a'; + break; case 'b': - c = '\b'; - break; - case 'f': - c = '\f'; - break; + C = '\b'; + break; + case 'f': + C = '\f'; + break; case 'r': - c = '\r'; - break; + C = '\r'; + break; case 'n': - c = '\n'; - break; + C = '\n'; + break; case 't': - c = '\t'; - break; + C = '\t'; + break; + case 'v': + C = '\v'; + break; case '\"': - c = '\"'; - break; + C = '\"'; + break; case '\'': - c = '\''; - break; + C = '\''; + break; case '\\': - c = '\\'; - break; + C = '\\'; + break; case 'x': case 'X': - /* Hex character constant */ - val = hexval (gch ()) << 4; - c = val | hexval (gch ()); /* Do not translate */ - break; + /* Hex character constant */ + NextChar (); + Val = HexVal (CurC) << 4; + NextChar (); + C = Val | HexVal (CurC); /* Do not translate */ + break; case '0': case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': /* Octal constant */ - i = 0; - val = c - '0'; - while ((c = *lptr) >= '0' && c <= '7' && i++ < 4) { - val = (val << 3) | (c - '0'); - gch (); - } - c = val; /* Do not translate */ + I = 0; + Val = CurC - '0'; + while (NextC >= '0' && NextC <= '7' && ++I <= 3) { + NextChar (); + Val = (Val << 3) | (CurC - '0'); + } + C = (int) Val; + if (Val >= 256) { + Error ("Character constant out of range"); + C = ' '; + } + break; + default: + Error ("Illegal character constant"); + C = ' '; + /* Try to do error recovery, otherwise the compiler will spit + * out thousands of errors in this place and abort. + */ + if (CurC != '\'' && CurC != '\0') { + while (NextC != '\'' && NextC != '\"' && NextC != '\0') { + NextChar (); + } + } break; - default: - Error (ERR_ILLEGAL_CHARCONST); - } + } + } else { + C = CurC; } + /* Skip the character read */ + NextChar (); + /* Do correct sign extension */ - return SignExtendChar (c); + return SignExtendChar (C); } @@ -289,23 +342,30 @@ static int parsechar (int c) static void CharConst (void) /* Parse a character constant. */ { - int c; + int C; /* Skip the quote */ - ++lptr; + NextChar (); /* Get character */ - c = parsechar (cgch ()); + C = ParseChar (); /* Check for closing quote */ - if (cgch () != '\'') { - Error (ERR_QUOTE_EXPECTED); + if (CurC != '\'') { + Error ("`\'' expected"); + } else { + /* Skip the quote */ + NextChar (); } /* Setup values and attributes */ - nxttok = CCONST; - nxtval = SignExtendChar (ctrans (c)); /* Translate into target charset */ - nxttype = type_int; /* Character constants have type int */ + NextTok.Tok = TOK_CCONST; + + /* Translate into target charset */ + NextTok.IVal = SignExtendChar (TgtTranslateChar (C)); + + /* Character constants have type int */ + NextTok.Type = type_int; } @@ -313,28 +373,28 @@ static void CharConst (void) static void StringConst (void) /* Parse a quoted string */ { - nxtval = GetLiteralOffs (); - nxttok = SCONST; + NextTok.IVal = GetLiteralPoolOffs (); + NextTok.Tok = TOK_SCONST; /* Be sure to concatenate strings */ - while (*lptr == '\"') { + while (CurC == '\"') { /* Skip the quote char */ - ++lptr; + NextChar (); - while (*lptr != '\"') { - if (*lptr == 0) { - Error (ERR_UNEXPECTED_NEWLINE); + while (CurC != '\"') { + if (CurC == '\0') { + Error ("Unexpected newline"); break; } - AddLiteralChar (parsechar (gch())); + AddLiteralChar (ParseChar ()); } /* Skip closing quote char if there was one */ - cgch (); + NextChar (); /* Skip white space, read new input */ - skipwhite (); + SkipWhite (); } @@ -344,82 +404,105 @@ static void StringConst (void) -void gettok (void) +void NextToken (void) /* Get next token from input stream */ { - char c; ident token; + /* We have to skip white space here before shifting tokens, since the + * tokens and the current line info is invalid at startup and will get + * initialized by reading the first time from the file. Remember if + * we were at end of input and handle that later. + */ + int GotEOF = (SkipWhite() == 0); + /* Current token is the lookahead token */ + if (CurTok.LI) { + ReleaseLineInfo (CurTok.LI); + } CurTok = NextTok; + /* When reading the first time from the file, the line info in NextTok, + * which was copied to CurTok is invalid. Since the information from + * the token is used for error messages, we must make it valid. + */ + if (CurTok.LI == 0) { + CurTok.LI = UseLineInfo (GetCurLineInfo ()); + } + /* Remember the starting position of the next token */ - NextTok.Pos = ln; + NextTok.LI = UseLineInfo (GetCurLineInfo ()); - /* Skip spaces and read the next line if needed */ - if (skipwhite () == 0) { + /* Now handle end of input. */ + if (GotEOF) { /* End of file reached */ - nxttok = CEOF; + NextTok.Tok = TOK_CEOF; return; } /* Determine the next token from the lookahead */ - c = *lptr; - if (isdigit (c)) { + if (IsDigit (CurC)) { /* A number */ int HaveSuffix; /* True if we have a type suffix */ unsigned types; /* Possible types */ - unsigned base; - unsigned long k; /* Value */ + unsigned Base; + unsigned DigitVal; + unsigned long k; /* Value */ k = 0; - base = 10; + Base = 10; types = IT_INT | IT_LONG | IT_ULONG; - if (c == '0') { + if (CurC == '0') { /* Octal or hex constants may also be of type unsigned int */ types = IT_INT | IT_UINT | IT_LONG | IT_ULONG; /* gobble 0 and examin next char */ - if (toupper (*++lptr) == 'X') { - base = 16; - nxttype = type_uint; - ++lptr; /* gobble "x" */ - } else { - base = 8; - } - } - while (1) { - c = *lptr; - if (isdigit (c)) { - k = k * base + (c - '0'); - } else if (base == 16 && isxdigit (c)) { - k = (k << 4) + hexval (c); + NextChar (); + if (toupper (CurC) == 'X') { + Base = 16; + NextTok.Type = type_uint; + NextChar (); /* gobble "x" */ } else { - break; /* not digit */ + Base = 8; } - ++lptr; /* gobble char */ } + while (IsXDigit (CurC) && (DigitVal = HexVal (CurC)) < Base) { + k = k * Base + DigitVal; + NextChar (); + } + /* Check for errorneous digits */ + if (Base == 8 && IsDigit (CurC)) { + Error ("Numeric constant contains digits beyond the radix"); + /* Do error recovery */ + do { + NextChar (); + } while (IsDigit (CurC)); + } else if (Base != 16 && IsXDigit (CurC)) { + Error ("Nondigits in number and not hexadecimal"); + do { + NextChar (); + } while (IsXDigit (CurC)); + } /* Check for a suffix */ HaveSuffix = 1; - c = toupper (*lptr); - if (c == 'U') { + if (CurC == 'u' || CurC == 'U') { /* Unsigned type */ - ++lptr; - if (toupper (*lptr) != 'L') { + NextChar (); + if (toupper (CurC) != 'L') { types = IT_UINT | IT_ULONG; } else { - ++lptr; + NextChar (); types = IT_ULONG; } - } else if (c == 'L') { + } else if (CurC == 'l' || CurC == 'L') { /* Long type */ - ++lptr; - if (toupper (*lptr) != 'U') { + NextChar (); + if (toupper (CurC) != 'U') { types = IT_LONG | IT_ULONG; } else { - ++lptr; + NextChar (); types = IT_ULONG; } } else { @@ -435,7 +518,7 @@ void gettok (void) * warning. */ if (k <= 0xFFFF && (types & IT_UINT) == 0 && !HaveSuffix) { - Warning (WARN_CONSTANT_IS_LONG); + Warning ("Constant is long"); } } if (k > 0xFFFF) { @@ -449,50 +532,45 @@ void gettok (void) /* Now set the type string to the smallest type in types */ if (types & IT_INT) { - nxttype = type_int; + NextTok.Type = type_int; } else if (types & IT_UINT) { - nxttype = type_uint; + NextTok.Type = type_uint; } else if (types & IT_LONG) { - nxttype = type_long; + NextTok.Type = type_long; } else { - nxttype = type_ulong; + NextTok.Type = type_ulong; } /* Set the value and the token */ - nxtval = k; - nxttok = ICONST; + NextTok.IVal = k; + NextTok.Tok = TOK_ICONST; return; } - if (issym (token)) { + if (IsSym (token)) { /* Check for a keyword */ - if ((nxttok = FindKey (token)) != IDENT) { + if ((NextTok.Tok = FindKey (token)) != TOK_IDENT) { /* Reserved word found */ return; } /* No reserved word, check for special symbols */ if (token [0] == '_') { /* Special symbols */ - if (strcmp (token, "__FILE__") == 0) { - nxtval = AddLiteral (fin); - nxttok = SCONST; + if (strcmp (token, "__FILE__") == 0) { + NextTok.IVal = AddLiteral (GetCurrentFile()); + NextTok.Tok = TOK_SCONST; return; } else if (strcmp (token, "__LINE__") == 0) { - nxttok = ICONST; - nxtval = ln; - nxttype = type_int; - return; - } else if (strcmp (token, "__fixargs__") == 0) { - nxttok = ICONST; - nxtval = GetParamSize (CurrentFunc); - nxttype = type_uint; + NextTok.Tok = TOK_ICONST; + NextTok.IVal = GetCurrentLine(); + NextTok.Type = type_int; return; } else if (strcmp (token, "__func__") == 0) { /* __func__ is only defined in functions */ if (CurrentFunc) { - nxtval = AddLiteral (GetFuncName (CurrentFunc)); - nxttok = SCONST; + NextTok.IVal = AddLiteral (F_GetFuncName (CurrentFunc)); + NextTok.Tok = TOK_SCONST; return; } } @@ -500,18 +578,19 @@ void gettok (void) /* No reserved word but identifier */ strcpy (NextTok.Ident, token); - NextTok.Tok = IDENT; + NextTok.Tok = TOK_IDENT; return; } /* Monstrous switch statement ahead... */ - switch (c) { + switch (CurC) { case '!': - if (*++lptr == '=') { - SetTok (NE); + NextChar (); + if (CurC == '=') { + SetTok (TOK_NE); } else { - nxttok = BANG; + NextTok.Tok = TOK_BOOL_NOT; } break; @@ -520,23 +599,25 @@ void gettok (void) break; case '%': - if (*++lptr == '=') { - SetTok (MOASGN); + NextChar (); + if (CurC == '=') { + SetTok (TOK_MOD_ASSIGN); } else { - nxttok = MOD; + NextTok.Tok = TOK_MOD; } break; case '&': - switch (*++lptr) { + NextChar (); + switch (CurC) { case '&': - SetTok (DAMP); + SetTok (TOK_BOOL_AND); break; case '=': - SetTok (AASGN); + SetTok (TOK_AND_ASSIGN); break; default: - nxttok = AMP; + NextTok.Tok = TOK_AND; } break; @@ -545,180 +626,184 @@ void gettok (void) break; case '(': - SetTok (LPAREN); + SetTok (TOK_LPAREN); break; case ')': - SetTok (RPAREN); + SetTok (TOK_RPAREN); break; case '*': - if (*++lptr == '=') { - SetTok (MASGN); + NextChar (); + if (CurC == '=') { + SetTok (TOK_MUL_ASSIGN); } else { - nxttok = STAR; + NextTok.Tok = TOK_STAR; } break; case '+': - switch (*++lptr) { + NextChar (); + switch (CurC) { case '+': - SetTok (INC); + SetTok (TOK_INC); break; case '=': - SetTok (PASGN); + SetTok (TOK_PLUS_ASSIGN); break; default: - nxttok = PLUS; + NextTok.Tok = TOK_PLUS; } break; case ',': - SetTok (COMMA); + SetTok (TOK_COMMA); break; case '-': - switch (*++lptr) { + NextChar (); + switch (CurC) { case '-': - SetTok (DEC); + SetTok (TOK_DEC); break; case '=': - SetTok (SASGN); + SetTok (TOK_MINUS_ASSIGN); break; case '>': - SetTok (PREF); + SetTok (TOK_PTR_REF); break; default: - nxttok = MINUS; + NextTok.Tok = TOK_MINUS; } break; case '.': - if (*++lptr == '.') { - if (*++lptr == '.') { - SetTok (ELLIPSIS); + NextChar (); + if (CurC == '.') { + NextChar (); + if (CurC == '.') { + SetTok (TOK_ELLIPSIS); } else { - unknown (*lptr); + UnknownChar (CurC); } } else { - nxttok = DOT; + NextTok.Tok = TOK_DOT; } break; case '/': - if (*++lptr == '=') { - SetTok (DASGN); + NextChar (); + if (CurC == '=') { + SetTok (TOK_DIV_ASSIGN); } else { - nxttok = DIV; + NextTok.Tok = TOK_DIV; } break; case ':': - SetTok (COLON); + SetTok (TOK_COLON); break; case ';': - SetTok (SEMI); + SetTok (TOK_SEMI); break; case '<': - switch (*++lptr) { + NextChar (); + switch (CurC) { case '=': - SetTok (LE); + SetTok (TOK_LE); break; case '<': - if (*++lptr == '=') { - SetTok (SLASGN); + NextChar (); + if (CurC == '=') { + SetTok (TOK_SHL_ASSIGN); } else { - nxttok = ASL; + NextTok.Tok = TOK_SHL; } break; default: - nxttok = LT; + NextTok.Tok = TOK_LT; } break; case '=': - if (*++lptr == '=') { - SetTok (EQ); + NextChar (); + if (CurC == '=') { + SetTok (TOK_EQ); } else { - nxttok = ASGN; + NextTok.Tok = TOK_ASSIGN; } break; case '>': - switch (*++lptr) { + NextChar (); + switch (CurC) { case '=': - SetTok (GE); + SetTok (TOK_GE); break; case '>': - if (*++lptr == '=') { - SetTok (SRASGN); + NextChar (); + if (CurC == '=') { + SetTok (TOK_SHR_ASSIGN); } else { - nxttok = ASR; + NextTok.Tok = TOK_SHR; } break; default: - nxttok = GT; + NextTok.Tok = TOK_GT; } break; case '?': - SetTok (QUEST); + SetTok (TOK_QUEST); break; case '[': - SetTok (LBRACK); + SetTok (TOK_LBRACK); break; case ']': - SetTok (RBRACK); + SetTok (TOK_RBRACK); break; case '^': - if (*++lptr == '=') { - SetTok (XOASGN); + NextChar (); + if (CurC == '=') { + SetTok (TOK_XOR_ASSIGN); } else { - nxttok = XOR; + NextTok.Tok = TOK_XOR; } break; case '{': - SetTok (LCURLY); + SetTok (TOK_LCURLY); break; case '|': - switch (*++lptr) { + NextChar (); + switch (CurC) { case '|': - SetTok (DBAR); + SetTok (TOK_BOOL_OR); break; case '=': - SetTok (OASGN); + SetTok (TOK_OR_ASSIGN); break; default: - nxttok = BAR; + NextTok.Tok = TOK_OR; } break; case '}': - SetTok (RCURLY); + SetTok (TOK_RCURLY); break; case '~': - SetTok (COMP); + SetTok (TOK_COMP); break; - case '#': - while (*++lptr == ' ') ; /* Skip it and following whitespace */ - if (!issym (token) || strcmp (token, "pragma") != 0) { - /* OOPS - should not happen */ - Error (ERR_CPP_DIRECTIVE_EXPECTED); - } - nxttok = PRAGMA; - break; - default: - unknown (c); + UnknownChar (CurC); } @@ -726,88 +811,134 @@ void gettok (void) -void Consume (unsigned Token, unsigned char ErrNum) +void SkipTokens (const token_t* TokenList, unsigned TokenCount) +/* Skip tokens until we reach TOK_CEOF or a token in the given token list. + * This routine is used for error recovery. + */ +{ + while (CurTok.Tok != TOK_CEOF) { + + /* Check if the current token is in the token list */ + unsigned I; + for (I = 0; I < TokenCount; ++I) { + if (CurTok.Tok == TokenList[I]) { + /* Found a token in the list */ + return; + } + } + + /* Not in the list: Skip it */ + NextToken (); + + } +} + + + +int Consume (token_t Token, const char* ErrorMsg) /* Eat token if it is the next in the input stream, otherwise print an error - * message. + * message. Returns true if the token was found and false otherwise. */ { - if (curtok == Token) { - gettok (); + if (CurTok.Tok == Token) { + NextToken (); + return 1; } else { - Error (ErrNum); + Error (ErrorMsg); + return 0; } } -void ConsumeColon (void) +int ConsumeColon (void) /* Check for a colon and skip it. */ { - Consume (COLON, ERR_COLON_EXPECTED); + return Consume (TOK_COLON, "`:' expected"); } -void ConsumeSemi (void) +int ConsumeSemi (void) /* Check for a semicolon and skip it. */ { /* Try do be smart about typos... */ - if (curtok == SEMI) { - gettok (); + if (CurTok.Tok == TOK_SEMI) { + NextToken (); + return 1; + } else { + Error ("`;' expected"); + if (CurTok.Tok == TOK_COLON || CurTok.Tok == TOK_COMMA) { + NextToken (); + } + return 0; + } +} + + + +int ConsumeComma (void) +/* Check for a comma and skip it. */ +{ + /* Try do be smart about typos... */ + if (CurTok.Tok == TOK_COMMA) { + NextToken (); + return 1; } else { - Error (ERR_SEMICOLON_EXPECTED); - if (curtok == COLON || curtok == COMMA) { - gettok (); + Error ("`,' expected"); + if (CurTok.Tok == TOK_SEMI) { + NextToken (); } + return 0; } } -void ConsumeLParen (void) +int ConsumeLParen (void) /* Check for a left parenthesis and skip it */ { - Consume (LPAREN, ERR_LPAREN_EXPECTED); + return Consume (TOK_LPAREN, "`(' expected"); } -void ConsumeRParen (void) +int ConsumeRParen (void) /* Check for a right parenthesis and skip it */ { - Consume (RPAREN, ERR_RPAREN_EXPECTED); + return Consume (TOK_RPAREN, "`)' expected"); } -void ConsumeLBrack (void) +int ConsumeLBrack (void) /* Check for a left bracket and skip it */ { - Consume (LBRACK, ERR_LBRACK_EXPECTED); + return Consume (TOK_LBRACK, "`[' expected"); } -void ConsumeRBrack (void) +int ConsumeRBrack (void) /* Check for a right bracket and skip it */ { - Consume (RBRACK, ERR_RBRACK_EXPECTED); + return Consume (TOK_RBRACK, "`]' expected"); } -void ConsumeLCurly (void) +int ConsumeLCurly (void) /* Check for a left curly brace and skip it */ { - Consume (LCURLY, ERR_LCURLY_EXPECTED); + return Consume (TOK_LCURLY, "`{' expected"); } -void ConsumeRCurly (void) +int ConsumeRCurly (void) /* Check for a right curly brace and skip it */ { - Consume (RCURLY, ERR_RCURLY_EXPECTED); + return Consume (TOK_RCURLY, "`}' expected"); }