cleanup

[m6w6/ext-psi] / src / parser_proc.y

diff --git a/src/parser_proc.y b/src/parser_proc.y
index 06e4be59a4cd9c314d4bd49db3d118a0eed393ff..94cdf58556ec0ffdd86861bca3a88ed8eb075a24 100644 (file)
--- a/src/parser_proc.y
+++ b/src/parser_proc.y
@@ -25,7 +25,7 @@
 %nonassoc NAME.
 %left PLUS MINUS.
 %left SLASH ASTERISK.
-%fallback NAME FREE SET LET RETURN LIB INT UNSIGNED.
+%fallback NAME TEMP FREE SET LET RETURN LIB INT UNSIGNED.
 
 file ::= blocks.
 
@@ -241,6 +241,7 @@ decl_type(type_) ::= UNSIGNED NAME(T). {
        memcpy(type_->name, "unsigned", sizeof("unsigned")-1);
        type_->name[sizeof("unsigned")] = ' ';
        type_->name[T->size + sizeof("unsigned")] = 0;
+       free(T);
 }
 /* we have to support plain int here because we have it in our lexer rules */
 decl_type(type_) ::= INT(T). {
@@ -271,12 +272,8 @@ impl(impl) ::= impl_func(func) LBRACE impl_stmts(stmts) RBRACE. {
 
 %type impl_func {impl_func*}
 %destructor impl_func {free_impl_func($$);}
-impl_func(func) ::= FUNCTION NSNAME(NAME) impl_args(args) COLON impl_type(type). {
-       func = init_impl_func(NAME->text, args, type, 0);
-       free(NAME);
-}
-impl_func(func) ::= FUNCTION AMPERSAND NSNAME(NAME) impl_args(args) COLON impl_type(type). {
-       func = init_impl_func(NAME->text, args, type, 1);
+impl_func(func) ::= FUNCTION reference(r) NSNAME(NAME) impl_args(args) COLON impl_type(type). {
+       func = init_impl_func(NAME->text, args, type, r);
        free(NAME);
 }
 
@@ -290,12 +287,8 @@ impl_def_val(def) ::= impl_def_val_token(T). {
 
 %type impl_var {impl_var*}
 %destructor impl_var {free_impl_var($$);}
-impl_var(var) ::= DOLLAR NAME(T). {
-       var = init_impl_var(T->text, 0);
-       free(T);
-}
-impl_var(var) ::= AMPERSAND DOLLAR NAME(T). {
-       var = init_impl_var(T->text, 1);
+impl_var(var) ::= reference(r) DOLLAR NAME(T). {
+       var = init_impl_var(T->text, r);
        free(T);
 }
 
@@ -370,46 +363,45 @@ num_exp(exp) ::= num_exp(exp_) num_exp_op_token(operator_) num_exp(operand_). {
 %type let_stmt {let_stmt*}
 %destructor let_stmt {free_let_stmt($$);}
 let_stmt(let) ::= LET decl_var(var) EOS. {
-       let = init_let_stmt(var, NULL);
+       let = init_let_stmt(var, init_let_val(PSI_LET_NULL, NULL));
 }
-let_stmt(let) ::= LET decl_var(var) EQUALS let_value(val) EOS. {
+let_stmt(let) ::= LET decl_var(var) EQUALS reference(r) let_val(val) EOS. {
+       val->flags.one.is_reference = r ? 1 : 0;
        let = init_let_stmt(var, val);
 }
-let_stmt(let) ::= decl_arg(arg) EQUALS decl_var(var_) EOS. {
-       let = init_let_stmt(arg->var, NULL);
+let_stmt(let) ::= TEMP decl_var(var) EQUALS decl_var(val) EOS. {
+       let = init_let_stmt(var, init_let_val(PSI_LET_TMP, val));
 }
 
-%type let_value {let_value*}
-%destructor let_value {free_let_value($$);}
-let_value(val) ::= reference(r) CALLOC(F) LPAREN let_calloc(alloc) RPAREN. {
-       val = init_let_value(init_let_func(F->type, F->text, alloc), NULL, r);
-       free(F);
+%type let_val {let_val*}
+%destructor let_val {free_let_val($$);}
+let_val(val) ::= NULL. {
+       val = init_let_val(PSI_LET_NULL, NULL);
+}
+let_val(val) ::= num_exp(exp). {
+       val = init_let_val(PSI_LET_NUMEXP, exp);
+}
+let_val(val) ::= CALLOC LPAREN let_calloc(alloc) RPAREN. {
+       val = init_let_val(PSI_LET_CALLOC, alloc);
+}
+let_val(val) ::= let_func(func). {
+       val = init_let_val(PSI_LET_FUNC, func);
 }
+
 %type let_calloc {let_calloc*}
 %destructor let_calloc {free_let_calloc($$);}
 let_calloc(alloc) ::= num_exp(nmemb) COMMA num_exp(size). {
        alloc = init_let_calloc(nmemb, size);
 }
-
-let_value(val) ::= reference(r) num_exp(exp). {
-       val = init_let_value(NULL, NULL, r);
-       val->num = exp;
-}
-let_value(val) ::= reference(r) let_func(func) LPAREN impl_var(var) RPAREN. {
-       val = init_let_value(func, var, r);
-}
-let_value(val) ::= reference(r) NULL. {
-       val = init_let_value(NULL, NULL, r);
-}
-
 %token_class let_func_token OBJVAL ARRVAL PATHVAL STRLEN STRVAL FLOATVAL INTVAL BOOLVAL.
 %type let_func {let_func*}
 %destructor let_func {free_let_func($$);}
-let_func(func) ::= let_func_token(T). {
-       func = init_let_func(T->type, T->text, NULL);
+let_func(func) ::= let_func_token(T) LPAREN impl_var(var) RPAREN. {
+       func = init_let_func(T->type, T->text, var);
        free(T);
 }
 
+
 %type set_stmt {set_stmt*}
 %destructor set_stmt {free_set_stmt($$);}
 set_stmt(set) ::= SET impl_var(var) EQUALS set_value(val) EOS. {
@@ -478,6 +470,7 @@ free_calls(calls) ::= free_calls(calls_) COMMA free_call(call). {
 %destructor free_call {free_free_call($$);}
 free_call(call) ::= NAME(F) LPAREN decl_vars(vars) RPAREN. {
        call = init_free_call(F->text, vars);
+       free(F);
 }
 
 %token_class impl_type_token VOID MIXED BOOL INT FLOAT STRING ARRAY OBJECT.