X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=parser.c;h=5bdb7e7cbeacb805b1bb66425f579809a6106a0e;hb=5e4b8846d1838c6c0244646b2a3f81c94a647b13;hp=621f98a353c533fb76e18cca5094aba0d79d6870;hpb=dae13e87dec89cccd7d71fa1dddc431e21df3cdb;p=xonotic%2Fgmqcc.git

diff --git a/parser.c b/parser.c
index 621f98a..5bdb7e7 100644
--- a/parser.c
+++ b/parser.c
@@ -44,15 +44,15 @@ MEM_VEC_FUNCTIONS(parser_t, ast_value*, imm_vector)
 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);
 
-void parseerror(parser_t *parser, const char *fmt, ...)
+static void parseerror(parser_t *parser, const char *fmt, ...)
 {
 	va_list ap;
 
@@ -64,7 +64,7 @@ void parseerror(parser_t *parser, const char *fmt, ...)
 }
 
 /* returns true if it counts as an error */
-bool GMQCC_WARN parsewarning(parser_t *parser, int warntype, const char *fmt, ...)
+static bool GMQCC_WARN parsewarning(parser_t *parser, int warntype, const char *fmt, ...)
 {
 	va_list ap;
 	int lvl = LVL_WARNING;
@@ -84,6 +84,24 @@ bool GMQCC_WARN parsewarning(parser_t *parser, int warntype, const char *fmt, ..
 	return opts_werror;
 }
 
+static bool GMQCC_WARN genwarning(lex_ctx ctx, int warntype, const char *fmt, ...)
+{
+	va_list ap;
+	int lvl = LVL_WARNING;
+
+    if (!OPTS_WARN(warntype))
+        return false;
+
+    if (opts_werror)
+	    lvl = LVL_ERROR;
+
+	va_start(ap, fmt);
+    vprintmsg(lvl, ctx.file, ctx.line, "warning", fmt, ap);
+	va_end(ap);
+
+	return opts_werror;
+}
+
 /**********************************************************************
  * some maths used for constant folding
  */
@@ -129,7 +147,7 @@ bool parser_next(parser_t *parser)
     /* 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;
@@ -174,7 +192,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 */
@@ -306,6 +324,7 @@ static ast_value *parser_parse_type(parser_t *parser, int basetype, bool *isfunc
     int vtype = basetype;
     int temptype;
     size_t i;
+    bool variadic = false;
 
     MEM_VECTOR_INIT(&params, p);
 
@@ -317,7 +336,7 @@ static ast_value *parser_parse_type(parser_t *parser, int basetype, bool *isfunc
             ast_value *param;
             ast_value *fld;
             bool isfield = false;
-            bool dummy;
+            bool isfuncparam = false;
 
             if (!parser_next(parser))
                 goto on_error;
@@ -333,12 +352,27 @@ static ast_value *parser_parse_type(parser_t *parser, int basetype, bool *isfunc
                 }
             }
 
+            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;
@@ -351,6 +385,19 @@ static ast_value *parser_parse_type(parser_t *parser, int basetype, bool *isfunc
                     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(&param->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;
@@ -376,6 +423,7 @@ static ast_value *parser_parse_type(parser_t *parser, int basetype, bool *isfunc
     var = ast_value_new(ctx, "<unnamed>", vtype);
     if (!var)
         goto on_error;
+    var->expression.variadic = variadic;
     MEM_VECTOR_MOVE(&params, p, &var->expression, params);
     return var;
 on_error:
@@ -941,29 +989,42 @@ static bool parser_close_call(parser_t *parser, shunt *sy)
         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",
-                               fval->name, (int)fun->expression.params_count, paramcount);
+                    parseerror(parser, "too %s parameters for call to %s: expected %i, got %i\n"
+                               " -> `%s` has been declared here: %s:%i",
+                               fewmany, fval->name, (int)fun->expression.params_count, (int)paramcount,
+                               fval->name, ast_ctx(fun).file, (int)ast_ctx(fun).line);
                 else
-                    parseerror(parser, "too few parameters for function call: expected %i, got %i",
-                               (int)fun->expression.params_count, paramcount);
+                    parseerror(parser, "too %s parameters for function call: expected %i, got %i\n"
+                               " -> `%s` has been declared here: %s:%i",
+                               fewmany, fval->name, (int)fun->expression.params_count, (int)paramcount,
+                               fval->name, ast_ctx(fun).file, (int)ast_ctx(fun).line);
                 return false;
             }
             else
             {
                 if (fval)
                     return !parsewarning(parser, WARN_TOO_FEW_PARAMETERS,
-                                         "too few parameters for call to %s: expected %i, got %i",
-                                         fval->name, (int)fun->expression.params_count, paramcount);
+                                         "too %s parameters for call to %s: expected %i, got %i\n"
+                                         " -> `%s` has been declared here: %s:%i",
+                                         fewmany, fval->name, (int)fun->expression.params_count, (int)paramcount,
+                                         fval->name, ast_ctx(fun).file, (int)ast_ctx(fun).line);
                 else
                     return !parsewarning(parser, WARN_TOO_FEW_PARAMETERS,
-                                         "too few parameters for function call: expected %i, got %i",
-                                         (int)fun->expression.params_count, paramcount);
+                                         "too %s parameters for function call: expected %i, got %i\n"
+                                         " -> `%s` has been declared here: %s:%i",
+                                         fewmany, fval->name, (int)fun->expression.params_count, (int)paramcount,
+                                         fval->name, ast_ctx(fun).file, (int)ast_ctx(fun).line);
             }
         }
     }
