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

diff --git a/gesamt/parser.y b/gesamt/parser.y
index 1d7a7c6..6702256 100644
--- a/gesamt/parser.y
+++ b/gesamt/parser.y
@@ -39,6 +39,11 @@
  * node: baum fuer iburg
  * sin: symboltabelle fuer statement ("eingabe")
  * sout: symboltabelle die aus einem statement wieder rauskommt ("ausgabe")
+ * lblcnt_{in,out}: label counter
+ * vars_{in,out}: counter fuer lokale variablen
+ * call: enthaelt block einen call? (sonst kann man sich stack setup sparen)
+ * imm: fuer ein paar quirks mit immediates im ast
+ * paramcount: zum zaehlen der paramter eines methodenaufrufes
  */
 @autoinh s gparamges vars_in
 @autosyn node imm call
@@ -53,7 +58,7 @@
 @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 *s; int gparamges; int vars_in; struct treenode *node; } Lexpr IdentCommon
 @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
@@ -178,14 +183,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;
 
 		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);
@@ -200,7 +205,9 @@ Statement:
 		@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);
+		@gen {
+			just_calls(@Statement.node@);
+		}
 	  @}
 
 	| IF Expr THEN Statseq END
@@ -223,7 +230,6 @@ Statement:
 		@gen {
 			printf(".%s_ifstart_%d:\n", get_func_name(), @Statement.lblcnt_in@);
 			write_tree(@Statement.node@, 0); burm_label(@Statement.node@); burm_reduce(@Statement.node@, 1);
-			/* TODO: kann ich mir das test wirklich wegan and davor sparen? */
 			printf("\tjz .%s_ifend_%d\n", get_func_name(), @Statement.lblcnt_in@);
 		}
 		@gen @revorder(1) printf(".%s_ifend_%d:\n", get_func_name(), @Statement.lblcnt_in@);
@@ -255,7 +261,6 @@ Statement:
 		@gen {
 			printf(".%s_ifstart_%d:\n", get_func_name(), @Statement.lblcnt_in@);
 			write_tree(@Statement.node@, 0); burm_label(@Statement.node@); burm_reduce(@Statement.node@, 1);
-			/* TODO: kann ich mir das test wirklich wegan and davor sparen? */
 			printf("\tjz .%s_ifelse_%d\n", get_func_name(), @Statement.lblcnt_in@);
 		}
 		@gen @revorder(1) printf(".%s_ifend_%d:\n", get_func_name(), @Statement.lblcnt_in@);
@@ -281,7 +286,6 @@ Statement:
 		@gen {
 			printf(".%s_whilestart_%d:\n", get_func_name(), @Statement.lblcnt_in@);
 			write_tree(@Statement.node@, 0); burm_label(@Statement.node@); burm_reduce(@Statement.node@, 1);
-			/* TODO: kann ich mir das test wirklich wegan and davor sparen? */
 			printf("\tjz .%s_whileend_%d\n", get_func_name(), @Statement.lblcnt_in@);
 		}
 		@gen @revorder(1) printf("\tjmp .%s_whilestart_%d\n.%s_whileend_%d:\n", get_func_name(), @Statement.lblcnt_in@, get_func_name(), @Statement.lblcnt_in@);
@@ -314,31 +318,34 @@ Elsestat:
 	  @}
 
 Lexpr:
