X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=codea%2Fparser.y;h=9a08dcc2520e6d21092b114378657e9942947305;hb=7c081ed2392afbf02406ab37346ef3b119d61f4c;hp=2df6af47eb8b9863ac0e070a1babfc88888c7dc2;hpb=2a5fba6342e1d5486e88dedda5a64fa2a56428a3;p=uebersetzerbau-ss10.git

diff --git a/codea/parser.y b/codea/parser.y
index 2df6af4..9a08dcc 100644
--- a/codea/parser.y
+++ b/codea/parser.y
@@ -24,15 +24,13 @@
 @end
 
 /* beschreibung der attribute
- * s:
- * f:
- * gparamges:
- * parms:
- * node:
- * imm:
- * exprcount:
- * sin:
- * sout:
+ * s: symboltabelle
+ * f: symboltabelle fuer quirks mit structur und parameter
+ * gparamges: anzahl der parameter in einer methode
+ * parms: parametercounter
+ * node: baum fuer iburg
+ * sin: symboltabelle fuer statement ("eingabe")
+ * sout: symboltabelle die aus einem statement wieder rauskommt ("ausgabe")
  */
 @autoinh s gparamges
 @autosyn node imm
@@ -40,24 +38,24 @@
 @attributes { char *name; } IDENT
 @attributes { long val; } NUM
 @attributes { struct symbol *f; int paramges; int parms; } Parms
-@attributes { struct symbol *f; } FeldID Structdef Program
+@attributes { struct symbol *f; } Program Structdef;
+@attributes { struct symbol *f; int offsetcount; } FeldID
 @attributes { struct symbol *s; } Methoddef
 @attributes { struct symbol *s; int gparamges; } Statseq Exprs
-@attributes { struct symbol *s; int gparamges; struct treenode *node; short imm; int exprcount; } Expr Minusterm Term
-@attributes { struct symbol *s; int gparamges; struct treenode *node; int exprcount; } Orterm Multerm
-@attributes { struct symbol *s; int gparamges; struct treenode *node; } Lexpr Feld
+@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; } Statement
 
 @traversal @postorder c
 @traversal @preorder reg
-@traversal @postorder gen
+@traversal @preorder gen
 
 %%
 Input:
 	  Program
 	  @{
 	    @i @Program.f@ = tab_new();
-	    @gen @revorder(1) printf("\t.text\n");
+	    @gen printf("\t.text\n");
 	  @}
 	;
 
@@ -81,7 +79,7 @@ Methoddef:
 	    @i @Parms.parms@ = 1;
 	    @i @Statseq.s@ = tab_merge(@Methoddef.s@, @Parms.f@, 0);
 		@i @Statseq.gparamges@ = @Parms.paramges@;
-	    @gen @revorder(1) func_header(@IDENT.name@);
+	    @gen func_header(@IDENT.name@);
 	  @}
 	;
 
@@ -89,6 +87,7 @@ Structdef:
 	  STRUCT FeldID END
 	  @{
 	    @i @Structdef.f@ = @FeldID.f@;
+		@i @FeldID.offsetcount@ = 0;
 	  @}
 	;
 
@@ -96,9 +95,9 @@ Parms:
 	  /* lokale Vars werden in Statement in die tabelle eingefuegt */
 	  IDENT Parms
 	  @{
-	    @i @Parms.1.parms@ = @Parms.parms@ + 1;
+	    @i @Parms.1.parms@ = @Parms.0.parms@ + 1;
 		@i @Parms.0.paramges@ = @Parms.1.paramges@;
-	    @i @Parms.0.f@ = tab_add_symbol(@Parms.1.f@, @IDENT.name@, S_PARM, 1, @Parms.parms@);
+	    @i @Parms.0.f@ = tab_add_symbol(@Parms.1.f@, @IDENT.name@, S_PARM, 1, @Parms.parms@, -1);
 	  @}
 
 	|
