1.3.1: AS fixes

kirjavascript · Oct 29, 2023 · 269d7ee · 269d7ee
1 parent c0aad5a
commit 269d7ee
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.3.1]
+- Readd support for @label syntax
+- Fix a bug with the even macro
+
 ## [1.3.0]
 - Assembler now uses AS Macro Assembler for full macro support
 - MapMacros.asm definitions added for Sonic 1 and 2

diff --git a/app/formats/asm/index.js b/app/formats/asm/index.js
@@ -19,6 +19,22 @@ const p2binMessages = {
     toolsmsg,
 };
 
+function atLabels(code) {
+    const labels = /^@[a-zA-Z0-9_$]+\s*:/gm;
+
+    while (true) {
+        const result = labels.exec(code);
+        if (!result) break;
+        const label = result[0].slice(0, -1);
+
+        if (label.startsWith('@')) {
+            code = code.replace(new RegExp(label, 'g'), `._at_${label.slice(1)}`);
+        }
+    }
+
+    return code;
+}
+
 export async function assemble(
     code,
     { filename } = {
@@ -28,7 +44,7 @@ export async function assemble(
     const aslWorker = new Worker('bundles/asl-worker.js');
     const asl = Comlink.wrap(aslWorker);
 
-    const pFile = await asl.assemble(code, {
+    const pFile = await asl.assemble(atLabels(code), {
         messages: asMessages,
         filename,
     });

diff --git a/app/formats/scripts/run-script.js b/app/formats/scripts/run-script.js
@@ -334,7 +334,6 @@ export default catchFunc((file) => {
         prelude: `
 even macro
     if (*)&1
-paddingSoFar		set paddingSoFar+1
         dc.b 0 ;ds.b 1
     endif
     endm

diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-    "version": "1.3.0",
+    "version": "1.3.1",
     "scripts": {
         "start": "electron ./static --dev"
     },