Use the CHECK macros from the common dir

git-svn-id: svn://svn.cc65.org/cc65/trunk@251 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz
2000-08-01 15:17:43 +00:00
parent 7e4a0ed5c6
commit 5ee8618510
27 changed files with 81 additions and 185 deletions

View File

@@ -38,9 +38,12 @@
#include <string.h>
#include <errno.h>
#include "../common/bitops.h"
#include "../common/xmalloc.h"
/* common */
#include "check.h"
#include "bitops.h"
#include "xmalloc.h"
/* ld65 */
#include "error.h"
#include "global.h"
#include "bin.h"

View File

@@ -35,9 +35,12 @@
#include <string.h>
#include "../common/symdefs.h"
#include "../common/xmalloc.h"
/* common */
#include "check.h"
#include "symdefs.h"
#include "xmalloc.h"
/* ld65 */
#include "global.h"
#include "error.h"
#include "fileio.h"

View File

@@ -6,10 +6,10 @@
/* */
/* */
/* */
/* (C) 1998 Ullrich von Bassewitz */
/* Wacholderweg 14 */
/* D-70597 Stuttgart */
/* EMail: uz@musoftware.de */
/* (C) 1998-2000 Ullrich von Bassewitz */
/* Wacholderweg 14 */
/* D-70597 Stuttgart */
/* EMail: uz@musoftware.de */
/* */
/* */
/* This software is provided 'as-is', without any expressed or implied */
@@ -41,22 +41,6 @@
/*****************************************************************************/
/* Data */
/*****************************************************************************/
/* 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";
/*****************************************************************************/
/* Code */
/*****************************************************************************/

View File

@@ -6,10 +6,10 @@
/* */
/* */
/* */
/* (C) 1998 Ullrich von Bassewitz */
/* Wacholderweg 14 */
/* D-70597 Stuttgart */
/* EMail: uz@musoftware.de */
/* (C) 1998-2000 Ullrich von Bassewitz */
/* Wacholderweg 14 */
/* D-70597 Stuttgart */
/* EMail: uz@musoftware.de */
/* */
/* */
/* This software is provided 'as-is', without any expressed or implied */
@@ -43,19 +43,6 @@
/*****************************************************************************/
/* Data */
/*****************************************************************************/
/* Messages for internal compiler errors */
extern const char _MsgCheckFailed [];
extern const char _MsgPrecondition [];
extern const char _MsgFail [];
/*****************************************************************************/
/* Code */
/*****************************************************************************/
@@ -71,18 +58,7 @@ void Error (const char* Format, ...) attribute((format(printf,1,2)));
void Internal (const char* Format, ...) attribute((format(printf,1,2)));
/* Print an internal error message 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 */

View File

@@ -37,10 +37,13 @@
#include <stdlib.h>
#include <string.h>
#include "../common/symdefs.h"
#include "../common/hashstr.h"
#include "../common/xmalloc.h"
/* common */
#include "check.h"
#include "hashstr.h"
#include "symdefs.h"
#include "xmalloc.h"
/* ld65 */
#include "global.h"
#include "error.h"
#include "fileio.h"

View File

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

View File

@@ -39,6 +39,7 @@
#include <time.h>
/* common */
#include "check.h"
#include "version.h"
#include "xmalloc.h"

View File

@@ -37,12 +37,13 @@
#include <string.h>
/* common */
#include "check.h"
#include "exprdefs.h"
#include "hashstr.h"
#include "segdefs.h"
#include "symdefs.h"
#include "xmalloc.h"
/* ld65 */
#include "error.h"
#include "expr.h"