Added the io module

[cc65] / src / cc65 / error.c

diff --git a/src/cc65/error.c b/src/cc65/error.c
index 4d3250256e3deec61e6ca33cc2508bb3b86ac679..437b127630199f6591cd65da0e2bf7b1ef12b247 100644 (file)
--- a/src/cc65/error.c
+++ b/src/cc65/error.c
@@ -38,7 +38,7 @@
 #include <stdarg.h>
 
 #include "global.h"
-#include "io.h"
+#include "input.h"
 #include "scanner.h"
 #include "stmt.h"
 #include "error.h"
@@ -65,6 +65,7 @@ static char* WarnMsg [WARN_COUNT-1] = {
     "`%s' is defined but never used",
     "Constant is long",
     "`/*' found inside a comment",
+    "Useless declaration",
 };
 
 
@@ -99,7 +100,7 @@ static char* ErrMsg [ERR_COUNT-1] = {
     "`\"' or `<' expected",
     "Missing terminator or name too long",
     "Include file `%s' not found",
-    "Open failure on include file `%s'",
+    "Cannot open include file `%s': %s",
     "Invalid #error directive",
     "#error: %s",
     "Unexpected `#endif'",
@@ -147,6 +148,7 @@ static char* ErrMsg [ERR_COUNT-1] = {
     "Illegal size of data type",
     "__fastcall__ is not allowed for C functions",
     "Variable has unknown size",
+    "Unknown identifier: `%s'",
 };
 
 
@@ -183,7 +185,8 @@ void Warning (unsigned WarnNum, ...)
     va_list ap;
 
     if (!NoWarn) {
-       fprintf (stderr, "%s(%u): Warning #%u: ", fin, curpos, WarnNum);
+       fprintf (stderr, "%s(%u): Warning #%u: ",
+                GetCurrentFile(), curpos, WarnNum);
 
        va_start (ap, WarnNum);
        vfprintf (stderr, WarnMsg [WarnNum-1], ap);
@@ -205,7 +208,8 @@ void PPWarning (unsigned WarnNum, ...)
     va_list ap;
 
     if (!NoWarn) {
-       fprintf (stderr, "%s(%u): Warning #%u: ", fin, ln, WarnNum);
+       fprintf (stderr, "%s(%u): Warning #%u: ",
+                GetCurrentFile(), GetCurrentLine(), WarnNum);
 
        va_start (ap, WarnNum);
        vfprintf (stderr, WarnMsg [WarnNum-1], ap);
@@ -222,7 +226,8 @@ void Error (unsigned ErrNum, ...)
 {
     va_list ap;
 
-    fprintf (stderr, "%s(%u): Error #%u: ", fin, curpos, ErrNum);
+    fprintf (stderr, "%s(%u): Error #%u: ",
+            GetCurrentFile(), curpos, ErrNum);
 
     va_start (ap, ErrNum);
     vfprintf (stderr, ErrMsg [ErrNum-1], ap);
@@ -245,7 +250,8 @@ void PPError (unsigned ErrNum, ...)
 {
     va_list ap;
 
-    fprintf (stderr, "%s(%u): Error #%u: ", fin, ln, ErrNum);
+    fprintf (stderr, "%s(%u): Error #%u: ",
+            GetCurrentFile(), GetCurrentLine(), ErrNum);
 
     va_start (ap, ErrNum);
     vfprintf (stderr, ErrMsg [ErrNum-1], ap);
@@ -265,7 +271,8 @@ void Fatal (unsigned FatNum, ...)
 {
     va_list ap;
 
-    fprintf (stderr, "%s(%u): Fatal #%u: ", fin, curpos, FatNum);
+    fprintf (stderr, "%s(%u): Fatal #%u: ",
+            GetCurrentFile(), curpos, FatNum);
 
     va_start (ap, FatNum);
     vfprintf (stderr, FatMsg [FatNum-1], ap);
@@ -285,7 +292,8 @@ void Internal (char* Format, ...)
 {
     va_list ap;
 
-    fprintf (stderr, "%s(%u): Internal compiler error:\n", fin, curpos);
+    fprintf (stderr, "%s(%u): Internal compiler error:\n",
+            GetCurrentFile(), curpos);
 
     va_start (ap, Format);
     vfprintf (stderr, Format, ap);
@@ -308,3 +316,4 @@ void ErrorReport (void)
 
 
 
+