X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=codea%2Fparser.y;h=bab08bcc61e9a2e434282959fd57eab41159c883;hb=c2a8a36f40f5dd2bdb26b07c4f9fc61801abbe3d;hp=0c58a77d51466bcd558ba33c06e038b83fc2203e;hpb=8836ee65981a63b5fb0864b1db06a9e40fcf9572;p=uebersetzerbau-ss10.git

diff --git a/codea/parser.y b/codea/parser.y
index 0c58a77..bab08bc 100644
--- a/codea/parser.y
+++ b/codea/parser.y
@@ -29,7 +29,6 @@
  * gparamges:
  * parms:
  * node:
- * imm:
  * exprcount:
  * sin:
  * sout:
@@ -40,12 +39,12 @@
 @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; int exprcount; 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
@@ -89,6 +88,7 @@ Structdef:
 	  STRUCT FeldID END
 	  @{
 	    @i @Structdef.f@ = @FeldID.f@;
+		@i @FeldID.offsetcount@ = 0;
 	  @}
 	;
 
@@ -96,9 +96,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 +111,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 +145,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;
 	  @}
@@ -186,7 +187,7 @@ Statement:
 	  	statinout()
 		xxputsin(@Expr.s@,)
 		@i @Statement.node@ = new_node(O_RET, @Expr.node@, TREENULL, @Expr.exprcount@+1); fprintf(stderr, "RETURN: %s (gparamges: %i, exprcount: %i, gesamt %i [maximal: 7])\n", @Expr.gparamges@ + @Expr.exprcount@ + 1 > 7 ? "zu hohe tiefe" : "tiefe passt", @Expr.gparamges@, @Expr.exprcount@+1, @Expr.gparamges@+@Expr.exprcount@+1);
-		@reg @Statement.node@->reg = @Expr.node@->reg = next_reg((char *)NULL, 0, @Expr.gparamges@);
+		@reg @Statement.node@->reg = @Expr.node@->reg = next_reg((char *)NULL, @Expr.gparamges@);
 	  @}
 	;
 
@@ -195,6 +196,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 +206,10 @@ 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, @Feld.exprcount@);
+
+		@i @Feld.exprcount@ = @Term.exprcount@; fprintf(stderr, "(Feld)- Term.IDENT\n");
+		@reg @Term.node@->reg = @Feld.node@->reg;
 	  @}
 	;
 
@@ -216,8 +222,10 @@ Expr:
 
 	| 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, @Expr.exprcount@), @Expr.exprcount@);
+
+		@reg @Term.node@->reg = @Expr.node@->reg;
 	  @}
 
 	| Term Minusterm
@@ -227,37 +235,67 @@ Expr:
 		@i @Expr.imm@ = @Term.imm@ && @Minusterm.imm@;
 
 		@reg {
-			/* TODO */
-			@Term.node@->reg = @Expr.node@->reg;
-			@Term.node@->skip = 0;
-			@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@, @Expr.exprcount@);
+		@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@, @Expr.exprcount@);
+		@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@, @Expr.exprcount@);
+		@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@, @Expr.exprcount@);
+		@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@);
+		}
 	  @}
 	;
 
@@ -266,11 +304,15 @@ 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.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@);
+			}
 		}
 	  @}
 
@@ -285,16 +327,23 @@ 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@, @Multerm.0.exprcount@);
+		@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;
 	  @}
 	;
 
@@ -302,15 +351,22 @@ 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@, @Orterm.0.exprcount@);
+		@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;
 	  @}
 
 	;
@@ -346,30 +402,44 @@ Term:
 	| 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, @Term.exprcount@), TREENULL, tab_lookup(@Term.s@, @IDENT.name@, S_FIELD) == SYMNULL ? -1 : tab_lookup(@Term.s@, @IDENT.name@, S_FIELD)->soffset, @Term.exprcount@);
+			} 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, @Term.exprcount@);
+			}
+		}
+
+		@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.imm@ = 0;
+	    @i @Term.node@ = @Feld.node@;
 		/*TODO*/@i @Term.exprcount@ = 0;
+		@i @Term.imm@ = 0;
 	  @}
 
 	| IDENT '(' Exprs ')'
 	  @{
 	    @i @Term.node@ = TREENULL;
-		@i @Term.imm@ = 0;
 		/*TODO*/@i @Term.exprcount@ = 0;
+		@i @Term.imm@ = 0;
 	  @}
 
 	| Term '.' IDENT '(' Exprs ')'
 	  @{
 	    @i @Term.node@ = TREENULL;
-		@i @Term.imm@ = 0;
 		/*TODO*/@i @Term.exprcount@ = 0;
+		@i @Term.imm@ = 0;
 	  @}
 
 	;