gesamt: registerbelegung fuer VARs doch wieder geaendert...

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

diff --git a/gesamt/parser.y b/gesamt/parser.y
index 20d0a5152c2b444dad69ae0f95b30209c4c2af3f..4b453522a9469260b8bae5883f8300abb1a2caf3 100644 (file)
--- a/gesamt/parser.y
+++ b/gesamt/parser.y
@@ -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
@@ -559,7 +562,7 @@ Term:
            @i {
                        @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@;
+                       @Term.node@->soffset = MAX(@Exprs.paramcount@, @Term.gparamges@);
                }
                @i @Exprs.cnt@ = 1;
                @i @Term.imm@ = 0;
@@ -572,7 +575,7 @@ Term:
            @i {
                        @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@;
+                       @Term.node@->soffset = MAX(@Exprs.paramcount@, @Term.gparamges@);
                }
                @i @Exprs.cnt@ = 1;
                @i @Term.imm@ = 0;