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

diff --git a/codea/parser.y b/codea/parser.y
index d1e6024..bab08bc 100644
--- a/codea/parser.y
+++ b/codea/parser.y
@@ -34,7 +34,7 @@
  * sout:
  */
 @autoinh s gparamges
-@autosyn node
+@autosyn node imm
 
 @attributes { char *name; } IDENT
 @attributes { long val; } NUM
@@ -43,7 +43,7 @@
 @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; int exprcount; } Expr Minusterm Multerm Orterm Feld Term
+@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
 
@@ -187,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@);
 	  @}
 	;
 
@@ -232,12 +232,17 @@ Expr:
 	  @{
 		@i @Expr.exprcount@ = @Term.exprcount@ + @Minusterm.exprcount@; fprintf(stderr, "(Expr)- Term Minusterm\n");
 	    @i @Expr.node@ = new_node(O_SUB, @Term.node@, @Minusterm.node@, @Expr.exprcount@);
+		@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@);
+				}
+			}
 		}
 	  @}
 
@@ -245,12 +250,15 @@ Expr:
 	  @{
 		@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@);
+			if(@Term.imm@) {
+				@Multerm.node@->reg = @Expr.node@->reg;
+			} else {
+				@Multerm.node@->reg = next_reg(@Term.node@->reg, @Expr.gparamges@);
+			}
 		}
 	  @}
 
@@ -258,12 +266,11 @@ Expr:
 	  @{
 		@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 {
-			/* TODO */
 			@Term.node@->reg = @Expr.node@->reg;
-			@Term.node@->skip = 0;
-			@Orterm.node@->reg = next_reg(@Term.node@->reg, @Expr.node@->skip, @Expr.gparamges@);
+			@Orterm.node@->reg = next_reg(@Term.node@->reg, @Expr.gparamges@);
 		}
 	  @}
 
@@ -271,10 +278,11 @@ Expr:
 	  @{
 		@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.node@->skip, @Expr.gparamges@);
+			@Term.1.node@->reg = next_reg(@Term.0.node@->reg, @Expr.gparamges@);
 		}
 	  @}
 
@@ -282,10 +290,11 @@ Expr:
 	  @{
 		@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.node@->skip, @Expr.gparamges@);
+			@Term.1.node@->reg = next_reg(@Term.0.node@->reg, @Expr.gparamges@);
 		}
 	  @}
 	;
@@ -295,10 +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.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@);
+			}
 		}
 	  @}
 
@@ -314,10 +328,15 @@ Multerm:
 	  @{
 		@i @Multerm.0.exprcount@ = @Term.exprcount@ + @Multerm.1.exprcount@; fprintf(stderr, "(Multerm)- - Term Multerm\n");
 	    @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;
-			@Term.node@->reg = next_reg(@Multerm.1.node@->reg, @Multerm.node@->skip, @Multerm.gparamges@);
+			if(@Multerm.1.imm@) {
+				@Term.node@->reg = @Multerm.node@->reg;
+			} else {
+				@Term.node@->reg = next_reg(@Multerm.1.node@->reg, @Multerm.gparamges@);
+			}
 		}
 	  @}
 
@@ -333,10 +352,15 @@ Orterm:
 	  @{
 		@i @Orterm.0.exprcount@ = @Term.exprcount@ + @Orterm.1.exprcount@; fprintf(stderr, "(Orterm)- - Term Orterm\n");
 	    @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;
-			@Term.node@->reg = next_reg(@Orterm.1.node@->reg, @Orterm.node@->skip, @Orterm.gparamges@);
+			if(@Orterm.1.imm@) {
+				@Term.node@->reg = @Orterm.node@->reg;
+			} else {
+				@Term.node@->reg = next_reg(@Orterm.1.node@->reg, @Orterm.gparamges@);
+			}
 		}
 	  @}
 	| OR Term
@@ -358,18 +382,21 @@ Term:
 	  @{
 		@i @Term.exprcount@ = 0; fprintf(stderr, "(Term)- NUM\n");
 	    @i @Term.node@ = new_number(@NUM.val@, @Term.exprcount@);
+		@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.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.imm@ = 0;
 	  @}
 
 	| IDENT
@@ -377,6 +404,7 @@ Term:
 	    @c check(@Term.s@, @IDENT.name@, S_VAR|S_PARM);
 
 		@i @Term.exprcount@ = 0; fprintf(stderr, "(Term)- IDENT\n");
+		@i @Term.imm@ = 0;
 	    @i {
 			@Term.node@ = TREENULL;
 			if(tab_lookup(@Term.s@, @IDENT.name@, S_VAR|S_PARM) == SYMNULL) {
@@ -397,18 +425,21 @@ Term:
 	  @{
 	    @i @Term.node@ = @Feld.node@;
 		/*TODO*/@i @Term.exprcount@ = 0;
+		@i @Term.imm@ = 0;
 	  @}
 
 	| IDENT '(' Exprs ')'
 	  @{
 	    @i @Term.node@ = TREENULL;
 		/*TODO*/@i @Term.exprcount@ = 0;
+		@i @Term.imm@ = 0;
 	  @}
 
 	| Term '.' IDENT '(' Exprs ')'
 	  @{
 	    @i @Term.node@ = TREENULL;
 		/*TODO*/@i @Term.exprcount@ = 0;
+		@i @Term.imm@ = 0;
 	  @}
 
 	;