From: Chris Hanson <org/chris-hanson/cph>
Date: Mon, 31 May 2010 10:04:43 +0000 (-0700)
Subject: Implement SCALAR-VALUE-IN-CHAR-SET?.
X-Git-Tag: 20100708-Gtk~38
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=324c71426ac8b02013d16f9f609a1ab18915a1e3;p=mit-scheme.git

Implement SCALAR-VALUE-IN-CHAR-SET?.
---

diff --git a/src/runtime/chrset.scm b/src/runtime/chrset.scm
index 986da3729..4fb4390a7 100644
--- a/src/runtime/chrset.scm
+++ b/src/runtime/chrset.scm
@@ -252,6 +252,11 @@ USA.
   (guarantee-unicode-char char 'CHAR-SET-MEMBER?)
   (%scalar-value-in-char-set? (char-code char) char-set))
 
+(define (scalar-value-in-char-set? scalar-value char-set)
+  (guarantee-unicode-scalar-value scalar-value 'SCALAR-VALUE-IN-CHAR-SET?)
+  (guarantee-char-set char-set 'SCALAR-VALUE-IN-CHAR-SET?)
+  (%scalar-value-in-char-set? scalar-value char-set))
+
 (define (%scalar-value-in-char-set? value char-set)
   (if (fix:< value %low-limit)
       (%low-ref (%char-set-low char-set) value)
diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg
index 617fdf097..c7c8918ef 100644
--- a/src/runtime/runtime.pkg
+++ b/src/runtime/runtime.pkg
@@ -1137,6 +1137,7 @@ USA.
 	  guarantee-char-set
 	  guarantee-well-formed-scalar-value-list
 	  guarantee-well-formed-scalar-value-range
+	  scalar-value-in-char-set?
 	  scalar-values->char-set
 	  string->char-set
 	  well-formed-scalar-value-list?