From 748ccc06ea70ea0d814c666efba0ed405abf21b7 Mon Sep 17 00:00:00 2001 From: Alex Shinn Date: Thu, 16 Aug 2012 20:48:07 +0900 Subject: [PATCH] Fixing full unicode versions of char- predicates. Thanks to Barry Fishman. --- lib/scheme/char.sld | 5 ++++- lib/scheme/char/full.scm | 10 +++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/scheme/char.sld b/lib/scheme/char.sld index 26e4f1ba..da4a3f0d 100644 --- a/lib/scheme/char.sld +++ b/lib/scheme/char.sld @@ -3,7 +3,10 @@ (import (scheme base)) (cond-expand (full-unicode - (import (chibi char-set full) (chibi iset base) (only (scheme) digit-value)) + (import (chibi char-set full) + (chibi char-set base) + (chibi iset base) + (only (scheme) digit-value)) (include "char/full.scm") (include "char/case-offsets.scm")) (else diff --git a/lib/scheme/char/full.scm b/lib/scheme/char/full.scm index 1beddd1d..f9caac5c 100644 --- a/lib/scheme/char/full.scm +++ b/lib/scheme/char/full.scm @@ -1,9 +1,9 @@ -(define (char-alphabetic? ch) (iset-contains? char-set:letter ch)) -(define (char-lower-case? ch) (iset-contains? char-set:lower-case ch)) -(define (char-upper-case? ch) (iset-contains? char-set:upper-case ch)) -(define (char-numeric? ch) (iset-contains? char-set:digit ch)) -(define (char-whitespace? ch) (iset-contains? char-set:whitespace ch)) +(define (char-alphabetic? ch) (char-set-contains? char-set:letter ch)) +(define (char-lower-case? ch) (char-set-contains? char-set:lower-case ch)) +(define (char-upper-case? ch) (char-set-contains? char-set:upper-case ch)) +(define (char-numeric? ch) (char-set-contains? char-set:digit ch)) +(define (char-whitespace? ch) (char-set-contains? char-set:whitespace ch)) (define (char-downcase ch) (let ((n (char->integer ch)))