zdoom/acc
0
0
Fork 0
mirror of https://github.com/ZDoom/acc.git synced 2025-02-14 07:30:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Enforce #library must be the first thing in an ACS file if it's used

Browse source
This commit is contained in:
Randy Heit 2016-01-28 19:38:56 -06:00
parent 5bf0629f2e
commit 76b8552d4d
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
error.c
View file

@ -180,6 +180,7 @@ static struct
{ ERR_NOT_HEXEN, "Cannot save; new features are not compatible with Hexen." }, { ERR_NOT_HEXEN, "Cannot save; new features are not compatible with Hexen." },
{ ERR_SPECIAL_RANGE, "Line specials with values higher than 255 require #nocompact." }, { ERR_SPECIAL_RANGE, "Line specials with values higher than 255 require #nocompact." },
{ ERR_EVENT_NEEDS_3_ARG, "Event scripts must have 3 arguments." }, // [BB] { ERR_EVENT_NEEDS_3_ARG, "Event scripts must have 3 arguments." }, // [BB]
{ ERR_LIBRARY_NOT_FIRST, "#library must come before anything else." },
{ ERR_NONE, NULL } { ERR_NONE, NULL }
}; };

3
error.h
View file

@ -147,7 +147,8 @@ typedef enum
ERR_HEXEN_COMPAT, ERR_HEXEN_COMPAT,
ERR_NOT_HEXEN, ERR_NOT_HEXEN,
ERR_SPECIAL_RANGE, ERR_SPECIAL_RANGE,
ERR_EVENT_NEEDS_3_ARG // [BB] ERR_EVENT_NEEDS_3_ARG, // [BB]
ERR_LIBRARY_NOT_FIRST,
} error_t; } error_t;
// PUBLIC FUNCTION PROTOTYPES ---------------------------------------------- // PUBLIC FUNCTION PROTOTYPES ----------------------------------------------

8
parse.c
View file

@ -408,14 +408,16 @@ static void CountScript(int type)
static void Outside(void) static void Outside(void)
{ {
boolean done; boolean done;
int outertokencount;
done = NO; done = NO;
outertokencount = 0;
while(done == NO) while(done == NO)
{ {
outertokencount++;
switch(tk_Token) switch(tk_Token)
{ {
case TK_EOF: case TK_EOF:
done = YES; done = YES;
break; break;
case TK_SCRIPT: case TK_SCRIPT:
@ -496,6 +498,10 @@ static void Outside(void)
OuterImport(); OuterImport();
break; break;
case TK_LIBRARY: case TK_LIBRARY:
if (outertokencount != 1)
{
ERR_Error(ERR_LIBRARY_NOT_FIRST, YES);
}
TK_NextTokenMustBe(TK_STRING, ERR_STRING_LIT_NOT_FOUND); TK_NextTokenMustBe(TK_STRING, ERR_STRING_LIT_NOT_FOUND);
if(ImportMode == IMPORT_None) if(ImportMode == IMPORT_None)
{ {