codea: bugfix fuer ag-part...

[uebersetzerbau-ss10.git] / codea / parser.y

diff --git a/codea/parser.y b/codea/parser.y
index d1e6024959281b916d762ca57b342a465139a9e6..c01bee7d93c7480451077e00ce4f2f346b74a563 100644 (file)
--- 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
 
@@ -232,12 +232,18 @@ 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;
+                               @Term.node@->skip = 0;
+                               if(@Minusterm.imm@) {
+                                       @Minusterm.node@->reg = @Expr.node@->reg;
+                               } else {
+                                       @Minusterm.node@->reg = next_reg(@Term.node@->reg, @Expr.node@->skip, @Expr.gparamges@);
+                               }
+                       }
                }
          @}
 
@@ -245,12 +251,16 @@ 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.node@->skip, @Expr.gparamges@);
+                       }
                }
          @}
 
@@ -258,6 +268,7 @@ 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 */
@@ -271,6 +282,7 @@ 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;
@@ -282,6 +294,7 @@ 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;
@@ -295,10 +308,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.node@->skip, @Minusterm.gparamges@);
+                       }
                }
          @}
 
@@ -314,10 +332,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.node@->skip, @Multerm.gparamges@);
+                       }
                }
          @}
 
@@ -333,10 +356,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.node@->skip, @Orterm.gparamges@);
+                       }
                }
          @}
        | OR Term
@@ -358,18 +386,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 +408,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 +429,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;
          @}
 
        ;