mirror of
https://github.com/cc65/cc65.git
synced 2024-06-07 23:29:39 +00:00
Added a diagnostic level "note" for infomative messages.
This commit is contained in:
acqn
parent
702ec52161
commit
96df4e8b5e
119
src/cc65/error.c
119
src/cc65/error.c
|
|
@ -108,6 +108,36 @@ Collection DiagnosticStrBufs;
|
|||
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Helpers */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
|
||||
static const char* GetDiagnosticFileName (void)
|
||||
/* Get the source file name where the diagnostic info refers to */
|
||||
{
|
||||
if (CurTok.LI) {
|
||||
return GetInputName (CurTok.LI);
|
||||
} else {
|
||||
return GetCurrentFile ();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
static unsigned GetDiagnosticLineNum (void)
|
||||
/* Get the source line number where the diagnostic info refers to */
|
||||
{
|
||||
if (CurTok.LI) {
|
||||
return GetInputLine (CurTok.LI);
|
||||
} else {
|
||||
return GetCurrentLine ();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Handling of fatal errors */
|
||||
/*****************************************************************************/
|
||||
|
|
@ -119,17 +149,7 @@ void Fatal (const char* Format, ...)
|
|||
{
|
||||
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: Fatal: ", FileName, LineNum);
|
||||
fprintf (stderr, "%s:%u: Fatal: ", GetDiagnosticFileName (), GetDiagnosticLineNum ());
|
||||
|
||||
va_start (ap, Format);
|
||||
vfprintf (stderr, Format, ap);
|
||||
|
|
@ -145,22 +165,12 @@ void Fatal (const char* Format, ...)
|
|||
|
||||
|
||||
void Internal (const char* Format, ...)
|
||||
/* Print a message about an internal compiler error and die. */
|
||||
/* 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",
|
||||
FileName, LineNum);
|
||||
GetDiagnosticFileName (), GetDiagnosticLineNum ());
|
||||
|
||||
va_start (ap, Format);
|
||||
vfprintf (stderr, Format, ap);
|
||||
|
|
@ -184,7 +194,7 @@ void Internal (const char* Format, ...)
|
|||
|
||||
|
||||
static void IntError (const char* Filename, unsigned LineNo, const char* Msg, va_list ap)
|
||||
/* Print an error message - internal function*/
|
||||
/* Print an error message - internal function */
|
||||
{
|
||||
fprintf (stderr, "%s:%u: Error: ", Filename, LineNo);
|
||||
vfprintf (stderr, Msg, ap);
|
||||
|
|
@ -206,7 +216,7 @@ void Error (const char* Format, ...)
|
|||
{
|
||||
va_list ap;
|
||||
va_start (ap, Format);
|
||||
IntError (GetInputName (CurTok.LI), GetInputLine (CurTok.LI), Format, ap);
|
||||
IntError (GetDiagnosticFileName (), GetDiagnosticLineNum (), Format, ap);
|
||||
va_end (ap);
|
||||
}
|
||||
|
||||
|
|
@ -224,7 +234,7 @@ void LIError (const LineInfo* LI, const char* Format, ...)
|
|||
|
||||
|
||||
void PPError (const char* Format, ...)
|
||||
/* Print an error message. For use within the preprocessor. */
|
||||
/* Print an error message. For use within the preprocessor */
|
||||
{
|
||||
va_list ap;
|
||||
va_start (ap, Format);
|
||||
|
|
@ -241,7 +251,7 @@ void PPError (const char* Format, ...)
|
|||
|
||||
|
||||
static void IntWarning (const char* Filename, unsigned LineNo, const char* Msg, va_list ap)
|
||||
/* Print warning message - internal function. */
|
||||
/* Print a warning message - internal function */
|
||||
{
|
||||
if (IS_Get (&WarningsAreErrors)) {
|
||||
|
||||
|
|
@ -265,11 +275,11 @@ static void IntWarning (const char* Filename, unsigned LineNo, const char* Msg,
|
|||
|
||||
|
||||
void Warning (const char* Format, ...)
|
||||
/* Print warning message. */
|
||||
/* Print a warning message */
|
||||
{
|
||||
va_list ap;
|
||||
va_start (ap, Format);
|
||||
IntWarning (GetInputName (CurTok.LI), GetInputLine (CurTok.LI), Format, ap);
|
||||
IntWarning (GetDiagnosticFileName (), GetDiagnosticLineNum (), Format, ap);
|
||||
va_end (ap);
|
||||
}
|
||||
|
||||
|
|
@ -287,7 +297,7 @@ void LIWarning (const LineInfo* LI, const char* Format, ...)
|
|||
|
||||
|
||||
void PPWarning (const char* Format, ...)
|
||||
/* Print warning message. For use within the preprocessor. */
|
||||
/* Print a warning message. For use within the preprocessor */
|
||||
{
|
||||
va_list ap;
|
||||
va_start (ap, Format);
|
||||
|
|
@ -326,6 +336,55 @@ void ListWarnings (FILE* F)
|
|||
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Handling of other infos */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
|
||||
static void IntNote (const char* Filename, unsigned LineNo, const char* Msg, va_list ap)
|
||||
/* Print a note message - internal function */
|
||||
{
|
||||
fprintf (stderr, "%s:%u: Note: ", Filename, LineNo);
|
||||
vfprintf (stderr, Msg, ap);
|
||||
fprintf (stderr, "\n");
|
||||
}
|
||||
|
||||
|
||||
|
||||
void Note (const char* Format, ...)
|
||||
/* Print a note message */
|
||||
{
|
||||
va_list ap;
|
||||
va_start (ap, Format);
|
||||
IntNote (GetDiagnosticFileName (), GetDiagnosticLineNum (), Format, ap);
|
||||
va_end (ap);
|
||||
}
|
||||
|
||||
|
||||
|
||||
void LINote (const LineInfo* LI, const char* Format, ...)
|
||||
/* Print a note message with the line info given explicitly */
|
||||
{
|
||||
va_list ap;
|
||||
va_start (ap, Format);
|
||||
IntNote (GetInputName (LI), GetInputLine (LI), Format, ap);
|
||||
va_end (ap);
|
||||
}
|
||||
|
||||
|
||||
|
||||
void PPNote (const char* Format, ...)
|
||||
/* Print a note message. For use within the preprocessor */
|
||||
{
|
||||
va_list ap;
|
||||
va_start (ap, Format);
|
||||
IntNote (GetCurrentFile(), GetCurrentLine(), Format, ap);
|
||||
va_end (ap);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Code */
|
||||
/*****************************************************************************/
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ void Fatal (const char* Format, ...) attribute ((noreturn, format (printf, 1, 2)
|
|||
/* Print a message about a fatal error and die */
|
||||
|
||||
void Internal (const char* Format, ...) attribute ((noreturn, format (printf, 1, 2)));
|
||||
/* Print a message about an internal compiler error and die. */
|
||||
/* Print a message about an internal compiler error and die */
|
||||
|
||||
void Error (const char* Format, ...) attribute ((format (printf, 1, 2)));
|
||||
/* Print an error message */
|
||||
|
|
@ -101,16 +101,16 @@ void LIError (const LineInfo* LI, const char* Format, ...) attribute ((format (p
|
|||
/* Print an error message with the line info given explicitly */
|
||||
|
||||
void PPError (const char* Format, ...) attribute ((format (printf, 1, 2)));
|
||||
/* Print an error message. For use within the preprocessor. */
|
||||
/* Print an error message. For use within the preprocessor */
|
||||
|
||||
void Warning (const char* Format, ...) attribute ((format (printf, 1, 2)));
|
||||
/* Print warning message. */
|
||||
/* Print a warning message */
|
||||
|
||||
void LIWarning (const LineInfo* LI, const char* Format, ...) attribute ((format (printf, 2, 3)));
|
||||
/* Print a warning message with the line info given explicitly */
|
||||
|
||||
void PPWarning (const char* Format, ...) attribute ((format (printf, 1, 2)));
|
||||
/* Print warning message. For use within the preprocessor. */
|
||||
/* Print a warning message. For use within the preprocessor */
|
||||
|
||||
IntStack* FindWarning (const char* Name);
|
||||
/* Search for a warning in the WarnMap table and return a pointer to the
|
||||
|
|
@ -120,6 +120,15 @@ IntStack* FindWarning (const char* Name);
|
|||
void ListWarnings (FILE* F);
|
||||
/* Print a list of warning types/names to the given file */
|
||||
|
||||
void Note (const char* Format, ...) attribute ((format (printf, 1, 2)));
|
||||
/* Print a note message */
|
||||
|
||||
void LINote (const LineInfo* LI, const char* Format, ...) attribute ((format (printf, 2, 3)));
|
||||
/* Print a note message with the line info given explicitly */
|
||||
|
||||
void PPNote (const char* Format, ...) attribute ((format (printf, 1, 2)));
|
||||
/* Print a note message. For use within the preprocessor */
|
||||
|
||||
void ErrorReport (void);
|
||||
/* Report errors (called at end of compile) */
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user