More lineinfo usage.

[cc65] / src / ca65 / nexttok.h

diff --git a/src/ca65/nexttok.h b/src/ca65/nexttok.h
index bc63b699e7a6413f01b0240176e063d4d4240656..28806f94ed0c0644945b34fed2cd9586f6f7b442 100644 (file)
--- a/src/ca65/nexttok.h
+++ b/src/ca65/nexttok.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000     Ullrich von Bassewitz                                        */
-/*              Wacholderweg 14                                              */
-/*              D-70597 Stuttgart                                            */
-/* EMail:       uz@musoftware.de                                             */
+/* (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       */
@@ -51,7 +51,7 @@
 void NextTok (void);
 /* Get next token and handle token level functions */
 
-void Consume (enum Token Expected, unsigned ErrMsg);
+void Consume (token_t Expected, const char* ErrMsg);
 /* Consume Token, print an error if we don't find it */
 
 void ConsumeSep (void);
@@ -67,7 +67,23 @@ void ConsumeComma (void);
 /* Consume a comma */
 
 void SkipUntilSep (void);
-/* Skip tokens until we reach a line separator */
+/* Skip tokens until we reach a line separator or end of file */
+
+void ExpectSep (void);
+/* Check if we've reached a line separator, and output an error if not. Do
+ * not skip the line separator.
+ */
+
+void EnterRawTokenMode (void);
+/* Enter raw token mode. In raw mode, token handling functions are not
+ * executed, but the function tokens are passed untouched to the upper
+ * layer. Raw token mode is used when storing macro tokens for later
+ * use.
+ * Calls to EnterRawTokenMode and LeaveRawTokenMode may be nested.
+ */
+
+void LeaveRawTokenMode (void);
+/* Leave raw token mode. */