codea: feldzugriffe

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

diff --git a/codea/parser.y b/codea/parser.y
index a6bb1d3a059a43fa0d98676876fd9a2ae9ef6c05..fa8d988e2beaba4e79e879c48234d8bec38d7fce 100644 (file)
--- a/codea/parser.y
+++ b/codea/parser.y
@@ -43,8 +43,8 @@
 @attributes { struct symbol *f; int soffset; int offsetcount; } FeldID Structdef
 @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 Term Multerm Orterm
-@attributes { struct symbol *s; int gparamges; struct treenode *node; } Lexpr Feld
+@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; } Lexpr
 @attributes { struct symbol *sin; int gparamges; struct symbol *sout; struct treenode *node; } Statement
 
 @traversal @postorder c
@@ -204,6 +204,8 @@ Lexpr:
          @{
            @i @Lexpr.node@ = TREENULL;
            @c check(@Lexpr.s@, @IDENT.name@, S_VAR|S_PARM);
+               /* this.feldname */
+               /* TODO fuer zuweisungen ... (codeb?) */
          @}
 
        | Feld
@@ -212,7 +214,10 @@ Lexpr:
 Feld: Term '.' IDENT
          @{
            @c check(@Feld.s@, @IDENT.name@, S_FIELD);
-           @i @Feld.node@ = TREENULL;
+           @i @Feld.node@ = new_field(@IDENT.name@, @Term.node@, TREENULL, tab_lookup(@Feld.s@, @IDENT.name@, S_FIELD) == SYMNULL ? -1 : tab_lookup(@Feld.s@, @IDENT.name@, S_FIELD)->soffset, @Feld.exprcount@);
+
+               @i @Feld.exprcount@ = @Term.exprcount@; fprintf(stderr, "(Feld)- Term.IDENT\n");
+               @reg @Term.node@->reg = @Feld.node@->reg;
          @}
        ;
 
@@ -376,13 +381,27 @@ Term:
        | IDENT
          @{
            @c check(@Term.s@, @IDENT.name@, S_VAR|S_PARM);
+
                @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.node@ = TREENULL;
+                       if(tab_lookup(@Term.s@, @IDENT.name@, S_VAR|S_PARM) == SYMNULL) {
+                               /* es handelt sich um ein feldzugriff auf this */
+                               @Term.node@ = new_field(@IDENT.name@, new_param(O_ID, strdup("this"), TREENULL, TREENULL, 0, @Term.exprcount@), TREENULL, tab_lookup(@Term.s@, @IDENT.name@, S_FIELD) == SYMNULL ? -1 : tab_lookup(@Term.s@, @IDENT.name@, S_FIELD)->soffset, @Term.exprcount@);
+                       } else { /* param oder var */
+                               @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@);
+                       }
+               }
+
+               @reg if(tab_lookup(@Term.s@, @IDENT.name@, S_VAR|S_PARM) == SYMNULL) {
+                       /* TODO: kein schoener hack? */
+                       @Term.node@->kids[0]->reg = @Term.node@->reg;
+               }
          @}
 
        | Feld
          @{
-           @i @Term.node@ = TREENULL;
+           @i @Term.node@ = @Feld.node@;
                /*TODO*/@i @Term.exprcount@ = 0;
          @}