X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=parser.c;h=4874f49deae08885c900e29d8019b69253e64322;hb=8fcc528ffa7e17424ae63836f38f626f213b9c1f;hp=fa910692443b770651e9531071f1517fd463e887;hpb=78d04a8352f3eb60e3a2a97fe5bf881366cc2f79;p=xonotic%2Fgmqcc.git diff --git a/parser.c b/parser.c index fa91069..4874f49 100644 --- a/parser.c +++ b/parser.c @@ -46,7 +46,8 @@ MEM_VEC_FUNCTIONS(parser_t, ast_function*, functions) static void parser_pop_local(parser_t *parser); static bool parser_variable(parser_t *parser, ast_block *localblock); -static ast_block* parser_parse_block(parser_t *parser); +static ast_block* parser_parse_block(parser_t *parser, bool warnreturn); +static bool parser_parse_block_into(parser_t *parser, ast_block *block, bool warnreturn); static ast_expression* parser_parse_statement_or_block(parser_t *parser); static ast_expression* parser_expression_leave(parser_t *parser, bool stopatcomma); static ast_expression* parser_expression(parser_t *parser, bool stopatcomma); @@ -127,8 +128,12 @@ bool parser_next(parser_t *parser) { /* lex_do kills the previous token */ parser->tok = lex_do(parser->lex); - if (parser->tok == TOKEN_EOF || parser->tok >= TOKEN_ERROR) + if (parser->tok == TOKEN_EOF) + return true; + if (parser->tok >= TOKEN_ERROR) { + parseerror(parser, "lex error"); return false; + } return true; } @@ -169,7 +174,7 @@ ast_value* parser_const_float_0(parser_t *parser) return parser->imm_float_zero; } -char *parser_strdup(const char *str) +static char *parser_strdup(const char *str) { if (str && !*str) { /* actually dup empty strings */ @@ -972,10 +977,12 @@ static bool parser_close_paren(parser_t *parser, shunt *sy, bool functions_only) parseerror(parser, "unmatched closing paren"); return false; } + /* this would for bit a + (x) because there are no operators inside (x) if (sy->ops[sy->ops_count-1].paren == 1) { parseerror(parser, "empty parenthesis expression"); return false; } + */ while (sy->ops_count) { if (sy->ops[sy->ops_count-1].paren == 'f') { if (!parser_close_call(parser, sy)) @@ -1194,8 +1201,11 @@ static ast_expression* parser_expression_leave(parser_t *parser, bool stopatcomm op = &operators[o]; /* when declaring variables, a comma starts a new variable */ - if (op->id == opid1(',') && !parens && stopatcomma) + if (op->id == opid1(',') && !parens && stopatcomma) { + /* fixup the token */ + parser->tok = ','; break; + } if (sy.ops_count && !sy.ops[sy.ops_count-1].paren) olast = &operators[sy.ops[sy.ops_count-1].etype-1]; @@ -1232,7 +1242,7 @@ static ast_expression* parser_expression_leave(parser_t *parser, bool stopatcomm if (op->id == opid1('(')) { if (wantop) { - DEBUGSHUNTDO(printf("push (\n")); + DEBUGSHUNTDO(printf("push [op] (\n")); ++parens; /* we expected an operator, this is the function-call operator */ if (!shunt_ops_add(&sy, syparen(parser_ctx(parser), 'f', sy.out_count-1))) { @@ -1245,7 +1255,7 @@ static ast_expression* parser_expression_leave(parser_t *parser, bool stopatcomm parseerror(parser, "out of memory"); goto onerr; } - DEBUGSHUNTDO(printf("push (\n")); + DEBUGSHUNTDO(printf("push [nop] (\n")); } wantop = false; } else { @@ -1258,7 +1268,7 @@ static ast_expression* parser_expression_leave(parser_t *parser, bool stopatcomm if (!parser_next(parser)) { goto onerr; } - if (parser->tok == ';') { + if (parser->tok == ';' || parser->tok == ']') { break; } } @@ -1682,7 +1692,7 @@ static bool parser_parse_statement(parser_t *parser, ast_block *block, ast_expre else if (parser->tok == '{') { ast_block *inner; - inner = parser_parse_block(parser); + inner = parser_parse_block(parser, false); if (!inner) return false; *out = (ast_expression*)inner; @@ -1704,10 +1714,9 @@ static void parser_pop_local(parser_t *parser) mem_d(parser->locals[parser->locals_count].name); } -static ast_block* parser_parse_block(parser_t *parser) +static bool parser_parse_block_into(parser_t *parser, ast_block *block, bool warnreturn) { size_t oldblocklocal; - ast_block *block = NULL; oldblocklocal = parser->blocklocal; parser->blocklocal = parser->locals_count; @@ -1717,8 +1726,6 @@ static ast_block* parser_parse_block(parser_t *parser) goto cleanup; } - block = ast_block_new(parser_ctx(parser)); - while (parser->tok != TOKEN_EOF && parser->tok < TOKEN_ERROR) { ast_expression *expr; @@ -1727,7 +1734,6 @@ static ast_block* parser_parse_block(parser_t *parser) if (!parser_parse_statement(parser, block, &expr)) { parseerror(parser, "parse error"); - ast_block_delete(block); block = NULL; goto cleanup; } @@ -1735,16 +1741,25 @@ static ast_block* parser_parse_block(parser_t *parser) continue; if (!ast_block_exprs_add(block, expr)) { ast_delete(expr); - ast_block_delete(block); block = NULL; goto cleanup; } } if (parser->tok != '}') { - ast_block_delete(block); block = NULL; } else { + if (warnreturn && parser->function->vtype->expression.next->expression.vtype != TYPE_VOID) + { + if (!block->exprs_count || + !ast_istype(block->exprs[block->exprs_count-1], ast_return)) + { + if (parsewarning(parser, WARN_MISSING_RETURN_VALUES, "control reaches end of non-void function")) { + block = NULL; + goto cleanup; + } + } + } (void)parser_next(parser); } @@ -1752,7 +1767,19 @@ cleanup: while (parser->locals_count > parser->blocklocal) parser_pop_local(parser); parser->blocklocal = oldblocklocal; - /* unroll the local vector */ + return !!block; +} + +static ast_block* parser_parse_block(parser_t *parser, bool warnreturn) +{ + ast_block *block; + block = ast_block_new(parser_ctx(parser)); + if (!block) + return NULL; + if (!parser_parse_block_into(parser, block, warnreturn)) { + ast_block_delete(block); + return NULL; + } return block; } @@ -1760,52 +1787,122 @@ static ast_expression* parser_parse_statement_or_block(parser_t *parser) { ast_expression *expr = NULL; if (parser->tok == '{') - return (ast_expression*)parser_parse_block(parser); + return (ast_expression*)parser_parse_block(parser, false); if (!parser_parse_statement(parser, NULL, &expr)) return NULL; return expr; } +static bool create_vector_members(parser_t *parser, ast_value *var, + varentry_t *vx, varentry_t *vy, varentry_t *vz) +{ + size_t len = strlen(var->name); + vx->var = (ast_expression*)ast_member_new(ast_ctx(var), (ast_expression*)var, 0); + if (!vx->var) { + parseerror(parser, "failed to create vector members (out of memory)"); + return false; + } + + vy->var = (ast_expression*)ast_member_new(ast_ctx(var), (ast_expression*)var, 1); + if (!vy->var) { + ast_delete(vx->var); + parseerror(parser, "failed to create vector members (out of memory)"); + return false; + } + + vz->var = (ast_expression*)ast_member_new(ast_ctx(var), (ast_expression*)var, 2); + if (!vz->var) { + ast_delete(vy->var); + ast_delete(vx->var); + parseerror(parser, "failed to create vector members (out of memory)"); + return false; + } + + if ( !(vx->name = (char*)mem_a(len+3)) ) { + ast_delete(vz->var); + ast_delete(vy->var); + ast_delete(vx->var); + parseerror(parser, "failed to create vector members (out of memory)"); + return false; + } + if ( !(vy->name = (char*)mem_a(len+3)) ) { + mem_d(vx->name); + ast_delete(vz->var); + ast_delete(vy->var); + ast_delete(vx->var); + parseerror(parser, "failed to create vector members (out of memory)"); + return false; + } + if ( !(vz->name = (char*)mem_a(len+3)) ) { + mem_d(vy->name); + mem_d(vx->name); + ast_delete(vz->var); + ast_delete(vy->var); + ast_delete(vx->var); + parseerror(parser, "failed to create vector members (out of memory)"); + return false; + } + + memcpy(vx->name, var->name, len); + memcpy(vy->name, var->name, len); + memcpy(vz->name, var->name, len); + vx->name[len] = vy->name[len] = vz->name[len] = '_'; + vx->name[len+1] = 'x'; + vy->name[len+1] = 'y'; + vz->name[len+1] = 'z'; + vx->name[len+2] = vy->name[len+2] = vz->name[len+2] = 0; + return true; +} + 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); @@ -1819,6 +1916,7 @@ static bool parser_variable(parser_t *parser, ast_block *localblock) 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); @@ -1831,6 +1929,7 @@ static bool parser_variable(parser_t *parser, ast_block *localblock) 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); @@ -1847,12 +1946,16 @@ static bool parser_variable(parser_t *parser, ast_block *localblock) 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; @@ -1863,6 +1966,7 @@ static bool parser_variable(parser_t *parser, ast_block *localblock) 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; } @@ -1900,11 +2004,9 @@ static bool parser_variable(parser_t *parser, ast_block *localblock) * 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; } @@ -1920,29 +2022,20 @@ static bool parser_variable(parser_t *parser, ast_block *localblock) 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; } /* copy over the parameter names */ for (param = 0; param < fval->expression.params_count; ++param) ast_value_set_name(proto->expression.params[param], fval->expression.params[param]->name); + /* copy the new context */ + 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; } @@ -1952,22 +2045,11 @@ static bool parser_variable(parser_t *parser, ast_block *localblock) varent.var = (ast_expression*)var; if (var->expression.vtype == TYPE_VECTOR) { - size_t len = strlen(varent.name); varentry_t vx, vy, vz; - vx.var = (ast_expression*)ast_member_new(var->expression.node.context, (ast_expression*)var, 0); - vy.var = (ast_expression*)ast_member_new(var->expression.node.context, (ast_expression*)var, 1); - vz.var = (ast_expression*)ast_member_new(var->expression.node.context, (ast_expression*)var, 2); - vx.name = (char*)mem_a(len+3); - vy.name = (char*)mem_a(len+3); - vz.name = (char*)mem_a(len+3); - memcpy(vx.name, varent.name, len); - memcpy(vy.name, varent.name, len); - memcpy(vz.name, varent.name, len); - vx.name[len] = vy.name[len] = vz.name[len] = '_'; - vx.name[len+1] = 'x'; - vy.name[len+1] = 'y'; - vz.name[len+1] = 'z'; - vx.name[len+2] = vy.name[len+2] = vz.name[len+2] = 0; + if (!create_vector_members(parser, var, &vx, &vy, &vz)) { + ast_delete(var); + return false; + } if (!localblock) { (void)!parser_t_globals_add(parser, varent); @@ -2012,74 +2094,352 @@ static bool parser_variable(parser_t *parser, ast_block *localblock) 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 (localblock && opts_standard == COMPILER_QCC) { + if (parsewarning(parser, WARN_LOCAL_CONSTANTS, + "initializing expression turns variable `%s` into a constant in this standard", + var->name) ) + { + ast_value_delete(typevar); + return false; + } + } + 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 == '{') { + } + } else if (parser->tok == '{' || parser->tok == '[') { /* function body */ + ast_function *func; + ast_function *old; ast_block *block; - ast_function *old = parser->function; + size_t parami; + + ast_expression *fld_think, *fld_nextthink, *fld_frame; + ast_expression *gbl_time, *gbl_self; + ast_expression *framenum, *nextthink; + bool has_frame_think; + + has_frame_think = false; + old = parser->function; if (localblock) { parseerror(parser, "cannot declare functions within functions"); + ast_value_delete(typevar); + return false; + } + + if (parser->tok == '[') { + /* got a frame definition: [ framenum, nextthink ] + * this translates to: + * self.frame = framenum; + * self.nextthink = time + 0.1; + * self.think = nextthink; + */ + nextthink = NULL; + + fld_think = parser_find_field(parser, "think"); + fld_nextthink = parser_find_field(parser, "nextthink"); + fld_frame = parser_find_field(parser, "frame"); + 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"); + gbl_self = parser_find_global(parser, "self"); + 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, "framenumber in [frame,think] notation must be a constant"); + } + + if (parser->tok != ',') { + 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 (parser->tok == TOKEN_IDENT && !parser_find_var(parser, parser_tokval(parser))) + { + /* qc allows the use of not-yet-declared functions here + * - this automatically creates a prototype */ + varentry_t varent; + ast_value *thinkfunc; + ast_expression *functype = fld_think->expression.next; + + thinkfunc = ast_value_new(parser_ctx(parser), parser_tokval(parser), functype->expression.vtype); + 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); + (void)!parser_t_globals_add(parser, varent); + nextthink = (ast_expression*)thinkfunc; + + } else { + nextthink = parser_expression_leave(parser, true); + 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_unref(nextthink); + ast_unref(framenum); + parseerror(parser, "think-function in [frame,think] notation must be a constant"); + } + + if (parser->tok != ']') { + 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; + } + + if (parser->tok != '{') { + 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; + } + + has_frame_think = true; + } + + block = ast_block_new(parser_ctx(parser)); + if (!block) { + parseerror(parser, "failed to allocate block"); + ast_value_delete(typevar); + return false; + } + + if (has_frame_think) { + lex_ctx ctx; + ast_expression *self_frame; + ast_expression *self_nextthink; + ast_expression *self_think; + ast_expression *time_plus_1; + ast_store *store_frame; + ast_store *store_nextthink; + ast_store *store_think; + + ctx = parser_ctx(parser); + self_frame = (ast_expression*)ast_entfield_new(ctx, gbl_self, fld_frame); + self_nextthink = (ast_expression*)ast_entfield_new(ctx, gbl_self, fld_nextthink); + self_think = (ast_expression*)ast_entfield_new(ctx, gbl_self, fld_think); + + time_plus_1 = (ast_expression*)ast_binary_new(ctx, INSTR_ADD_F, + gbl_time, (ast_expression*)parser_const_float(parser, 0.1)); + + store_frame = ast_store_new(ctx, INSTR_STOREP_F, self_frame, framenum); + store_nextthink = ast_store_new(ctx, INSTR_STOREP_F, self_nextthink, time_plus_1); + store_think = ast_store_new(ctx, INSTR_STOREP_FNC, self_think, nextthink); + + if (!ast_block_exprs_add(block, (ast_expression*)store_frame) || + !ast_block_exprs_add(block, (ast_expression*)store_nextthink) || + !ast_block_exprs_add(block, (ast_expression*)store_think) ) + { + parseerror(parser, "failed to generate code for [frame,think]"); + ast_block_delete(block); + ast_value_delete(typevar); + return false; + } + } + + for (parami = 0; parami < var->expression.params_count; ++parami) { + ast_value *param = var->expression.params[parami]; + varentry_t vx, vy, vz; + + if (param->expression.vtype != TYPE_VECTOR && + (param->expression.vtype != TYPE_FIELD || + param->expression.next->expression.vtype != TYPE_VECTOR)) + { + continue; + } + + if (!create_vector_members(parser, param, &vx, &vy, &vz)) { + ast_block_delete(block); + ast_value_delete(typevar); + return false; + } + + (void)!parser_t_locals_add(parser, vx); + (void)!parser_t_locals_add(parser, vy); + (void)!parser_t_locals_add(parser, vz); + if (!ast_block_collect(block, vx.var) || + !ast_block_collect(block, vy.var) || + !ast_block_collect(block, vz.var) ) + { + parser_pop_local(parser); + 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; - block = parser_parse_block(parser); + 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; } @@ -2087,6 +2447,7 @@ nextvar: 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; @@ -2099,8 +2460,10 @@ nextvar: 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); } } @@ -2112,11 +2475,13 @@ nextvar: if (parser->tok != ';') { parseerror(parser, "missing semicolon"); + ast_value_delete(typevar); return false; } (void)parser_next(parser); + ast_value_delete(typevar); return true; } } @@ -2154,7 +2519,7 @@ static bool parser_do(parser_t *parser) /* parse into the declaration */ if (!parser_next(parser)) { - parseerror(parser, "expected field def"); + parseerror(parser, "expected field definition"); return false; } @@ -2220,7 +2585,7 @@ static bool parser_do(parser_t *parser) ast_delete(fld); return false; } else { - if (parsewarning(parser, WARN_FIELD_REDECLARED, "field %s has already been declared here: %s:%i", + if (parsewarning(parser, WARN_FIELD_REDECLARED, "field `%s` has already been declared here: %s:%i", parser_tokval(parser), ast_ctx(oldex).file, (int)ast_ctx(oldex).line)) { ast_delete(fld); @@ -2239,24 +2604,11 @@ static bool parser_do(parser_t *parser) if (var->expression.vtype == TYPE_VECTOR) { /* create _x, _y and _z fields as well */ - size_t len; varentry_t vx, vy, vz; - - len = strlen(varent.name); - vx.var = (ast_expression*)ast_member_new(ast_ctx(fld), (ast_expression*)fld, 0); - vy.var = (ast_expression*)ast_member_new(ast_ctx(fld), (ast_expression*)fld, 1); - vz.var = (ast_expression*)ast_member_new(ast_ctx(fld), (ast_expression*)fld, 2); - vx.name = (char*)mem_a(len+3); - vy.name = (char*)mem_a(len+3); - vz.name = (char*)mem_a(len+3); - memcpy(vx.name, varent.name, len); - memcpy(vy.name, varent.name, len); - memcpy(vz.name, varent.name, len); - vx.name[len] = vy.name[len] = vz.name[len] = '_'; - vx.name[len+1] = 'x'; - vy.name[len+1] = 'y'; - vz.name[len+1] = 'z'; - vx.name[len+2] = vy.name[len+2] = vz.name[len+2] = 0; + if (!create_vector_members(parser, fld, &vx, &vy, &vz)) { + ast_delete(fld); + return false; + } (void)!parser_t_fields_add(parser, vx); (void)!parser_t_fields_add(parser, vy); (void)!parser_t_fields_add(parser, vz); @@ -2328,12 +2680,17 @@ bool parser_compile(const char *filename) 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);