re-organize PASM internals to hold everything in a top level list; should make changing PASM (e.g. for ditto) easier in the future

totalspectrum · totalspectrum · commit db3d400b1438 · 2025-03-02T17:14:23.000-04:00
diff --git a/Test/stest071.spin b/Test/stest071.spin
@@ -4,8 +4,7 @@ pub blink(pin, n)
     return entry
     
 dat
-entry
-  long $11223344
+entry long $11223344
 foo
   long @@@foo
   
diff --git a/Test/stest124.spin b/Test/stest124.spin
@@ -1,4 +1,5 @@
 dat
+  long
 bas_tx_handles
   long 0[8]
   
diff --git a/Test/stest196.spin b/Test/stest196.spin
@@ -3,8 +3,7 @@ CON
   __ = 2
 
 DAT
-myarray
-  byte 1
+myarray byte 1
   byte long 2, 3
 dummy1
   byte 4
diff --git a/Test/test064.spin b/Test/test064.spin
@@ -6,8 +6,6 @@ PUB getit
   return @entry
 
 DAT
-
-entry
-  long float(y)
+entry long float(y)
   long trunc(pi)
   long round(3.6)
diff --git a/Test/test077.spin b/Test/test077.spin
@@ -8,7 +8,7 @@ PUB dummy
   return @arr[0]
 
 DAT
-
+  long
 arr
   long onef
   long twof
diff --git a/Test/test104.spin b/Test/test104.spin
@@ -5,7 +5,6 @@ PUB get
   return @stuff
 
 DAT
-stuff
-  long foo
+stuff long foo
   long bar
   long baz
diff --git a/Test/test155.spin b/Test/test155.spin
@@ -4,8 +4,7 @@ entry
    cmp par, #"ß" wz
    cmp par, #$df wz
    nop
-sval
-   byte "ß", 0
+sval byte "ß", 0
 
 pub get
   return sval[0]
diff --git a/ast.c b/ast.c
@@ -1087,6 +1087,14 @@ static void doASTDump(AST *ast, int indent)
     case AST_THROW:
         sprintf(buf, "<throw %" PRId64 ">", ast->d.ival);
         break;
