I guess this needs to throw warnings instead of errors, or else NAM and some other mods with problems will break.

git-svn-id: https://svn.eduke32.com/eduke32@255 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-08-04 00:57:27 +00:00
parent f467ebaf3e
commit 268521021f

View file

@ -109,23 +109,23 @@ enum errors {
}; };
enum labeltypes { enum labeltypes {
LABEL_ANY = -1, LABEL_ANY = -1,
LABEL_DEFINE = 1, LABEL_DEFINE = 1,
LABEL_STATE = 2, LABEL_STATE = 2,
LABEL_ACTOR = 4, LABEL_ACTOR = 4,
LABEL_ACTION = 8, LABEL_ACTION = 8,
LABEL_AI = 16, LABEL_AI = 16,
LABEL_MOVE = 32, LABEL_MOVE = 32,
}; };
static char *labeltypenames[] = { static char *labeltypenames[] = {
"define", "define",
"state", "state",
"actor", "actor",
"action", "action",
"ai", "ai",
"move" "move"
}; };
static char *translatelabeltype(long type) static char *translatelabeltype(long type)
{ {
@ -2251,8 +2251,9 @@ char parsecommand(void)
if((transnum(LABEL_MOVE|LABEL_DEFINE) == 0) && (*(scriptptr-1) != 0) && (*(scriptptr-1) != 1)) if((transnum(LABEL_MOVE|LABEL_DEFINE) == 0) && (*(scriptptr-1) != 0) && (*(scriptptr-1) != 1))
{ {
error++; ReportError(-1);
ReportError(ERROR_SYNTAXERROR); *(scriptptr-1) = 0;
initprintf("%s:%ld: warning: expected a move, found a constant.\n",compilefile,line_number);
} }
j = 0; j = 0;
@ -2484,8 +2485,9 @@ char parsecommand(void)
{ {
if((transnum(LABEL_MOVE|LABEL_DEFINE) == 0) && (*(scriptptr-1) != 0) && (*(scriptptr-1) != 1)) if((transnum(LABEL_MOVE|LABEL_DEFINE) == 0) && (*(scriptptr-1) != 0) && (*(scriptptr-1) != 1))
{ {
error++; ReportError(-1);
ReportError(ERROR_SYNTAXERROR); *(scriptptr-1) = 0;
initprintf("%s:%ld: warning: expected a move, found a constant.\n",compilefile,line_number);
} }
k = 0; k = 0;
while(keyword() == -1) while(keyword() == -1)
@ -2609,8 +2611,9 @@ char parsecommand(void)
case 2: case 2:
if((transnum(LABEL_MOVE|LABEL_DEFINE) == 0) && (*(scriptptr-1) != 0) && (*(scriptptr-1) != 1)) if((transnum(LABEL_MOVE|LABEL_DEFINE) == 0) && (*(scriptptr-1) != 0) && (*(scriptptr-1) != 1))
{ {
error++; ReportError(-1);
ReportError(ERROR_SYNTAXERROR); *(scriptptr-1) = 0;
initprintf("%s:%ld: warning: expected a move, found a constant.\n",compilefile,line_number);
} }
break; break;
} }
@ -2754,8 +2757,9 @@ char parsecommand(void)
case 2: case 2:
if((transnum(LABEL_MOVE|LABEL_DEFINE) == 0) && (*(scriptptr-1) != 0) && (*(scriptptr-1) != 1)) if((transnum(LABEL_MOVE|LABEL_DEFINE) == 0) && (*(scriptptr-1) != 0) && (*(scriptptr-1) != 1))
{ {
error++; ReportError(-1);
ReportError(ERROR_SYNTAXERROR); *(scriptptr-1) = 0;
initprintf("%s:%ld: warning: expected a move, found a constant.\n",compilefile,line_number);
} }
break; break;
} }
@ -4186,8 +4190,9 @@ repeatcase:
case CON_IFMOVE: case CON_IFMOVE:
if((transnum(LABEL_MOVE|LABEL_DEFINE) == 0) && (*(scriptptr-1) != 0) && (*(scriptptr-1) != 1)) if((transnum(LABEL_MOVE|LABEL_DEFINE) == 0) && (*(scriptptr-1) != 0) && (*(scriptptr-1) != 1))
{ {
error++; ReportError(-1);
ReportError(ERROR_SYNTAXERROR); *(scriptptr-1) = 0;
initprintf("%s:%ld: warning: expected a move, found a constant.\n",compilefile,line_number);
} }
break; break;
case CON_IFPINVENTORY: case CON_IFPINVENTORY: