//
-// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
+// RMAC - Reboot's Macro Assembler for all Atari computers
// ERROR.C - Error Handling
-// Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
// RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer
//
#include "error.h"
-#include "token.h"
+#include <stdarg.h>
#include "listing.h"
+#include "token.h"
-int errcnt; // Error count
-char * err_fname; // Name of error message file
+int errcnt; // Error count
+char * err_fname; // Name of error message file
-static char nl[] = "\n";
+static long unused; // For supressing 'write' warnings
//
// Report error if not at EOL
+// N.B.: Since this should *never* happen, we can feel free to add whatever
+// diagnostics that will help in tracking down a problem to this function.
//
int at_eol(void)
{
- if (*tok != EOL)
- error("syntax error");
+ if (*tok != EOL)
+ {
+ error("syntax error. expected EOL, found $%X ('%c')", *tok, *tok);
+ printf("Token = ");
+ DumpToken(*tok);
+ printf("\n");
+ DumpTokenBuffer();
+ }
- return 0;
+ return 0;
}
//
-// Cannot Create a File
+// Cannot create a file
//
-void cantcreat(char * fn)
+void cantcreat(const char * fn)
{
- printf("cannot create: '%s'\n", fn);
- exit(1);
+ printf("cannot create: '%s'\n", fn);
+ exit(1);
}
//
-// Setup for Error Message
-// o Create error listing file (if necessary)
-// o Set current filename
+// Setup for error message
+// o Create error listing file (if necessary)
+// o Set current filename
//
void err_setup(void)
{
char fnbuf[FNSIZ];
- setfnum(cfileno);
-
if (err_fname != NULL)
{
strcpy(fnbuf, err_fname);
//
-// Display Error Message
+// Display error message (uses printf() style variable arguments)
//
-int error(const char * s)
-{
- char buf[EBUFSIZ];
- unsigned int length;
-
- err_setup();
-
- if (listing > 0)
- ship_ln(s);
-
- sprintf(buf, "%s%d: Error: %s%s", curfname, curlineno, s, nl);
- length = strlen(buf);
-
- if (err_flag)
- write(err_fd, buf, length);
- else
- printf("%s", buf);
-
- taglist('E');
- errcnt++;
-
- return ERROR;
-}
-
-int errors(char * s, char * s1)
+int error(const char * text, ...)
{
char buf[EBUFSIZ];
char buf1[EBUFSIZ];
err_setup();
- sprintf(buf, s, s1);
+
+ va_list arg;
+ va_start(arg, text);
+ vsprintf(buf, text, arg);
+ va_end(arg);
if (listing > 0)
ship_ln(buf);
- sprintf(buf1, "%s%d: Error: %s%s", curfname, curlineno, buf, nl);
+ sprintf(buf1, "%s %d: Error: %s\n", curfname, curlineno, buf);
if (err_flag)
- write(err_fd, buf1, (LONG)strlen(buf1));
+ unused = write(err_fd, buf1, (LONG)strlen(buf1));
else
printf("%s", buf1);
taglist('E');
- ++errcnt;
+ errcnt++;
return ERROR;
}
-int warn(char * s)
-{
- char buf[EBUFSIZ];
-
- err_setup();
-
- if (listing > 0)
- ship_ln(s);
-
- sprintf(buf, "%s%d: Warning: %s%s", curfname, curlineno, s, nl);
-
- if (err_flag)
- write(err_fd, buf, (LONG)strlen(buf));
- else
- printf("%s", buf);
-
- taglist('W');
-
- return OK;
-}
-
-int warns(char * s, char * s1)
-{
- char buf[EBUFSIZ];
- char buf1[EBUFSIZ];
-
- err_setup();
- sprintf(buf, s, s1);
-
- if (listing > 0)
- ship_ln(s);
-
- sprintf(buf1, "%s%d: Warning: %s%s", curfname, curlineno, buf, nl);
-
- if (err_flag)
- write(err_fd, buf1, (LONG)strlen(buf1));
- else
- printf("%s", buf1);
-
- taglist('W');
- return OK;
-}
-
-int warni(char * s, unsigned i)
+//
+// Display warning message (uses printf() style variable arguments)
+//
+int warn(const char * text, ...)
{
char buf[EBUFSIZ];
char buf1[EBUFSIZ];
err_setup();
- sprintf(buf, s, i);
+ va_list arg;
+ va_start(arg, text);
+ vsprintf(buf, text, arg);
+ va_end(arg);
if (listing > 0)
ship_ln(buf);
- sprintf(buf1, "%s%d: Warning: %s%s", curfname, curlineno, buf, nl);
+ sprintf(buf1, "%s %d: Warning: %s\n", curfname, curlineno, buf);
if (err_flag)
- write(err_fd, buf1, (LONG)strlen(buf1));
+ unused = write(err_fd, buf1, (LONG)strlen(buf1));
else
printf("%s", buf1);
return OK;
}
-int fatal(char * s)
+
+int fatal(const char * s)
{
char buf[EBUFSIZ];
if (listing > 0)
ship_ln(s);
- sprintf(buf, "%s%d: Fatal: %s%s", curfname, curlineno, s, nl);
+ sprintf(buf, "%s %d: Fatal: %s\n", curfname, curlineno, s);
if (err_flag)
- write(err_fd, buf, (LONG)strlen(buf));
+ unused = write(err_fd, buf, (LONG)strlen(buf));
else
printf("%s", buf);
exit(1);
}
+
int interror(int n)
{
char buf[EBUFSIZ];
err_setup();
- sprintf(buf, "%s%d: Internal Error Number %d%s", curfname, curlineno, n, nl);
+ sprintf(buf, "%s %d: Internal error #%d\n", curfname, curlineno, n);
if (listing > 0)
ship_ln(buf);
if (err_flag)
- write(err_fd, buf, (LONG)strlen(buf));
+ unused = write(err_fd, buf, (LONG)strlen(buf));
else
printf("%s", buf);
exit(1);
}
+
projects / rmac / blobdiff