//
-// 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-2020 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"
+
+// Exported variables
+int errcnt; // Error count
+char * err_fname; // Name of error message file
-int errcnt; // Error count
-char *err_fname; // Name of error message file
+// Internal variables
+static long unused; // For supressing 'write' warnings
-static char nl[] = "\n";
//
-// --- Report error if not at EOL ------------------------------------------------------------------
+// Report error if not at EOL
//
-
-int at_eol(void) {
- if(*tok != EOL)
- error("syntax error");
- return(0);
+// 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 ErrorIfNotAtEOL(void)
+{
+ if (*tok != EOL)
+ {
+ error("syntax error. expected EOL, found $%X ('%c')", *tok, *tok);
+ printf("Token = ");
+ DumpToken(*tok);
+ printf("\n");
+ DumpTokenBuffer();
+ }
+
+ return 0;
}
+
//
-// --- Cannot Create a File ------------------------------------------------------------------------
+// Cannot create a file
//
-
-void cantcreat(char *fn) {
- printf("cannot create: '%s'\n", fn);
- exit(1);
+void CantCreateFile(const char * fn)
+{
+ printf("Cannot create file: '%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];
+
+ if (err_fname != NULL)
+ {
+ strcpy(fnbuf, err_fname);
+
+ if (*fnbuf == EOS)
+ strcpy(fnbuf, firstfname);
+
+ err_fname = NULL;
+
+ if ((err_fd = open(fnbuf, _OPEN_FLAGS, _PERM_MODE)) < 0)
+ CantCreateFile(fnbuf);
-void err_setup(void) {
- char fnbuf[FNSIZ];
-
- setfnum(cfileno);
- if(err_fname != NULL) {
- strcpy(fnbuf, err_fname);
- if(*fnbuf == EOS) {
- strcpy(fnbuf, firstfname);
- }
- err_fname = NULL;
-
- if((err_fd = open(fnbuf, _OPEN_FLAGS, _PERM_MODE)) < 0)
- cantcreat(fnbuf);
- err_flag = 1;
- }
+ err_flag = 1;
+ }
}
+
//
-// --- Display Error Message -----------------------------------------------------------------------
+// Display error message (uses printf() style variable arguments)
//
+int error(const char * text, ...)
+{
+ char buf[EBUFSIZ];
+ char buf1[EBUFSIZ];
+
+ err_setup();
+
+ va_list arg;
+ va_start(arg, text);
+ vsprintf(buf, text, arg);
+ va_end(arg);
+
+ if (listing > 0)
+ ship_ln(buf);
+
+ if (cur_inobj)
+ {
+ 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;
+ }
+ }
+ else
+ // No current file so cur_inobj is NULL
+ sprintf(buf1, "%s %d: Error: %s\n", curfname, curlineno, buf);
+
+ if (err_flag)
+ unused = write(err_fd, buf1, (LONG)strlen(buf1));
+ else
+ printf("%s", buf1);
+
+ taglist('E');
+ errcnt++;
+
+ return ERROR;
+}
-int error(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;
+//
+// Display warning message (uses printf() style variable arguments)
+//
+int warn(const char * text, ...)
+{
+ char buf[EBUFSIZ];
+ char buf1[EBUFSIZ];
- return(ERROR);
-}
+ err_setup();
+ va_list arg;
+ va_start(arg, text);
+ vsprintf(buf, text, arg);
+ va_end(arg);
-int errors(char *s, char *s1) {
- char buf[EBUFSIZ];
- char buf1[EBUFSIZ];
+ if (listing > 0)
+ ship_ln(buf);
- err_setup();
- sprintf(buf, s, s1);
- if(listing > 0) ship_ln(buf);
- sprintf(buf1, "%s[%d]: Error: %s%s", curfname, curlineno, buf, nl);
- if(err_flag) write(err_fd, buf1, (LONG)strlen(buf1));
- else printf("%s", buf1);
- taglist('E');
- ++errcnt;
+ sprintf(buf1, "%s %d: Warning: %s\n", curfname, curlineno, buf);
- return(ERROR);
-}
+ if (err_flag)
+ unused = write(err_fd, buf1, (LONG)strlen(buf1));
+ else
+ printf("%s", buf1);
-int warn(char *s) {
- char buf[EBUFSIZ];
+ taglist('W');
- 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);
+ 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');
+int fatal(const char * s)
+{
+ char buf[EBUFSIZ];
- return(OK);
-}
+ err_setup();
+
+ if (listing > 0)
+ ship_ln(s);
-int warni(char *s, unsigned i) {
- char buf[EBUFSIZ];
- char buf1[EBUFSIZ];
+ sprintf(buf, "%s %d: Fatal: %s\n", curfname, curlineno, s);
- err_setup();
- sprintf(buf, s, i);
- if(listing > 0) ship_ln(buf);
- 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');
+ if (err_flag)
+ unused = write(err_fd, buf, (LONG)strlen(buf));
+ else
+ printf("%s", buf);
- return(OK);
+ exit(1);
}
-int fatal(char *s) {
- char buf[EBUFSIZ];
- err_setup();
- if(listing > 0) ship_ln(s);
- sprintf(buf, "%s[%d]: Fatal: %s%s", curfname, curlineno, s, nl);
- if(err_flag) write(err_fd, buf, (LONG)strlen(buf));
- else printf("%s", buf);
+int interror(int n)
+{
+ char buf[EBUFSIZ];
- exit(1);
-}
+ err_setup();
+ sprintf(buf, "%s %d: Internal error #%d\n", curfname, curlineno, n);
-int interror(int n) {
- char buf[EBUFSIZ];
+ if (listing > 0)
+ ship_ln(buf);
- err_setup();
- sprintf(buf, "%s[%d]: Internal Error Number %d%s", curfname, curlineno, n, nl);
- if(listing > 0) ship_ln(buf);
- if(err_flag) write(err_fd, buf, (LONG)strlen(buf));
- else printf("%s", buf);
+ if (err_flag)
+ unused = write(err_fd, buf, (LONG)strlen(buf));
+ else
+ printf("%s", buf);
- exit(1);
+ exit(1);
}
+
projects / rmac / blobdiff