From f84affdb4a0c2577d9b32644bc57b7fe7ab56b7d Mon Sep 17 00:00:00 2001 From: Curtis F Kaylor Date: Sun, 4 Mar 2018 13:38:40 -0500 Subject: [PATCH] Removed extraneous semicolon after ERROR( macro invocations --- src/c02.c | 33 +++++++++++++-------------------- src/cond.c | 2 +- src/dclrtn.c | 6 +++--- src/expr.c | 8 ++++---- src/files.c | 2 +- src/include.c | 10 +++++----- src/label.c | 2 +- src/parse.c | 12 ++++++------ src/stmnt.c | 24 ++++++++++++------------ src/vars.c | 8 ++++---- 10 files changed, 50 insertions(+), 57 deletions(-) diff --git a/src/c02.c b/src/c02.c index ad50ac1..8aec375 100644 --- a/src/c02.c +++ b/src/c02.c @@ -54,10 +54,10 @@ void pword(void) { getwrd(); DEBUG("Parsing Word '%s'\n", word); if (xstmnt[0]) { - if (wordis(xstmnt)) + if (wordis(xstmnt)) xstmnt[0] = 0; //Clear xstmnt else - ERROR("Expected '%s' statement\n", xstmnt, EXIT_FAILURE); + ERROR("Expected '%s' statement\n", xstmnt, EXIT_FAILURE) } if (!pmodfr() && !ptype(MTNONE)) pstmnt(); //Parse Statement @@ -69,19 +69,12 @@ void pdrctv(void) { CCMNT('#'); getwrd(); //read directive into word DEBUG("Processing directive '%s'\n", word); - if (wordis("DEFINE")) - pdefin(); //Parse Define - else if (wordis("ENUM")) - penumd(); //Parse Enum Directive - else if (wordis("INCLUDE")) - pincfl(); //Parse Include File - else if (wordis("ERROR")) { - ERROR("Error \n", 0, EXIT_FAILURE); - } - else if (wordis("PRAGMA")) - pprgma(); - else - ERROR("Illegal directive %s encountered\n", word, EXIT_FAILURE); + if (wordis("DEFINE")) pdefin(); //Parse Define + else if (wordis("ENUM")) penumd(); //Parse Enum Directive + else if (wordis("INCLUDE")) pincfl(); //Parse Include File + else if (wordis("ERROR")) ERROR("Error \n", 0, EXIT_FAILURE) + else if (wordis("PRAGMA")) pprgma(); + else ERROR("Illegal directive %s encountered\n", word, EXIT_FAILURE) } void prolog(void) { @@ -117,7 +110,7 @@ void compile(void) { else if (isalph()) pword(); //Parse Word else - ERROR("Unexpected character '%c'\n", nxtchr, EXIT_FAILURE); + ERROR("Unexpected character '%c'\n", nxtchr, EXIT_FAILURE) } epilog(); } @@ -135,11 +128,11 @@ int popt(int arg, int argc, char *argv[]) { char optarg[32]; //Option Argument strncpy (argstr, argv[arg], 31); if (strlen(argstr) != 2) - ERROR("malformed option %s\n", argstr, EXIT_FAILURE); + ERROR("malformed option %s\n", argstr, EXIT_FAILURE) opt = toupper(argstr[1]); if (strchr("H", opt)) { if (++arg >= argc) - ERROR("Option -%c requires an argument\n", opt, EXIT_FAILURE); + ERROR("Option -%c requires an argument\n", opt, EXIT_FAILURE) strncpy(optarg, argv[arg], 31); } DEBUG("Processing Command Line Option -%c\n", argstr[1]); @@ -149,7 +142,7 @@ int popt(int arg, int argc, char *argv[]) { DEBUG("Header Name set to '%s'\n", hdrnam); break; default: - ERROR("Illegal option -%c\n", opt, EXIT_FAILURE); + ERROR("Illegal option -%c\n", opt, EXIT_FAILURE) } return arg; } @@ -177,7 +170,7 @@ void pargs(int argc, char *argv[]) { DEBUG("outnam set to '%s'\n", outnam); } else - ERROR("Unexpected argument '%s'\n", argv[arg], EXIT_FAILURE); + ERROR("Unexpected argument '%s'\n", argv[arg], EXIT_FAILURE) } } diff --git a/src/cond.c b/src/cond.c index bed640f..c6eafc3 100644 --- a/src/cond.c +++ b/src/cond.c @@ -77,7 +77,7 @@ void prccmp(void) { asmlin("BNE", cndlbl); break; default: - ERROR("Unsupported comparison operator index %d\n", cmprtr, EXIT_FAILURE); + ERROR("Unsupported comparison operator index %d\n", cmprtr, EXIT_FAILURE) } } diff --git a/src/dclrtn.c b/src/dclrtn.c index f15fa8f..2921fff 100644 --- a/src/dclrtn.c +++ b/src/dclrtn.c @@ -59,9 +59,9 @@ void pdecl(int m, int t) { while(TRUE) { getwrd(); if (match('(')) { - if (m != MTNONE) { - ERROR("Illegal Modifier %d in Function Definion", m, EXIT_FAILURE); - } + if (m != MTNONE) + ERROR("Illegal Modifier %d in Function Definion", m, EXIT_FAILURE) + addfnc(); //Add Function Call return; } diff --git a/src/expr.c b/src/expr.c index 0d3560d..b3888fb 100644 --- a/src/expr.c +++ b/src/expr.c @@ -67,9 +67,9 @@ void chkidx(void) { void prstrm(void) { DEBUG("Parsing term\n", 0); prsval(FALSE); - if (valtyp == FUNCTION) { - ERROR("Function call only allowed in first term\n", 0, EXIT_FAILURE); - } + if (valtyp == FUNCTION) + ERROR("Function call only allowed in first term\n", 0, EXIT_FAILURE) + strcpy(term, value); DEBUG("Parsed term %s\n", term); chkidx(); //Check for Array Index @@ -137,7 +137,7 @@ int chkadr(int adract) { void prsfnc(char trmntr) { DEBUG("Processing Function Call '%s'...\n", term); if (fnscnt >= MAXFNS) - ERROR("Maximum Function Call Depth Exceeded", 0, EXIT_FAILURE); + ERROR("Maximum Function Call Depth Exceeded", 0, EXIT_FAILURE) strcpy(fnstck[fnscnt++], term); skpchr(); //skip open paren CCMNT('('); diff --git a/src/files.c b/src/files.c index f83a2c7..10eba8b 100644 --- a/src/files.c +++ b/src/files.c @@ -91,7 +91,7 @@ void opninc(void) /* Close Include File * * Uses: incfil - Include File Handle */ -void clsinc() { +void clsinc(void) { fclose(incfil); } diff --git a/src/include.c b/src/include.c index af1f4d4..c062d5b 100644 --- a/src/include.c +++ b/src/include.c @@ -31,7 +31,7 @@ void pincnm(void) { dlmtr = '>'; } else if (dlmtr != '"') - ERROR("Unexpected character '%c' after include\n", dlmtr, EXIT_FAILURE); + ERROR("Unexpected character '%c' after include\n", dlmtr, EXIT_FAILURE) while (!match(dlmtr)) { incnam[inclen++] = nxtchr; @@ -114,9 +114,9 @@ void prszpg(void) { /* Process Vartable Subdirective */ void pvrtbl(void) { - if (vrwrtn) { - ERROR("Variable table already written", 0, EXIT_FAILURE); - } + if (vrwrtn) + ERROR("Variable table already written", 0, EXIT_FAILURE) + vartbl(); //Write Variable Table } @@ -133,7 +133,7 @@ void pprgma(void) { else if (wordis("ZEROPAGE")) prszpg(); //Parse Origin else - ERROR("Illegal pragma subdirective '%s'\n", word, EXIT_FAILURE); + ERROR("Illegal pragma subdirective '%s'\n", word, EXIT_FAILURE) } /* Process Include File Directive */ diff --git a/src/label.c b/src/label.c index 2c6a739..32e41a5 100644 --- a/src/label.c +++ b/src/label.c @@ -49,7 +49,7 @@ void setlbl(char *lblset) { asmlin("",""); //Emit Block End Label on it's own line } if (strlen(lblset) > LABLEN) - ERROR("Label '%s' exceeds maximum size\n", word, EXIT_FAILURE); + ERROR("Label '%s' exceeds maximum size\n", word, EXIT_FAILURE) strcpy(lblasm, lblset); } diff --git a/src/parse.c b/src/parse.c index 609a4ec..9b6e341 100644 --- a/src/parse.c +++ b/src/parse.c @@ -295,9 +295,9 @@ int prsnum(int maxval) { DEBUG("Parsed number '%s' ", word); DETAIL("with value '%d'\n", number); - if (number > maxval) { - ERROR("Out of bounds constant '%d';\n", number, EXIT_FAILURE); - } + if (number > maxval) + ERROR("Out of bounds constant '%d';\n", number, EXIT_FAILURE) + if (maxval > 255) sprintf(value, "$%04X", number); else @@ -323,9 +323,9 @@ int prsdef(void) { expect('#'); getwrd(); //Get Constant Name fnddef(word); - if (defidx < 0) { - ERROR("Undefined constant '%s'\n", word, EXIT_FAILURE); - } + if (defidx < 0) + ERROR("Undefined constant '%s'\n", word, EXIT_FAILURE) + strcpy(value, word); return defval[defidx]; } diff --git a/src/stmnt.c b/src/stmnt.c index a1f9ec8..4c82f32 100644 --- a/src/stmnt.c +++ b/src/stmnt.c @@ -38,7 +38,7 @@ void endblk(int blkflg) { expect('}'); //Block End Character DEBUG("Found inblck set to %d\n", inblck); if (inblck != blkflg) - ERROR("Encountered '}' without matching '{'\n", 0, EXIT_FAILURE); + ERROR("Encountered '}' without matching '{'\n", 0, EXIT_FAILURE) lbtype = poplbl(); if (lbtype == LTDO) pdowhl(); //Parse While at End of Do Loop @@ -139,9 +139,9 @@ void prcvar(char trmntr) { } else { if (look(',')) { - if (asntyp == REGISTER) { - ERROR("Register %s not allowed in plural assignment\n", asnvar, EXIT_FAILURE); - } + if (asntyp == REGISTER) + ERROR("Register %s not allowed in plural assignment\n", asnvar, EXIT_FAILURE) + prsvar(FALSE); //get variable name strcpy(ysnvar, word); DEBUG("Set STY variable to %s\n", ysnvar); @@ -156,9 +156,9 @@ void prcvar(char trmntr) { prsvar(FALSE); //get variable name strcpy(xsnvar, word); DEBUG("Set STX variable to %s\n", xsnvar); - if (valtyp == ARRAY) { - ERROR("Array element not allowed in third assignment\n", 0, EXIT_FAILURE); - } + if (valtyp == ARRAY) + ERROR("Array element not allowed in third assignment\n", 0, EXIT_FAILURE) + } } prcasn(trmntr); @@ -199,7 +199,7 @@ void pbrcnt(int lbflag) { DEBUG("Parsing BREAK/CONTINUE statement\n", 0); if (lstlbl(lbflag) < 0) - ERROR("Break/continue statement outside of loop\n", 0, EXIT_FAILURE); + ERROR("Break/continue statement outside of loop\n", 0, EXIT_FAILURE) DEBUG("Found Label '%s'\n", tmplbl); asmlin("JMP", tmplbl); expect(';'); @@ -372,9 +372,9 @@ void pslct(void) { void ecase(void) { DEBUG("Processing end of CASE block\n", 0); if (poplbl(cndlbl) != LTCASE) - ERROR("%s not at end of CASE block\n", word, EXIT_FAILURE); + ERROR("%s not at end of CASE block\n", word, EXIT_FAILURE) if (toplbl(endlbl) != LTSLCT) - ERROR("Illegal nesting in SELECT statement\n", 0, EXIT_FAILURE); + ERROR("Illegal nesting in SELECT statement\n", 0, EXIT_FAILURE) asmlin("JMP", endlbl); //Emit jump over default case setlbl(cndlbl); //Set entry point label to emit } @@ -432,7 +432,7 @@ void pwhile(void) { /* generate unimplemented statement error */ void punimp(void) { - ERROR("Unimplemented statement '%s' encountered\n", word, EXIT_FAILURE); + ERROR("Unimplemented statement '%s' encountered\n", word, EXIT_FAILURE) } /* Parse Function Call as Statement */ @@ -472,7 +472,7 @@ void pstmnt(void) { return; } if (wordis("SWITCH")) { - ERROR("SWITCH not implemented. Use SELECT.\n", word, EXIT_FAILURE); + ERROR("SWITCH not implemented. Use SELECT.\n", word, EXIT_FAILURE) } if (wordis("SELECT")) { pslct(); diff --git a/src/vars.c b/src/vars.c index 0eabeee..35d176a 100644 --- a/src/vars.c +++ b/src/vars.c @@ -38,10 +38,10 @@ void chksym(int alwreg, char *name) { valtyp = REGISTER; return; } - ERROR("Illegal reference to register %s\n", name, EXIT_FAILURE); + ERROR("Illegal reference to register %s\n", name, EXIT_FAILURE) } if (!fndvar(name)) - ERROR("Undeclared variable '%s' encountered\n", name, EXIT_FAILURE); + ERROR("Undeclared variable '%s' encountered\n", name, EXIT_FAILURE) } /* Parse next word as variable or function name * @@ -153,9 +153,9 @@ void setvar(int m, int t) { void addvar(int m, int t) { strcpy(vrname, word); //Save Variable Name if (fndvar(vrname)) - ERROR("Duplicate declaration of variable '%s\n", word,EXIT_FAILURE); + ERROR("Duplicate declaration of variable '%s\n", word,EXIT_FAILURE) if (t == VTVOID) - ERROR("Illegal Variable Type\n", 0, EXIT_FAILURE); + ERROR("Illegal Variable Type\n", 0, EXIT_FAILURE) if (m == MTZP) { setlbl(vrname); sprintf(word, "$%hhX", zpaddr++);