Delete empty unit tests files, remove 1- and 1+, reorder IN: lines in a lot of places...

[factor.git] / extra / sequences / product / product.factor

diff --git a/extra/sequences/product/product.factor b/extra/sequences/product/product.factor
index 665d43f0cd00ed646f236778158ec6bf41dbfbcd..9291fad3c080d3cfea1d41dda1273503d3729ecb 100644 (file)
--- a/extra/sequences/product/product.factor
+++ b/extra/sequences/product/product.factor
@@ -23,11 +23,11 @@ M: product-sequence length lengths>> product ;
     [ lengths>> ns ] [ nip sequences>> ] 2bi ;
 
 :: (carry-n) ( ns lengths i -- )
-    ns length i 1+ = [
+    ns length i 1 + = [
         i ns nth i lengths nth = [
             0 i ns set-nth
-            i 1+ ns [ 1+ ] change-nth
-            ns lengths i 1+ (carry-n)
+            i 1 + ns [ 1 + ] change-nth
+            ns lengths i 1 + (carry-n)
         ] when
     ] unless ;
 
@@ -35,7 +35,7 @@ M: product-sequence length lengths>> product ;
     0 (carry-n) ;
     
 : product-iter ( ns lengths -- )
-    [ 0 over [ 1+ ] change-nth ] dip carry-ns ;
+    [ 0 over [ 1 + ] change-nth ] dip carry-ns ;
 
 : start-product-iter ( sequence-product -- ns lengths )
     [ [ drop 0 ] map ] [ [ length ] map ] bi ;
@@ -57,7 +57,7 @@ M: product-sequence nth
     0 :> i!
     sequences [ length ] [ * ] map-reduce sequences
     [| result |
-        sequences [ quot call i result set-nth i 1+ i! ] product-each
+        sequences [ quot call i result set-nth i 1 + i! ] product-each
         result
     ] new-like ; inline