darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-02-01 20:30:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix pragma parsing that I broke.

Browse source
This commit is contained in:
Dale Weiler 2013-01-30 05:51:28 +00:00
parent e12d492d67
commit 9f5f2b6d74
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
parser.c
View file

@ -3292,8 +3292,15 @@ static bool parse_eol(parser_t *parser)
return parser->tok == TOKEN_EOL; return parser->tok == TOKEN_EOL;
} }
static bool parse_pragma_do(parser_t *parser)
static bool parse_pragma_do(parser_t *parser) { {
if (!parser_next(parser) ||
parser->tok != TOKEN_IDENT ||
strcmp(parser_tokval(parser), "pragma"))
{
parseerror(parser, "expected `pragma` keyword after `#`, got `%s`", parser_tokval(parser));
return false;
}
if (!parse_skipwhite(parser) || parser->tok != TOKEN_IDENT) { if (!parse_skipwhite(parser) || parser->tok != TOKEN_IDENT) {
parseerror(parser, "expected pragma, got `%s`", parser_tokval(parser)); parseerror(parser, "expected pragma, got `%s`", parser_tokval(parser));
return false; return false;
@ -3304,37 +3311,33 @@ static bool parse_pragma_do(parser_t *parser) {
parseerror(parser, "`noref` pragma requires an argument: 0 or 1"); parseerror(parser, "`noref` pragma requires an argument: 0 or 1");
return false; return false;
} }
parser->noref = !!parser_token(parser)->constval.i; parser->noref = !!parser_token(parser)->constval.i;
if (!parse_eol(parser)) { if (!parse_eol(parser)) {
parseerror(parser, "parse error after `noref` pragma"); parseerror(parser, "parse error after `noref` pragma");
return false; return false;
} }
} else { }
else
{
(void)!parsewarning(parser, WARN_UNKNOWN_PRAGMAS, "ignoring #pragma %s", parser_tokval(parser)); (void)!parsewarning(parser, WARN_UNKNOWN_PRAGMAS, "ignoring #pragma %s", parser_tokval(parser));
return false; return false;
} }
return true; return true;
} }
static bool parse_pragma(parser_t *parser) static bool parse_pragma(parser_t *parser)
{ {
bool rv; bool rv;
parser->lex->flags.preprocessing = true; parser->lex->flags.preprocessing = true;
parser->lex->flags.mergelines = true; parser->lex->flags.mergelines = true;
rv = parse_pragma_do(parser); rv = parse_pragma_do(parser);
if (parser->tok != TOKEN_EOL) { if (parser->tok != TOKEN_EOL) {
parseerror(parser, "junk after pragma"); parseerror(parser, "junk after pragma");
rv = false; rv = false;
} }
parser->lex->flags.preprocessing = false; parser->lex->flags.preprocessing = false;
parser->lex->flags.mergelines = false; parser->lex->flags.mergelines = false;
if (!parser_next(parser)) { if (!parser_next(parser)) {
parseerror(parser, "parse error after pragma"); parseerror(parser, "parse error after pragma");
rv = false; rv = false;