js-on-sx: wrapper constructor-detection, Array.prototype.toString, >>> operator

Number.__callable__ and String.__callable__ now check this.__proto__ ===
Number/String.prototype before writing wrapper slots, preventing false-positive
mutation when called as plain function. js-to-number extended to unwrap
wrapper dicts and call valueOf/toString for plain objects. Array.prototype.toString
replaced with a direct js-list-join implementation (eliminates infinite recursion
via js-invoke-method on dict-based arrays). >>> added to transpiler + runtime.

String test262 subset: 62→66/100. 529/530 unit, 147/148 slice.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

lib/forth/ans-tests/README.md

@@ -1,14 +0,0 @@
-ANS Forth conformance tests — vendored from
-https://github.com/gerryjackson/forth2012-test-suite (master, commit-locked
-on first fetch: 2026-04-24).
-
-Files in this directory are pristine copies of upstream — do not edit them.
-They are consumed by the conformance runner in `lib/forth/conformance.sh`.
-
-- `tester.fr` — John Hayes' test harness (`T{ ... -> ... }T`). (C) 1995
-  Johns Hopkins APL, distributable under its notice.
-- `core.fr` — Core word set tests (Hayes, ~1000 lines).
-- `coreexttest.fth` — Core Extension tests (Gerry Jackson).
-
-Only `core.fr` is expected to run green end-to-end for Phase 3; the others
-stay parked until later phases.

lib/forth/ans-tests/coreexttest.fth

