handle parameters in parser_find_local

[xonotic/gmqcc.git] / parser.c

diff --git a/parser.c b/parser.c
index 1eeda391f2dc85c6e0221662f5f0bdac4c5fd844..81dda629df4c25314ca54f9208629b7b7cf6df08 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -90,11 +90,17 @@ ast_value* parser_find_global(parser_t *parser, const char *name)
 ast_value* parser_find_local(parser_t *parser, const char *name, size_t upto)
 {
     size_t i;
+    ast_value *fun;
     for (i = parser->locals_count; i > upto;) {
         --i;
         if (!strcmp(parser->locals[i]->name, name))
             return parser->locals[i];
     }
+    fun = parser->function->vtype;
+    for (i = 0; i < fun->params_count; ++i) {
+        if (!strcmp(fun->params[i]->name, name))
+            return fun->params[i];
+    }
     return NULL;
 }
 
@@ -118,6 +124,7 @@ static ast_value *parser_parse_type(parser_t *parser, int basetype, bool *isfunc
     lex_ctx   ctx = parser_ctx(parser);
     int vtype = basetype;
     int temptype;
+    size_t i;
 
     MEM_VECTOR_INIT(&params, p);
 
@@ -129,54 +136,56 @@ static ast_value *parser_parse_type(parser_t *parser, int basetype, bool *isfunc
             ast_value *param;
             bool dummy;
 
-            if (!parser_next(parser)) {
-                MEM_VECTOR_CLEAR(&params, p);
-                return NULL;
-            }
+            if (!parser_next(parser))
+                goto on_error;
 
             if (parser->tok == ')')
                 break;
 
             temptype = parser_token(parser)->constval.t;
-            if (!parser_next(parser)) {
-                MEM_VECTOR_CLEAR(&params, p);
-                return NULL;
-            }
+            if (!parser_next(parser))
+                goto on_error;
+
             param = parser_parse_type(parser, temptype, &dummy);
             (void)dummy;
 
-            if (!param) {
-                MEM_VECTOR_CLEAR(&params, p);
-                return NULL;
+            if (!param)
+                goto on_error;
+
+            if (parser->tok == TOKEN_IDENT) {
+                /* named parameter */
+                if (!ast_value_set_name(param, parser_tokval(parser)))
+                    goto on_error;
+                if (!parser_next(parser))
+                    goto on_error;
             }
 
             if (!paramlist_t_p_add(&params, param)) {
-                MEM_VECTOR_CLEAR(&params, p);
                 parseerror(parser, "Out of memory while parsing typename");
-                return NULL;
+                goto on_error;
             }
 
             if (parser->tok == ',')
                 continue;
             if (parser->tok == ')')
                 break;
-            MEM_VECTOR_CLEAR(&params, p);
             parseerror(parser, "Unexpected token");
-            return NULL;
-        }
-        if (!parser_next(parser)) {
-            MEM_VECTOR_CLEAR(&params, p);
-            return NULL;
+            goto on_error;
         }
+        if (!parser_next(parser))
+            goto on_error;
     }
 
     var = ast_value_new(ctx, "<unnamed>", vtype);
-    if (!var) {
-        MEM_VECTOR_CLEAR(&params, p);
-        return NULL;
-    }
+    if (!var)
+        goto on_error;
     MEM_VECTOR_MOVE(&params, p, var, params);
     return var;
+on_error:
+    for (i = 0; i < params.p_count; ++i)
+        ast_value_delete(params.p[i]);
+    MEM_VECTOR_CLEAR(&params, p);
+    return NULL;
 }
 
 typedef struct
@@ -556,10 +565,39 @@ static bool parser_body_do(parser_t *parser, ast_block *block)
             return false;
         return true;
     }
+    else if (parser->tok == TOKEN_KEYWORD)
+    {
+        if (!strcmp(parser_tokval(parser), "return"))
+        {
+            ast_expression *exp;
+            ast_return *ret;
+
+            if (!parser_next(parser)) {
+                parseerror(parser, "expected return expression");
+                return false;
+            }
+
+            exp = parser_expression(parser);
+            if (!exp)
+                return false;
+            ret = ast_return_new(exp->expression.node.context, exp);
+            if (!ret) {
+                ast_delete(exp);
+                return false;
+            }
+            if (!ast_block_exprs_add(block, (ast_expression*)ret)) {
+                ast_delete(ret);
+                return false;
+            }
+            return true;
+        }
+        parseerror(parser, "Unexpected keyword");
+        return false;
+    }
     else if (parser->tok == '{')
     {
         /* a block */
-        parseerror(parser, "TODO: inner blocks");
+        parseerror(parser, "TODO: inner blocks: %s", parser_tokval(parser));
         return false;
     }
     else
@@ -567,8 +605,10 @@ static bool parser_body_do(parser_t *parser, ast_block *block)
         ast_expression *exp = parser_expression(parser);
         if (!exp)
             return false;
-        if (!ast_block_exprs_add(block, exp))
+        if (!ast_block_exprs_add(block, exp)) {
+            ast_delete(exp);
             return false;
+        }
         return true;
     }
 }