From 65faa3fda3239f7db334fcd1833dfc8503e48746 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sun, 10 May 2009 17:03:41 -0500 Subject: [PATCH] Fix unit tests and load errors for slip removal --- basis/compiler/tests/curry.factor | 2 +- .../escape-analysis/escape-analysis-tests.factor | 2 +- .../tree/tuple-unboxing/tuple-unboxing-tests.factor | 2 +- basis/stack-checker/stack-checker-tests.factor | 2 +- basis/windows/com/com.factor | 2 +- basis/windows/com/wrapper/wrapper.factor | 2 +- core/kernel/kernel-tests.factor | 12 ++++-------- extra/crypto/timing/authors.txt | 1 - extra/crypto/timing/timing-tests.factor | 4 ---- extra/crypto/timing/timing.factor | 8 -------- extra/reports/noise/noise.factor | 3 --- extra/spider/unique-deque/unique-deque.factor | 4 ++-- 12 files changed, 12 insertions(+), 32 deletions(-) delete mode 100755 extra/crypto/timing/authors.txt delete mode 100644 extra/crypto/timing/timing-tests.factor delete mode 100644 extra/crypto/timing/timing.factor diff --git a/basis/compiler/tests/curry.factor b/basis/compiler/tests/curry.factor index 32611ba87a..b541e19f34 100644 --- a/basis/compiler/tests/curry.factor +++ b/basis/compiler/tests/curry.factor @@ -33,7 +33,7 @@ IN: compiler.tests.curry ] unit-test : foobar ( quot: ( -- ) -- ) - dup slip swap [ foobar ] [ drop ] if ; inline recursive + [ call ] keep swap [ foobar ] [ drop ] if ; inline recursive [ ] [ [ [ f ] foobar ] compile-call ] unit-test diff --git a/basis/compiler/tree/escape-analysis/escape-analysis-tests.factor b/basis/compiler/tree/escape-analysis/escape-analysis-tests.factor index 5f89372ebe..3d9d77ae56 100644 --- a/basis/compiler/tree/escape-analysis/escape-analysis-tests.factor +++ b/basis/compiler/tree/escape-analysis/escape-analysis-tests.factor @@ -302,7 +302,7 @@ C: ro-box [ 0 ] [ [ 1 cons boa "x" get slot ] count-unboxed-allocations ] unit-test : impeach-node ( quot: ( node -- ) -- ) - dup slip impeach-node ; inline recursive + [ call ] keep impeach-node ; inline recursive : bleach-node ( quot: ( node -- ) -- ) [ bleach-node ] curry [ ] compose impeach-node ; inline recursive diff --git a/basis/compiler/tree/tuple-unboxing/tuple-unboxing-tests.factor b/basis/compiler/tree/tuple-unboxing/tuple-unboxing-tests.factor index 70670648b1..0d5f05fab0 100644 --- a/basis/compiler/tree/tuple-unboxing/tuple-unboxing-tests.factor +++ b/basis/compiler/tree/tuple-unboxing/tuple-unboxing-tests.factor @@ -39,7 +39,7 @@ TUPLE: empty-tuple ; ! A more complicated example : impeach-node ( quot: ( node -- ) -- ) - dup slip impeach-node ; inline recursive + [ call ] keep impeach-node ; inline recursive : bleach-node ( quot: ( node -- ) -- ) [ bleach-node ] curry [ ] compose impeach-node ; inline recursive diff --git a/basis/stack-checker/stack-checker-tests.factor b/basis/stack-checker/stack-checker-tests.factor index 919cd098f6..201f3ce30b 100644 --- a/basis/stack-checker/stack-checker-tests.factor +++ b/basis/stack-checker/stack-checker-tests.factor @@ -180,7 +180,7 @@ DEFER: blah4 over [ 2drop ] [ - [ swap slip ] keep swap bad-combinator + [ dip ] keep swap bad-combinator ] if ; inline recursive [ [ [ 1 ] [ ] bad-combinator ] infer ] must-fail diff --git a/basis/windows/com/com.factor b/basis/windows/com/com.factor index af828c9145..d485692a91 100644 --- a/basis/windows/com/com.factor +++ b/basis/windows/com/com.factor @@ -40,6 +40,6 @@ COM-INTERFACE: IDropTarget IUnknown {00000122-0000-0000-C000-000000000046} IUnknown::Release drop ; inline : with-com-interface ( interface quot -- ) - over [ slip ] [ com-release ] [ ] cleanup ; inline + over [ com-release ] curry [ ] cleanup ; inline DESTRUCTOR: com-release diff --git a/basis/windows/com/wrapper/wrapper.factor b/basis/windows/com/wrapper/wrapper.factor index e78c987cd4..9d52378da9 100755 --- a/basis/windows/com/wrapper/wrapper.factor +++ b/basis/windows/com/wrapper/wrapper.factor @@ -93,7 +93,7 @@ unless : compile-alien-callback ( word return parameters abi quot -- word ) '[ _ _ _ _ alien-callback ] - [ [ (( -- alien )) define-declared ] pick slip ] + [ [ (( -- alien )) define-declared ] pick [ call ] dip ] with-compilation-unit ; : (callback-word) ( function-name interface-name counter -- word ) diff --git a/core/kernel/kernel-tests.factor b/core/kernel/kernel-tests.factor index 5a88db4f9e..c8e0fcd2a9 100644 --- a/core/kernel/kernel-tests.factor +++ b/core/kernel/kernel-tests.factor @@ -61,20 +61,16 @@ IN: kernel.tests [ 2 ] [ f 2 xor ] unit-test [ f ] [ f f xor ] unit-test -[ slip ] must-fail +[ dip ] must-fail [ ] [ :c ] unit-test -[ 1 slip ] must-fail +[ 1 [ call ] dip ] must-fail [ ] [ :c ] unit-test -[ 1 2 slip ] must-fail +[ 1 2 [ call ] dip ] must-fail [ ] [ :c ] unit-test -[ 1 2 3 slip ] must-fail -[ ] [ :c ] unit-test - - -[ 5 ] [ [ 2 2 + ] 1 slip + ] unit-test +[ 5 ] [ 1 [ 2 2 + ] dip + ] unit-test [ [ ] keep ] must-fail diff --git a/extra/crypto/timing/authors.txt b/extra/crypto/timing/authors.txt deleted file mode 100755 index 7c1b2f2279..0000000000 --- a/extra/crypto/timing/authors.txt +++ /dev/null @@ -1 +0,0 @@ -Doug Coleman diff --git a/extra/crypto/timing/timing-tests.factor b/extra/crypto/timing/timing-tests.factor deleted file mode 100644 index 9afb913724..0000000000 --- a/extra/crypto/timing/timing-tests.factor +++ /dev/null @@ -1,4 +0,0 @@ -USING: crypto.timing kernel tools.test system math ; -IN: crypto.timing.tests - -[ t ] [ millis [ ] 1000 with-timing millis swap - 1000 >= ] unit-test diff --git a/extra/crypto/timing/timing.factor b/extra/crypto/timing/timing.factor deleted file mode 100644 index b2a59a1851..0000000000 --- a/extra/crypto/timing/timing.factor +++ /dev/null @@ -1,8 +0,0 @@ -! Copyright (C) 2008 Doug Coleman. -! See http://factorcode.org/license.txt for BSD license. -USING: kernel math threads system calendar ; -IN: crypto.timing - -: with-timing ( quot n -- ) - #! force the quotation to execute in, at minimum, n milliseconds - millis 2slip millis - + milliseconds sleep ; inline diff --git a/extra/reports/noise/noise.factor b/extra/reports/noise/noise.factor index 51196279ff..f5c2ea9811 100755 --- a/extra/reports/noise/noise.factor +++ b/extra/reports/noise/noise.factor @@ -19,13 +19,11 @@ IN: reports.noise { 2keep 1 } { 2nip 2 } { 2over 4 } - { 2slip 2 } { 2swap 3 } { 3curry 2 } { 3drop 1 } { 3dup 2 } { 3keep 3 } - { 3slip 3 } { 4drop 2 } { 4dup 3 } { compose 1/2 } @@ -58,7 +56,6 @@ IN: reports.noise { pick 4 } { roll 4 } { rot 3 } - { slip 1 } { spin 3 } { swap 1 } { swapd 3 } diff --git a/extra/spider/unique-deque/unique-deque.factor b/extra/spider/unique-deque/unique-deque.factor index b26797f8d5..b4bbc9fbf8 100644 --- a/extra/spider/unique-deque/unique-deque.factor +++ b/extra/spider/unique-deque/unique-deque.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2009 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors assocs deques dlists kernel spider ; +USING: accessors assocs deques dlists kernel ; IN: spider.unique-deque TUPLE: todo-url url depth ; @@ -32,6 +32,6 @@ TUPLE: unique-deque assoc deque ; : slurp-deque-when ( deque quot1 quot2: ( value -- ) -- ) pick deque-empty? [ 3drop ] [ - [ [ pop-front dup ] 2dip slip [ t ] compose [ drop f ] if ] + [ [ pop-front dup ] 2dip [ call ] dip [ t ] compose [ drop f ] if ] [ roll [ slurp-deque-when ] [ 3drop ] if ] 3bi ] if ; inline recursive