X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=gesamt%2Fparser.y;h=55ca382b994419b602ab8326c0fcc4c85f066068;hb=f8a6a326d88ce84fb401b75c5adc881016d60995;hp=1d7a7c6d61c2d9d71cd1eacf653ab9e704d0ee82;hpb=bd2d6716e386dd5cafc483af0cfc5aa608c1891e;p=uebersetzerbau-ss10.git

diff --git a/gesamt/parser.y b/gesamt/parser.y
index 1d7a7c6..55ca382 100644
--- a/gesamt/parser.y
+++ b/gesamt/parser.y
@@ -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, 6 - @Statement.vars_in@, -1);
+		@i @Statement.sout@ = tab_add_symbol(tab_clone(@Statement.sin@), @IDENT.name@, S_VAR, 1, VARBEGIN - @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, 6 - @Statement.vars_in@));
+		@i @Statement.node@ = new_node(O_ASSIGN, @Expr.node@, new_param(O_ID, @IDENT.name@, TREENULL, TREENULL, VARBEGIN - @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);
@@ -562,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;
@@ -575,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;