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

diff --git a/src/runtime/chrset.scm b/src/runtime/chrset.scm
index 986da3729a81b02fb5b43c332e270e09a7d208f5..4fb4390a7fd90bcfe17da6f41bcbaa84e05d8f99 100644 (file)
--- 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 617fdf0973026b2c8c5461a2ee2fdabeeb018673..c7c8918ef6924f4c1dc4ab0d1d7268be4d7fe980 100644 (file)
--- 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?