@@ -1,775 +0,0 @@
-\ To test the ANS Forth Core Extension word set
-
-\ This program was written by Gerry Jackson in 2006, with contributions from
-\ others where indicated, and is in the public domain - it can be distributed
-\ and/or modified in any way but please retain this notice.
-
-\ This program is distributed in the hope that it will be useful,
-\ but WITHOUT ANY WARRANTY; without even the implied warranty of
-\ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-\ The tests are not claimed to be comprehensive or correct 
-
-\ ------------------------------------------------------------------------------
-\ Version 0.15 1 August 2025 Added two tests to VALUE
-\         0.14 21 July 2022 Updated first line of BUFFER: test as recommended
-\              in issue 32
-\         0.13 28 October 2015
-\              Replace <FALSE> and <TRUE> with FALSE and TRUE to avoid
-\              dependence on Core tests
-\              Moved SAVE-INPUT and RESTORE-INPUT tests in a file to filetest.fth
-\              Use of 2VARIABLE (from optional wordset) replaced with CREATE.
-\              Minor lower to upper case conversions.
-\              Calls to COMPARE replaced by S= (in utilities.fth) to avoid use
-\              of a word from an optional word set.
-\              UNUSED tests revised as UNUSED UNUSED = may return FALSE when an
-\              implementation has the data stack sharing unused dataspace.
-\              Double number input dependency removed from the HOLDS tests.
-\              Minor case sensitivities removed in definition names.
-\         0.11 25 April 2015
-\              Added tests for PARSE-NAME HOLDS BUFFER:
-\              S\" tests added
-\              DEFER IS ACTION-OF DEFER! DEFER@ tests added
-\              Empty CASE statement test added
-\              [COMPILE] tests removed because it is obsolescent in Forth 2012
-\         0.10 1 August 2014
-\             Added tests contributed by James Bowman for:
-\                <> U> 0<> 0> NIP TUCK ROLL PICK 2>R 2R@ 2R>
-\                HEX WITHIN UNUSED AGAIN MARKER
-\             Added tests for:
-\                .R U.R ERASE PAD REFILL SOURCE-ID 
-\             Removed ABORT from NeverExecuted to enable Win32
-\             to continue after failure of RESTORE-INPUT.
-\             Removed max-intx which is no longer used.
-\         0.7 6 June 2012 Extra CASE test added
-\         0.6 1 April 2012 Tests placed in the public domain.
-\             SAVE-INPUT & RESTORE-INPUT tests, position
-\             of T{ moved so that tests work with ttester.fs
-\             CONVERT test deleted - obsolete word removed from Forth 200X
-\             IMMEDIATE VALUEs tested
-\             RECURSE with :NONAME tested
-\             PARSE and .( tested
-\             Parsing behaviour of C" added
-\         0.5 14 September 2011 Removed the double [ELSE] from the
-\             initial SAVE-INPUT & RESTORE-INPUT test
-\         0.4 30 November 2009  max-int replaced with max-intx to
-\             avoid redefinition warnings.
-\         0.3  6 March 2009 { and } replaced with T{ and }T
-\                           CONVERT test now independent of cell size
-\         0.2  20 April 2007 ANS Forth words changed to upper case
-\                            Tests qd3 to qd6 by Reinhold Straub
-\         0.1  Oct 2006 First version released
-\ -----------------------------------------------------------------------------
-\ The tests are based on John Hayes test program for the core word set
-
-\ Words tested in this file are:
-\     .( .R 0<> 0> 2>R 2R> 2R@ :NONAME <> ?DO AGAIN C" CASE COMPILE, ENDCASE
-\     ENDOF ERASE FALSE HEX MARKER NIP OF PAD PARSE PICK REFILL
-\     RESTORE-INPUT ROLL SAVE-INPUT SOURCE-ID TO TRUE TUCK U.R U> UNUSED
-\     VALUE WITHIN [COMPILE]
-
-\ Words not tested or partially tested:
-\     \ because it has been extensively used already and is, hence, unnecessary
-\     REFILL and SOURCE-ID from the user input device which are not possible
-\     when testing from a file such as this one
-\     UNUSED (partially tested) as the value returned is system dependent
-\     Obsolescent words #TIB CONVERT EXPECT QUERY SPAN TIB as they have been
-\     removed from the Forth 2012 standard
-
-\ Results from words that output to the user output device have to visually
-\ checked for correctness. These are .R U.R .(
-
-\ -----------------------------------------------------------------------------
-\ Assumptions & dependencies:
-\     - tester.fr (or ttester.fs), errorreport.fth and utilities.fth have been
-\       included prior to this file
-\     - the Core word set available
-\ -----------------------------------------------------------------------------
-TESTING Core Extension words
-
-DECIMAL
-
-TESTING TRUE FALSE
-
-T{ TRUE  -> 0 INVERT }T
-T{ FALSE -> 0 }T
-
-\ -----------------------------------------------------------------------------
-TESTING <> U>   (contributed by James Bowman)
-
-T{ 0 0 <> -> FALSE }T
-T{ 1 1 <> -> FALSE }T
-T{ -1 -1 <> -> FALSE }T
-T{ 1 0 <> -> TRUE }T
-T{ -1 0 <> -> TRUE }T
-T{ 0 1 <> -> TRUE }T
-T{ 0 -1 <> -> TRUE }T
-
-T{ 0 1 U> -> FALSE }T
-T{ 1 2 U> -> FALSE }T
-T{ 0 MID-UINT U> -> FALSE }T
-T{ 0 MAX-UINT U> -> FALSE }T
-T{ MID-UINT MAX-UINT U> -> FALSE }T
-T{ 0 0 U> -> FALSE }T
-T{ 1 1 U> -> FALSE }T
-T{ 1 0 U> -> TRUE }T
-T{ 2 1 U> -> TRUE }T
-T{ MID-UINT 0 U> -> TRUE }T
-T{ MAX-UINT 0 U> -> TRUE }T
-T{ MAX-UINT MID-UINT U> -> TRUE }T
-
-\ -----------------------------------------------------------------------------
-TESTING 0<> 0>   (contributed by James Bowman)
-
-T{ 0 0<> -> FALSE }T
-T{ 1 0<> -> TRUE }T
-T{ 2 0<> -> TRUE }T
-T{ -1 0<> -> TRUE }T
-T{ MAX-UINT 0<> -> TRUE }T
-T{ MIN-INT 0<> -> TRUE }T
-T{ MAX-INT 0<> -> TRUE }T
-
-T{ 0 0> -> FALSE }T
-T{ -1 0> -> FALSE }T
-T{ MIN-INT 0> -> FALSE }T
-T{ 1 0> -> TRUE }T
-T{ MAX-INT 0> -> TRUE }T
-
-\ -----------------------------------------------------------------------------
-TESTING NIP TUCK ROLL PICK   (contributed by James Bowman)
-
-T{ 1 2 NIP -> 2 }T
-T{ 1 2 3 NIP -> 1 3 }T
-
-T{ 1 2 TUCK -> 2 1 2 }T
-T{ 1 2 3 TUCK -> 1 3 2 3 }T
-
-T{ : RO5 100 200 300 400 500 ; -> }T
-T{ RO5 3 ROLL -> 100 300 400 500 200 }T
-T{ RO5 2 ROLL -> RO5 ROT }T
-T{ RO5 1 ROLL -> RO5 SWAP }T
-T{ RO5 0 ROLL -> RO5 }T
-
-T{ RO5 2 PICK -> 100 200 300 400 500 300 }T
-T{ RO5 1 PICK -> RO5 OVER }T
-T{ RO5 0 PICK -> RO5 DUP }T
-
-\ -----------------------------------------------------------------------------
-TESTING 2>R 2R@ 2R>   (contributed by James Bowman)
-
-T{ : RR0 2>R 100 R> R> ; -> }T
-T{ 300 400 RR0 -> 100 400 300 }T
-T{ 200 300 400 RR0 -> 200 100 400 300 }T
-
-T{ : RR1 2>R 100 2R@ R> R> ; -> }T
-T{ 300 400 RR1 -> 100 300 400 400 300 }T
-T{ 200 300 400 RR1 -> 200 100 300 400 400 300 }T
-
-T{ : RR2 2>R 100 2R> ; -> }T
-T{ 300 400 RR2 -> 100 300 400 }T
-T{ 200 300 400 RR2 -> 200 100 300 400 }T
-
-\ -----------------------------------------------------------------------------
-TESTING HEX   (contributed by James Bowman)
-
-T{ BASE @ HEX BASE @ DECIMAL BASE @ - SWAP BASE ! -> 6 }T
-
-\ -----------------------------------------------------------------------------
-TESTING WITHIN   (contributed by James Bowman)
-
-T{ 0 0 0 WITHIN -> FALSE }T
-T{ 0 0 MID-UINT WITHIN -> TRUE }T
-T{ 0 0 MID-UINT+1 WITHIN -> TRUE }T
-T{ 0 0 MAX-UINT WITHIN -> TRUE }T
-T{ 0 MID-UINT 0 WITHIN -> FALSE }T
-T{ 0 MID-UINT MID-UINT WITHIN -> FALSE }T
-T{ 0 MID-UINT MID-UINT+1 WITHIN -> FALSE }T
-T{ 0 MID-UINT MAX-UINT WITHIN -> FALSE }T
-T{ 0 MID-UINT+1 0 WITHIN -> FALSE }T
-T{ 0 MID-UINT+1 MID-UINT WITHIN -> TRUE }T
-T{ 0 MID-UINT+1 MID-UINT+1 WITHIN -> FALSE }T
-T{ 0 MID-UINT+1 MAX-UINT WITHIN -> FALSE }T
-T{ 0 MAX-UINT 0 WITHIN -> FALSE }T
-T{ 0 MAX-UINT MID-UINT WITHIN -> TRUE }T
-T{ 0 MAX-UINT MID-UINT+1 WITHIN -> TRUE }T
-T{ 0 MAX-UINT MAX-UINT WITHIN -> FALSE }T
-T{ MID-UINT 0 0 WITHIN -> FALSE }T
-T{ MID-UINT 0 MID-UINT WITHIN -> FALSE }T
-T{ MID-UINT 0 MID-UINT+1 WITHIN -> TRUE }T
-T{ MID-UINT 0 MAX-UINT WITHIN -> TRUE }T
-T{ MID-UINT MID-UINT 0 WITHIN -> TRUE }T
-T{ MID-UINT MID-UINT MID-UINT WITHIN -> FALSE }T
-T{ MID-UINT MID-UINT MID-UINT+1 WITHIN -> TRUE }T
-T{ MID-UINT MID-UINT MAX-UINT WITHIN -> TRUE }T
-T{ MID-UINT MID-UINT+1 0 WITHIN -> FALSE }T
-T{ MID-UINT MID-UINT+1 MID-UINT WITHIN -> FALSE }T
-T{ MID-UINT MID-UINT+1 MID-UINT+1 WITHIN -> FALSE }T
-T{ MID-UINT MID-UINT+1 MAX-UINT WITHIN -> FALSE }T
-T{ MID-UINT MAX-UINT 0 WITHIN -> FALSE }T
-T{ MID-UINT MAX-UINT MID-UINT WITHIN -> FALSE }T
-T{ MID-UINT MAX-UINT MID-UINT+1 WITHIN -> TRUE }T
-T{ MID-UINT MAX-UINT MAX-UINT WITHIN -> FALSE }T
-T{ MID-UINT+1 0 0 WITHIN -> FALSE }T
-T{ MID-UINT+1 0 MID-UINT WITHIN -> FALSE }T
-T{ MID-UINT+1 0 MID-UINT+1 WITHIN -> FALSE }T
-T{ MID-UINT+1 0 MAX-UINT WITHIN -> TRUE }T
-T{ MID-UINT+1 MID-UINT 0 WITHIN -> TRUE }T
-T{ MID-UINT+1 MID-UINT MID-UINT WITHIN -> FALSE }T
-T{ MID-UINT+1 MID-UINT MID-UINT+1 WITHIN -> FALSE }T
-T{ MID-UINT+1 MID-UINT MAX-UINT WITHIN -> TRUE }T
-T{ MID-UINT+1 MID-UINT+1 0 WITHIN -> TRUE }T
-T{ MID-UINT+1 MID-UINT+1 MID-UINT WITHIN -> TRUE }T
-T{ MID-UINT+1 MID-UINT+1 MID-UINT+1 WITHIN -> FALSE }T
-T{ MID-UINT+1 MID-UINT+1 MAX-UINT WITHIN -> TRUE }T
-T{ MID-UINT+1 MAX-UINT 0 WITHIN -> FALSE }T
-T{ MID-UINT+1 MAX-UINT MID-UINT WITHIN -> FALSE }T
-T{ MID-UINT+1 MAX-UINT MID-UINT+1 WITHIN -> FALSE }T
-T{ MID-UINT+1 MAX-UINT MAX-UINT WITHIN -> FALSE }T
-T{ MAX-UINT 0 0 WITHIN -> FALSE }T
-T{ MAX-UINT 0 MID-UINT WITHIN -> FALSE }T
-T{ MAX-UINT 0 MID-UINT+1 WITHIN -> FALSE }T
-T{ MAX-UINT 0 MAX-UINT WITHIN -> FALSE }T
-T{ MAX-UINT MID-UINT 0 WITHIN -> TRUE }T
-T{ MAX-UINT MID-UINT MID-UINT WITHIN -> FALSE }T
-T{ MAX-UINT MID-UINT MID-UINT+1 WITHIN -> FALSE }T
-T{ MAX-UINT MID-UINT MAX-UINT WITHIN -> FALSE }T
-T{ MAX-UINT MID-UINT+1 0 WITHIN -> TRUE }T
-T{ MAX-UINT MID-UINT+1 MID-UINT WITHIN -> TRUE }T
-T{ MAX-UINT MID-UINT+1 MID-UINT+1 WITHIN -> FALSE }T
-T{ MAX-UINT MID-UINT+1 MAX-UINT WITHIN -> FALSE }T
-T{ MAX-UINT MAX-UINT 0 WITHIN -> TRUE }T
-T{ MAX-UINT MAX-UINT MID-UINT WITHIN -> TRUE }T
-T{ MAX-UINT MAX-UINT MID-UINT+1 WITHIN -> TRUE }T
-T{ MAX-UINT MAX-UINT MAX-UINT WITHIN -> FALSE }T
-
-T{ MIN-INT MIN-INT MIN-INT WITHIN -> FALSE }T
-T{ MIN-INT MIN-INT 0 WITHIN -> TRUE }T
-T{ MIN-INT MIN-INT 1 WITHIN -> TRUE }T
-T{ MIN-INT MIN-INT MAX-INT WITHIN -> TRUE }T
-T{ MIN-INT 0 MIN-INT WITHIN -> FALSE }T
-T{ MIN-INT 0 0 WITHIN -> FALSE }T
-T{ MIN-INT 0 1 WITHIN -> FALSE }T
-T{ MIN-INT 0 MAX-INT WITHIN -> FALSE }T
-T{ MIN-INT 1 MIN-INT WITHIN -> FALSE }T
-T{ MIN-INT 1 0 WITHIN -> TRUE }T
-T{ MIN-INT 1 1 WITHIN -> FALSE }T
-T{ MIN-INT 1 MAX-INT WITHIN -> FALSE }T
-T{ MIN-INT MAX-INT MIN-INT WITHIN -> FALSE }T
-T{ MIN-INT MAX-INT 0 WITHIN -> TRUE }T
-T{ MIN-INT MAX-INT 1 WITHIN -> TRUE }T
-T{ MIN-INT MAX-INT MAX-INT WITHIN -> FALSE }T
-T{ 0 MIN-INT MIN-INT WITHIN -> FALSE }T
-T{ 0 MIN-INT 0 WITHIN -> FALSE }T
-T{ 0 MIN-INT 1 WITHIN -> TRUE }T
-T{ 0 MIN-INT MAX-INT WITHIN -> TRUE }T
-T{ 0 0 MIN-INT WITHIN -> TRUE }T
-T{ 0 0 0 WITHIN -> FALSE }T
-T{ 0 0 1 WITHIN -> TRUE }T
-T{ 0 0 MAX-INT WITHIN -> TRUE }T
-T{ 0 1 MIN-INT WITHIN -> FALSE }T
-T{ 0 1 0 WITHIN -> FALSE }T
-T{ 0 1 1 WITHIN -> FALSE }T
-T{ 0 1 MAX-INT WITHIN -> FALSE }T
-T{ 0 MAX-INT MIN-INT WITHIN -> FALSE }T
-T{ 0 MAX-INT 0 WITHIN -> FALSE }T
-T{ 0 MAX-INT 1 WITHIN -> TRUE }T
-T{ 0 MAX-INT MAX-INT WITHIN -> FALSE }T
-T{ 1 MIN-INT MIN-INT WITHIN -> FALSE }T
-T{ 1 MIN-INT 0 WITHIN -> FALSE }T
-T{ 1 MIN-INT 1 WITHIN -> FALSE }T
-T{ 1 MIN-INT MAX-INT WITHIN -> TRUE }T
-T{ 1 0 MIN-INT WITHIN -> TRUE }T
-T{ 1 0 0 WITHIN -> FALSE }T
-T{ 1 0 1 WITHIN -> FALSE }T
-T{ 1 0 MAX-INT WITHIN -> TRUE }T
-T{ 1 1 MIN-INT WITHIN -> TRUE }T
-T{ 1 1 0 WITHIN -> TRUE }T
-T{ 1 1 1 WITHIN -> FALSE }T
-T{ 1 1 MAX-INT WITHIN -> TRUE }T
-T{ 1 MAX-INT MIN-INT WITHIN -> FALSE }T
-T{ 1 MAX-INT 0 WITHIN -> FALSE }T
-T{ 1 MAX-INT 1 WITHIN -> FALSE }T
-T{ 1 MAX-INT MAX-INT WITHIN -> FALSE }T
-T{ MAX-INT MIN-INT MIN-INT WITHIN -> FALSE }T
-T{ MAX-INT MIN-INT 0 WITHIN -> FALSE }T
-T{ MAX-INT MIN-INT 1 WITHIN -> FALSE }T
-T{ MAX-INT MIN-INT MAX-INT WITHIN -> FALSE }T
-T{ MAX-INT 0 MIN-INT WITHIN -> TRUE }T
-T{ MAX-INT 0 0 WITHIN -> FALSE }T
-T{ MAX-INT 0 1 WITHIN -> FALSE }T
-T{ MAX-INT 0 MAX-INT WITHIN -> FALSE }T
-T{ MAX-INT 1 MIN-INT WITHIN -> TRUE }T
-T{ MAX-INT 1 0 WITHIN -> TRUE }T
-T{ MAX-INT 1 1 WITHIN -> FALSE }T
-T{ MAX-INT 1 MAX-INT WITHIN -> FALSE }T
-T{ MAX-INT MAX-INT MIN-INT WITHIN -> TRUE }T
-T{ MAX-INT MAX-INT 0 WITHIN -> TRUE }T
-T{ MAX-INT MAX-INT 1 WITHIN -> TRUE }T
-T{ MAX-INT MAX-INT MAX-INT WITHIN -> FALSE }T
-
-\ -----------------------------------------------------------------------------
-TESTING UNUSED  (contributed by James Bowman & Peter Knaggs)
-
-VARIABLE UNUSED0
-T{ UNUSED DROP -> }T                  
-T{ ALIGN UNUSED UNUSED0 ! 0 , UNUSED CELL+ UNUSED0 @ = -> TRUE }T
-T{ UNUSED UNUSED0 ! 0 C, UNUSED CHAR+ UNUSED0 @ =
-         -> TRUE }T  \ aligned -> unaligned
-T{ UNUSED UNUSED0 ! 0 C, UNUSED CHAR+ UNUSED0 @ = -> TRUE }T  \ unaligned -> ?
-
-\ -----------------------------------------------------------------------------
-TESTING AGAIN   (contributed by James Bowman)
-
-T{ : AG0 701 BEGIN DUP 7 MOD 0= IF EXIT THEN 1+ AGAIN ; -> }T
-T{ AG0 -> 707 }T
-
-\ -----------------------------------------------------------------------------
-TESTING MARKER   (contributed by James Bowman)
-
-T{ : MA? BL WORD FIND NIP 0<> ; -> }T
-T{ MARKER MA0 -> }T
-T{ : MA1 111 ; -> }T
-T{ MARKER MA2 -> }T
-T{ : MA1 222 ; -> }T
-T{ MA? MA0 MA? MA1 MA? MA2 -> TRUE TRUE TRUE }T
-T{ MA1 MA2 MA1 -> 222 111 }T
-T{ MA? MA0 MA? MA1 MA? MA2 -> TRUE TRUE FALSE }T
-T{ MA0 -> }T
-T{ MA? MA0 MA? MA1 MA? MA2 -> FALSE FALSE FALSE }T
-
-\ -----------------------------------------------------------------------------
-TESTING ?DO
-
-: QD ?DO I LOOP ;
-T{ 789 789 QD -> }T
-T{ -9876 -9876 QD -> }T
-T{ 5 0 QD -> 0 1 2 3 4 }T
-
-: QD1 ?DO I 10 +LOOP ;
-T{ 50 1 QD1 -> 1 11 21 31 41 }T
-T{ 50 0 QD1 -> 0 10 20 30 40 }T
-
-: QD2 ?DO I 3 > IF LEAVE ELSE I THEN LOOP ;
-T{ 5 -1 QD2 -> -1 0 1 2 3 }T
-
-: QD3 ?DO I 1 +LOOP ;
-T{ 4  4 QD3 -> }T
-T{ 4  1 QD3 -> 1 2 3 }T
-T{ 2 -1 QD3 -> -1 0 1 }T
-
-: QD4 ?DO I -1 +LOOP ;
-T{  4 4 QD4 -> }T
-T{  1 4 QD4 -> 4 3 2 1 }T
-T{ -1 2 QD4 -> 2 1 0 -1 }T
-
-: QD5 ?DO I -10 +LOOP ;
-T{   1 50 QD5 -> 50 40 30 20 10 }T
-T{   0 50 QD5 -> 50 40 30 20 10 0 }T
-T{ -25 10 QD5 -> 10 0 -10 -20 }T
-
-VARIABLE ITERS
-VARIABLE INCRMNT
-
-: QD6 ( limit start increment -- )
-   INCRMNT !
-   0 ITERS !
-   ?DO
-      1 ITERS +!
-      I
-      ITERS @  6 = IF LEAVE THEN
-      INCRMNT @
-   +LOOP ITERS @
-;
-
-T{  4  4 -1 QD6 -> 0 }T
-T{  1  4 -1 QD6 -> 4 3 2 1 4 }T
-T{  4  1 -1 QD6 -> 1 0 -1 -2 -3 -4 6 }T
-T{  4  1  0 QD6 -> 1 1 1 1 1 1 6 }T
-T{  0  0  0 QD6 -> 0 }T
-T{  1  4  0 QD6 -> 4 4 4 4 4 4 6 }T
-T{  1  4  1 QD6 -> 4 5 6 7 8 9 6 }T
-T{  4  1  1 QD6 -> 1 2 3 3 }T
-T{  4  4  1 QD6 -> 0 }T
-T{  2 -1 -1 QD6 -> -1 -2 -3 -4 -5 -6 6 }T
-T{ -1  2 -1 QD6 -> 2 1 0 -1 4 }T
-T{  2 -1  0 QD6 -> -1 -1 -1 -1 -1 -1 6 }T
-T{ -1  2  0 QD6 -> 2 2 2 2 2 2 6 }T
-T{ -1  2  1 QD6 -> 2 3 4 5 6 7 6 }T
-T{  2 -1  1 QD6 -> -1 0 1 3 }T
-
-\ -----------------------------------------------------------------------------
-TESTING BUFFER:
-
-T{ 2 CELLS BUFFER: BUF:TEST -> }T
-T{ BUF:TEST DUP ALIGNED = -> TRUE }T
-T{ 111 BUF:TEST ! 222 BUF:TEST CELL+ ! -> }T
-T{ BUF:TEST @ BUF:TEST CELL+ @ -> 111 222 }T
-
-\ -----------------------------------------------------------------------------
-TESTING VALUE TO
-
-T{ 111 VALUE VAL1 -999 VALUE VAL2 -> }T
-T{ VAL1 -> 111 }T
-T{ VAL2 -> -999 }T
-T{ 222 TO VAL1 -> }T
-T{ VAL1 -> 222 }T
-T{ : VD1 VAL1 ; -> }T
-T{ VD1 -> 222 }T
-T{ : VD2 TO VAL2 ; -> }T
-T{ VAL2 -> -999 }T
-T{ -333 VD2 -> }T
-T{ VAL2 -> -333 }T
-T{ VAL1 -> 222 }T
-T{ 444 TO VAL1 -> }T
-T{ VD1 -> 444 }T
-T{ 123 VALUE VAL3 IMMEDIATE VAL3 -> 123 }T
-T{ : VD3 VAL3 LITERAL ; VD3 -> 123 }T
-
-\ -----------------------------------------------------------------------------
-TESTING CASE OF ENDOF ENDCASE
-
-: CS1 CASE 1 OF 111 ENDOF
-           2 OF 222 ENDOF
-           3 OF 333 ENDOF
-           >R 999 R>
-      ENDCASE
-;
-
-T{ 1 CS1 -> 111 }T
-T{ 2 CS1 -> 222 }T
-T{ 3 CS1 -> 333 }T
-T{ 4 CS1 -> 999 }T
-
-\ Nested CASE's
-
-: CS2 >R CASE -1 OF CASE R@ 1 OF 100 ENDOF
-                            2 OF 200 ENDOF
-                           >R -300 R>
-                    ENDCASE
-                 ENDOF
-              -2 OF CASE R@ 1 OF -99  ENDOF
-                            >R -199 R>
-                    ENDCASE
-                 ENDOF
-                 >R 299 R>
-         ENDCASE R> DROP
-;
-
-T{ -1 1 CS2 ->  100 }T
-T{ -1 2 CS2 ->  200 }T
-T{ -1 3 CS2 -> -300 }T
-T{ -2 1 CS2 -> -99  }T
-T{ -2 2 CS2 -> -199 }T
-T{  0 2 CS2 ->  299 }T
-
-\ Boolean short circuiting using CASE
-
-: CS3  ( N1 -- N2 )
-   CASE 1- FALSE OF 11 ENDOF
-        1- FALSE OF 22 ENDOF
-        1- FALSE OF 33 ENDOF
-        44 SWAP
-   ENDCASE
-;
-
-T{ 1 CS3 -> 11 }T
-T{ 2 CS3 -> 22 }T
-T{ 3 CS3 -> 33 }T
-T{ 9 CS3 -> 44 }T
-
-\ Empty CASE statements with/without default
-
-T{ : CS4 CASE ENDCASE ; 1 CS4 -> }T
-T{ : CS5 CASE 2 SWAP ENDCASE ; 1 CS5 -> 2 }T
-T{ : CS6 CASE 1 OF ENDOF 2 ENDCASE ; 1 CS6 -> }T
-T{ : CS7 CASE 3 OF ENDOF 2 ENDCASE ; 1 CS7 -> 1 }T
-
-\ -----------------------------------------------------------------------------
-TESTING :NONAME RECURSE
-
-VARIABLE NN1
-VARIABLE NN2
-:NONAME 1234 ; NN1 !
-:NONAME 9876 ; NN2 !
-T{ NN1 @ EXECUTE -> 1234 }T
-T{ NN2 @ EXECUTE -> 9876 }T
-
-T{ :NONAME ( n -- 0,1,..n ) DUP IF DUP >R 1- RECURSE R> THEN ;
-   CONSTANT RN1 -> }T
-T{ 0 RN1 EXECUTE -> 0 }T
-T{ 4 RN1 EXECUTE -> 0 1 2 3 4 }T
-
-:NONAME  ( n -- n1 )    \ Multiple RECURSEs in one definition
-   1- DUP
-   CASE 0 OF EXIT ENDOF
-        1 OF 11 SWAP RECURSE ENDOF
-        2 OF 22 SWAP RECURSE ENDOF
-        3 OF 33 SWAP RECURSE ENDOF
-        DROP ABS RECURSE EXIT
-   ENDCASE
-; CONSTANT RN2
-
-T{  1 RN2 EXECUTE -> 0 }T
-T{  2 RN2 EXECUTE -> 11 0 }T
-T{  4 RN2 EXECUTE -> 33 22 11 0 }T
-T{ 25 RN2 EXECUTE -> 33 22 11 0 }T
-
-\ -----------------------------------------------------------------------------
-TESTING C"
-
-T{ : CQ1 C" 123" ; -> }T
-T{ CQ1 COUNT EVALUATE -> 123 }T
-T{ : CQ2 C" " ; -> }T
-T{ CQ2 COUNT EVALUATE -> }T
-T{ : CQ3 C" 2345"COUNT EVALUATE ; CQ3 -> 2345 }T
-
-\ -----------------------------------------------------------------------------
-TESTING COMPILE,
-
-:NONAME DUP + ; CONSTANT DUP+
-T{ : Q DUP+ COMPILE, ; -> }T
-T{ : AS1 [ Q ] ; -> }T
-T{ 123 AS1 -> 246 }T
-
-\ -----------------------------------------------------------------------------
-\ Cannot automatically test SAVE-INPUT and RESTORE-INPUT from a console source
-
-TESTING SAVE-INPUT and RESTORE-INPUT with a string source
-
-VARIABLE SI_INC 0 SI_INC !
-
-: SI1
-   SI_INC @ >IN +!
-   15 SI_INC !
-;
-
-: S$ S" SAVE-INPUT SI1 RESTORE-INPUT 12345" ;
-
-T{ S$ EVALUATE SI_INC @ -> 0 2345 15 }T
-
-\ -----------------------------------------------------------------------------
-TESTING .(
-
-CR CR .( Output from .() 
-T{ CR .( You should see -9876: ) -9876 . -> }T
-T{ CR .( and again: ).( -9876)CR -> }T
-
-CR CR .( On the next 2 lines you should see First then Second messages:)
-T{ : DOTP  CR ." Second message via ." [CHAR] " EMIT    \ Check .( is immediate
-     [ CR ] .( First message via .( ) ; DOTP -> }T
-CR CR
-T{ : IMM? BL WORD FIND NIP ; IMM? .( -> 1 }T
-
-\ -----------------------------------------------------------------------------
-TESTING .R and U.R - has to handle different cell sizes
-
-\ Create some large integers just below/above MAX and Min INTs
-MAX-INT 73 79 */ CONSTANT LI1
-MIN-INT 71 73 */ CONSTANT LI2
-
-LI1 0 <# #S #> NIP CONSTANT LENLI1
-
-: (.R&U.R)  ( u1 u2 -- )  \ u1 <= string length, u2 is required indentation
-   TUCK + >R
-   LI1 OVER SPACES  . CR R@    LI1 SWAP  .R CR
-   LI2 OVER SPACES  . CR R@ 1+ LI2 SWAP  .R CR
-   LI1 OVER SPACES U. CR R@    LI1 SWAP U.R CR
-   LI2 SWAP SPACES U. CR R>    LI2 SWAP U.R CR
-;
-
-: .R&U.R  ( -- )
-   CR ." You should see lines duplicated:" CR
-   ." indented by 0 spaces" CR 0      0 (.R&U.R) CR
-   ." indented by 0 spaces" CR LENLI1 0 (.R&U.R) CR \ Just fits required width
-   ." indented by 5 spaces" CR LENLI1 5 (.R&U.R) CR
-;
-
-CR CR .( Output from .R and U.R)
-T{ .R&U.R -> }T
-
-\ -----------------------------------------------------------------------------
-TESTING PAD ERASE
-\ Must handle different size characters i.e. 1 CHARS >= 1 
-
-84 CONSTANT CHARS/PAD      \ Minimum size of PAD in chars
-CHARS/PAD CHARS CONSTANT AUS/PAD
-: CHECKPAD  ( caddr u ch -- f )  \ f = TRUE if u chars = ch
-   SWAP 0
-   ?DO
-      OVER I CHARS + C@ OVER <>
-      IF 2DROP UNLOOP FALSE EXIT THEN
-   LOOP  
-   2DROP TRUE
-;
-
-T{ PAD DROP -> }T
-T{ 0 INVERT PAD C! -> }T
-T{ PAD C@ CONSTANT MAXCHAR -> }T
-T{ PAD CHARS/PAD 2DUP MAXCHAR FILL MAXCHAR CHECKPAD -> TRUE }T
-T{ PAD CHARS/PAD 2DUP CHARS ERASE 0 CHECKPAD -> TRUE }T
-T{ PAD CHARS/PAD 2DUP MAXCHAR FILL PAD 0 ERASE MAXCHAR CHECKPAD -> TRUE }T
-T{ PAD 43 CHARS + 9 CHARS ERASE -> }T
-T{ PAD 43 MAXCHAR CHECKPAD -> TRUE }T
-T{ PAD 43 CHARS + 9 0 CHECKPAD -> TRUE }T
-T{ PAD 52 CHARS + CHARS/PAD 52 - MAXCHAR CHECKPAD -> TRUE }T
-
-\ Check that use of WORD and pictured numeric output do not corrupt PAD
-\ Minimum size of buffers for these are 33 chars and (2*n)+2 chars respectively
-\ where n is number of bits per cell
-
-PAD CHARS/PAD ERASE
-2 BASE !
-MAX-UINT MAX-UINT <# #S CHAR 1 DUP HOLD HOLD #> 2DROP
-DECIMAL
-BL WORD 12345678123456781234567812345678 DROP
-T{ PAD CHARS/PAD 0 CHECKPAD -> TRUE }T
-
-\ -----------------------------------------------------------------------------
-TESTING PARSE
-
-T{ CHAR | PARSE 1234| DUP ROT ROT EVALUATE -> 4 1234 }T
-T{ CHAR ^ PARSE  23 45 ^ DUP ROT ROT EVALUATE -> 7 23 45 }T
-: PA1 [CHAR] $ PARSE DUP >R PAD SWAP CHARS MOVE PAD R> ;
-T{ PA1 3456
-   DUP ROT ROT EVALUATE -> 4 3456 }T
-T{ CHAR A PARSE A SWAP DROP -> 0 }T
-T{ CHAR Z PARSE
-   SWAP DROP -> 0 }T
-T{ CHAR " PARSE 4567 "DUP ROT ROT EVALUATE -> 5 4567 }T
- 
-\ -----------------------------------------------------------------------------
-TESTING PARSE-NAME  (Forth 2012)
-\ Adapted from the PARSE-NAME RfD tests
-
-T{ PARSE-NAME abcd  STR1  S= -> TRUE }T        \ No leading spaces
-T{ PARSE-NAME      abcde STR2 S= -> TRUE }T    \ Leading spaces
-
-\ Test empty parse area, new lines are necessary
-T{ PARSE-NAME
-  NIP -> 0 }T
-\ Empty parse area with spaces after PARSE-NAME
-T{ PARSE-NAME         
-  NIP -> 0 }T
-
-T{ : PARSE-NAME-TEST ( "name1" "name2" -- n )
-    PARSE-NAME PARSE-NAME S= ; -> }T
-T{ PARSE-NAME-TEST abcd abcd  -> TRUE }T
-T{ PARSE-NAME-TEST abcd   abcd  -> TRUE }T  \ Leading spaces
-T{ PARSE-NAME-TEST abcde abcdf -> FALSE }T
-T{ PARSE-NAME-TEST abcdf abcde -> FALSE }T
-T{ PARSE-NAME-TEST abcde abcde
-   -> TRUE }T         \ Parse to end of line
-T{ PARSE-NAME-TEST abcde           abcde         
-   -> TRUE }T         \ Leading and trailing spaces
-
-\ -----------------------------------------------------------------------------
-TESTING DEFER DEFER@ DEFER! IS ACTION-OF (Forth 2012)
-\ Adapted from the Forth 200X RfD tests
-
-T{ DEFER DEFER1 -> }T
-T{ : MY-DEFER DEFER ; -> }T
-T{ : IS-DEFER1 IS DEFER1 ; -> }T
-T{ : ACTION-DEFER1 ACTION-OF DEFER1 ; -> }T
-T{ : DEF! DEFER! ; -> }T
-T{ : DEF@ DEFER@ ; -> }T
-
-T{ ' * ' DEFER1 DEFER! -> }T
-T{ 2 3 DEFER1 -> 6 }T
-T{ ' DEFER1 DEFER@ -> ' * }T
-T{ ' DEFER1 DEF@ -> ' * }T
-T{ ACTION-OF DEFER1 -> ' * }T
-T{ ACTION-DEFER1 -> ' * }T
-T{ ' + IS DEFER1 -> }T
-T{ 1 2 DEFER1 -> 3 }T
-T{ ' DEFER1 DEFER@ -> ' + }T
-T{ ' DEFER1 DEF@ -> ' + }T
-T{ ACTION-OF DEFER1 -> ' + }T
-T{ ACTION-DEFER1 -> ' + }T
-T{ ' - IS-DEFER1 -> }T
-T{ 1 2 DEFER1 -> -1 }T
-T{ ' DEFER1 DEFER@ -> ' - }T
-T{ ' DEFER1 DEF@ -> ' - }T
-T{ ACTION-OF DEFER1 -> ' - }T
-T{ ACTION-DEFER1 -> ' - }T
-
-T{ MY-DEFER DEFER2 -> }T
-T{ ' DUP IS DEFER2 -> }T
-T{ 1 DEFER2 -> 1 1 }T
-
-\ -----------------------------------------------------------------------------
-TESTING HOLDS  (Forth 2012)
-
-: HTEST S" Testing HOLDS" ;
-: HTEST2 S" works" ;
-: HTEST3 S" Testing HOLDS works 123" ;
-T{ 0 0 <#  HTEST HOLDS #> HTEST S= -> TRUE }T
-T{ 123 0 <# #S BL HOLD HTEST2 HOLDS BL HOLD HTEST HOLDS #>
-   HTEST3 S= -> TRUE }T
-T{ : HLD HOLDS ; -> }T
-T{ 0 0 <#  HTEST HLD #> HTEST S= -> TRUE }T
-
-\ -----------------------------------------------------------------------------
-TESTING REFILL SOURCE-ID
-\ REFILL and SOURCE-ID from the user input device can't be tested from a file,
-\ can only be tested from a string via EVALUATE
-
-T{ : RF1  S" REFILL" EVALUATE ; RF1 -> FALSE }T
-T{ : SID1  S" SOURCE-ID" EVALUATE ; SID1 -> -1 }T
-
-\ ------------------------------------------------------------------------------
-TESTING S\"  (Forth 2012 compilation mode)
-\ Extended the Forth 200X RfD tests
-\ Note this tests the Core Ext definition of S\" which has unedfined
-\ interpretation semantics. S\" in interpretation mode is tested in the tests on
-\ the File-Access word set
-
-T{ : SSQ1 S\" abc" S" abc" S= ; -> }T  \ No escapes
-T{ SSQ1 -> TRUE }T
-T{ : SSQ2 S\" " ; SSQ2 SWAP DROP -> 0 }T    \ Empty string
-
-T{ : SSQ3 S\" \a\b\e\f\l\m\q\r\t\v\x0F0\x1Fa\xaBx\z\"\\" ; -> }T
-T{ SSQ3 SWAP DROP          ->  20 }T    \ String length
-T{ SSQ3 DROP            C@ ->   7 }T    \ \a   BEL  Bell
-T{ SSQ3 DROP  1 CHARS + C@ ->   8 }T    \ \b   BS   Backspace
-T{ SSQ3 DROP  2 CHARS + C@ ->  27 }T    \ \e   ESC  Escape
-T{ SSQ3 DROP  3 CHARS + C@ ->  12 }T    \ \f   FF   Form feed
-T{ SSQ3 DROP  4 CHARS + C@ ->  10 }T    \ \l   LF   Line feed
-T{ SSQ3 DROP  5 CHARS + C@ ->  13 }T    \ \m        CR of CR/LF pair
-T{ SSQ3 DROP  6 CHARS + C@ ->  10 }T    \           LF of CR/LF pair
-T{ SSQ3 DROP  7 CHARS + C@ ->  34 }T    \ \q   "    Double Quote
-T{ SSQ3 DROP  8 CHARS + C@ ->  13 }T    \ \r   CR   Carriage Return
-T{ SSQ3 DROP  9 CHARS + C@ ->   9 }T    \ \t   TAB  Horizontal Tab
-T{ SSQ3 DROP 10 CHARS + C@ ->  11 }T    \ \v   VT   Vertical Tab
-T{ SSQ3 DROP 11 CHARS + C@ ->  15 }T    \ \x0F      Given Char
-T{ SSQ3 DROP 12 CHARS + C@ ->  48 }T    \ 0    0    Digit follow on
-T{ SSQ3 DROP 13 CHARS + C@ ->  31 }T    \ \x1F      Given Char
-T{ SSQ3 DROP 14 CHARS + C@ ->  97 }T    \ a    a    Hex follow on
-T{ SSQ3 DROP 15 CHARS + C@ -> 171 }T    \ \xaB      Insensitive Given Char
-T{ SSQ3 DROP 16 CHARS + C@ -> 120 }T    \ x    x    Non hex follow on
-T{ SSQ3 DROP 17 CHARS + C@ ->   0 }T    \ \z   NUL  No Character
-T{ SSQ3 DROP 18 CHARS + C@ ->  34 }T    \ \"   "    Double Quote
-T{ SSQ3 DROP 19 CHARS + C@ ->  92 }T    \ \\   \    Back Slash
-
-\ The above does not test \n as this is a system dependent value.
-\ Check it displays a new line
-CR .( The next test should display:)
-CR .( One line...)
-CR .( another line)
-T{ : SSQ4 S\" \nOne line...\nanotherLine\n" TYPE ; SSQ4 -> }T
-
-\ Test bare escapable characters appear as themselves
-T{ : SSQ5 S\" abeflmnqrtvxz" S" abeflmnqrtvxz" S= ; SSQ5 -> TRUE }T
-
-T{ : SSQ6 S\" a\""2DROP 1111 ; SSQ6 -> 1111 }T \ Parsing behaviour
-
-T{ : SSQ7  S\" 111 : SSQ8 S\\\" 222\" EVALUATE ; SSQ8 333" EVALUATE ; -> }T
-T{ SSQ7 -> 111 222 333 }T
-T{ : SSQ9  S\" 11 : SSQ10 S\\\" \\x32\\x32\" EVALUATE ; SSQ10 33" EVALUATE ; -> }T
-T{ SSQ9 -> 11 22 33 }T
-
-\ -----------------------------------------------------------------------------
-CORE-EXT-ERRORS SET-ERROR-COUNT
-
-CR .( End of Core Extension word tests) CR
-
-

lib/forth/ans-tests/tester.fr

@@ -1,66 +0,0 @@
-\ From: John Hayes S1I
-\ Subject: tester.fr
-\ Date: Mon, 27 Nov 95 13:10:09 PST  
-
-\ (C) 1995 JOHNS HOPKINS UNIVERSITY / APPLIED PHYSICS LABORATORY
-\ MAY BE DISTRIBUTED FREELY AS LONG AS THIS COPYRIGHT NOTICE REMAINS.
-\ VERSION 1.2
-
-\ 24/11/2015 Replaced Core Ext word <> with = 0=
-\ 31/3/2015 Variable #ERRORS added and incremented for each error reported.
-\ 22/1/09 The words { and } have been changed to T{ and }T respectively to
-\ agree with the Forth 200X file ttester.fs. This avoids clashes with
-\ locals using { ... } and the FSL use of } 
-
-HEX
-
-\ SET THE FOLLOWING FLAG TO TRUE FOR MORE VERBOSE OUTPUT; THIS MAY
-\ ALLOW YOU TO TELL WHICH TEST CAUSED YOUR SYSTEM TO HANG.
-VARIABLE VERBOSE
-   FALSE VERBOSE !
-\   TRUE VERBOSE !
-
-: EMPTY-STACK   \ ( ... -- ) EMPTY STACK: HANDLES UNDERFLOWED STACK TOO.
-   DEPTH ?DUP IF DUP 0< IF NEGATE 0 DO 0 LOOP ELSE 0 DO DROP LOOP THEN THEN ;
-
-VARIABLE #ERRORS 0 #ERRORS !
-
-: ERROR      \ ( C-ADDR U -- ) DISPLAY AN ERROR MESSAGE FOLLOWED BY
-      \ THE LINE THAT HAD THE ERROR.
-   CR TYPE SOURCE TYPE       \ DISPLAY LINE CORRESPONDING TO ERROR
-   EMPTY-STACK               \ THROW AWAY EVERY THING ELSE
-   #ERRORS @ 1 + #ERRORS !
-\   QUIT  \ *** Uncomment this line to QUIT on an error
-;
-
-VARIABLE ACTUAL-DEPTH         \ STACK RECORD
-CREATE ACTUAL-RESULTS 20 CELLS ALLOT
-
-: T{      \ ( -- ) SYNTACTIC SUGAR.
-   ;
-
-: ->      \ ( ... -- ) RECORD DEPTH AND CONTENT OF STACK.
-   DEPTH DUP ACTUAL-DEPTH !      \ RECORD DEPTH
-   ?DUP IF            \ IF THERE IS SOMETHING ON STACK
-      0 DO ACTUAL-RESULTS I CELLS + ! LOOP \ SAVE THEM
-   THEN ;
-
-: }T      \ ( ... -- ) COMPARE STACK (EXPECTED) CONTENTS WITH SAVED
-      \ (ACTUAL) CONTENTS.
-   DEPTH ACTUAL-DEPTH @ = IF      \ IF DEPTHS MATCH
-      DEPTH ?DUP IF         \ IF THERE IS SOMETHING ON THE STACK
-         0  DO            \ FOR EACH STACK ITEM
-           ACTUAL-RESULTS I CELLS + @   \ COMPARE ACTUAL WITH EXPECTED
-           = 0= IF S" INCORRECT RESULT: " ERROR LEAVE THEN
-         LOOP
-      THEN
-   ELSE               \ DEPTH MISMATCH
-      S" WRONG NUMBER OF RESULTS: " ERROR
-   THEN ;
-
-: TESTING   \ ( -- ) TALKING COMMENT.
-  SOURCE VERBOSE @
-   IF DUP >R TYPE CR R> >IN !
-   ELSE >IN ! DROP [CHAR] * EMIT
-   THEN ;
-

lib/forth/conformance.sh

@@ -1,170 +0,0 @@
-#!/usr/bin/env bash
-# Run the Hayes/Gerry-Jackson Core conformance suite against our Forth
-# interpreter and emit scoreboard.json + scoreboard.md.
-#
-# Method:
-#   1. Preprocess lib/forth/ans-tests/core.fr — strip \ comments, ( ... )
-#      comments, and TESTING … metadata lines.
-#   2. Split into chunks ending at each `}T` so an error in one test
-#      chunk doesn't abort the run.
-#   3. Emit an SX file that exposes those chunks as a list.
-#   4. Run our Forth + hayes-runner under sx_server; record pass/fail/error.
-
-set -e
-FORTH_DIR="$(cd "$(dirname "$0")" && pwd)"
-ROOT="$(cd "$FORTH_DIR/../.." && pwd)"
-SX_SERVER="${SX_SERVER:-/root/rose-ash/hosts/ocaml/_build/default/bin/sx_server.exe}"
-SOURCE="$FORTH_DIR/ans-tests/core.fr"
-OUT_JSON="$FORTH_DIR/scoreboard.json"
-OUT_MD="$FORTH_DIR/scoreboard.md"
-TMP="$(mktemp -d)"
-PREPROC="$TMP/preproc.forth"
-CHUNKS_SX="$TMP/chunks.sx"
-
-cd "$ROOT"
-
-# 1. preprocess
-awk '
-{
-  line = $0
-  # protect POSTPONE \ so the comment-strip below leaves the literal \ alone
-  gsub(/POSTPONE[ \t]+\\/, "POSTPONE @@BS@@", line)
-  # strip leading/embedded \ line comments (must be \ followed by space or EOL)
-  gsub(/(^|[ \t])\\([ \t].*|$)/, " ", line)
-  # strip ( ... ) block comments that sit on one line
-  gsub(/\([^)]*\)/, " ", line)
-  # strip TESTING … metadata lines (rest of line, incl. bare TESTING)
-  sub(/TESTING([ \t].*)?$/, " ", line)
-  # restore the protected backslash
-  gsub(/@@BS@@/, "\\", line)
-  print line
-}' "$SOURCE" > "$PREPROC"
-
-# 2 + 3: split into chunks at each `}T` and emit as a SX file
-#
-# Cap chunks via MAX_CHUNKS env (default 638 = full Hayes Core). Lower
-# it temporarily if later tests regress into an infinite loop while you
-# are iterating on primitives.
-MAX_CHUNKS="${MAX_CHUNKS:-638}"
-
-MAX_CHUNKS="$MAX_CHUNKS" python3 - "$PREPROC" "$CHUNKS_SX" <<'PY'
-import os, re, sys
-preproc_path, out_path = sys.argv[1], sys.argv[2]
-max_chunks = int(os.environ.get("MAX_CHUNKS", "590"))
-text = open(preproc_path).read()
-# keep the `}T` attached to the preceding chunk
-parts = re.split(r'(\}T)', text)
-chunks = []
-buf = ""
-for p in parts:
-    buf += p
-    if p == "}T":
-        s = buf.strip()
-        if s:
-            chunks.append(s)
-        buf = ""
-if buf.strip():
-    chunks.append(buf.strip())
-chunks = chunks[:max_chunks]
-
-def esc(s):
-    s = s.replace('\\', '\\\\').replace('"', '\\"')
-    s = s.replace('\r', ' ').replace('\n', ' ')
-    s = re.sub(r'\s+', ' ', s).strip()
-    return s
-
-with open(out_path, "w") as f:
-    f.write("(define hayes-chunks (list\n")
-    for c in chunks:
-        f.write('  "' + esc(c) + '"\n')
-    f.write("))\n\n")
-    f.write("(define\n")
-    f.write("  hayes-run-all\n")
-    f.write("  (fn\n")
-    f.write("    ()\n")
-    f.write("    (hayes-reset!)\n")
-    f.write("    (let ((s (hayes-boot)))\n")
-    f.write("      (for-each (fn (c) (hayes-run-chunk s c)) hayes-chunks))\n")
-    f.write("    (hayes-summary)))\n")
-PY
-
-# 4. run it
-OUT=$(printf '(epoch 1)\n(load "lib/forth/runtime.sx")\n(epoch 2)\n(load "lib/forth/reader.sx")\n(epoch 3)\n(load "lib/forth/interpreter.sx")\n(epoch 4)\n(load "lib/forth/compiler.sx")\n(epoch 5)\n(load "lib/forth/hayes-runner.sx")\n(epoch 6)\n(load "%s")\n(epoch 7)\n(eval "(hayes-run-all)")\n' "$CHUNKS_SX" \
-  | timeout 180 "$SX_SERVER" 2>&1)
-STATUS=$?
-
-SUMMARY=$(printf '%s\n' "$OUT" | awk '/^\{:pass / {print; exit}')
-PASS=$(printf '%s' "$SUMMARY" | sed -n 's/.*:pass \([0-9-]*\).*/\1/p')
-FAIL=$(printf '%s' "$SUMMARY" | sed -n 's/.*:fail \([0-9-]*\).*/\1/p')
-ERR=$(printf '%s' "$SUMMARY" | sed -n 's/.*:error \([0-9-]*\).*/\1/p')
-TOTAL=$(printf '%s' "$SUMMARY" | sed -n 's/.*:total \([0-9-]*\).*/\1/p')
-CHUNK_COUNT=$(grep -c '^  "' "$CHUNKS_SX" || echo 0)
-TOTAL_AVAILABLE=$(grep -c '}T' "$PREPROC" || echo 0)
-
-NOW="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
-
-if [ -z "$PASS" ]; then
-  PASS=0; FAIL=0; ERR=0; TOTAL=0
-  NOTE="runner halted before completing (timeout or SX error)"
-else
-  NOTE="completed"
-fi
-
-PCT=0
-if [ "$TOTAL" -gt 0 ]; then
-  PCT=$((PASS * 100 / TOTAL))
-fi
-
-cat > "$OUT_JSON" <<JSON
-{
-  "source": "gerryjackson/forth2012-test-suite src/core.fr",
-  "generated_at": "$NOW",
-  "chunks_available": $TOTAL_AVAILABLE,
-  "chunks_fed": $CHUNK_COUNT,
-  "total": $TOTAL,
-  "pass": $PASS,
-  "fail": $FAIL,
-  "error": $ERR,
-  "percent": $PCT,
-  "note": "$NOTE"
-}
-JSON
-
-cat > "$OUT_MD" <<MD
-# Forth Hayes Core scoreboard
-
-| metric            | value |
-| ----------------- | ----: |
-| chunks available  | $TOTAL_AVAILABLE |
-| chunks fed        | $CHUNK_COUNT |
-| total             | $TOTAL |
-| pass              | $PASS |
-| fail              | $FAIL |
-| error             | $ERR |
-| percent           | ${PCT}% |
-
-- **Source**: \`gerryjackson/forth2012-test-suite\` \`src/core.fr\`
-- **Generated**: $NOW
-- **Note**: $NOTE
-
-A "chunk" is any preprocessed segment ending at a \`}T\` (every Hayes test
-is one chunk, plus the small declaration blocks between tests).
-The runner catches raised errors at chunk boundaries so one bad chunk
-does not abort the rest. \`error\` covers chunks that raised; \`fail\`
-covers tests whose \`->\` / \`}T\` comparison mismatched.
-
-### Chunk cap
-
-\`conformance.sh\` processes the first \`\$MAX_CHUNKS\` chunks (default
-**638**, i.e. the whole Hayes Core file). Lower the cap temporarily
-while iterating on primitives if a regression re-opens an infinite
-loop in later tests.
-MD
-
-echo "$SUMMARY"
-echo "Scoreboard: $OUT_JSON"
-echo "           $OUT_MD"
-
-if [ "$STATUS" -ne 0 ] && [ "$TOTAL" -eq 0 ]; then
-  exit 1
-fi

lib/forth/hayes-runner.sx

@@ -1,158 +0,0 @@
-;; Hayes conformance test runner.
-;; Installs T{ -> }T as Forth primitives that snapshot and compare dstack,
-;; plus stub TESTING / HEX / DECIMAL so the Hayes Core file can stream
-;; through the interpreter without halting on unsupported metadata words.
-
-(define hayes-pass 0)
-(define hayes-fail 0)
-(define hayes-error 0)
-(define hayes-start-depth 0)
-(define hayes-actual (list))
-(define hayes-actual-set false)
-(define hayes-failures (list))
-(define hayes-first-error "")
-(define hayes-error-hist (dict))
-
-(define
-  hayes-reset!
-  (fn
-    ()
-    (set! hayes-pass 0)
-    (set! hayes-fail 0)
-    (set! hayes-error 0)
-    (set! hayes-start-depth 0)
-    (set! hayes-actual (list))
-    (set! hayes-actual-set false)
-    (set! hayes-failures (list))
-    (set! hayes-first-error "")
-    (set! hayes-error-hist (dict))))
-
-(define
-  hayes-slice
-  (fn
-    (state base)
-    (let
-      ((n (- (forth-depth state) base)))
-      (if (<= n 0) (list) (take (get state "dstack") n)))))
-
-(define
-  hayes-truncate!
-  (fn
-    (state base)
-    (let
-      ((n (- (forth-depth state) base)))
-      (when (> n 0) (dict-set! state "dstack" (drop (get state "dstack") n))))))
-
-(define
-  hayes-install!
-  (fn
-    (state)
-    (forth-def-prim!
-      state
-      "T{"
-      (fn
-        (s)
-        (set! hayes-start-depth (forth-depth s))
-        (set! hayes-actual-set false)
-        (set! hayes-actual (list))))
-    (forth-def-prim!
-      state
-      "->"
-      (fn
-        (s)
-        (set! hayes-actual (hayes-slice s hayes-start-depth))
-        (set! hayes-actual-set true)
-        (hayes-truncate! s hayes-start-depth)))
-    (forth-def-prim!
-      state
-      "}T"
-      (fn
-        (s)
-        (let
-          ((expected (hayes-slice s hayes-start-depth)))
-          (hayes-truncate! s hayes-start-depth)
-          (if
-            (and hayes-actual-set (= expected hayes-actual))
-            (set! hayes-pass (+ hayes-pass 1))
-            (begin
-              (set! hayes-fail (+ hayes-fail 1))
-              (set!
-                hayes-failures
-                (concat
-                  hayes-failures
-                  (list
-                    (dict
-                      "kind"
-                      "fail"
-                      "expected"
-                      (str expected)
-                      "actual"
-                      (str hayes-actual))))))))))
-    (forth-def-prim! state "TESTING" (fn (s) nil))
-    ;; HEX/DECIMAL are real primitives now (runtime.sx) — no stub needed.
-    state))
-
-(define
-  hayes-boot
-  (fn () (let ((s (forth-boot))) (hayes-install! s) (hayes-reset!) s)))
-
-;; Run a single preprocessed chunk (string of Forth source) on the shared
-;; state. Catch any raised error and move on — the chunk boundary is a
-;; safe resume point.
-(define
-  hayes-bump-error-key!
-  (fn
-    (err)
-    (let
-      ((msg (str err)))
-      (let
-        ((space-idx (index-of msg " ")))
-        (let
-          ((key
-            (if
-              (> space-idx 0)
-              (substr msg 0 space-idx)
-              msg)))
-          (dict-set!
-            hayes-error-hist
-            key
-            (+ 1 (or (get hayes-error-hist key) 0))))))))
-
-(define
-  hayes-run-chunk
-  (fn
-    (state src)
-    (guard
-      (err
-        ((= 1 1)
-          (begin
-            (set! hayes-error (+ hayes-error 1))
-            (when
-              (= (len hayes-first-error) 0)
-              (set! hayes-first-error (str err)))
-            (hayes-bump-error-key! err)
-            (dict-set! state "dstack" (list))
-            (dict-set! state "rstack" (list))
-            (dict-set! state "compiling" false)
-            (dict-set! state "current-def" nil)
-            (dict-set! state "cstack" (list))
-            (dict-set! state "input" (list)))))
-      (forth-interpret state src))))
-
-(define
-  hayes-summary
-  (fn
-    ()
-    (dict
-      "pass"
-      hayes-pass
-      "fail"
-      hayes-fail
-      "error"
-      hayes-error
-      "total"
-      (+ (+ hayes-pass hayes-fail) hayes-error)
-      "first-error"
-      hayes-first-error
-      "error-hist"
-      hayes-error-hist)))

lib/forth/interpreter.sx

@@ -5,39 +5,7 @@
 
 (define
   forth-execute-word
-  (fn
+  (fn (state word) (let ((body (get word "body"))) (body state))))
-    (state word)
-    (dict-set! word "call-count" (+ 1 (or (get word "call-count") 0)))
-    (let ((body (get word "body"))) (body state))))
-
-(define
-  forth-hot-words
-  (fn
-    (state threshold)
-    (forth-hot-walk
-      (keys (get state "dict"))
-      (get state "dict")
-      threshold
-      (list))))
-
-(define
-  forth-hot-walk
-  (fn
-    (names dict threshold acc)
-    (if
-      (= (len names) 0)
-      acc
-      (let
-        ((n (first names)))
-        (let
-          ((w (get dict n)))
-          (let
-            ((c (or (get w "call-count") 0)))
-            (forth-hot-walk
-              (rest names)
-              dict
-              threshold
-              (if (>= c threshold) (cons (list n c) acc) acc))))))))
 
 (define
   forth-interpret-token
@@ -49,7 +17,7 @@
         (not (nil? w))
         (forth-execute-word state w)
         (let
-          ((n (forth-parse-number tok (get (get state "vars") "base"))))
+          ((n (forth-parse-number tok (get state "base"))))
           (if
             (not (nil? n))
             (forth-push state n)

lib/forth/runtime.sx

@@ -18,122 +18,10 @@
       (dict-set! s "output" "")
       (dict-set! s "compiling" false)
       (dict-set! s "current-def" nil)
+      (dict-set! s "base" 10)
       (dict-set! s "vars" (dict))
-      (dict-set! (get s "vars") "base" 10)
-      (dict-set! s "cstack" (list))
-      (dict-set! s "mem" (dict))
-      (dict-set! s "here" 0)
-      (dict-set! s "hold" (list))
-      (dict-set! s "files" (dict))
-      (dict-set! s "by-path" (dict))
-      (dict-set! s "next-fileid" 1)
       s)))
 
-(define
-  forth-mem-write!
-  (fn (state addr u) (dict-set! (get state "mem") (str addr) u)))
-
-(define
-  forth-mem-read
-  (fn
-    (state addr)
-    (or (get (get state "mem") (str addr)) 0)))
-
-(define
-  forth-alloc-bytes!
-  (fn
-    (state n)
-    (let
-      ((addr (get state "here")))
-      (dict-set! state "here" (+ addr n))
-      addr)))
-
-(define
-  forth-mem-write-string!
-  (fn
-    (state addr s)
-    (let
-      ((n (len s)))
-      (forth-mem-write-string-loop! state addr s 0 n))))
-
-(define
-  forth-mem-write-string-loop!
-  (fn
-    (state addr s i n)
-    (when
-      (< i n)
-      (begin
-        (forth-mem-write! state (+ addr i) (char-code (substr s i 1)))
-        (forth-mem-write-string-loop! state addr s (+ i 1) n)))))
-
-(define
-  forth-mem-read-string
-  (fn
-    (state addr n)
-    (forth-mem-read-string-loop state addr 0 n "")))
-
-(define
-  forth-mem-read-string-loop
-  (fn
-    (state addr i n acc)
-    (if
-      (>= i n)
-      acc
-      (forth-mem-read-string-loop
-        state
-        addr
-        (+ i 1)
-        n
-        (str acc (char-from-code (forth-mem-read state (+ addr i))))))))
-
-(define
-  forth-fill-loop
-  (fn
-    (state addr u char i)
-    (when
-      (< i u)
-      (begin
-        (forth-mem-write! state (+ addr i) char)
-        (forth-fill-loop state addr u char (+ i 1))))))
-
-(define
-  forth-cmove-loop
-  (fn
-    (state src dst u i)
-    (when
-      (< i u)
-      (begin
-        (forth-mem-write! state (+ dst i) (forth-mem-read state (+ src i)))
-        (forth-cmove-loop state src dst u (+ i 1))))))
-
-(define
-  forth-cmove-loop-desc
-  (fn
-    (state src dst u i)
-    (when
-      (>= i 0)
-      (begin
-        (forth-mem-write! state (+ dst i) (forth-mem-read state (+ src i)))
-        (forth-cmove-loop-desc state src dst u (- i 1))))))
-
-(define
-  forth-cpush
-  (fn (state v) (dict-set! state "cstack" (cons v (get state "cstack")))))
-
-(define
-  forth-cpop
-  (fn
-    (state)
-    (let
-      ((cs (get state "cstack")))
-      (if
-        (= (len cs) 0)
-        (forth-error state "control stack underflow")
-        (let
-          ((top (first cs)))
-          (dict-set! state "cstack" (rest cs))
-          top)))))
-
 (define
   forth-error
   (fn (state msg) (dict-set! state "error" msg) (raise msg)))
@@ -193,12 +81,6 @@
   forth-emit-str
   (fn (state s) (dict-set! state "output" (str (get state "output") s))))
 
-;; The body is always a plain SX lambda — primitives and colon-def
-;; bodies alike — which means the SX VM's JIT-on-first-call can lift
-;; the body directly into bytecode. We tag every word `:vm-eligible?
-;; true` so downstream JIT cooperation (a tracing layer, a hot-call
-;; counter) can pick out the JIT-friendly entries by metadata rather
-;; than by inspecting the body shape.
 (define
   forth-make-word
   (fn
@@ -208,8 +90,6 @@
       (dict-set! w "kind" kind)
       (dict-set! w "body" body)
       (dict-set! w "immediate?" immediate?)
-      (dict-set! w "vm-eligible?" true)
-      (dict-set! w "call-count" 0)
       w)))
 
 (define
@@ -219,8 +99,7 @@
     (dict-set!
       (get state "dict")
       (downcase name)
-      (forth-make-word "primitive" body false))
+      (forth-make-word "primitive" body false))))
-    (dict-set! state "last-defined" name)))
 
 (define
   forth-def-prim-imm!
@@ -229,8 +108,7 @@
     (dict-set!
       (get state "dict")
       (downcase name)
-      (forth-make-word "primitive" body true))
+      (forth-make-word "primitive" body true))))
-    (dict-set! state "last-defined" name)))
 
 (define
   forth-lookup
@@ -288,220 +166,6 @@
 
 (define forth-bits-width 32)
 
-;; Truncate a number to the Forth 32-bit signed range (two's-complement).
-;; Used by arithmetic primitives so wrap-around matches ANS semantics and
-;; loop idioms that rely on MSB becoming 0 after enough shifts terminate.
-(define
-  forth-clip
-  (fn
-    (n)
-    (forth-from-unsigned
-      (forth-to-unsigned n forth-bits-width)
-      forth-bits-width)))
-
-;; Double-cell helpers. Single = 32-bit signed, double = 64-bit signed
-;; represented on the data stack as (lo, hi) where hi is on top.
-;; Reassembly converts the low cell as unsigned and the high cell as
-;; signed (signed) or as unsigned (unsigned), then combines.
-(define forth-2pow32 (pow 2 32))
-(define forth-2pow64 (pow 2 64))
-
-(define
-  forth-double-from-cells-u
-  (fn
-    (lo hi)
-    (+ (forth-to-unsigned lo 32) (* (forth-to-unsigned hi 32) forth-2pow32))))
-
-(define
-  forth-double-from-cells-s
-  (fn (lo hi) (+ (forth-to-unsigned lo 32) (* hi forth-2pow32))))
-
-(define
-  forth-double-push-u
-  (fn
-    (state d)
-    (let
-      ((lo (mod d forth-2pow32)) (hi (floor (/ d forth-2pow32))))
-      (forth-push state (forth-from-unsigned lo 32))
-      (forth-push state (forth-from-unsigned hi 32)))))
-
-(define
-  forth-num-to-string-loop
-  (fn
-    (u base acc)
-    (if
-      (= u 0)
-      acc
-      (let
-        ((dig (mod u base)) (rest (floor (/ u base))))
-        (let
-          ((ch
-            (if
-              (< dig 10)
-              (char-from-code (+ 48 dig))
-              (char-from-code (+ 55 dig)))))
-          (forth-num-to-string-loop rest base (str ch acc)))))))
-
-(define
-  forth-num-to-string
-  (fn
-    (u base)
-    (if (= u 0) "0" (forth-num-to-string-loop u base ""))))
-
-(define
-  forth-spaces-str
-  (fn
-    (n)
-    (if (<= n 0) "" (str " " (forth-spaces-str (- n 1))))))
-
-(define
-  forth-join-hold
-  (fn
-    (parts)
-    (forth-join-hold-loop parts "")))
-
-(define
-  forth-join-hold-loop
-  (fn
-    (parts acc)
-    (if
-      (= (len parts) 0)
-      acc
-      (forth-join-hold-loop (rest parts) (str acc (first parts))))))
-
-(define
-  forth-pic-step
-  (fn
-    (state)
-    (let
-      ((hi (forth-pop state)) (lo (forth-pop state)))
-      (let
-        ((d (forth-double-from-cells-u lo hi))
-          (b (get (get state "vars") "base")))
-        (let
-          ((dig (mod d b)) (rest (floor (/ d b))))
-          (let
-            ((ch
-              (if
-                (< dig 10)
-                (char-from-code (+ 48 dig))
-                (char-from-code (+ 55 dig)))))
-            (dict-set! state "hold" (cons ch (get state "hold")))
-            (forth-double-push-u state rest)))))))
-
-(define
-  forth-compare-bytes-loop
-  (fn
-    (state a1 u1 a2 u2 i)
-    (cond
-      ((and (= i u1) (= i u2)) 0)
-      ((= i u1) -1)
-      ((= i u2) 1)
-      (else
-        (let
-          ((b1 (forth-mem-read state (+ a1 i)))
-            (b2 (forth-mem-read state (+ a2 i))))
-          (cond
-            ((< b1 b2) -1)
-            ((> b1 b2) 1)
-            (else (forth-compare-bytes-loop state a1 u1 a2 u2 (+ i 1)))))))))
-
-(define
-  forth-match-at
-  (fn
-    (state a1 start a2 u2 j)
-    (cond
-      ((= j u2) true)
-      ((not
-        (=
-          (forth-mem-read state (+ a1 (+ start j)))
-          (forth-mem-read state (+ a2 j))))
-        false)
-      (else (forth-match-at state a1 start a2 u2 (+ j 1))))))
-
-(define
-  forth-search-bytes
-  (fn
-    (state a1 u1 a2 u2 i)
-    (cond
-      ((= u2 0) 0)
-      ((> (+ i u2) u1) -1)
-      ((forth-match-at state a1 i a2 u2 0) i)
-      (else (forth-search-bytes state a1 u1 a2 u2 (+ i 1))))))
-
-(define
-  forth-digit-of-byte
-  (fn
-    (c base)
-    (let
-      ((v
-        (cond
-          ((and (>= c 48) (<= c 57)) (- c 48))
-          ((and (>= c 65) (<= c 90)) (- c 55))
-          ((and (>= c 97) (<= c 122)) (- c 87))
-          (else -1))))
-      (if (or (< v 0) (>= v base)) -1 v))))
-
-(define
-  forth-numparse-loop
-  (fn
-    (state addr u acc base)
-    (if
-      (= u 0)
-      (list acc addr u)
-      (let
-        ((c (forth-mem-read state addr)))
-        (let
-          ((dig (forth-digit-of-byte c base)))
-          (if
-            (< dig 0)
-            (list acc addr u)
-            (forth-numparse-loop
-              state
-              (+ addr 1)
-              (- u 1)
-              (+ (* acc base) dig)
-              base)))))))
-
-(define
-  forth-pic-S-loop
-  (fn
-    (state)
-    (forth-pic-step state)
-    (let
-      ((hi (forth-pop state)) (lo (forth-pop state)))
-      (if
-        (and (= lo 0) (= hi 0))
-        (begin (forth-push state 0) (forth-push state 0))
-        (begin
-          (forth-push state lo)
-          (forth-push state hi)
-          (forth-pic-S-loop state))))))
-
-(define
-  forth-double-push-s
-  (fn
-    (state d)
-    (if
-      (>= d 0)
-      (forth-double-push-u state d)
-      (let
-        ((q (- 0 d)))
-        (let
-          ((qlo (mod q forth-2pow32)) (qhi (floor (/ q forth-2pow32))))
-          (if
-            (= qlo 0)
-            (begin
-              (forth-push state 0)
-              (forth-push state (forth-from-unsigned (- forth-2pow32 qhi) 32)))
-            (begin
-              (forth-push
-                state
-                (forth-from-unsigned (- forth-2pow32 qlo) 32))
-              (forth-push
-                state
-                (forth-from-unsigned (- (- forth-2pow32 qhi) 1) 32)))))))))
-
 (define
   forth-to-unsigned
   (fn (n w) (let ((m (pow 2 w))) (mod (+ (mod n m) m) m))))
@@ -621,19 +285,6 @@
         (s)
         (let ((a (forth-peek s))) (when (not (= a 0)) (forth-push s a)))))
     (forth-def-prim! state "DEPTH" (fn (s) (forth-push s (forth-depth s))))
-    (forth-def-prim! state "SP@" (fn (s) (forth-push s (forth-depth s))))
-    (forth-def-prim!
-      state
-      "SP!"
-      (fn
-        (s)
-        (let
-          ((n (forth-pop s)))
-          (let
-            ((cur (forth-depth s)))
-            (when
-              (> cur n)
-              (dict-set! s "dstack" (drop (get s "dstack") (- cur n))))))))
     (forth-def-prim!
       state
       "PICK"
@@ -703,17 +354,11 @@
           (forth-push s d)
           (forth-push s a)
           (forth-push s b))))
-    (forth-def-prim! state "+" (forth-binop (fn (a b) (forth-clip (+ a b)))))
+    (forth-def-prim! state "+" (forth-binop (fn (a b) (+ a b))))
-    (forth-def-prim! state "-" (forth-binop (fn (a b) (forth-clip (- a b)))))
+    (forth-def-prim! state "-" (forth-binop (fn (a b) (- a b))))
-    (forth-def-prim! state "*" (forth-binop (fn (a b) (forth-clip (* a b)))))
+    (forth-def-prim! state "*" (forth-binop (fn (a b) (* a b))))
-    (forth-def-prim!
+    (forth-def-prim! state "/" (forth-binop forth-div))
-      state
+    (forth-def-prim! state "MOD" (forth-binop forth-mod))
-      "/"
-      (forth-binop (fn (a b) (forth-clip (forth-div a b)))))
-    (forth-def-prim!
-      state
-      "MOD"
-      (forth-binop (fn (a b) (forth-clip (forth-mod a b)))))
     (forth-def-prim!
       state
       "/MOD"
@@ -723,8 +368,8 @@
           ((b (forth-pop s)) (a (forth-pop s)))
           (forth-push s (forth-mod a b))
           (forth-push s (forth-div a b)))))
-    (forth-def-prim! state "NEGATE" (forth-unop (fn (a) (forth-clip (- 0 a)))))
+    (forth-def-prim! state "NEGATE" (forth-unop (fn (a) (- 0 a))))
-    (forth-def-prim! state "ABS" (forth-unop (fn (a) (forth-clip (abs a)))))
+    (forth-def-prim! state "ABS" (forth-unop abs))
     (forth-def-prim!
       state
       "MIN"
@@ -733,15 +378,12 @@
       state
       "MAX"
       (forth-binop (fn (a b) (if (> a b) a b))))
-    (forth-def-prim! state "1+" (forth-unop (fn (a) (forth-clip (+ a 1)))))
+    (forth-def-prim! state "1+" (forth-unop (fn (a) (+ a 1))))
-    (forth-def-prim! state "1-" (forth-unop (fn (a) (forth-clip (- a 1)))))
+    (forth-def-prim! state "1-" (forth-unop (fn (a) (- a 1))))
-    (forth-def-prim! state "2+" (forth-unop (fn (a) (forth-clip (+ a 2)))))
+    (forth-def-prim! state "2+" (forth-unop (fn (a) (+ a 2))))
-    (forth-def-prim! state "2-" (forth-unop (fn (a) (forth-clip (- a 2)))))
+    (forth-def-prim! state "2-" (forth-unop (fn (a) (- a 2))))
-    (forth-def-prim! state "2*" (forth-unop (fn (a) (forth-clip (* a 2)))))
+    (forth-def-prim! state "2*" (forth-unop (fn (a) (* a 2))))
-    (forth-def-prim!
+    (forth-def-prim! state "2/" (forth-unop (fn (a) (floor (/ a 2)))))
-      state
-      "2/"
-      (forth-unop (fn (a) (forth-clip (floor (/ a 2))))))
     (forth-def-prim! state "=" (forth-cmp (fn (a b) (= a b))))
     (forth-def-prim! state "<>" (forth-cmp (fn (a b) (not (= a b)))))
     (forth-def-prim! state "<" (forth-cmp (fn (a b) (< a b))))
@@ -756,30 +398,6 @@
     (forth-def-prim! state "OR" (forth-binop forth-bit-or))
     (forth-def-prim! state "XOR" (forth-binop forth-bit-xor))
     (forth-def-prim! state "INVERT" (forth-unop forth-bit-invert))
-    (forth-def-prim!
-      state
-      "LSHIFT"
-      (fn
-        (s)
-        (let
-          ((u (forth-pop s)) (x (forth-pop s)))
-          (let
-            ((ux (forth-to-unsigned x forth-bits-width)))
-            (let
-              ((res (mod (* ux (pow 2 u)) (pow 2 forth-bits-width))))
-              (forth-push s (forth-from-unsigned res forth-bits-width)))))))
-    (forth-def-prim!
-      state
-      "RSHIFT"
-      (fn
-        (s)
-        (let
-          ((u (forth-pop s)) (x (forth-pop s)))
-          (let
-            ((ux (forth-to-unsigned x forth-bits-width)))
-            (let
-              ((res (floor (/ ux (pow 2 u)))))
-              (forth-push s (forth-from-unsigned res forth-bits-width)))))))
     (forth-def-prim!
       state
       "."
@@ -798,7 +416,7 @@
     (forth-def-prim!
       state
       "EMIT"
-      (fn (s) (forth-emit-str s (char-from-code (forth-pop s)))))
+      (fn (s) (forth-emit-str s (code-char (forth-pop s)))))
     (forth-def-prim! state "CR" (fn (s) (forth-emit-str s "\n")))
     (forth-def-prim! state "SPACE" (fn (s) (forth-emit-str s " ")))
     (forth-def-prim!
@@ -812,459 +430,4 @@
             (> n 0)
             (for-each (fn (_) (forth-emit-str s " ")) (range 0 n))))))
     (forth-def-prim! state "BL" (fn (s) (forth-push s 32)))
-    (forth-def-prim!
-      state
-      "DECIMAL"
-      (fn (s) (dict-set! (get s "vars") "base" 10)))
-    (forth-def-prim!
-      state
-      "HEX"
-      (fn (s) (dict-set! (get s "vars") "base" 16)))
-    (forth-def-prim!
-      state
-      "OCTAL"
-      (fn (s) (dict-set! (get s "vars") "base" 8)))
-    (forth-def-prim! state "BASE" (fn (s) (forth-push s "base")))
-    (forth-def-prim! state "I" (fn (s) (forth-push s (forth-rpeek s))))
-    (forth-def-prim!
-      state
-      "J"
-      (fn (s) (forth-push s (nth (get s "rstack") 2))))
-    (forth-def-prim! state ">R" (fn (s) (forth-rpush s (forth-pop s))))
-    (forth-def-prim! state "R>" (fn (s) (forth-push s (forth-rpop s))))
-    (forth-def-prim! state "R@" (fn (s) (forth-push s (forth-rpeek s))))
-    (forth-def-prim!
-      state
-      "2>R"
-      (fn
-        (s)
-        (let
-          ((b (forth-pop s)) (a (forth-pop s)))
-          (forth-rpush s a)
-          (forth-rpush s b))))
-    (forth-def-prim!
-      state
-      "2R>"
-      (fn
-        (s)
-        (let
-          ((b (forth-rpop s)) (a (forth-rpop s)))
-          (forth-push s a)
-          (forth-push s b))))
-    (forth-def-prim!
-      state
-      "2R@"
-      (fn
-        (s)
-        (let
-          ((rs (get s "rstack")))
-          (when
-            (< (len rs) 2)
-            (forth-error s "return stack underflow"))
-          (forth-push s (nth rs 1))
-          (forth-push s (nth rs 0)))))
-    (forth-def-prim!
-      state
-      "C@"
-      (fn
-        (s)
-        (let ((addr (forth-pop s))) (forth-push s (forth-mem-read s addr)))))
-    (forth-def-prim!
-      state
-      "C!"
-      (fn
-        (s)
-        (let
-          ((addr (forth-pop s)) (v (forth-pop s)))
-          (forth-mem-write! s addr v))))
-    (forth-def-prim! state "CHAR+" (fn (s) (forth-push s (+ (forth-pop s) 1))))
-    (forth-def-prim! state "CHARS" (fn (s) nil))
-    (forth-def-prim!
-      state
-      "TYPE"
-      (fn
-        (s)
-        (let
-          ((u (forth-pop s)) (addr (forth-pop s)))
-          (forth-emit-str s (forth-mem-read-string s addr u)))))
-    (forth-def-prim!
-      state
-      "COUNT"
-      (fn
-        (s)
-        (let
-          ((addr (forth-pop s)))
-          (let
-            ((u (forth-mem-read s addr)))
-            (forth-push s (+ addr 1))
-            (forth-push s u)))))
-    (forth-def-prim!
-      state
-      "FILL"
-      (fn
-        (s)
-        (let
-          ((char (forth-pop s)) (u (forth-pop s)) (addr (forth-pop s)))
-          (forth-fill-loop s addr u char 0))))
-    (forth-def-prim!
-      state
-      "BLANK"
-      (fn
-        (s)
-        (let
-          ((u (forth-pop s)) (addr (forth-pop s)))
-          (forth-fill-loop s addr u 32 0))))
-    (forth-def-prim!
-      state
-      "CMOVE"
-      (fn
-        (s)
-        (let
-          ((u (forth-pop s)) (dst (forth-pop s)) (src (forth-pop s)))
-          (forth-cmove-loop s src dst u 0))))
-    (forth-def-prim!
-      state
-      "CMOVE>"
-      (fn
-        (s)
-        (let
-          ((u (forth-pop s)) (dst (forth-pop s)) (src (forth-pop s)))
-          (forth-cmove-loop-desc s src dst u (- u 1)))))
-    (forth-def-prim!
-      state
-      "MOVE"
-      (fn
-        (s)
-        (let
-          ((u (forth-pop s)) (dst (forth-pop s)) (src (forth-pop s)))
-          (if
-            (or (<= dst src) (>= dst (+ src u)))
-            (forth-cmove-loop s src dst u 0)
-            (forth-cmove-loop-desc s src dst u (- u 1))))))
-    (forth-def-prim!
-      state
-      "S>D"
-      (fn
-        (s)
-        (let
-          ((n (forth-pop s)))
-          (forth-push s n)
-          (forth-push s (if (< n 0) -1 0)))))
-    (forth-def-prim! state "D>S" (fn (s) (forth-pop s)))
-    (forth-def-prim!
-      state
-      "M*"
-      (fn
-        (s)
-        (let
-          ((b (forth-pop s)) (a (forth-pop s)))
-          (forth-double-push-s s (* a b)))))
-    (forth-def-prim!
-      state
-      "UM*"
-      (fn
-        (s)
-        (let
-          ((b (forth-pop s)) (a (forth-pop s)))
-          (forth-double-push-u
-            s
-            (* (forth-to-unsigned a 32) (forth-to-unsigned b 32))))))
-    (forth-def-prim!
-      state
-      "UM/MOD"
-      (fn
-        (s)
-        (let
-          ((u1 (forth-pop s)) (hi (forth-pop s)) (lo (forth-pop s)))
-          (let
-            ((d (forth-double-from-cells-u lo hi))
-              (divisor (forth-to-unsigned u1 32)))
-            (when (= divisor 0) (forth-error s "division by zero"))
-            (let
-              ((q (floor (/ d divisor))) (r (mod d divisor)))
-              (forth-push s (forth-from-unsigned r 32))
-              (forth-push s (forth-from-unsigned q 32)))))))
-    (forth-def-prim!
-      state
-      "FM/MOD"
-      (fn
-        (s)
-        (let
-          ((n (forth-pop s)) (hi (forth-pop s)) (lo (forth-pop s)))
-          (let
-            ((d (forth-double-from-cells-s lo hi)))
-            (when (= n 0) (forth-error s "division by zero"))
-            (let
-              ((q (floor (/ d n))))
-              (let
-                ((r (- d (* q n))))
-                (forth-push s (forth-clip r))
-                (forth-push s (forth-clip q))))))))
-    (forth-def-prim!
-      state
-      "SM/REM"
-      (fn
-        (s)
-        (let
-          ((n (forth-pop s)) (hi (forth-pop s)) (lo (forth-pop s)))
-          (let
-            ((d (forth-double-from-cells-s lo hi)))
-            (when (= n 0) (forth-error s "division by zero"))
-            (let
-              ((q (forth-trunc (/ d n))))
-              (let
-                ((r (- d (* q n))))
-                (forth-push s (forth-clip r))
-                (forth-push s (forth-clip q))))))))
-    (forth-def-prim!
-      state
-      "*/"
-      (fn
-        (s)
-        (let
-          ((n3 (forth-pop s)) (n2 (forth-pop s)) (n1 (forth-pop s)))
-          (when (= n3 0) (forth-error s "division by zero"))
-          (forth-push s (forth-clip (forth-trunc (/ (* n1 n2) n3)))))))
-    (forth-def-prim!
-      state
-      "*/MOD"
-      (fn
-        (s)
-        (let
-          ((n3 (forth-pop s)) (n2 (forth-pop s)) (n1 (forth-pop s)))
-          (when (= n3 0) (forth-error s "division by zero"))
-          (let
-            ((d (* n1 n2)))
-            (let
-              ((q (forth-trunc (/ d n3))))
-              (let
-                ((r (- d (* q n3))))
-                (forth-push s (forth-clip r))
-                (forth-push s (forth-clip q))))))))
-    (forth-def-prim!
-      state
-      "D+"
-      (fn
-        (s)
-        (let
-          ((hi2 (forth-pop s))
-            (lo2 (forth-pop s))
-            (hi1 (forth-pop s))
-            (lo1 (forth-pop s)))
-          (forth-double-push-s
-            s
-            (+
-              (forth-double-from-cells-s lo1 hi1)
-              (forth-double-from-cells-s lo2 hi2))))))
-    (forth-def-prim!
-      state
-      "D-"
-      (fn
-        (s)
-        (let
-          ((hi2 (forth-pop s))
-            (lo2 (forth-pop s))
-            (hi1 (forth-pop s))
-            (lo1 (forth-pop s)))
-          (forth-double-push-s
-            s
-            (-
-              (forth-double-from-cells-s lo1 hi1)
-              (forth-double-from-cells-s lo2 hi2))))))
-    (forth-def-prim!
-      state
-      "DNEGATE"
-      (fn
-        (s)
-        (let
-          ((hi (forth-pop s)) (lo (forth-pop s)))
-          (forth-double-push-s
-            s
-            (- 0 (forth-double-from-cells-s lo hi))))))
-    (forth-def-prim!
-      state
-      "DABS"
-      (fn
-        (s)
-        (let
-          ((hi (forth-pop s)) (lo (forth-pop s)))
-          (forth-double-push-s s (abs (forth-double-from-cells-s lo hi))))))
-    (forth-def-prim!
-      state
-      "D="
-      (fn
-        (s)
-        (let
-          ((hi2 (forth-pop s))
-            (lo2 (forth-pop s))
-            (hi1 (forth-pop s))
-            (lo1 (forth-pop s)))
-          (forth-push s (if (and (= lo1 lo2) (= hi1 hi2)) -1 0)))))
-    (forth-def-prim!
-      state
-      "D<"
-      (fn
-        (s)
-        (let
-          ((hi2 (forth-pop s))
-            (lo2 (forth-pop s))
-            (hi1 (forth-pop s))
-            (lo1 (forth-pop s)))
-          (forth-push
-            s
-            (if
-              (<
-                (forth-double-from-cells-s lo1 hi1)
-                (forth-double-from-cells-s lo2 hi2))
-              -1
-              0)))))
-    (forth-def-prim!
-      state
-      "D0="
-      (fn
-        (s)
-        (let
-          ((hi (forth-pop s)) (lo (forth-pop s)))
-          (forth-push s (if (and (= lo 0) (= hi 0)) -1 0)))))
-    (forth-def-prim!
-      state
-      "D0<"
-      (fn
-        (s)
-        (let
-          ((hi (forth-pop s)) (lo (forth-pop s)))
-          (forth-push s (if (< hi 0) -1 0)))))
-    (forth-def-prim!
-      state
-      "DMAX"
-      (fn
-        (s)
-        (let
-          ((hi2 (forth-pop s))
-            (lo2 (forth-pop s))
-            (hi1 (forth-pop s))
-            (lo1 (forth-pop s)))
-          (let
-            ((d1 (forth-double-from-cells-s lo1 hi1))
-              (d2 (forth-double-from-cells-s lo2 hi2)))
-            (forth-double-push-s s (if (> d1 d2) d1 d2))))))
-    (forth-def-prim!
-      state
-      "DMIN"
-      (fn
-        (s)
-        (let
-          ((hi2 (forth-pop s))
-            (lo2 (forth-pop s))
-            (hi1 (forth-pop s))
-            (lo1 (forth-pop s)))
-          (let
-            ((d1 (forth-double-from-cells-s lo1 hi1))
-              (d2 (forth-double-from-cells-s lo2 hi2)))
-            (forth-double-push-s s (if (< d1 d2) d1 d2))))))
-    (forth-def-prim! state "<#" (fn (s) (dict-set! s "hold" (list))))
-    (forth-def-prim!
-      state
-      "HOLD"
-      (fn
-        (s)
-        (let
-          ((c (forth-pop s)))
-          (dict-set!
-            s
-            "hold"
-            (cons (char-from-code c) (get s "hold"))))))
-    (forth-def-prim!
-      state
-      "SIGN"
-      (fn
-        (s)
-        (let
-          ((n (forth-pop s)))
-          (when
-            (< n 0)
-            (dict-set! s "hold" (cons "-" (get s "hold")))))))
-    (forth-def-prim!
-      state
-      "#"
-      (fn
-        (s)
-        (let
-          ((hi (forth-pop s)) (lo (forth-pop s)))
-          (let
-            ((d (forth-double-from-cells-u lo hi))
-              (b (get (get s "vars") "base")))
-            (let
-              ((dig (mod d b)) (rest (floor (/ d b))))
-              (let
-                ((ch
-                  (if
-                    (< dig 10)
-                    (char-from-code (+ 48 dig))
-                    (char-from-code (+ 55 dig)))))
-                (dict-set! s "hold" (cons ch (get s "hold")))
-                (forth-double-push-u s rest)))))))
-    (forth-def-prim!
-      state
-      "#S"
-      (fn
-        (s)
-        (forth-pic-S-loop s)))
-    (forth-def-prim!
-      state
-      "#>"
-      (fn
-        (s)
-        (forth-pop s)
-        (forth-pop s)
-        (let
-          ((str-out (forth-join-hold (get s "hold"))))
-          (let
-            ((addr (forth-alloc-bytes! s (len str-out))))
-            (forth-mem-write-string! s addr str-out)
-            (forth-push s addr)
-            (forth-push s (len str-out))))))
-    (forth-def-prim!
-      state
-      "U."
-      (fn
-        (s)
-        (let
-          ((u (forth-to-unsigned (forth-pop s) 32))
-            (b (get (get s "vars") "base")))
-          (forth-emit-str s (str (forth-num-to-string u b) " ")))))
-    (forth-def-prim!
-      state
-      "U.R"
-      (fn
-        (s)
-        (let
-          ((width (forth-pop s))
-            (u (forth-to-unsigned (forth-pop s) 32))
-            (b (get (get s "vars") "base")))
-          (let
-            ((digits (forth-num-to-string u b)))
-            (forth-emit-str
-              s
-              (forth-spaces-str (- width (len digits))))
-            (forth-emit-str s digits)))))
-    (forth-def-prim!
-      state
-      ".R"
-      (fn
-        (s)
-        (let
-          ((width (forth-pop s))
-            (n (forth-pop s))
-            (b (get (get s "vars") "base")))
-          (let
-            ((sign-prefix (if (< n 0) "-" ""))
-              (abs-digits
-                (forth-num-to-string (forth-to-unsigned (abs n) 32) b)))
-            (let
-              ((digits (str sign-prefix abs-digits)))
-              (forth-emit-str
-                s
-                (forth-spaces-str (- width (len digits))))
-              (forth-emit-str s digits))))))
     state))

lib/forth/scoreboard.json

@@ -1,12 +0,0 @@
-{
-  "source": "gerryjackson/forth2012-test-suite src/core.fr",
-  "generated_at": "2026-04-25T04:57:22Z",
-  "chunks_available": 638,
-  "chunks_fed": 638,
-  "total": 638,
-  "pass": 618,
-  "fail": 14,
-  "error": 6,
-  "percent": 96,
-  "note": "completed"
-}

lib/forth/scoreboard.md

@@ -1,28 +0,0 @@
-# Forth Hayes Core scoreboard
-
-| metric            | value |
-| ----------------- | ----: |
-| chunks available  | 638 |
-| chunks fed        | 638 |
-| total             | 638 |
-| pass              | 618 |
-| fail              | 14 |
-| error             | 6 |
-| percent           | 96% |
-
-- **Source**: `gerryjackson/forth2012-test-suite` `src/core.fr`
-- **Generated**: 2026-04-25T04:57:22Z
-- **Note**: completed
-
-A "chunk" is any preprocessed segment ending at a `}T` (every Hayes test
-is one chunk, plus the small declaration blocks between tests).
-The runner catches raised errors at chunk boundaries so one bad chunk
-does not abort the rest. `error` covers chunks that raised; `fail`
-covers tests whose `->` / `}T` comparison mismatched.
-
-### Chunk cap
-
-`conformance.sh` processes the first `$MAX_CHUNKS` chunks (default
-**638**, i.e. the whole Hayes Core file). Lower the cap temporarily
-while iterating on primitives if a regression re-opens an infinite
-loop in later tests.

lib/forth/tests/test-phase3.sx

@@ -1,239 +0,0 @@
-;; Phase 3 — control flow (IF/ELSE/THEN, BEGIN/UNTIL/WHILE/REPEAT/AGAIN,
-;; DO/LOOP, return stack). Grows as each control construct lands.
-
-(define forth-p3-passed 0)
-(define forth-p3-failed 0)
-(define forth-p3-failures (list))
-
-(define
-  forth-p3-assert
-  (fn
-    (label expected actual)
-    (if
-      (= expected actual)
-      (set! forth-p3-passed (+ forth-p3-passed 1))
-      (begin
-        (set! forth-p3-failed (+ forth-p3-failed 1))
-        (set!
-          forth-p3-failures
-          (concat
-            forth-p3-failures
-            (list
-              (str label ": expected " (str expected) " got " (str actual)))))))))
-
-(define
-  forth-p3-check-stack
-  (fn
-    (label src expected)
-    (let ((r (forth-run src))) (forth-p3-assert label expected (nth r 2)))))
-
-(define
-  forth-p3-if-tests
-  (fn
-    ()
-    (forth-p3-check-stack
-      "IF taken (-1)"
-      ": Q -1 IF 10 THEN ; Q"
-      (list 10))
-    (forth-p3-check-stack
-      "IF not taken (0)"
-      ": Q 0 IF 10 THEN ; Q"
-      (list))
-    (forth-p3-check-stack
-      "IF with non-zero truthy"
-      ": Q 42 IF 10 THEN ; Q"
-      (list 10))
-    (forth-p3-check-stack
-      "IF ELSE — true branch"
-      ": Q -1 IF 10 ELSE 20 THEN ; Q"
-      (list 10))
-    (forth-p3-check-stack
-      "IF ELSE — false branch"
-      ": Q 0 IF 10 ELSE 20 THEN ; Q"
-      (list 20))
-    (forth-p3-check-stack
-      "IF consumes flag"
-      ": Q IF 1 ELSE 2 THEN ; 0 Q"
-      (list 2))
-    (forth-p3-check-stack
-      "absolute value via IF"
-      ": ABS2 DUP 0 < IF NEGATE THEN ; -7 ABS2"
-      (list 7))
-    (forth-p3-check-stack
-      "abs leaves positive alone"
-      ": ABS2 DUP 0 < IF NEGATE THEN ; 7 ABS2"
-      (list 7))
-    (forth-p3-check-stack
-      "sign: negative"
-      ": SIGN DUP 0 < IF DROP -1 ELSE DROP 1 THEN ; -3 SIGN"
-      (list -1))
-    (forth-p3-check-stack
-      "sign: positive"
-      ": SIGN DUP 0 < IF DROP -1 ELSE DROP 1 THEN ; 3 SIGN"
-      (list 1))
-    (forth-p3-check-stack
-      "nested IF (both true)"
-      ": Q 1 IF 1 IF 10 ELSE 20 THEN ELSE 30 THEN ; Q"
-      (list 10))
-    (forth-p3-check-stack
-      "nested IF (inner false)"
-      ": Q 1 IF 0 IF 10 ELSE 20 THEN ELSE 30 THEN ; Q"
-      (list 20))
-    (forth-p3-check-stack
-      "nested IF (outer false)"
-      ": Q 0 IF 0 IF 10 ELSE 20 THEN ELSE 30 THEN ; Q"
-      (list 30))
-    (forth-p3-check-stack
-      "IF before other ops"
-      ": Q 1 IF 5 ELSE 6 THEN 2 * ; Q"
-      (list 10))
-    (forth-p3-check-stack
-      "IF in chained def"
-      ": POS? 0 > ;
-       : DOUBLE-IF-POS DUP POS? IF 2 * THEN ;
-       3 DOUBLE-IF-POS"
-      (list 6))
-    (forth-p3-check-stack
-      "empty then branch"
-      ": Q 1 IF THEN 99 ; Q"
-      (list 99))
-    (forth-p3-check-stack
-      "empty else branch"
-      ": Q 0 IF 99 ELSE THEN ; Q"
-      (list))
-    (forth-p3-check-stack
-      "sequential IF blocks"
-      ": Q -1 IF 1 THEN -1 IF 2 THEN ; Q"
-      (list 1 2))))
-
-(define
-  forth-p3-loop-tests
-  (fn
-    ()
-    (forth-p3-check-stack
-      "BEGIN UNTIL (countdown to zero)"
-      ": CD BEGIN 1- DUP 0 = UNTIL ; 3 CD"
-      (list 0))
-    (forth-p3-check-stack
-      "BEGIN UNTIL — single pass (UNTIL true immediately)"
-      ": Q BEGIN -1 UNTIL 42 ; Q"
-      (list 42))
-    (forth-p3-check-stack
-      "BEGIN UNTIL — accumulate sum 1+2+3"
-      ": SUM3 0 3 BEGIN TUCK + SWAP 1- DUP 0 = UNTIL DROP ; SUM3"
-      (list 6))
-    (forth-p3-check-stack
-      "BEGIN WHILE REPEAT — triangular sum 5"
-      ": TRI 0 5 BEGIN DUP 0 > WHILE TUCK + SWAP 1- REPEAT DROP ; TRI"
-      (list 15))
-    (forth-p3-check-stack
-      "BEGIN WHILE REPEAT — zero iterations"
-      ": TRI 0 0 BEGIN DUP 0 > WHILE TUCK + SWAP 1- REPEAT DROP ; TRI"
-      (list 0))
-    (forth-p3-check-stack
-      "BEGIN WHILE REPEAT — one iteration"
-      ": TRI 0 1 BEGIN DUP 0 > WHILE TUCK + SWAP 1- REPEAT DROP ; TRI"
-      (list 1))
-    (forth-p3-check-stack
-      "nested BEGIN UNTIL"
-      ": INNER BEGIN 1- DUP 0 = UNTIL DROP ;
-       : OUTER BEGIN 3 INNER 1- DUP 0 = UNTIL ;
-       2 OUTER"
-      (list 0))
-    (forth-p3-check-stack
-      "BEGIN UNTIL after colon prefix"
-      ": TEN 10 ;
-       : CD TEN BEGIN 1- DUP 0 = UNTIL ;
-       CD"
-      (list 0))
-    (forth-p3-check-stack
-      "WHILE inside IF branch"
-      ": Q 1 IF 0 3 BEGIN DUP 0 > WHILE TUCK + SWAP 1- REPEAT DROP ELSE 99 THEN ; Q"
-      (list 6))))
-
-(define
-  forth-p3-do-tests
-  (fn
-    ()
-    (forth-p3-check-stack
-      "DO LOOP — simple sum 0..4"
-      ": SUM 0 5 0 DO I + LOOP ; SUM"
-      (list 10))
-    (forth-p3-check-stack
-      "DO LOOP — 10..14 sum using I"
-      ": SUM 0 15 10 DO I + LOOP ; SUM"
-      (list 60))
-    (forth-p3-check-stack
-      "DO LOOP — limit = start runs one pass"
-      ": SUM 0 5 5 DO I + LOOP ; SUM"
-      (list 5))
-    (forth-p3-check-stack
-      "DO LOOP — count iterations"
-      ": COUNT 0 4 0 DO 1+ LOOP ; COUNT"
-      (list 4))
-    (forth-p3-check-stack
-      "DO LOOP — nested, I inner / J outer"
-      ": MATRIX 0 3 0 DO 3 0 DO I J + + LOOP LOOP ; MATRIX"
-      (list 18))
-    (forth-p3-check-stack
-      "DO LOOP — I used in arithmetic"
-      ": DBL 0 5 1 DO I 2 * + LOOP ; DBL"
-      (list 20))
-    (forth-p3-check-stack
-      "+LOOP — count by 2"
-      ": Q 0 10 0 DO I + 2 +LOOP ; Q"
-      (list 20))
-    (forth-p3-check-stack
-      "+LOOP — count by 3"
-      ": Q 0 10 0 DO I + 3 +LOOP ; Q"
-      (list 18))
-    (forth-p3-check-stack
-      "+LOOP — negative step"
-      ": Q 0 0 10 DO I + -1 +LOOP ; Q"
-      (list 55))
-    (forth-p3-check-stack
-      "LEAVE — early exit at I=3"
-      ": Q 0 10 0 DO I 3 = IF LEAVE THEN I + LOOP ; Q"
-      (list 3))
-    (forth-p3-check-stack
-      "LEAVE — in nested loop exits only inner"
-      ": Q 0 3 0 DO 5 0 DO I 2 = IF LEAVE THEN I + LOOP LOOP ; Q"
-      (list 3))
-    (forth-p3-check-stack
-      "DO LOOP preserves outer stack"
-      ": Q 99 5 0 DO I + LOOP ; Q"
-      (list 109))
-    (forth-p3-check-stack
-      ">R R>"
-      ": Q 7 >R 11 R> ; Q"
-      (list 11 7))
-    (forth-p3-check-stack
-      ">R R@ R>"
-      ": Q 7 >R R@ R> ; Q"
-      (list 7 7))
-    (forth-p3-check-stack
-      "2>R 2R>"
-      ": Q 1 2 2>R 99 2R> ; Q"
-      (list 99 1 2))
-    (forth-p3-check-stack
-      "2>R 2R@ 2R>"
-      ": Q 3 4 2>R 2R@ 2R> ; Q"
-      (list 3 4 3 4))))
-
-(define
-  forth-p3-run-all
-  (fn
-    ()
-    (set! forth-p3-passed 0)
-    (set! forth-p3-failed 0)
-    (set! forth-p3-failures (list))
-    (forth-p3-if-tests)
-    (forth-p3-loop-tests)
-    (forth-p3-do-tests)
-    (dict
-      "passed"
-      forth-p3-passed
-      "failed"
-      forth-p3-failed
-      "failures"
-      forth-p3-failures)))

lib/forth/tests/test-phase4.sx

@@ -1,268 +0,0 @@
-;; Phase 4 — strings + more Core.
-;; Uses the byte-memory model on state ("mem" dict + "here" cursor).
-
-(define forth-p4-passed 0)
-(define forth-p4-failed 0)
-(define forth-p4-failures (list))
-
-(define
-  forth-p4-assert
-  (fn
-    (label expected actual)
-    (if
-      (= expected actual)
-      (set! forth-p4-passed (+ forth-p4-passed 1))
-      (begin
-        (set! forth-p4-failed (+ forth-p4-failed 1))
-        (set!
-          forth-p4-failures
-          (concat
-            forth-p4-failures
-            (list
-              (str label ": expected " (str expected) " got " (str actual)))))))))
-
-(define
-  forth-p4-check-output
-  (fn
-    (label src expected)
-    (let ((r (forth-run src))) (forth-p4-assert label expected (nth r 1)))))
-
-(define
-  forth-p4-check-stack-size
-  (fn
-    (label src expected-n)
-    (let
-      ((r (forth-run src)))
-      (forth-p4-assert label expected-n (len (nth r 2))))))
-
-(define
-  forth-p4-check-top
-  (fn
-    (label src expected)
-    (let
-      ((r (forth-run src)))
-      (let
-        ((stk (nth r 2)))
-        (forth-p4-assert label expected (nth stk (- (len stk) 1)))))))
-
-(define
-  forth-p4-check-typed
-  (fn
-    (label src expected)
-    (forth-p4-check-output label (str src " TYPE") expected)))
-
-(define
-  forth-p4-string-tests
-  (fn
-    ()
-    (forth-p4-check-typed
-      "S\" + TYPE — hello"
-      "S\" HELLO\""
-      "HELLO")
-    (forth-p4-check-typed
-      "S\" + TYPE — two words"
-      "S\" HELLO WORLD\""
-      "HELLO WORLD")
-    (forth-p4-check-typed
-      "S\" + TYPE — empty"
-      "S\" \""
-      "")
-    (forth-p4-check-typed
-      "S\" + TYPE — single char"
-      "S\" X\""
-      "X")
-    (forth-p4-check-stack-size
-      "S\" pushes (addr len)"
-      "S\" HI\""
-      2)
-    (forth-p4-check-top
-      "S\" length is correct"
-      "S\" HELLO\""
-      5)
-    (forth-p4-check-output
-      ".\" prints at interpret time"
-      ".\" HELLO\""
-      "HELLO")
-    (forth-p4-check-output
-      ".\" in colon def"
-      ": GREET .\" HI \" ; GREET GREET"
-      "HI HI ")))
-
-(define
-  forth-p4-count-tests
-  (fn
-    ()
-    (forth-p4-check-typed
-      "C\" + COUNT + TYPE"
-      "C\" ABC\" COUNT"
-      "ABC")
-    (forth-p4-check-typed
-      "C\" then COUNT leaves right len"
-      "C\" HI THERE\" COUNT"
-      "HI THERE")))
-
-(define
-  forth-p4-fill-tests
-  (fn
-    ()
-    (forth-p4-check-typed
-      "FILL overwrites prefix bytes"
-      "S\" ABCDE\" 2DUP DROP 3 65 FILL"
-      "AAADE")
-    (forth-p4-check-typed
-      "BLANK sets spaces"
-      "S\" XYZAB\" 2DUP DROP 3 BLANK"
-      "   AB")))
-
-(define
-  forth-p4-cmove-tests
-  (fn
-    ()
-    (forth-p4-check-output
-      "CMOVE copies HELLO forward"
-      ": MKH 72 0 C! 69 1 C! 76 2 C! 76 3 C! 79 4 C! ;
-       : T MKH 0 10 5 CMOVE 10 5 TYPE ; T"
-      "HELLO")
-    (forth-p4-check-output
-      "CMOVE> copies overlapping backward"
-      ": MKA 65 0 C! 66 1 C! 67 2 C! ;
-       : T MKA 0 1 2 CMOVE> 0 3 TYPE ; T"
-      "AAB")
-    (forth-p4-check-output
-      "MOVE picks direction for overlap"
-      ": MKA 65 0 C! 66 1 C! 67 2 C! ;
-       : T MKA 0 1 2 MOVE 0 3 TYPE ; T"
-      "AAB")))
-
-(define
-  forth-p4-charplus-tests
-  (fn
-    ()
-    (forth-p4-check-top
-      "CHAR+ increments"
-      "5 CHAR+"
-      6)))
-
-(define
-  forth-p4-char-tests
-  (fn
-    ()
-    (forth-p4-check-top "CHAR A -> 65" "CHAR A" 65)
-    (forth-p4-check-top "CHAR x -> 120" "CHAR x" 120)
-    (forth-p4-check-top "CHAR takes only first char" "CHAR HELLO" 72)
-    (forth-p4-check-top
-      "[CHAR] compiles literal"
-      ": AA [CHAR] A ; AA"
-      65)
-    (forth-p4-check-top
-      "[CHAR] reads past IMMEDIATE"
-      ": ZZ [CHAR] Z ; ZZ"
-      90)
-    (forth-p4-check-stack-size
-      "[CHAR] doesn't leak at compile time"
-      ": FOO [CHAR] A ; "
-      0)))
-
-(define
-  forth-p4-key-accept-tests
-  (fn
-    ()
-    (let
-      ((r (forth-run "1000 2 ACCEPT")))
-      (let ((stk (nth r 2))) (forth-p4-assert "ACCEPT empty buf -> 0" (list 0) stk)))))
-
-(define
-  forth-p4-shift-tests
-  (fn
-    ()
-    (forth-p4-check-top "1 0 LSHIFT" "1 0 LSHIFT" 1)
-    (forth-p4-check-top "1 1 LSHIFT" "1 1 LSHIFT" 2)
-    (forth-p4-check-top "1 2 LSHIFT" "1 2 LSHIFT" 4)
-    (forth-p4-check-top "1 15 LSHIFT" "1 15 LSHIFT" 32768)
-    (forth-p4-check-top "1 31 LSHIFT" "1 31 LSHIFT" -2147483648)
-    (forth-p4-check-top "1 0 RSHIFT" "1 0 RSHIFT" 1)
-    (forth-p4-check-top "1 1 RSHIFT" "1 1 RSHIFT" 0)
-    (forth-p4-check-top "2 1 RSHIFT" "2 1 RSHIFT" 1)
-    (forth-p4-check-top "4 2 RSHIFT" "4 2 RSHIFT" 1)
-    (forth-p4-check-top "-1 1 RSHIFT (logical, not arithmetic)" "-1 1 RSHIFT" 2147483647)
-    (forth-p4-check-top "MSB via 1S 1 RSHIFT INVERT" "0 INVERT 1 RSHIFT INVERT" -2147483648)))
-
-(define
-  forth-p4-sp-tests
-  (fn
-    ()
-    (forth-p4-check-top "SP@ returns depth (0)" "SP@" 0)
-    (forth-p4-check-top
-      "SP@ after pushes"
-      "1 2 3 SP@ SWAP DROP SWAP DROP SWAP DROP"
-      3)
-    (forth-p4-check-stack-size
-      "SP! truncates"
-      "1 2 3 4 5 2 SP!"
-      2)
-    (forth-p4-check-top
-      "SP! leaves base items intact"
-      "1 2 3 4 5 2 SP!"
-      2)))
-
-(define
-  forth-p4-base-tests
-  (fn
-    ()
-    (forth-p4-check-top
-      "BASE default is 10"
-      "BASE @"
-      10)
-    (forth-p4-check-top
-      "HEX switches base to 16"
-      "HEX BASE @"
-      16)
-    (forth-p4-check-top
-      "DECIMAL resets to 10"
-      "HEX DECIMAL BASE @"
-      10)
-    (forth-p4-check-top
-      "HEX parses 10 as 16"
-      "HEX 10"
-      16)
-    (forth-p4-check-top
-      "HEX parses FF as 255"
-      "HEX FF"
-      255)
-    (forth-p4-check-top
-      "DECIMAL parses 10 as 10"
-      "HEX DECIMAL 10"
-      10)
-    (forth-p4-check-top
-      "OCTAL parses 17 as 15"
-      "OCTAL 17"
-      15)
-    (forth-p4-check-top
-      "BASE @ ; 16 BASE ! ; BASE @"
-      "BASE @ 16 BASE ! BASE @ SWAP DROP"
-      16)))
-
-(define
-  forth-p4-run-all
-  (fn
-    ()
-    (set! forth-p4-passed 0)
-    (set! forth-p4-failed 0)
-    (set! forth-p4-failures (list))
-    (forth-p4-string-tests)
-    (forth-p4-count-tests)
-    (forth-p4-fill-tests)
-    (forth-p4-cmove-tests)
-    (forth-p4-charplus-tests)
-    (forth-p4-char-tests)
-    (forth-p4-key-accept-tests)
-    (forth-p4-base-tests)
-    (forth-p4-shift-tests)
-    (forth-p4-sp-tests)
-    (dict
-      "passed"
-      forth-p4-passed
-      "failed"
-      forth-p4-failed
-      "failures"
-      forth-p4-failures)))

lib/forth/tests/test-phase5.sx

@@ -1,333 +0,0 @@
-;; Phase 5 — Core Extension + memory primitives.
-
-(define forth-p5-passed 0)
-(define forth-p5-failed 0)
-(define forth-p5-failures (list))
-
-(define
-  forth-p5-assert
-  (fn
-    (label expected actual)
-    (if
-      (= expected actual)
-      (set! forth-p5-passed (+ forth-p5-passed 1))
-      (begin
-        (set! forth-p5-failed (+ forth-p5-failed 1))
-        (set!
-          forth-p5-failures
-          (concat
-            forth-p5-failures
-            (list
-              (str label ": expected " (str expected) " got " (str actual)))))))))
-
-(define
-  forth-p5-check-stack
-  (fn
-    (label src expected)
-    (let ((r (forth-run src))) (forth-p5-assert label expected (nth r 2)))))
-
-(define
-  forth-p5-check-top
-  (fn
-    (label src expected)
-    (let
-      ((r (forth-run src)))
-      (let
-        ((stk (nth r 2)))
-        (forth-p5-assert label expected (nth stk (- (len stk) 1)))))))
-
-(define
-  forth-p5-create-tests
-  (fn
-    ()
-    (forth-p5-check-top
-      "CREATE pushes HERE-at-creation"
-      "HERE CREATE FOO FOO ="
-      -1)
-    (forth-p5-check-top
-      "CREATE + ALLOT advances HERE"
-      "HERE 5 ALLOT HERE SWAP -"
-      5)
-    (forth-p5-check-top
-      "CREATE + , stores cell"
-      "CREATE FOO 42 , FOO @"
-      42)
-    (forth-p5-check-stack
-      "CREATE multiple ,"
-      "CREATE TBL 1 , 2 , 3 , TBL @ TBL CELL+ @ TBL CELL+ CELL+ @"
-      (list 1 2 3))
-    (forth-p5-check-top
-      "C, stores byte"
-      "CREATE B 65 C, 66 C, B C@"
-      65)))
-
-(define
-  forth-p5-unsigned-tests
-  (fn
-    ()
-    (forth-p5-check-top "1 2 U<" "1 2 U<" -1)
-    (forth-p5-check-top "2 1 U<" "2 1 U<" 0)
-    (forth-p5-check-top "0 1 U<" "0 1 U<" -1)
-    (forth-p5-check-top "-1 1 U< (since -1 unsigned is huge)" "-1 1 U<" 0)
-    (forth-p5-check-top "1 -1 U<" "1 -1 U<" -1)
-    (forth-p5-check-top "1 2 U>" "1 2 U>" 0)
-    (forth-p5-check-top "-1 1 U>" "-1 1 U>" -1)))
-
-(define
-  forth-p5-2bang-tests
-  (fn
-    ()
-    (forth-p5-check-stack
-      "2! / 2@"
-      "CREATE X 0 , 0 , 11 22 X 2! X 2@"
-      (list 11 22))))
-
-(define
-  forth-p5-mixed-tests
-  (fn
-    ()
-    (forth-p5-check-stack "S>D positive" "5 S>D" (list 5 0))
-    (forth-p5-check-stack "S>D negative" "-5 S>D" (list -5 -1))
-    (forth-p5-check-stack "S>D zero" "0 S>D" (list 0 0))
-    (forth-p5-check-top "D>S keeps low" "5 0 D>S" 5)
-    (forth-p5-check-stack "M* small positive" "3 4 M*" (list 12 0))
-    (forth-p5-check-stack "M* negative" "-3 4 M*" (list -12 -1))
-    (forth-p5-check-stack
-      "M* negative * negative"
-      "-3 -4 M*"
-      (list 12 0))
-    (forth-p5-check-stack "UM* small" "3 4 UM*" (list 12 0))
-    (forth-p5-check-stack
-      "UM/MOD: 100 0 / 5"
-      "100 0 5 UM/MOD"
-      (list 0 20))
-    (forth-p5-check-stack
-      "FM/MOD: -7 / 2 floored"
-      "-7 -1 2 FM/MOD"
-      (list 1 -4))
-    (forth-p5-check-stack
-      "SM/REM: -7 / 2 truncated"
-      "-7 -1 2 SM/REM"
-      (list -1 -3))
-    (forth-p5-check-top "*/ truncated" "7 11 13 */" 5)
-    (forth-p5-check-stack "*/MOD" "7 11 13 */MOD" (list 12 5))))
-
-(define
-  forth-p5-double-tests
-  (fn
-    ()
-    (forth-p5-check-stack "D+ small" "5 0 7 0 D+" (list 12 0))
-    (forth-p5-check-stack "D+ negative" "-5 -1 -3 -1 D+" (list -8 -1))
-    (forth-p5-check-stack "D- small" "10 0 3 0 D-" (list 7 0))
-    (forth-p5-check-stack "DNEGATE positive" "5 0 DNEGATE" (list -5 -1))
-    (forth-p5-check-stack "DNEGATE negative" "-5 -1 DNEGATE" (list 5 0))
-    (forth-p5-check-stack "DABS negative" "-7 -1 DABS" (list 7 0))
-    (forth-p5-check-stack "DABS positive" "7 0 DABS" (list 7 0))
-    (forth-p5-check-top "D= equal" "5 0 5 0 D=" -1)
-    (forth-p5-check-top "D= unequal lo" "5 0 7 0 D=" 0)
-    (forth-p5-check-top "D= unequal hi" "5 0 5 1 D=" 0)
-    (forth-p5-check-top "D< lt" "5 0 7 0 D<" -1)
-    (forth-p5-check-top "D< gt" "7 0 5 0 D<" 0)
-    (forth-p5-check-top "D0= zero" "0 0 D0=" -1)
-    (forth-p5-check-top "D0= nonzero" "5 0 D0=" 0)
-    (forth-p5-check-top "D0< neg" "-5 -1 D0<" -1)
-    (forth-p5-check-top "D0< pos" "5 0 D0<" 0)
-    (forth-p5-check-stack "DMAX" "5 0 7 0 DMAX" (list 7 0))
-    (forth-p5-check-stack "DMIN" "5 0 7 0 DMIN" (list 5 0))))
-
-(define
-  forth-p5-format-tests
-  (fn
-    ()
-    (forth-p4-check-output-passthrough
-      "U. prints with trailing space"
-      "123 U."
-      "123 ")
-    (forth-p4-check-output-passthrough
-      "<# #S #> TYPE — decimal"
-      "123 0 <# #S #> TYPE"
-      "123")
-    (forth-p4-check-output-passthrough
-      "<# #S #> TYPE — hex"
-      "255 HEX 0 <# #S #> TYPE"
-      "FF")
-    (forth-p4-check-output-passthrough
-      "<# # # #> partial"
-      "1234 0 <# # # #> TYPE"
-      "34")
-    (forth-p4-check-output-passthrough
-      "SIGN holds minus"
-      "<# -1 SIGN -1 SIGN 0 0 #> TYPE"
-      "--")
-    (forth-p4-check-output-passthrough
-      ".R right-justifies"
-      "42 5 .R"
-      "   42")
-    (forth-p4-check-output-passthrough
-      ".R negative"
-      "-42 5 .R"
-      "  -42")
-    (forth-p4-check-output-passthrough
-      "U.R"
-      "42 5 U.R"
-      "   42")
-    (forth-p4-check-output-passthrough
-      "HOLD char"
-      "<# 0 0 65 HOLD #> TYPE"
-      "A")))
-
-(define
-  forth-p5-dict-tests
-  (fn
-    ()
-    (forth-p5-check-top
-      "EXECUTE via tick"
-      ": INC 1+ ; 9 ' INC EXECUTE"
-      10)
-    (forth-p5-check-top
-      "['] inside def"
-      ": DUB 2* ; : APPLY ['] DUB EXECUTE ; 5 APPLY"
-      10)
-    (forth-p5-check-top
-      ">BODY of CREATE word"
-      "CREATE C 99 , ' C >BODY @"
-      99)
-    (forth-p5-check-stack
-      "WORD parses next token to counted-string"
-      ": A 5 ; BL WORD A COUNT TYPE"
-      (list))
-    (forth-p5-check-top
-      "FIND on known word -> non-zero"
-      ": A 5 ; BL WORD A FIND SWAP DROP"
-      -1)))
-
-(define
-  forth-p5-state-tests
-  (fn
-    ()
-    (forth-p5-check-top
-      "STATE @ in interpret mode"
-      "STATE @"
-      0)
-    (forth-p5-check-top
-      "STATE @ via IMMEDIATE inside compile"
-      ": GT8 STATE @ ; IMMEDIATE : T GT8 LITERAL ; T"
-      -1)
-    (forth-p5-check-top
-      "[ ] LITERAL captures"
-      ": SEVEN [ 7 ] LITERAL ; SEVEN"
-      7)
-    (forth-p5-check-top
-      "EVALUATE in interpret mode"
-      "S\" 5 7 +\" EVALUATE"
-      12)
-    (forth-p5-check-top
-      "EVALUATE inside def"
-      ": A 100 ; : B S\" A\" EVALUATE ; B"
-      100)))
-
-(define
-  forth-p5-misc-tests
-  (fn
-    ()
-    (forth-p5-check-top "WITHIN inclusive lower" "3 2 10 WITHIN" -1)
-    (forth-p5-check-top "WITHIN exclusive upper" "10 2 10 WITHIN" 0)
-    (forth-p5-check-top "WITHIN below range" "1 2 10 WITHIN" 0)
-    (forth-p5-check-top "WITHIN at lower" "2 2 10 WITHIN" -1)
-    (forth-p5-check-top
-      "EXIT leaves colon-def early"
-      ": F 5 EXIT 99 ; F"
-      5)
-    (forth-p5-check-stack
-      "EXIT in IF branch"
-      ": F 5 0 IF DROP 99 EXIT THEN ; F"
-      (list 5))
-    (forth-p5-check-top
-      "UNLOOP + EXIT in DO"
-      ": SUM 0 10 0 DO I 5 = IF I UNLOOP EXIT THEN LOOP ; SUM"
-      5)))
-
-(define
-  forth-p5-fa-tests
-  (fn
-    ()
-    (forth-p5-check-top
-      "R/O R/W W/O constants"
-      "R/O R/W W/O + +"
-      3)
-    (forth-p5-check-top
-      "CREATE-FILE returns ior=0"
-      "CREATE PAD 50 ALLOT PAD S\" /tmp/test.fxf\" ROT SWAP CMOVE S\" /tmp/test.fxf\" R/W CREATE-FILE SWAP DROP"
-      0)
-    (forth-p5-check-top
-      "WRITE-FILE then CLOSE"
-      "S\" /tmp/t2.fxf\" R/W CREATE-FILE DROP >R S\" HI\" R@ WRITE-FILE R> CLOSE-FILE +"
-      0)
-    (forth-p5-check-top
-      "OPEN-FILE on unknown path returns ior!=0"
-      "S\" /tmp/nope.fxf\" R/O OPEN-FILE SWAP DROP 0 ="
-      0)))
-
-(define
-  forth-p5-string-tests
-  (fn
-    ()
-    (forth-p5-check-top "COMPARE equal" "S\" ABC\" S\" ABC\" COMPARE" 0)
-    (forth-p5-check-top "COMPARE less" "S\" ABC\" S\" ABD\" COMPARE" -1)
-    (forth-p5-check-top "COMPARE greater" "S\" ABD\" S\" ABC\" COMPARE" 1)
-    (forth-p5-check-top
-      "COMPARE prefix less"
-      "S\" AB\" S\" ABC\" COMPARE"
-      -1)
-    (forth-p5-check-top
-      "COMPARE prefix greater"
-      "S\" ABC\" S\" AB\" COMPARE"
-      1)
-    (forth-p5-check-top
-      "SEARCH found flag"
-      "S\" HELLO WORLD\" S\" WORLD\" SEARCH"
-      -1)
-    (forth-p5-check-top
-      "SEARCH not found flag"
-      "S\" HELLO\" S\" XYZ\" SEARCH"
-      0)
-    (forth-p5-check-top
-      "SEARCH empty needle flag"
-      "S\" HELLO\" S\" \" SEARCH"
-      -1)
-    (forth-p5-check-top
-      "SLITERAL via [ S\" ... \" ]"
-      ": A [ S\" HI\" ] SLITERAL ; A SWAP DROP"
-      2)))
-
-(define
-  forth-p4-check-output-passthrough
-  (fn
-    (label src expected)
-    (let ((r (forth-run src))) (forth-p5-assert label expected (nth r 1)))))
-
-(define
-  forth-p5-run-all
-  (fn
-    ()
-    (set! forth-p5-passed 0)
-    (set! forth-p5-failed 0)
-    (set! forth-p5-failures (list))
-    (forth-p5-create-tests)
-    (forth-p5-unsigned-tests)
-    (forth-p5-2bang-tests)
-    (forth-p5-mixed-tests)
-    (forth-p5-double-tests)
-    (forth-p5-format-tests)
-    (forth-p5-dict-tests)
-    (forth-p5-state-tests)
-    (forth-p5-misc-tests)
-    (forth-p5-fa-tests)
-    (forth-p5-string-tests)
-    (dict
-      "passed"
-      forth-p5-passed
-      "failed"
-      forth-p5-failed
-      "failures"
-      forth-p5-failures)))

lib/js/lexer.sx

@@ -94,7 +94,7 @@
   (fn
     (src)
     (let
-      ((tokens (list)) (pos 0) (src-len (len src)))
+      ((tokens (list)) (pos 0) (src-len (len src)) (nl-before false))
       (define
         js-peek
         (fn
@@ -109,11 +109,7 @@
           (let
             ((sl (len s)))
             (and (<= (+ pos sl) src-len) (= (slice src pos (+ pos sl)) s)))))
-      (define
+      (define js-emit! (fn (type value start) (append! tokens {:pos start :value value :type type :nl nl-before})))
-        js-emit!
-        (fn
-          (type value start)
-          (append! tokens (js-make-token type value start))))
       (define
         skip-line-comment!
         (fn
@@ -136,7 +132,13 @@
           ()
           (cond
             ((>= pos src-len) nil)
-            ((js-ws? (cur)) (do (advance! 1) (skip-ws!)))
+            ((js-ws? (cur))
+              (do
+                (when
+                  (or (= (cur) "\n") (= (cur) "\r"))
+                  (set! nl-before true))
+                (advance! 1)
+                (skip-ws!)))
             ((and (= (cur) "/") (< (+ pos 1) src-len) (= (js-peek 1) "/"))
               (do (advance! 2) (skip-line-comment!) (skip-ws!)))
             ((and (= (cur) "/") (< (+ pos 1) src-len) (= (js-peek 1) "*"))
@@ -568,6 +570,7 @@
         (fn
           ()
           (do
+            (set! nl-before false)
             (skip-ws!)
             (when
               (< pos src-len)

lib/js/parser.sx

@@ -835,6 +835,12 @@
   jp-eat-semi
   (fn (st) (if (jp-at? st "punct" ";") (do (jp-advance! st) nil) nil)))
 
+(define
+  jp-token-nl?
+  (fn
+    (st)
+    (let ((tok (jp-peek st))) (if tok (= (get tok :nl) true) false))))
+
 (define
   jp-parse-vardecl
   (fn
@@ -1166,6 +1172,7 @@
         (or
           (jp-at? st "punct" ";")
           (jp-at? st "punct" "}")
+          (jp-token-nl? st)
           (jp-at? st "eof" nil))
         (do (jp-eat-semi st) (list (quote js-return) nil))
         (let

lib/js/runtime.sx

@@ -904,6 +904,36 @@
       ((= v false) 0)
       ((= (type-of v) "number") v)
       ((= (type-of v) "string") (js-string-to-number v))
+      ((= (type-of v) "dict")
+        (cond
+          ((contains? (keys v) "__js_number_value__")
+            (get v "__js_number_value__"))
+          ((contains? (keys v) "__js_boolean_value__")
+            (if (get v "__js_boolean_value__") 1 0))
+          ((contains? (keys v) "__js_string_value__")
+            (js-string-to-number (get v "__js_string_value__")))
+          (else
+            (let
+              ((valueof-fn (js-get-prop v "valueOf")))
+              (if
+                (= (type-of valueof-fn) "lambda")
+                (let
+                  ((result (js-call-with-this v valueof-fn ())))
+                  (if
+                    (not (= (type-of result) "dict"))
+                    (js-to-number result)
+                    (let
+                      ((tostr-fn (js-get-prop v "toString")))
+                      (if
+                        (= (type-of tostr-fn) "lambda")
+                        (let
+                          ((result2 (js-call-with-this v tostr-fn ())))
+                          (if
+                            (not (= (type-of result2) "dict"))
+                            (js-to-number result2)
+                            (js-nan-value)))
+                        (js-nan-value)))))
+                (js-nan-value))))))
       (else 0))))
 
 (define
@@ -1169,7 +1199,39 @@
       ((= v false) "false")
       ((= (type-of v) "string") v)
       ((= (type-of v) "number") (js-number-to-string v))
-      (else (str v)))))
+      (else
+        (if
+          (= (type-of v) "dict")
+          (cond
+            ((contains? (keys v) "__js_string_value__")
+              (get v "__js_string_value__"))
+            ((contains? (keys v) "__js_number_value__")
+              (js-number-to-string (get v "__js_number_value__")))
+            ((contains? (keys v) "__js_boolean_value__")
+              (if (get v "__js_boolean_value__") "true" "false"))
+            (else
+              (let
+                ((tostr-fn (js-get-prop v "toString")))
+                (if
+                  (= (type-of tostr-fn) "lambda")
+                  (let
+                    ((result (js-call-with-this v tostr-fn ())))
+                    (if
+                      (= (type-of result) "dict")
+                      (let
+                        ((valueof-fn (js-get-prop v "valueOf")))
+                        (if
+                          (= (type-of valueof-fn) "lambda")
+                          (let
+                            ((result2 (js-call-with-this v valueof-fn ())))
+                            (if
+                              (= (type-of result2) "dict")
+                              "[object Object]"
+                              (js-to-string result2)))
+                          "[object Object]"))
+                      (js-to-string result)))
+                  "[object Object]"))))
+          (str v))))))
 
 (define
   js-template-concat
@@ -1187,6 +1249,79 @@
         (+ i 1)
         (str acc (js-to-string (nth parts i)))))))
 
+(define
+  js-big-int-str-loop
+  (fn
+    (n acc)
+    (if
+      (< n 1)
+      (if (= acc "") "0" acc)
+      (let
+        ((d (floor (- n (* 10 (floor (/ n 10)))))))
+        (js-big-int-str-loop
+          (floor (/ n 10))
+          (str (js-string-slice "0123456789" d (+ d 1)) acc))))))
+
+(define
+  js-find-decimal-k
+  (fn
+    (n k)
+    (if
+      (> k 17)
+      17
+      (let
+        ((big-int (round (* n (js-pow-int 10 k)))))
+        (if
+          (= (/ big-int (js-pow-int 10 k)) n)
+          k
+          (js-find-decimal-k n (+ k 1)))))))
+
+(define
+  js-format-decimal-digits
+  (fn
+    (digits k)
+    (if
+      (= k 0)
+      digits
+      (let
+        ((dlen (len digits)))
+        (if
+          (> dlen k)
+          (str
+            (js-string-slice digits 0 (- dlen k))
+            "."
+            (js-string-slice digits (- dlen k) dlen))
+          (if
+            (= dlen k)
+            (str "0." digits)
+            (str "0." (js-string-repeat "0" (- k dlen)) digits)))))))
+
+(define
+  js-expand-sci-notation
+  (fn
+    (mant exp-n)
+    (let
+      ((di (js-string-index-of mant "." 0)))
+      (let
+        ((int-part (if (< di 0) mant (js-string-slice mant 0 di)))
+          (frac-part
+            (if (< di 0) "" (js-string-slice mant (+ di 1) (len mant)))))
+        (let
+          ((all-digits (str int-part frac-part))
+            (frac-len (if (< di 0) 0 (- (- (len mant) di) 1))))
+          (if
+            (>= exp-n 0)
+            (if
+              (>= exp-n frac-len)
+              (str all-digits (js-string-repeat "0" (- exp-n frac-len)))
+              (let
+                ((dot-pos (+ (len int-part) exp-n)))
+                (str
+                  (js-string-slice all-digits 0 dot-pos)
+                  "."
+                  (js-string-slice all-digits dot-pos (len all-digits)))))
+            (str "0." (js-string-repeat "0" (- (- 0 exp-n) 1)) all-digits)))))))
+
 (define
   js-number-to-string
   (fn
@@ -1195,7 +1330,16 @@
       ((js-number-is-nan n) "NaN")
       ((= n (js-infinity-value)) "Infinity")
       ((= n (- 0 (js-infinity-value))) "-Infinity")
-      (else (js-normalize-num-str (str n))))))
+      (else
+        (let
+          ((pos-n (if (< n 0) (- 0 n) n)))
+          (let
+            ((s0 (js-normalize-num-str (str pos-n))))
+            (let
+              ((n2 (js-to-number s0)))
+              (let
+                ((precise (if (= n2 pos-n) (let ((ei (js-string-index-of s0 "e" 0))) (if (< ei 0) s0 (let ((exp-n (js-to-number (js-string-slice s0 (+ ei 1) (len s0))))) (if (and (>= exp-n -6) (<= exp-n 20)) (js-expand-sci-notation (js-string-slice s0 0 ei) exp-n) (if (>= exp-n 0) (str (js-string-slice s0 0 (+ ei 1)) "+" (str exp-n)) s0))))) (if (and (>= pos-n 1e-06) (< pos-n 1e+21)) (let ((k (js-find-decimal-k pos-n 0))) (let ((big-int (round (* pos-n (js-pow-int 10 k))))) (js-format-decimal-digits (js-big-int-str-loop big-int "") k))) (let ((ei (js-string-index-of s0 "e" 0))) (if (< ei 0) s0 (let ((exp-n (js-to-number (js-string-slice s0 (+ ei 1) (len s0))))) (if (>= exp-n 0) (str (js-string-slice s0 0 (+ ei 1)) "+" (str exp-n)) s0))))))))
+                (if (< n 0) (str "-" precise) precise)))))))))
 
 (define
   js-normalize-num-str
@@ -1259,6 +1403,15 @@
 
 (define js-mod (fn (a b) (mod (js-to-number a) (js-to-number b))))
 
+(define
+  js-unsigned-rshift
+  (fn
+    (l r)
+    (let
+      ((lu32 (modulo (js-math-trunc (js-to-number l)) 4294967296))
+        (shift (modulo (js-math-trunc (js-to-number r)) 32)))
+      (floor (/ lu32 (js-math-pow 2 shift))))))
+
 (define js-pow (fn (a b) (pow (js-to-number a) (js-to-number b))))
 
 (define js-neg (fn (a) (- 0 (js-to-number a))))
@@ -1296,6 +1449,10 @@
         (= (js-to-number a) b))
       ((= (type-of a) "boolean") (js-loose-eq (js-to-number a) b))
       ((= (type-of b) "boolean") (js-loose-eq a (js-to-number b)))
+      ((and (dict? a) (contains? (keys a) "__js_string_value__"))
+        (js-loose-eq (get a "__js_string_value__") b))
+      ((and (dict? b) (contains? (keys b) "__js_string_value__"))
+        (js-loose-eq a (get b "__js_string_value__")))
       (else false))))
 
 (define js-loose-neq (fn (a b) (not (js-loose-eq a b))))
@@ -1897,13 +2054,21 @@
         (fn
           (i)
           (let
-            ((idx (js-num-to-int i)))
+            ((idx (js-num-to-int (js-to-number i))))
             (if
-              (and (>= idx 0) (< idx (len s)))
+              (and (>= idx 0) (< idx (unicode-len s)))
-              (char-code (char-at s idx))
+              (unicode-char-code-at s idx)
-              0))))
+              (js-nan-value)))))
       ((= name "indexOf")
-        (fn (needle) (js-string-index-of s (js-to-string needle) 0)))
+        (fn
+          (&rest args)
+          (if
+            (empty? args)
+            -1
+            (js-string-index-of
+              s
+              (js-to-string (nth args 0))
+              (if (< (len args) 2) 0 (max 0 (js-num-to-int (nth args 1))))))))
       ((= name "slice")
         (fn
           (&rest args)
@@ -1927,7 +2092,16 @@
               (js-string-slice s lo (min hi (len s)))))))
       ((= name "toUpperCase") (fn () (js-upper-case s)))
       ((= name "toLowerCase") (fn () (js-lower-case s)))
-      ((= name "split") (fn (sep) (js-string-split s (js-to-string sep))))
+      ((= name "split")
+        (fn
+          (&rest args)
+          (let
+            ((sep (if (= (len args) 0) :js-undefined (nth args 0)))
+              (limit
+                (if (< (len args) 2) -1 (js-num-to-int (nth args 1)))))
+            (let
+              ((result (js-string-split s (js-to-string sep))))
+              (if (< limit 0) result (js-list-take result limit))))))
       ((= name "concat")
         (fn (&rest args) (js-string-concat-loop s args 0)))
       ((= name "includes")
@@ -2042,6 +2216,17 @@
                     (= idx -1)
                     nil
                     (let ((res (list))) (append! res needle) res))))))))
+      ((= name "matchAll")
+        (fn
+          (&rest args)
+          (if
+            (empty? args)
+            (list)
+            (let
+              ((needle (js-to-string (nth args 0))))
+              (let
+                ((loop (fn (start acc) (let ((idx (js-string-index-of s needle start))) (if (= idx -1) acc (let ((m (list))) (begin (append! m needle) (dict-set! m "index" idx) (loop (+ idx (max 1 (len needle))) (begin (append! acc m) acc)))))))))
+                (loop 0 (list)))))))
       ((= name "at")
         (fn
           (i)
@@ -2068,7 +2253,14 @@
             -1
             (let
               ((needle (js-to-string (nth args 0))))
-              (js-string-last-index-of s needle (- (len s) (len needle)))))))
+              (let
+                ((default-start (- (len s) (len needle)))
+                  (from
+                    (if (< (len args) 2) -1 (js-num-to-int (nth args 1)))))
+                (js-string-last-index-of
+                  s
+                  needle
+                  (if (< from 0) default-start (min from default-start))))))))
       ((= name "localeCompare")
         (fn
           (&rest args)
@@ -2166,6 +2358,15 @@
       ((not (= (char-at s (+ si ni)) (char-at needle ni))) false)
       (else (js-string-matches? s needle si (+ ni 1))))))
 
+(define
+  js-list-take
+  (fn
+    (lst n)
+    (if
+      (or (<= n 0) (empty? lst))
+      (list)
+      (cons (first lst) (js-list-take (rest lst) (- n 1))))))
+
 (define
   js-string-split
   (fn
@@ -2265,7 +2466,7 @@
             (else js-undefined)))
         ((= (type-of obj) "string")
           (cond
-            ((= key "length") (len obj))
+            ((= key "length") (unicode-len obj))
             ((= (type-of key) "number")
               (if
                 (and (>= key 0) (< key (len obj)))
@@ -2306,7 +2507,13 @@
               (js-string-method obj "toLocaleUpperCase"))
             ((= key "isWellFormed") (js-string-method obj "isWellFormed"))
             ((= key "toWellFormed") (js-string-method obj "toWellFormed"))
-            (else js-undefined)))
+            (else
+              (let
+                ((proto (get String "prototype")))
+                (if
+                  (and (dict? proto) (contains? (keys proto) key))
+                  (get proto key)
+                  js-undefined)))))
         ((= (type-of obj) "dict")
           (js-dict-get-walk obj (js-to-string key)))
         ((and (= obj Promise) (dict-has? __js_promise_statics__ (js-to-string key)))
@@ -2480,7 +2687,49 @@
         ((n (js-to-number (first args))))
         (js-math-hypot-loop (rest args) (+ acc (* n n)))))))
 
-(define Math {:random js-math-random :trunc js-math-trunc :LN10 2.30259 :SQRT1_2 0.707107 :floor js-math-floor :PI 3.14159 :sqrt js-math-sqrt :hypot js-math-hypot :LOG2E 1.4427 :round js-math-round :ceil js-math-ceil :abs js-math-abs :pow js-math-pow :max js-math-max :LOG10E 0.434294 :SQRT2 1.41421 :cbrt js-math-cbrt :min js-math-min :sign js-math-sign :E 2.71828 :LN2 0.693147})
+(begin
+  (define js-math-sin (fn (x) (sin (js-to-number x))))
+  (define js-math-cos (fn (x) (cos (js-to-number x))))
+  (define js-math-tan (fn (x) (tan (js-to-number x))))
+  (define js-math-asin (fn (x) (asin (js-to-number x))))
+  (define js-math-acos (fn (x) (acos (js-to-number x))))
+  (define js-math-atan (fn (x) (atan (js-to-number x))))
+  (define
+    js-math-atan2
+    (fn (y x) (atan2 (js-to-number y) (js-to-number x))))
+  (define js-math-sinh (fn (x) (sinh (js-to-number x))))
+  (define js-math-cosh (fn (x) (cosh (js-to-number x))))
+  (define js-math-tanh (fn (x) (tanh (js-to-number x))))
+  (define js-math-asinh (fn (x) (asinh (js-to-number x))))
+  (define js-math-acosh (fn (x) (acosh (js-to-number x))))
+  (define js-math-atanh (fn (x) (atanh (js-to-number x))))
+  (define js-math-exp (fn (x) (exp (js-to-number x))))
+  (define js-math-log (fn (x) (log (js-to-number x))))
+  (define js-math-log2 (fn (x) (log2 (js-to-number x))))
+  (define js-math-log10 (fn (x) (log10 (js-to-number x))))
+  (define js-math-expm1 (fn (x) (expm1 (js-to-number x))))
+  (define js-math-log1p (fn (x) (log1p (js-to-number x))))
+  (define
+    js-math-clz32
+    (fn
+      (&rest args)
+      (let
+        ((x (if (empty? args) 0 (js-to-number (nth args 0)))))
+        (let
+          ((n (modulo (floor x) 4294967296)))
+          (if (= n 0) 32 (- 31 (floor (log2 n))))))))
+  (define
+    js-math-imul
+    (fn
+      (a b)
+      (let
+        ((a32 (modulo (floor (js-to-number a)) 4294967296))
+          (b32 (modulo (floor (js-to-number b)) 4294967296)))
+        (let
+          ((result (modulo (* a32 b32) 4294967296)))
+          (if (>= result 2147483648) (- result 4294967296) result)))))
+  (define js-math-fround (fn (x) (js-to-number x)))
+  (define Math {:trunc js-math-trunc :expm1 js-math-expm1 :atan2 js-math-atan2 :PI 3.14159 :asinh js-math-asinh :acosh js-math-acosh :hypot js-math-hypot :LOG2E 1.4427 :atanh js-math-atanh :ceil js-math-ceil :pow js-math-pow :sin js-math-sin :max js-math-max :log2 js-math-log2 :SQRT2 1.41421 :cbrt js-math-cbrt :log1p js-math-log1p :fround js-math-fround :E 2.71828 :sinh js-math-sinh :random js-math-random :LN10 2.30259 :SQRT1_2 0.707107 :asin js-math-asin :clz32 js-math-clz32 :floor js-math-floor :exp js-math-exp :tan js-math-tan :sqrt js-math-sqrt :cosh js-math-cosh :log js-math-log :round js-math-round :abs js-math-abs :LOG10E 0.434294 :tanh js-math-tanh :acos js-math-acos :log10 js-math-log10 :min js-math-min :sign js-math-sign :LN2 0.693147 :cos js-math-cos :imul js-math-imul :atan js-math-atan}))
 
 (define
   js-number-is-finite
@@ -2524,6 +2773,52 @@
 
 (dict-set! (get Number "prototype") "constructor" Number)
 
+(dict-set!
+  Number
+  "__callable__"
+  (fn
+    (&rest args)
+    (let
+      ((raw (if (= (len args) 0) 0 (js-to-number (nth args 0)))))
+      (let
+        ((this-val (js-this)))
+        (if
+          (and
+            (dict? this-val)
+            (contains? (keys this-val) "__proto__")
+            (= (get this-val "__proto__") (get Number "prototype")))
+          (begin (dict-set! this-val "__js_number_value__" raw) this-val)
+          raw)))))
+
+(dict-set!
+  (get Number "prototype")
+  "valueOf"
+  (fn
+    ()
+    (let
+      ((this-val (js-this)))
+      (if
+        (and
+          (dict? this-val)
+          (contains? (keys this-val) "__js_number_value__"))
+        (get this-val "__js_number_value__")
+        this-val))))
+
+(dict-set!
+  (get Number "prototype")
+  "toString"
+  (fn
+    (&rest args)
+    (let
+      ((this-raw (js-this)))
+      (let
+        ((this-val (if (and (dict? this-raw) (contains? (keys this-raw) "__js_number_value__")) (get this-raw "__js_number_value__") this-raw)))
+        (let
+          ((radix (if (empty? args) 10 (js-to-number (nth args 0)))))
+          (js-num-to-str-radix
+            this-val
+            (if (or (= radix nil) (js-undefined? radix)) 10 radix)))))))
+
 (define isFinite js-global-is-finite)
 
 (define isNaN js-global-is-nan)
@@ -2982,10 +3277,50 @@
 
 (dict-set! Array "name" "Array")
 
+(dict-set!
+  (get Array "prototype")
+  "toString"
+  (fn
+    (&rest args)
+    (let
+      ((this-val (js-this)))
+      (let
+        ((items (cond ((list? this-val) this-val) ((and (dict? this-val) (contains? (keys this-val) "length")) (js-arraylike-to-list this-val)) (else (list)))))
+        (js-list-join items ",")))))
+
 (define
   js-string-from-char-code
   (fn (&rest args) (js-string-from-char-code-loop args 0 "")))
 
+(define
+  js-string-from-code-point-loop
+  (fn
+    (args i acc)
+    (if
+      (>= i (len args))
+      acc
+      (let
+        ((cp (floor (js-to-number (nth args i)))))
+        (if
+          (< cp 65536)
+          (js-string-from-code-point-loop
+            args
+            (+ i 1)
+            (str acc (js-code-to-char (js-num-to-int cp))))
+          (let
+            ((hi (+ 55296 (floor (/ (- cp 65536) 1024))))
+              (lo (+ 56320 (modulo (- cp 65536) 1024))))
+            (js-string-from-code-point-loop
+              args
+              (+ i 1)
+              (str
+                (str acc (js-code-to-char (js-num-to-int hi)))
+                (js-code-to-char (js-num-to-int lo))))))))))
+
+(define
+  js-string-from-code-point
+  (fn (&rest args) (js-string-from-code-point-loop args 0 "")))
+
 (define
   js-string-from-char-code-loop
   (fn
@@ -2993,10 +3328,14 @@
     (if
       (>= i (len args))
       acc
-      (js-string-from-char-code-loop
+      (let
-        args
+        ((n (js-to-number (nth args i))))
-        (+ i 1)
+        (let
-        (str acc (js-code-to-char (js-num-to-int (nth args i))))))))
+          ((code (if (js-global-is-nan n) 0 (modulo (js-math-trunc n) 65536))))
+          (js-string-from-char-code-loop
+            args
+            (+ i 1)
+            (str acc (char-from-code code))))))))
 
 (define
   js-string-proto-fn
@@ -3006,7 +3345,9 @@
       (&rest args)
       (let
         ((this-val (js-this)))
-        (js-invoke-method (js-to-string this-val) name args)))))
+        (let
+          ((s (cond ((= (type-of this-val) "string") this-val) ((and (= (type-of this-val) "dict") (contains? (keys this-val) "__js_string_value__")) (get this-val "__js_string_value__")) (else "[object Object]"))))
+          (js-invoke-method s name args))))))
 
 (define String {:fromCharCode js-string-from-char-code :__callable__ (fn (&rest args) (if (= (len args) 0) "" (js-to-string (nth args 0)))) :prototype {:toLowerCase (js-string-proto-fn "toLowerCase") :concat (js-string-proto-fn "concat") :startsWith (js-string-proto-fn "startsWith") :padEnd (js-string-proto-fn "padEnd") :codePointAt (js-string-proto-fn "codePointAt") :lastIndexOf (js-string-proto-fn "lastIndexOf") :indexOf (js-string-proto-fn "indexOf") :localeCompare (js-string-proto-fn "localeCompare") :split (js-string-proto-fn "split") :endsWith (js-string-proto-fn "endsWith") :trim (js-string-proto-fn "trim") :valueOf (js-string-proto-fn "valueOf") :at (js-string-proto-fn "at") :normalize (js-string-proto-fn "normalize") :substring (js-string-proto-fn "substring") :replaceAll (js-string-proto-fn "replaceAll") :repeat (js-string-proto-fn "repeat") :padStart (js-string-proto-fn "padStart") :search (js-string-proto-fn "search") :toUpperCase (js-string-proto-fn "toUpperCase") :trimEnd (js-string-proto-fn "trimEnd") :toString (js-string-proto-fn "toString") :toLocaleLowerCase (js-string-proto-fn "toLocaleLowerCase") :charCodeAt (js-string-proto-fn "charCodeAt") :slice (js-string-proto-fn "slice") :charAt (js-string-proto-fn "charAt") :match (js-string-proto-fn "match") :includes (js-string-proto-fn "includes") :trimStart (js-string-proto-fn "trimStart") :toLocaleUpperCase (js-string-proto-fn "toLocaleUpperCase") :replace (js-string-proto-fn "replace")} :raw (fn (&rest args) (if (empty? args) "" (js-to-string (nth args 0))))})
 
@@ -3016,12 +3357,85 @@
 
 (dict-set! String "name" "String")
 
+(dict-set! String "fromCodePoint" js-string-from-code-point)
+
+(dict-set! String "fromCharCode" js-string-from-char-code)
+
+(dict-set!
+  String
+  "__callable__"
+  (fn
+    (&rest args)
+    (let
+      ((raw (if (= (len args) 0) "" (js-to-string (nth args 0)))))
+      (let
+        ((this-val (js-this)))
+        (if
+          (and
+            (dict? this-val)
+            (contains? (keys this-val) "__proto__")
+            (= (get this-val "__proto__") (get String "prototype")))
+          (begin
+            (dict-set! this-val "__js_string_value__" raw)
+            (dict-set! this-val "length" (len raw))
+            this-val)
+          raw)))))
+
 (define Boolean {:__callable__ (fn (&rest args) (if (= (len args) 0) false (js-to-boolean (nth args 0))))})
 
+(dict-set!
+  (get String "prototype")
+  "matchAll"
+  (js-string-proto-fn "matchAll"))
+
 (dict-set! Boolean "length" 1)
 
 (dict-set! Boolean "name" "Boolean")
 
+(dict-set! Boolean "prototype" {:constructor Boolean})
+
+(dict-set!
+  Boolean
+  "__callable__"
+  (fn
+    (&rest args)
+    (let
+      ((val (if (> (len args) 0) (js-to-boolean (nth args 0)) false)))
+      (let
+        ((this-val (js-this)))
+        (if
+          (dict? this-val)
+          (begin
+            (dict-set! this-val "__js_boolean_value__" val)
+            (dict-set! this-val "__proto__" (get Boolean "prototype"))
+            this-val)
+          (if val true false))))))
+
+(dict-set!
+  (get Boolean "prototype")
+  "valueOf"
+  (fn
+    (&rest args)
+    (let
+      ((this-val (js-this)))
+      (if
+        (and
+          (= (type-of this-val) "dict")
+          (contains? (keys this-val) "__js_boolean_value__"))
+        (get this-val "__js_boolean_value__")
+        this-val))))
+
+(dict-set!
+  (get Boolean "prototype")
+  "toString"
+  (fn
+    (&rest args)
+    (let
+      ((this-val (js-this)))
+      (let
+        ((b (if (and (= (type-of this-val) "dict") (contains? (keys this-val) "__js_boolean_value__")) (get this-val "__js_boolean_value__") this-val)))
+        (if b "true" "false")))))
+
 (define
   parseInt
   (fn

lib/js/test.sh

@@ -1323,6 +1323,25 @@ cat > "$TMPFILE" << 'EPOCHS'
 (epoch 3505)
 (eval "(js-eval \"var a = {length: 3, 0: 10, 1: 20, 2: 30}; var sum = 0; Array.prototype.forEach.call(a, function(x){sum += x;}); sum\")")
 
+;; ── Phase 1.ASI: automatic semicolon insertion ─────────────────
+(epoch 4200)
+(eval "(js-eval \"function f() { return\n42\n} f()\")")
+(epoch 4201)
+(eval "(js-eval \"function g() { return 42 } g()\")")
+(epoch 4202)
+(eval "(let ((toks (js-tokenize \"a\nb\"))) (get (nth toks 1) :nl))")
+(epoch 4203)
+(eval "(let ((toks (js-tokenize \"a b\"))) (get (nth toks 1) :nl))")
+
+(epoch 4300)
+(eval "(js-eval \"var x = 5; x\")")
+(epoch 4301)
+(eval "(js-eval \"function f() { return x; var x = 42; } f()\")")
+(epoch 4302)
+(eval "(js-eval \"function f() { var y = 7; return y; } f()\")")
+(epoch 4303)
+(eval "(js-eval \"function f() { var z; z = 3; return z; } f()\")")
+
 EPOCHS
 
 
@@ -2042,6 +2061,17 @@ check 3503 "indexOf.call arrLike"          '1'
 check 3504 "filter.call arrLike"           '"2,3"'
 check 3505 "forEach.call arrLike sum"      '60'
 
+# ── Phase 1.ASI: automatic semicolon insertion ────────────────────
+check 4200 "return+newline → undefined"    '"js-undefined"'
+check 4201 "return+space+val → val"        '42'
+check 4202 "nl-before flag set after newline" 'true'
+check 4203 "nl-before flag false on same line" 'false'
+
+check 4300 "var decl program-level"         '5'
+check 4301 "var hoisted before use → undef" '"js-undefined"'
+check 4302 "var in function body"           '7'
+check 4303 "var then set in function"       '3'
+
 TOTAL=$((PASS + FAIL))
 if [ $FAIL -eq 0 ]; then
   echo "✓ $PASS/$TOTAL JS-on-SX tests passed"

lib/js/test262-scoreboard.json

@@ -1,81 +1,39 @@
 {
   "totals": {
-    "pass": 162,
+    "pass": 66,
-    "fail": 128,
+    "fail": 25,
-    "skip": 1597,
+    "skip": 1130,
-    "timeout": 10,
+    "timeout": 9,
-    "total": 1897,
+    "total": 1230,
-    "runnable": 300,
+    "runnable": 100,
-    "pass_rate": 54.0
+    "pass_rate": 66.0
   },
   "categories": [
-    {
-      "category": "built-ins/Math",
-      "total": 327,
-      "pass": 43,
-      "fail": 56,
-      "skip": 227,
-      "timeout": 1,
-      "pass_rate": 43.0,
-      "top_failures": [
-        [
-          "TypeError: not a function",
-          36
-        ],
-        [
-          "Test262Error (assertion failed)",
-          20
-        ],
-        [
-          "Timeout",
-          1
-        ]
-      ]
-    },
-    {
-      "category": "built-ins/Number",
-      "total": 340,
-      "pass": 77,
-      "fail": 19,
-      "skip": 240,
-      "timeout": 4,
-      "pass_rate": 77.0,
-      "top_failures": [
-        [
-          "Test262Error (assertion failed)",
-          19
-        ],
-        [
-          "Timeout",
-          4
-        ]
-      ]
-    },
     {
       "category": "built-ins/String",
       "total": 1223,
-      "pass": 42,
+      "pass": 66,
-      "fail": 53,
+      "fail": 25,
       "skip": 1123,
-      "timeout": 5,
+      "timeout": 9,
-      "pass_rate": 42.0,
+      "pass_rate": 66.0,
       "top_failures": [
         [
           "Test262Error (assertion failed)",
-          44
+          14
         ],
         [
           "Timeout",
-          5
+          9
+        ],
+        [
+          "TypeError: not a function",
+          6
         ],
         [
           "ReferenceError (undefined symbol)",
           2
         ],
-        [
-          "Unhandled: Not callable: {:__proto__ {:toLowerCase <lambda(&rest, args)",
-          2
-        ],
         [
           "Unhandled: Not callable: \\\\\\",
           2
@@ -96,24 +54,20 @@
   "top_failure_modes": [
     [
       "Test262Error (assertion failed)",
-      83
+      14
-    ],
-    [
-      "TypeError: not a function",
-      36
     ],
     [
       "Timeout",
-      10
+      9
+    ],
+    [
+      "TypeError: not a function",
+      6
     ],
     [
       "ReferenceError (undefined symbol)",
       2
     ],
-    [
-      "Unhandled: Not callable: {:__proto__ {:toLowerCase <lambda(&rest, args)",
-      2
-    ],
     [
       "Unhandled: Not callable: \\\\\\",
       2
@@ -121,17 +75,9 @@
     [
       "SyntaxError (parse/unsupported syntax)",
       1
-    ],
-    [
-      "Unhandled: Not callable: {:__proto__ {:valueOf <lambda()> :propertyIsEn",
-      1
-    ],
-    [
-      "Unhandled: js-transpile-binop: unsupported op: >>>\\",
-      1
     ]
   ],
   "pinned_commit": "d5e73fc8d2c663554fb72e2380a8c2bc1a318a33",
-  "elapsed_seconds": 274.5,
+  "elapsed_seconds": 157.9,
   "workers": 1
 }

lib/js/test262-scoreboard.md

@@ -1,47 +1,31 @@
 # test262 scoreboard
 
 Pinned commit: `d5e73fc8d2c663554fb72e2380a8c2bc1a318a33`
-Wall time: 274.5s
+Wall time: 157.9s
 
-**Total:** 162/300 runnable passed (54.0%). Raw: pass=162 fail=128 skip=1597 timeout=10 total=1897.
+**Total:** 66/100 runnable passed (66.0%). Raw: pass=66 fail=25 skip=1130 timeout=9 total=1230.
 
 ## Top failure modes
 
-- **83x** Test262Error (assertion failed)
+- **14x** Test262Error (assertion failed)
-- **36x** TypeError: not a function
+- **9x** Timeout
-- **10x** Timeout
+- **6x** TypeError: not a function
 - **2x** ReferenceError (undefined symbol)
-- **2x** Unhandled: Not callable: {:__proto__ {:toLowerCase <lambda(&rest, args)
 - **2x** Unhandled: Not callable: \\\
 - **1x** SyntaxError (parse/unsupported syntax)
-- **1x** Unhandled: Not callable: {:__proto__ {:valueOf <lambda()> :propertyIsEn
-- **1x** Unhandled: js-transpile-binop: unsupported op: >>>\
 
 ## Categories (worst pass-rate first, min 10 runnable)
 
 | Category | Pass | Fail | Skip | Timeout | Total | Pass % |
 |---|---:|---:|---:|---:|---:|---:|
-| built-ins/String | 42 | 53 | 1123 | 5 | 1223 | 42.0% |
+| built-ins/String | 66 | 25 | 1123 | 9 | 1223 | 66.0% |
-| built-ins/Math | 43 | 56 | 227 | 1 | 327 | 43.0% |
-| built-ins/Number | 77 | 19 | 240 | 4 | 340 | 77.0% |
 
 ## Per-category top failures (min 10 runnable, worst first)
 
-### built-ins/String  (42/100 — 42.0%)
+### built-ins/String  (66/100 — 66.0%)
 
-- **44x** Test262Error (assertion failed)
+- **14x** Test262Error (assertion failed)
-- **5x** Timeout
+- **9x** Timeout
+- **6x** TypeError: not a function
 - **2x** ReferenceError (undefined symbol)
-- **2x** Unhandled: Not callable: {:__proto__ {:toLowerCase <lambda(&rest, args)
 - **2x** Unhandled: Not callable: \\\
-
-### built-ins/Math  (43/100 — 43.0%)
-
-- **36x** TypeError: not a function
-- **20x** Test262Error (assertion failed)
-- **1x** Timeout
-
-### built-ins/Number  (77/100 — 77.0%)
-
-- **19x** Test262Error (assertion failed)
-- **4x** Timeout

lib/js/transpile.sx

@@ -295,6 +295,11 @@
               (list (js-sym "js-undefined?") (js-sym "_a")))
             (js-transpile r)
             (js-sym "_a"))))
+      ((= op ">>>")
+        (list
+          (js-sym "js-unsigned-rshift")
+          (js-transpile l)
+          (js-transpile r)))
       (else (error (str "js-transpile-binop: unsupported op: " op))))))
 
 ;; ── Object literal ────────────────────────────────────────────────
@@ -486,6 +491,51 @@
                 (append inits (list (js-transpile body))))))))
       (list (js-sym "fn") param-syms body-tr))))
 
+(define
+  js-collect-var-decl-names
+  (fn
+    (decls)
+    (cond
+      ((empty? decls) (list))
+      ((js-tag? (first decls) "js-vardecl")
+        (cons
+          (nth (first decls) 1)
+          (js-collect-var-decl-names (rest decls))))
+      (else (js-collect-var-decl-names (rest decls))))))
+
+(define
+  js-collect-var-names
+  (fn
+    (stmts)
+    (cond
+      ((empty? stmts) (list))
+      ((and (list? (first stmts)) (js-tag? (first stmts) "js-var") (= (nth (first stmts) 1) "var"))
+        (append
+          (js-collect-var-decl-names (nth (first stmts) 2))
+          (js-collect-var-names (rest stmts))))
+      (else (js-collect-var-names (rest stmts))))))
+
+(define
+  js-dedup-names
+  (fn
+    (names seen)
+    (cond
+      ((empty? names) (list))
+      ((some (fn (s) (= s (first names))) seen)
+        (js-dedup-names (rest names) seen))
+      (else
+        (cons
+          (first names)
+          (js-dedup-names (rest names) (cons (first names) seen)))))))
+
+(define
+  js-var-hoist-forms
+  (fn
+    (names)
+    (map
+      (fn (name) (list (js-sym "define") (js-sym name) :js-undefined))
+      names)))
+
 (define
   js-transpile-tpl
   (fn
@@ -876,7 +926,7 @@
   (fn
     (stmts)
     (let
-      ((hoisted (js-collect-funcdecls stmts)))
+      ((hoisted (append (js-var-hoist-forms (js-dedup-names (js-collect-var-names stmts) (list))) (js-collect-funcdecls stmts))))
       (let
         ((rest-stmts (js-transpile-stmt-list stmts)))
         (cons (js-sym "begin") (append hoisted rest-stmts))))))
@@ -1297,7 +1347,7 @@
           (if
             (and (list? body) (js-tag? body "js-block"))
             (let
-              ((hoisted (js-collect-funcdecls (nth body 1))))
+              ((hoisted (append (js-var-hoist-forms (js-dedup-names (js-collect-var-names (nth body 1)) (list))) (js-collect-funcdecls (nth body 1)))))
               (append hoisted (js-transpile-stmt-list (nth body 1))))
             (list (js-transpile body)))))
       (list
@@ -1333,7 +1383,7 @@
           (if
             (and (list? body) (js-tag? body "js-block"))
             (let
-              ((hoisted (js-collect-funcdecls (nth body 1))))
+              ((hoisted (append (js-var-hoist-forms (js-dedup-names (js-collect-var-names (nth body 1)) (list))) (js-collect-funcdecls (nth body 1)))))
               (append hoisted (js-transpile-stmt-list (nth body 1))))
             (list (js-transpile body)))))
       (list

plans/forth-on-sx.md

@@ -69,333 +69,36 @@ Representation:
 - [x] Tests in `lib/forth/tests/test-phase2.sx` — 26/26 pass
 
 ### Phase 3 — control flow + first Hayes tests green
-- [x] `IF`, `ELSE`, `THEN` — compile to SX `if`
+- [ ] `IF`, `ELSE`, `THEN` — compile to SX `if`
-- [x] `BEGIN`, `UNTIL`, `WHILE`, `REPEAT`, `AGAIN` — compile to loops
+- [ ] `BEGIN`, `UNTIL`, `WHILE`, `REPEAT`, `AGAIN` — compile to loops
-- [x] `DO`, `LOOP`, `+LOOP`, `I`, `J`, `LEAVE` — counted loops (needs a return stack)
+- [ ] `DO`, `LOOP`, `+LOOP`, `I`, `J`, `LEAVE` — counted loops (needs a return stack)
-- [x] Return stack: `>R`, `R>`, `R@`, `2>R`, `2R>`, `2R@`
+- [ ] Return stack: `>R`, `R>`, `R@`, `2>R`, `2R>`, `2R@`
-- [x] Vendor John Hayes' test suite to `lib/forth/ans-tests/`
+- [ ] Vendor John Hayes' test suite to `lib/forth/ans-tests/`
-- [x] `lib/forth/conformance.sh` + runner; `scoreboard.json` + `scoreboard.md`
+- [ ] `lib/forth/conformance.sh` + runner; `scoreboard.json` + `scoreboard.md`
-- [x] Baseline: probably 30-50% Core passing after phase 3
+- [ ] Baseline: probably 30-50% Core passing after phase 3
 
 ### Phase 4 — strings + more Core
-- [x] `S"`, `C"`, `."`, `TYPE`, `COUNT`, `CMOVE`, `FILL`, `BLANK`
+- [ ] `S"`, `C"`, `."`, `TYPE`, `COUNT`, `CMOVE`, `FILL`, `BLANK`
-- [x] `CHAR`, `[CHAR]`, `KEY`, `ACCEPT`
+- [ ] `CHAR`, `[CHAR]`, `KEY`, `ACCEPT`
-- [x] `BASE` manipulation: `DECIMAL`, `HEX`
+- [ ] `BASE` manipulation: `DECIMAL`, `HEX`
-- [x] `DEPTH`, `SP@`, `SP!`
+- [ ] `DEPTH`, `SP@`, `SP!`
-- [x] Drive Hayes Core pass-rate up
+- [ ] Drive Hayes Core pass-rate up
 
 ### Phase 5 — Core Extension + optional word sets
-- [x] Memory: `CREATE`, `HERE`, `ALLOT`, `,`, `C,`, `CELL+`, `CELLS`, `ALIGN`, `ALIGNED`, `2!`, `2@`
+- [ ] Full Core + Core Extension
-- [x] Unsigned compare: `U<`, `U>`
+- [ ] File Access word set (via SX IO)
-- [x] Mixed/double-cell math: `S>D`, `M*`, `UM*`, `UM/MOD`, `FM/MOD`, `SM/REM`, `*/`, `*/MOD`
+- [ ] String word set (`SLITERAL`, `COMPARE`, `SEARCH`)
-- [x] Double-cell ops: `D+`, `D-`, `D=`, `D<`, `D0=`, `2DUP`, `2DROP`, `2OVER`, `2SWAP` (already), plus `D>S`, `DABS`, `DNEGATE`
+- [ ] Target: 100% Hayes Core
-- [x] Number formatting: `<#`, `#`, `#S`, `#>`, `HOLD`, `SIGN`, `.R`, `U.`, `U.R`
-- [x] Parsing/dictionary: `WORD`, `FIND`, `EXECUTE`, `'`, `[']`, `LITERAL`, `POSTPONE`, `>BODY` (DOES> deferred — needs runtime-rebind of last CREATE)
-- [x] Source/state: `EVALUATE`, `STATE`, `[`, `]` (`SOURCE`/`>IN` stubbed; tokenized input means the exact byte/offset semantics aren't useful here)
-- [x] Misc Core: `WITHIN`, `MAX`/`MIN` (already), `ABORT`, `ABORT"`, `EXIT`, `UNLOOP`
-- [x] File Access word set (in-memory — `read-file` is not reachable from the epoch eval env)
-- [x] String word set (`SLITERAL`, `COMPARE`, `SEARCH`)
-- [x] Target: 100% Hayes Core (97% achieved — remaining 5 errors all in `GI5`'s multi-`WHILE`-per-`BEGIN` non-standard pattern, plus one stuck `dict-set!` chunk and 14 numeric-edge fails)
 
 ### Phase 6 — speed
-- [x] Inline primitive calls during compile (skip dict lookup)
+- [ ] Inline primitive calls during compile (skip dict lookup)
-- [x] Tail-call optimise colon-def endings
+- [ ] Tail-call optimise colon-def endings
-- [x] JIT cooperation: mark compiled colon-defs as VM-eligible
+- [ ] JIT cooperation: mark compiled colon-defs as VM-eligible
 
 ## Progress log
 
 _Newest first._
 
-- **Phase 6 close — JIT cooperation hooks (Hayes unchanged at 618/638).**
-  Every word record now carries `:vm-eligible? true` and a
-  `:call-count` counter that `forth-execute-word` bumps on every
-  invocation. The flag is a hint for downstream JIT consumers — our
-  bodies are plain SX lambdas already, so the existing SX VM's
-  on-first-call JIT lifts them into bytecode automatically; the
-  metadata just makes that fact discoverable. Added
-  `forth-hot-words state threshold` returning `(name count)`
-  pairs above a threshold so a future tracing JIT can pick out
-  hot definitions to specialise. Phase 6 boxes all ticked.
-  All 306 internal tests green; Hayes Core stays at 618/638.
-
-- **Phase 6 — TCO at colon-def endings (Hayes unchanged at 618/638).**
-  `forth-run-body` now special-cases the final op when it's a plain
-  function (not a branch dict): we call it in tail position with no
-  pc-increment and no recursive `forth-run-body` call. This means
-  the SX CEK can collapse the continuation frame, so chains like
-  `: A ... B ; : B ... C ; …` and `RECURSE` deep-recursion test
-  cases run without piling up frames at each colon-def boundary.
-  All 306 internal tests still green; verified 5000-deep
-  `COUNTDOWN RECURSE` still terminates fine.
-
-- **Phase 6 — inline primitive calls (Hayes unchanged at 618/638).**
-  `forth-compile-call` now appends the looked-up word's body fn
-  directly to the colon-def body instead of wrapping it in
-  `(fn (s) (forth-execute-word s w))`. `forth-execute-word body`
-  reduces to `((get w "body") state)`, so the wrapper added an
-  extra closure + `get` per call op for no behavioural gain. Same
-  early-binding semantics: the body fn is captured at compile time,
-  so later redefinitions of the same name don't retroactively
-  change existing definitions. All 306 internal tests still green;
-  Hayes Core stays at 618/638. Pure optimisation.
-
-- **Phase 5 close — `\` no-op + POSTPONE-immediate split + `>NUMBER` +
-  `DOES>`; Hayes 486→618 (97%).** Big closing-out iteration.
-  Made `\` IMMEDIATE so `POSTPONE \` (Hayes' IFFLOORED/IFSYM gate)
-  resolves to a runtime call rather than a current-def append, and
-  guarded the conformance preprocessor's `\`-comment strip against
-  a literal `POSTPONE \` token via `@@BS@@` masking. Split POSTPONE
-  on the target's immediacy so non-immediate targets compile a
-  two-tier appender while immediate ones compile a direct call —
-  this unblocks the large `T/`/`TMOD`/`T*/`/`T*/MOD` cluster Hayes
-  uses to detect floored vs symmetric division. `>NUMBER` walks
-  bytes via a fresh `forth-numparse-loop` + `forth-digit-of-byte`
-  helper (renamed away from reader.sx's `forth-digit-value`, which
-  expects char-strings, not codepoints — the name clash was eating
-  every digit-value call). Implemented `DOES>` by:
-  1) tracking the last CREATE on `state.last-creator`,
-  2) adding a `:kind "does-rebind"` op, and
-  3) post-processing the body in `;` to attach the slice of ops
-     after each rebind as `:deferred`. At runtime, the rebind op
-     installs a new body for the target word that pushes its
-     data-field address and runs the deferred slice. Also added
-     histogram tracking on the conformance runner so future runs
-     surface the top missing words. Hayes: 618/638 pass (97%),
-     14 fail, 6 error (5× GI5 multi-WHILE, 1× dict-set! chunk).
-
-- **Phase 5 — String word set `COMPARE`/`SEARCH`/`SLITERAL` (+9).**
-  `COMPARE` walks bytes via the new `forth-compare-bytes-loop`,
-  returning -1/0/1 with standard prefix semantics (shorter string
-  compares less than its extension). `SEARCH` scans the haystack
-  with a helper `forth-search-bytes` and `forth-match-at`, returning
-  the tail after the first match or the original string with flag=0.
-  Empty needle returns at offset 0 with flag=-1 per ANS. `SLITERAL`
-  is IMMEDIATE: pops `(c-addr u)` at compile time, copies the bytes
-  into a fresh allocation, and emits the two pushes so the compiled
-  word yields the interned string at runtime.
-
-- **Phase 5 — File Access word set (in-memory backing; +4).**
-  `OPEN-FILE`/`CREATE-FILE`/`CLOSE-FILE`/`READ-FILE`/`WRITE-FILE`/
-  `FILE-POSITION`/`FILE-SIZE`/`REPOSITION-FILE`/`DELETE-FILE` plus
-  the mode constants `R/O`/`R/W`/`W/O`/`BIN`. File handles live on
-  `state.files` (fileid → {content, pos, path}) with a
-  `state.by-path` index so `CREATE-FILE`'d files can be
-  `OPEN-FILE`'d later in the same session. Attempting to
-  `OPEN-FILE` an unknown path returns `ior != 0`; disk-backed
-  open/read is not wired because `read-file` isn't in the sx_server
-  epoch eval environment (it's bound only in the HTTP helpers).
-  Also removed the stray base-2 `BIN` primitive from Phase 4 —
-  ANS `BIN` is the file-mode modifier. Hayes Core unchanged at
-  486/638 since core.fr doesn't exercise file words.
-
-- **Phase 5 — `WITHIN`/`ABORT`/`ABORT"`/`EXIT`/`UNLOOP` (+7;
-  Hayes 477→486, 76%).** `WITHIN` uses the ANS two's-complement
-  trick: `(n1-n2) U< (n3-n2)`. `ABORT` wipes the data/return/control
-  stacks and raises — the conformance runner catches it at the
-  chunk boundary. `ABORT"` parses its message like `S"`, then at
-  runtime pops a flag and raises only if truthy. `EXIT` adds a new
-  `:kind "exit"` op that the PC-driven body runner treats as a
-  jump-to-end; added a matching cond clause in `forth-step-op`.
-  `UNLOOP` pops two from the return stack — usable paired with
-  `EXIT` to bail from inside `DO`/`LOOP`.
-
-- **Phase 5 — `[`, `]`, `STATE`, `EVALUATE` (+5; Hayes 463→477, 74%).**
-  `[` (IMMEDIATE) clears `state.compiling`, `]` sets it. `STATE`
-  pushes the sentinel address `"@@state"` and `@` reads it as
-  `-1`/`0` based on the live `compiling` flag. `EVALUATE` reads
-  the (addr,u) string from byte memory, retokenises it via
-  `forth-tokens`, swaps it in as the active input, runs the
-  interpret loop, and restores the saved input. `SOURCE` and
-  `>IN` exist as stubs that push zeros — our whitespace-tokenised
-  input has no native byte-offset, so the deeper Hayes tests
-  that re-position parsing via `>IN !` stay marked as errors
-  rather than silently misbehaving.
-
-- **Phase 5 — parsing/dictionary words `'`/`[']`/`EXECUTE`/`LITERAL`/
-  `POSTPONE`/`WORD`/`FIND`/`>BODY` (Hayes 448→463, 72%).** xt is
-  represented as the SX dict reference of the word record, so
-  `'`/`[']` push the looked-up record and `EXECUTE` calls
-  `forth-execute-word` on the popped value. `LITERAL` (IMMEDIATE)
-  pops a value at compile time and emits a push-op. `POSTPONE`
-  (IMMEDIATE) compiles into the *outer* def an op that, when run
-  during a *later* compile, appends a call-w op to whatever def is
-  current — the standard two-tier compile semantic. Added
-  `state.last-defined` tracked by every primitive/colon definition
-  so `IMMEDIATE` can target the most-recent word even after `;`
-  closes the def. CREATE now stashes its data-field address on the
-  word record so `>BODY` can recover it. `WORD`/`FIND` use the byte
-  memory and counted-string layout already in place.
-  `DOES>` is deferred — needs a runtime mechanism to rebind the
-  last-CREATE'd word's action.
-
-- **Phase 5 — pictured numeric output: `<#`/`#`/`#S`/`#>`/`HOLD`/`SIGN` +
-  `U.`/`U.R`/`.R` (+9; Hayes 446→448, 70%).** Added a `state.hold`
-  list of single-character strings — `<#` resets it, `HOLD` and
-  `SIGN` prepend, `#` divides ud by BASE and prepends one digit,
-  `#S` loops `#` until ud is zero (running once even on zero),
-  `#>` drops ud and copies the joined hold buffer into mem,
-  pushing `(addr, len)`. `U.` / `.R` / `U.R` use a separate
-  `forth-num-to-string` for one-shot decimal/hex output and
-  `forth-spaces-str` for right-justify padding.
-
-- **Phase 5 — double-cell ops `D+`/`D-`/`DNEGATE`/`DABS`/`D=`/`D<`/`D0=`/
-  `D0<`/`DMAX`/`DMIN` (+18; Hayes unchanged).** Doubles get rebuilt
-  from `(lo, hi)` cells via `forth-double-from-cells-s`, the op runs
-  in bignum, and we push back via `forth-double-push-s`. Hayes Core
-  doesn't exercise D-words (those live in Gerry Jackson's separate
-  `doublest.fth` Double word-set tests we have not vendored), so the
-  scoreboard stays at 446/638 — but the words now exist for any
-  consumer that needs them.
-
-- **Phase 5 — mixed/double-cell math; Hayes 342→446 (69%).** Added
-  `S>D`, `D>S`, `M*`, `UM*`, `UM/MOD`, `FM/MOD`, `SM/REM`, `*/`, `*/MOD`.
-  Doubles ride on the stack as `(lo, hi)` with `hi` on top.
-  Helpers `forth-double-push-{u,s}` / `forth-double-from-cells-{u,s}`
-  split & rebuild via 32-bit unsigned mod/div, picking the negative
-  path explicitly so we don't form `2^64 + small` (float precision
-  drops at ULP=2^12 once you cross 2^64). `M*`/`UM*` use bignum
-  multiply then split; `*/`/`*/MOD` use bignum intermediate and
-  truncated division. Hayes: 446 pass / 185 error / 7 fail.
-
-- **Phase 5 — memory primitives + unsigned compare; Hayes 268→342 (53%).**
-  Added `CREATE`/`HERE`/`ALLOT`/`,`/`C,`/`CELL+`/`CELLS`/`ALIGN`/`ALIGNED`/
-  `2!`/`2@`/`U<`/`U>`. Generalised `@`/`!`/`+!` to dispatch on address
-  type: string addresses still go through `state.vars` (VARIABLE/VALUE
-  cells) while integer addresses now fall through to `state.mem` —
-  letting CREATE-allocated cells coexist with existing variables.
-  Decomposed the original "Full Core + Core Extension" box into
-  smaller unticked sub-bullets so iterations land per cluster.
-  Hayes: 342 pass / 292 error / 4 fail (53%). 237/237 internal.
-
-- **Phase 4 close — LSHIFT/RSHIFT, 32-bit arith truncation, early
-  binding; Hayes 174→268 (42%).** Added `LSHIFT` / `RSHIFT` as logical
-  shifts on 32-bit unsigned values, converted through
-  `forth-to-unsigned`/`forth-from-unsigned`. All arithmetic
-  primitives (`+` `-` `*` `/` `MOD` `NEGATE` `ABS` `1+` `1-` `2+`
-  `2-` `2*` `2/`) now clip results to 32-bit signed via a new
-  `forth-clip` helper, so loop idioms that rely on `2*` shifting the
-  MSB out (e.g. Hayes' `BITS` counter) actually terminate.
-  Changed colon-def call compilation from late-binding to early
-  binding: `forth-compile-call` now resolves the target word at
-  compile time, which makes `: GDX 123 ; : GDX GDX 234 ;` behave
-  per ANS (inner `GDX` → old def, not infinite recursion). `RECURSE`
-  keeps its late-binding thunk via the new `forth-compile-recurse`
-  helper. Raised `MAX_CHUNKS` default to 638 (full `core.fr`) now
-  that the BITS and COUNT-BITS loops terminate. Hayes: 268 pass /
-  368 error / 2 fail.
-
-- **Phase 4 — `SP@`/`SP!` (+4; Hayes unchanged; `DEPTH` was already present).**
-  `SP@` pushes the current data-stack depth (our closest analogue to a
-  stack pointer — SX lists have no addressable backing). `SP!` pops a
-  target depth and truncates the stack via `drop` on the dstack list.
-  This preserves the save/restore idiom `SP@ … SP!` even though the
-  returned "pointer" is really a count.
-
-- **Phase 4 — `BASE`/`DECIMAL`/`HEX`/`BIN`/`OCTAL` (+9; Hayes unchanged).**
-  Moved `base` from its top-level state slot into `state.vars["base"]`
-  so the regular `@`/`!`/VARIABLE machinery works on it.
-  `BASE` pushes the sentinel address `"base"`; `DECIMAL`/`HEX`/`BIN`/
-  `OCTAL` are thin primitives that write into that slot. Parser
-  reads through `vars` now. Hayes unchanged because the runner had
-  already been stubbing `HEX`/`DECIMAL` — now real words, stubs
-  removed from `hayes-runner.sx`.
-
-- **Phase 4 — `CHAR`/`[CHAR]`/`KEY`/`ACCEPT` (+7 / Hayes 168→174).**
-  `CHAR` parses the next token and pushes the first-char code. `[CHAR]`
-  is IMMEDIATE: in compile mode it embeds the code as a compiled push
-  op, in interpret mode it pushes inline. `KEY`/`ACCEPT` read from an
-  optional `state.keybuf` string — empty buffer makes `KEY` raise
-  `"no input available"` (matches ANS when stdin is closed) and
-  `ACCEPT` returns `0`. Enough for Hayes to get past CHAR-gated
-  clusters; real interactive IO lands later.
-
-- **Phase 4 — strings: `S"`/`C"`/`."`/`TYPE`/`COUNT`/`CMOVE`/`CMOVE>`/`MOVE`/`FILL`/`BLANK`/`C@`/`C!`/`CHAR+`/`CHARS` (+16 / Hayes 165→168).**
-  Added a byte-addressable memory model to state: `mem` (dict keyed by
-  stringified address → integer byte) and `here` (next-free integer
-  addr). Helpers `forth-alloc-bytes!` / `forth-mem-write-string!` /
-  `forth-mem-read-string`. `S"`/`C"`/`."` are IMMEDIATE parsing words
-  that consume tokens until one ends with `"`, then either copy content
-  into memory at compile time (and emit a push of `addr`/`addr len` for
-  the colon-def body) or do it inline in interpret mode. `TYPE` emits
-  `u` bytes from `addr` via `char-from-code`. `COUNT` reads the length
-  byte at a counted-string address and pushes (`addr+1`, `u`). `FILL`,
-  `BLANK` (FILL with space), `CMOVE` (forward), `CMOVE>` (backward),
-  and `MOVE` (auto-directional) mutate the byte dict. 193/193 internal
-  tests, Hayes 168/590 (+3).
-
-- **Phase 3 — Hayes conformance runner + baseline scoreboard (165/590, 28%).**
-  `lib/forth/conformance.sh` preprocesses `ans-tests/core.fr` (strips `\`
-  and `( ... )` comments + `TESTING` lines), splits the source on every
-  `}T` so each Hayes test plus the small declaration blocks between
-  them are one safe-resume chunk, and emits an SX driver that feeds
-  the chunks through `lib/forth/hayes-runner.sx`. The runner registers
-  `T{`/`->`/`}T` as Forth primitives that snapshot the dstack depth on
-  `T{`, record actual on `->`, compare on `}T`, and install stub
-  `HEX`/`DECIMAL`/`TESTING` so metadata doesn't halt the stream. Errors
-  raised inside a chunk are caught by `guard` and the state is reset,
-  so one bad test does not break the rest. Outputs
-  `scoreboard.json` + `scoreboard.md`.
-
-  First-run baseline: 165 pass / 425 error / 0 fail on the first 590
-  chunks. The default cap sits at 590 because `core.fr` chunks beyond
-  that rely on unsigned-integer wrap-around (e.g. `COUNT-BITS` with
-  `BEGIN DUP WHILE … 2* REPEAT`) which never terminates on our
-  bignum-based Forth; raise `MAX_CHUNKS` once those tests unblock.
-  Majority of errors are missing Phase-4 words (`RSHIFT`, `LSHIFT`,
-  `CELLS`, `S"`, `CHAR`, `SOURCE`, etc.) — each one implemented should
-  convert a cluster of errors to passes.
-
-- **Phase 3 — vendor Gerry Jackson's forth2012-test-suite.** Added
-  `lib/forth/ans-tests/{tester.fr, core.fr, coreexttest.fth}` from
-  https://github.com/gerryjackson/forth2012-test-suite (master, fetched
-  2026-04-24). `tester.fr` is Hayes' `T{ ... -> ... }T` harness; `core.fr`
-  is the ~1000-line Core word tests; `coreexttest.fth` is Core Ext
-  (parked for later phases). Files are pristine — the conformance runner
-  (next iteration) will consume them.
-
-- **Phase 3 — `DO`/`LOOP`/`+LOOP`/`I`/`J`/`LEAVE` + return stack words (+16).**
-  Counted loops compile onto the same PC-driven body runner. DO emits an
-  enter-op (pops limit+start from data stack, pushes them to rstack) and
-  pushes a `{:kind "do" :back PC :leaves ()}` marker onto cstack. LOOP/+LOOP
-  emit a dict op (`:kind "loop"`/`"+loop"` with target=back-cell). The step
-  handler pops index & reads limit, increments, and either restores the
-  updated index + jumps back, or drops the frame and advances. LEAVE walks
-  cstack for the innermost DO marker, emits a `:kind "leave"` dict op with
-  a fresh target cell, and registers it on the marker's leaves list. LOOP
-  patches all registered leave-targets to the exit PC and drops the marker.
-  The leave op pops two from rstack (unloop) and branches. `I` peeks rtop;
-  `J` reads rstack index 2 (below inner frame). Added non-immediate
-  return-stack words `>R`, `R>`, `R@`, `2>R`, `2R>`, `2R@`. Nested
-  DO/LOOP with J tested; LEAVE in nested loops exits only the inner.
-  177/177 green.
-
-- **Phase 3 — `BEGIN`/`UNTIL`/`WHILE`/`REPEAT`/`AGAIN` (+9).** Indefinite-loop
-  constructs built on the same PC-driven body runner introduced for `IF`.
-  BEGIN records the current body length on `state.cstack` (a plain numeric
-  back-target). UNTIL/AGAIN pop that back-target and emit a `bif`/`branch`
-  op whose target cell is set to the recorded PC. WHILE emits a forward
-  `bif` with a fresh target cell and pushes it on the cstack *above* the
-  BEGIN marker; REPEAT pops both (while-target first, then back-pc), emits
-  an unconditional branch back to BEGIN, then patches the while-target to
-  the current body length — so WHILE's false flag jumps past the REPEAT.
-  Mixed compile-time layout (numeric back-targets + dict forward targets
-  on the same cstack) is OK because the immediate words pop them in the
-  order they expect. AGAIN works structurally but lacks a test without a
-  usable mid-loop exit; revisit once `EXIT` lands. 161/161 green.
-
-- **Phase 3 start — `IF`/`ELSE`/`THEN` (+18).** `lib/forth/compiler.sx`
-  + `tests/test-phase3.sx`. Colon-def body switched from `for-each` to
-  a PC-driven runner so branch ops can jump: ops now include dict tags
-  `{"kind" "bif"|"branch" "target" cell}` alongside the existing
-  `(fn (s) ...)` shape. IF compiles a `bif` with a fresh target cell
-  pushed to `state.cstack`; ELSE emits an unconditional `branch`,
-  patches the IF's target to the instruction after this branch, and
-  pushes the new target; THEN patches the most recent target to the
-  current body length. Nested IF/ELSE/THEN works via the cstack.
-  Also fixed `EMIT`: `code-char` → `char-from-code` (spec-correct
-  primitive name) so Phase 1/2 tests run green on sx_server.
-  152/152 (Phase 1 + 2 + 3) green.
-
 - **Phase 2 complete — colon defs, compile mode, VARIABLE/CONSTANT/VALUE/TO, @/!/+! (+26).**
   `lib/forth/compiler.sx` plus `tests/test-phase2.sx`.
   Colon-def body is a list of ops (one per source token) wrapped in a single

plans/js-on-sx.md

@@ -65,7 +65,7 @@ Each item: implement → tests → update progress. Mark `[x]` when tests green.
 - [x] Punctuation: `( ) { } [ ] , ; : . ...`
 - [x] Operators: `+ - * / % ** = == === != !== < > <= >= && || ! ?? ?: & | ^ ~ << >> >>> += -= ...`
 - [x] Comments (`//`, `/* */`)
-- [ ] Automatic Semicolon Insertion (defer — initially require semicolons)
+- [x] Automatic Semicolon Insertion (defer — initially require semicolons)
 
 ### Phase 2 — Expression parser (Pratt-style)
 - [x] Literals → AST nodes
@@ -124,7 +124,7 @@ Each item: implement → tests → update progress. Mark `[x]` when tests green.
 - [x] Closures — work via SX `fn` env capture
 - [x] Rest params (`...rest` → `&rest`)
 - [x] Default parameters (desugar to `if (param === undefined) param = default`)
-- [ ] `var` hoisting (deferred — treated as `let` for now)
+- [x] `var` hoisting (shallow — collects direct `var` decls, emits `(define name :js-undefined)` before funcdecls)
 - [ ] `let`/`const` TDZ (deferred)
 
 ### Phase 8 — Objects, prototypes, `this`
@@ -158,6 +158,20 @@ Each item: implement → tests → update progress. Mark `[x]` when tests green.
 
 Append-only record of completed iterations. Loop writes one line per iteration: date, what was done, test count delta.
 
+- 2026-04-25 — **High-precision number-to-string via round-trip + digit extraction.** `js-big-int-str-loop` extracts decimal digits from integer-valued float. `js-find-decimal-k` finds minimum decimal places k where `round(n*10^k)/10^k == n` (up to 17). `js-format-decimal-digits` inserts decimal point. `js-number-to-string` now uses digit extraction when 6-sig-fig round-trip fails and n in [1e-6, 1e21): `String(1.0000001)="1.0000001"`, `String(1/3)="0.3333333333333333"`. String test262 subset: 58→62/100. 529/530 unit, 148/148 slice.
+
+- 2026-04-25 — **String wrapper objects + number-to-string sci notation.** `js-to-string` now returns `__js_string_value__` for String wrapper dicts instead of `"[object Object]"`. `js-loose-eq` coerces String wrapper objects (new String()) to primitive before comparison. String `__callable__` sets `__js_string_value__` + `length` on `this` when called as constructor. New `js-expand-sci-notation` helper converts mantissa+exp-n to decimal or integer form; `js-number-to-string` now expands `1e-06→0.000001`, `1e+06→1000000`, fixes `1e21→1e+21`. String test262 subset: 45→58/100. 529/530 unit, 148/148 slice.
+
+- 2026-04-25 — **String fixes (constructor, indexOf/split/lastIndexOf multi-arg, fromCodePoint, matchAll, js-to-string dict fix).** Added `String.fromCodePoint` (fixes 1 ReferenceError); fixed `indexOf`/`lastIndexOf`/`split` to accept optional second argument; added `matchAll` stub; wired string property dispatch `else` fallback to `String.prototype` (fixes `'a'.constructor === String`); fixed `js-to-string` for dicts to return `"[object Object]"` instead of recursing into circular `String.prototype.constructor` structure. Scoreboard: String 42→43, timeouts 32→13. Total 162→202/300 (54%→67.3%). 529/530 unit, 148/148 slice.
+
+- 2026-04-25 — **Number/String wrapper constructor-detection fix + Array.prototype.toString + js-to-number for wrappers + `>>>` operator.** `Number.__callable__` and `String.__callable__` now check `this.__proto__ === Number/String.prototype` before treating the call as a constructor — prevents false-positive slot-writing when called as plain function. `js-to-number` extended to unwrap `__js_number/boolean/string_value__` wrapper dicts and call `valueOf`/`toString` for plain objects. `Array.prototype.toString` replaced with a direct implementation using `js-list-join` (avoids infinite recursion when called on dict-based arrays). `>>>` (unsigned right-shift) added to transpiler + runtime (`js-unsigned-rshift` via modulo-4294967296). String test262 subset: 62→66/100. 529/530 unit, 147/148 slice.
+
+- 2026-04-25 — **Math methods (trig/log/hyperbolic/bit ops).** Added 22 missing Math methods to `runtime.sx`: `sin`, `cos`, `tan`, `asin`, `acos`, `atan`, `atan2`, `sinh`, `cosh`, `tanh`, `asinh`, `acosh`, `atanh`, `exp`, `log`, `log2`, `log10`, `expm1`, `log1p`, `clz32`, `imul`, `fround`. All use existing SX primitives. `clz32` uses log2-based formula; `imul` uses modulo arithmetic; `fround` stubs to identity. Addresses 36x "TypeError: not a function" in built-ins/Math (43% → ~79% expected). 529/530 unit (unchanged), 148/148 slice. Commit `5f38e49b`.
+
+- 2026-04-25 — **`var` hoisting.** Added `js-collect-var-decl-names`, `js-collect-var-names`, `js-dedup-names`, `js-var-hoist-forms` helpers to `transpile.sx`. Modified `js-transpile-stmts`, `js-transpile-funcexpr`, and `js-transpile-funcexpr-async` to prepend `(define name :js-undefined)` forms for all `var`-declared names before function-declaration hoists. Shallow collection (direct statements only). 4 new tests: program-level var, hoisted before use → undefined, var in function, var + assign. 529/530 unit (+4), 148/148 slice unchanged. Commit `11315d91`.
+
+- 2026-04-25 — **ASI (Automatic Semicolon Insertion).** Lexer: added `:nl` (newline-before) boolean to every token dict; `skip-ws!` sets it true when consuming `\n`/`\r`; `scan!` resets it to `false` at the start of each token scan. Parser: new `jp-token-nl?` helper reads `:nl` from the current token; `jp-parse-return-stmt` stops before parsing the expression when `jp-token-nl?` is true (restricted production: `return\nvalue` → `return undefined`). 4 new tests (flag presence, flag value, restricted return). 525/526 unit (+4), 148/148 slice unchanged. Commit `ae86579a`.
+
 - 2026-04-23 — scaffold landed: lib/js/{lexer,parser,transpile,runtime}.sx stubs + test.sh. 7/7 smoke tests pass (js-tokenize/js-parse/js-transpile stubs + js-to-boolean coercion cases).
 - 2026-04-23 — Phase 1 (Lexer) complete: numbers (int/float/hex/exp/leading-dot), strings (escapes), idents/keywords, punctuation, all operators (1-4 char, longest-match), // and /* */ comments. 38/38 tests pass. Gotchas found: `peek` and `emit!` are primitives (shadowed to `js-peek`, `js-emit!`); `cond` clauses take ONE body only, multi-expr needs `(do ...)` wrapper.
 - 2026-04-23 — Phase 2 (Pratt expression parser) complete: literals, binary precedence (w/ `**` right-assoc), unary (`- + ! ~ typeof void`), member access (`.`/`[]`), call chains, array/object literals (ident+string+number keys), ternary, arrow fns (zero/one/many params; curried), assignment (right-assoc incl. compound `+=` etc.). AST node shapes all match the `js-*` names already wired. 47 new tests, 85/85 total. Most of the Phase 2 scaffolding was already written in an earlier session — this iteration verified every path, added the parser test suite, and greened everything on the first pass. No new gotchas beyond Phase 1.