Fix smart-if* for multiple inputs and test. oops

diff --git a/basis/combinators/smart/smart-tests.factor b/basis/combinators/smart/smart-tests.factor
index ec05bd67c3bc600cc7cec41b220282c67194dea1..8933c4bb39f1545572fa1ebedc316ab261423cee 100644 (file)
--- a/basis/combinators/smart/smart-tests.factor
+++ b/basis/combinators/smart/smart-tests.factor
@@ -73,3 +73,6 @@ IN: combinators.smart.tests
 [ ] [ 3 [ even? ] [ 2 + ] smart-when* ] unit-test
 [ 3 ] [ 2 [ odd? ] [ 3 ] smart-unless* ] unit-test
 [ 3 ] [ 3 [ odd? ] [ 5 ] smart-unless* ] unit-test
+
+[ -1 ] [ 1 2 [ + odd? ] [ - ] smart-when* ] unit-test
+[ ] [ 2 2 [ + odd? ] [ ] smart-unless* ] unit-test

diff --git a/basis/combinators/smart/smart.factor b/basis/combinators/smart/smart.factor
index c4bb35ef4e8b5c0d2c316e99f4d4e456eb892a38..a907d2d29754fc492c0a9fded5bd0b3250d97fce 100644 (file)
--- a/basis/combinators/smart/smart.factor
+++ b/basis/combinators/smart/smart.factor
@@ -50,7 +50,7 @@ MACRO: nullary ( quot -- quot' )
     dup outputs '[ @ _ ndrop ] ;
 
 MACRO: dropping ( quot -- quot' )
-    outputs '[ [ _ ndrop ] ] ;
+    inputs '[ [ _ ndrop ] ] ;
 
 MACRO: balancing ( quot -- quot' )
     '[ _ [ preserving ] [ dropping ] bi ] ;