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

diff --git a/gesamt/parser.y b/gesamt/parser.y
index 39cc35d..f564b15 100644
--- a/gesamt/parser.y
+++ b/gesamt/parser.y
@@ -27,6 +27,10 @@
 	@i @Statement.lblcnt_out@ = @Statement.lblcnt_in@;
 @end
 
+@macro varsinout()
+	@i @Statement.vars_out@ = @Statement.vars_in@;
+@end
+
 /* beschreibung der attribute
  * s: symboltabelle
  * f: symboltabelle fuer quirks mit structur und parameter
@@ -36,8 +40,8 @@
  * sin: symboltabelle fuer statement ("eingabe")
  * sout: symboltabelle die aus einem statement wieder rauskommt ("ausgabe")
  */
-@autoinh s gparamges
-@autosyn node imm
+@autoinh s gparamges vars_in
+@autosyn node imm call
 
 @attributes { char *name; } IDENT
 @attributes { long val; } NUM
@@ -45,12 +49,12 @@
 @attributes { struct symbol *f; } Program Structdef;
 @attributes { struct symbol *f; int offsetcount; } FeldID
 @attributes { struct symbol *s; } Methoddef
-@attributes { struct symbol *s; int gparamges; } Exprs
-@attributes { struct symbol *s; int gparamges; int lblcnt_in; int lblcnt_out; } Statseq
-@attributes { struct symbol *s; int gparamges; int lblcnt_in; int lblcnt_out; int reallblcnt; } Elsestat
-@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; int vars; int lblcnt_in; int lblcnt_out; } Statement
+@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
+@attributes { struct symbol *s; int gparamges; int vars_in; struct treenode *node; } Lexpr
+@attributes { struct symbol *sin; int gparamges; struct symbol *sout; struct treenode *node; int vars_in; int vars_out; int lblcnt_in; int lblcnt_out; int call; } Statement
 
 @traversal @postorder c
 @traversal @preorder reg
@@ -84,9 +88,10 @@ Methoddef:
 	  @{
 	    @i @Parms.parms@ = 1;
 	    @i @Statseq.s@ = tab_merge(@Methoddef.s@, @Parms.f@, 0);
+		@i @Statseq.vars_in@ = 0;
 		@i @Statseq.gparamges@ = @Parms.paramges@;
 		@i @Statseq.lblcnt_in@ = 0;
-	    @gen func_header(@IDENT.name@);
+	    @gen func_header(@IDENT.name@, @Statseq.vars_out@, @Parms.paramges@, @Statseq.call@);
 	  @}
 	;
 
@@ -135,14 +140,22 @@ Statseq:
 
 		@i @Statseq.1.s@ = @Statement.sout@;
 		@i @Statseq.1.lblcnt_in@ = @Statement.lblcnt_out@;
-		@i @Statseq.1.gparamges@ = @Statseq.0.gparamges@ + @Statement.vars@;
+		@i @Statseq.1.gparamges@ = @Statseq.0.gparamges@;
+
+		@i @Statement.vars_in@ = @Statseq.0.vars_in@;
+		@i @Statseq.1.vars_in@ = @Statement.vars_out@;
 
 		@i @Statseq.0.lblcnt_out@ = @Statseq.1.lblcnt_out@;
+		@i @Statseq.0.vars_out@ = @Statseq.1.vars_out@;
+
+		@i @Statseq.0.call@ = @Statement.call@ || @Statseq.1.call@;
 	  @}
 
 	|
 	  @{
 	  	@i @Statseq.0.lblcnt_out@ = @Statseq.0.lblcnt_in@;
+		@i @Statseq.0.vars_out@ = @Statseq.0.vars_in@;
+		@i @Statseq.0.call@ = 0;
 	  @}
 	;
 
@@ -151,10 +164,10 @@ Statement:
 	  @{
 	  	statinout()
 		lblcountinout()
+		varsinout()
 		xxputsin(@Lexpr.s@,)
 		xxputsin(@Expr.s@,)
 	    @i @Statement.node@ = new_node(O_ASSIGN, @Expr.node@, @Lexpr.node@);
-		@i @Statement.vars@ = 0;
 		@reg @Statement.node@->reg = @Expr.node@->reg = next_reg((char *)NULL, @Expr.gparamges@);
 		@reg @Lexpr.node@->reg = next_reg(@Expr.node@->reg, @Expr.gparamges@);
 
@@ -165,12 +178,15 @@ 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@, -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;
+		@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, @Statement.gparamges@));
-		@i @Statement.vars@ = 1;
+		@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);
@@ -179,10 +195,10 @@ Statement:
 	| Expr
 	  @{
 	  	statinout()
+		varsinout()
 		lblcountinout()
 		xxputsin(@Expr.s@,)
 	    @i @Statement.node@ = TREENULL;
-		@i @Statement.vars@ = 0;
 	  @}
 
 	| IF Expr THEN Statseq END
