fixup asm build

guybedford · Mar 25, 2024 · 9431d44 · 9431d44
1 parent 96347a4
commit 9431d44
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/chompfile.toml b/chompfile.toml
@@ -52,7 +52,7 @@ dep = 'src/lexer.ts'
 # even when we set "source-maps = false", so for now we have ejected the
 # template to its raw "run" command, and added an "rm" step.
 run = '''
-node ./node_modules/@swc/cli/bin/swc.js $DEP -o $TARGET --no-swcrc -C jsc.parser.syntax=typescript -C jsc.parser.importAssertions=true -C jsc.parser.topLevelAwait=true -C jsc.parser.importMeta=true -C jsc.parser.privateMethod=true -C jsc.parser.dynamicImport=true -C jsc.target=es2016 -C jsc.experimental.keepImportAssertions=true
+node ./node_modules/@swc/cli/bin/swc.js $DEP -o $TARGET --no-swcrc -C jsc.parser.syntax=typescript -C jsc.parser.importAssertions=true -C jsc.parser.topLevelAwait=true -C jsc.parser.importMeta=true -C jsc.parser.privateMethod=true -C jsc.parser.dynamicImport=true -C jsc.target=es2016 -C jsc.experimental.keepImportAttributes=true
 '''
 
 [[task]]
@@ -110,7 +110,7 @@ run = """
 	${{ EMSDK_PATH }}/emsdk activate 1.40.1-fastcomp
 
 	${{ EMSDK_PATH }}/fastcomp/emscripten/emcc ./src/lexer.c -o lib/lexer.emcc.js -s WASM=0 -Oz --closure 1 \
-	-s EXPORTED_FUNCTIONS="['_parse','_sa','_e','_ri','_re','_is','_ie','_ss','_ip','_se','_ai','_id','_es','_ee','_els','_ele','_f','_ms','_setSource']" \
+	-s EXPORTED_FUNCTIONS="['_parse','_sa','_e','_ri','_re','_it','_is','_ie','_ss','_ip','_se','_ai','_id','_es','_ee','_els','_ele','_f','_ms','_setSource']" \
 	-s ERROR_ON_UNDEFINED_SYMBOLS=0 -s SINGLE_FILE=1 -s TOTAL_STACK=4997968 -s --separate-asm -Wno-logical-op-parentheses -Wno-parentheses
 
 	# rm lib/lexer.emcc.js

diff --git a/lib/lexer.asm.js b/lib/lexer.asm.js
diff --git a/lib/lexer.emcc.asm.js b/lib/lexer.emcc.asm.js
diff --git a/lib/lexer.wasm b/lib/lexer.wasm
diff --git a/src/lexer.asm.js b/src/lexer.asm.js
@@ -13,7 +13,7 @@ const copy = new Uint8Array(new Uint16Array([1]).buffer)[0] === 1 ? function (sr
     outBuf16[i++] = (ch & 0xff) << 8 | ch >>> 8;
   }
 };
-const words = 'xportmportlassetaromsyncunctionssertvoyiedelecontininstantybreareturdebuggeawaithrwhileforifcatcfinallels';
+const words = 'xportmportlassetaourceromsyncunctionssertvoyiedelecontininstantybreareturdebuggeawaithrwhileforifcatcfinallels';
 
 let source, name;
 export function parse (_source, _name = '@') {
@@ -44,11 +44,11 @@ export function parse (_source, _name = '@') {
 
   const imports = [], exports = [];
   while (asm.ri()) {
-    const s = asm.is(), e = asm.ie(), a = asm.ai(), d = asm.id(), ss = asm.ss(), se = asm.se();
+    const s = asm.is(), e = asm.ie(), a = asm.ai(), d = asm.id(), ss = asm.ss(), se = asm.se(), t = asm.it();
     let n;
     if (asm.ip())
       n = readString(d === -1 ? s : s + 1, source.charCodeAt(d === -1 ? s - 1 : s));
-    imports.push({ n, s, e, ss, se, d, a });
+    imports.push({ t, n, s, e, ss, se, d, a });
   }
   while (asm.re()) {
     const s = asm.es(), e = asm.ee(), ls = asm.els(), le = asm.ele();