CHAR-SET-CONTAINS? had extra code to make sure it did not work when
applied to a non-ASCII char. Now fixed.
This commit is contained in:
parent
755913967b
commit
acaaedd035
|
@ -19,10 +19,7 @@
|
||||||
|
|
||||||
(define (char-ascii? char)
|
(define (char-ascii? char)
|
||||||
(let ((maybe-ascii (char->ascii char)))
|
(let ((maybe-ascii (char->ascii char)))
|
||||||
(if (and (< maybe-ascii 128)
|
(and (<= 0 maybe-ascii 127) maybe-ascii)))
|
||||||
(>= maybe-ascii 0))
|
|
||||||
maybe-ascii
|
|
||||||
#f)))
|
|
||||||
|
|
||||||
;;;; Character Sets
|
;;;; Character Sets
|
||||||
|
|
||||||
|
@ -94,8 +91,7 @@
|
||||||
;;; its arg order -- (CHAR-SET-CONTAINS? cset char).
|
;;; its arg order -- (CHAR-SET-CONTAINS? cset char).
|
||||||
|
|
||||||
(define (char-set-contains? char-set char)
|
(define (char-set-contains? char-set char)
|
||||||
(let ((ascii (char-ascii? char)))
|
(not (zero? (char->ascii (string-ref char-set (char->ascii char))))))
|
||||||
(and ascii (not (zero? (char->ascii (string-ref char-set ascii)))))))
|
|
||||||
|
|
||||||
;;; This actually isn't exported. Just CYA.
|
;;; This actually isn't exported. Just CYA.
|
||||||
(define (char-set-member? . args)
|
(define (char-set-member? . args)
|
||||||
|
@ -167,7 +163,7 @@
|
||||||
|
|
||||||
;;; Bullshit legalese
|
;;; Bullshit legalese
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
;$Header: /home/flat/Dropbox/Hacks/scsh/scsh-cvs/scsh-0.5/scsh/char-set.scm,v 1.1 1995/10/14 03:33:40 bdc Exp $
|
;$Header: /home/flat/Dropbox/Hacks/scsh/scsh-cvs/scsh-0.5/scsh/char-set.scm,v 1.2 1995/11/20 06:20:12 shivers Exp $
|
||||||
|
|
||||||
;Copyright (c) 1988 Massachusetts Institute of Technology
|
;Copyright (c) 1988 Massachusetts Institute of Technology
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue