Add flag -px in alcyon mode which enables extended GST symbol table.

[rmac] / error.c

diff --git a/error.c b/error.c
index c27911796f9dc9778102ccccb1c19b47db8ef0a3..5c9b8c90133b074d9c16750f7342a370d8ec1ed7 100644 (file)
--- a/error.c
+++ b/error.c
@@ -24,11 +24,11 @@ static long unused;                         // For supressing 'write' warnings
 //
 int at_eol(void)
 {
-       if (*tok.u32 != EOL)
+       if (*tok != EOL)
        {
-               error("syntax error. expected EOL, found $%X ('%c')", *tok.u32, *tok.u32);
+               error("syntax error. expected EOL, found $%X ('%c')", *tok, *tok);
                printf("Token = ");
-               DumpToken(*tok.u32);
+               DumpToken(*tok);
                printf("\n");
                DumpTokenBuffer();
        }
@@ -91,7 +91,18 @@ int error(const char * text, ...)
        if (listing > 0)
                ship_ln(buf);
 
-       sprintf(buf1, "%s %d: Error: %s\n", curfname, curlineno, buf);
+       switch (cur_inobj->in_type)
+       {
+       case SRC_IFILE:
+               sprintf(buf1, "%s %d: Error: %s\n", curfname, curlineno, buf);
+              break;
+       case SRC_IMACRO:
+               sprintf(buf1, "%s %d: Error: %s\n", curfname, cur_inobj->inobj.imacro->im_macro->lineList->lineno, buf);
+               break;
+       case SRC_IREPT:
+               sprintf(buf1, "%s %d: Error: %s\n", curfname, cur_inobj->inobj.irept->lineno, buf);
+               break;
+       }
 
        if (err_flag)
                unused = write(err_fd, buf1, (LONG)strlen(buf1));