codea: hoffentlich passt jetzt 'expr'-zaehlen?

diff --git a/codea/parser.y b/codea/parser.y
index a804229a7bf18e0e20eb404e2f38b9232b14af52..2df6af47eb8b9863ac0e070a1babfc88888c7dc2 100644 (file)
--- a/codea/parser.y
+++ b/codea/parser.y
@@ -5,6 +5,8 @@
        #include "symtable.h"
        #include "chelper.h"
        #include "tree.h"
+
+       #define MAX(A,B) (A > B ? A : B)
 %}
 
 %start Input
@@ -42,7 +44,8 @@
 @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; } Lexpr Multerm Orterm Feld
+@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 *sin; int gparamges; struct symbol *sout; struct treenode *node; } Statement
 
 @traversal @postorder c
@@ -182,7 +185,7 @@ Statement:
          @{
                statinout()
                xxputsin(@Expr.s@,)
-               @i @Statement.node@ = new_node(O_RET, @Expr.node@, TREENULL, 0);
+               @i @Statement.node@ = new_node(O_RET, @Expr.node@, TREENULL, @Expr.exprcount@+1); if(@Expr.gparamges@ + @Expr.exprcount@ + 1 > 7) { fprintf(stderr, "RETURN: zu hohe tiefe (gparamges: %i, exprcount: %i, gesamt %i [maximal: 7])\n", @Expr.gparamges@, @Expr.exprcount@+1, @Expr.gparamges@+@Expr.exprcount@+1); }
                @reg @Statement.node@->reg = next_reg((char *)NULL, 0, @Expr.gparamges@); @Expr.node@->reg = @Statement.node@->reg;
          @}
        ;
@@ -208,18 +211,18 @@ Expr:
          Term
          @{
            @reg @Term.node@->reg = @Expr.node@->reg;
-               @i @Expr.exprcount@ = 1 + @Term.exprcount@; fprintf(stderr, "(Expr)- Term\n");
+               @i @Expr.exprcount@ = @Term.exprcount@; fprintf(stderr, "(Expr)- Term\n");
          @}
 
        | NOT Term
          @{
            @i @Expr.node@ = TREENULL;
-               @i @Expr.exprcount@ = 1 + @Term.exprcount@; fprintf(stderr, "(Expr)- NOT Term\n");
+               @i @Expr.exprcount@ = @Term.exprcount@; fprintf(stderr, "(Expr)- NOT Term\n");
          @}
 
        | Term Minusterm
          @{
-               @i @Expr.exprcount@ = 1 + @Term.exprcount@ + @Minusterm.exprcount@; fprintf(stderr, "(Expr)- Term Minusterm\n");
+               @i @Expr.exprcount@ = @Term.exprcount@ + @Minusterm.exprcount@; fprintf(stderr, "(Expr)- Term Minusterm\n");
            @i @Expr.node@ = new_node(O_SUB, @Minusterm.node@, @Term.node@, @Expr.exprcount@);
                @i @Expr.imm@ = @Term.imm@ && @Minusterm.imm@;
 
@@ -234,34 +237,34 @@ Expr:
        | Term Multerm
          @{
            @i @Expr.node@ = TREENULL;
-               @i @Expr.exprcount@ = 1 + @Term.exprcount@; fprintf(stderr, "(Expr)- Term Multerm\n");
+               @i @Expr.exprcount@ = @Term.exprcount@ + @Multerm.exprcount@; fprintf(stderr, "(Expr)- Term Multerm\n");
          @}
 
        | Term Orterm
          @{
            @i @Expr.node@ = TREENULL;
-               @i @Expr.exprcount@ = 1 + @Term.exprcount@; fprintf(stderr, "(Expr)- Term OrTerm\n");
+               @i @Expr.exprcount@ = @Term.exprcount@ + @Orterm.exprcount@; fprintf(stderr, "(Expr)- Term Orterm\n");
          @}
 
        | Term '<' Term
          @{
            @i @Expr.node@ = TREENULL;
                /* das is bloedsinn atm */ @i @Expr.imm@ = @Term.0.imm@ && @Term.1.imm@;
-               @i @Expr.exprcount@ = 1 + @Term.0.exprcount@ + @Term.1.exprcount@; fprintf(stderr, "(Expr)- Term < Term\n");
+               @i @Expr.exprcount@ = @Term.0.exprcount@ + @Term.1.exprcount@; fprintf(stderr, "(Expr)- Term < Term\n");
          @}
 
        | Term '=' Term
          @{
            @i @Expr.node@ = TREENULL;
                /* das is bloedsinn atm */ @i @Expr.imm@ = @Term.0.imm@ && @Term.1.imm@;
-               @i @Expr.exprcount@ = 1 + @Term.0.exprcount@ + @Term.1.exprcount@; fprintf(stderr, "(Expr)- Term = Term\n");
+               @i @Expr.exprcount@ = @Term.0.exprcount@ + @Term.1.exprcount@; fprintf(stderr, "(Expr)- Term = Term\n");
          @}
        ;
 
 Minusterm:
          '-' Term Minusterm
          @{
-               @i @Minusterm.0.exprcount@ = 1 + @Term.exprcount@ + @Minusterm.1.exprcount@; fprintf(stderr, "(Minusterm)- - Term Minusterm\n");
+               @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@;
 
@@ -273,7 +276,7 @@ Minusterm:
 
        | '-' Term
          @{
-               @i @Minusterm.exprcount@ = 1 + @Term.exprcount@; fprintf(stderr, "(Minusterm)- - Term\n");
+               @i @Minusterm.exprcount@ = @Term.exprcount@; fprintf(stderr, "(Minusterm)- - Term\n");
            @reg @Term.node@->reg = @Minusterm.node@->reg;
          @}
        ;
@@ -281,11 +284,16 @@ Minusterm:
 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;
          @}
 
        | '*' Term
          @{
+               @i @Multerm.exprcount@ = @Term.exprcount@; fprintf(stderr, "(Multerm)- - Term\n");
+               /* TODO */
            @i @Multerm.node@ = TREENULL;
          @}
        ;
@@ -293,10 +301,15 @@ Multerm:
 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;
          @}
        | OR Term
          @{
+               @i @Orterm.exprcount@ = @Term.exprcount@; fprintf(stderr, "(Orterm)- - Term\n");
+               /* TODO */
            @i @Orterm.node@ = TREENULL;
          @}
 
