Add CHAR-CTL? and CHAR-WSP? predicates.

diff --git a/v7/src/runtime/chrset.scm b/v7/src/runtime/chrset.scm
index 1738a7484d2577825374611458701155ca5d0682..dcec1f083a9d29396a46ba612cfb86995487b78b 100644 (file)
--- a/v7/src/runtime/chrset.scm
+++ b/v7/src/runtime/chrset.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: chrset.scm,v 14.24 2008/07/08 06:14:26 cph Exp $
+$Id: chrset.scm,v 14.25 2008/09/15 07:07:27 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -270,4 +270,12 @@ USA.
   (%char-standard? char))
 
 (define-integrable (%char-standard? char)
-  (%char-set-member? char-set:standard char))
\ No newline at end of file
+  (%char-set-member? char-set:standard char))
+
+(define (char-ctl? char)
+  (guarantee-char char 'CHAR-CTL?)
+  (%char-set-member? char-set:ctl char))
+
+(define (char-wsp? char)
+  (guarantee-char char 'CHAR-WSP?)
+  (%char-set-member? char-set:wsp char))
\ No newline at end of file

diff --git a/v7/src/runtime/rfc2822-headers.scm b/v7/src/runtime/rfc2822-headers.scm
index e1df0415e23b7ba03a6f8613ebfe0d3df737771d..2d53a48bd9fbec678929a838e7ea1ae89bf7f6f6 100644 (file)
--- a/v7/src/runtime/rfc2822-headers.scm
+++ b/v7/src/runtime/rfc2822-headers.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: rfc2822-headers.scm,v 14.1 2008/08/24 07:20:09 cph Exp $
+$Id: rfc2822-headers.scm,v 14.2 2008/09/15 07:07:51 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -191,9 +191,6 @@ USA.
               (substring string start* end*))))
       (guarantee-header-value string)
       string)))
-
-(define (char-wsp? char)
-  (char-set-member? char-set:wsp char))
 \f
 ;;;; Quotation
 

diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg
index 86a5582af5c81dc87c8fa58cc14449740bb9a2ac..5aed780ff9cbdf0d82bcaea357e0fbcda4b4dd08 100644 (file)
--- a/v7/src/runtime/runtime.pkg
+++ b/v7/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: runtime.pkg,v 14.680 2008/09/15 05:18:41 cph Exp $
+$Id: runtime.pkg,v 14.681 2008/09/15 07:07:31 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -1046,6 +1046,7 @@ USA.
          ascii-range->char-set
          char-alphabetic?
          char-alphanumeric?
+         char-ctl?
          char-graphic?
          char-lower-case?
          char-numeric?
@@ -1081,6 +1082,7 @@ USA.
          char-standard?
          char-upper-case?
          char-whitespace?
+         char-wsp?
          chars->char-set
          guarantee-char-set
          predicate->char-set