started work on DAT namespaces

Author: totalspectrum

ast.c

@@ -891,6 +891,8 @@ static const char *astnames[] = {
     "ditto_start",
     "ditto_end",
     "ditto_count",
+
+    "namespace",
 };
 
 //

ast.h

@@ -254,6 +254,7 @@ enum astkind {
     AST_DITTO_END = 183,
     AST_DITTO_COUNT = 184,
 
+    AST_NAMESPACE = 185,
 };
 
 /* forward reference */

backends/dat/outdat.c

@@ -732,7 +732,7 @@ outputDataList(Flexbuf *f, int size, AST *ast, Flexbuf *relocs, int checkSize)
     int32_t relocOff = 0;
     int origsize = size;
     int checkThis = 0;
-    
+
     origval = 0;
     while (ast) {
         sub = ast->left;
@@ -2066,6 +2066,7 @@ PrintDataBlock(Flexbuf *f, AST *list, DataBlockOutFuncs *funcs, Flexbuf *relocs)
 
     if (gl_errors != 0)
         return;
+    current->name_space = NULL;
     top = list;
     while (top) {
         ast = top->left;
@@ -2182,6 +2183,18 @@ PrintDataBlock(Flexbuf *f, AST *list, DataBlockOutFuncs *funcs, Flexbuf *relocs)
             // emit a debug entry
             SendOneComment(relocs, ast, flexbuf_curlen(f), 0);
             break;
+        case AST_NAMESPACE: {
+            const char *name = NULL;
+            if (ast->left) {
+                name = GetIdentifierName(ast->left);
+            }
+            if (name) {
+                current->name_space = GetNamespace(&current->objsyms, name);
+            } else {
+                current->name_space = NULL;
+            }
+            break;
+        }
         default:
             ERROR(ast, "unknown element in data block");
             break;

expr.c

@@ -147,7 +147,9 @@ LookupGlobalSymbol(const char *name)
     if (!IsSpinLang(lang)) {
         Module *top = GetTopLevelModule();
         if (top) {
-            Symbol *s = LookupSymbolInTable(&top->objsyms, name);
+            SymbolTable *tab = top->name_space;
+            if (!tab) tab = &top->objsyms;
+            Symbol *s = LookupSymbolInTable(tab, name);
             if (s) {
                 return s;
             }
@@ -163,6 +165,8 @@ LookupSymbolInFunc(Function *func, const char *name)
 
     if (func) {
         sym = LookupSymbolInTable(&func->localsyms, name);
+    } else if (current->name_space) {
+        sym = LookupSymbolInTable(current->name_space, name);
     } else {
         sym = LookupSymbolInTable(&current->objsyms, name);
     }

frontends/common.h

@@ -576,9 +576,12 @@ struct modulestate {
     /* lexer state during input */
     LexStream *Lptr;
 
-    /* the symbol table */
+    /* the main symbol table */
     SymbolTable objsyms;
 
+    /* the currently open namespace in a DAT section (or NULL if none) */
+    SymbolTable *name_space;
+
     /* size of variables & objects used */
     int varsize;
 

frontends/spin/spin.y

@@ -5,7 +5,7 @@
  */
 
 %pure-parser
-%expect 43
+%expect 44
 
 %{
 #include <stdio.h>
@@ -1447,8 +1447,23 @@ basedatline:
       ast = NewAST(AST_COMMENTEDNODE, ast, $1);
       $$ = ast;
   }
+  | SP_NAMESP optidentifier
+  {
+      $$ = NewAST(AST_NAMESPACE, $2, NULL);
+  }
   ;
 
+optidentifier:
+  /* empty */
+  {
+      $$ = NULL;
+  }
+  | SP_IDENTIFIER
+  {
+      $$ = $1;
+  }
+;
+
 objblock:
   objline
   { $$ = $1; }

pasm.c

@@ -737,7 +737,7 @@ ExpandDittos(AST *instrlist)
 }
 
 void
-AssignAddresses(PASMAddresses *addr, SymbolTable *symtab, AST *instrlist, int startFlags)
+AssignAddresses(PASMAddresses *addr, SymbolTable *orig_symtab, AST *instrlist, int startFlags)
 {
     unsigned cogpc = 0;
     unsigned hubpc = 0;
@@ -762,10 +762,12 @@ AssignAddresses(PASMAddresses *addr, SymbolTable *symtab, AST *instrlist, int st
     expect_undefined_labels = 1;
     unsigned asm_nest;
     AsmState state[MAX_ASM_NEST] = { 0 };
-
+    SymbolTable *symtab;
+    
     ExpandDittos(instrlist);
 
 again:
+    symtab = orig_symtab;
     labels_changed = 0;
 
     cogpc = coglimit = hublimit = 0;
@@ -1041,6 +1043,17 @@ AssignAddresses(PASMAddresses *addr, SymbolTable *symtab, AST *instrlist, int st
                 lasttype = ast->left;
             }
             break;
+        case AST_NAMESPACE: {
+            const char *name;
+            pendingLabels = emitPendingLabels(symtab, pendingLabels, hubpc, cogpc, lasttype, lastOrg, inHub, label_flags, pass);
+            if (!ast->left) {
+                symtab = orig_symtab;
+            } else {
+                name = GetIdentifierName(ast->left);
+                symtab = GetNamespace(orig_symtab, name);
+            }
+            break;
+        }
         case AST_COMMENT:
         case AST_SRCCOMMENT:
             break;

symbol.c

@@ -320,3 +320,21 @@ DumpSymbolTable(SymbolTable *table)
 {
     IterateOverSymbols(table, PrintSymbol, NULL);
 }
+
+SymbolTable *
+GetNamespace(SymbolTable *orig, const char *name)
+{
+    SymbolTable *p;
+    Symbol *sym;
+
+    sym = LookupSymbolInTable(orig, name);
+    if (sym && sym->kind == SYM_NAMESPACE) {
+        p = (SymbolTable *)sym->v.ptr;
+    } else {
+        p = (SymbolTable *)calloc(1, sizeof(SymbolTable));
+        p->flags = orig->flags;
+        p->next = NULL;
+        sym = AddSymbol(orig, name, SYM_NAMESPACE, p, name);
+    }
+    return p;
+}

symbol.h

@@ -30,6 +30,7 @@ typedef enum symtype {
     SYM_REDEF,           /* name redefinition, used for implementing static */
     SYM_ALIAS,           /* makes a name an alias for an expression */
     SYM_TEMPLATE,        /* points to a function or class template */
+    SYM_NAMESPACE,       /* points to a symbol namespace */
 } Symtype;
 
 #define IsAlias(sym) ((sym)->kind == SYM_WEAK_ALIAS)
@@ -116,5 +117,11 @@ int SetTempVariableBase(int base, int max);
  */
 typedef int (*SymbolFunc)(Symbol *sym, void *arg);
 
-void  IterateOverSymbols(SymbolTable *table, SymbolFunc func, void *arg);    
+void  IterateOverSymbols(SymbolTable *table, SymbolFunc func, void *arg);
+
+/*
+ * fetch or create a namespace as a child of "orig"
+ */
+SymbolTable *GetNamespace(SymbolTable *orig, const char *name);
+
 #endif