+    case AST_LINEBREAK:
+        if (ast->left) {
+            sprintf(buf, "<linebreak>");
+        } else {
+            sprintf(buf, "<linebreak/>");
+            leaf = 1;
+        }
+        break;
     default:
         idx = (unsigned int)ast->kind;
         if (idx < sizeof(astnames) / sizeof(astnames[0])) {
diff --git a/backends/asm/inlineasm.c b/backends/asm/inlineasm.c
@@ -571,7 +571,7 @@ CompileTraditionalInlineAsm(IRList *irl, AST *origtop, unsigned asmFlags)
     asmNest = 0;
     state[asmNest].is_active = true;
     while (top) {
-        ast = top;
+        ast = top->left;
         top = top->right;
         while (ast && ast->kind == AST_COMMENTEDNODE) {
             ast = ast->left;
@@ -638,9 +638,9 @@ CompileTraditionalInlineAsm(IRList *irl, AST *origtop, unsigned asmFlags)
     }
     firstir = NULL;
     while(top) {
-        ast = top;
+        ast = top->left;
         top = top->right;
-        if (ast->kind == AST_LINEBREAK) {
+        if (ast && ast->kind == AST_LINEBREAK) {
             continue;
         }
         while (ast && ast->kind == AST_COMMENTEDNODE) {
diff --git a/backends/dat/outdat.c b/backends/dat/outdat.c
@@ -1,7 +1,7 @@
 //
 // binary data output for spin2cpp
 //
-// Copyright 2012-2024 Total Spectrum Software Inc.
+// Copyright 2012-2025 Total Spectrum Software Inc.
 // see the file COPYING for conditions of redistribution
 //
 #include <stdio.h>
@@ -2068,11 +2068,10 @@ PrintDataBlock(Flexbuf *f, AST *list, DataBlockOutFuncs *funcs, Flexbuf *relocs)
         return;
     top = list;
     while (top) {
-        ast = top;
-        if (top->kind == AST_COMMENTEDNODE) {
-            top = SendComments(f, top->right, relocs);
-        } else {
-            top = top->right;
+        ast = top->left;
+        top = top->right;
+        if (ast && ast->kind == AST_COMMENTEDNODE) {
+            SendComments(f, ast, relocs);
         }
         while (ast && ast->kind == AST_COMMENTEDNODE) {
             if (startAst) {
diff --git a/cmdline.c b/cmdline.c
@@ -427,7 +427,7 @@ int ProcessCommandLine(CmdLineOptions *cmd)
             }
             if (cmd->compile)  {
                 gl_caseSensitive = !compile_original;
-                gl_warn_flags &= ~(WARN_ASM_FIRST_PASS|WARN_ASM_USAGE); // already issued warnings
+                gl_warn_flags &= ~(WARN_ASM_FIRST_PASS|WARN_ASM_USAGE|WARN_ASM_LABEL_TYPES); // already issued warnings
                 gl_optimize_flags = 0; // no need to re-optimize
                 gl_cenv_flags = 0;     // already handled C startup code
                 CompileAsmToBinary(binname, asmname);
diff --git a/frontends/basic/basic.y b/frontends/basic/basic.y
@@ -2676,18 +2676,25 @@ asmlist:
 
 asmline:
   basedatline
+  {
+      $$ = NewAST(AST_LISTHOLDER, $1, NULL);
+  }
   | BAS_IDENTIFIER basedatline
-    {   AST *linebreak;
+    {   AST *linebreak = NULL;
         AST *comment = GetComments();
-        AST *ast;
-        ast = $1;
+        AST *datitem = $2;
+        AST *changetype = NULL;
+        if (datitem) {
+            changetype = ExtractPasmType(datitem);
+            datitem = NewAST(AST_LISTHOLDER, $2, NULL);
+        }
+        AST *ast = NewAST(AST_LISTHOLDER, $1, datitem);
         if (comment && (comment->d.string || comment->kind == AST_SRCCOMMENT)) {
-            linebreak = NewCommentedAST(AST_LINEBREAK, NULL, NULL, comment);
+            linebreak = NewCommentedAST(AST_LINEBREAK, changetype, NULL, comment);
         } else {
-            linebreak = NewAST(AST_LINEBREAK, NULL, NULL);
+            linebreak = NewAST(AST_LINEBREAK, changetype, NULL);
         }
-        ast = AddToList(ast, $2);
-        ast = AddToList(linebreak, ast);
+        ast = NewAST(AST_LISTHOLDER, linebreak, ast);
         $$ = ast;
     }
   ;
diff --git a/frontends/c/cgram.y b/frontends/c/cgram.y
@@ -2340,18 +2340,25 @@ asmlist:
 
 asmline:
   asm_baseline
+  {
+      $$ = NewAST(AST_LISTHOLDER, $1, NULL);
+  }
   | C_IDENTIFIER asm_baseline
     {   AST *linebreak;
         AST *comment = GetComments();
-        AST *ast;
-        ast = $1;
+        AST *datitem = $2;
+        AST *changetype = NULL;
+        if (datitem) {
+            changetype = ExtractPasmType(datitem);
+            datitem = NewAST(AST_LISTHOLDER, $2, NULL);
+        }
+        AST *ast = NewAST(AST_LISTHOLDER, $1, datitem);
         if (comment && (comment->d.string || comment->kind == AST_SRCCOMMENT)) {
-            linebreak = NewCommentedAST(AST_LINEBREAK, NULL, NULL, comment);
+            linebreak = NewCommentedAST(AST_LINEBREAK, changetype, NULL, comment);
         } else {
-            linebreak = NewAST(AST_LINEBREAK, NULL, NULL);
+            linebreak = NewAST(AST_LINEBREAK, changetype, NULL);
         }
-        ast = AddToList(ast, $2);
-        ast = AddToList(linebreak, ast);
+        ast = NewAST(AST_LISTHOLDER, linebreak, ast);
         $$ = ast;
     }
   ;
@@ -2858,18 +2865,26 @@ pasmlist:
 
 pasmline:
   pasm_baseline
+  {
+      $$ = NewAST(AST_LISTHOLDER, $1, NULL);
+  }
   | C_IDENTIFIER pasm_baseline
     {   AST *linebreak;
         AST *comment = GetComments();
-        AST *ast;
-        ast = $1;
+        AST *changetypes = NULL;
+        AST *datitem = $2;
+
+        if (datitem) {
+            changetypes = ExtractPasmType(datitem);
+            datitem = NewAST(AST_LISTHOLDER, datitem, NULL);
+        }
+        AST *ast = NewAST(AST_LISTHOLDER, $1, datitem);
         if (comment && (comment->d.string || comment->kind == AST_SRCCOMMENT)) {
-            linebreak = NewCommentedAST(AST_LINEBREAK, NULL, NULL, comment);
+            linebreak = NewCommentedAST(AST_LINEBREAK, changetypes, NULL, comment);
         } else {
-            linebreak = NewAST(AST_LINEBREAK, NULL, NULL);
+            linebreak = NewAST(AST_LINEBREAK, changetypes, NULL);
         }
-        ast = AddToList(ast, $2);
-        ast = AddToList(linebreak, ast);
+        ast = NewAST(AST_LISTHOLDER, linebreak, ast);
         $$ = ast;
     }
   ;
diff --git a/frontends/common.c b/frontends/common.c
@@ -1826,9 +1826,9 @@ FindDeclaration(AST *datlist, const char *name)
 {
     AST *ident;
     AST *declare;
-
+    
     while (datlist) {
-        if (datlist->kind == AST_COMMENTEDNODE
+        if (datlist->kind == AST_LISTHOLDER
                 && datlist->left
                 && datlist->left->kind == AST_DECLARE_VAR)
         {
@@ -1987,7 +1987,7 @@ DeclareOneGlobalVar(Module *P, AST *ident, AST *type, int inDat)
             ident = AstAssign(ident, initializer);
         }
         declare = NewAST(AST_DECLARE_VAR, type, ident);
-        ast = NewAST(AST_COMMENTEDNODE, declare, NULL);
+        ast = NewAST(AST_LISTHOLDER, declare, NULL);
         P->datblock = AddToList(P->datblock, ast);
     }
     return;
diff --git a/frontends/common.h b/frontends/common.h
@@ -222,7 +222,9 @@ extern int gl_warn_flags;     /* flags for warnings */
 #define WARN_ARRAY_INDEX        0x000020
 #define WARN_LANG_VERSION       0x000040
 #define WARN_DEPRECATED         0x000080
-#define WARN_ASM_FIRST_PASS     0x800000      
+#define WARN_ASM_LABEL_TYPES    0x400000
+#define WARN_ASM_FIRST_PASS     0x800000
+
 #define WARN_ALL                0xFFFFFF
 
 #define DEFAULT_WARN_FLAGS (WARN_ASM_USAGE | WARN_UNINIT_VARS | WARN_ASM_FIRST_PASS | WARN_ARRAY_INDEX | WARN_DEPRECATED)
@@ -1078,6 +1080,9 @@ Module *GetTopLevelModule(void);
 // returns non-zero if a variable of type typ must go on the stack
 int TypeGoesOnStack(AST *typ);
 
+// extract type of a PASM node
+AST *ExtractPasmType(AST *node);
+
 // declare a symbol together with a location of its definition
 Symbol *AddSymbolPlaced(SymbolTable *table, const char *name, int type, void *val, const char *user_name, AST *def);
 
diff --git a/frontends/spin/spin.y b/frontends/spin/spin.y
@@ -50,11 +50,11 @@ SpinAddDatList(AST *datlist)
 {
     AST *label = AstTempIdentifier("_byteptr_");
     AST *ptr = NewAST(AST_ABSADDROF, DupAST(label), NULL);
-    AST *linebreak = NewAST(AST_LINEBREAK, NULL, NULL);
     AST *ast = label;
 
-    ast = AddToList(ast, datlist);
-    ast = AddToList(linebreak, ast);
+    if (datlist && datlist->kind != AST_LISTHOLDER)
+        datlist = NewAST(AST_LISTHOLDER, datlist, NULL);
+    ast = NewAST(AST_LISTHOLDER, ast, datlist);
 
     // add this entry to the DAT section
     current->datblock = AddToListEx(current->datblock, ast, &current->datblock_tail);
@@ -1188,30 +1188,42 @@ datblock:
   datline
     {
         AST *dat = $1;
-        $$ = dat; //NewAST(AST_LISTHOLDER, dat, NULL);
+        $$ = dat; // NewAST(AST_LISTHOLDER, dat, NULL);
         current->parse_tail = NULL;
     }
   | datblock datline
-    { $$ = AddToListEx($1, $2, &current->parse_tail); }
+    {
+        AST *dat = $2; // NewAST(AST_LISTHOLDER, $2, NULL);
+        $$ = AddToListEx($1, dat, &current->parse_tail);
+    }
   ;
 
 datline:
   basedatline
+  {
+      $$ = NewAST(AST_LISTHOLDER, $1, NULL);
+  }
   | identifier basedatline
-    {   AST *linebreak;
+    {
         AST *comment = GetComments();
-        AST *ast;
-        AST *label = DupAST($1);
-        ast = $1;
+        AST *idast = $1;
+        AST *datast = $2;
+        AST *label = DupAST(idast);
+        AST *linebreak = NULL;
+        AST *changetype = NULL;
+        if (datast) {
+            changetype = ExtractPasmType(datast);
+            datast = NewAST(AST_LISTHOLDER, datast, NULL);
+        }
         SpinAddLocalSymbol(label, SYM_NAME);
         if (comment && (comment->d.string || comment->kind == AST_SRCCOMMENT)) {
-            linebreak = NewCommentedAST(AST_LINEBREAK, NULL, NULL, comment);
+            linebreak = NewCommentedAST(AST_LINEBREAK, changetype, NULL, comment);
         } else {
-            linebreak = NewAST(AST_LINEBREAK, NULL, NULL);
+            linebreak = NewAST(AST_LINEBREAK, changetype, NULL);
         }
-        ast = AddToList(ast, $2);
-        ast = AddToList(linebreak, ast);
-        $$ = ast;
+        idast = NewAST(AST_LISTHOLDER, idast, datast);
+        idast = NewAST(AST_LISTHOLDER, linebreak, idast);
+        $$ = idast;
     }
   ;
 
diff --git a/pasm.c b/pasm.c
diff --git a/spinc.c b/spinc.c

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`dat`
	`2`	`+ long`
`2`	`3`	`bas_tx_handles`
`3`	`4`	`long 0[8]`
`4`	`5`