New module strstack

[cc65] / src / sim65 / scanner.h

diff --git a/src/sim65/scanner.h b/src/sim65/scanner.h
index 25427e88982dcdb261dd70f5760b22607e74866d..3066e15dfd6d06548ed519f943367e9f24731622 100644 (file)
--- a/src/sim65/scanner.h
+++ b/src/sim65/scanner.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2002 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       */
@@ -38,6 +38,11 @@
 
 
 
+/* common */
+#include "attrib.h"
+
+
+
 /*****************************************************************************/
 /*                                          Data                                    */
 /*****************************************************************************/
@@ -57,15 +62,16 @@ typedef enum {
     CFGTOK_EQ,
     CFGTOK_COLON,
     CFGTOK_DOT,
+    CFGTOK_DOTDOT,
     CFGTOK_EOF,
 
     /* Primary blocks */
-    CFGTOK_CHIPS,
+    CFGTOK_CPU,
+    CFGTOK_MEMORY,
 
-    /* Chips section */
-    CFGTOK_NAME,
-    CFGTOK_ADDR,
-    CFGTOK_RANGE,
+    /* CPU block */
+    CFGTOK_TYPE,
+    CFGTOK_ADDRSPACE,
 
     /* Special identifiers */
     CFGTOK_TRUE,
@@ -121,6 +127,9 @@ void CfgConsumeSemi (void);
 void CfgConsumeColon (void);
 /* Consume a colon */
 
+void CfgConsumeRCurly (void);
+/* Consume a right curly brace */
+
 void CfgOptionalComma (void);
 /* Consume a comma if there is one */