In case of parse errors for structs, don't just set the type of the result to

[cc65] / src / cc65 / scanner.h

diff --git a/src/cc65/scanner.h b/src/cc65/scanner.h
index db297ff0148cb0b481a5aff0ff2726228f36a8f5..6c3db2ed21423da04df1e849fe55e59e960f9c5b 100644 (file)
--- a/src/cc65/scanner.h
+++ b/src/cc65/scanner.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2004 Ullrich von Bassewitz                                       */
-/*               Römerstrasse 52                                             */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 1998-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -38,6 +38,9 @@
 
 
 
+/* common */
+#include "fp.h"
+
 /* cc65 */
 #include "datatype.h"
 #include "ident.h"
@@ -55,18 +58,25 @@ typedef enum token_t {
     TOK_INVALID,
     TOK_CEOF,
 
-    TOK_AUTO,
+    /* Storage specifiers */
+    TOK_FIRST_STORAGE_CLASS,
+    TOK_AUTO            = TOK_FIRST_STORAGE_CLASS,
     TOK_EXTERN,
     TOK_REGISTER,
-    TOK_RESTRICT,
     TOK_STATIC,
     TOK_TYPEDEF,
+    TOK_LAST_STORAGE_CLASS = TOK_TYPEDEF,
 
     /* Tokens denoting type qualifiers */
     TOK_FIRST_TYPEQUAL,
     TOK_CONST           = TOK_FIRST_TYPEQUAL,
     TOK_VOLATILE,
-    TOK_LAST_TYPEQUAL   = TOK_VOLATILE,
+    TOK_RESTRICT,
+    TOK_LAST_TYPEQUAL   = TOK_RESTRICT,
+
+    /* Function specifiers */
+    TOK_INLINE,
+    TOK_FASTCALL,
 
     /* Tokens denoting types */
     TOK_FIRST_TYPE,
@@ -159,11 +169,11 @@ typedef enum token_t {
     TOK_ICONST,
     TOK_CCONST,
     TOK_FCONST,
+    TOK_WCSCONST,
 
     TOK_ATTRIBUTE,
     TOK_FAR,
     TOK_NEAR,
-    TOK_FASTCALL,
     TOK_A,
     TOK_X,
     TOK_Y,
@@ -186,10 +196,10 @@ typedef struct Token Token;
 struct Token {
     token_t    Tok;            /* The token itself */
     long       IVal;           /* The integer attribute */
-    double     FVal;           /* The float attribute */
+    Double      FVal;          /* The float attribute */
     ident      Ident;          /* Identifier if IDENT */
     LineInfo*   LI;            /* Source line where the token comes from */
-    type*      Type;           /* Type if integer or float constant */
+    Type*      Type;           /* Type if integer or float constant */
 };
 
 extern Token CurTok;           /* The current token */
@@ -203,6 +213,17 @@ extern Token NextTok;              /* The next token */
 
 
 
+#if defined(HAVE_INLINE)
+INLINE int TokIsStorageClass (const Token* T)
+/* Return true if the token is a storage class specifier */
+{
+    return (T->Tok >= TOK_FIRST_STORAGE_CLASS && T->Tok <= TOK_LAST_STORAGE_CLASS);
+}
+#else
+#  define TokIsStorageClass(T)  \
+        ((T)->Tok >= TOK_FIRST_STORAGE_CLASS && (T)->Tok <= TOK_LAST_STORAGE_CLASS)
+#endif
+
 #if defined(HAVE_INLINE)
 INLINE int TokIsType (const Token* T)
 /* Return true if the token is a type */
@@ -223,6 +244,9 @@ INLINE int TokIsTypeQual (const Token* T)
 #  define TokIsTypeQual(T)  ((T)->Tok >= TOK_FIRST_TYPEQUAL && (T)->Tok <= TOK_LAST_TYPEQUAL)
 #endif
 
+int TokIsFuncSpec (const Token* T);
+/* Return true if the token is a function specifier */
+
 void SymName (char* S);
 /* Read a symbol from the input stream. The first character must have been
  * checked before calling this function. The buffer is expected to be at