ag: symbol table refactor

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

diff --git a/ag/parser.y b/ag/parser.y
index 7634069298681de8a634b4c1b3dc7519515a2d41..ba76bb68add9970682d287e55d351701e1a36120 100644 (file)
--- a/ag/parser.y
+++ b/ag/parser.y
@@ -12,11 +12,11 @@
 @autoinh symbols
 
 @attributes    { char *name; } ID
-@attributes    { struct symbol_t *fields; struct symbol_t *symbols; } Program
-@attributes    { struct symbol_t *fields; } Ids Structdef
-@attributes    { struct symbol_t *pars; } Pars
-@attributes    { struct symbol_t *symbols; } Funcdef Stats Bool Expr Call Lexpr Field Term Plusterm Malterm Bterm Orterm Exprs
-@attributes    { struct symbol_t *in_symbols; struct symbol_t *out_symbols; } Stat
+@attributes    { struct symbol *fields; struct symbol *symbols; } Program
+@attributes    { struct symbol *fields; } Ids Structdef
+@attributes    { struct symbol *pars; } Pars
+@attributes    { struct symbol *symbols; } Funcdef Stats Bool Expr Call Lexpr Field Term Plusterm Malterm Bterm Orterm Exprs
+@attributes    { struct symbol *in_symbols; struct symbol *out_symbols; } Stat
 
 @traversal @postorder t
 
@@ -34,21 +34,21 @@ Program:      Funcdef ';' Program
 
                | Structdef ';' Program
                @{
-                  @i @Program.fields@ = table_merge(@Structdef.fields@, @Program.1.fields@, 1);
+                  @i @Program.fields@ = tab_merge(@Structdef.fields@, @Program.1.fields@, 1);
                   @i @Program.1.symbols@ = @Program.0.symbols@;
                @}
 
                |
-               @{ @i @Program.fields@ = new_table(); @}
+               @{ @i @Program.fields@ = new_tab(); @}
 
                ;
  
 Funcdef:         FUNC ID '(' Pars ')' Stats END
-                       @{ @i @Stats.symbols@ = table_merge(@Funcdef.symbols@, @Pars.pars@, 0); @}
+                       @{ @i @Stats.symbols@ = tab_merge(@Funcdef.symbols@, @Pars.pars@, 0); @}
 
                |
                  FUNC ID '(' ')' Stats END
-                       @{ @i @Stats.symbols@ = table_merge(@Funcdef.symbols@, new_table(), 0); @}
+                       @{ @i @Stats.symbols@ = tab_merge(@Funcdef.symbols@, new_tab(), 0); @}
 
                ;  
  
@@ -58,18 +58,18 @@ Structdef:    STRUCT Ids END
                ;  
 
 Ids:             ID Ids
-               @{ @i @Ids.fields@ = table_add_symbol(@Ids.1.fields@, @ID.name@, SYMBOL_TYPE_FIELD, 1); @}
+               @{ @i @Ids.fields@ = tab_add_symbol(@Ids.1.fields@, @ID.name@, S_FIELD, 1); @}
 
                |
-               @{ @i @Ids.fields@ = new_table(); @}
+               @{ @i @Ids.fields@ = new_tab(); @}
 
                ;
 
 Pars:            Pars ',' ID
-               @{ @i @Pars.pars@ = table_add_symbol(@Pars.1.pars@, @ID.name@, SYMBOL_TYPE_VAR, 0); @}
+               @{ @i @Pars.pars@ = tab_add_symbol(@Pars.1.pars@, @ID.name@, S_VAR, 0); @}
 
                | ID
-               @{ @i @Pars.pars@ = table_add_symbol(new_table(), @ID.name@, SYMBOL_TYPE_VAR, 0); @}
+               @{ @i @Pars.pars@ = tab_add_symbol(new_tab(), @ID.name@, S_VAR, 0); @}
 
                ; 
  
@@ -84,7 +84,7 @@ Stats:                  Stat ';' Stats
  
 Stat:            VAR ID ASSIGN Expr
                @{
-                  @i @Stat.out_symbols@ = table_add_symbol(clone_table(@Stat.in_symbols@), @ID.name@, SYMBOL_TYPE_VAR, 0);
+                  @i @Stat.out_symbols@ = tab_add_symbol(clone_tab(@Stat.in_symbols@), @ID.name@, S_VAR, 0);
                   @i @Expr.symbols@ = @Stat.in_symbols@;
                @}