@@ -111,7 +110,8 @@ Parms:
 FeldID:
 	  IDENT FeldID
 	  @{
-	    @i @FeldID.0.f@ = tab_add_symbol(@FeldID.1.f@, @IDENT.name@, S_FIELD, 1, -1);
+	    @i @FeldID.1.offsetcount@ = @FeldID.0.offsetcount@ + 1;
+	    @i @FeldID.0.f@ = tab_add_symbol(@FeldID.1.f@, @IDENT.name@, S_FIELD, 1, -1, @FeldID.0.offsetcount@);
 	  @}
 
 	|
@@ -144,7 +144,7 @@ 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, -1);
+		@i @Statement.sout@ = tab_add_symbol(tab_clone(@Statement.sin@), @IDENT.name@, S_VAR, 1, -1, -1);
 		xxputsin(@Expr.s@,)
 	    @i @Statement.node@ = TREENULL;
 	  @}
@@ -185,8 +185,8 @@ Statement:
 	  @{
 	  	statinout()
 		xxputsin(@Expr.s@,)
-		@i @Statement.node@ = new_node(O_RET, @Expr.node@, TREENULL, @Expr.exprcount@+1); if(@Expr.gparamges@ + @Expr.exprcount@ + 1 > 7) { fprintf(stderr, "RETURN: zu hohe tiefe (gparamges: %i, exprcount: %i, gesamt %i [maximal: 7])\n", @Expr.gparamges@, @Expr.exprcount@+1, @Expr.gparamges@+@Expr.exprcount@+1); }
-		@reg @Statement.node@->reg = next_reg((char *)NULL, 0, @Expr.gparamges@); @Expr.node@->reg = @Statement.node@->reg;
+		@i @Statement.node@ = new_node(O_RET, @Expr.node@, TREENULL);
+		@reg @Statement.node@->reg = @Expr.node@->reg = next_reg((char *)NULL, @Expr.gparamges@);
 	  @}
 	;
 
@@ -195,6 +195,8 @@ Lexpr:
 	  @{
 	    @i @Lexpr.node@ = TREENULL;
 	    @c check(@Lexpr.s@, @IDENT.name@, S_VAR|S_PARM);
+		/* this.feldname */
+		/* TODO fuer zuweisungen ... (codeb?) */
 	  @}
 
 	| Feld
@@ -203,7 +205,9 @@ Lexpr:
 Feld: Term '.' IDENT
 	  @{
 	    @c check(@Feld.s@, @IDENT.name@, S_FIELD);
-	    @i @Feld.node@ = TREENULL;
+	    @i @Feld.node@ = new_field(@IDENT.name@, @Term.node@, TREENULL, tab_lookup(@Feld.s@, @IDENT.name@, S_FIELD) == SYMNULL ? -1 : tab_lookup(@Feld.s@, @IDENT.name@, S_FIELD)->soffset);
+
+		@reg @Term.node@->reg = @Feld.node@->reg;
 	  @}
 	;
 
