From 7a139a800e5ee81a3c2ec3c7b0e7c2ced4be10f6 Mon Sep 17 00:00:00 2001
From: acqn <acqn163@outlook.com>
Date: Sat, 6 Aug 2022 18:45:49 +0800
Subject: [PATCH] Added # and ## as punctuators recognized by the tokenizer.
 Reorganized the token enum.

---
 src/cc65/scanner.c |   9 +++
 src/cc65/scanner.h | 143 ++++++++++++++++++++++++++-------------------
 2 files changed, 91 insertions(+), 61 deletions(-)

diff --git a/src/cc65/scanner.c b/src/cc65/scanner.c
index c7e9bb6c2..9f0498c26 100644
--- a/src/cc65/scanner.c
+++ b/src/cc65/scanner.c
@@ -1012,6 +1012,15 @@ void NextToken (void)
             SetTok (TOK_COMP);
             break;
 
+        case '#':
+            NextChar ();
+            if (CurC == '#') {
+                SetTok (TOK_DOUBLE_HASH);
+            } else {
+                NextTok.Tok = TOK_HASH;
+            }
+            break;
+
         default:
             UnknownChar (CurC);
 
diff --git a/src/cc65/scanner.h b/src/cc65/scanner.h
index cd34cbbe8..2ed59771c 100644
--- a/src/cc65/scanner.h
+++ b/src/cc65/scanner.h
@@ -79,6 +79,10 @@ typedef enum token_t {
     TOK_FASTCALL,
     TOK_CDECL,
 
+    /* Address sizes */
+    TOK_FAR,
+    TOK_NEAR,
+
     /* Tokens denoting types */
     TOK_FIRST_TYPE,
     TOK_ENUM            = TOK_FIRST_TYPE,
@@ -95,94 +99,100 @@ typedef enum token_t {
     TOK_VOID,
     TOK_LAST_TYPE       = TOK_VOID,
 
-    /* Control statements */
+    /* Selection statements */
+    TOK_IF,
+    TOK_ELSE,
+    TOK_SWITCH,
+
+    /* Iteration statements */
+    TOK_WHILE,
     TOK_DO,
     TOK_FOR,
-    TOK_GOTO,
-    TOK_IF,
-    TOK_RETURN,
-    TOK_SWITCH,
-    TOK_WHILE,
 
-    TOK_ASM,
+    /* Jump statements */
+    TOK_GOTO,
+    TOK_CONTINUE,
+    TOK_BREAK,
+    TOK_RETURN,
+
+    /* Labels */
     TOK_CASE,
     TOK_DEFAULT,
-    TOK_BREAK,
-    TOK_CONTINUE,
-    TOK_ELSE,
-    TOK_ELLIPSIS,
+
+    /* Misc. */
+    TOK_ATTRIBUTE,
+    TOK_PRAGMA,
+    TOK_STATIC_ASSERT,
+    TOK_ASM,
     TOK_SIZEOF,
 
-    TOK_IDENT,
-    TOK_SEMI,
-
-    /* Primary operators */
-    TOK_LBRACK,
+    /* Punctuators */
+    TOK_FIRST_PUNC,
+    TOK_LBRACK          = TOK_FIRST_PUNC,
+    TOK_RBRACK,
     TOK_LPAREN,
+    TOK_RPAREN,
+    TOK_LCURLY,
+    TOK_RCURLY,
     TOK_DOT,
     TOK_PTR_REF,
-
-    TOK_LCURLY,
-    TOK_RBRACK,
-    TOK_COMP,
     TOK_INC,
-    TOK_PLUS_ASSIGN,
-    TOK_PLUS,
-    TOK_COMMA,
     TOK_DEC,
-    TOK_MINUS_ASSIGN,
-    TOK_RCURLY,
-    TOK_MINUS,
-    TOK_MUL_ASSIGN,
+    TOK_ADDR,
+    TOK_AND = TOK_ADDR,         /* Alias */
     TOK_STAR,
     TOK_MUL = TOK_STAR,         /* Alias */
-    TOK_DIV_ASSIGN,
-    TOK_DIV,
-    TOK_BOOL_AND,
-    TOK_AND_ASSIGN,
-    TOK_AND,
-    TOK_NE,
+    TOK_PLUS,
+    TOK_MINUS,
+    TOK_COMP,
     TOK_BOOL_NOT,
-    TOK_BOOL_OR,
-    TOK_OR_ASSIGN,
-    TOK_OR,
-    TOK_EQ,
-    TOK_ASSIGN,
-
-    /* Inequalities */
-    TOK_LE,
-    TOK_LT,
-    TOK_GE,
-    TOK_GT,
-
-    TOK_SHL_ASSIGN,
-    TOK_SHL,
-    TOK_SHR_ASSIGN,
-    TOK_SHR,
-    TOK_XOR_ASSIGN,
-    TOK_XOR,
-    TOK_MOD_ASSIGN,
+    TOK_DIV,
     TOK_MOD,
+    TOK_SHL,
+    TOK_SHR,
+    TOK_LT,
+    TOK_GT,
+    TOK_LE,
+    TOK_GE,
+    TOK_EQ,
+    TOK_NE,
+    TOK_XOR,
+    TOK_OR,
+    TOK_BOOL_AND,
+    TOK_BOOL_OR,
     TOK_QUEST,
     TOK_COLON,
-    TOK_RPAREN,
+    TOK_SEMI,
+    TOK_ELLIPSIS,
+    TOK_ASSIGN,
+    TOK_MUL_ASSIGN,
+    TOK_DIV_ASSIGN,
+    TOK_MOD_ASSIGN,
+    TOK_PLUS_ASSIGN,
+    TOK_MINUS_ASSIGN,
+    TOK_SHL_ASSIGN,
+    TOK_SHR_ASSIGN,
+    TOK_AND_ASSIGN,
+    TOK_XOR_ASSIGN,
+    TOK_OR_ASSIGN,
+    TOK_COMMA,
+    TOK_HASH,
+    TOK_HASH_HASH,
+    TOK_DOUBLE_HASH     = TOK_HASH_HASH,    /* Alias */
+    TOK_LAST_PUNC       = TOK_DOUBLE_HASH,
+
+    /* Primary expressions */
     TOK_SCONST,
     TOK_ICONST,
     TOK_CCONST,
     TOK_FCONST,
     TOK_WCSCONST,
-
-    TOK_ATTRIBUTE,
-    TOK_STATIC_ASSERT,
-    TOK_FAR,
-    TOK_NEAR,
+    TOK_IDENT,
     TOK_A,
     TOK_X,
     TOK_Y,
     TOK_AX,
-    TOK_EAX,
-
-    TOK_PRAGMA
+    TOK_EAX
 } token_t;
 
 
@@ -220,6 +230,17 @@ extern int   NextLineDisabled;  /* Disabled to read next line */
 
 
 
+#if defined(HAVE_INLINE)
+INLINE int TokIsPunc (const Token* T)
+/* Return true if the token is a punctuator */
+{
+    return (T->Tok >= TOK_FIRST_PUNC && T->Tok <= TOK_LAST_PUNC);
+}
+#else
+#  define TokIsPunc(T)  \
+        ((T)->Tok >= TOK_FIRST_PUNC && (T)->Tok <= TOK_LAST_PUNC)
+#endif
+
 #if defined(HAVE_INLINE)
 INLINE int TokIsStorageClass (const Token* T)
 /* Return true if the token is a storage class specifier */