interval-sets: rename in? to interval-in?.

Previously this word conflicted with sets:in?.

diff --git a/basis/interval-sets/interval-sets.factor b/basis/interval-sets/interval-sets.factor
index 3ebb9945540f719a6ec375c344a6d9cea77c7b5b..048551c6351175c562faf9762f9f8990ea7bdd9d 100644 (file)
--- a/basis/interval-sets/interval-sets.factor
+++ b/basis/interval-sets/interval-sets.factor
@@ -11,7 +11,7 @@ IN: interval-sets
 ! Intervals are a pair of { start end }
 TUPLE: interval-set { array uint-array read-only } ;
 
-: in? ( key set -- ? )
+: interval-in? ( key set -- ? )
     interval-set check-instance array>>
     dupd [ <=> ] with search swap [
         even? [ >= ] [ 1 - <= ] if

diff --git a/basis/unicode/data/data.factor b/basis/unicode/data/data.factor
index 32ac3e94fa7d36a36d838e71d37a2a59daaf342c..c1497d081d09cb8de208cbcd62bf94d4d5950deb 100644 (file)
--- a/basis/unicode/data/data.factor
+++ b/basis/unicode/data/data.factor
@@ -33,7 +33,7 @@ CONSTANT: name-map H{ }
 : combining-class ( char -- n ) class-map at ; inline
 : non-starter? ( char -- ? ) combining-class { 0 f } member? not ; inline
 : property ( property -- interval-map ) properties at ; foldable
-: property? ( char property -- ? ) property interval-sets:in? ; inline
+: property? ( char property -- ? ) property interval-in? ; inline
 : special-case ( ch -- casing-tuple ) special-casing at ; inline
 
 ! For non-existent characters, use Cn

diff --git a/extra/benchmark/interval-sets/interval-sets.factor b/extra/benchmark/interval-sets/interval-sets.factor
index b8abb2d26b11509d2f07baf561b3813ef0a809b7..66e7bfeaa076e78318c5412a387d0362045deb53 100644 (file)
--- a/extra/benchmark/interval-sets/interval-sets.factor
+++ b/extra/benchmark/interval-sets/interval-sets.factor
@@ -9,6 +9,6 @@ IN: benchmark.interval-sets
 : interval-sets-benchmark ( -- )
     10,000 [ random-32 ] replicate natural-sort
     2 <groups> <interval-set>
-    3,000,000 swap '[ random-32 _ in? drop ] times ;
+    3,000,000 swap '[ random-32 _ interval-in? drop ] times ;
 
 MAIN: interval-sets-benchmark