@@ -306,26 +319,26 @@ Term:
          '(' Expr ')'
          @{
            @i @Term.node@ = @Expr.node@;
-               @i @Term.exprcount@ = @Expr.exprcount@ + 1; fprintf(stderr, "(Term)- ( Expr )\n");
+               @i @Term.exprcount@ = 1 + @Expr.exprcount@; fprintf(stderr, "(Term)- ( Expr )\n");
          @}
 
        | NUM
          @{
-               @i @Term.exprcount@ = 1; fprintf(stderr, "(Term)- NUM\n");
+               @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@ = 1; fprintf(stderr, "(Term)- - NUM\n");
+               @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@ = 1; fprintf(stderr, "(Term)- THIS\n");
+               @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;
          @}
@@ -333,7 +346,7 @@ Term:
        | IDENT
          @{
            @c check(@Term.s@, @IDENT.name@, S_VAR|S_PARM);
-               @i @Term.exprcount@ = 1; fprintf(stderr, "(Term)- IDENT\n");
+               @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;
          @}
@@ -342,27 +355,28 @@ Term:
          @{
            @i @Term.node@ = TREENULL;
                @i @Term.imm@ = 0;
-               /*TODO*/@i @Term.exprcount@ = 1;
+               /*TODO*/@i @Term.exprcount@ = 0;
          @}
 
        | IDENT '(' Exprs ')'
          @{
            @i @Term.node@ = TREENULL;
                @i @Term.imm@ = 0;
-               /*TODO*/@i @Term.exprcount@ = 1;
+               /*TODO*/@i @Term.exprcount@ = 0;
          @}
 
        | Term '.' IDENT '(' Exprs ')'
          @{
            @i @Term.node@ = TREENULL;
                @i @Term.imm@ = 0;
-               /*TODO*/@i @Term.exprcount@ = 1;
+               /*TODO*/@i @Term.exprcount@ = 0;
          @}
 
        ;
 
 Exprs:
          Expr ',' Exprs
+         /* TODO: exprcount uppen */
        | Expr
        |
        ;