@@ -211,72 +215,99 @@ Expr:
 	  Term
 	  @{
 	    @reg @Term.node@->reg = @Expr.node@->reg;
-		@i @Expr.exprcount@ = @Term.exprcount@; fprintf(stderr, "(Expr)- Term\n");
 	  @}
 
 	| NOT Term
 	  @{
-	    @i @Expr.node@ = TREENULL;
-		@i @Expr.exprcount@ = @Term.exprcount@; fprintf(stderr, "(Expr)- NOT Term\n");
+		@i @Expr.node@ = new_node(O_EQ, @Term.node@, new_node(O_NULL, TREENULL, TREENULL));
+
+		@reg @Term.node@->reg = @Expr.node@->reg;
 	  @}
 
 	| Term Minusterm
 	  @{
-		@i @Expr.exprcount@ = @Term.exprcount@ + @Minusterm.exprcount@; fprintf(stderr, "(Expr)- Term Minusterm\n");
-	    @i @Expr.node@ = new_node(O_SUB, @Minusterm.node@, @Term.node@, @Expr.exprcount@);
+	    @i @Expr.node@ = new_node(O_SUB, @Term.node@, @Minusterm.node@);
 		@i @Expr.imm@ = @Term.imm@ && @Minusterm.imm@;
 
 		@reg {
-			/* TODO */
-			@Term.node@->reg = @Expr.node@->reg;
-			@Term.node@->skip = 1;
-			@Minusterm.node@->reg = next_reg(@Term.node@->reg, @Expr.node@->skip, @Expr.gparamges@);
+			if(!(@Expr.node@->kids[0] == TREENULL && @Expr.node@->kids[1] == TREENULL)) {
+				@Term.node@->reg = @Expr.node@->reg;
+				if(@Minusterm.imm@) {
+					@Minusterm.node@->reg = @Expr.node@->reg;
+				} else {
+					@Minusterm.node@->reg = next_reg(@Term.node@->reg, @Expr.gparamges@);
+				}
+			}
 		}
 	  @}
 
 	| Term Multerm
 	  @{
-	    @i @Expr.node@ = TREENULL;
-		@i @Expr.exprcount@ = @Term.exprcount@ + @Multerm.exprcount@; fprintf(stderr, "(Expr)- Term Multerm\n");
+	    @i @Expr.node@ = new_node(O_MUL, @Term.node@, @Multerm.node@);
+		@i @Expr.imm@ = @Term.imm@ && @Multerm.imm@;
+
+		@reg {
+			@Term.node@->reg = @Expr.node@->reg;
+			if(@Term.imm@) {
+				@Multerm.node@->reg = @Expr.node@->reg;
+			} else {
+				@Multerm.node@->reg = next_reg(@Term.node@->reg, @Expr.gparamges@);
+			}
+		}
 	  @}
 
 	| Term Orterm
 	  @{
-	    @i @Expr.node@ = TREENULL;
-		@i @Expr.exprcount@ = @Term.exprcount@ + @Orterm.exprcount@; fprintf(stderr, "(Expr)- Term Orterm\n");
+	    @i @Expr.node@ = new_node(O_OR, @Term.node@, @Orterm.node@);
+		@i @Expr.imm@ = @Term.imm@ && @Orterm.imm@;
+
+		@reg {
+			@Term.node@->reg = @Expr.node@->reg;
+			@Orterm.node@->reg = next_reg(@Term.node@->reg, @Expr.gparamges@);
+		}
 	  @}
 
 	| Term '<' Term
 	  @{
-	    @i @Expr.node@ = TREENULL;
-		/* das is bloedsinn atm */ @i @Expr.imm@ = @Term.0.imm@ && @Term.1.imm@;
-		@i @Expr.exprcount@ = @Term.0.exprcount@ + @Term.1.exprcount@; fprintf(stderr, "(Expr)- Term < Term\n");
+	    @i @Expr.node@ = new_node(O_LESS, @Term.0.node@, @Term.1.node@);
+		@i @Expr.imm@ = @Term.0.imm@ && @Term.0.imm@;
+
+		@reg {
+			@Term.0.node@->reg = @Expr.node@->reg;
+			@Term.1.node@->reg = next_reg(@Term.0.node@->reg, @Expr.gparamges@);
+		}
 	  @}
 
 	| Term '=' Term
 	  @{
-	    @i @Expr.node@ = TREENULL;
-		/* das is bloedsinn atm */ @i @Expr.imm@ = @Term.0.imm@ && @Term.1.imm@;
-		@i @Expr.exprcount@ = @Term.0.exprcount@ + @Term.1.exprcount@; fprintf(stderr, "(Expr)- Term = Term\n");
+	    @i @Expr.node@ = new_node(O_EQ, @Term.0.node@, @Term.1.node@);
+		@i @Expr.imm@ = @Term.0.imm@ && @Term.0.imm@;
+
+		@reg {
+			@Term.0.node@->reg = @Expr.node@->reg;
+			@Term.1.node@->reg = next_reg(@Term.0.node@->reg, @Expr.gparamges@);
+		}
 	  @}
 	;
 
 Minusterm:
 	  '-' Term Minusterm
 	  @{
-		@i @Minusterm.0.exprcount@ = @Term.exprcount@ + @Minusterm.1.exprcount@; fprintf(stderr, "(Minusterm)- - Term Minusterm\n");
-	    @i @Minusterm.node@ = new_node(O_ADD, @Minusterm.1.node@, @Term.node@, @Minusterm.0.exprcount@);
-		@i @Minusterm.imm@ = @Term.imm@ && @Minusterm.1.imm@;
+	    @i @Minusterm.node@ = new_node(O_ADD, @Minusterm.1.node@, @Term.node@);
+		@i @Minusterm.0.imm@ = @Term.imm@ && @Minusterm.1.imm@;
 
 	    @reg {
 			@Minusterm.1.node@->reg = @Minusterm.node@->reg;
-			@Term.node@->reg = next_reg(@Minusterm.1.node@->reg, @Minusterm.node@->skip, @Minusterm.gparamges@);
+			if(@Minusterm.1.imm@) {
+				@Term.node@->reg = @Minusterm.node@->reg;
+			} else {
+				@Term.node@->reg = next_reg(@Minusterm.1.node@->reg, @Minusterm.gparamges@);
+			}
 		}
 	  @}
 
 	| '-' Term
 	  @{
-		@i @Minusterm.exprcount@ = @Term.exprcount@; fprintf(stderr, "(Minusterm)- - Term\n");
 	    @reg @Term.node@->reg = @Minusterm.node@->reg;
 	  @}
 	;