+	  IdentCommon
+	| Feld
+	;
+
+IdentCommon: 
 	  IDENT
 	  @{
-	    @c check(@Lexpr.s@, @IDENT.name@, S_VAR|S_PARM);
+	    @c check(@IdentCommon.s@, @IDENT.name@, S_VAR|S_PARM);
 
-		/* TODO: selbe Code wie bei Term/IDENT -- schoener machen! */
 	    @i {
-			@Lexpr.node@ = TREENULL;
-			if(tab_lookup(@Lexpr.s@, @IDENT.name@, S_VAR|S_PARM) == SYMNULL) {
+			@IdentCommon.node@ = TREENULL;
+			if(tab_lookup(@IdentCommon.s@, @IDENT.name@, S_VAR|S_PARM) == SYMNULL) {
 				/* es handelt sich um ein feldzugriff auf this */
-				@Lexpr.node@ = new_field(@IDENT.name@, new_param(O_ID, strdup("this"), TREENULL, TREENULL, 0), TREENULL, tab_lookup(@Lexpr.s@, @IDENT.name@, S_FIELD) == SYMNULL ? -1 : tab_lookup(@Lexpr.s@, @IDENT.name@, S_FIELD)->soffset);
+				@IdentCommon.node@ = new_field(@IDENT.name@, new_param(O_ID, strdup("this"), TREENULL, TREENULL, 0), TREENULL, tab_lookup(@IdentCommon.s@, @IDENT.name@, S_FIELD) == SYMNULL ? -1 : tab_lookup(@IdentCommon.s@, @IDENT.name@, S_FIELD)->soffset);
 			} else { /* param oder var */
-				int tmp = tab_lookup(@Lexpr.s@, @IDENT.name@, S_VAR|S_PARM) == SYMNULL ? -1 : tab_lookup(@Lexpr.s@, @IDENT.name@, S_VAR|S_PARM)->param_index;
-				@Lexpr.node@ = new_param(O_ID, @IDENT.name@, TREENULL, TREENULL, tmp);
+				int tmp = tab_lookup(@IdentCommon.s@, @IDENT.name@, S_VAR|S_PARM) == SYMNULL ? -1 : tab_lookup(@IdentCommon.s@, @IDENT.name@, S_VAR|S_PARM)->param_index;
+				@IdentCommon.node@ = new_param(O_ID, @IDENT.name@, TREENULL, TREENULL, tmp);
 			}
 		}
 
-		@reg if(tab_lookup(@Lexpr.s@, @IDENT.name@, S_VAR|S_PARM) == SYMNULL) {
+		@reg if(tab_lookup(@IdentCommon.s@, @IDENT.name@, S_VAR|S_PARM) == SYMNULL) {
 			/* TODO: kein schoener hack? */
-			@Lexpr.node@->kids[0]->reg = @Lexpr.node@->reg;
+			@IdentCommon.node@->kids[0]->reg = @IdentCommon.node@->reg;
 		}
 	  @}
-
-	| Feld
 	;
 
+
 Feld: Term '.' IDENT
 	  @{
 	    @c check(@Feld.s@, @IDENT.name@, S_FIELD);
@@ -528,27 +535,10 @@ Term:
 		@i @Term.call@ = 0;
 	  @}
 
-	| IDENT
+	| IdentCommon
 	  @{
-	    @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) {
-				/* es handelt sich um ein feldzugriff auf this */
-				@Term.node@ = new_field(@IDENT.name@, new_param(O_ID, strdup("this"), TREENULL, TREENULL, 0), TREENULL, tab_lookup(@Term.s@, @IDENT.name@, S_FIELD) == SYMNULL ? -1 : tab_lookup(@Term.s@, @IDENT.name@, S_FIELD)->soffset);
-			} else { /* param oder var */
-				int tmp = tab_lookup(@Term.s@, @IDENT.name@, S_VAR|S_PARM) == SYMNULL ? -1 : tab_lookup(@Term.s@, @IDENT.name@, S_VAR|S_PARM)->param_index;
-				@Term.node@ = new_param(O_ID, @IDENT.name@, TREENULL, TREENULL, tmp);
-			}
-		}
-
-		@reg if(tab_lookup(@Term.s@, @IDENT.name@, S_VAR|S_PARM) == SYMNULL) {
-			/* TODO: kein schoener hack? */
-			@Term.node@->kids[0]->reg = @Term.node@->reg;
-		}
 	  @}
 
 	| Feld
@@ -562,7 +552,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 +565,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;
@@ -591,7 +581,10 @@ 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@);
+		@reg {
+			@Expr.node@->reg = @Exprs.0.node@->reg;
+			@Exprs.1.node@->reg = next_reg(@Exprs.0.node@->reg, @Exprs.gparamges@);
+		}
 	  @}
 	| Expr
 	  @{