@@ -977,10 +1038,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))
@@ -1071,6 +1134,8 @@ static ast_expression* parser_expression_leave(parser_t *parser, bool stopatcomm
                 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;
@@ -1240,7 +1305,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))) {
@@ -1253,7 +1318,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 {
@@ -1483,6 +1548,7 @@ static bool parser_parse_for(parser_t *parser, ast_block *block, ast_expression
     ast_loop *aloop;
     ast_expression *initexpr, *cond, *increment, *ontrue;
     size_t oldblocklocal;
+    bool   retval = true;
 
     lex_ctx ctx = parser_ctx(parser);
 
@@ -1556,6 +1622,13 @@ static bool parser_parse_for(parser_t *parser, ast_block *block, ast_expression
         increment = parser_expression_leave(parser, false);
         if (!increment)
             goto onerr;
+        if (!ast_istype(increment, ast_store) &&
+            !ast_istype(increment, ast_call) &&
+            !ast_istype(increment, ast_binstore))
+        {
+            if (genwarning(ast_ctx(increment), WARN_EFFECTLESS_STATEMENT, "statement has no effect"))
+                goto onerr;
+        }
     }
 
     /* closing paren */
@@ -1577,15 +1650,15 @@ static bool parser_parse_for(parser_t *parser, ast_block *block, ast_expression
     *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;
 }
@@ -1690,7 +1763,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;
@@ -1702,19 +1775,35 @@ static bool parser_parse_statement(parser_t *parser, ast_block *block, ast_expre
         if (!exp)
             return false;
         *out = exp;
+        if (!ast_istype(exp, ast_store) &&
+            !ast_istype(exp, ast_call) &&
+            !ast_istype(exp, ast_binstore))
+        {
+            if (genwarning(ast_ctx(exp), WARN_EFFECTLESS_STATEMENT, "statement has no effect"))
+                return false;
+        }
         return true;
     }
 }
 
-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;
@@ -1747,23 +1836,34 @@ static bool parser_parse_block_into(parser_t *parser, ast_block *block)
     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;
     }
@@ -1774,7 +1874,7 @@ 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;
@@ -1844,43 +1944,54 @@ static bool create_vector_members(parser_t *parser, ast_value *var,
 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);
@@ -1894,6 +2005,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);
@@ -1906,6 +2018,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);
@@ -1922,12 +2035,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;
@@ -1938,6 +2055,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;
         }
@@ -1975,16 +2093,16 @@ 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);
+                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
@@ -1995,29 +2113,21 @@ 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);
+                    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;
         }
@@ -2030,6 +2140,7 @@ static bool parser_variable(parser_t *parser, ast_block *localblock)
                 varentry_t vx, vy, vz;
                 if (!create_vector_members(parser, var, &vx, &vy, &vz)) {
                     ast_delete(var);
+                    ast_value_delete(typevar);
                     return false;
                 }
 
@@ -2048,11 +2159,12 @@ static bool parser_variable(parser_t *parser, ast_block *localblock)
                         !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;
                     }
                 }
