X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fcc65%2Fscanner.h;h=dabc17a373e6cc7b4beaf741e58c1bbad8b62230;hb=1b81dcc64fbb66da569ea5f827a6622cdfdbc743;hp=e78446efbe2efa370e875c237f2730fe6e46aee6;hpb=23fbf3ff2a8956483bffaf1943967e04074cf443;p=cc65

diff --git a/src/cc65/scanner.h b/src/cc65/scanner.h
index e78446efb..dabc17a37 100644
--- a/src/cc65/scanner.h
+++ b/src/cc65/scanner.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2001 Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
+/* (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       */
@@ -57,15 +57,16 @@ typedef enum token_t {
     TOK_AUTO,
     TOK_EXTERN,
     TOK_REGISTER,
+    TOK_RESTRICT,
     TOK_STATIC,
     TOK_TYPEDEF,
-    TOK_ENUM,
     TOK_CONST,
     TOK_VOLATILE,
 
     /* Tokens denoting types */
     TOK_FIRSTTYPE,
-    TOK_CHAR		= TOK_FIRSTTYPE,
+    TOK_ENUM		= TOK_FIRSTTYPE,
+    TOK_CHAR,
     TOK_INT,
     TOK_DOUBLE,
     TOK_FLOAT,
@@ -156,6 +157,7 @@ typedef enum token_t {
 
     TOK_ATTRIBUTE,
     TOK_FAR,
+    TOK_NEAR,
     TOK_FASTCALL,
     TOK_A,
     TOK_X,
@@ -210,36 +212,36 @@ void SkipTokens (const token_t* TokenList, unsigned TokenCount);
  * This routine is used for error recovery.
  */
 
-void Consume (token_t Token, const char* ErrorMsg);
+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.
  */
 
-void ConsumeColon (void);
+int ConsumeColon (void);
 /* Check for a colon and skip it. */
 
-void ConsumeSemi (void);
+int ConsumeSemi (void);
 /* Check for a semicolon and skip it. */
 
-void ConsumeComma (void);
+int ConsumeComma (void);
 /* Check for a comma and skip it. */
 
-void ConsumeLParen (void);
+int ConsumeLParen (void);
 /* Check for a left parenthesis and skip it */
 
-void ConsumeRParen (void);
+int ConsumeRParen (void);
 /* Check for a right parenthesis and skip it */
 
-void ConsumeLBrack (void);
+int ConsumeLBrack (void);
 /* Check for a left bracket and skip it */
 
-void ConsumeRBrack (void);
+int ConsumeRBrack (void);
 /* Check for a right bracket and skip it */
 
-void ConsumeLCurly (void);
+int ConsumeLCurly (void);
 /* Check for a left curly brace and skip it */
 
-void ConsumeRCurly (void);
+int ConsumeRCurly (void);
 /* Check for a right curly brace and skip it */