From 27c238c5bf52b1e23f08b314d43ccc3987ce1c25 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Thu, 30 Dec 2021 13:48:08 -0600 Subject: [PATCH] factor: Final rename of ranges words and fix up some using lists --- README.md | 2 +- basis/calendar/calendar-tests.factor | 2 +- basis/cbor/cbor-tests.factor | 4 ++-- basis/math/functions/functions-tests.factor | 2 +- core/math/floats/floats.factor | 2 +- core/math/parser/parser.factor | 5 +++-- core/sequences/sequences-docs.factor | 4 ++-- extra/brainfuck/brainfuck-tests.factor | 2 +- extra/math/extras/extras-tests.factor | 10 +++++----- extra/picomath/picomath-tests.factor | 2 +- extra/sequences/extras/extras-docs.factor | 2 +- extra/text-to-pdf/text-to-pdf.pdf | 2 +- extra/websites/factorcode/examples.txt | 2 +- 13 files changed, 21 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index c127539d69..94db2d9d2c 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ Some other simple things you can try in the listener: { 4 8 15 16 23 42 } [ 2 * ] map . -1000 [1,b] sum . +1000 [1..b] sum . 4 [ "Happy Birthday " write diff --git a/basis/calendar/calendar-tests.factor b/basis/calendar/calendar-tests.factor index 056def163e..a3a5772d89 100644 --- a/basis/calendar/calendar-tests.factor +++ b/basis/calendar/calendar-tests.factor @@ -208,7 +208,7 @@ IN: calendar ] unit-test { { 1 1 1 2 2 2 3 3 3 4 4 4 } } [ - 12 [1,b] [ 2020 swap 1 quarter ] map + 12 [1..b] [ 2020 swap 1 quarter ] map ] unit-test { 0 } diff --git a/basis/cbor/cbor-tests.factor b/basis/cbor/cbor-tests.factor index 0d356f3297..2e93378753 100644 --- a/basis/cbor/cbor-tests.factor +++ b/basis/cbor/cbor-tests.factor @@ -77,7 +77,7 @@ math.parser ranges tools.test urls ; { { } "80" } { { 1 2 3 } "83010203" } { { 1 { 2 3 } { 4 5 } } "8301820203820405" } - ${ 25 [1,b] >array "98190102030405060708090a0b0c0d0e0f101112131415161718181819" } + ${ 25 [1..b] >array "98190102030405060708090a0b0c0d0e0f101112131415161718181819" } { { } "a0" } { { { 1 2 } { 3 4 } } "a201020304" } { { { "a" 1 } { "b" { 2 3 } } } "a26161016162820203" } @@ -90,7 +90,7 @@ math.parser ranges tools.test urls ; { { 1 { 2 3 } { 4 5 } } "9f01820203820405ff" } { { 1 { 2 3 } { 4 5 } } "83018202039f0405ff" } { { 1 { 2 3 } { 4 5 } } "83019f0203ff820405" } - ${ 25 [1,b] >array "9f0102030405060708090a0b0c0d0e0f101112131415161718181819ff" } + ${ 25 [1..b] >array "9f0102030405060708090a0b0c0d0e0f101112131415161718181819ff" } { { { "a" 1 } { "b" { 2 3 } } } "bf61610161629f0203ffff" } { { "a" { { "b" "c" } } } "826161bf61626163ff" } { { { "Fun" t } { "Amt" -2 } } "bf6346756ef563416d7421ff" } diff --git a/basis/math/functions/functions-tests.factor b/basis/math/functions/functions-tests.factor index dcba10e609..8be020883f 100644 --- a/basis/math/functions/functions-tests.factor +++ b/basis/math/functions/functions-tests.factor @@ -38,7 +38,7 @@ IN: math.functions.tests { 0 } [ 0 3.0 ^ ] unit-test { 0 } [ 0 3 ^ ] unit-test -: factorial ( n -- n! ) [ 1 ] [ [1,b] 1 [ * ] reduce ] if-zero ; +: factorial ( n -- n! ) [ 1 ] [ [1..b] 1 [ * ] reduce ] if-zero ; { 0.0 0 } [ 0 frexp ] unit-test { 0.5 1 } [ 1 frexp ] unit-test diff --git a/core/math/floats/floats.factor b/core/math/floats/floats.factor index c5882724f4..509e42e36e 100644 --- a/core/math/floats/floats.factor +++ b/core/math/floats/floats.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2004, 2010 Slava Pestov, Joe Groff. ! See http://factorcode.org/license.txt for BSD license. -USING: kernel math math.private math.order ; +USING: kernel math math.order math.private ; IN: math.floats string ] map join-lines "\n" append } +${ 100 [0..b] [ dup * number>string ] map join-lines "\n" append } [ " ++++[>+++++<-]>[<+++++>-]+<+[ diff --git a/extra/math/extras/extras-tests.factor b/extra/math/extras/extras-tests.factor index b5dbbbd9be..88240eb03a 100644 --- a/extra/math/extras/extras-tests.factor +++ b/extra/math/extras/extras-tests.factor @@ -15,14 +15,14 @@ tools.test ; { -1 } [ 127 703 jacobi ] unit-test { 1 } [ -4 197 jacobi ] unit-test -{ { 2 3 4 5 6 7 8 9 } } [ 10 [1,b] 3 moving-average ] unit-test +{ { 2 3 4 5 6 7 8 9 } } [ 10 [1..b] 3 moving-average ] unit-test { { 1+1/2 2+1/2 3+1/2 4+1/2 5+1/2 6+1/2 7+1/2 8+1/2 9+1/2 } } -[ 10 [1,b] 2 moving-average ] unit-test +[ 10 [1..b] 2 moving-average ] unit-test { { 1 1+1/2 2+1/4 3+1/8 4+1/16 5+1/32 } } -[ 6 [1,b] 1/2 exponential-moving-average ] unit-test +[ 6 [1..b] 1/2 exponential-moving-average ] unit-test { { 1 3 3 5 5 7 7 9 9 11 } } -[ 10 [1,b] 2 exponential-moving-average ] unit-test +[ 10 [1..b] 2 exponential-moving-average ] unit-test { { 2 5 5 4 3 } } [ { 1 2 5 6 1 4 3 } 3 moving-median ] unit-test @@ -139,7 +139,7 @@ tools.test ; 0 -1 0 -1 0 1 1 -1 0 0 1 0 0 -1 -1 } } [ - 30 [1,b] [ mobius ] map + 30 [1..b] [ mobius ] map ] unit-test { 1/5 } [ 3/5 1 kelly ] unit-test diff --git a/extra/picomath/picomath-tests.factor b/extra/picomath/picomath-tests.factor index a7c01c0eb3..4e1bb81c19 100644 --- a/extra/picomath/picomath-tests.factor +++ b/extra/picomath/picomath-tests.factor @@ -39,7 +39,7 @@ IN: picomath supremum 1e-3 < ] unit-test -: factorial ( n -- n! ) [ 1 ] [ [1,b] 1 [ * ] reduce ] if-zero ; +: factorial ( n -- n! ) [ 1 ] [ [1..b] 1 [ * ] reduce ] if-zero ; { t } [ { 0 1 10 100 1000 10000 } [ diff --git a/extra/sequences/extras/extras-docs.factor b/extra/sequences/extras/extras-docs.factor index 13844e9f9b..4c677954df 100644 --- a/extra/sequences/extras/extras-docs.factor +++ b/extra/sequences/extras/extras-docs.factor @@ -75,7 +75,7 @@ HELP: count* { "quot" { $quotation ( ... elt -- ... ? ) } } { "%" rational } } { $description "Outputs the fraction of elements in the sequence for which the predicate quotation matches." } -{ $examples { $example "USING: math ranges prettyprint sequences.extras ;" "100 [1,b] [ even? ] count* ." "1/2" } } ; +{ $examples { $example "USING: math ranges prettyprint sequences.extras ;" "100 [1..b] [ even? ] count* ." "1/2" } } ; HELP: collapse { $values diff --git a/extra/text-to-pdf/text-to-pdf.pdf b/extra/text-to-pdf/text-to-pdf.pdf index 3520e4a31d..0778fc10a7 100644 --- a/extra/text-to-pdf/text-to-pdf.pdf +++ b/extra/text-to-pdf/text-to-pdf.pdf @@ -211,7 +211,7 @@ BT ( dup length 5 swap 2 range boa zip)' ( [ pdf-page , pdf-text , ] assoc-each)' ( ] { } make)' -( dup length [1,b] zip [ first2 pdf-object ] map ;)' +( dup length [1..b] zip [ first2 pdf-object ] map ;)' ( )' (: objects>pdf \( objects -- str \))' ( [ "\\n" join "\\n" append "%PDF-1.4\\n" ])' diff --git a/extra/websites/factorcode/examples.txt b/extra/websites/factorcode/examples.txt index 3d78df1a66..0c512baf97 100644 --- a/extra/websites/factorcode/examples.txt +++ b/extra/websites/factorcode/examples.txt @@ -90,7 +90,7 @@ USING: combinators io kernel locals math.functions math.parser ranges sequences ; -100 [1,b] [| i | +100 [1..b] [| i | { { [ i 15 divisor? ] [ "FizzBuzz" ] } { [ i 3 divisor? ] [ "Fizz" ] } -- 2.34.1