Use the CHECK macros from the common dir

git-svn-id: svn://svn.cc65.org/cc65/trunk@251 b7a2c559-68d2-44c3-8de9-860c34a00d81

src/ca65/error.c

@@ -51,15 +51,6 @@
 /* Warning level */
 unsigned WarnLevel	    = 1;
 
-/* Messages for internal compiler errors */
-const char _MsgCheckFailed [] =
-    "Check failed: `%s' (= %d), file `%s', line %u\n";
-const char _MsgPrecondition [] =
-    "Precondition violated: `%s' (= %d), file `%s', line %u\n";
-const char _MsgFail [] =
-    "%s, file `%s', line %u\n";
-
-
 /* Statistics */
 unsigned ErrorCount	= 0;
 unsigned WarningCount	= 0;

src/ca65/error.h

@@ -153,11 +153,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;
@@ -191,17 +186,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 */

src/ca65/expr.c

@@ -34,6 +34,7 @@
 
 
 /* common */
+#include "check.h"
 #include "exprdefs.h"
 #include "xmalloc.h"
 

src/ca65/instr.c

@@ -37,8 +37,11 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "../common/bitops.h"
+/* common */
+#include "bitops.h"
+#include "check.h"
 
+/* ca65 */
 #include "ea.h"
 #include "error.h"
 #include "expr.h"

src/ca65/istack.c

@@ -33,8 +33,11 @@
 
 
 
-#include "../common/xmalloc.h"
-
+/* common */
+#include "check.h"
+#include "xmalloc.h"
+		  
+/* ca65 */
 #include "error.h"
 #include "istack.h"
 

src/ca65/listing.c

@@ -38,6 +38,7 @@
 #include <errno.h>
 
 /* common */
+#include "check.h"
 #include "fname.h"
 #include "segdefs.h"
 #include "version.h"

src/ca65/macpack.c

@@ -33,6 +33,10 @@
 
 
 
+/* common */
+#include "check.h"
+		  
+/* ca65 */
 #include "error.h"
 #include "scanner.h"
 #include "macpack.h"

src/ca65/macro.c

@@ -36,9 +36,12 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../common/hashstr.h"
-#include "../common/xmalloc.h"
-
+/* common */
+#include "check.h"
+#include "hashstr.h"
+#include "xmalloc.h"
+	  
+/* ca65 */
 #include "condasm.h"
 #include "error.h"
 #include "istack.h"
@@ -657,7 +660,7 @@ static void StartExpDefine (Macro* M)
 
     /* A define style macro must be called with as many actual parameters
      * as there are formal ones. Get the parameter count.
-     */						 
+     */
     unsigned Count = M->ParamCount;
 
     /* Skip the current token */

src/ca65/nexttok.c

@@ -35,6 +35,10 @@
 
 #include <stdio.h>
 
+/* common */
+#include "check.h"
+		   
+/* ca65 */
 #include "error.h"
 #include "expr.h"
 #include "scanner.h"

src/ca65/objcode.c

@@ -38,9 +38,10 @@
 #include <ctype.h>
 
 /* common */
+#include "check.h"
 #include "segdefs.h"
 #include "xmalloc.h"
-	   
+
 /* cc65 */
 #include "error.h"
 #include "fragment.h"
@@ -162,7 +163,7 @@ static Segment* NewSegment (const char* Name, unsigned SegType)
     return S;
 }
 
-	  
+
 
 void UseCodeSeg (void)
 /* Use the code segment */

src/ca65/pseudo.c

@@ -41,6 +41,7 @@
 
 /* common */
 #include "bitops.h"
+#include "check.h"
 
 /* ca65 */
 #include "condasm.h"

src/ca65/scanner.c

@@ -41,9 +41,10 @@
 #include <sys/stat.h>
 
 /* common */
+#include "check.h"
 #include "fname.h"
 #include "xmalloc.h"
-	  
+
 /* ca65 */
 #include "condasm.h"
 #include "error.h"

src/ca65/symtab.c

@@ -36,10 +36,11 @@
 #include <string.h>
 
 /* common */
-#include "symdefs.h"
+#include "check.h"
 #include "hashstr.h"
+#include "symdefs.h"
 #include "xmalloc.h"
-	  
+
 /* ca65 */
 #include "global.h"
 #include "error.h"
@@ -998,7 +999,7 @@ void WriteImports (void)
      	}
      	S = S->List;
     }
-     
+
     /* Done writing imports */
     ObjEndImports ();
 }

src/ca65/toklist.c

@@ -34,10 +34,11 @@
 
 
 #include <string.h>
-		      
+
 /* common */
+#include "check.h"
 #include "xmalloc.h"
-	  
+
 /* ca65 */
 #include "error.h"
 #include "istack.h"

src/ca65/ulabel.c

@@ -33,9 +33,12 @@
 
 
 
-#include "../common/filepos.h"
-#include "../common/xmalloc.h"
-
+/* common */
+#include "check.h"
+#include "filepos.h"
+#include "xmalloc.h"
+	  
+/* ca65 */
 #include "error.h"
 #include "expr.h"
 #include "scanner.h"