@@ -284,33 +315,43 @@ Minusterm:
 Multerm:
 	  '*' Term Multerm
 	  @{
-		@i @Multerm.0.exprcount@ = @Term.exprcount@ + @Multerm.1.exprcount@; fprintf(stderr, "(Multerm)- - Term Multerm\n");
-	  	/* TODO */
-		/* TODO: imm */
-	    @i @Multerm.node@ = TREENULL;
+	    @i @Multerm.node@ = new_node(O_MUL, @Multerm.1.node@, @Term.node@);
+		@i @Multerm.0.imm@ = @Term.imm@ && @Multerm.1.imm@;
+
+	    @reg {
+			@Multerm.1.node@->reg = @Multerm.node@->reg;
+			if(@Multerm.1.imm@) {
+				@Term.node@->reg = @Multerm.node@->reg;
+			} else {
+				@Term.node@->reg = next_reg(@Multerm.1.node@->reg, @Multerm.gparamges@);
+			}
+		}
 	  @}
 
 	| '*' Term
 	  @{
-		@i @Multerm.exprcount@ = @Term.exprcount@; fprintf(stderr, "(Multerm)- - Term\n");
-	  	/* TODO */
-	    @i @Multerm.node@ = TREENULL;
+	    @reg @Term.node@->reg = @Multerm.node@->reg;
 	  @}
 	;
 
 Orterm:
 	  OR Term Orterm
 	  @{
-		@i @Orterm.0.exprcount@ = @Term.exprcount@ + @Orterm.1.exprcount@; fprintf(stderr, "(Orterm)- - Term Orterm\n");
-	  	/* TODO */
-		/* TODO: imm */
-	    @i @Orterm.node@ = TREENULL;
+	    @i @Orterm.node@ = new_node(O_OR, @Orterm.1.node@, @Term.node@);
+		@i @Orterm.0.imm@ = @Term.imm@ && @Orterm.1.imm@;
+
+	    @reg {
+			@Orterm.1.node@->reg = @Orterm.node@->reg;
+			if(@Orterm.1.imm@) {
+				@Term.node@->reg = @Orterm.node@->reg;
+			} else {
+				@Term.node@->reg = next_reg(@Orterm.1.node@->reg, @Orterm.gparamges@);
+			}
+		}
 	  @}
 	| OR Term
 	  @{
-		@i @Orterm.exprcount@ = @Term.exprcount@; fprintf(stderr, "(Orterm)- - Term\n");
-	  	/* TODO */
-	    @i @Orterm.node@ = TREENULL;
+	    @reg @Term.node@->reg = @Orterm.node@->reg;
 	  @}
 
 	;
