codea: parameter reihenfolge sollte passen

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

diff --git a/codea/parser.y b/codea/parser.y
index 3ccb81f705bb2cb25cb2accb7b697fd4480c0d44..f981df9e5f501f63083a676b53471583529268ac 100644 (file)
--- a/codea/parser.y
+++ b/codea/parser.y
@@ -26,7 +26,8 @@
 
 @attributes { char *name; } IDENT
 @attributes { long val; } NUM
-@attributes { struct symbol *f; } FeldID Parms Structdef Program
+@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; } Lexpr Expr Minusterm Multerm Orterm Term Feld
 @attributes { struct symbol *sin; struct symbol *sout; struct treenode *node; } Statement
@@ -61,6 +62,7 @@ Program:
 Methoddef:
          METHOD IDENT '(' Parms ')' Statseq END
          @{
+           @i @Parms.parms@ = 1;
            @i @Statseq.s@ = tab_merge(@Methoddef.s@, @Parms.f@, 0);
            @gen @revorder(1) func_header(@IDENT.name@);
          @}
@@ -77,7 +79,8 @@ Parms:
          /* lokale Vars werden in Statement in die tabelle eingefuegt */
          IDENT Parms
          @{
-           @i @Parms.0.f@ = tab_add_symbol(@Parms.1.f@, @IDENT.name@, S_PARM, 1);
+           @i @Parms.1.parms@ = @Parms.parms@ + 1;
+           @i @Parms.0.f@ = tab_add_symbol(@Parms.1.f@, @IDENT.name@, S_PARM, 1, @Parms.parms@);
          @}
 
        |
@@ -89,7 +92,7 @@ Parms:
 FeldID:
          IDENT FeldID
          @{
-           @i @FeldID.0.f@ = tab_add_symbol(@FeldID.1.f@, @IDENT.name@, S_FIELD, 1);
+           @i @FeldID.0.f@ = tab_add_symbol(@FeldID.1.f@, @IDENT.name@, S_FIELD, 1, 0);
          @}
 
        |
@@ -122,7 +125,7 @@ Statement:
          @{
                /* tab_clone ist hier noetig, vgl. folgendes statement
                 * > var x := x - 1; */
-               @i @Statement.sout@ = tab_add_symbol(tab_clone(@Statement.sin@), @IDENT.name@, S_VAR, 1);
+               @i @Statement.sout@ = tab_add_symbol(tab_clone(@Statement.sin@), @IDENT.name@, S_VAR, 1, 0);
                xxputsin(@Expr.s@,)
            @i @Statement.node@ = TREENULL;
          @}
@@ -293,7 +296,12 @@ Term:
        | IDENT
          @{
            @c check(@Term.s@, @IDENT.name@, S_VAR|S_PARM);
-           @i @Term.node@ = new_node(O_ID, TREENULL, TREENULL); @Term.node@->param_index=1;
+           @i @Term.node@ = new_node(O_ID, TREENULL, TREENULL); {
+                       struct symbol *tmp;
+                       if((tmp = tab_lookup(@Term.s@, @IDENT.name@, S_PARM)) != TREENULL) {
+                               @Term.node@->param_index = tmp->param_index;
+                       }
+               }
            @reg fprintf(stderr, "wtf5\n");
          @}