codea: exprcount (funktioniert vllt noch nicht richtig)

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

diff --git a/codea/parser.y b/codea/parser.y
index 15b2424eb53e747e73a9b9d2a2e0abd1e09768dd..e5a7dd2dc2e0832967d80dd59a76b54b3c99a9a4 100644 (file)
--- a/codea/parser.y
+++ b/codea/parser.y
@@ -22,14 +22,14 @@
 @end
 
 @autoinh s
-@autosyn node imm
+@autosyn node imm exprcount
 
 @attributes { char *name; } IDENT
 @attributes { long val; } NUM
 @attributes { struct symbol *f; int parms; } Parms
 @attributes { struct symbol *f; } FeldID Structdef Program
 @attributes { struct symbol *s; } Methoddef Statseq Exprs
-@attributes { struct symbol *s; struct treenode *node; short imm; } Expr Minusterm Term
+@attributes { struct symbol *s; struct treenode *node; short imm; int exprcount; } Expr Minusterm Term
 @attributes { struct symbol *s; struct treenode *node; } Lexpr Multerm Orterm Feld
 @attributes { struct symbol *sin; struct symbol *sout; struct treenode *node; } Statement
 
@@ -167,7 +167,7 @@ Statement:
          @{
                statinout()
                xxputsin(@Expr.s@,)
-               @i @Statement.node@ = new_node(O_RET, @Expr.node@, TREENULL);
+               @i @Statement.node@ = new_node(O_RET, @Expr.node@, TREENULL, 0);
                @reg @Statement.node@->reg = next_reg((char *)NULL, 0); @Expr.node@->reg = @Statement.node@->reg;
          @}
        ;
@@ -202,7 +202,8 @@ Expr:
 
        | Term Minusterm
          @{
-           @i @Expr.node@ = new_node(O_SUB, @Minusterm.node@, @Term.node@);
+               @i @Expr.exprcount@ = @Term.exprcount@ + @Minusterm.exprcount@;
+           @i @Expr.node@ = new_node(O_SUB, @Minusterm.node@, @Term.node@, @Expr.exprcount@);
                @i @Expr.imm@ = @Term.imm@ && @Minusterm.imm@;
 
                @reg {
@@ -228,19 +229,22 @@ Expr:
          @{
            @i @Expr.node@ = TREENULL;
                /* das is bloedsinn atm */ @i @Expr.imm@ = @Term.0.imm@ && @Term.1.imm@;
+               /* das is bloedsinn atm */ @i @Expr.exprcount@ = 0;
          @}
 
        | Term '=' Term
          @{
            @i @Expr.node@ = TREENULL;
                /* das is bloedsinn atm */ @i @Expr.imm@ = @Term.0.imm@ && @Term.1.imm@;
+               /* das is bloedsinn atm */ @i @Expr.exprcount@ = 0;
          @}
        ;
 
 Minusterm:
          '-' Term Minusterm
          @{
-           @i @Minusterm.node@ = new_node(O_ADD, @Minusterm.1.node@, @Term.node@);
+               @i @Minusterm.0.exprcount@ = @Term.exprcount@ + @Minusterm.1.exprcount@;
+           @i @Minusterm.node@ = new_node(O_ADD, @Minusterm.1.node@, @Term.node@, @Minusterm.0.exprcount@);
                @i @Minusterm.imm@ = @Term.imm@ && @Minusterm.1.imm@;
 
            @reg {
@@ -251,6 +255,7 @@ Minusterm:
 
        | '-' Term
          @{
+               @i @Minusterm.exprcount@ = @Term.exprcount@;
            @reg @Term.node@->reg = @Minusterm.node@->reg;
          @}
        ;
@@ -283,30 +288,35 @@ Term:
          '(' Expr ')'
          @{
            @i @Term.node@ = @Expr.node@;
+               @i @Term.exprcount@ = @Expr.exprcount@ + 1;
          @}
 
        | NUM
          @{
-           @i @Term.node@ = new_number(@NUM.val@);
+               @i @Term.exprcount@ = 1;
+           @i @Term.node@ = new_number(@NUM.val@, @Term.exprcount@);
                @i @Term.imm@ = 1;
          @}
 
        | '-' NUM
          @{
-           @i @Term.node@ = new_number(-1 * (@NUM.val@));
+               @i @Term.exprcount@ = 1;
+           @i @Term.node@ = new_number(-1 * (@NUM.val@), @Term.exprcount@);
                @i @Term.imm@ = 1;
          @}
 
        | THIS
          @{
-           @i @Term.node@ = new_param(O_ID, TREENULL, TREENULL, 0);
+               @i @Term.exprcount@ = 1;
+           @i @Term.node@ = new_param(O_ID, TREENULL, TREENULL, 0, @Term.exprcount@);
                @i @Term.imm@ = 0;
          @}
 
        | IDENT
          @{
            @c check(@Term.s@, @IDENT.name@, S_VAR|S_PARM);
-           @i @Term.node@ = new_param(O_ID, TREENULL, TREENULL, tab_lookup(@Term.s@, @IDENT.name@, S_PARM) == SYMNULL ? -1 : tab_lookup(@Term.s@, @IDENT.name@, S_PARM)->param_index);
+               @i @Term.exprcount@ = 1;
+           @i @Term.node@ = new_param(O_ID, 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;
          @}
 
@@ -314,18 +324,21 @@ Term:
          @{
            @i @Term.node@ = TREENULL;
                @i @Term.imm@ = 0;
+               /*TODO*/@i @Term.exprcount@ = 1;
          @}
 
        | IDENT '(' Exprs ')'
          @{
            @i @Term.node@ = TREENULL;
                @i @Term.imm@ = 0;
+               /*TODO*/@i @Term.exprcount@ = 1;
          @}
 
        | Term '.' IDENT '(' Exprs ')'
          @{
            @i @Term.node@ = TREENULL;
                @i @Term.imm@ = 0;
+               /*TODO*/@i @Term.exprcount@ = 1;
          @}
 
        ;