@@ -319,64 +360,69 @@ Term:
 	  '(' Expr ')'
 	  @{
 	    @i @Term.node@ = @Expr.node@;
-		@i @Term.exprcount@ = 1 + @Expr.exprcount@; fprintf(stderr, "(Term)- ( Expr )\n");
 	  @}
 
 	| NUM
 	  @{
-		@i @Term.exprcount@ = 0; fprintf(stderr, "(Term)- NUM\n");
-	    @i @Term.node@ = new_number(@NUM.val@, @Term.exprcount@);
+	    @i @Term.node@ = new_number(@NUM.val@);
 		@i @Term.imm@ = 1;
 	  @}
 
 	| '-' NUM
 	  @{
-		@i @Term.exprcount@ = 0; fprintf(stderr, "(Term)- - NUM\n");
-	    @i @Term.node@ = new_number(-1 * (@NUM.val@), @Term.exprcount@);
+	    @i @Term.node@ = new_number(-1 * (@NUM.val@));
 		@i @Term.imm@ = 1;
 	  @}
 
 	| THIS
 	  @{
-		@i @Term.exprcount@ = 0; fprintf(stderr, "(Term)- THIS\n");
-	    @i @Term.node@ = new_param(O_ID, strdup("this"), TREENULL, TREENULL, 0, @Term.exprcount@);
+	    @i @Term.node@ = new_param(O_ID, strdup("this"), TREENULL, TREENULL, 0);
 		@i @Term.imm@ = 0;
 	  @}
 
 	| IDENT
 	  @{
 	    @c check(@Term.s@, @IDENT.name@, S_VAR|S_PARM);
-		@i @Term.exprcount@ = 0; fprintf(stderr, "(Term)- IDENT\n");
-	    @i @Term.node@ = new_param(O_ID, @IDENT.name@, TREENULL, TREENULL, tab_lookup(@Term.s@, @IDENT.name@, S_PARM) == SYMNULL ? -1 : tab_lookup(@Term.s@, @IDENT.name@, S_PARM)->param_index, @Term.exprcount@);
+
 		@i @Term.imm@ = 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 */
+				@Term.node@ = new_param(O_ID, @IDENT.name@, TREENULL, TREENULL, tab_lookup(@Term.s@, @IDENT.name@, S_PARM) == SYMNULL ? -1 : tab_lookup(@Term.s@, @IDENT.name@, S_PARM)->param_index);
+			}
+		}
+
+		@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
 	  @{
-	    @i @Term.node@ = TREENULL;
+	    @i @Term.node@ = @Feld.node@;
 		@i @Term.imm@ = 0;
-		/*TODO*/@i @Term.exprcount@ = 0;
 	  @}
 
 	| IDENT '(' Exprs ')'
 	  @{
 	    @i @Term.node@ = TREENULL;
 		@i @Term.imm@ = 0;
-		/*TODO*/@i @Term.exprcount@ = 0;
 	  @}
 
 	| Term '.' IDENT '(' Exprs ')'
 	  @{
 	    @i @Term.node@ = TREENULL;
 		@i @Term.imm@ = 0;
-		/*TODO*/@i @Term.exprcount@ = 0;
 	  @}
 
 	;
 
 Exprs:
 	  Expr ',' Exprs
-	  /* TODO: exprcount uppen */
 	| Expr
 	|
 	;