From 9284bc81d0b9518f6df8266cf7429298723d8828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Remko=20Tron=C3=A7on?= Date: Sun, 29 May 2022 20:20:32 +0200 Subject: [PATCH] Remove redundant strings --- src/waforth.wat | 376 ++++++++++++++++++++--------------------- src/web/tests/suite.js | 12 +- 2 files changed, 193 insertions(+), 195 deletions(-) diff --git a/src/waforth.wat b/src/waforth.wat index 7bf6f4e..cef61e1 100644 --- a/src/waforth.wat +++ b/src/waforth.wat @@ -167,13 +167,11 @@ (data (i32.const 0x20000) "\0e" "undefined word") (data (i32.const 0x2000f) "\0d" "division by 0") (data (i32.const 0x2001d) "\10" "incomplete input") - (data (i32.const 0x2002e) "\0b" "missing ')'") - (data (i32.const 0x2003a) "\09" "missing \22") - (data (i32.const 0x20044) "\24" "word not supported in interpret mode") - (data (i32.const 0x20069) "\0f" "not implemented") - (data (i32.const 0x20079) "\11" "ADDRESS-UNIT-BITS") - (data (i32.const 0x2008b) "\0f" "/COUNTED-STRING") - (data (i32.const 0x2009b) "\0b" "stack empty") + (data (i32.const 0x2002e) "\24" "word not supported in interpret mode") + (data (i32.const 0x20053) "\0f" "not implemented") + (data (i32.const 0x20063) "\11" "ADDRESS-UNIT-BITS") + (data (i32.const 0x20075) "\0f" "/COUNTED-STRING") + (data (i32.const 0x20085) "\0b" "stack empty") ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Built-in words @@ -208,7 +206,7 @@ (i32.store (i32.load (i32.sub (local.get $tos) (i32.const 4))) (i32.load (local.tee $bbtos (i32.sub (local.get $tos) (i32.const 8))))) (local.get $bbtos)) - (data (i32.const 0x200a8) "\00\00\00\00" "\01" "! " "\10\00\00\00") + (data (i32.const 0x20094) "\00\00\00\00" "\01" "! " "\10\00\00\00") (elem (i32.const 0x10) $!) ;; 6.1.0030 @@ -218,7 +216,7 @@ (local $bbtos i32) (local $m i64) (local $npo i32) - (local.set $base (i64.extend_i32_u (i32.load (i32.const 0x2036c (; = body(BASE) ;))))) + (local.set $base (i64.extend_i32_u (i32.load (i32.const 0x20358 (; = body(BASE) ;))))) (local.set $v (i64.load (local.tee $bbtos (i32.sub (local.get $tos) (i32.const 8))))) (local.set $m (i64.rem_u (local.get $v) (local.get $base))) (local.set $v (i64.div_u (local.get $v) (local.get $base))) @@ -227,7 +225,7 @@ (i64.store (local.get $bbtos) (local.get $v)) (global.set $po (local.get $npo)) (local.get $tos)) - (data (i32.const 0x200b4) "\a8\00\02\00" "\01" "# " "\11\00\00\00") + (data (i32.const 0x200a0) "\94\00\02\00" "\01" "# " "\11\00\00\00") (elem (i32.const 0x11) $#) ;; 6.1.0040 @@ -235,7 +233,7 @@ (i32.store (i32.sub (local.get $tos) (i32.const 8)) (global.get $po)) (i32.store (i32.sub (local.get $tos) (i32.const 4)) (i32.sub (i32.add (global.get $here) (i32.const 0x200 (; = PICTURED_OUTPUT_OFFSET ;))) (global.get $po))) (local.get $tos)) - (data (i32.const 0x200c0) "\b4\00\02\00" "\02" "#> " "\12\00\00\00") + (data (i32.const 0x200ac) "\a0\00\02\00" "\02" "#> " "\12\00\00\00") (elem (i32.const 0x12) $#>) ;; 6.1.0050 @@ -245,7 +243,7 @@ (local $bbtos i32) (local $m i64) (local $po i32) - (local.set $base (i64.extend_i32_u (i32.load (i32.const 0x2036c (; = body(BASE) ;))))) + (local.set $base (i64.extend_i32_u (i32.load (i32.const 0x20358 (; = body(BASE) ;))))) (local.set $v (i64.load (local.tee $bbtos (i32.sub (local.get $tos) (i32.const 8))))) (local.set $po (global.get $po)) (loop $loop @@ -257,21 +255,21 @@ (i64.store (local.get $bbtos) (local.get $v)) (global.set $po (local.get $po)) (local.get $tos)) - (data (i32.const 0x200cc) "\c0\00\02\00" "\02" "#S " "\13\00\00\00") + (data (i32.const 0x200b8) "\ac\00\02\00" "\02" "#S " "\13\00\00\00") (elem (i32.const 0x13) $#S) ;; 6.1.0070 (func $' (param $tos i32) (result i32) (i32.store (local.get $tos) (drop (call $find (call $parseName)))) (i32.add (local.get $tos) (i32.const 4))) - (data (i32.const 0x200d8) "\cc\00\02\00" "\01" "' " "\14\00\00\00") + (data (i32.const 0x200c4) "\b8\00\02\00" "\01" "' " "\14\00\00\00") (elem (i32.const 0x14) $') ;; 6.1.0080 (func $paren (param $tos i32) (result i32) (drop (drop (call $parse (i32.const 0x29 (; = ')' ;))))) (local.get $tos)) - (data (i32.const 0x200e4) "\d8\00\02\00" "\81" (; F_IMMEDIATE ;) "( " "\15\00\00\00") + (data (i32.const 0x200d0) "\c4\00\02\00" "\81" (; F_IMMEDIATE ;) "( " "\15\00\00\00") (elem (i32.const 0x15) $paren) ;; 6.1.0090 @@ -282,7 +280,7 @@ (i32.mul (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))) (i32.load (local.get $bbtos)))) (local.get $btos)) - (data (i32.const 0x200f0) "\e4\00\02\00" "\01" "* " "\16\00\00\00") + (data (i32.const 0x200dc) "\d0\00\02\00" "\01" "* " "\16\00\00\00") (elem (i32.const 0x16) $*) ;; 6.1.0100 @@ -296,7 +294,7 @@ (i64.extend_i32_s (i32.load (local.tee $bbtos (i32.sub (local.get $tos) (i32.const 8)))))) (i64.extend_i32_s (i32.load (i32.sub (local.get $tos) (i32.const 4))))))) (local.get $bbtos)) - (data (i32.const 0x200fc) "\f0\00\02\00" "\02" "*/ " "\17\00\00\00") + (data (i32.const 0x200e8) "\dc\00\02\00" "\02" "*/ " "\17\00\00\00") (elem (i32.const 0x17) $*/) ;; 6.1.0110 @@ -314,7 +312,7 @@ (local.tee $x2 (i64.extend_i32_s (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))))))))) (i32.store (local.get $bbtos) (i32.wrap_i64 (i64.div_s (local.get $x1) (local.get $x2)))) (local.get $btos)) - (data (i32.const 0x20108) "\fc\00\02\00" "\05" "*/MOD " "\18\00\00\00") + (data (i32.const 0x200f4) "\e8\00\02\00" "\05" "*/MOD " "\18\00\00\00") (elem (i32.const 0x18) $*/MOD) ;; 6.1.0120 @@ -325,7 +323,7 @@ (i32.add (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))) (i32.load (local.get $bbtos)))) (local.get $btos)) - (data (i32.const 0x20118) "\08\01\02\00" "\01" "+ " "\19\00\00\00") + (data (i32.const 0x20104) "\f4\00\02\00" "\01" "+ " "\19\00\00\00") (elem (i32.const 0x19) $+) ;; 6.1.0130 @@ -336,7 +334,7 @@ (i32.add (i32.load (local.get $addr)) (i32.load (local.tee $bbtos (i32.sub (local.get $tos) (i32.const 8)))))) (local.get $bbtos)) - (data (i32.const 0x20124) "\18\01\02\00" "\02" "+! " "\1a\00\00\00") + (data (i32.const 0x20110) "\04\01\02\00" "\02" "+! " "\1a\00\00\00") (elem (i32.const 0x1a) $+!) ;; 6.1.0140 @@ -344,7 +342,7 @@ (local.get $tos) (call $ensureCompiling) (call $compilePlusLoop)) - (data (i32.const 0x20130) "\24\01\02\00" "\85" (; F_IMMEDIATE ;) "+LOOP " "\1b\00\00\00") + (data (i32.const 0x2011c) "\10\01\02\00" "\85" (; F_IMMEDIATE ;) "+LOOP " "\1b\00\00\00") (elem (i32.const 0x1b) $+LOOP) ;; 6.1.0150 @@ -354,7 +352,7 @@ (i32.load (i32.sub (local.get $tos) (i32.const 4)))) (global.set $here (i32.add (global.get $here) (i32.const 4))) (i32.sub (local.get $tos) (i32.const 4))) - (data (i32.const 0x20140) "\30\01\02\00" "\01" ", " "\1c\00\00\00") + (data (i32.const 0x2012c) "\1c\01\02\00" "\01" ", " "\1c\00\00\00") (elem (i32.const 0x1c) $comma) ;; 6.1.0160 @@ -365,7 +363,7 @@ (i32.sub (i32.load (local.get $bbtos)) (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))))) (local.get $btos)) - (data (i32.const 0x2014c) "\40\01\02\00" "\01" "- " "\1d\00\00\00") + (data (i32.const 0x20138) "\2c\01\02\00" "\01" "- " "\1d\00\00\00") (elem (i32.const 0x1d) $-) ;; 6.1.0180 @@ -377,9 +375,9 @@ (then (call $shell_emit (i32.const 0x2d)) (local.set $v (i32.sub (i32.const 0) (local.get $v))))) - (call $U._ (local.get $v) (i32.load (i32.const 0x2036c (; = body(BASE) ;)))) + (call $U._ (local.get $v) (i32.load (i32.const 0x20358 (; = body(BASE) ;)))) (call $shell_emit (i32.const 0x20))) - (data (i32.const 0x20158) "\4c\01\02\00" "\01" ". " "\1e\00\00\00") + (data (i32.const 0x20144) "\38\01\02\00" "\01" ". " "\1e\00\00\00") (elem (i32.const 0x1e) $.) ;; 6.1.0190 @@ -388,7 +386,7 @@ (call $ensureCompiling) (call $Sq) (call $emitICall (i32.const 0) (i32.const 0x91 (; = index("TYPE") ;)))) - (data (i32.const 0x20164) "\58\01\02\00" "\82" (; F_IMMEDIATE ;) ".\22 " "\1f\00\00\00") + (data (i32.const 0x20150) "\44\01\02\00" "\82" (; F_IMMEDIATE ;) ".\22 " "\1f\00\00\00") (elem (i32.const 0x1f) $.q) ;; 15.6.1.0220 @@ -398,12 +396,12 @@ (block $endLoop (loop $loop (br_if $endLoop (i32.ge_u (local.get $p) (local.get $tos))) - (call $U._ (i32.load (local.get $p)) (i32.load (i32.const 0x2036c (; = body(BASE) ;)))) + (call $U._ (i32.load (local.get $p)) (i32.load (i32.const 0x20358 (; = body(BASE) ;)))) (call $shell_emit (i32.const 0x20)) (local.set $p (i32.add (local.get $p) (i32.const 4))) (br $loop))) (local.get $tos)) - (data (i32.const 0x20170) "\64\01\02\00" "\02" ".S " "\20\00\00\00") + (data (i32.const 0x2015c) "\50\01\02\00" "\02" ".S " "\20\00\00\00") (elem (i32.const 0x20) $.S) ;; 6.1.0230 @@ -416,7 +414,7 @@ (i32.store (local.tee $bbtos (i32.sub (local.get $tos) (i32.const 8))) (i32.div_s (i32.load (local.get $bbtos)) (local.get $divisor))) (local.get $btos)) - (data (i32.const 0x2017c) "\70\01\02\00" "\01" "/ " "\21\00\00\00") + (data (i32.const 0x20168) "\5c\01\02\00" "\01" "/ " "\21\00\00\00") (elem (i32.const 0x21) $/) ;; 6.1.0240 @@ -431,7 +429,7 @@ (i32.const 4))))))) (i32.store (local.get $btos) (i32.div_s (local.get $n1) (local.get $n2))) (local.get $tos)) - (data (i32.const 0x20188) "\7c\01\02\00" "\04" "/MOD " "\22\00\00\00") + (data (i32.const 0x20174) "\68\01\02\00" "\04" "/MOD " "\22\00\00\00") (elem (i32.const 0x22) $/MOD) ;; 6.1.0250 @@ -443,7 +441,7 @@ (then (i32.store (local.get $btos) (i32.const -1))) (else (i32.store (local.get $btos) (i32.const 0)))) (local.get $tos)) - (data (i32.const 0x20198) "\88\01\02\00" "\02" "0< " "\23\00\00\00") + (data (i32.const 0x20184) "\74\01\02\00" "\02" "0< " "\23\00\00\00") (elem (i32.const 0x23) $0<) ;; 6.1.0270 @@ -454,7 +452,7 @@ (then (i32.store (local.get $btos) (i32.const -1))) (else (i32.store (local.get $btos) (i32.const 0)))) (local.get $tos)) - (data (i32.const 0x201a4) "\98\01\02\00" "\02" "0= " "\24\00\00\00") + (data (i32.const 0x20190) "\84\01\02\00" "\02" "0= " "\24\00\00\00") (elem (i32.const 0x24) $0=) ;; 6.2.0280 @@ -466,7 +464,7 @@ (then (i32.store (local.get $btos) (i32.const -1))) (else (i32.store (local.get $btos) (i32.const 0)))) (local.get $tos)) - (data (i32.const 0x201b0) "\a4\01\02\00" "\02" "0> " "\25\00\00\00") + (data (i32.const 0x2019c) "\90\01\02\00" "\02" "0> " "\25\00\00\00") (elem (i32.const 0x25) $0>) ;; 6.1.0290 @@ -475,7 +473,7 @@ (i32.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))) (i32.add (i32.load (local.get $btos)) (i32.const 1))) (local.get $tos)) - (data (i32.const 0x201bc) "\b0\01\02\00" "\02" "1+ " "\26\00\00\00") + (data (i32.const 0x201a8) "\9c\01\02\00" "\02" "1+ " "\26\00\00\00") (elem (i32.const 0x26) $1+) ;; 6.1.0300 @@ -484,14 +482,14 @@ (i32.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))) (i32.sub (i32.load (local.get $btos)) (i32.const 1))) (local.get $tos)) - (data (i32.const 0x201c8) "\bc\01\02\00" "\02" "1- " "\27\00\00\00") + (data (i32.const 0x201b4) "\a8\01\02\00" "\02" "1- " "\27\00\00\00") (elem (i32.const 0x27) $1-) ;; 6.1.0310 (func $2! (param $tos i32) (result i32) (local.get $tos) (call $SWAP) (call $OVER) (call $!) (call $CELL+) (call $!)) - (data (i32.const 0x201d4) "\c8\01\02\00" "\02" "2! " "\28\00\00\00") + (data (i32.const 0x201c0) "\b4\01\02\00" "\02" "2! " "\28\00\00\00") (elem (i32.const 0x28) $2!) ;; 6.1.0320 @@ -500,7 +498,7 @@ (i32.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))) (i32.shl (i32.load (local.get $btos)) (i32.const 1))) (local.get $tos)) - (data (i32.const 0x201e0) "\d4\01\02\00" "\02" "2* " "\29\00\00\00") + (data (i32.const 0x201cc) "\c0\01\02\00" "\02" "2* " "\29\00\00\00") (elem (i32.const 0x29) $2*) ;; 6.1.0330 @@ -509,7 +507,7 @@ (i32.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))) (i32.shr_s (i32.load (local.get $btos)) (i32.const 1))) (local.get $tos)) - (data (i32.const 0x201ec) "\e0\01\02\00" "\02" "2/ " "\2a\00\00\00") + (data (i32.const 0x201d8) "\cc\01\02\00" "\02" "2/ " "\2a\00\00\00") (elem (i32.const 0x2a) $2/) ;; 6.1.0350 @@ -520,13 +518,13 @@ (call $@) (call $SWAP) (call $@)) - (data (i32.const 0x201f8) "\ec\01\02\00" "\02" "2@ " "\2b\00\00\00") + (data (i32.const 0x201e4) "\d8\01\02\00" "\02" "2@ " "\2b\00\00\00") (elem (i32.const 0x2b) $2@) ;; 6.1.0370 (func $2DROP (param $tos i32) (result i32) (i32.sub (local.get $tos) (i32.const 8))) - (data (i32.const 0x20204) "\f8\01\02\00" "\05" "2DROP " "\2c\00\00\00") + (data (i32.const 0x201f0) "\e4\01\02\00" "\05" "2DROP " "\2c\00\00\00") (elem (i32.const 0x2c) $2DROP) ;; 6.1.0380 @@ -536,7 +534,7 @@ (i32.store (i32.add (local.get $tos) (i32.const 4)) (i32.load (i32.sub (local.get $tos) (i32.const 4)))) (i32.add (local.get $tos) (i32.const 8))) - (data (i32.const 0x20214) "\04\02\02\00" "\04" "2DUP " "\2d\00\00\00") + (data (i32.const 0x20200) "\f0\01\02\00" "\04" "2DUP " "\2d\00\00\00") (elem (i32.const 0x2d) $2DUP) ;; 6.1.0400 @@ -546,7 +544,7 @@ (i32.store (i32.add (local.get $tos) (i32.const 4)) (i32.load (i32.sub (local.get $tos) (i32.const 12)))) (i32.add (local.get $tos) (i32.const 8))) - (data (i32.const 0x20224) "\14\02\02\00" "\05" "2OVER " "\2e\00\00\00") + (data (i32.const 0x20210) "\00\02\02\00" "\05" "2OVER " "\2e\00\00\00") (elem (i32.const 0x2e) $2OVER) ;; 6.1.0430 @@ -564,7 +562,7 @@ (i32.store (i32.sub (local.get $tos) (i32.const 4)) (local.get $x2)) (local.get $tos)) - (data (i32.const 0x20234) "\24\02\02\00" "\05" "2SWAP " "\2f\00\00\00") + (data (i32.const 0x20220) "\10\02\02\00" "\05" "2SWAP " "\2f\00\00\00") (elem (i32.const 0x2f) $2SWAP) ;; 6.1.0450 @@ -588,7 +586,7 @@ (call $startColon (i32.const 0)) (call $right-bracket)) - (data (i32.const 0x20244) "\34\02\02\00" "\01" ": " "\30\00\00\00") + (data (i32.const 0x20230) "\20\02\02\00" "\01" ": " "\30\00\00\00") (elem (i32.const 0x30) $:) ;; 6.1.0460 @@ -598,7 +596,7 @@ (call $endColon) (call $hidden) (call $left-bracket)) - (data (i32.const 0x20250) "\44\02\02\00" "\81" (; F_IMMEDIATE ;) "; " "\31\00\00\00") + (data (i32.const 0x2023c) "\30\02\02\00" "\81" (; F_IMMEDIATE ;) "; " "\31\00\00\00") (elem (i32.const 0x31) $semicolon) ;; 6.1.0480 @@ -610,14 +608,14 @@ (then (i32.store (local.get $bbtos) (i32.const -1))) (else (i32.store (local.get $bbtos) (i32.const 0)))) (local.get $btos)) - (data (i32.const 0x2025c) "\50\02\02\00" "\01" "< " "\32\00\00\00") + (data (i32.const 0x20248) "\3c\02\02\00" "\01" "< " "\32\00\00\00") (elem (i32.const 0x32) $<) ;; 6.1.0490 (func $<# (param $tos i32) (result i32) (global.set $po (i32.add (global.get $here) (i32.const 0x200 (; = PICTURED_OUTPUT_OFFSET ;)))) (local.get $tos)) - (data (i32.const 0x20268) "\5c\02\02\00" "\02" "<# " "\33\00\00\00") + (data (i32.const 0x20254) "\48\02\02\00" "\02" "<# " "\33\00\00\00") (elem (i32.const 0x33) $<#) ;; 6.1.0530 @@ -629,7 +627,7 @@ (then (i32.store (local.get $bbtos) (i32.const -1))) (else (i32.store (local.get $bbtos) (i32.const 0)))) (local.get $btos)) - (data (i32.const 0x20274) "\68\02\02\00" "\01" "= " "\34\00\00\00") + (data (i32.const 0x20260) "\54\02\02\00" "\01" "= " "\34\00\00\00") (elem (i32.const 0x34) $=) ;; 6.1.0540 @@ -641,7 +639,7 @@ (then (i32.store (local.get $bbtos) (i32.const -1))) (else (i32.store (local.get $bbtos) (i32.const 0)))) (local.get $btos)) - (data (i32.const 0x20280) "\74\02\02\00" "\01" "> " "\35\00\00\00") + (data (i32.const 0x2026c) "\60\02\02\00" "\01" "> " "\35\00\00\00") (elem (i32.const 0x35) $>) ;; 6.1.0550 @@ -650,11 +648,11 @@ (i32.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))) (i32.add (call $body (i32.load (local.get $btos))) (i32.const 4))) (local.get $tos)) - (data (i32.const 0x2028c) "\80\02\02\00" "\05" ">BODY " "\36\00\00\00") + (data (i32.const 0x20278) "\6c\02\02\00" "\05" ">BODY " "\36\00\00\00") (elem (i32.const 0x36) $>BODY) ;; 6.1.0560 - (data (i32.const 0x2029c) "\8c\02\02\00" "\43" (; F_DATA ;) ">IN" "\03\00\00\00" (; = pack(PUSH_DATA_ADDRESS_INDEX) ;) "\00\00\00\00") + (data (i32.const 0x20288) "\78\02\02\00" "\43" (; F_DATA ;) ">IN" "\03\00\00\00" (; = pack(PUSH_DATA_ADDRESS_INDEX) ;) "\00\00\00\00") ;; 6.1.0570 (func $>NUMBER (param $tos i32) (result i32) @@ -675,7 +673,7 @@ (i32.store (local.get $bbtos) (local.get $rest)) (i64.store (local.get $bbbbtos) (local.get $value)) (local.get $tos)) - (data (i32.const 0x202ac) "\9c\02\02\00" "\07" ">NUMBER" "\37\00\00\00") + (data (i32.const 0x20298) "\88\02\02\00" "\07" ">NUMBER" "\37\00\00\00") (elem (i32.const 0x37) $>NUMBER) ;; 6.1.0580 @@ -683,7 +681,7 @@ (local.tee $tos (i32.sub (local.get $tos) (i32.const 4))) (i32.store (global.get $tors) (i32.load (local.get $tos))) (global.set $tors (i32.add (global.get $tors) (i32.const 4)))) - (data (i32.const 0x202bc) "\ac\02\02\00" "\02" ">R " "\38\00\00\00") + (data (i32.const 0x202a8) "\98\02\02\00" "\02" ">R " "\38\00\00\00") (elem (i32.const 0x38) $>R) ;; 6.1.0630 @@ -696,7 +694,7 @@ (i32.add (local.get $tos) (i32.const 4))) (else (local.get $tos)))) - (data (i32.const 0x202c8) "\bc\02\02\00" "\04" "?DUP " "\39\00\00\00") + (data (i32.const 0x202b4) "\a8\02\02\00" "\04" "?DUP " "\39\00\00\00") (elem (i32.const 0x39) $?DUP) ;; 6.1.0650 @@ -705,13 +703,13 @@ (i32.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))) (i32.load (i32.load (local.get $btos)))) (local.get $tos)) - (data (i32.const 0x202d8) "\c8\02\02\00" "\01" "@ " "\3a\00\00\00") + (data (i32.const 0x202c4) "\b4\02\02\00" "\01" "@ " "\3a\00\00\00") (elem (i32.const 0x3a) $@) ;; 6.1.0670 ABORT (func $ABORT (param $tos i32) (result i32) (call $QUIT (i32.const 0x10000 (; = STACK_BASE ;)))) - (data (i32.const 0x202e4) "\d8\02\02\00" "\05" "ABORT " "\3b\00\00\00") + (data (i32.const 0x202d0) "\c4\02\02\00" "\05" "ABORT " "\3b\00\00\00") ;; 6.1.0680 ABORT" (func $ABORTq (param $tos i32) (result i32) @@ -721,7 +719,7 @@ (call $emitICall (i32.const 0) (i32.const 0x91 (; = index("TYPE") ;))) (call $emitICall (i32.const 0) (i32.const 0x3b (; = index("ABORT") ;))) (call $compileThen)) - (data (i32.const 0x202f4) "\e4\02\02\00" "\86" (; F_IMMEDIATE ;) "ABORT\22 " "\3c\00\00\00") + (data (i32.const 0x202e0) "\d0\02\02\00" "\86" (; F_IMMEDIATE ;) "ABORT\22 " "\3c\00\00\00") (elem (i32.const 0x3c) $ABORTq) ;; 6.1.0690 @@ -734,7 +732,7 @@ (local.tee $y (i32.shr_s (local.get $v) (i32.const 31)))) (local.get $y))) (local.get $tos)) - (data (i32.const 0x20304) "\f4\02\02\00" "\03" "ABS" "\3d\00\00\00") + (data (i32.const 0x202f0) "\e0\02\02\00" "\03" "ABS" "\3d\00\00\00") (elem (i32.const 0x3d) $ABS) ;; 6.1.0695 @@ -759,14 +757,14 @@ (br_if $loop (i32.lt_u (local.get $p) (local.get $endp))))) (i32.store (local.get $bbtos) (i32.sub (local.get $p) (local.get $addr))) (local.get $btos)) - (data (i32.const 0x20310) "\04\03\02\00" "\06" "ACCEPT " "\3e\00\00\00") + (data (i32.const 0x202fc) "\f0\02\02\00" "\06" "ACCEPT " "\3e\00\00\00") (elem (i32.const 0x3e) $ACCEPT) ;; 6.1.0705 (func $ALIGN (param $tos i32) (result i32) (global.set $here (call $aligned (global.get $here))) (local.get $tos)) - (data (i32.const 0x20320) "\10\03\02\00" "\05" "ALIGN " "\3f\00\00\00") + (data (i32.const 0x2030c) "\fc\02\02\00" "\05" "ALIGN " "\3f\00\00\00") (elem (i32.const 0x3f) $ALIGN) ;; 6.1.0706 @@ -775,7 +773,7 @@ (i32.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))) (call $aligned (i32.load (local.get $btos)))) (local.get $tos)) - (data (i32.const 0x20330) "\20\03\02\00" "\07" "ALIGNED" "\40\00\00\00") + (data (i32.const 0x2031c) "\0c\03\02\00" "\07" "ALIGNED" "\40\00\00\00") (elem (i32.const 0x40) $ALIGNED) ;; 6.1.0710 @@ -784,7 +782,7 @@ (local.get $tos) (local.set $v (call $pop)) (global.set $here (i32.add (global.get $here) (local.get $v)))) - (data (i32.const 0x20340) "\30\03\02\00" "\05" "ALLOT " "\41\00\00\00") + (data (i32.const 0x2032c) "\1c\03\02\00" "\05" "ALLOT " "\41\00\00\00") (elem (i32.const 0x41) $ALLOT) ;; 6.1.0720 @@ -795,24 +793,24 @@ (i32.and (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))) (i32.load (local.get $bbtos)))) (local.get $btos)) - (data (i32.const 0x20350) "\40\03\02\00" "\03" "AND" "\42\00\00\00") + (data (i32.const 0x2033c) "\2c\03\02\00" "\03" "AND" "\42\00\00\00") (elem (i32.const 0x42) $AND) ;; 6.1.0750 - (data (i32.const 0x2035c) "\50\03\02\00" "\44" (; F_DATA ;) "BASE " "\03\00\00\00" (; = pack(PUSH_DATA_ADDRESS_INDEX) ;) "\0a\00\00\00" (; = pack(10) ;)) + (data (i32.const 0x20348) "\3c\03\02\00" "\44" (; F_DATA ;) "BASE " "\03\00\00\00" (; = pack(PUSH_DATA_ADDRESS_INDEX) ;) "\0a\00\00\00" (; = pack(10) ;)) ;; 6.1.0760 (func $BEGIN (param $tos i32) (result i32) (local.get $tos) (call $ensureCompiling) (call $compileBegin)) - (data (i32.const 0x20370) "\5c\03\02\00" "\85" (; F_IMMEDIATE ;) "BEGIN " "\43\00\00\00") + (data (i32.const 0x2035c) "\48\03\02\00" "\85" (; F_IMMEDIATE ;) "BEGIN " "\43\00\00\00") (elem (i32.const 0x43) $BEGIN) ;; 6.1.0770 (func $BL (param $tos i32) (result i32) (call $push (local.get $tos) (i32.const 32))) - (data (i32.const 0x20380) "\70\03\02\00" "\02" "BL " "\44\00\00\00") + (data (i32.const 0x2036c) "\5c\03\02\00" "\02" "BL " "\44\00\00\00") (elem (i32.const 0x44) $BL) ;; 6.1.0850 @@ -821,7 +819,7 @@ (i32.store8 (i32.load (i32.sub (local.get $tos) (i32.const 4))) (i32.load (local.tee $bbtos (i32.sub (local.get $tos) (i32.const 8))))) (local.get $bbtos)) - (data (i32.const 0x2038c) "\80\03\02\00" "\02" "C! " "\45\00\00\00") + (data (i32.const 0x20378) "\6c\03\02\00" "\02" "C! " "\45\00\00\00") (elem (i32.const 0x45) $C!) ;; 6.1.0860 @@ -830,7 +828,7 @@ (i32.load (i32.sub (local.get $tos) (i32.const 4)))) (global.set $here (i32.add (global.get $here) (i32.const 1))) (i32.sub (local.get $tos) (i32.const 4))) - (data (i32.const 0x20398) "\8c\03\02\00" "\02" "C, " "\46\00\00\00") + (data (i32.const 0x20384) "\78\03\02\00" "\02" "C, " "\46\00\00\00") (elem (i32.const 0x46) $Cc) ;; 6.1.0870 @@ -839,7 +837,7 @@ (i32.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))) (i32.load8_u (i32.load (local.get $btos)))) (local.get $tos)) - (data (i32.const 0x203a4) "\98\03\02\00" "\02" "C@ " "\47\00\00\00") + (data (i32.const 0x20390) "\84\03\02\00" "\02" "C@ " "\47\00\00\00") (elem (i32.const 0x47) $C@) ;; 6.1.0880 @@ -848,7 +846,7 @@ (i32.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))) (i32.add (i32.load (local.get $btos)) (i32.const 4))) (local.get $tos)) - (data (i32.const 0x203b0) "\a4\03\02\00" "\05" "CELL+ " "\48\00\00\00") + (data (i32.const 0x2039c) "\90\03\02\00" "\05" "CELL+ " "\48\00\00\00") (elem (i32.const 0x48) $CELL+) ;; 6.1.0890 @@ -857,7 +855,7 @@ (i32.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))) (i32.shl (i32.load (local.get $btos)) (i32.const 2))) (local.get $tos)) - (data (i32.const 0x203c0) "\b0\03\02\00" "\05" "CELLS " "\49\00\00\00") + (data (i32.const 0x203ac) "\9c\03\02\00" "\05" "CELLS " "\49\00\00\00") (elem (i32.const 0x49) $CELLS) ;; 6.1.0895 @@ -870,19 +868,19 @@ (return (call $fail (local.get $tos) (i32.const 0x2001d (; = str("incomplete input") ;)))))) (i32.store (local.get $tos) (i32.load8_u (local.get $addr))) (i32.add (local.get $tos) (i32.const 4))) - (data (i32.const 0x203d0) "\c0\03\02\00" "\04" "CHAR " "\4a\00\00\00") + (data (i32.const 0x203bc) "\ac\03\02\00" "\04" "CHAR " "\4a\00\00\00") (elem (i32.const 0x4a) $CHAR) ;; 6.1.0897 (func $CHAR+ (param $tos i32) (result i32) (call $1+ (local.get $tos))) - (data (i32.const 0x203e0) "\d0\03\02\00" "\05" "CHAR+ " "\4b\00\00\00") + (data (i32.const 0x203cc) "\bc\03\02\00" "\05" "CHAR+ " "\4b\00\00\00") (elem (i32.const 0x4b) $CHAR+) ;; 6.1.0898 (func $CHARS (param $tos i32) (result i32) (local.get $tos)) - (data (i32.const 0x203f0) "\e0\03\02\00" "\05" "CHARS " "\4c\00\00\00") + (data (i32.const 0x203dc) "\cc\03\02\00" "\05" "CHARS " "\4c\00\00\00") (elem (i32.const 0x4c) $CHARS) ;; 6.1.0950 @@ -894,7 +892,7 @@ (local.set $v (call $pop)) (i32.store (global.get $here) (local.get $v)) (global.set $here (i32.add (global.get $here) (i32.const 4)))) - (data (i32.const 0x20400) "\f0\03\02\00" "\08" "CONSTANT " "\4d\00\00\00") + (data (i32.const 0x203ec) "\dc\03\02\00" "\08" "CONSTANT " "\4d\00\00\00") (elem (i32.const 0x4d) $CONSTANT) ;; 6.1.0980 @@ -906,13 +904,13 @@ (i32.const 4))))))) (i32.store (local.get $btos) (i32.add (local.get $addr) (i32.const 1))) (i32.add (local.get $tos) (i32.const 4))) - (data (i32.const 0x20414) "\00\04\02\00" "\05" "COUNT " "\4e\00\00\00") + (data (i32.const 0x20400) "\ec\03\02\00" "\05" "COUNT " "\4e\00\00\00") (elem (i32.const 0x4e) $COUNT) ;; 6.1.0990 (func $CR (param $tos i32) (result i32) (call $push (local.get $tos) (i32.const 10)) (call $EMIT)) - (data (i32.const 0x20424) "\14\04\02\00" "\02" "CR " "\4f\00\00\00") + (data (i32.const 0x20410) "\00\04\02\00" "\02" "CR " "\4f\00\00\00") (elem (i32.const 0x4f) $CR) ;; 6.1.1000 @@ -939,14 +937,14 @@ (i32.store (global.get $here) (i32.const 0)) (call $setFlag (i32.const 0x40 (; = F_DATA ;))) (local.get $tos)) - (data (i32.const 0x20430) "\24\04\02\00" "\06" "CREATE " "\50\00\00\00") + (data (i32.const 0x2041c) "\10\04\02\00" "\06" "CREATE " "\50\00\00\00") (elem (i32.const 0x50) $CREATE) ;; 6.1.1170 (func $DECIMAL (param $tos i32) (result i32) - (i32.store (i32.const 0x2036c (; = body(BASE) ;)) (i32.const 10)) + (i32.store (i32.const 0x20358 (; = body(BASE) ;)) (i32.const 10)) (local.get $tos)) - (data (i32.const 0x20440) "\30\04\02\00" "\07" "DECIMAL" "\51\00\00\00") + (data (i32.const 0x2042c) "\1c\04\02\00" "\07" "DECIMAL" "\51\00\00\00") (elem (i32.const 0x51) $DECIMAL) ;; 6.1.1200 @@ -954,7 +952,7 @@ (i32.store (local.get $tos) (i32.shr_u (i32.sub (local.get $tos) (i32.const 0x10000 (; = STACK_BASE ;))) (i32.const 2))) (i32.add (local.get $tos) (i32.const 4))) - (data (i32.const 0x20450) "\40\04\02\00" "\05" "DEPTH " "\52\00\00\00") + (data (i32.const 0x2043c) "\2c\04\02\00" "\05" "DEPTH " "\52\00\00\00") (elem (i32.const 0x52) $DEPTH) ;; 6.1.1240 @@ -962,7 +960,7 @@ (local.get $tos) (call $ensureCompiling) (call $compileDo)) - (data (i32.const 0x20460) "\50\04\02\00" "\82" (; F_IMMEDIATE ;) "DO " "\53\00\00\00") + (data (i32.const 0x2044c) "\3c\04\02\00" "\82" (; F_IMMEDIATE ;) "DO " "\53\00\00\00") (elem (i32.const 0x53) $DO) ;; 6.1.1250 @@ -974,13 +972,13 @@ (call $endColon) (call $startColon (i32.const 1)) (call $compilePushLocal (i32.const 1))) - (data (i32.const 0x2046c) "\60\04\02\00" "\85" (; F_IMMEDIATE ;) "DOES> " "\54\00\00\00") + (data (i32.const 0x20458) "\4c\04\02\00" "\85" (; F_IMMEDIATE ;) "DOES> " "\54\00\00\00") (elem (i32.const 0x54) $DOES>) ;; 6.1.1260 (func $DROP (param $tos i32) (result i32) (i32.sub (local.get $tos) (i32.const 4))) - (data (i32.const 0x2047c) "\6c\04\02\00" "\04" "DROP " "\55\00\00\00") + (data (i32.const 0x20468) "\58\04\02\00" "\04" "DROP " "\55\00\00\00") (elem (i32.const 0x55) $DROP) ;; 6.1.1290 @@ -988,7 +986,7 @@ (i32.store (local.get $tos) (i32.load (i32.sub (local.get $tos) (i32.const 4)))) (i32.add (local.get $tos) (i32.const 4))) - (data (i32.const 0x2048c) "\7c\04\02\00" "\03" "DUP" "\56\00\00\00") + (data (i32.const 0x20478) "\68\04\02\00" "\03" "DUP" "\56\00\00\00") (elem (i32.const 0x56) $DUP) ;; 6.1.1310 @@ -996,14 +994,14 @@ (local.get $tos) (call $ensureCompiling) (call $emitElse)) - (data (i32.const 0x20498) "\8c\04\02\00" "\84" (; F_IMMEDIATE ;) "ELSE " "\57\00\00\00") + (data (i32.const 0x20484) "\78\04\02\00" "\84" (; F_IMMEDIATE ;) "ELSE " "\57\00\00\00") (elem (i32.const 0x57) $ELSE) ;; 6.1.1320 (func $EMIT (param $tos i32) (result i32) (call $shell_emit (i32.load (i32.sub (local.get $tos) (i32.const 4)))) (i32.sub (local.get $tos) (i32.const 4))) - (data (i32.const 0x204a8) "\98\04\02\00" "\04" "EMIT " "\58\00\00\00") + (data (i32.const 0x20494) "\84\04\02\00" "\04" "EMIT " "\58\00\00\00") (elem (i32.const 0x58) $EMIT) ;; 6.1.1345 @@ -1014,13 +1012,13 @@ (local $bbtos i32) (local.set $addr (i32.load (local.tee $bbtos (i32.sub (local.get $tos) (i32.const 8))))) (local.set $len (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))))) - (if (result i32) (call $stringEqual (local.get $addr) (local.get $len) (i32.const 0x2007a (; = str("ADDRESS-UNIT-BITS") + 1 ;)) (i32.const 0x11 (; = len("ADDRESS-UNIT-BITS") ;))) + (if (result i32) (call $stringEqual (local.get $addr) (local.get $len) (i32.const 0x20064 (; = str("ADDRESS-UNIT-BITS") + 1 ;)) (i32.const 0x11 (; = len("ADDRESS-UNIT-BITS") ;))) (then (i32.store (local.get $bbtos) (i32.const 8)) (i32.store (local.get $btos) (i32.const -1)) (local.get $tos)) (else - (if (result i32) (call $stringEqual (local.get $addr) (local.get $len) (i32.const 0x2008c (; = str("/COUNTED-STRING") + 1 ;)) (i32.const 0xf (; = len("/COUNTED-STRING") ;))) + (if (result i32) (call $stringEqual (local.get $addr) (local.get $len) (i32.const 0x20076 (; = str("/COUNTED-STRING") + 1 ;)) (i32.const 0xf (; = len("/COUNTED-STRING") ;))) (then (i32.store (local.get $bbtos) (i32.const 255)) (i32.store (local.get $btos) (i32.const -1)) @@ -1028,7 +1026,7 @@ (else (i32.store (local.get $bbtos) (i32.const 0)) (local.get $btos)))))) - (data (i32.const 0x204b8) "\a8\04\02\00" "\0c" "ENVIRONMENT? " "\59\00\00\00") + (data (i32.const 0x204a4) "\94\04\02\00" "\0c" "ENVIRONMENT? " "\59\00\00\00") (elem (i32.const 0x59) $ENVIRONMENT?) ;; 6.2.1350 @@ -1039,7 +1037,7 @@ (i32.const 0) (i32.load (i32.sub (local.get $tos) (i32.const 4)))) (local.get $bbtos)) - (data (i32.const 0x204d0) "\b8\04\02\00" "\05" "ERASE " "\5a\00\00\00") + (data (i32.const 0x204bc) "\a4\04\02\00" "\05" "ERASE " "\5a\00\00\00") (elem (i32.const 0x5a) $ERASE) ;; 6.1.1360 @@ -1052,23 +1050,23 @@ ;; Save input state (local.set $prevSourceID (global.get $sourceID)) - (local.set $prevIn (i32.load (i32.const 0x202a8 (; = body(>IN) ;)))) + (local.set $prevIn (i32.load (i32.const 0x20294 (; = body(>IN) ;)))) (local.set $prevInputBufferSize (global.get $inputBufferSize)) (local.set $prevInputBufferBase (global.get $inputBufferBase)) (global.set $sourceID (i32.const -1)) (global.set $inputBufferBase (i32.load (local.tee $bbtos (i32.sub (local.get $tos) (i32.const 8))))) (global.set $inputBufferSize (i32.load (i32.sub (local.get $tos) (i32.const 4)))) - (i32.store (i32.const 0x202a8 (; = body(>IN) ;)) (i32.const 0)) + (i32.store (i32.const 0x20294 (; = body(>IN) ;)) (i32.const 0)) (drop (call $interpret (local.get $bbtos))) ;; Restore input state (global.set $sourceID (local.get $prevSourceID)) - (i32.store (i32.const 0x202a8 (; = body(>IN) ;)) (local.get $prevIn)) + (i32.store (i32.const 0x20294 (; = body(>IN) ;)) (local.get $prevIn)) (global.set $inputBufferBase (local.get $prevInputBufferBase)) (global.set $inputBufferSize (local.get $prevInputBufferSize))) - (data (i32.const 0x204e0) "\d0\04\02\00" "\08" "EVALUATE " "\5b\00\00\00") + (data (i32.const 0x204cc) "\bc\04\02\00" "\08" "EVALUATE " "\5b\00\00\00") (elem (i32.const 0x5b) $EVALUATE) ;; 6.1.1370 @@ -1084,7 +1082,7 @@ (i32.load (local.get $body)))) (else (call_indirect (type $word) (i32.load (local.get $body)))))) - (data (i32.const 0x204f4) "\e0\04\02\00" "\07" "EXECUTE" "\5c\00\00\00") + (data (i32.const 0x204e0) "\cc\04\02\00" "\07" "EXECUTE" "\5c\00\00\00") (elem (i32.const 0x5c) $EXECUTE) ;; 6.1.1380 @@ -1092,13 +1090,13 @@ (local.get $tos) (call $ensureCompiling) (call $emitReturn)) - (data (i32.const 0x20504) "\f4\04\02\00" "\84" (; F_IMMEDIATE ;) "EXIT " "\5d\00\00\00") + (data (i32.const 0x204f0) "\e0\04\02\00" "\84" (; F_IMMEDIATE ;) "EXIT " "\5d\00\00\00") (elem (i32.const 0x5d) $EXIT) ;; 6.2.1485 (func $FALSE (param $tos i32) (result i32) (call $push (local.get $tos) (i32.const 0x0))) - (data (i32.const 0x20514) "\04\05\02\00" "\05" "FALSE " "\5e\00\00\00") + (data (i32.const 0x20500) "\f0\04\02\00" "\05" "FALSE " "\5e\00\00\00") (elem (i32.const 0x5e) $FALSE) ;; 6.1.1540 @@ -1109,7 +1107,7 @@ (i32.load (i32.sub (local.get $tos) (i32.const 4))) (i32.load (i32.sub (local.get $tos) (i32.const 8)))) (local.get $bbbtos)) - (data (i32.const 0x20524) "\14\05\02\00" "\04" "FILL " "\5f\00\00\00") + (data (i32.const 0x20510) "\00\05\02\00" "\04" "FILL " "\5f\00\00\00") (elem (i32.const 0x5f) $FILL) ;; 6.1.1550 @@ -1126,7 +1124,7 @@ (else (i32.store (i32.sub (local.get $tos) (i32.const 4)) (local.get $xt)))) (i32.store (local.get $tos) (local.get $r)) (i32.add (local.get $tos) (i32.const 4))) - (data (i32.const 0x20534) "\24\05\02\00" "\04" "FIND " "\60\00\00\00") + (data (i32.const 0x20520) "\10\05\02\00" "\04" "FIND " "\60\00\00\00") (elem (i32.const 0x60) $FIND) ;; 6.1.1561 @@ -1154,21 +1152,21 @@ (i32.store (local.get $bbbtos) (local.get $mod)) (i32.store (i32.sub (local.get $tos) (i32.const 8)) (local.get $q)) (local.get $btos)) - (data (i32.const 0x20544) "\34\05\02\00" "\06" "FM/MOD " "\61\00\00\00") + (data (i32.const 0x20530) "\20\05\02\00" "\06" "FM/MOD " "\61\00\00\00") (elem (i32.const 0x61) $FM/MOD) ;; 6.1.1650 (func $HERE (param $tos i32) (result i32) (i32.store (local.get $tos) (global.get $here)) (i32.add (local.get $tos) (i32.const 4))) - (data (i32.const 0x20554) "\44\05\02\00" "\04" "HERE " "\62\00\00\00") + (data (i32.const 0x20540) "\30\05\02\00" "\04" "HERE " "\62\00\00\00") (elem (i32.const 0x62) $HERE) ;; 6.2.1660 (func $HEX (param $tos i32) (result i32) - (i32.store (i32.const 0x2036c (; = body(BASE) ;)) (i32.const 16)) + (i32.store (i32.const 0x20358 (; = body(BASE) ;)) (i32.const 16)) (local.get $tos)) - (data (i32.const 0x20564) "\54\05\02\00" "\03" "HEX" "\63\00\00\00") + (data (i32.const 0x20550) "\40\05\02\00" "\03" "HEX" "\63\00\00\00") (elem (i32.const 0x63) $HEX) ;; 6.1.1670 @@ -1180,14 +1178,14 @@ (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))))) (global.set $po (local.get $npo)) (local.get $btos)) - (data (i32.const 0x20570) "\64\05\02\00" "\04" "HOLD " "\64\00\00\00") + (data (i32.const 0x2055c) "\50\05\02\00" "\04" "HOLD " "\64\00\00\00") (elem (i32.const 0x64) $HOLD) ;; 6.1.1680 (func $I (param $tos i32) (result i32) (i32.store (local.get $tos) (i32.load (i32.sub (global.get $tors) (i32.const 4)))) (i32.add (local.get $tos) (i32.const 4))) - (data (i32.const 0x20580) "\70\05\02\00" "\01" "I " "\65\00\00\00") + (data (i32.const 0x2056c) "\5c\05\02\00" "\01" "I " "\65\00\00\00") (elem (i32.const 0x65) $I) ;; 6.1.1700 @@ -1195,14 +1193,14 @@ (local.get $tos) (call $ensureCompiling) (call $compileIf)) - (data (i32.const 0x2058c) "\80\05\02\00" "\82" (; F_IMMEDIATE ;) "IF " "\66\00\00\00") + (data (i32.const 0x20578) "\6c\05\02\00" "\82" (; F_IMMEDIATE ;) "IF " "\66\00\00\00") (elem (i32.const 0x66) $IF) ;; 6.1.1710 (func $IMMEDIATE (param $tos i32) (result i32) (call $setFlag (i32.const 0x80 (; = F_IMMEDIATE ;))) (local.get $tos)) - (data (i32.const 0x20598) "\8c\05\02\00" "\09" "IMMEDIATE " "\67\00\00\00") + (data (i32.const 0x20584) "\78\05\02\00" "\09" "IMMEDIATE " "\67\00\00\00") (elem (i32.const 0x67) $IMMEDIATE) ;; 6.1.1720 @@ -1211,27 +1209,27 @@ (i32.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))) (i32.xor (i32.load (local.get $btos)) (i32.const -1))) (local.get $tos)) - (data (i32.const 0x205ac) "\98\05\02\00" "\06" "INVERT " "\68\00\00\00") + (data (i32.const 0x20598) "\84\05\02\00" "\06" "INVERT " "\68\00\00\00") (elem (i32.const 0x68) $INVERT) ;; 6.1.1730 (func $J (param $tos i32) (result i32) (i32.store (local.get $tos) (i32.load (i32.sub (global.get $tors) (i32.const 8)))) (i32.add (local.get $tos) (i32.const 4))) - (data (i32.const 0x205bc) "\ac\05\02\00" "\01" "J " "\69\00\00\00") + (data (i32.const 0x205a8) "\98\05\02\00" "\01" "J " "\69\00\00\00") (elem (i32.const 0x69) $J) ;; 6.1.1750 (func $KEY (param $tos i32) (result i32) (i32.store (local.get $tos) (call $shell_key)) (i32.add (local.get $tos) (i32.const 4))) - (data (i32.const 0x205c8) "\bc\05\02\00" "\03" "KEY" "\6a\00\00\00") + (data (i32.const 0x205b4) "\a8\05\02\00" "\03" "KEY" "\6a\00\00\00") (elem (i32.const 0x6a) $KEY) (func $LATEST (param $tos i32) (result i32) (i32.store (local.get $tos) (global.get $latest)) (i32.add (local.get $tos) (i32.const 4))) - (data (i32.const 0x205d4) "\c8\05\02\00" "\06" "LATEST " "\6b\00\00\00") + (data (i32.const 0x205c0) "\b4\05\02\00" "\06" "LATEST " "\6b\00\00\00") (elem (i32.const 0x6b) $LATEST) ;; 6.1.1760 @@ -1239,7 +1237,7 @@ (local.get $tos) (call $ensureCompiling) (call $compileLeave)) - (data (i32.const 0x205e4) "\d4\05\02\00" "\85" (; F_IMMEDIATE ;) "LEAVE " "\6c\00\00\00") + (data (i32.const 0x205d0) "\c0\05\02\00" "\85" (; F_IMMEDIATE ;) "LEAVE " "\6c\00\00\00") (elem (i32.const 0x6c) $LEAVE) ;; 6.1.1780 @@ -1247,7 +1245,7 @@ (local.get $tos) (call $ensureCompiling) (call $compilePushConst (call $pop))) - (data (i32.const 0x205f4) "\e4\05\02\00" "\87" (; F_IMMEDIATE ;) "LITERAL" "\6d\00\00\00") + (data (i32.const 0x205e0) "\d0\05\02\00" "\87" (; F_IMMEDIATE ;) "LITERAL" "\6d\00\00\00") (elem (i32.const 0x6d) $LITERAL) ;; 6.1.1800 @@ -1255,7 +1253,7 @@ (local.get $tos) (call $ensureCompiling) (call $compileLoop)) - (data (i32.const 0x20604) "\f4\05\02\00" "\84" (; F_IMMEDIATE ;) "LOOP " "\6e\00\00\00") + (data (i32.const 0x205f0) "\e0\05\02\00" "\84" (; F_IMMEDIATE ;) "LOOP " "\6e\00\00\00") (elem (i32.const 0x6e) $LOOP) ;; 6.1.1805 @@ -1266,7 +1264,7 @@ (i32.shl (i32.load (local.get $bbtos)) (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))))) (local.get $btos)) - (data (i32.const 0x20614) "\04\06\02\00" "\06" "LSHIFT " "\6f\00\00\00") + (data (i32.const 0x20600) "\f0\05\02\00" "\06" "LSHIFT " "\6f\00\00\00") (elem (i32.const 0x6f) $LSHIFT) ;; 6.1.1810 @@ -1277,7 +1275,7 @@ (i64.extend_i32_s (i32.load (i32.sub (local.get $tos) (i32.const 4)))))) (local.get $tos)) - (data (i32.const 0x20624) "\14\06\02\00" "\02" "M* " "\70\00\00\00") + (data (i32.const 0x20610) "\00\06\02\00" "\02" "M* " "\70\00\00\00") (elem (i32.const 0x70) $M*) ;; 6.1.1870 @@ -1291,7 +1289,7 @@ (then (i32.store (local.get $bbtos) (local.get $v)))) (local.get $btos)) - (data (i32.const 0x20630) "\24\06\02\00" "\03" "MAX" "\71\00\00\00") + (data (i32.const 0x2061c) "\10\06\02\00" "\03" "MAX" "\71\00\00\00") (elem (i32.const 0x71) $MAX) ;; 6.1.1880 @@ -1305,7 +1303,7 @@ (then (i32.store (local.get $bbtos) (local.get $v)))) (local.get $btos)) - (data (i32.const 0x2063c) "\30\06\02\00" "\03" "MIN" "\72\00\00\00") + (data (i32.const 0x20628) "\1c\06\02\00" "\03" "MIN" "\72\00\00\00") (elem (i32.const 0x72) $MIN) ;; 6.1.1890 @@ -1316,7 +1314,7 @@ (i32.rem_s (i32.load (local.get $bbtos)) (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))))) (local.get $btos)) - (data (i32.const 0x20648) "\3c\06\02\00" "\03" "MOD" "\73\00\00\00") + (data (i32.const 0x20634) "\28\06\02\00" "\03" "MOD" "\73\00\00\00") (elem (i32.const 0x73) $MOD) ;; 6.1.1900 @@ -1327,7 +1325,7 @@ (i32.load (local.tee $bbbtos (i32.sub (local.get $tos) (i32.const 12)))) (i32.load (i32.sub (local.get $tos) (i32.const 4)))) (local.get $bbbtos)) - (data (i32.const 0x20654) "\48\06\02\00" "\04" "MOVE " "\74\00\00\00") + (data (i32.const 0x20640) "\34\06\02\00" "\04" "MOVE " "\74\00\00\00") (elem (i32.const 0x74) $MOVE) ;; 6.1.1910 @@ -1336,14 +1334,14 @@ (i32.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))) (i32.sub (i32.const 0) (i32.load (local.get $btos)))) (local.get $tos)) - (data (i32.const 0x20664) "\54\06\02\00" "\06" "NEGATE " "\75\00\00\00") + (data (i32.const 0x20650) "\40\06\02\00" "\06" "NEGATE " "\75\00\00\00") (elem (i32.const 0x75) $NEGATE) ;; 6.2.1930 (func $NIP (param $tos i32) (result i32) (local.get $tos) (call $SWAP) (call $DROP)) - (data (i32.const 0x20674) "\64\06\02\00" "\03" "NIP" "\76\00\00\00") + (data (i32.const 0x20660) "\50\06\02\00" "\03" "NIP" "\76\00\00\00") (elem (i32.const 0x76) $NIP) ;; 6.1.1980 @@ -1354,7 +1352,7 @@ (i32.or (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))) (i32.load (local.get $bbtos)))) (local.get $btos)) - (data (i32.const 0x20680) "\74\06\02\00" "\02" "OR " "\77\00\00\00") + (data (i32.const 0x2066c) "\60\06\02\00" "\02" "OR " "\77\00\00\00") (elem (i32.const 0x77) $OR) ;; 6.1.1990 @@ -1362,7 +1360,7 @@ (i32.store (local.get $tos) (i32.load (i32.sub (local.get $tos) (i32.const 8)))) (i32.add (local.get $tos) (i32.const 4))) - (data (i32.const 0x2068c) "\80\06\02\00" "\04" "OVER " "\78\00\00\00") + (data (i32.const 0x20678) "\6c\06\02\00" "\04" "OVER " "\78\00\00\00") (elem (i32.const 0x78) $OVER) ;; 6.2.2030 @@ -1374,7 +1372,7 @@ (local.get $tos) (i32.shl (i32.add (i32.load (local.get $btos)) (i32.const 2)) (i32.const 2))))) (local.get $tos)) - (data (i32.const 0x2069c) "\8c\06\02\00" "\04" "PICK " "\79\00\00\00") + (data (i32.const 0x20688) "\78\06\02\00" "\04" "PICK " "\79\00\00\00") (elem (i32.const 0x79) $PICK) ;; 6.1.2033 @@ -1392,7 +1390,7 @@ (else (call $emitConst (local.get $FINDToken)) (call $emitICall (i32.const 1) (i32.const 0x5 (; = COMPILE_CALL_INDEX ;)))))) - (data (i32.const 0x206ac) "\9c\06\02\00" "\88" (; F_IMMEDIATE ;) "POSTPONE " "\7a\00\00\00") + (data (i32.const 0x20698) "\88\06\02\00" "\88" (; F_IMMEDIATE ;) "POSTPONE " "\7a\00\00\00") (elem (i32.const 0x7a) $POSTPONE) ;; 6.1.2050 @@ -1400,9 +1398,9 @@ (global.set $tos (local.get $tos)) (global.set $tors (i32.const 0x2000 (; = RETURN_STACK_BASE ;))) (global.set $sourceID (i32.const 0)) - (i32.store (i32.const 0x207d0 (; = body(STATE) ;)) (i32.const 0)) + (i32.store (i32.const 0x207bc (; = body(STATE) ;)) (i32.const 0)) (unreachable)) - (data (i32.const 0x206c0) "\ac\06\02\00" "\04" "QUIT " "\7b\00\00\00") + (data (i32.const 0x206ac) "\98\06\02\00" "\04" "QUIT " "\7b\00\00\00") (elem (i32.const 0x7b) $QUIT) ;; 6.1.2060 @@ -1410,14 +1408,14 @@ (global.set $tors (i32.sub (global.get $tors) (i32.const 4))) (i32.store (local.get $tos) (i32.load (global.get $tors))) (i32.add (local.get $tos) (i32.const 4))) - (data (i32.const 0x206d0) "\c0\06\02\00" "\02" "R> " "\7c\00\00\00") + (data (i32.const 0x206bc) "\ac\06\02\00" "\02" "R> " "\7c\00\00\00") (elem (i32.const 0x7c) $R>) ;; 6.1.2070 (func $R@ (param $tos i32) (result i32) (i32.store (local.get $tos) (i32.load (i32.sub (global.get $tors) (i32.const 4)))) (i32.add (local.get $tos) (i32.const 4))) - (data (i32.const 0x206dc) "\d0\06\02\00" "\02" "R@ " "\7d\00\00\00") + (data (i32.const 0x206c8) "\bc\06\02\00" "\02" "R@ " "\7d\00\00\00") (elem (i32.const 0x7d) $R@) ;; 6.1.2120 @@ -1425,14 +1423,14 @@ (local.get $tos) (call $ensureCompiling) (call $compileRecurse)) - (data (i32.const 0x206e8) "\dc\06\02\00" "\87" (; F_IMMEDIATE ;) "RECURSE" "\7e\00\00\00") + (data (i32.const 0x206d4) "\c8\06\02\00" "\87" (; F_IMMEDIATE ;) "RECURSE" "\7e\00\00\00") (elem (i32.const 0x7e) $RECURSE) ;; 6.2.2125 (func $REFILL (param $tos i32) (result i32) (local $char i32) (global.set $inputBufferSize (i32.const 0)) - (i32.store (i32.const 0x202a8 (; = body(>IN) ;)) (i32.const 0)) + (i32.store (i32.const 0x20294 (; = body(>IN) ;)) (i32.const 0)) (local.get $tos) (if (param i32) (result i32) (i32.eq (global.get $sourceID) (i32.const -1)) (then @@ -1445,7 +1443,7 @@ (if (param i32) (result i32) (i32.eqz (global.get $inputBufferSize)) (then (call $push (i32.const 0))) (else (call $push (i32.const -1))))) - (data (i32.const 0x206f8) "\e8\06\02\00" "\06" "REFILL " "\7f\00\00\00") + (data (i32.const 0x206e4) "\d4\06\02\00" "\06" "REFILL " "\7f\00\00\00") (elem (i32.const 0x7f) $REFILL) ;; 6.1.2140 @@ -1453,7 +1451,7 @@ (local.get $tos) (call $ensureCompiling) (call $compileRepeat)) - (data (i32.const 0x20708) "\f8\06\02\00" "\86" (; F_IMMEDIATE ;) "REPEAT " "\80\00\00\00") + (data (i32.const 0x206f4) "\e4\06\02\00" "\86" (; F_IMMEDIATE ;) "REPEAT " "\80\00\00\00") (elem (i32.const 0x80) $REPEAT) ;; 6.1.2160 ROT @@ -1469,7 +1467,7 @@ (i32.load (local.tee $bbtos (i32.sub (local.get $tos) (i32.const 8))))) (i32.store (local.get $bbtos) (local.get $tmp)) (local.get $tos)) - (data (i32.const 0x20718) "\08\07\02\00" "\03" "ROT" "\81\00\00\00") + (data (i32.const 0x20704) "\f4\06\02\00" "\03" "ROT" "\81\00\00\00") (elem (i32.const 0x81) $ROT) ;; 6.1.2162 @@ -1480,7 +1478,7 @@ (i32.shr_u (i32.load (local.get $bbtos)) (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))))) (local.get $btos)) - (data (i32.const 0x20724) "\18\07\02\00" "\06" "RSHIFT " "\82\00\00\00") + (data (i32.const 0x20710) "\04\07\02\00" "\06" "RSHIFT " "\82\00\00\00") (elem (i32.const 0x82) $RSHIFT) ;; 6.1.2165 @@ -1496,7 +1494,7 @@ (call $compilePushConst (local.get $len)) (global.set $here (call $aligned (i32.add (global.get $here) (local.get $len))))) - (data (i32.const 0x20734) "\24\07\02\00" "\82" (; F_IMMEDIATE ;) "S\22 " "\83\00\00\00") + (data (i32.const 0x20720) "\10\07\02\00" "\82" (; F_IMMEDIATE ;) "S\22 " "\83\00\00\00") (elem (i32.const 0x83) $Sq) ;; 6.1.2170 @@ -1505,14 +1503,14 @@ (i64.store (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))) (i64.extend_i32_s (i32.load (local.get $btos)))) (i32.add (local.get $tos) (i32.const 4))) - (data (i32.const 0x20740) "\34\07\02\00" "\03" "S>D" "\84\00\00\00") + (data (i32.const 0x2072c) "\20\07\02\00" "\03" "S>D" "\84\00\00\00") (elem (i32.const 0x84) $S>D) (func $SCALL (param $tos i32) (result i32) (global.set $tos (local.get $tos)) (call $shell_call) (global.get $tos)) - (data (i32.const 0x2074c) "\40\07\02\00" "\05" "SCALL " "\85\00\00\00") + (data (i32.const 0x20738) "\2c\07\02\00" "\05" "SCALL " "\85\00\00\00") (elem (i32.const 0x85) $SCALL) ;; 6.1.2210 @@ -1524,7 +1522,7 @@ (i32.store8 (local.tee $npo (i32.sub (global.get $po) (i32.const 1))) (i32.const 0x2d (; = '-' ;))) (global.set $po (local.get $npo)))) (local.get $btos)) - (data (i32.const 0x2075c) "\4c\07\02\00" "\04" "SIGN " "\86\00\00\00") + (data (i32.const 0x20748) "\38\07\02\00" "\04" "SIGN " "\86\00\00\00") (elem (i32.const 0x86) $SIGN) ;; 6.1.2214 @@ -1545,7 +1543,7 @@ (i32.wrap_i64 (i64.div_s (local.get $n1) (local.get $n2)))) (local.get $btos)) - (data (i32.const 0x2076c) "\5c\07\02\00" "\06" "SM/REM " "\87\00\00\00") + (data (i32.const 0x20758) "\48\07\02\00" "\06" "SM/REM " "\87\00\00\00") (elem (i32.const 0x87) $SM/REM) ;; 6.1.2216 @@ -1553,20 +1551,20 @@ (local.get $tos) (call $push (global.get $inputBufferBase)) (call $push (global.get $inputBufferSize))) - (data (i32.const 0x2077c) "\6c\07\02\00" "\06" "SOURCE " "\88\00\00\00") + (data (i32.const 0x20768) "\58\07\02\00" "\06" "SOURCE " "\88\00\00\00") (elem (i32.const 0x88) $SOURCE) ;; 6.1.2250 (func $SOURCE-ID (param $tos i32) (result i32) (call $push (local.get $tos) (global.get $sourceID))) - (data (i32.const 0x2078c) "\7c\07\02\00" "\09" "SOURCE-ID " "\89\00\00\00") + (data (i32.const 0x20778) "\68\07\02\00" "\09" "SOURCE-ID " "\89\00\00\00") (elem (i32.const 0x89) $SOURCE-ID) ;; 6.1.2220 (func $SPACE (param $tos i32) (result i32) (local.get $tos) (call $BL) (call $EMIT)) - (data (i32.const 0x207a0) "\8c\07\02\00" "\05" "SPACE " "\8a\00\00\00") + (data (i32.const 0x2078c) "\78\07\02\00" "\05" "SPACE " "\8a\00\00\00") (elem (i32.const 0x8a) $SPACE) ;; 6.1.2230 @@ -1580,11 +1578,11 @@ (call $SPACE) (local.set $i (i32.sub (local.get $i) (i32.const 1))) (br $loop)))) - (data (i32.const 0x207b0) "\a0\07\02\00" "\06" "SPACES " "\8b\00\00\00") + (data (i32.const 0x2079c) "\8c\07\02\00" "\06" "SPACES " "\8b\00\00\00") (elem (i32.const 0x8b) $SPACES) ;; 6.1.2250 - (data (i32.const 0x207c0) "\b0\07\02\00" "\45" (; F_DATA ;) "STATE " "\03\00\00\00" (; = pack(PUSH_DATA_ADDRESS_INDEX) ;) "\00\00\00\00" (; = pack(0) ;)) + (data (i32.const 0x207ac) "\9c\07\02\00" "\45" (; F_DATA ;) "STATE " "\03\00\00\00" (; = pack(PUSH_DATA_ADDRESS_INDEX) ;) "\00\00\00\00" (; = pack(0) ;)) ;; 6.1.2260 (func $SWAP (param $tos i32) (result i32) @@ -1596,7 +1594,7 @@ (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))))) (i32.store (local.get $btos) (local.get $tmp)) (local.get $tos)) - (data (i32.const 0x207d4) "\c0\07\02\00" "\04" "SWAP " "\8c\00\00\00") + (data (i32.const 0x207c0) "\ac\07\02\00" "\04" "SWAP " "\8c\00\00\00") (elem (i32.const 0x8c) $SWAP) ;; 6.1.2270 @@ -1604,7 +1602,7 @@ (local.get $tos) (call $ensureCompiling) (call $compileThen)) - (data (i32.const 0x207e4) "\d4\07\02\00" "\84" (; F_IMMEDIATE ;) "THEN " "\8d\00\00\00") + (data (i32.const 0x207d0) "\c0\07\02\00" "\84" (; F_IMMEDIATE ;) "THEN " "\8d\00\00\00") (elem (i32.const 0x8d) $THEN) ;; 6.2.2295 @@ -1616,20 +1614,20 @@ (i32.store (i32.add (call $body (local.get $xt)) (i32.const 4)) (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4))))) (local.get $btos)) - (data (i32.const 0x207f4) "\e4\07\02\00" "\02" "TO " "\8e\00\00\00") + (data (i32.const 0x207e0) "\d0\07\02\00" "\02" "TO " "\8e\00\00\00") (elem (i32.const 0x8e) $TO) ;; 6.2.2298 (func $TRUE (param $tos i32) (result i32) (call $push (local.get $tos) (i32.const 0xffffffff))) - (data (i32.const 0x20800) "\f4\07\02\00" "\04" "TRUE " "\8f\00\00\00") + (data (i32.const 0x207ec) "\e0\07\02\00" "\04" "TRUE " "\8f\00\00\00") (elem (i32.const 0x8f) $TRUE) ;; 6.2.2300 (func $TUCK (param $tos i32) (result i32) (local.get $tos) (call $SWAP) (call $OVER)) - (data (i32.const 0x20810) "\00\08\02\00" "\04" "TUCK " "\90\00\00\00") + (data (i32.const 0x207fc) "\ec\07\02\00" "\04" "TUCK " "\90\00\00\00") (elem (i32.const 0x90) $TUCK) ;; 6.1.2310 TYPE @@ -1640,15 +1638,15 @@ (local.set $len (call $pop)) (local.set $p (call $pop)) (call $type (local.get $len) (local.get $p))) - (data (i32.const 0x20820) "\10\08\02\00" "\04" "TYPE " "\91\00\00\00") + (data (i32.const 0x2080c) "\fc\07\02\00" "\04" "TYPE " "\91\00\00\00") (elem (i32.const 0x91) $TYPE) ;; 6.1.2320 (func $U. (param $tos i32) (result i32) (local.get $tos) - (call $U._ (call $pop) (i32.load (i32.const 0x2036c (; = body(BASE) ;)))) + (call $U._ (call $pop) (i32.load (i32.const 0x20358 (; = body(BASE) ;)))) (call $shell_emit (i32.const 0x20))) - (data (i32.const 0x20830) "\20\08\02\00" "\02" "U. " "\92\00\00\00") + (data (i32.const 0x2081c) "\0c\08\02\00" "\02" "U. " "\92\00\00\00") (elem (i32.const 0x92) $U.) ;; 6.1.2340 @@ -1660,7 +1658,7 @@ (then (i32.store (local.get $bbtos) (i32.const -1))) (else (i32.store (local.get $bbtos) (i32.const 0)))) (local.get $btos)) - (data (i32.const 0x2083c) "\30\08\02\00" "\02" "U< " "\93\00\00\00") + (data (i32.const 0x20828) "\1c\08\02\00" "\02" "U< " "\93\00\00\00") (elem (i32.const 0x93) $U<) ;; 6.1.2360 @@ -1671,7 +1669,7 @@ (i64.extend_i32_u (i32.load (i32.sub (local.get $tos) (i32.const 4)))))) (local.get $tos)) - (data (i32.const 0x20848) "\3c\08\02\00" "\03" "UM*" "\94\00\00\00") + (data (i32.const 0x20834) "\28\08\02\00" "\03" "UM*" "\94\00\00\00") (elem (i32.const 0x94) $UM*) ;; 6.1.2370 @@ -1691,7 +1689,7 @@ (i32.wrap_i64 (i64.div_u (local.get $n1) (local.get $n2)))) (local.get $btos)) - (data (i32.const 0x20854) "\48\08\02\00" "\06" "UM/MOD " "\95\00\00\00") + (data (i32.const 0x20840) "\34\08\02\00" "\06" "UM/MOD " "\95\00\00\00") (elem (i32.const 0x95) $UM/MOD) ;; 6.1.2380 @@ -1699,7 +1697,7 @@ (local.get $tos) (call $ensureCompiling) (call $emitICall (i32.const 0) (i32.const 0x9 (; = END_DO_INDEX ;)))) - (data (i32.const 0x20864) "\54\08\02\00" "\86" (; F_IMMEDIATE ;) "UNLOOP " "\96\00\00\00") + (data (i32.const 0x20850) "\40\08\02\00" "\86" (; F_IMMEDIATE ;) "UNLOOP " "\96\00\00\00") (elem (i32.const 0x96) $UNLOOP) ;; 6.1.2390 @@ -1707,14 +1705,14 @@ (local.get $tos) (call $ensureCompiling) (call $compileUntil)) - (data (i32.const 0x20874) "\64\08\02\00" "\85" (; F_IMMEDIATE ;) "UNTIL " "\97\00\00\00") + (data (i32.const 0x20860) "\50\08\02\00" "\85" (; F_IMMEDIATE ;) "UNTIL " "\97\00\00\00") (elem (i32.const 0x97) $UNTIL) ;; 6.1.2395 (func $UNUSED (param $tos i32) (result i32) (local.get $tos) (call $push (i32.shr_s (i32.sub (i32.const 0x6400000 (; = MEMORY_SIZE ;)) (global.get $here)) (i32.const 2)))) - (data (i32.const 0x20884) "\74\08\02\00" "\06" "UNUSED " "\98\00\00\00") + (data (i32.const 0x20870) "\60\08\02\00" "\06" "UNUSED " "\98\00\00\00") (elem (i32.const 0x98) $UNUSED) (func $UWIDTH (param $tos i32) (result i32) @@ -1723,7 +1721,7 @@ (local $base i32) (local.get $tos) (local.set $v (call $pop)) - (local.set $base (i32.load (i32.const 0x2036c (; = body(BASE) ;)))) + (local.set $base (i32.load (i32.const 0x20358 (; = body(BASE) ;)))) (block $endLoop (loop $loop (br_if $endLoop (i32.eqz (local.get $v))) @@ -1731,18 +1729,18 @@ (local.set $v (i32.div_s (local.get $v) (local.get $base))) (br $loop))) (call $push (local.get $r))) - (data (i32.const 0x20894) "\84\08\02\00" "\06" "UWIDTH " "\99\00\00\00") + (data (i32.const 0x20880) "\70\08\02\00" "\06" "UWIDTH " "\99\00\00\00") (elem (i32.const 0x99) $UWIDTH) ;; 6.2.2405 - (data (i32.const 0x208a4) "\94\08\02\00" "\05" "VALUE " "\4d\00\00\00" (; = pack(index("CONSTANT")) ;)) + (data (i32.const 0x20890) "\80\08\02\00" "\05" "VALUE " "\4d\00\00\00" (; = pack(index("CONSTANT")) ;)) ;; 6.1.2410 (func $VARIABLE (param $tos i32) (result i32) (local.get $tos) (call $CREATE) (global.set $here (i32.add (global.get $here) (i32.const 4)))) - (data (i32.const 0x208b4) "\a4\08\02\00" "\08" "VARIABLE " "\9a\00\00\00") + (data (i32.const 0x208a0) "\90\08\02\00" "\08" "VARIABLE " "\9a\00\00\00") (elem (i32.const 0x9a) $VARIABLE) ;; 6.1.2430 @@ -1750,7 +1748,7 @@ (local.get $tos) (call $ensureCompiling) (call $compileWhile)) - (data (i32.const 0x208c8) "\b4\08\02\00" "\85" (; F_IMMEDIATE ;) "WHILE " "\9b\00\00\00") + (data (i32.const 0x208b4) "\a0\08\02\00" "\85" (; F_IMMEDIATE ;) "WHILE " "\9b\00\00\00") (elem (i32.const 0x9b) $WHILE) ;; 6.1.2450 @@ -1769,7 +1767,7 @@ (local.get $len)) (i32.store8 (local.get $wordBase) (local.get $len)) (call $push (local.get $wordBase))) - (data (i32.const 0x208d8) "\c8\08\02\00" "\04" "WORD " "\9c\00\00\00") + (data (i32.const 0x208c4) "\b4\08\02\00" "\04" "WORD " "\9c\00\00\00") (elem (i32.const 0x9c) $WORD) ;; 15.6.1.2465 @@ -1791,7 +1789,7 @@ (local.set $entryP (i32.load (local.get $entryP))) (br_if $loop (local.get $entryP))) (local.get $tos)) - (data (i32.const 0x208e8) "\d8\08\02\00" "\05" "WORDS " "\9d\00\00\00") + (data (i32.const 0x208d4) "\c4\08\02\00" "\05" "WORDS " "\9d\00\00\00") (elem (i32.const 0x9d) $WORDS) ;; 6.1.2490 @@ -1802,15 +1800,15 @@ (i32.xor (i32.load (local.tee $btos (i32.sub (local.get $tos) (i32.const 4)))) (i32.load (local.get $bbtos)))) (local.get $btos)) - (data (i32.const 0x208f8) "\e8\08\02\00" "\03" "XOR" "\9e\00\00\00") + (data (i32.const 0x208e4) "\d4\08\02\00" "\03" "XOR" "\9e\00\00\00") (elem (i32.const 0x9e) $XOR) ;; 6.1.2500 (func $left-bracket (param $tos i32) (result i32) (local.get $tos) (call $ensureCompiling) - (i32.store (i32.const 0x207d0 (; = body(STATE) ;)) (i32.const 0))) - (data (i32.const 0x20904) "\f8\08\02\00" "\81" (; F_IMMEDIATE ;) "[ " "\9f\00\00\00") + (i32.store (i32.const 0x207bc (; = body(STATE) ;)) (i32.const 0))) + (data (i32.const 0x208f0) "\e4\08\02\00" "\81" (; F_IMMEDIATE ;) "[ " "\9f\00\00\00") (elem (i32.const 0x9f) $left-bracket) ;; 6.1.2510 @@ -1819,7 +1817,7 @@ (call $ensureCompiling) (call $') (call $compilePushConst (call $pop))) - (data (i32.const 0x20910) "\04\09\02\00" "\83" (; F_IMMEDIATE ;) "[']" "\a0\00\00\00") + (data (i32.const 0x208fc) "\f0\08\02\00" "\83" (; F_IMMEDIATE ;) "[']" "\a0\00\00\00") (elem (i32.const 0xa0) $bracket-tick) ;; 6.1.2520 @@ -1828,21 +1826,21 @@ (call $ensureCompiling) (call $CHAR) (call $compilePushConst (call $pop))) - (data (i32.const 0x2091c) "\10\09\02\00" "\86" (; F_IMMEDIATE ;) "[CHAR] " "\a1\00\00\00") + (data (i32.const 0x20908) "\fc\08\02\00" "\86" (; F_IMMEDIATE ;) "[CHAR] " "\a1\00\00\00") (elem (i32.const 0xa1) $bracket-char) ;; 6.2.2535 (func $\ (param $tos i32) (result i32) (drop (drop (call $parse (i32.const 0x0a (; '\n' ;))))) (local.get $tos)) - (data (i32.const 0x2092c) "\1c\09\02\00" "\81" (; F_IMMEDIATE ;) "\5c " "\a2\00\00\00") + (data (i32.const 0x20918) "\08\09\02\00" "\81" (; F_IMMEDIATE ;) "\5c " "\a2\00\00\00") (elem (i32.const 0xa2) $\) ;; 6.1.2540 (func $right-bracket (param $tos i32) (result i32) - (i32.store (i32.const 0x207d0 (; = body(STATE) ;)) (i32.const 1)) + (i32.store (i32.const 0x207bc (; = body(STATE) ;)) (i32.const 1)) (local.get $tos)) - (data (i32.const 0x20938) "\2c\09\02\00" "\01" "] " "\a3\00\00\00") + (data (i32.const 0x20924) "\18\09\02\00" "\01" "] " "\a3\00\00\00") (elem (i32.const 0xa3) $right-bracket) @@ -1873,7 +1871,7 @@ (if (param i32) (i32.eqz (call $readNumber (local.get $wordAddr) (local.get $wordLen))) (then ;; It's a number. Are we compiling? (local.set $number) - (if (i32.load (i32.const 0x207d0 (; = body(STATE) ;))) + (if (i32.load (i32.const 0x207bc (; = body(STATE) ;))) (then ;; We're compiling. Pop it off the stack and ;; add it to the compiled list @@ -1888,7 +1886,7 @@ ;; Are we compiling or is it immediate? (if (i32.or - (i32.eqz (i32.load (i32.const 0x207d0 (; = body(STATE) ;)))) + (i32.eqz (i32.load (i32.const 0x207bc (; = body(STATE) ;)))) (i32.eq (local.get $FINDResult) (i32.const 1))) (then (local.get $tos) @@ -1900,7 +1898,7 @@ (local.set $tos (call $compileCall (local.get $tos) (local.get $FINDToken))))))) (br $loop))) (local.get $tos) - (i32.load (i32.const 0x207d0 (; = body(STATE) ;)))) + (i32.load (i32.const 0x207bc (; = body(STATE) ;)))) ;; Returns (number, unparsed length) (func $readNumber (param $addr i32) (param $len i32) (result i32 i32) @@ -1925,7 +1923,7 @@ (local $n i32) (local.set $p (local.get $addr)) (local.set $end (i32.add (local.get $p) (local.get $length))) - (local.set $base (i32.load (i32.const 0x2036c (; = body(BASE) ;)))) + (local.set $base (i32.load (i32.const 0x20358 (; = body(BASE) ;)))) ;; Read first character (if (i32.eq (local.tee $char (i32.load8_u (local.get $p))) (i32.const 0x2d (; = '-' ;))) @@ -1983,8 +1981,8 @@ (global $sourceID (mut i32) (i32.const 0)) ;; Dictionary pointers - (global $latest (mut i32) (i32.const 0x20938)) - (global $here (mut i32) (i32.const 0x20944)) + (global $latest (mut i32) (i32.const 0x20924)) + (global $here (mut i32) (i32.const 0x20930)) (global $nextTableIndex (mut i32) (i32.const 0xa4)) ;; Pictured output pointer @@ -2546,8 +2544,8 @@ (func $ensureCompiling (param $tos i32) (result i32) (local.get $tos) - (if (param i32) (result i32) (i32.eqz (i32.load (i32.const 0x207d0 (; = body(STATE) ;)))) - (call $fail (i32.const 0x20044 (; = str("word not supported in interpret mode") ;))))) + (if (param i32) (result i32) (i32.eqz (i32.load (i32.const 0x207bc (; = body(STATE) ;)))) + (call $fail (i32.const 0x2002e (; = str("word not supported in interpret mode") ;))))) ;; Toggle the hidden flag (func $hidden @@ -2636,7 +2634,7 @@ (local $delimited i32) (local.set $p (local.tee $addr (i32.add (global.get $inputBufferBase) - (i32.load (i32.const 0x202a8 (; = body(>IN) ;)))))) + (i32.load (i32.const 0x20294 (; = body(>IN) ;)))))) (local.set $end (i32.add (global.get $inputBufferBase) (global.get $inputBufferSize))) (local.set $delimited (i32.const 0)) (block $endOfInput @@ -2648,7 +2646,7 @@ (br_if $delimiter (i32.eq (local.get $c) (i32.const 0xa))) (br_if $read (i32.ne (local.get $c) (local.get $delim))))) (local.set $delimited (i32.const 1))) - (i32.store (i32.const 0x202a8 (; = body(>IN) ;)) + (i32.store (i32.const 0x20294 (; = body(>IN) ;)) (i32.sub (local.get $p) (global.get $inputBufferBase))) (local.get $addr) (i32.sub @@ -2662,7 +2660,7 @@ (local $c i32) (local.set $p (local.tee $addr (i32.add (global.get $inputBufferBase) - (i32.load (i32.const 0x202a8 (; = body(>IN) ;)))))) + (i32.load (i32.const 0x20294 (; = body(>IN) ;)))))) (local.set $end (i32.add (global.get $inputBufferBase) (global.get $inputBufferSize))) (block $endLoop (loop $loop @@ -2672,7 +2670,7 @@ (local.set $p (i32.add (local.get $p) (i32.const 1))) ;; Eat up a newline (br_if $loop (i32.ne (local.get $c) (i32.const 0xa))))) - (i32.store (i32.const 0x202a8 (; = body(>IN) ;)) + (i32.store (i32.const 0x20294 (; = body(>IN) ;)) (i32.sub (local.get $p) (global.get $inputBufferBase)))) ;; Returns xt, type (0 = not found, 1 = immediate, -1 = non-immediate) @@ -2741,7 +2739,7 @@ ;; Check for stack underflow (if (i32.lt_s (local.get $tos) (i32.const 0x10000 (; = STACK_BASE ;))) - (drop (call $fail (local.get $tos) (i32.const 0x2009b (; = str("stack empty") ;))))) + (drop (call $fail (local.get $tos) (i32.const 0x20085 (; = str("stack empty") ;))))) ;; Show prompt (if (i32.eqz (local.get $silent)) diff --git a/src/web/tests/suite.js b/src/web/tests/suite.js index cc91baa..63acede 100644 --- a/src/web/tests/suite.js +++ b/src/web/tests/suite.js @@ -973,21 +973,21 @@ function loadTests() { it("should find a word", () => { loadString("DUP"); run("FIND"); - expect(stackValues()[0]).to.eql(132236); // FIXME: Make test more robust against dict changes + expect(stackValues()[0]).to.eql(132216); // FIXME: Make test more robust against dict changes expect(stackValues()[1]).to.eql(-1); }); it("should find a short word", () => { loadString("!"); run("FIND"); - expect(stackValues()[0]).to.eql(131240); // FIXME: Make test more robust against dict changes + expect(stackValues()[0]).to.eql(131220); // FIXME: Make test more robust against dict changes expect(stackValues()[1]).to.eql(-1); }); it("should find an immediate word", () => { loadString("+LOOP"); run("FIND"); - expect(stackValues()[0]).to.eql(131376); // FIXME: Make test more robust against dict changes + expect(stackValues()[0]).to.eql(131356); // FIXME: Make test more robust against dict changes expect(stackValues()[1]).to.eql(1); }); @@ -1483,19 +1483,19 @@ function loadTests() { it("should work", () => { run(': FOO 0 0 S" 123AB" >NUMBER ;'); run("FOO"); - expect(stackValues()).to.eql([123, 0, 133459, 2]); // FIXME: Make test more robust against dictionary changes + expect(stackValues()).to.eql([123, 0, 133439, 2]); // FIXME: Make test more robust against dictionary changes }); it("should work with init", () => { run(': FOO 1 0 S" 1" >NUMBER ;'); run("FOO"); - expect(stackValues()).to.eql([11, 0, 133457, 0]); // FIXME: Make test more robust against dictionary changes + expect(stackValues()).to.eql([11, 0, 133437, 0]); // FIXME: Make test more robust against dictionary changes }); it("should not parse sign", () => { run(': FOO 0 0 S" -" >NUMBER ;'); run("FOO"); - expect(stackValues()).to.eql([0, 0, 133456, 1]); // FIXME: Make test more robust against dictionary changes + expect(stackValues()).to.eql([0, 0, 133436, 1]); // FIXME: Make test more robust against dictionary changes }); });