X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=error.c;h=75e91490d3d44df485fed4cd180befc545055443;hp=9a4baeba73888d75bc253ad398b74a2441b2db99;hb=eace4e1b294ccec54a5c476619f616f5da0bf8a9;hpb=d28f432296e812643e236d1bfc9b556a7b11c461 diff --git a/error.c b/error.c index 9a4baeb..75e9149 100644 --- a/error.c +++ b/error.c @@ -1,161 +1,175 @@ // -// 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 #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 long unused; // For supressing 'write' warnings -static char nl[] = "\n"; // -// --- Report error if not at EOL ------------------------------------------------------------------ +// 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"); - return(0); +int at_eol(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 cantcreat(const char * fn) +{ + 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]; -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; - } + 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; + } } + // -// --- Display Error Message ----------------------------------------------------------------------- +// Display error message (uses printf() style variable arguments) // +int error(const char * text, ...) +{ + char buf[EBUFSIZ]; + char buf1[EBUFSIZ]; -int error(char *s) { - char buf[EBUFSIZ]; - unsigned int length; + err_setup(); - 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; + va_list arg; + va_start(arg, text); + vsprintf(buf, text, arg); + va_end(arg); - return(ERROR); -} + if (listing > 0) + ship_ln(buf); -int errors(char *s, char *s1) { - char buf[EBUFSIZ]; - char buf1[EBUFSIZ]; + sprintf(buf1, "%s %d: Error: %s\n", curfname, curlineno, 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; + if (err_flag) + unused = write(err_fd, buf1, (LONG)strlen(buf1)); + else + printf("%s", buf1); - return(ERROR); + taglist('E'); + 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'); +// +// Display warning message (uses printf() style variable arguments) +// +int warn(const char * text, ...) +{ + char buf[EBUFSIZ]; + char buf1[EBUFSIZ]; - return(OK); -} + err_setup(); + va_list arg; + va_start(arg, text); + vsprintf(buf, text, arg); + va_end(arg); -int warns(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(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'); + sprintf(buf1, "%s %d: Warning: %s\n", curfname, curlineno, buf); - return(OK); + if (err_flag) + unused = write(err_fd, buf1, (LONG)strlen(buf1)); + else + printf("%s", buf1); + + taglist('W'); + + return OK; } -int warni(char *s, unsigned i) { - char buf[EBUFSIZ]; - char buf1[EBUFSIZ]; - 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'); +int fatal(const char * s) +{ + char buf[EBUFSIZ]; - return(OK); -} + err_setup(); -int fatal(char *s) { - char buf[EBUFSIZ]; + if (listing > 0) + ship_ln(s); - 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); + sprintf(buf, "%s %d: Fatal: %s\n", curfname, curlineno, s); - exit(1); + if (err_flag) + 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); - if(listing > 0) ship_ln(buf); - if(err_flag) write(err_fd, buf, (LONG)strlen(buf)); - else printf("%s", buf); +int interror(int n) +{ + char buf[EBUFSIZ]; + + err_setup(); + sprintf(buf, "%s %d: Internal error #%d\n", curfname, curlineno, n); + + if (listing > 0) + ship_ln(buf); + + if (err_flag) + unused = write(err_fd, buf, (LONG)strlen(buf)); + else + printf("%s", buf); + + exit(1); +} - exit(1); -} \ No newline at end of file