MEM_VEC_FUNCTIONS(parser_t, varentry_t, locals)
MEM_VEC_FUNCTIONS(parser_t, ast_function*, functions)
-static void parser_pop_local(parser_t *parser);
+static bool GMQCC_WARN 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 bool parser_parse_block_into(parser_t *parser, ast_block *block);
+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);
/* 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;
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 */
int vtype = basetype;
int temptype;
size_t i;
+ bool variadic = false;
MEM_VECTOR_INIT(¶ms, p);
ast_value *param;
ast_value *fld;
bool isfield = false;
- bool dummy;
+ bool isfuncparam = false;
if (!parser_next(parser))
goto on_error;
}
}
+ if (parser->tok == TOKEN_DOTS) {
+ /* variadic args */
+ variadic = true;
+ if (!parser_next(parser))
+ goto on_error;
+ if (parser->tok != ')') {
+ parseerror(parser, "`...` must be the last parameter of a variadic function declaration");
+ goto on_error;
+ }
+ if (opts_standard == COMPILER_QCC) {
+ if (parsewarning(parser, WARN_EXTENSIONS, "variadic functions are not available in this standard"))
+ goto on_error;
+ }
+ break;
+ }
+
temptype = parser_token(parser)->constval.t;
if (!parser_next(parser))
goto on_error;
- param = parser_parse_type(parser, temptype, &dummy);
- (void)dummy;
+ param = parser_parse_type(parser, temptype, &isfuncparam);
if (!param)
goto on_error;
goto on_error;
}
+ /* This comes before the isfield part! */
+ if (isfuncparam) {
+ ast_value *fval = ast_value_new(ast_ctx(param), param->name, TYPE_FUNCTION);
+ if (!fval) {
+ ast_delete(param);
+ goto on_error;
+ }
+ fval->expression.next = (ast_expression*)param;
+ MEM_VECTOR_MOVE(¶m->expression, params, &fval->expression, params);
+ fval->expression.variadic = param->expression.variadic;
+ param = fval;
+ }
+
if (isfield) {
fld = ast_value_new(ctx, param->name, TYPE_FIELD);
fld->expression.next = (ast_expression*)param;
var = ast_value_new(ctx, "<unnamed>", vtype);
if (!var)
goto on_error;
+ var->expression.variadic = variadic;
MEM_VECTOR_MOVE(¶ms, p, &var->expression, params);
return var;
on_error:
parseerror(parser, "could not determine function return type");
return false;
} else {
- if (fun->expression.params_count != paramcount) {
+ if (fun->expression.params_count != paramcount &&
+ !(fun->expression.variadic &&
+ fun->expression.params_count < paramcount))
+ {
ast_value *fval;
+ const char *fewmany = (fun->expression.params_count > paramcount) ? "few" : "many";
+
fval = (ast_istype(fun, ast_value) ? ((ast_value*)fun) : NULL);
if (opts_standard == COMPILER_GMQCC)
{
if (fval)
- parseerror(parser, "too few parameters for call to %s: expected %i, got %i",
+ parseerror(parser, "too %s parameters for call to %s: expected %i, got %i", fewmany,
fval->name, (int)fun->expression.params_count, paramcount);
else
- parseerror(parser, "too few parameters for function call: expected %i, got %i",
+ parseerror(parser, "too %s parameters for function call: expected %i, got %i", fewmany,
(int)fun->expression.params_count, paramcount);
return false;
}
{
if (fval)
return !parsewarning(parser, WARN_TOO_FEW_PARAMETERS,
- "too few parameters for call to %s: expected %i, got %i",
+ "too %s parameters for call to %s: expected %i, got %i", fewmany,
fval->name, (int)fun->expression.params_count, paramcount);
else
return !parsewarning(parser, WARN_TOO_FEW_PARAMETERS,
- "too few parameters for function call: expected %i, got %i",
+ "too %s parameters for function call: expected %i, got %i", fewmany,
(int)fun->expression.params_count, paramcount);
}
}
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))
parseerror(parser, "unexpected ident: %s", parser_tokval(parser));
goto onerr;
}
+ if (ast_istype(var, ast_value))
+ ((ast_value*)var)->uses++;
if (!shunt_out_add(&sy, syexp(parser_ctx(parser), var))) {
parseerror(parser, "out of memory");
goto onerr;
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))) {
parseerror(parser, "out of memory");
goto onerr;
}
- DEBUGSHUNTDO(printf("push (\n"));
+ DEBUGSHUNTDO(printf("push [nop] (\n"));
}
wantop = false;
} else {
ast_loop *aloop;
ast_expression *initexpr, *cond, *increment, *ontrue;
size_t oldblocklocal;
+ bool retval = true;
lex_ctx ctx = parser_ctx(parser);
*out = (ast_expression*)aloop;
while (parser->locals_count > parser->blocklocal)
- parser_pop_local(parser);
+ retval = retval && parser_pop_local(parser);
parser->blocklocal = oldblocklocal;
- return true;
+ return retval;
onerr:
if (initexpr) ast_delete(initexpr);
if (cond) ast_delete(cond);
if (increment) ast_delete(increment);
while (parser->locals_count > parser->blocklocal)
- parser_pop_local(parser);
+ (void)!parser_pop_local(parser);
parser->blocklocal = oldblocklocal;
return false;
}
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;
}
}
-static void parser_pop_local(parser_t *parser)
+static bool GMQCC_WARN parser_pop_local(parser_t *parser)
{
+ varentry_t *ve;
parser->locals_count--;
+
+ ve = &parser->locals[parser->locals_count];
+ if (ast_istype(ve->var, ast_value) && !(((ast_value*)(ve->var))->uses)) {
+ if (parsewarning(parser, WARN_UNUSED_VARIABLE, "unused variable: `%s`", ve->name))
+ return false;
+ }
mem_d(parser->locals[parser->locals_count].name);
+ return true;
}
-static bool parser_parse_block_into(parser_t *parser, ast_block *block)
+static bool parser_parse_block_into(parser_t *parser, ast_block *block, bool warnreturn)
{
size_t oldblocklocal;
+ bool retval = true;
oldblocklocal = parser->blocklocal;
parser->blocklocal = parser->locals_count;
if (parser->tok != '}') {
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);
}
cleanup:
while (parser->locals_count > parser->blocklocal)
- parser_pop_local(parser);
+ retval = retval && parser_pop_local(parser);
parser->blocklocal = oldblocklocal;
return !!block;
}
-static ast_block* parser_parse_block(parser_t *parser)
+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)) {
+ if (!parser_parse_block_into(parser, block, warnreturn)) {
ast_block_delete(block);
return NULL;
}
{
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 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;
+ bool retval = true;
+
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);
+ ast_value_delete(typevar);
if (fval) ast_value_delete(fval);
- if (func) ast_function_delete(func);
return false;
}
fval->expression.next = (ast_expression*)var;
MEM_VECTOR_MOVE(&var->expression, params, &fval->expression, params);
+ fval->expression.variadic = var->expression.variadic;
/* we compare the type late here, but it's easier than
* messing with the parameter-vector etc. earlier
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);
+ ast_value_delete(typevar);
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;
}
varentry_t vx, vy, vz;
if (!create_vector_members(parser, var, &vx, &vy, &vz)) {
ast_delete(var);
+ ast_value_delete(typevar);
return false;
}
!ast_block_collect(localblock, vy.var) ||
!ast_block_collect(localblock, vz.var))
{
- parser_pop_local(parser);
- parser_pop_local(parser);
- parser_pop_local(parser);
- parser_pop_local(parser);
+ (void)!parser_pop_local(parser);
+ (void)!parser_pop_local(parser);
+ (void)!parser_pop_local(parser);
+ (void)!parser_pop_local(parser);
ast_value_delete(var);
+ ast_value_delete(typevar);
return false;
}
}
( localblock && !parser_t_locals_add(parser, varent)) )
{
ast_value_delete(var);
+ ast_value_delete(typevar);
return false;
}
if (localblock && !ast_block_locals_add(localblock, var))
{
- parser_pop_local(parser);
+ (void)!parser_pop_local(parser);
ast_value_delete(var);
+ ast_value_delete(typevar);
return false;
}
}
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 == '{' || parser->tok == '[') {
/* function body */
+ ast_function *func;
ast_function *old;
ast_block *block;
size_t parami;
has_frame_think = false;
old = parser->function;
+ if (var->expression.variadic) {
+ if (parsewarning(parser, WARN_VARIADIC_FUNCTION,
+ "variadic function with implementation will not be able to access additional parameters"))
+ {
+ ast_value_delete(typevar);
+ return false;
+ }
+ }
+
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;
}
!ast_block_collect(block, vy.var) ||
!ast_block_collect(block, vz.var) )
{
- parser_pop_local(parser);
- parser_pop_local(parser);
- parser_pop_local(parser);
+ (void)!parser_pop_local(parser);
+ (void)!parser_pop_local(parser);
+ (void)!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)) {
+ if (!parser_parse_block_into(parser, block, true)) {
ast_block_delete(block);
parser->function = old;
+ ast_value_delete(typevar);
return false;
}
parser->function = old;
+ while (parser->locals_count)
+ retval = retval && parser_pop_local(parser);
- 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;
}
- if (parser->tok == ';')
+ if (parser->tok == ';') {
+ ast_value_delete(typevar);
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)");
- return true;
+ ast_value_delete(typevar);
+ return retval;
} else {
ast_expression *cexp;
ast_value *cval;
cexp = parser_expression_leave(parser, true);
+ if (!cexp) {
+ ast_value_delete(typevar);
+ return false;
+ }
+
cval = (ast_value*)cexp;
if (!ast_istype(cval, ast_value) || !cval->isconst)
parseerror(parser, "cannot initialize a global constant variable with a non-constant expression");
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;
}
}
fval->expression.next = (ast_expression*)var;
MEM_VECTOR_MOVE(&var->expression, params, &fval->expression, params);
+ fval->expression.variadic = var->expression.variadic;
var = fval;
}
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);
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);
return false;
}
- for (i = 0; i < parser->imm_float_count; ++i) {
- if (!ast_global_codegen(parser->imm_float[i], ir)) {
- printf("failed to generate global %s\n", parser->imm_float[i]->name);
- ir_builder_delete(ir);
- return false;
- }
- }
- for (i = 0; i < parser->imm_string_count; ++i) {
- if (!ast_global_codegen(parser->imm_string[i], ir)) {
- printf("failed to generate global %s\n", parser->imm_string[i]->name);
- ir_builder_delete(ir);
- return false;
- }
- }
- for (i = 0; i < parser->imm_vector_count; ++i) {
- if (!ast_global_codegen(parser->imm_vector[i], ir)) {
- printf("failed to generate global %s\n", parser->imm_vector[i]->name);
- ir_builder_delete(ir);
- return false;
- }
- }
for (i = 0; i < parser->fields_count; ++i) {
ast_value *field;
bool isconst;
return false;
}
}
+ for (i = 0; i < parser->imm_float_count; ++i) {
+ if (!ast_global_codegen(parser->imm_float[i], ir)) {
+ printf("failed to generate global %s\n", parser->imm_float[i]->name);
+ ir_builder_delete(ir);
+ return false;
+ }
+ }
+ for (i = 0; i < parser->imm_string_count; ++i) {
+ if (!ast_global_codegen(parser->imm_string[i], ir)) {
+ printf("failed to generate global %s\n", parser->imm_string[i]->name);
+ ir_builder_delete(ir);
+ return false;
+ }
+ }
+ for (i = 0; i < parser->imm_vector_count; ++i) {
+ if (!ast_global_codegen(parser->imm_vector[i], ir)) {
+ printf("failed to generate global %s\n", parser->imm_vector[i]->name);
+ ir_builder_delete(ir);
+ return false;
+ }
+ }
for (i = 0; i < parser->functions_count; ++i) {
if (!ast_function_codegen(parser->functions[i], ir)) {
printf("failed to generate function %s\n", parser->functions[i]->name);
projects / xonotic / gmqcc.git / blobdiff