X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fcc65%2Ferror.c;h=cba0a479e97ecb2dca7979037abf8696655a93c7;hb=b8c4dc9b0661e19e46ba60372db3831cdcf5961f;hp=4a8a0ecb7e2977fab1eb8f856c5945112d3de064;hpb=d171b3dac96e836a6b952b14951d0479c31ab280;p=cc65 diff --git a/src/cc65/error.c b/src/cc65/error.c index 4a8a0ecb7..cba0a479e 100644 --- a/src/cc65/error.c +++ b/src/cc65/error.c @@ -37,8 +37,13 @@ #include #include +/* common */ +#include "print.h" + +/* cc65 */ #include "global.h" #include "input.h" +#include "lineinfo.h" #include "scanner.h" #include "stmt.h" #include "error.h" @@ -46,132 +51,11 @@ /*****************************************************************************/ -/* Data */ +/* Data */ /*****************************************************************************/ -static char* WarnMsg [WARN_COUNT-1] = { - "Unreachable code", - "Condition is never true", - "Condition is always true", - "Converting pointer to integer without a cast", - "Converting integer to pointer without a cast", - "Function call without a prototype", - "Unknown #pragma", - "No case labels", - "Function must be extern", - "Parameter `%s' is never used", - "`%s' is defined but never used", - "Constant is long", - "`/*' found inside a comment", - "Useless declaration", -}; - - - -/* Error messages sorted by ErrTypes */ -static char* ErrMsg [ERR_COUNT-1] = { - "Invalid character (%u)", - "Unexpected newline", - "End-of-file reached in comment starting at line %u", - "Syntax error", - "`\"' expected", - "`:' expected", - "`;' expected", - "`(' expected", - "`)' expected", - "`[' expected", - "`]' expected", - "`{' expected", - "`}' expected", - "Identifier expected", - "Type expected", - "Incompatible types", - "Incompatible pointer types", - "Too many arguments in function call", - "Too few arguments in function call", - "Macro argument count mismatch", - "Duplicate macro parameter: %s", - "Variable identifier expected", - "Integer expression expected", - "Constant expression expected", - "No active loop", - "`\"' or `<' expected", - "Missing terminator or name too long", - "Include file `%s' not found", - "Cannot open include file `%s': %s", - "Invalid #error directive", - "#error: %s", - "Unexpected `#endif'", - "Unexpected `#else'", - "`#endif' expected", - "Compiler directive expected", - "Symbol `%s' defined more than once", - "String literal expected", - "`while' expected", - "Function must return a value", - "Function cannot return a value", - "Unexpected `continue'", - "Undefined symbol: `%s'", - "Undefined label: `%s'", - "Include nesting too deep", - "Too many local variables", - "Too many initializers", - "Cannot initialize incomplete type", - "Cannot subscript", - "Operation not allowed on these types", - "Struct expected", - "Struct/union has no field named `%s'", - "Struct pointer expected", - "lvalue expected", - "Expression expected", - "Preprocessor expression expected", - "Illegal type", - "Illegal function call", - "Illegal indirection", - "Illegal address", - "Illegal macro call", - "Illegal hex digit", - "Illegal character constant", - "Illegal modifier", - "Illegal type qualifier", - "Illegal storage class", - "Illegal segment name: `%s'", - "Division by zero", - "Modulo operation with zero", - "Range error", - "Symbol is already different kind", - "Too many lexical levels", - "Parameter name omitted", - "Old style function decl used as prototype", - "Declaration for parameter `%s' but no such parameter", - "Cannot take address of a register variable", - "Illegal size of data type", - "__fastcall__ is not allowed for C functions", - "Variable has unknown size", - "Unknown identifier: `%s'", - "Duplicate qualifier: `%s'", - "Assignment discards `const' qualifier", - "Passing argument %u discards `const' qualifier", -}; - - - -static char* FatMsg [FAT_COUNT-1] = { - "Too many errors", - "Cannot open output file: %s", - "Cannot write to output file (disk full?)", - "Cannot open input file: %s", - "Out of memory", - "Stack overflow", - "Stack empty", - "Out of string space", - "Too many case labels", -}; - - - /* Count of errors/warnings */ unsigned ErrorCount = 0; unsigned WarningCount = 0; @@ -184,121 +68,126 @@ unsigned WarningCount = 0; -void Warning (unsigned WarnNum, ...) -/* Print warning message. */ +static void IntWarning (const char* Filename, unsigned Line, const char* Msg, va_list ap) +/* Print warning message - internal function. */ { - va_list ap; - if (!NoWarn) { - fprintf (stderr, "%s(%u): Warning #%u: ", - GetCurrentFile(), curpos, WarnNum); - - va_start (ap, WarnNum); - vfprintf (stderr, WarnMsg [WarnNum-1], ap); - va_end (ap); + fprintf (stderr, "%s(%u): Warning: ", Filename, Line); + vfprintf (stderr, Msg, ap); fprintf (stderr, "\n"); - if (Verbose) { - fprintf (stderr, "Line: %s\n", line); - } + Print (stderr, 1, "Line: %s\n", line); + ++WarningCount; } - ++ WarningCount; } -void PPWarning (unsigned WarnNum, ...) -/* Print warning message. For use within the preprocessor. */ +void Warning (const char* Format, ...) +/* Print warning message. */ { va_list ap; - - if (!NoWarn) { - fprintf (stderr, "%s(%u): Warning #%u: ", - GetCurrentFile(), GetCurrentLine(), WarnNum); - - va_start (ap, WarnNum); - vfprintf (stderr, WarnMsg [WarnNum-1], ap); - va_end (ap); - fprintf (stderr, "\n"); - } - ++WarningCount; + va_start (ap, Format); + IntWarning (GetInputName (CurTok.LI), GetInputLine (CurTok.LI), Format, ap); + va_end (ap); } -void Error (unsigned ErrNum, ...) -/* Print an error message */ +void PPWarning (const char* Format, ...) +/* Print warning message. For use within the preprocessor. */ { va_list ap; + va_start (ap, Format); + IntWarning (GetCurrentFile(), GetCurrentLine(), Format, ap); + va_end (ap); +} - fprintf (stderr, "%s(%u): Error #%u: ", - GetCurrentFile(), curpos, ErrNum); - va_start (ap, ErrNum); - vfprintf (stderr, ErrMsg [ErrNum-1], ap); - va_end (ap); + +static void IntError (const char* Filename, unsigned Line, const char* Msg, va_list ap) +/* Print an error message - internal function*/ +{ + fprintf (stderr, "%s(%u): Error: ", Filename, Line); + vfprintf (stderr, Msg, ap); fprintf (stderr, "\n"); - if (Verbose) { - fprintf (stderr, "Line: %s\n", line); - } + Print (stderr, 1, "Line: %s\n", line); ++ErrorCount; if (ErrorCount > 10) { - Fatal (FAT_TOO_MANY_ERRORS); + Fatal ("Too many errors"); } } -void PPError (unsigned ErrNum, ...) -/* Print an error message. For use within the preprocessor. */ +void Error (const char* Format, ...) +/* Print an error message */ { va_list ap; + va_start (ap, Format); + IntError (GetInputName (CurTok.LI), GetInputLine (CurTok.LI), Format, ap); + va_end (ap); +} - fprintf (stderr, "%s(%u): Error #%u: ", - GetCurrentFile(), GetCurrentLine(), ErrNum); - va_start (ap, ErrNum); - vfprintf (stderr, ErrMsg [ErrNum-1], ap); - va_end (ap); - fprintf (stderr, "\n"); - ++ErrorCount; - if (ErrorCount > 10) { - Fatal (FAT_TOO_MANY_ERRORS); - } +void PPError (const char* Format, ...) +/* Print an error message. For use within the preprocessor. */ +{ + va_list ap; + va_start (ap, Format); + IntError (GetCurrentFile(), GetCurrentLine(), Format, ap); + va_end (ap); } -void Fatal (unsigned FatNum, ...) +void Fatal (const char* Format, ...) /* Print a message about a fatal error and die */ { va_list ap; - fprintf (stderr, "%s(%u): Fatal #%u: ", - GetCurrentFile(), curpos, FatNum); + const char* FileName; + unsigned LineNum; + if (CurTok.LI) { + FileName = GetInputName (CurTok.LI); + LineNum = GetInputLine (CurTok.LI); + } else { + FileName = GetCurrentFile (); + LineNum = GetCurrentLine (); + } + + fprintf (stderr, "%s(%u): Fatal: ", FileName, LineNum); - va_start (ap, FatNum); - vfprintf (stderr, FatMsg [FatNum-1], ap); + va_start (ap, Format); + vfprintf (stderr, Format, ap); va_end (ap); fprintf (stderr, "\n"); - if (Verbose) { - fprintf (stderr, "Line: %s\n", line); - } + Print (stderr, 1, "Line: %s\n", line); exit (EXIT_FAILURE); } -void Internal (char* Format, ...) +void Internal (const char* Format, ...) /* Print a message about an internal compiler error and die. */ { va_list ap; + const char* FileName; + unsigned LineNum; + if (CurTok.LI) { + FileName = GetInputName (CurTok.LI); + LineNum = GetInputLine (CurTok.LI); + } else { + FileName = GetCurrentFile (); + LineNum = GetCurrentLine (); + } + fprintf (stderr, "%s(%u): Internal compiler error:\n", - GetCurrentFile(), curpos); + FileName, LineNum); va_start (ap, Format); vfprintf (stderr, Format, ap); @@ -307,14 +196,14 @@ void Internal (char* Format, ...) /* Use abort to create a core dump */ abort (); -} +} void ErrorReport (void) /* Report errors (called at end of compile) */ { - if (ErrorCount == 0 && Verbose) { + if (ErrorCount == 0 && Verbosity > 0) { printf ("No errors.\n"); } } @@ -322,3 +211,4 @@ void ErrorReport (void) +