codeb: var-assignments

[uebersetzerbau-ss10.git] / codeb / parser.y

diff --git a/codeb/parser.y b/codeb/parser.y
index 9a08dcc2520e6d21092b114378657e9942947305..6c956447d4d44e7eddb93014a8957005c5a0b227 100644 (file)
--- a/codeb/parser.y
+++ b/codeb/parser.y
@@ -44,7 +44,8 @@
 @attributes { struct symbol *s; int gparamges; } Statseq Exprs
 @attributes { struct symbol *s; int gparamges; struct treenode *node; short imm; } Expr Minusterm Multerm Orterm Feld Term
 @attributes { struct symbol *s; int gparamges; struct treenode *node; } Lexpr
-@attributes { struct symbol *sin; int gparamges; struct symbol *sout; struct treenode *node; } Statement
+@attributes { struct symbol *sin; int gparamges; struct symbol *sout; struct
+treenode *node; int vars; } Statement
 
 @traversal @postorder c
 @traversal @preorder reg
@@ -125,7 +126,7 @@ Statseq:
          @{
                @i @Statement.sin@ = @Statseq.0.s@;
                @i @Statseq.1.s@ = @Statement.sout@;
-               @gen write_tree(@Statement.node@, 0); burm_label(@Statement.node@); burm_reduce(@Statement.node@, 1);
+               @i @Statseq.1.gparamges@ = @Statseq.0.gparamges@ + @Statement.vars@;
          @}
 
        |
@@ -138,15 +139,21 @@ Statement:
                xxputsin(@Lexpr.s@,)
                xxputsin(@Expr.s@,)
            @i @Statement.node@ = TREENULL;
+               @i @Statement.vars@ = 0;
          @}
 
        | VAR IDENT ASSIGN Expr
          @{
                /* tab_clone ist hier noetig, vgl. folgendes statement
                 * > var x := x - 1; */
-               @i @Statement.sout@ = tab_add_symbol(tab_clone(@Statement.sin@), @IDENT.name@, S_VAR, 1, -1, -1);
+               @i @Statement.sout@ = tab_add_symbol(tab_clone(@Statement.sin@), @IDENT.name@, S_VAR, 1, @Statement.gparamges@, -1);
                xxputsin(@Expr.s@,)
-           @i @Statement.node@ = TREENULL;
+               @i @Statement.vars@ = 1;
+
+               @i @Statement.node@ = new_node(O_ASSIGN, new_param(O_ID, @IDENT.name@, TREENULL, TREENULL, @Statement.gparamges@), @Expr.node@);
+               @reg @Statement.node@->reg = @Expr.node@->reg = next_reg((char *)NULL, @Expr.gparamges@);
+
+               @gen write_tree(@Statement.node@, 0); burm_label(@Statement.node@); burm_reduce(@Statement.node@, 1);
          @}
 
        | Expr
@@ -154,6 +161,7 @@ Statement:
                statinout()
                xxputsin(@Expr.s@,)
            @i @Statement.node@ = TREENULL;
+               @i @Statement.vars@ = 0;
          @}
 
        | IF Expr THEN Statseq END
@@ -162,6 +170,7 @@ Statement:
                xxputsin(@Expr.s@,)
                xxputsin(@Statseq.s@,)
            @i @Statement.node@ = TREENULL;
+               @i @Statement.vars@ = 0;
          @}
 
        | IF Expr THEN Statseq ELSE Statseq END
@@ -171,6 +180,7 @@ Statement:
                xxputsin(@Statseq.0.s@,)
                xxputsin(@Statseq.1.s@,)
            @i @Statement.node@ = TREENULL;
+               @i @Statement.vars@ = 0;
          @}
 
        | WHILE Expr DO Statseq END
@@ -179,14 +189,18 @@ Statement:
                xxputsin(@Expr.s@,)
                xxputsin(@Statseq.s@,)
            @i @Statement.node@ = TREENULL;
+               @i @Statement.vars@ = 0;
          @}
 
        | RETURN Expr
          @{
                statinout()
                xxputsin(@Expr.s@,)
+               @i @Statement.vars@ = 0;
                @i @Statement.node@ = new_node(O_RET, @Expr.node@, TREENULL);
                @reg @Statement.node@->reg = @Expr.node@->reg = next_reg((char *)NULL, @Expr.gparamges@);
+
+               @gen write_tree(@Statement.node@, 0); burm_label(@Statement.node@); burm_reduce(@Statement.node@, 1);
          @}
        ;
 
@@ -391,7 +405,9 @@ Term:
                                /* es handelt sich um ein feldzugriff auf this */
                                @Term.node@ = new_field(@IDENT.name@, new_param(O_ID, strdup("this"), TREENULL, TREENULL, 0), TREENULL, tab_lookup(@Term.s@, @IDENT.name@, S_FIELD) == SYMNULL ? -1 : tab_lookup(@Term.s@, @IDENT.name@, S_FIELD)->soffset);
                        } else { /* param oder var */
-                               @Term.node@ = new_param(O_ID, @IDENT.name@, TREENULL, TREENULL, tab_lookup(@Term.s@, @IDENT.name@, S_PARM) == SYMNULL ? -1 : tab_lookup(@Term.s@, @IDENT.name@, S_PARM)->param_index);
+                               int tmp = tab_lookup(@Term.s@, @IDENT.name@, S_VAR|S_PARM) == SYMNULL ? -1 : tab_lookup(@Term.s@, @IDENT.name@, S_VAR|S_PARM)->param_index;
+                               fprintf(stderr, "WTF: %d\n", tmp);
+                               @Term.node@ = new_param(O_ID, @IDENT.name@, TREENULL, TREENULL, tmp);
                        }
                }