X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fca65%2Fscanner.h;h=f6fddc58810a36454fbd97592e8914ca7c9af63a;hb=834a3eac52617190c9ff3b264a3c4e21218b8c62;hp=f28e30d47d99b7c988f08c0c0771a97f669673b4;hpb=6b002da6039523520f6370e464c51b8278ae1629;p=cc65

diff --git a/src/ca65/scanner.h b/src/ca65/scanner.h
index f28e30d47..f6fddc588 100644
--- a/src/ca65/scanner.h
+++ b/src/ca65/scanner.h
@@ -38,7 +38,8 @@
 
 
 
-#include "../common/filepos.h"
+/* common */
+#include "filepos.h"
 
 
 
@@ -104,6 +105,7 @@ enum Token {
     TOK_RBRACK,	 	/* ] */
 
     TOK_MACPARAM,	/* Macro parameter, not generated by scanner */
+    TOK_REPCOUNTER,	/* Repeat counter, not generated by scanner */
 
     /* The next ones are tokens for the pseudo instructions. Keep together! */
     TOK_FIRSTPSEUDO,
@@ -118,14 +120,18 @@ enum Token {
     TOK_BYTE,
     TOK_CASE,
     TOK_CODE,
-    TOK_CONCAT,
+    TOK_CONCAT,	    
+    TOK_CONDES,
     TOK_CONST,
+    TOK_CONSTRUCTOR,
     TOK_CPU,
     TOK_DATA,
+    TOK_DBG,
     TOK_DBYT,
     TOK_DEBUGINFO,
     TOK_DEFINE,
     TOK_DEFINED,
+    TOK_DESTRUCTOR,
     TOK_DWORD,
     TOK_ELSE,
     TOK_ELSEIF,
@@ -141,6 +147,7 @@ enum Token {
     TOK_FARADDR,
     TOK_FEATURE,
     TOK_FILEOPT,
+    TOK_FORCEWORD,
     TOK_GLOBAL,
     TOK_GLOBALZP,
     TOK_I16,
@@ -161,6 +168,7 @@ enum Token {
     TOK_IMPORTZP,
     TOK_INCBIN,
     TOK_INCLUDE,
+    TOK_LEFT,
     TOK_LINECONT,
     TOK_LIST,
     TOK_LISTBYTES,
@@ -183,11 +191,16 @@ enum Token {
     TOK_RELOC,
     TOK_REPEAT,
     TOK_RES,
+    TOK_RIGHT,
     TOK_RODATA,
     TOK_SEGMENT,
     TOK_SMART,
+    TOK_STRAT,
     TOK_STRING,
+    TOK_STRLEN,
     TOK_SUNPLUS,
+    TOK_TCOUNT,
+    TOK_WARNING,
     TOK_WORD,
     TOK_XMATCH,
     TOK_ZEROPAGE,
@@ -217,9 +230,6 @@ extern int     	ForcedEnd;		/* Force end of assembly */
 
 
 
-const char* GetFileName (unsigned char Name);
-/* Get the name of a file where the name index is known */
-
 void NewInputFile (const char* Name);
 /* Open a new input file */
 
@@ -229,6 +239,9 @@ void DoneInputFile (void);
 void NewInputData (const char* Data, int Malloced);
 /* Add a chunk of input data to the input stream */
 
+void LocaseSVal (void);
+/* Make SVal lower case */
+
 void UpcaseSVal (void);
 /* Make SVal upper case */
 
@@ -248,9 +261,6 @@ int GetSubKey (const char** Keys, unsigned Count);
  * or -1 if the keyword was not found.
  */
 
-void WriteFiles (void);
-/* Write the list of input files to the object file */
-
 void InitScanner (const char* InFile);
 /* Initialize the scanner, open the given input file */