X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fca65%2Ferror.h;h=54e2ae1985a1dfdde98dfea7b01bdcacdb51930f;hb=46209118b1a77d2e57f28026b1e5916c2c074778;hp=7dba969241acd8ec5dde7664f5461b62f6750e00;hpb=53dd513176425872128ef26031d00952ef7a0628;p=cc65

diff --git a/src/ca65/error.h b/src/ca65/error.h
index 7dba96924..54e2ae198 100644
--- a/src/ca65/error.h
+++ b/src/ca65/error.h
@@ -38,7 +38,8 @@
 
 
 
-#include "scanner.h"
+/* common */
+#include "filepos.h"
 
 
 
@@ -55,6 +56,7 @@ enum Warnings {
     WARN_SYM_NOT_REFERENCED,
     WARN_IMPORT_NOT_REFERENCED,
     WARN_CANNOT_TRACK_STATUS,
+    WARN_USER,
     WARN_COUNT	     	    	      	/* Warning count */
 };
 
@@ -63,6 +65,7 @@ enum Errors {
     ERR_NONE,  	       	       	      	/* No error */
     ERR_NOT_IMPLEMENTED,		/* Command/operation not implemented */
     ERR_CANNOT_OPEN_INCLUDE,
+    ERR_CANNOT_READ_INCLUDE,
     ERR_INCLUDE_NESTING,
     ERR_INVALID_CHAR,
     ERR_HEX_DIGIT_EXPECTED,
@@ -86,6 +89,7 @@ enum Errors {
     ERR_IDENT_EXPECTED,
     ERR_ENDMACRO_EXPECTED,
     ERR_OPTION_KEY_EXPECTED,
+    ERR_EQ_EXPECTED,
     ERR_816_MODE_ONLY,
     ERR_USER,
     ERR_STRING_TOO_LONG,
@@ -106,6 +110,7 @@ enum Errors {
     ERR_EXPORT_UNDEFINED,
     ERR_EXPORT_MUST_BE_CONST,
     ERR_IF_NESTING,
+    ERR_UNEXPECTED_EOF,
     ERR_UNEXPECTED_EOL,
     ERR_UNEXPECTED,
     ERR_DIV_BY_ZERO,
@@ -123,6 +128,8 @@ enum Errors {
     ERR_CPU_NOT_SUPPORTED,
     ERR_COUNTER_UNDERFLOW,
     ERR_UNDEFINED_LABEL,
+    ERR_OPEN_STMT,
+    ERR_FILENAME_NOT_FOUND,
     ERR_COUNT  	      	       	      	/* Error count */
 };
 
@@ -140,7 +147,7 @@ enum Fatals {
     FAT_CANNOT_OPEN_LISTING,
     FAT_CANNOT_WRITE_LISTING,
     FAT_CANNOT_READ_LISTING,
-    FAT_MACRO_NESTING,
+    FAT_NESTING,
     FAT_TOO_MANY_SYMBOLS,
     FAT_COUNT	    	  	      	/* Fatal error count */
 };
@@ -150,11 +157,6 @@ enum Fatals {
 /* Warning levels */
 extern unsigned        	WarnLevel;
 
-/* Messages for internal compiler errors */
-extern const char _MsgCheckFailed [];
-extern const char _MsgPrecondition [];
-extern const char _MsgFail [];
-
 /* Statistics */
 extern unsigned ErrorCount;
 extern unsigned WarningCount;
@@ -188,17 +190,6 @@ void Fatal (unsigned FatNum, ...);
 void Internal (const char* Format, ...);
 /* Print a message about an internal compiler error and die. */
 
-#define CHECK(c)       							\
-    if (!(c)) 	       	       	       	       	       	     		\
- 	Internal (_MsgCheckFailed, #c, c, __FILE__, __LINE__)
-
-#define PRECONDITION(c)							\
-    if (!(c)) 	       	       	       	       	       	     		\
-       	Internal (_MsgPrecondition, #c, c, __FILE__, __LINE__)
-
-#define FAIL(s)	       							\
-    Internal (_MsgFail, s, __FILE__, __LINE__)
-
 
 
 /* End of error.h */