The longbranch macros did not work with numeric addresses

[cc65] / src / ca65 / error.h

diff --git a/src/ca65/error.h b/src/ca65/error.h
index d45b2ddafb7813e4e89d27f6de80284b2041e653..54e2ae1985a1dfdde98dfea7b01bdcacdb51930f 100644 (file)
--- 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,
@@ -125,6 +129,7 @@ enum Errors {
     ERR_COUNTER_UNDERFLOW,
     ERR_UNDEFINED_LABEL,
     ERR_OPEN_STMT,
+    ERR_FILENAME_NOT_FOUND,
     ERR_COUNT                                  /* Error count */
 };
 
@@ -152,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;
@@ -190,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 */