ranges: maybe last rename, remove experimental .. and ... parsing words for ranges

diff --git a/basis/math/primes/erato/fast/fast.factor b/basis/math/primes/erato/fast/fast.factor
index ee957afa9473d22ec2e52647a40e00e3e173ddea..bd30ebaa786c2f876e17cace71b81e360a6c577e 100644 (file)
--- a/basis/math/primes/erato/fast/fast.factor
+++ b/basis/math/primes/erato/fast/fast.factor
@@ -10,7 +10,7 @@ IN: math.primes.erato.fast
 <PRIVATE
 
 CONSTANT: wheel-2-3-5-7 $[
-    11 dup 210 + [a,b] [
+    11 dup 210 + [a..b] [
         { 2 3 5 7 } [ divisor? ] with none?
     ] B{ } filter-as differences
 ]

diff --git a/extra/math/extras/extras.factor b/extra/math/extras/extras.factor
index 00686c4f4bee90e550f1fb715bbbc6d809ea447d..8b876e92b0d23cc5600f8c192d69886fd60916c2 100644 (file)
--- a/extra/math/extras/extras.factor
+++ b/extra/math/extras/extras.factor
@@ -335,9 +335,6 @@ PRIVATE>
 : sum-floats ( seq -- n )
     partial-sums sum-exact ;
 
-! SYNTAX: .. dup pop scan-object [a,b) suffix! ;
-! SYNTAX: ... dup pop scan-object [a,b] suffix! ;
-
 : mobius ( n -- x )
     group-factors values [ 1 ] [
         dup [ 1 > ] any?

diff --git a/extra/trees/trees-tests.factor b/extra/trees/trees-tests.factor
index 4a989406ac70c93072f5ab7a05554c77571ba142..6c4ed758500458ea47328f2a3d563c0a41e1f467 100644 (file)
--- a/extra/trees/trees-tests.factor
+++ b/extra/trees/trees-tests.factor
@@ -162,7 +162,7 @@ CONSTANT: test-tree2 TREE{
 { { 120 120 } } [ test-tree2 last-entry ] unit-test
 { 120 } [ test-tree2 last-key ] unit-test
 
-: ?a,b? ( a b ? ? -- range )
+: ?a..b? ( a b ? ? -- range )
     2array {
         { { t t } [ [a..b] ] }
         { { t f } [ [a..b) ] }
@@ -172,7 +172,7 @@ CONSTANT: test-tree2 TREE{
 
 ! subtree>alist
 : test-tree2-subtree>alist ( a b ? ? -- subalist )
-    ?a,b? >array [ even? ] filter [ dup 2array ] map ;
+    ?a..b? >array [ even? ] filter [ dup 2array ] map ;
 
 : subtree>alist ( from-key to-key tree start-inclusive? end-inclusive? -- alist )
     2array {