ag: scope von feldern

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

diff --git a/ag/parser.y b/ag/parser.y
index e8c71d65ebe33e4b30cbe47e12c60bbe22d8323e..d7cdf4a8b9ca590a25669c49b5b554fbc42d2717 100644 (file)
--- a/ag/parser.y
+++ b/ag/parser.y
@@ -21,13 +21,9 @@
 @end
 
 @autoinh s
-/* f .. fields
- * s .. symbols  */
 @attributes { char *name; } IDENT
-@attributes { struct symbol *f; struct symbol *s; } Program
-@attributes { struct symbol *f; } Idents Structdef Parms
-@attributes { struct symbol *s; } Methoddef Statseq Lexpr Expr Minusterm Multerm Orterm
-Term Exprs Feld
+@attributes { struct symbol *f; } FeldID Parms Structdef Program
+@attributes { struct symbol *s; } Methoddef Statseq Lexpr Expr Minusterm Multerm Orterm Term Exprs Feld
 @attributes { struct symbol *sin; struct symbol *sout; } Statement
 
 @traversal @postorder c
@@ -36,25 +32,22 @@ Term Exprs Feld
 Input:
          Program
          @{
-               @i @Program.s@ = @Program.f@;
+           @i @Program.f@ = new_tab();
          @}
        ;
 
 Program:
          Methoddef ';' Program
          @{
-           @i @Program.0.f@ = @Program.1.f@;
+           @i @Methoddef.s@ = @Program.0.f@;
+           @i @Program.1.f@ = @Program.0.f@;
          @}
-         
+
        | Structdef ';' Program
          @{
-           @i @Program.0.f@ = tab_merge(@Structdef.f@, @Program.1.f@, 1);
+           @i @Program.1.f@ = tab_merge(@Program.0.f@, @Structdef.f@, 1);
          @}
-
        |
-         @{
-               @i @Program.0.f@ = new_tab();
-         @}
        ;
 
 Methoddef:
@@ -65,9 +58,9 @@ Methoddef:
        ;
 
 Structdef:
-         STRUCT Idents END
+         STRUCT FeldID END
          @{
-           @i @Structdef.f@ = @Idents.f@;
+           @i @Structdef.f@ = @FeldID.f@;
          @}
        ;
 
@@ -84,15 +77,15 @@ Parms:
          @}
        ;
 
-Idents:
-         IDENT Idents
+FeldID:
+         IDENT FeldID
          @{
-           @i @Idents.0.f@ = tab_add_symbol(@Idents.1.f@, @IDENT.name@, S_FIELD, 1);
+           @i @FeldID.0.f@ = tab_add_symbol(@FeldID.1.f@, @IDENT.name@, S_FIELD, 1);
          @}
 
        |
          @{
-           @i @Idents.f@ = new_tab();
+           @i @FeldID.f@ = new_tab();
          @}
        ;
 
@@ -158,7 +151,7 @@ Statement:
 Lexpr:
          IDENT
          @{
-               @c check_variable(@Lexpr.s@, @IDENT.name@);
+               @c check(@Lexpr.s@, @IDENT.name@, S_VAR);
          @}
 
        | Feld
@@ -166,7 +159,7 @@ Lexpr:
 
 Feld: Term '.' IDENT
          @{
-               @c check_field(@Feld.s@, @IDENT.name@);
+               @c check(@Feld.s@, @IDENT.name@, S_FIELD);
          @}
        ;
 
@@ -202,19 +195,12 @@ Term:
        | THIS
        | IDENT
          @{
-               @c check_variable(@Term.s@, @IDENT.name@);
+               @c check(@Term.s@, @IDENT.name@, S_VAR);
          @}
 
        | Feld
        | IDENT '(' Exprs ')'
-         @{
-               @c check_variable(@Term.s@, @IDENT.name@);
-         @}
-
        | Term '.' IDENT '(' Exprs ')'
-         @{
-               @c check_variable(@Term.s@, @IDENT.name@);
-         @}
        ;
 
 Exprs: