Completed the coding of da65's SEGMENT feature.

[cc65] / src / da65 / scanner.h

diff --git a/src/da65/scanner.h b/src/da65/scanner.h
index 5e3f6efabe928f7a501004375c21c63d852f2d63..f7f090fad4ab56426c6307a096f4f39bcaa5b860 100644 (file)
--- a/src/da65/scanner.h
+++ b/src/da65/scanner.h
@@ -1,15 +1,15 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                                scanner.h                                 */
+/*                                 scanner.h                                 */
 /*                                                                           */
-/*          Configuration file scanner for the da65 disassembler            */
+/*           Configuration file scanner for the da65 disassembler            */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000-2005 Ullrich von Bassewitz                                       */
-/*               Römerstrasse 52                                             */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 2000-2011, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -39,7 +39,7 @@
 
 
 /*****************************************************************************/
-/*                                          Data                                    */
+/*                                   Data                                    */
 /*****************************************************************************/
 
 
@@ -65,17 +65,25 @@ typedef enum token_t {
     INFOTOK_RANGE,
     INFOTOK_LABEL,
     INFOTOK_ASMINC,
+    INFOTOK_SEGMENT,
 
     /* Global section */
+    INFOTOK_ARGUMENT_COLUMN,
+    INFOTOK_COMMENT_COLUMN,
     INFOTOK_COMMENTS,
     INFOTOK_CPU,
     INFOTOK_HEXOFFS,
     INFOTOK_INPUTNAME,
     INFOTOK_INPUTOFFS,
     INFOTOK_INPUTSIZE,
+    INFOTOK_LABELBREAK,
+    INFOTOK_MNEMONIC_COLUMN,
+    INFOTOK_NL_AFTER_JMP,
+    INFOTOK_NL_AFTER_RTS,
     INFOTOK_OUTPUTNAME,
     INFOTOK_PAGELENGTH,
     INFOTOK_STARTADDR,
+    INFOTOK_TEXT_COLUMN,
 
     /* Range section */
     INFOTOK_START,
@@ -94,6 +102,7 @@ typedef enum token_t {
 
     /* Label section */
     INFOTOK_NAME,
+    INFOTOK_COMMENT,
     INFOTOK_ADDR,
     INFOTOK_SIZE,
 
@@ -111,27 +120,27 @@ typedef enum token_t {
 /* Mapping table entry, special identifier --> token */
 typedef struct IdentTok IdentTok;
 struct IdentTok {
-    const char*                Ident;          /* Identifier */
-    token_t            Tok;            /* Token for identifier */
+    const char*         Ident;          /* Identifier */
+    token_t             Tok;            /* Token for identifier */
 };
-#define ENTRY_COUNT(s)         (sizeof (s) / sizeof (s [0]))
+#define ENTRY_COUNT(s)  (sizeof (s) / sizeof (s [0]))
 
 
 
 /* Current token and attributes */
 #define CFG_MAX_IDENT_LEN  255
-extern unsigned                InfoTok;
-extern char                    InfoSVal[CFG_MAX_IDENT_LEN+1];
-extern long            InfoIVal;
+extern unsigned         InfoTok;
+extern char             InfoSVal[CFG_MAX_IDENT_LEN+1];
+extern long             InfoIVal;
 
 /* Error location */
-extern unsigned                InfoErrorLine;
-extern unsigned                InfoErrorCol;
+extern unsigned         InfoErrorLine;
+extern unsigned         InfoErrorCol;
 
 
 
 /*****************************************************************************/
-/*                                          Code                                    */
+/*                                   Code                                    */
 /*****************************************************************************/
 
 
@@ -205,7 +214,5 @@ void InfoCloseInput (void);
 
 
 /* End of scanner.h */
-#endif
-
-
 
+#endif