More lineinfo usage.

[cc65] / src / ca65 / scanner.h

diff --git a/src/ca65/scanner.h b/src/ca65/scanner.h
index 04ba9a4bc5f3ae1c4c0d04ce0a1e360b3ed65149..0fad248d13fc31116f89684a6b04af1498b109c9 100644 (file)
--- a/src/ca65/scanner.h
+++ b/src/ca65/scanner.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2007 Ullrich von Bassewitz                                       */
-/*               Roemerstrasse 52                                            */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 1998-2011, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -38,9 +38,6 @@
 
 
 
-/* common */
-#include "filepos.h"
-
 /* ca65 */
 #include "token.h"
 
@@ -53,15 +50,8 @@
 
 
 /* Scanner variables */
-#define MAX_INPUT_FILES        254             /* No more than this files total */
-#define MAX_STR_LEN            255             /* Maximum length of any string */
-extern Token Tok;                       /* Current token */
-extern int WS;                                 /* Flag: Whitespace before token */
-extern long IVal;                              /* Integer token attribute */
-extern char SVal[MAX_STR_LEN+1];        /* String token attribute */
-
-extern FilePos         CurPos;                 /* Name and position in file */
-extern int             ForcedEnd;              /* Force end of assembly */
+extern Token CurTok;            /* Current input token incl. attributes */
+extern int   ForcedEnd;                /* Force end of assembly */
 
 
 
@@ -77,8 +67,10 @@ int IsIdChar (int C);
 int IsIdStart (int C);
 /* Return true if the character may start an identifier */
 
-void NewInputFile (const char* Name);
-/* Open a new input file */
+int NewInputFile (const char* Name);
+/* Open a new input file. Returns true if the file could be successfully opened
+ * and false otherwise.
+ */
 
 void NewInputData (char* Text, int Malloced);
 /* Add a chunk of input data to the input stream */
@@ -119,4 +111,4 @@ void DoneScanner (void);
 
 
 
-                                        
+