darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-02-21 02:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Parsing basic macro body, no special tokens yet

Browse source
This commit is contained in:
Wolfgang (Blub) Bumiller 2012-11-16 20:38:44 +01:00
parent 52d7a5d7be
commit c48b9dbf61
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
ftepp.c
View file

@ -91,7 +91,10 @@ pptoken *pptoken_make(ftepp_t *ftepp)
{
pptoken *token = (pptoken*)mem_a(sizeof(pptoken));
token->token = ftepp->token;
token->value = util_strdup(ftepp_tokval(ftepp));
if (token->token == TOKEN_WHITE)
token->value = util_strdup(" ");
else
token->value = util_strdup(ftepp_tokval(ftepp));
memcpy(&token->constval, &ftepp->lex->tok.constval, sizeof(token->constval));
return token;
}
@ -204,6 +207,24 @@ static bool ftepp_define_params(ftepp_t *ftepp, ppmacro *macro)
return true;
}
static bool ftepp_define_body(ftepp_t *ftepp, ppmacro *macro)
{
pptoken *ptok;
while (ftepp->token != TOKEN_EOL && ftepp->token < TOKEN_EOF) {
ptok = pptoken_make(ftepp);
vec_push(macro->output, ptok);
ftepp_next(ftepp);
if (!ftepp_skipspace(ftepp))
return false;
}
if (ftepp->token != TOKEN_EOL) {
ftepp_error(ftepp, "unexpected junk after macro or unexpected end of file");
return false;
}
return true;
}
static bool ftepp_define(ftepp_t *ftepp)
{
ppmacro *macro;
@ -233,10 +254,9 @@ static bool ftepp_define(ftepp_t *ftepp)
if (!ftepp_skipspace(ftepp))
return false;
if (ftepp->token != TOKEN_EOL) {
ftepp_error(ftepp, "stray tokens after macro");
if (!ftepp_define_body(ftepp, macro))
return false;
}
vec_push(ftepp->macros, macro);
return true;
}