mirror of
https://github.com/ashinn/chibi-scheme.git
synced 2025-07-08 05:27:35 +02:00
Simpler grapheme description.
This commit is contained in:
parent
b82391fde6
commit
4012cbdb36
1 changed files with 9 additions and 17 deletions
|
@ -673,27 +673,19 @@
|
||||||
((eog) (make-char-state match/eog flags next))
|
((eog) (make-char-state match/eog flags next))
|
||||||
((grapheme)
|
((grapheme)
|
||||||
(->rx
|
(->rx
|
||||||
`(or (: "\r\n")
|
`(or (: (* ,char-set:hangul-l) (+ ,char-set:hangul-v)
|
||||||
(: (+ ,char-set:hangul-l)
|
|
||||||
(or ,char-set:hangul-lvt
|
|
||||||
(: (? ,char-set:hangul-lv) (* ,char-set:hangul-v)))
|
|
||||||
(* ,char-set:hangul-t))
|
(* ,char-set:hangul-t))
|
||||||
(: (* ,char-set:hangul-l)
|
(: (* ,char-set:hangul-l) ,char-set:hangul-v
|
||||||
(or ,char-set:hangul-lvt
|
(* ,char-set:hangul-v) (* ,char-set:hangul-t))
|
||||||
(: ,char-set:hangul-lv (* ,char-set:hangul-v)))
|
(: (* ,char-set:hangul-l) ,char-set:hangul-lvt
|
||||||
(* ,char-set:hangul-t))
|
(* ,char-set:hangul-t))
|
||||||
(: (* ,char-set:hangul-l)
|
(+ ,char-set:hangul-l)
|
||||||
(or ,char-set:hangul-lvt
|
(+ ,char-set:hangul-t)
|
||||||
(: (? ,char-set:hangul-lv) (+ ,char-set:hangul-v)))
|
|
||||||
(* ,char-set:hangul-t))
|
|
||||||
(: (* ,char-set:hangul-l)
|
|
||||||
(or ,char-set:hangul-lvt
|
|
||||||
(: (? ,char-set:hangul-lv) (* ,char-set:hangul-v)))
|
|
||||||
(+ ,char-set:hangul-t))
|
|
||||||
(+ ,char-set:regional-indicator)
|
(+ ,char-set:regional-indicator)
|
||||||
control
|
(: "\r\n")
|
||||||
(: (~ control ("\r\n"))
|
(: (~ control ("\r\n"))
|
||||||
(+ ,char-set:extend-or-spacing-mark)))
|
(+ ,char-set:extend-or-spacing-mark))
|
||||||
|
control)
|
||||||
flags
|
flags
|
||||||
next))
|
next))
|
||||||
((word) (->rx '(word+ any) flags next))
|
((word) (->rx '(word+ any) flags next))
|
||||||
|
|
Loading…
Add table
Reference in a new issue