coop/rose-ash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

js-on-sx: parseInt digit-walker, parseFloat prefix, Number('abc')→NaN, encodeURIComponent

Browse Source 
Four coercion fixes that together unblock many test262 cases:

1. js-to-number(undefined) now returns NaN (was 0). Fixes Number(undefined),
   isNaN(undefined), Math ops on undefined.
2. js-string-to-number returns NaN for non-numeric strings (via new
   js-is-numeric-string?). Previously returned 0 for 'abc'.
3. parseInt('123abc', 10) → 123 (walks digits until first invalid char),
   supports radix 2..36.
4. parseFloat('3.14xyz') → 3.14 (walks float prefix).
5. encodeURIComponent / decodeURIComponent / encodeURI / decodeURI —
   new URI-helper implementations.

8 new unit tests, 514/516 total.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
giles
2026-04-24 08:17:49 +00:00
parent 621a1ad947
commit 60bb77d365
2 changed files with 243 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

221
lib/js/runtime.sx
View File

@@ -679,7 +679,7 @@
(fn
(v)
(cond
((js-undefined? v) 0)
((js-undefined? v) (js-nan-value))
((= v nil) 0)
((= v true) 1)
((= v false) 0)
@@ -688,7 +688,48 @@
(else 0))))
(define
js-string-to-number
(fn (s) (cond ((= s "") 0) (else (js-parse-num-safe s)))))
(fn
(s)
(let
((trimmed (js-trim s)))
(cond
((= trimmed "") 0)
((= trimmed "Infinity") (js-infinity-value))
((= trimmed "+Infinity") (js-infinity-value))
((= trimmed "-Infinity") (- 0 (js-infinity-value)))
((js-is-numeric-string? trimmed) (js-parse-num-safe trimmed))
(else (js-nan-value))))))
(define
js-is-numeric-string?
(fn (s) (js-is-numeric-loop s 0 false false false)))
(define
js-is-numeric-loop
(fn
(s i sawdigit sawdot sawe)
(cond
((>= i (len s)) sawdigit)
(else
(let
((c (char-at s i)))
(cond
((or (= c "0") (= c "1") (= c "2") (= c "3") (= c "4") (= c "5") (= c "6") (= c "7") (= c "8") (= c "9"))
(js-is-numeric-loop s (+ i 1) true sawdot sawe))
((and (= c ".") (not sawdot) (not sawe))
(js-is-numeric-loop s (+ i 1) sawdigit true sawe))
((and (or (= c "e") (= c "E")) sawdigit (not sawe))
(js-is-numeric-loop s (+ i 1) false sawdot true))
((and (or (= c "+") (= c "-")) (= i 0))
(js-is-numeric-loop s (+ i 1) sawdigit sawdot sawe))
((and (or (= c "+") (= c "-")) sawe (= i (- (len s) 1)))
false)
((and (or (= c "+") (= c "-")) sawe)
(let
((prev (char-at s (- i 1))))
(if
(or (= prev "e") (= prev "E"))
(js-is-numeric-loop s (+ i 1) sawdigit sawdot sawe)
false)))
(else false)))))))
(define js-parse-num-safe (fn (s) (cond (else (js-num-from-string s)))))
(define
js-num-from-string
@@ -710,10 +751,16 @@
(cond
((>= i n) "")
((js-is-space? (char-at s i)) (js-trim-left-at s n (+ i 1)))
(else (substr s i n)))))
(else (substr s i n))))) ; deterministic placeholder for tests
(define
js-trim-right
(fn (s) (let ((n (len s))) (js-trim-right-at s n))))
;; The global object — lookup table for JS names that aren't in the
;; SX env. Transpiled idents look up locally first; globals here are a
;; fallback, but most slice programs reference `console`, `Math`,
;; `undefined` as plain symbols, which we bind as defines above.
(define
js-trim-right-at
(fn
@@ -721,16 +768,12 @@
(cond
((<= n 0) "")
((js-is-space? (char-at s (- n 1))) (js-trim-right-at s (- n 1)))
(else (substr s 0 n))))) ; deterministic placeholder for tests
(else (substr s 0 n)))))
(define
js-is-space?
(fn (c) (or (= c " ") (= c "\t") (= c "\n") (= c "\r"))))
;; The global object — lookup table for JS names that aren't in the
;; SX env. Transpiled idents look up locally first; globals here are a
;; fallback, but most slice programs reference `console`, `Math`,
;; `undefined` as plain symbols, which we bind as defines above.
(define
js-parse-decimal
(fn
@@ -2576,11 +2619,169 @@
parseInt
(fn
(&rest args)
(if (= (len args) 0) 0 (js-math-trunc (js-to-number (nth args 0))))))
(cond
((= (len args) 0) (js-nan-value))
(else
(let
((s (js-to-string (nth args 0)))
(radix-arg
(if (< (len args) 2) 10 (js-to-number (nth args 1)))))
(let
((radix (if (or (js-number-is-nan radix-arg) (= radix-arg 0)) 10 radix-arg)))
(js-parse-int-str (js-trim s) (js-math-trunc radix))))))))
(define
js-parse-int-str
(fn
(s radix)
(cond
((= s "") (js-nan-value))
(else
(let
((first (char-at s 0)))
(cond
((= first "-")
(let
((r (js-parse-int-digits (js-string-slice s 1 (len s)) radix 0 false)))
(if (js-number-is-nan r) r (- 0 r))))
((= first "+")
(js-parse-int-digits
(js-string-slice s 1 (len s))
radix
0
false))
(else (js-parse-int-digits s radix 0 false))))))))
(define
js-parse-int-digits
(fn
(s radix acc sawdigit)
(if
(= (len s) 0)
(if sawdigit acc (js-nan-value))
(let
((c (char-at s 0)))
(let
((d (js-digit-value c radix)))
(if
(= d -1)
(if sawdigit acc (js-nan-value))
(js-parse-int-digits
(js-string-slice s 1 (len s))
radix
(+ (* acc radix) d)
true)))))))
(define
js-digit-value
(fn
(c radix)
(let
((code (char-code c)))
(let
((d (cond ((and (>= code 48) (<= code 57)) (- code 48)) ((and (>= code 97) (<= code 122)) (+ 10 (- code 97))) ((and (>= code 65) (<= code 90)) (+ 10 (- code 65))) (else -1))))
(if (or (= d -1) (>= d radix)) -1 d)))))
(define
parseFloat
(fn (&rest args) (if (= (len args) 0) 0 (js-to-number (nth args 0)))))
(fn
(&rest args)
(if
(= (len args) 0)
(js-nan-value)
(let
((s (js-trim (js-to-string (nth args 0)))))
(cond
((= s "") (js-nan-value))
((= s "Infinity") (js-infinity-value))
((= s "+Infinity") (js-infinity-value))
((= s "-Infinity") (- 0 (js-infinity-value)))
(else (js-parse-float-prefix s)))))))
(define
js-parse-float-prefix
(fn
(s)
(let
((end (js-float-prefix-end s 0 false false false)))
(cond
((= end 0) (js-nan-value))
(else (js-parse-num-safe (js-string-slice s 0 end)))))))
(define
js-float-prefix-end
(fn
(s i sawdigit sawdot sawe)
(cond
((>= i (len s)) i)
(else
(let
((c (char-at s i)))
(cond
((or (= c "0") (= c "1") (= c "2") (= c "3") (= c "4") (= c "5") (= c "6") (= c "7") (= c "8") (= c "9"))
(js-float-prefix-end s (+ i 1) true sawdot sawe))
((and (= c ".") (not sawdot) (not sawe))
(js-float-prefix-end s (+ i 1) sawdigit true sawe))
((and (or (= c "e") (= c "E")) sawdigit (not sawe))
(js-float-prefix-end s (+ i 1) false sawdot true))
((and (or (= c "+") (= c "-")) (= i 0))
(js-float-prefix-end s (+ i 1) sawdigit sawdot sawe))
((and (or (= c "+") (= c "-")) sawe)
(let
((prev (char-at s (- i 1))))
(if
(or (= prev "e") (= prev "E"))
(js-float-prefix-end s (+ i 1) sawdigit sawdot sawe)
i)))
(else i)))))))
(define
encodeURIComponent
(fn (v) (let ((s (js-to-string v))) (js-uri-encode-loop s 0 ""))))
(define decodeURIComponent (fn (v) (js-to-string v)))
(define encodeURI (fn (v) (js-to-string v)))
(define decodeURI (fn (v) (js-to-string v)))
(define
js-uri-encode-loop
(fn
(s i acc)
(cond
((>= i (len s)) acc)
(else
(let
((c (char-at s i)))
(let
((code (char-code c)))
(cond
((= c " ") (js-uri-encode-loop s (+ i 1) (str acc "%20")))
((and (>= code 48) (<= code 57))
(js-uri-encode-loop s (+ i 1) (str acc c)))
((and (>= code 65) (<= code 90))
(js-uri-encode-loop s (+ i 1) (str acc c)))
((and (>= code 97) (<= code 122))
(js-uri-encode-loop s (+ i 1) (str acc c)))
((or (= c "-") (= c "_") (= c ".") (= c "~") (= c "!") (= c "*") (= c "'") (= c "(") (= c ")"))
(js-uri-encode-loop s (+ i 1) (str acc c)))
(else
(js-uri-encode-loop s (+ i 1) (str acc "%" (js-hex-2 code)))))))))))
(define
js-hex-2
(fn
(n)
(let
((hi (js-math-trunc (/ n 16))) (lo (mod n 16)))
(str (js-hex-digit hi) (js-hex-digit lo)))))
(define
js-hex-digit
(fn
(d)
(cond ((< d 10) (js-to-string d)) (else (js-code-to-char (+ 55 d))))))
(define
js-json-stringify