ag: noch ein paar bugs gefixt und symboltaballe weiter verschoenert

[uebersetzerbau-ss10.git] / ag / symtable.c

diff --git a/ag/symtable.c b/ag/symtable.c
index 41957203a5bef66afcee1438ef9a5e533c31a4b2..590077d71cfc8321bdeca31b56eb9d265093b8dd 100755 (executable)
--- a/ag/symtable.c
+++ b/ag/symtable.c
@@ -3,6 +3,10 @@
 #include <stdio.h>
 #include "symtable.h"
 
+#define DD
+
+static void check_gen(struct symbol *tab, char *ident, short type);
+
 struct symbol *new_tab(void)
 {
        return SYMNULL;
@@ -12,6 +16,9 @@ struct symbol *clone_tab(struct symbol *tab)
 {
        struct symbol *elm;
        struct symbol *new_tabx;
+#ifdef DD
+       printf("clone_tab: tab(%08X)\n", tab);
+#endif
 
        elm = tab;
        new_tabx = new_tab();
@@ -27,13 +34,17 @@ struct symbol *tab_add_symbol(struct symbol *tab, char *ident, short type, short
 {
        struct symbol *elm;
        struct symbol *new_elm;
+#ifdef DD
+       printf("tab_add_symbol: tab(%08X), ident(%s), type(%i), check(%i)\n", tab, ident, type, check);
+#endif
 
-       if(tab_lookup(tab,ident) != SYMNULL) {
+       if(tab_lookup(tab, ident, type) != SYMNULL) {
                if(check) {
-                       fprintf(stderr, "Feld doppelt vorhanden: \"%s\"\n", ident);
+                       fprintf(stderr, "Identifier doppelt vorhanden: \"%s\"\n", ident);
                        exit(3);
+               } else {
+                       tab = tab_remove_symbol(tab, ident, type);
                }
-               tab = tab_remove_symbol(tab, ident);
        }
        
        new_elm = (struct symbol *) malloc(sizeof(struct symbol));
@@ -54,24 +65,20 @@ struct symbol *tab_add_symbol(struct symbol *tab, char *ident, short type, short
        return tab;
 }
 
-struct symbol *tab_lookup(struct symbol *tab, char *ident)
+struct symbol *tab_lookup(struct symbol *tab, char *ident, short type)
 {
        struct symbol *elm = tab;
 
        if(tab == SYMNULL) {
                return SYMNULL;
        }
-       
-       if(strcmp(elm->ident, ident) == 0) {
-               return elm;
-       }
-       
-       while(elm->next != SYMNULL) {
-               elm = elm->next;
-               if(strcmp(elm->ident, ident) == 0) {
+
+       do {
+               if((elm->type == type) && (strcmp(elm->ident, ident) == 0)) {
                        return elm;
                }
-       }
+               elm = elm->next;
+       } while(elm != SYMNULL);
 
        return SYMNULL;
 }
@@ -80,6 +87,9 @@ struct symbol *tab_merge(struct symbol *tab, struct symbol *to_add, short check)
 {
        struct symbol *elm = to_add;
        struct symbol *new_tab = clone_tab(tab);
+#ifdef DD
+       printf("tab_merge: tab(%08X), to_add(%08X), check(%i), new_tab(%08X)\n", tab, to_add, check, new_tab);
+#endif
        
        while(elm != SYMNULL) {
                new_tab = tab_add_symbol(new_tab, elm->ident, elm->type, check);
@@ -89,27 +99,21 @@ struct symbol *tab_merge(struct symbol *tab, struct symbol *to_add, short check)
        return new_tab;
 }
 
-struct symbol *tab_remove_symbol(struct symbol *tab, char *ident)
+struct symbol *tab_remove_symbol(struct symbol *tab, char *ident, short type)
 {
        struct symbol *elm = tab;
        struct symbol *previous_elm = SYMNULL;
-       struct symbol *new_elm;
-
-       if(tab == SYMNULL) {
-               return SYMNULL;
-       }
 
        while(elm != SYMNULL) {
-               if(strcmp(elm->ident, ident) == 0) {
+               if((elm->type == type) && (strcmp(elm->ident, ident) == 0)) {
                        if(previous_elm == SYMNULL) {
-                               new_elm = elm->next;
+                               tab = elm->next;
                        } else {
                                previous_elm->next = elm->next;
-                               new_elm = tab;
                        }
                        (void)free(elm->ident);
                        (void)free(elm);
-                       return new_elm;
+                       break;
                }
                previous_elm = elm;
                elm = elm->next;
@@ -120,27 +124,21 @@ struct symbol *tab_remove_symbol(struct symbol *tab, char *ident)
 
 void check_variable(struct symbol *tab, char *ident)
 {
-       struct symbol *elm = tab_lookup(tab, ident);
-       if(elm != SYMNULL) {
-               if(elm->type != S_VAR) {
-                       fprintf(stderr, "Identifier ist keine Variable: \"%s\"\n", ident);
-                       exit(3);
-               }
-       } else {
-               fprintf(stderr, "Unbekannter Identifier: \"%s\"\n", ident);
-               exit(3);
-       }
+       check_gen(tab, ident, S_VAR);
 }
 
 void check_field(struct symbol *tab, char *ident)
 {
-       struct symbol *elm = tab_lookup(tab, ident);
-       if(elm != SYMNULL) {
-               if(elm->type != S_FIELD) {
-                       fprintf(stderr, "Identifier ist kein Feld: \"%s\"\n", ident);
-                       exit(3);
-               }
-       } else {
+       check_gen(tab, ident, S_FIELD);
+}
+
+static void check_gen(struct symbol *tab, char *ident, short type)
+{
+       struct symbol *elm = tab_lookup(tab, ident, type);
+#ifdef DD
+       printf("check_variable: tab(%08X), ident(%s), type(%i), elm(%08X)\n", tab, ident, type, elm);
+#endif
+       if(elm == SYMNULL) {
                fprintf(stderr, "Unbekannter Identifier: \"%s\"\n", ident);
                exit(3);
        }