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

HS: fix compiler AST-unwrap + restore hs-id= dispatch after merge regression
Some checks failed
Test, Build, and Deploy / test-build-deploy (push) Failing after 16s
Details

Browse Source 
Merge c36fd5b2 stripped the source-info dict unwrapping from hs-to-sx
(the (let ((ast (if (and (dict? ast) (:hs-ast)) ...) wrapper) and also
introduced E37 tokenizer whitespace-token changes that broke the parser.

Reverts tokenizer/runtime to pre-E37 HEAD~1 state, restores hs-to-sx
with AST unwrapping from 61c9697f, and adds back the hs-id= dispatch
clause. Baseline: 178/195.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
giles
2026-04-26 19:13:02 +00:00
parent cabb0467ab
commit 92adf9d496
7 changed files with 2979 additions and 3521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

156
lib/hyperscript/runtime.sx
View File

@@ -2615,159 +2615,3 @@
(raise (host-get state "value"))
(if state (host-get state "value") result)))
result)))))
(define
hs-raw->api-token
(fn
(raw)
(let
((type (dict-get raw :type)) (value (dict-get raw :value)))
(cond
(= type "ident")
{:value value :type "IDENTIFIER" :op false}
(= type "keyword")
{:value value :type "IDENTIFIER" :op false}
(= type "number")
{:value value :type "NUMBER" :op false}
(= type "string")
{:value value :type "STRING" :op false}
(= type "class")
{:value (str "." value) :type "CLASS_REF" :op false}
(= type "id")
{:value (str "#" value) :type "ID_REF" :op false}
(= type "attr")
{:value value :type "ATTRIBUTE_REF" :op false}
(= type "style")
{:value value :type "STYLE_REF" :op false}
(= type "selector")
{:value value :type "QUERY_REF" :op false}
(= type "eof")
{:value "<<<EOF>>>" :type "EOF" :op false}
(= type "paren-open")
{:value value :type "L_PAREN" :op true}
(= type "paren-close")
{:value value :type "R_PAREN" :op true}
(= type "bracket-open")
{:value value :type "L_BRACKET" :op true}
(= type "bracket-close")
{:value value :type "R_BRACKET" :op true}
(= type "brace-open")
{:value value :type "L_BRACE" :op true}
(= type "brace-close")
{:value value :type "R_BRACE" :op true}
(= type "comma")
{:value value :type "COMMA" :op true}
(= type "dot")
{:value value :type "PERIOD" :op true}
(= type "colon")
{:value value :type "COLON" :op true}
(= type "op")
(cond
(= value "+")
{:value value :type "PLUS" :op true}
(= value "-")
{:value value :type "MINUS" :op true}
(= value "*")
{:value value :type "MULTIPLY" :op true}
(= value "/")
{:value value :type "SLASH" :op true}
(= value "!")
{:value value :type "EXCLAMATION" :op true}
(= value "?")
{:value value :type "QUESTION" :op true}
(= value "#")
{:value value :type "POUND" :op true}
(= value "&")
{:value value :type "AMPERSAND" :op true}
(= value "=")
{:value value :type "EQUALS" :op true}
(= value "<")
{:value value :type "L_ANG" :op true}
(= value ">")
{:value value :type "R_ANG" :op true}
(= value "<=")
{:value value :type "LTE_ANG" :op true}
(= value ">=")
{:value value :type "GTE_ANG" :op true}
(= value "==")
{:value value :type "EQ" :op true}
(= value "===")
{:value value :type "EQQ" :op true}
(= value "..")
{:value value :type "PERIOD_PERIOD" :op true}
:else {:value value :type value :op true})
:else {:value (or value "") :type (str type) :op false}))))
(define hs-eof-sentinel {:value "<<<EOF>>>" :type "EOF" :op false})
(define
hs-api-list
(fn
(raw-tokens)
(filter
(fn (t) (not (= (dict-get t :type) "EOF")))
(map hs-raw->api-token raw-tokens))))
(define
hs-tokens-of
(fn
(src &rest args)
(let
((template (some (fn (a) (equal? a :template)) args)))
(let
((raw (if template (hs-tokenize-template src) (hs-tokenize src))))
{:pos 0 :list (hs-api-list raw) :source src}))))
(define
hs-stream-token
(fn
(s i)
(let
((lst (get s "list")) (start (get s "pos")))
(define
find-nth
(fn
(j count)
(let
((tok (or (nth lst j) hs-eof-sentinel)))
(if
(= (get tok "type") "whitespace")
(find-nth (+ j 1) count)
(if (= count 0) tok (find-nth (+ j 1) (- count 1)))))))
(find-nth start i))))
(define
hs-stream-consume
(fn
(s)
(let
((lst (get s "list")))
(define
skip-ws
(fn
(j)
(let
((tok (or (nth lst j) nil)))
(if
(and tok (= (get tok "type") "whitespace"))
(skip-ws (+ j 1))
j))))
(let
((j (skip-ws (get s "pos"))))
(let
((tok (or (nth lst j) hs-eof-sentinel)))
(do
(when
(not (= (get tok "type") "EOF"))
(dict-set! s :pos (+ j 1)))
tok))))))
(define
hs-stream-has-more
(fn (s) (not (= (get (hs-stream-token s 0) "type") "EOF"))))
(define hs-token-type (fn (tok) (get tok "type")))
(define hs-token-value (fn (tok) (get tok "value")))
(define hs-token-op? (fn (tok) (get tok "op")))