New module strstack

[cc65] / src / ld65 / scanner.h

diff --git a/src/ld65/scanner.h b/src/ld65/scanner.h
index 65258d04c304d8e45960d03b560a7327085585b9..2af9fa1619f506c36937bf41d72b21a5a0b8e6fd 100644 (file)
--- a/src/ld65/scanner.h
+++ b/src/ld65/scanner.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2000 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       */
@@ -33,7 +33,7 @@
 
 
 
-#ifndef SCANNER_H      
+#ifndef SCANNER_H
 #define SCANNER_H
 
 
@@ -77,18 +77,20 @@ typedef enum {
     CFGTOK_EXPORT,
     CFGTOK_IMPORT,
     CFGTOK_OS,
+    CFGTOK_ID,
+    CFGTOK_VERSION,
     CFGTOK_FORMAT,
 
     CFGTOK_LOAD,
     CFGTOK_RUN,
     CFGTOK_ALIGN,
     CFGTOK_OFFSET,
+    CFGTOK_OPTIONAL,
 
     CFGTOK_RO,
     CFGTOK_RW,
     CFGTOK_BSS,
     CFGTOK_ZP,
-    CFGTOK_WPROT,
 
     CFGTOK_O65,
     CFGTOK_BIN,
@@ -101,8 +103,11 @@ typedef enum {
 
     CFGTOK_LUNIX,
     CFGTOK_OSA65,
+    CFGTOK_CC65,
 
     CFGTOK_CONDES,
+    CFGTOK_STARTADDRESS,
+
     CFGTOK_SEGMENT,
     CFGTOK_LABEL,
     CFGTOK_COUNT,
@@ -112,7 +117,9 @@ typedef enum {
     CFGTOK_DESTRUCTOR,
 
     CFGTOK_DECREASING,
-    CFGTOK_INCREASING
+    CFGTOK_INCREASING,
+
+    CFGTOK_DEFAULT
 
 } cfgtok_t;
 
@@ -120,7 +127,7 @@ typedef enum {
 
 /* Mapping table entry, special identifier --> token */
 typedef struct IdentTok IdentTok;
-struct IdentTok_ {
+struct IdentTok {
     const char*        Ident;          /* Identifier */
     cfgtok_t   Tok;            /* Token for identifier */
 };