@@ -190,11 +206,16 @@ Statement:
 	  	statinout()
 		@i @Statseq.lblcnt_in@ =  @Statement.lblcnt_in@ + 1;
 		@i @Statement.lblcnt_out@ = @Statseq.lblcnt_out@;
+
+		@i @Statseq.vars_in@ = @Statement.vars_in@;
+		@i @Statement.vars_out@ = @Statseq.vars_out@;
+
+		@i @Statement.call@ = @Expr.call@ || @Statseq.call@;
+
 		xxputsin(@Expr.s@,)
 		xxputsin(@Statseq.s@,)
 
 		@i @Statement.node@ = new_node(O_IF, @Expr.node@, TREENULL);
-		@i @Statement.vars@ = 0;
 
 		@reg @Statement.node@->reg = @Expr.node@->reg = next_reg((char *)NULL, @Expr.gparamges@);
 		@gen {
@@ -216,12 +237,17 @@ Statement:
 		/* im Elsestat muss noch ein label numeriert werden */
 		@i @Elsestat.reallblcnt@ = @Statement.lblcnt_in@;
 
+		@i @Statseq.vars_in@ = @Statement.vars_in@;
+		@i @Elsestat.vars_in@ = @Statement.vars_in@;
+		@i @Statement.vars_out@ = MAX(@Statseq.vars_out@, @Elsestat.vars_out@);
+
+		@i @Statement.call@ = @Expr.call@ || @Statseq.call@ || @Elsestat.call@;
+
 		xxputsin(@Expr.s@,)
 		xxputsin(@Statseq.0.s@,)
 		xxputsin(@Elsestat.s@,)
 
 		@i @Statement.node@ = new_node(O_IF, @Expr.node@, TREENULL);
-		@i @Statement.vars@ = 0;
 
 		@reg @Statement.node@->reg = @Expr.node@->reg = next_reg((char *)NULL, @Expr.gparamges@);
 		@gen {
@@ -238,11 +264,16 @@ Statement:
 	  	statinout()
 		@i @Statseq.lblcnt_in@ =  @Statement.lblcnt_in@ + 1;
 		@i @Statement.lblcnt_out@ = @Statseq.lblcnt_out@;
+
+		@i @Statseq.vars_in@ = @Statement.vars_in@;
+		@i @Statement.vars_out@ = @Statseq.vars_out@;
+
+		@i @Statement.call@ = @Expr.call@ || @Statseq.call@;
+
 		xxputsin(@Expr.s@,)
 		xxputsin(@Statseq.s@,)
 
 		@i @Statement.node@ = new_node(O_IF, @Expr.node@, TREENULL);
-		@i @Statement.vars@ = 0;
 
 		@reg @Statement.node@->reg = @Expr.node@->reg = next_reg((char *)NULL, @Expr.gparamges@);
 		@gen {
@@ -258,13 +289,13 @@ Statement:
 	  @{
 	  	statinout()
 		lblcountinout()
+		varsinout()
 		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);
+		@gen write_tree(@Statement.node@, 0); burm_label(@Statement.node@); burm_reduce(@Statement.node@, 1); func_footer();
 	  @}
 	;
 
@@ -274,6 +305,9 @@ Elsestat:
 		@i @Statseq.lblcnt_in@ =  @Elsestat.lblcnt_in@;
 		@i @Elsestat.lblcnt_out@ =  @Statseq.lblcnt_out@;
 
+		@i @Statseq.vars_in@ = @Elsestat.vars_in@;
+		@i @Elsestat.vars_out@ = @Statseq.vars_out@;
+
 		@gen printf("\tjmp .%s_ifend_%d\n.%s_ifelse_%d:\n", get_func_name(), @Elsestat.reallblcnt@, get_func_name(), @Elsestat.reallblcnt@);
 	  @}
 
@@ -329,6 +363,7 @@ Expr:
 	  @{
 	    @i @Expr.node@ = new_node(O_SUB, @Term.node@, @Minusterm.node@);
 		@i @Expr.imm@ = @Term.imm@ && @Minusterm.imm@;
+		@i @Expr.call@ = @Term.call@ || @Minusterm.call@;
 
 		@reg {
 			if(!(@Expr.node@->kids[0] == TREENULL && @Expr.node@->kids[1] == TREENULL)) {
@@ -346,6 +381,7 @@ Expr:
 	  @{
 	    @i @Expr.node@ = new_node(O_MUL, @Term.node@, @Multerm.node@);
 		@i @Expr.imm@ = @Term.imm@ && @Multerm.imm@;
+		@i @Expr.call@ = @Term.call@ || @Multerm.call@;
 
 		@reg {
 			@Term.node@->reg = @Expr.node@->reg;
@@ -361,6 +397,7 @@ Expr:
 	  @{
 	    @i @Expr.node@ = new_node(O_OR, @Term.node@, @Orterm.node@);
 		@i @Expr.imm@ = @Term.imm@ && @Orterm.imm@;
+		@i @Expr.call@ = @Term.call@ || @Orterm.call@;
 
 		@reg {
 			@Term.node@->reg = @Expr.node@->reg;
@@ -371,7 +408,8 @@ Expr:
 	| Term '<' Term
 	  @{
 	    @i @Expr.node@ = new_node(O_BOOL, new_node(O_LESS, @Term.0.node@, @Term.1.node@), TREENULL);
-		@i @Expr.imm@ = @Term.0.imm@ && @Term.0.imm@;
+		@i @Expr.imm@ = @Term.0.imm@ && @Term.1.imm@;
+		@i @Expr.call@ = @Term.0.call@ || @Term.1.call@;
 
 		@reg {
 			@Term.0.node@->reg = @Expr.node@->kids[0]->reg = @Expr.node@->reg;
@@ -382,7 +420,8 @@ Expr:
 	| Term '=' Term
 	  @{
 	    @i @Expr.node@ = new_node(O_BOOL, new_node(O_EQ, @Term.0.node@, @Term.1.node@), TREENULL);
-		@i @Expr.imm@ = @Term.0.imm@ && @Term.0.imm@;
+		@i @Expr.imm@ = @Term.0.imm@ && @Term.1.imm@;
+		@i @Expr.call@ = @Term.0.call@ || @Term.1.call@;
 
 		@reg {
 			@Term.0.node@->reg = @Expr.node@->kids[0]->reg = @Expr.node@->reg;
@@ -396,6 +435,7 @@ Minusterm:
 	  @{
 	    @i @Minusterm.node@ = new_node(O_ADD, @Minusterm.1.node@, @Term.node@);
 		@i @Minusterm.0.imm@ = @Term.imm@ && @Minusterm.1.imm@;
+		@i @Minusterm.0.call@ = @Term.call@ || @Minusterm.1.call@;
 
 	    @reg {
 			@Minusterm.1.node@->reg = @Minusterm.node@->reg;
@@ -418,6 +458,7 @@ Multerm:
 	  @{
 	    @i @Multerm.node@ = new_node(O_MUL, @Multerm.1.node@, @Term.node@);
 		@i @Multerm.0.imm@ = @Term.imm@ && @Multerm.1.imm@;
+		@i @Multerm.0.call@ = @Term.call@ || @Multerm.1.call@;
 
 	    @reg {
 			@Multerm.1.node@->reg = @Multerm.node@->reg;
@@ -440,6 +481,7 @@ Orterm:
 	  @{
 	    @i @Orterm.node@ = new_node(O_OR, @Orterm.1.node@, @Term.node@);
 		@i @Orterm.0.imm@ = @Term.imm@ && @Orterm.1.imm@;
+		@i @Orterm.0.call@ = @Term.call@ || @Orterm.1.call@;
 
 	    @reg {
 			@Orterm.1.node@->reg = @Orterm.node@->reg;
@@ -467,18 +509,21 @@ Term:
 	  @{
 	    @i @Term.node@ = new_number(@NUM.val@);
 		@i @Term.imm@ = 1;
+		@i @Term.call@ = 0;
 	  @}
 
 	| '-' NUM
 	  @{
 	    @i @Term.node@ = new_number(-1 * (@NUM.val@));
 		@i @Term.imm@ = 1;
+		@i @Term.call@ = 0;
 	  @}
 
 	| THIS
 	  @{
 	    @i @Term.node@ = new_param(O_ID, strdup("this"), TREENULL, TREENULL, 0);
 		@i @Term.imm@ = 0;
+		@i @Term.call@ = 0;
 	  @}
 
 	| IDENT
@@ -486,6 +531,7 @@ Term:
 	    @c check(@Term.s@, @IDENT.name@, S_VAR|S_PARM);
 
 		@i @Term.imm@ = 0;
+		@i @Term.call@ = 0;
 	    @i {
 			@Term.node@ = TREENULL;
 			if(tab_lookup(@Term.s@, @IDENT.name@, S_VAR|S_PARM) == SYMNULL) {
@@ -511,22 +557,51 @@ Term:
 
 	| IDENT '(' Exprs ')'
 	  @{
-	    @i @Term.node@ = TREENULL;
+	    @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@;
+		}
+		@i @Exprs.cnt@ = 1;
 		@i @Term.imm@ = 0;
+		@i @Term.call@ = 1;
+		@reg @Exprs.node@->reg = @Term.node@->reg;
 	  @}
 
 	| Term '.' IDENT '(' Exprs ')'
 	  @{
-	    @i @Term.node@ = TREENULL;
+	    @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@;
+		}
+		@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;
 	  @}
 
 	;
 
 Exprs:
 	  Expr ',' Exprs
+	  @{
+		@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(), @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@ = @Exprs.cnt@;
+	  @}
 	;
 %%