Merge branch 'hs-e40-fetch' into loops/hs

2026-04-26 17:54:34 +00:00
parent 4c48a8dd57 4c43918a99
commit 41fac7ac29
13 changed files with 256 additions and 56 deletions
--- a/lib/hyperscript/tokenizer.sx
+++ b/lib/hyperscript/tokenizer.sx
@@ -568,10 +568,26 @@
                (do
                  (let
                    ((word (read-ident start)))
-                    (hs-emit!
-                      (if (hs-keyword? word) "keyword" "ident")
-                      word
-                      start))
+                    (let
+                      ((full-word
+                         (if
+                           (and
+                             (< pos src-len)
+                             (= (hs-cur) "'")
+                             (< (+ pos 1) src-len)
+                             (hs-letter? (hs-peek 1))
+                             (not
+                               (and
+                                 (= (hs-peek 1) "s")
+                                 (or
+                                   (>= (+ pos 2) src-len)
+                                   (not (hs-ident-char? (hs-peek 2)))))))
+                           (do (hs-advance! 1) (str word "'" (read-ident pos)))
+                           word)))
+                      (hs-emit!
+                        (if (hs-keyword? full-word) "keyword" "ident")
+                        full-word
+                        start)))
                  (scan!))
                (and
                  (or (= ch "=") (= ch "!") (= ch "<") (= ch ">"))