@@ -2063,12 +2175,14 @@ static bool parser_variable(parser_t *parser, ast_block *localblock)
                      ( 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;
                 }
             }
@@ -2076,57 +2190,100 @@ 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 == '{' || parser->tok == '[') {
             /* function body */
+            ast_function *func;
             ast_function *old;
             ast_block *block;
             size_t     parami;
@@ -2139,8 +2296,18 @@ nextvar:
             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;
             }
 
@@ -2151,12 +2318,15 @@ nextvar:
                  * 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");
@@ -2164,16 +2334,19 @@ nextvar:
                 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) {
@@ -2185,22 +2358,54 @@ nextvar:
                     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;
                 }
 
-                nextthink = parser_expression_leave(parser, true);
-                if (!nextthink) {
-                    ast_unref(framenum);
-                    parseerror(parser, "expected a think-function in [frame,think] notation");
-                    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_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");
@@ -2210,12 +2415,14 @@ nextvar:
                     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;
                 }
 
@@ -2223,6 +2430,7 @@ nextvar:
                     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;
                 }
 
@@ -2232,6 +2440,7 @@ nextvar:
             block = ast_block_new(parser_ctx(parser));
             if (!block) {
                 parseerror(parser, "failed to allocate block");
+                ast_value_delete(typevar);
                 return false;
             }
 
@@ -2263,6 +2472,7 @@ nextvar:
                 {
                     parseerror(parser, "failed to generate code for [frame,think]");
                     ast_block_delete(block);
+                    ast_value_delete(typevar);
                     return false;
                 }
             }
@@ -2280,6 +2490,7 @@ nextvar:
 
                 if (!create_vector_members(parser, param, &vx, &vy, &vz)) {
                     ast_block_delete(block);
+                    ast_value_delete(typevar);
                     return false;
                 }
 
@@ -2290,48 +2501,83 @@ nextvar:
                     !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);
             }
         }
@@ -2343,11 +2589,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;
     }
 }
@@ -2385,7 +2633,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;
         }
 
@@ -2424,6 +2672,7 @@ static bool parser_do(parser_t *parser)
                 }
                 fval->expression.next = (ast_expression*)var;
                 MEM_VECTOR_MOVE(&var->expression, params, &fval->expression, params);
+                fval->expression.variadic = var->expression.variadic;
                 var = fval;
             }
 
@@ -2451,7 +2700,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);
@@ -2546,12 +2795,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);
@@ -2598,6 +2852,7 @@ bool parser_finish(const char *output)
 {
     size_t i;
     ir_builder *ir;
+    bool retval = true;
 
     if (!parser->errors)
     {
@@ -2607,27 +2862,6 @@ bool parser_finish(const char *output)
             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;
@@ -2655,14 +2889,41 @@ bool parser_finish(const char *output)
             }
         }
         for (i = 0; i < parser->globals_count; ++i) {
+            ast_value *asvalue;
             if (!ast_istype(parser->globals[i].var, ast_value))
                 continue;
-            if (!ast_global_codegen((ast_value*)(parser->globals[i].var), ir)) {
+            asvalue = (ast_value*)(parser->globals[i].var);
+            if (!asvalue->uses && !asvalue->isconst && asvalue->expression.vtype != TYPE_FUNCTION) {
+                retval = retval && !genwarning(ast_ctx(asvalue), WARN_UNUSED_VARIABLE,
+                                               "unused global: `%s`", asvalue->name);
+            }
+            if (!ast_global_codegen(asvalue, ir)) {
                 printf("failed to generate global %s\n", parser->globals[i].name);
                 ir_builder_delete(ir);
                 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);
@@ -2676,17 +2937,19 @@ bool parser_finish(const char *output)
             }
         }
 
-        if (opts_dump)
-            ir_builder_dump(ir, printf);
+        if (retval) {
+            if (opts_dump)
+                ir_builder_dump(ir, printf);
 
-        if (!ir_builder_generate(ir, output)) {
-            printf("*** failed to generate output file\n");
-            ir_builder_delete(ir);
-            return false;
+            if (!ir_builder_generate(ir, output)) {
+                printf("*** failed to generate output file\n");
+                ir_builder_delete(ir);
+                return false;
+            }
         }
 
         ir_builder_delete(ir);
-        return true;
+        return retval;
     }
 
     printf("*** there were compile errors\n");