Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-05-21 14:49:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add missing (scheme char) import for non-chibi implementations.

Browse source 
Prefer Unicode-aware (scheme char) to (chibi) char-up/downcase.
Use char-set:title-case from SRFI-14 for non-chibi implementations.
Fixes issue #233.
This commit is contained in:
Alex Shinn 2014-08-10 11:04:58 +09:00
parent 6f57be54ea
commit a2ca973c4f
3 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/chibi/regexp.scm
View file

@ -494,12 +494,6 @@
(char-set-union %char-set:letter %char-set:digit (char-set #\_))) (char-set-union %char-set:letter %char-set:digit (char-set #\_)))
(define (char-word-constituent? ch) (define (char-word-constituent? ch)
(char-set-contains? char-set:word-constituent ch)) (char-set-contains? char-set:word-constituent ch))
(define char-set:title-case
(char-set-union
(ucs-range->char-set #x1F88 #x1F90)
(ucs-range->char-set #x1F98 #x1FA0)
(ucs-range->char-set #x1FA8 #x1FB0)
(char-set #\x01C5 #\x01C8 #\x01CB #\x01F2 #\x1FBC #\x1FCC #\x1FFC)))
(define get-char-set:cased (define get-char-set:cased
(let ((char-set:cased #f)) (let ((char-set:cased #f))
(lambda () (lambda ()

20
lib/chibi/regexp.sld
View file

@ -12,12 +12,24 @@
;; Chibi's char-set library is more factored than SRFI-14. ;; Chibi's char-set library is more factored than SRFI-14.
(cond-expand (cond-expand
(chibi (chibi
(import (rename (chibi) (protect guard)) (import (rename (chibi)
(srfi 9) (chibi char-set) (protect guard)
(char-downcase %char-downcase)
(char-upcase %char-upcase))
(only (scheme char) char-downcase char-upcase)
(srfi 9)
(chibi char-set)
(chibi char-set full) (chibi char-set full)
(prefix (chibi char-set ascii) %))) (prefix (chibi char-set ascii) %))
(begin
(define char-set:title-case
(char-set-union
(ucs-range->char-set #x1F88 #x1F90)
(ucs-range->char-set #x1F98 #x1FA0)
(ucs-range->char-set #x1FA8 #x1FB0)
(char-set #\x01C5 #\x01C8 #\x01CB #\x01F2 #\x1FBC #\x1FCC #\x1FFC)))))
(else (else
(import (scheme base) (srfi 14)) (import (scheme base) (scheme char) (srfi 14))
(begin (begin
(define %char-set:letter (define %char-set:letter
(char-set-intersection char-set:ascii char-set:letter)) (char-set-intersection char-set:ascii char-set:letter))

1
tests/regexp-tests.scm
View file

@ -179,6 +179,7 @@
(test-re '("кириллица") '(* alpha) "кириллица") (test-re '("кириллица") '(* alpha) "кириллица")
(test-re #f '(w/ascii (* alpha)) "кириллица") (test-re #f '(w/ascii (* alpha)) "кириллица")
(test-re '("кириллица") '(w/nocase "КИРИЛЛИЦА") "кириллица")
(test-re '("１２３４５") '(* digit) "１２３４５") (test-re '("１２３４５") '(* digit) "１２３４５")
(test-re #f '(w/ascii (* digit)) "１２３４５") (test-re #f '(w/ascii (* digit)) "１２３４５")