X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=gesamt%2Fparser.y;h=88b808e7cfc0155da7d18a3ff137644bc125e4f8;hb=e01d4b5591d2684af59e9dbb30330da9aa145794;hp=f564b151b3383dd35b8d5c3075d4275206d32795;hpb=44f4fb2a8cf8990a02b77d4e42aed5ac6f3e871f;p=uebersetzerbau-ss10.git

diff --git a/gesamt/parser.y b/gesamt/parser.y
index f564b15..88b808e 100644
--- a/gesamt/parser.y
+++ b/gesamt/parser.y
@@ -178,15 +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, 6 - @Statement.vars_in@, -1);
+		@i @Statement.sout@ = tab_add_symbol(tab_clone(@Statement.sin@), @IDENT.name@, S_VAR, 1, @Statement.gparamges@ + @Statement.vars_in@, -1);
 		lblcountinout()
 
 		@i @Statement.vars_out@ = @Statement.vars_in@ + 1;
-		@i @Expr.vars_in@ = @Statement.vars_in@ - 1;
 
 		xxputsin(@Expr.s@,)
 
-		@i @Statement.node@ = new_node(O_ASSIGN, @Expr.node@, new_param(O_ID, @IDENT.name@, TREENULL, TREENULL, 6 - @Statement.vars_in@));
+		@i @Statement.node@ = new_node(O_ASSIGN, @Expr.node@, new_param(O_ID, @IDENT.name@, TREENULL, TREENULL, @Statement.gparamges@ + @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);
@@ -198,7 +197,12 @@ 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 {
+			just_calls(@Statement.node@);
+		}
 	  @}
 
 	| IF Expr THEN Statseq END
@@ -560,7 +564,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;
@@ -573,7 +577,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;