codea: refactor, teil1

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

diff --git a/codea/parser.y b/codea/parser.y
index c01bee7d93c7480451077e00ce4f2f346b74a563..bab08bcc61e9a2e434282959fd57eab41159c883 100644 (file)
--- a/codea/parser.y
+++ b/codea/parser.y
@@ -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@);
          @}
        ;
 
@@ -237,11 +237,10 @@ Expr:
                @reg {
                        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@);
+                                       @Minusterm.node@->reg = next_reg(@Term.node@->reg, @Expr.gparamges@);
                                }
                        }
                }
@@ -255,11 +254,10 @@ Expr:
 
                @reg {
                        @Term.node@->reg = @Expr.node@->reg;
-                       @Term.node@->skip = 0;
                        if(@Term.imm@) {
                                @Multerm.node@->reg = @Expr.node@->reg;
                        } else {
-                               @Multerm.node@->reg = next_reg(@Term.node@->reg, @Expr.node@->skip, @Expr.gparamges@);
+                               @Multerm.node@->reg = next_reg(@Term.node@->reg, @Expr.gparamges@);
                        }
                }
          @}
@@ -271,10 +269,8 @@ Expr:
                @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@);
                }
          @}
 
@@ -286,7 +282,7 @@ Expr:
 
                @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@);
                }
          @}
 
@@ -298,7 +294,7 @@ Expr:
 
                @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@);
                }
          @}
        ;
@@ -315,7 +311,7 @@ Minusterm:
                        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@);
+                               @Term.node@->reg = next_reg(@Minusterm.1.node@->reg, @Minusterm.gparamges@);
                        }
                }
          @}
@@ -339,7 +335,7 @@ Multerm:
                        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@);
+                               @Term.node@->reg = next_reg(@Multerm.1.node@->reg, @Multerm.gparamges@);
                        }
                }
          @}
@@ -363,7 +359,7 @@ Orterm:
                        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@);
+                               @Term.node@->reg = next_reg(@Orterm.1.node@->reg, @Orterm.gparamges@);
                        }
                }
          @}