Report filenames in error messages.

icculus · Feb 12, 2009 · 3af56d1 · 3af56d1
1 parent 4018cf4
commit 3af56d1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/assemble.c b/assemble.c
@@ -30,7 +30,8 @@ static int assemble(const char *buf, int len, const char *outfile)
         int i;
         for (i = 0; i < pd->error_count; i++)
         {
-            printf("ERROR: (line %d) %s\n",
+            printf("%s:%d: ERROR: %s\n",
+                    pd->errors[i].filename ? pd->errors[i].filename : "???",
                     pd->errors[i].error_position,
                     pd->errors[i].error);
         } // for

diff --git a/finderrors.c b/finderrors.c
@@ -88,7 +88,10 @@ static int do_file(const char *profile, const char *dname, const char *fn, int *
 
         if (a->error_count > 0)
         {
-            report("FAIL: %s (line %d) %s\n", fname, a->errors[0].error_position, a->errors[0].error);
+            report("FAIL: %s (line %d) %s\n",
+                a->errors[0].filename ? a->errors[0].filename : "???",
+                a->errors[0].error_position,
+                a->errors[0].error);
             return 1;
         } // if
 

diff --git a/preprocess.c b/preprocess.c
@@ -31,7 +31,8 @@ static int preprocess(const char *buf, int len, const char *outfile)
         int i;
         for (i = 0; i < pd->error_count; i++)
         {
-            printf("ERROR: (line %d) %s\n",
+            printf("%s:%d: ERROR: %s\n",
+                    pd->errors[i].filename ? pd->errors[i].filename : "???",
                     pd->errors[i].error_position,
                     pd->errors[i].error);
         } // for

diff --git a/testoutput.c b/testoutput.c
@@ -22,7 +22,8 @@ static int do_parse(const unsigned char *buf, const int len, const char *prof)
         int i;
         for (i = 0; i < pd->error_count; i++)
         {
-            printf("ERROR: (line %d) %s\n",
+            printf("%s:%d: ERROR: %s\n",
+                    pd->errors[i].filename ? pd->errors[i].filename : "???",
                     pd->errors[i].error_position,
                     pd->errors[i].error);
         } // for

diff --git a/testparse.c b/testparse.c
@@ -66,7 +66,8 @@ static int do_parse(const unsigned char *buf, const int len, const char *prof)
         int i;
         for (i = 0; i < pd->error_count; i++)
         {
-            printf("ERROR: (position %d) %s\n",
+            printf("%s:%d: ERROR: %s\n",
+                    pd->errors[i].filename ? pd->errors[i].filename : "???",
                     pd->errors[i].error_position,
                     pd->errors[i].error);
         } // for