darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-01-18 22:31:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Handling definition of builtins

Browse source
This commit is contained in:
Wolfgang Bumiller 2012-07-19 17:39:19 +02:00
parent c44355e224
commit 6a346745aa
2 changed files with 43 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lexer.c
View file

@ -466,6 +466,8 @@ int lex_do(lex_file *lex)
case ',': case ',':
case '#':
return (lex->tok->ttype = ch); return (lex->tok->ttype = ch);
default: default:
break; break;

49
parser.c
View file

@ -125,6 +125,7 @@ bool parser_do(parser_t *parser)
{ {
if (parser->tok == TOKEN_TYPENAME) if (parser->tok == TOKEN_TYPENAME)
{ {
lex_ctx ctx = parser_ctx(parser);
ast_value *var = parser_parse_type(parser); ast_value *var = parser_parse_type(parser);
if (!var) if (!var)
return false; return false;
@ -146,12 +147,12 @@ bool parser_do(parser_t *parser)
return false; return false;
} }
if (!parser_t_globals_add(parser, var)) if (!parser_t_globals_add(parser, var) ||
return false; !parser_next(parser))
{
/* Constant assignment */ ast_value_delete(var);
if (!parser_next(parser))
return false; return false;
}
if (parser->tok == ';') { if (parser->tok == ';') {
if (!parser_next(parser)) if (!parser_next(parser))
@ -167,9 +168,41 @@ bool parser_do(parser_t *parser)
if (!parser_next(parser)) if (!parser_next(parser))
return false; return false;
/* '=' found, assign... */ if (parser->tok == '#') {
parseerror(parser, "TODO, const assignment"); /* builtin function */
return false; ast_function *func;
ast_value *fval;
if (!parser_next(parser)) {
parseerror(parser, "expected builtin number");
return false;
}
fval = ast_value_new(ctx, var->name, TYPE_FUNCTION);
func = ast_function_new(ctx, var->name, fval);
if (!fval || !func) {
if (fval) ast_value_delete(fval);
if (func) ast_function_delete(func);
return false;
}
fval->expression.next = (ast_expression*)var;
MEM_VECTOR_MOVE(var, params, fval, params);
/* replace the variable */
parser->globals[parser->globals_count-1] = fval;
} else {
parseerror(parser, "TODO, const assignment");
}
if (!parser_next(parser))
return false;
if (parser->tok != ';') {
parseerror(parser, "expected semicolon");
return false;
}
return true;
} }
else if (parser->tok == TOKEN_KEYWORD) else if (parser->tok == TOKEN_KEYWORD)
{ {