Skip to content

Fix incorrect and nonstandard use of error() #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nmlgc wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix incorrect and nonstandard use of error() #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions midicomp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ if (dbg) fprintf(stderr, "Compiling %s to %s\n", infile, outfile);
initfuncs();
Mf_getc = filegetc;
mfread();
if (ferror(F)) error ("Output file error");
if (ferror(F)) prs_error ("Output file error");
fclose(F);
}
}
Expand Down Expand Up @@ -1048,7 +1048,7 @@ static int mywritetrack() {
prs_error("Unexpected MTrk");
case EOF:
err_cont = 0;
error("Unexpected EOF");
prs_error("Unexpected EOF");
return -1;
case TRKEND:
err_cont = 0;
Expand Down Expand Up @@ -1116,7 +1116,7 @@ static int mywritetrack() {
cc = getbyte("clocks per click");
bb = getbyte("32nd notes per 24 clocks");
for(i = 0, k = 1 ; k < denom; i++, k <<= 1);
if (k != denom) error("Illegal TimeSig");
if (k != denom) prs_error("Illegal TimeSig");
data[0] = nn;
data[1] = i;
data[2] = cc;
Expand All @@ -1135,7 +1135,7 @@ static int mywritetrack() {
case KEYSIG:
data[0] = i = getint("Keysig");
if (i < -7 || i > 7)
error("Key Sig must be between -7 and 7");
prs_error("Key Sig must be between -7 and 7");
if ((c=yylex()) != MINOR && c != MAJOR)
syntax();
data[1] = (c == MINOR);
Expand Down Expand Up @@ -1192,7 +1192,7 @@ getbyte(char *mess) {
getint(mess);
if (yyval < 0 || yyval > 127) {
sprintf(ermesg, "Wrong value (%ld) for %s", yyval, mess);
error(ermesg);
prs_error(ermesg);
yyval = 0;
}
return yyval;
Expand All @@ -1203,7 +1203,7 @@ getint(char *mess) {
char ermesg[100];
if (yylex() != INT) {
sprintf(ermesg, "Integer expected for %s", mess);
error(ermesg);
prs_error(ermesg);
yyval = 0;
}
return yyval;
Expand All @@ -1212,7 +1212,7 @@ getint(char *mess) {
static void checkchan() {

if (yylex() != CH || yylex() != INT) syntax();
if (yyval < 1 || yyval > 16) error("Chan must be between 1 and 16");
if (yyval < 1 || yyval > 16) prs_error("Chan must be between 1 and 16");
chan = yyval-1;
}

Expand All @@ -1238,23 +1238,23 @@ static void checknote() {
yyval += 12 * atoi(p);
}
if (yyval < 0 || yyval > 127)
error("Note must be between 0 and 127");
prs_error("Note must be between 0 and 127");
data[0] = yyval;
}

static void checkval() {

if (yylex() != VAL || yylex() != INT) syntax();
if (yyval < 0 || yyval > 127)
error("Value must be between 0 and 127");
prs_error("Value must be between 0 and 127");
data[1] = yyval;
}

static void splitval() {

if (yylex() != VAL || yylex() != INT) syntax();
if (yyval < 0 || yyval > 16383)
error("Value must be between 0 and 16383");
prs_error("Value must be between 0 and 16383");
data[0] = yyval % 128;
data[1] = yyval / 128;
}
Expand All @@ -1263,7 +1263,7 @@ static void get16val() {

if (yylex() != VAL || yylex() != INT) syntax();
if (yyval < 0 || yyval > 65535)
error("Value must be between 0 and 65535");
prs_error("Value must be between 0 and 65535");
data[0] = (yyval >> 8) & 0xff;
data[1] = yyval & 0xff;
}
Expand All @@ -1273,15 +1273,15 @@ static void checkcon() {
if (yylex() != CON || yylex() != INT)
syntax();
if (yyval < 0 || yyval > 127)
error("Controller must be between 0 and 127");
prs_error("Controller must be between 0 and 127");
data[0] = yyval;
}

static void checkprog() {

if (yylex() != PROG || yylex() != INT) syntax();
if (yyval < 0 || yyval > 127)
error("Program number must be between 0 and 127");
prs_error("Program number must be between 0 and 127");
data[0] = yyval;
}

Expand Down Expand Up @@ -1309,7 +1309,7 @@ static void gethex() {
buffer = realloc(buffer, bufsiz);
else
buffer = malloc (bufsiz);
if (! buffer) error("Out of memory");
if (! buffer) prs_error("Out of memory");
}
while(i < yyleng - 1) {
c = yytext[i++];
Expand Down Expand Up @@ -1341,7 +1341,7 @@ static void gethex() {
buffer = realloc(buffer, bufsiz);
else
buffer = malloc(bufsiz);
if (! buffer) error ("Out of memory");
if (! buffer) prs_error ("Out of memory");
}
buffer[buflen++] = yyval;
c = yylex();
Expand Down
1 change: 0 additions & 1 deletion midicomp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,6 @@ void translate();
void initfuncs();
void mfread();
void mferror();
void error();

void mymseq();
void mymeot();
Expand Down
4 changes: 2 additions & 2 deletions t2mflex.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,13 +823,13 @@ yymore();
YY_BREAK
case 46:
# line 83 "t2mf.fl"
{ error ("unterminated string");
{ prs_error ("unterminated string");
lineno++; eol_seen++; BEGIN(0); return EOL;
}
YY_BREAK
case YY_STATE_EOF(QUOTE):
# line 86 "t2mf.fl"
error ("EOF in string"); return EOF;
prs_error ("EOF in string"); return EOF;
YY_BREAK
case 48:
# line 88 "t2mf.fl"
Expand Down