/* lex_do kills the previous token */
parser->tok = lex_do(parser->lex);
if (parser->tok == TOKEN_EOF)
- return false;
+ return true;
if (parser->tok >= TOKEN_ERROR) {
parseerror(parser, "lex error");
return false;
static bool parser_variable(parser_t *parser, ast_block *localblock)
{
bool isfunc = false;
- ast_function *func = NULL;
lex_ctx ctx;
ast_value *var;
varentry_t varent;
ast_expression *olddecl;
+ ast_value *typevar;
+
bool hadproto;
bool isparam;
int basetype = parser_token(parser)->constval.t;
+ if (!parser_next(parser)) {
+ parseerror(parser, "expected variable definition");
+ return false;
+ }
+
+ typevar = parser_parse_type(parser, basetype, &isfunc);
+ if (!typevar)
+ return false;
+
while (true)
{
hadproto = false;
-
- if (!parser_next(parser)) { /* skip basetype or comma */
- parseerror(parser, "expected variable declaration");
- return false;
- }
-
olddecl = NULL;
- isfunc = false;
- func = NULL;
isparam = false;
+
ctx = parser_ctx(parser);
- var = parser_parse_type(parser, basetype, &isfunc);
+ var = ast_value_copy(typevar);
- if (!var)
+ if (!var) {
+ ast_delete(typevar);
+ parseerror(parser, "failed to create variable");
return false;
+ }
if (parser->tok != TOKEN_IDENT) {
- parseerror(parser, "expected variable name\n");
+ parseerror(parser, "expected variable name");
+ ast_value_delete(typevar);
+ ast_value_delete(var);
return false;
}
if (!isfunc) {
if (!localblock && (olddecl = parser_find_global(parser, parser_tokval(parser)))) {
+ ast_value_delete(typevar);
ast_value_delete(var);
parseerror(parser, "global `%s` already declared here: %s:%i",
parser_tokval(parser), ast_ctx(olddecl).file, (int)ast_ctx(olddecl).line);
if (olddecl)
{
if (!isparam) {
+ ast_value_delete(typevar);
ast_value_delete(var);
parseerror(parser, "local `%s` already declared here: %s:%i",
parser_tokval(parser), ast_ctx(olddecl).file, (int)ast_ctx(olddecl).line);
if (parsewarning(parser, WARN_LOCAL_SHADOWS,
"local `%s` is shadowing a parameter", parser_tokval(parser)))
{
+ ast_value_delete(typevar);
ast_value_delete(var);
parseerror(parser, "local `%s` already declared here: %s:%i",
parser_tokval(parser), ast_ctx(olddecl).file, (int)ast_ctx(olddecl).line);
parsewarning(parser, WARN_LOCAL_SHADOWS,
"a parameter is shadowing local `%s`", parser_tokval(parser)))
{
+ ast_value_delete(typevar);
+ ast_value_delete(var);
return false;
}
else if (!isparam)
{
parseerror(parser, "local `%s` already declared here: %s:%i",
parser_tokval(parser), ast_ctx(olddecl).file, (int)ast_ctx(olddecl).line);
+ ast_value_delete(typevar);
+ ast_value_delete(var);
return false;
}
goto nextvar;
if (!ast_value_set_name(var, parser_tokval(parser))) {
parseerror(parser, "failed to set variable name\n");
+ ast_value_delete(typevar);
ast_value_delete(var);
return false;
}
* as return type
*/
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(var);
if (fval) ast_value_delete(fval);
- if (func) ast_function_delete(func);
return false;
}
parseerror(parser, "conflicting types for `%s`, previous declaration was here: %s:%i",
proto->name,
ast_ctx(proto).file, ast_ctx(proto).line);
- ast_function_delete(func);
ast_value_delete(fval);
return false;
}
ast_ctx(proto) = ast_ctx(fval);
/* now ditch the rest of the new data */
- ast_function_delete(func);
ast_value_delete(fval);
fval = proto;
- func = proto->constval.vfunc;
hadproto = true;
}
- else
- {
- if (!parser_t_functions_add(parser, func)) {
- ast_function_delete(func);
- ast_value_delete(fval);
- return false;
- }
- }
var = fval;
}
nextvar:
if (!parser_next(parser)) {
+ ast_value_delete(typevar);
ast_value_delete(var);
return false;
}
if (parser->tok == ';') {
+ ast_value_delete(typevar);
if (!parser_next(parser))
- return parser->tok == TOKEN_EOF;
+ return false;
return true;
}
if (parser->tok == ',') {
/* another var */
+ if (!parser_next(parser)) {
+ ast_delete(typevar);
+ return false;
+ }
continue;
}
if (parser->tok != '=') {
+ ast_value_delete(typevar);
parseerror(parser, "expected '=' or ';'");
return false;
}
- if (!parser_next(parser))
+ if (!parser_next(parser)) {
+ ast_value_delete(typevar);
return false;
+ }
if (parser->tok == '#') {
+ ast_function *func;
+
if (localblock) {
parseerror(parser, "cannot declare builtins within functions");
+ ast_value_delete(typevar);
return false;
}
- if (!isfunc || !func) {
+ if (!isfunc) {
parseerror(parser, "unexpected builtin number, '%s' is not a function", var->name);
+ ast_value_delete(typevar);
return false;
}
if (!parser_next(parser)) {
parseerror(parser, "expected builtin number");
+ ast_value_delete(typevar);
return false;
}
if (parser->tok != TOKEN_INTCONST) {
parseerror(parser, "builtin number must be an integer constant");
+ ast_value_delete(typevar);
return false;
}
if (parser_token(parser)->constval.i <= 0) {
parseerror(parser, "builtin number must be positive integer greater than zero");
+ ast_value_delete(typevar);
+ return false;
+ }
+
+ func = ast_function_new(ast_ctx(var), var->name, var);
+ if (!func) {
+ parseerror(parser, "failed to allocate function for `%s`", var->name);
+ ast_value_delete(typevar);
+ return false;
+ }
+ if (!parser_t_functions_add(parser, func)) {
+ parseerror(parser, "failed to allocate slot for function `%s`", var->name);
+ ast_function_delete(func);
+ var->constval.vfunc = NULL;
+ ast_value_delete(typevar);
return false;
}
func->builtin = -parser_token(parser)->constval.i;
- if (!parser_next(parser))
+ if (!parser_next(parser)) {
+ ast_value_delete(typevar);
return false;
+ }
} else if (parser->tok == '{' || parser->tok == '[') {
/* function body */
+ ast_function *func;
ast_function *old;
ast_block *block;
size_t parami;
if (localblock) {
parseerror(parser, "cannot declare functions within functions");
+ ast_value_delete(typevar);
return false;
}
if (!fld_think || !fld_nextthink || !fld_frame) {
parseerror(parser, "cannot use [frame,think] notation without the required fields");
parseerror(parser, "please declare the following entityfields: `frame`, `think`, `nextthink`");
+ ast_value_delete(typevar);
return false;
}
gbl_time = parser_find_global(parser, "time");
if (!gbl_time || !gbl_self) {
parseerror(parser, "cannot use [frame,think] notation without the required globals");
parseerror(parser, "please declare the following globals: `time`, `self`");
+ ast_value_delete(typevar);
return false;
}
if (!parser_next(parser)) {
+ ast_value_delete(typevar);
return false;
}
framenum = parser_expression_leave(parser, true);
if (!framenum) {
parseerror(parser, "expected a framenumber constant in[frame,think] notation");
+ ast_value_delete(typevar);
return false;
}
if (!ast_istype(framenum, ast_value) || !( (ast_value*)framenum )->isconst) {
ast_unref(framenum);
parseerror(parser, "expected comma after frame number in [frame,think] notation");
parseerror(parser, "Got a %i\n", parser->tok);
+ ast_value_delete(typevar);
return false;
}
if (!parser_next(parser)) {
ast_unref(framenum);
+ ast_value_delete(typevar);
return false;
}
if (!thinkfunc || !ast_type_adopt(thinkfunc, functype)) {
ast_unref(framenum);
parseerror(parser, "failed to create implicit prototype for `%s`", parser_tokval(parser));
+ ast_value_delete(typevar);
return false;
}
if (!parser_next(parser)) {
ast_unref(framenum);
+ ast_value_delete(typevar);
return false;
}
varent.var = (ast_expression*)thinkfunc;
varent.name = util_strdup(thinkfunc->name);
- if (thinkfunc->expression.vtype == TYPE_FUNCTION)
- {
- ast_function *func;
-
- func = ast_function_new(parser_ctx(parser), thinkfunc->name, thinkfunc);
- if (!func) {
- ast_delete(thinkfunc);
- ast_unref(framenum);
- parseerror(parser, "failed to create function for implicit prototype for `%s`",
- thinkfunc->name);
- return false;
- }
- (void)!parser_t_functions_add(parser, func);
- (void)!parser_t_globals_add(parser, varent);
- }
- else
- (void)!parser_t_globals_add(parser, varent);
+ (void)!parser_t_globals_add(parser, varent);
nextthink = (ast_expression*)thinkfunc;
} else {
if (!nextthink) {
ast_unref(framenum);
parseerror(parser, "expected a think-function in [frame,think] notation");
+ ast_value_delete(typevar);
return false;
}
}
- if (!ast_istype(nextthink, ast_value) || !( (ast_value*)nextthink )->isconst) {
+ if (!ast_istype(nextthink, ast_value)) {
ast_unref(nextthink);
ast_unref(framenum);
parseerror(parser, "think-function in [frame,think] notation must be a constant");
parseerror(parser, "expected closing `]` for [frame,think] notation");
ast_unref(nextthink);
ast_unref(framenum);
+ ast_value_delete(typevar);
return false;
}
if (!parser_next(parser)) {
ast_unref(nextthink);
ast_unref(framenum);
+ ast_value_delete(typevar);
return false;
}
parseerror(parser, "a function body has to be declared after a [frame,think] declaration");
ast_unref(nextthink);
ast_unref(framenum);
+ ast_value_delete(typevar);
return false;
}
block = ast_block_new(parser_ctx(parser));
if (!block) {
parseerror(parser, "failed to allocate block");
+ ast_value_delete(typevar);
return false;
}
{
parseerror(parser, "failed to generate code for [frame,think]");
ast_block_delete(block);
+ ast_value_delete(typevar);
return false;
}
}
if (!create_vector_members(parser, param, &vx, &vy, &vz)) {
ast_block_delete(block);
+ ast_value_delete(typevar);
return false;
}
parser_pop_local(parser);
parser_pop_local(parser);
ast_block_delete(block);
+ ast_value_delete(typevar);
return false;
}
}
+ func = ast_function_new(ast_ctx(var), var->name, var);
+ if (!func) {
+ parseerror(parser, "failed to allocate function for `%s`", var->name);
+ ast_block_delete(block);
+ parser->function = old;
+ ast_value_delete(typevar);
+ return false;
+ }
+ if (!parser_t_functions_add(parser, func)) {
+ parseerror(parser, "failed to allocate slot for function `%s`", var->name);
+ ast_function_delete(func);
+ var->constval.vfunc = NULL;
+ ast_value_delete(typevar);
+ ast_block_delete(block);
+ parser->function = old;
+ return false;
+ }
+
parser->function = func;
if (!parser_parse_block_into(parser, block, true)) {
ast_block_delete(block);
parser->function = old;
+ ast_value_delete(typevar);
return false;
}
parser->function = old;
- if (!block)
+ if (!block) {
+ ast_value_delete(typevar);
return false;
+ }
if (!ast_function_blocks_add(func, block)) {
ast_block_delete(block);
+ ast_value_delete(typevar);
return false;
}
return parser_next(parser) || parser->tok == TOKEN_EOF;
else if (opts_standard == COMPILER_QCC)
parseerror(parser, "missing semicolon after function body (mandatory with -std=qcc)");
+ ast_value_delete(typevar);
return true;
} else {
ast_expression *cexp;
else
{
var->isconst = true;
- memcpy(&var->constval, &cval->constval, sizeof(var->constval));
- memset(&cval->constval, 0, sizeof(cval->constval));
+ if (cval->expression.vtype == TYPE_STRING)
+ var->constval.vstring = parser_strdup(cval->constval.vstring);
+ else
+ memcpy(&var->constval, &cval->constval, sizeof(var->constval));
ast_unref(cval);
}
}
if (parser->tok != ';') {
parseerror(parser, "missing semicolon");
+ ast_value_delete(typevar);
return false;
}
(void)parser_next(parser);
+ ast_value_delete(typevar);
return true;
}
}
/* parse into the declaration */
if (!parser_next(parser)) {
- parseerror(parser, "expected field def");
+ parseerror(parser, "expected field definition");
return false;
}
if (parser->tok == TOKEN_EOF)
parseerror(parser, "unexpected eof");
else if (!parser->errors)
- parseerror(parser, "parse error\n");
+ parseerror(parser, "parse error");
lex_close(parser->lex);
parser->lex = NULL;
return false;
}
}
+ } else {
+ parseerror(parser, "parse error");
+ lex_close(parser->lex);
+ parser->lex = NULL;
+ return false;
}
lex_close(parser->lex);
projects / xonotic / gmqcc.git / blobdiff