codea: chmod a-x symtable.*

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

diff --git a/codea/symtable.c b/codea/symtable.c
old mode 100755 (executable)
new mode 100644 (file)
index 850c1b0..4776240
--- a/codea/symtable.c
+++ b/codea/symtable.c
@@ -3,7 +3,9 @@
 #include <stdio.h>
 #include "symtable.h"
 
+#if 0
 #define DD
+#endif
 
 struct symbol *tab_new(void)
 {
@@ -15,25 +17,30 @@ struct symbol *tab_clone(struct symbol *tab)
        struct symbol *elm = tab;
        struct symbol *ntab = tab_new();
 #ifdef DD
-       printf("tab_clone: tab(%08X)\n", tab);
+       fprintf(stderr, "tab_clone: tab(%08X)\n", tab);
 #endif
 
        while(elm != SYMNULL) {
-               ntab = tab_add_symbol(ntab, elm->ident, elm->type, 0);
+               ntab = tab_add_symbol(ntab, elm->ident, elm->type, 0, elm->param_index, elm->soffset);
                elm = elm->next;
        }
        return ntab;
 }
 
-struct symbol *tab_add_symbol(struct symbol *tab, char *ident, short type, short check)
+struct symbol *tab_add_symbol(struct symbol *tab, char *ident, short type, short check, int param_index, int soffset)
 {
        struct symbol *elm = tab;
        struct symbol *new_elm;
 #ifdef DD
-       printf("tab_add_symbol: tab(%08X), ident(%s), type(%i), check(%i)\n", tab, ident, type, check);
+       fprintf(stderr, "tab_add_symbol: tab(%08X), ident(%s), type(%i), check(%i), param_index(%i), soffset(%i)\n", tab, ident, type, check, param_index, soffset);
 #endif
 
-       if(tab_lookup(tab, ident, type) != SYMNULL) {
+       if(param_index >= 6) {
+               fprintf(stderr, "eine methode hat zu viele parameter (max. 6 inkl. this erlaubt)\n");
+               exit(4);
+       }
+
+       if(tab_lookup(tab, ident, type) != SYMNULL || (type == S_VAR && tab_lookup(tab, ident, S_PARM) != SYMNULL)) {
                if(check) {
                        fprintf(stderr, "Identifier doppelt vorhanden: \"%s\"\n", ident);
                        exit(3);
@@ -46,10 +53,10 @@ struct symbol *tab_add_symbol(struct symbol *tab, char *ident, short type, short
        new_elm->next = SYMNULL;
        new_elm->ident = strdup(ident);
        new_elm->type = type;
+       new_elm->param_index = param_index;
+       new_elm->soffset = soffset;
 
-       if(tab == SYMNULL) {
-               return new_elm;
-       }
+       if(tab == SYMNULL) return new_elm;
 
        while(elm->next != SYMNULL) {
                elm = elm->next;
@@ -63,12 +70,10 @@ struct symbol *tab_lookup(struct symbol *tab, char *ident, short type)
 {
        struct symbol *elm = tab;
 
-       if(tab == SYMNULL) {
-               return SYMNULL;
-       }
+       if(tab == SYMNULL) return SYMNULL;
 
        do {
-               if((elm->type == type) && (strcmp(elm->ident, ident) == 0)) {
+               if((elm->type & type) && (strcmp(elm->ident, ident) == 0)) {
                        return elm;
                }
                elm = elm->next;
@@ -82,11 +87,11 @@ struct symbol *tab_merge(struct symbol *tab, struct symbol *to_add, short check)
        struct symbol *elm = to_add;
        struct symbol *ntab = tab_clone(tab);
 #ifdef DD
-       printf("tab_merge: tab(%08X), to_add(%08X), check(%i), ntab(%08X)\n", tab, to_add, check, ntab);
+       fprintf(stderr, "tab_merge: tab(%08X), to_add(%08X), check(%i), ntab(%08X)\n", tab, to_add, check, ntab);
 #endif
        
        while(elm != SYMNULL) {
-               ntab = tab_add_symbol(ntab, elm->ident, elm->type, check);
+               ntab = tab_add_symbol(ntab, elm->ident, elm->type, check, elm->param_index, elm->soffset);
                elm = elm->next;
        }
 
@@ -120,10 +125,10 @@ void check(struct symbol *tab, char *ident, short type)
 {
        struct symbol *elm;
 #ifdef DD
-       printf("check: tab(%08X), ident(%s), type(%i), elm(%08X)\n", tab, ident, type, elm);
+       fprintf(stderr, "check: tab(%08X), ident(%s), type(%i), elm(%08X)\n", tab, ident, type, elm);
 #endif
 
-       if(type == S_VAR) {
+       if(type & (S_VAR | S_PARM)) {
                elm = tab_lookup(tab, ident, type);
                if(elm != SYMNULL) {
                        return;