X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=codea%2Fparser.y;h=4e460e087d662fbf093802aad1a673039990487c;hb=9fa7e43000403e78ecad7f3cd8c33b719958cf64;hp=0c58a77d51466bcd558ba33c06e038b83fc2203e;hpb=97d1e095c7e54150e898afc4826b94aed6cf7f8b;p=uebersetzerbau-ss10.git

diff --git a/codea/parser.y b/codea/parser.y
index 0c58a77..4e460e0 100644
--- a/codea/parser.y
+++ b/codea/parser.y
@@ -43,8 +43,8 @@
 @attributes { struct symbol *f; } FeldID Structdef Program
 @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; short imm; int exprcount; } Expr Minusterm Term Multerm
+@attributes { struct symbol *s; int gparamges; struct treenode *node; int exprcount; } Orterm
 @attributes { struct symbol *s; int gparamges; struct treenode *node; } Lexpr Feld
 @attributes { struct symbol *sin; int gparamges; struct symbol *sout; struct treenode *node; } Statement
 
@@ -236,8 +236,16 @@ Expr:
 
 	| 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 {
+			/* TODO */
+			@Term.node@->reg = @Expr.node@->reg;
+			@Term.node@->skip = 0;
+			@Multerm.node@->reg = next_reg(@Term.node@->reg, @Expr.node@->skip, @Expr.gparamges@);
+		}
 	  @}
 
 	| Term Orterm
@@ -285,16 +293,19 @@ 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.imm@ = @Term.imm@ && @Multerm.1.imm@;
+
+	    @reg {
+			@Multerm.1.node@->reg = @Multerm.node@->reg;
+			@Term.node@->reg = next_reg(@Multerm.1.node@->reg, @Multerm.node@->skip, @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;
 	  @}
 	;