gesamt: leerstehende Expr's auswerten (weil da Methodenaufrufe drin sein koennten)

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

diff --git a/gesamt/parser.y b/gesamt/parser.y
index 4722ff80cbda2ed00dce53f0704ec74f4a137dda..1d7a7c6d61c2d9d71cd1eacf653ab9e704d0ee82 100644 (file)
--- a/gesamt/parser.y
+++ b/gesamt/parser.y
@@ -49,7 +49,7 @@
 @attributes { struct symbol *f; } Program Structdef;
 @attributes { struct symbol *f; int offsetcount; } FeldID
 @attributes { struct symbol *s; } Methoddef
-@attributes { struct symbol *s; int gparamges; int vars_in; int paramcount; struct treenode *node; } Exprs
+@attributes { struct symbol *s; int gparamges; int vars_in; int cnt; int paramcount; struct treenode *node; } Exprs
 @attributes { struct symbol *s; int gparamges; int lblcnt_in; int lblcnt_out; int vars_in; int vars_out; int call; } Statseq
 @attributes { struct symbol *s; int gparamges; int lblcnt_in; int lblcnt_out; int reallblcnt; int vars_in; int vars_out; int call; } Elsestat
 @attributes { struct symbol *s; int gparamges; int vars_in; struct treenode *node; short imm; int call; } Expr Minusterm Multerm Orterm Feld Term
@@ -178,14 +178,14 @@ Statement:
          @{
                /* 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, @Statement.gparamges@ + @Statement.vars_in@, -1);
+               @i @Statement.sout@ = tab_add_symbol(tab_clone(@Statement.sin@), @IDENT.name@, S_VAR, 1, 6 - @Statement.vars_in@, -1);
                lblcountinout()
 
                @i @Statement.vars_out@ = @Statement.vars_in@ + 1;
 
                xxputsin(@Expr.s@,)
 
-               @i @Statement.node@ = new_node(O_ASSIGN, @Expr.node@, new_param(O_ID, @IDENT.name@, TREENULL, TREENULL, @Statement.gparamges@ + @Statement.vars_in@));
+               @i @Statement.node@ = new_node(O_ASSIGN, @Expr.node@, new_param(O_ID, @IDENT.name@, TREENULL, TREENULL, 6 - @Statement.vars_in@));
                @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);
@@ -197,7 +197,10 @@ Statement:
                varsinout()
                lblcountinout()
                xxputsin(@Expr.s@,)
-           @i @Statement.node@ = TREENULL;
+               @i @Statement.node@ = new_node(O_EXPR, @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);
          @}
 
        | IF Expr THEN Statseq END
@@ -557,10 +560,11 @@ Term:
        | IDENT '(' Exprs ')'
          @{
            @i {
-                       @Term.node@ = new_call(@IDENT.name@, new_arg(new_nothing(), new_nothing(), 0) /*this*/,
-                                       @Exprs.node@, @Term.gparamges@, @Term.vars_in@);
+                       @Term.node@ = new_call(@IDENT.name@, new_arg(@Exprs.node@, new_nothing(), 0) /*this*/,
+                                       TREENULL, @Term.gparamges@, @Term.vars_in@);
                        @Term.node@->soffset = @Exprs.paramcount@;
                }
+               @i @Exprs.cnt@ = 1;
                @i @Term.imm@ = 0;
                @i @Term.call@ = 1;
                @reg @Exprs.node@->reg = @Term.node@->reg;
@@ -569,10 +573,11 @@ Term:
        | Term '.' IDENT '(' Exprs ')'
          @{
            @i {
-                       @Term.node@ = new_call(@IDENT.name@, new_arg(@Term.1.node@, new_nothing(), 0) /*this*/,
-                                       @Exprs.node@, @Term.gparamges@, @Term.vars_in@);
+                       @Term.node@ = new_call(@IDENT.name@, new_arg(@Exprs.node@, @Term.1.node@, 0) /*this*/,
+                                       TREENULL, @Term.gparamges@, @Term.vars_in@);
                        @Term.node@->soffset = @Exprs.paramcount@;
                }
+               @i @Exprs.cnt@ = 1;
                @i @Term.imm@ = 0;
                @i @Term.call@ = 1;
                @reg @Exprs.node@->reg = @Term.1.node@->reg = @Term.node@->kids[0]->reg = @Term.node@->reg;
@@ -583,20 +588,21 @@ Term:
 Exprs:
          Expr ',' Exprs
          @{
-               @i @Exprs.0.node@ = new_arg(@Expr.0.node@, @Exprs.1.node@, @Exprs.1.paramcount@);
-               @i @Exprs.0.paramcount@ = @Exprs.1.paramcount@ + 1;
-               @reg @Expr.node@->reg = @Exprs.1.node@->reg = @Exprs.0.node@->reg;
+               @i @Exprs.0.node@ = new_arg(@Expr.0.node@, @Exprs.1.node@, @Exprs.0.cnt@);
+               @i @Exprs.0.paramcount@ = @Exprs.1.paramcount@;
+               @i @Exprs.1.cnt@ = @Exprs.0.cnt@ + 1;
+               @reg @Expr.node@->reg = @Exprs.0.node@->reg; @Exprs.1.node@->reg = next_reg(@Exprs.0.node@->reg, @Exprs.gparamges@);
          @}
        | Expr
          @{
-               @i @Exprs.0.node@ = new_arg(@Expr.0.node@, new_nothing(), 1);
-               @i @Exprs.paramcount@ = 2;
+               @i @Exprs.0.node@ = new_arg(@Expr.0.node@, new_nothing(), @Exprs.cnt@);
+               @i @Exprs.paramcount@ = @Exprs.cnt@ + 1;
                @reg @Expr.node@->reg = @Exprs.0.node@->reg;
          @}
        |
          @{
                @i @Exprs.0.node@ = new_nothing();
-               @i @Exprs.paramcount@ = 1;
+               @i @Exprs.paramcount@ = @Exprs.cnt@;
          @}
        ;
 %%