with-variables: Monads has its own bind word. missed one bind in koszul.

diff --git a/extra/koszul/koszul.factor b/extra/koszul/koszul.factor
index ff1547ed27a9eb226017ebbdd270421a2ba1ffe7..8fdf1559390a3b2564eb4613ea1abcf554e088eb 100644 (file)
--- a/extra/koszul/koszul.factor
+++ b/extra/koszul/koszul.factor
@@ -55,7 +55,7 @@ SYMBOL: terms
 
 ! Addition
 : (alt+) ( x -- )
-    terms get [ [ swap +@ ] assoc-each ] bind ;
+    terms get [ [ swap +@ ] assoc-each ] with-variables ;
 
 : alt+ ( x y -- x+y )
     [ >alt ] bi@ [ (alt+) (alt+) ] with-terms ;

diff --git a/extra/monads/monads-tests.factor b/extra/monads/monads-tests.factor
index 34535a11b5f46fa156ff1814babfae62818682ca..5504633bb636fdac67bc5007f3c930467c142776 100644 (file)
--- a/extra/monads/monads-tests.factor
+++ b/extra/monads/monads-tests.factor
@@ -10,7 +10,7 @@ IN: monads.tests
 ] unit-test
 
 [ nothing ] [
-    111 just [ maybe-monad fail ] with-variables
+    111 just [ maybe-monad fail ] bind
 ] unit-test
 
 [ 100 ] [
@@ -26,7 +26,7 @@ IN: monads.tests
 ] unit-test
 
 [ { } ] [
-    { 1 2 3 } [ drop "OOPS" array-monad fail ] with-variables
+    { 1 2 3 } [ drop "OOPS" array-monad fail ] bind
 ] unit-test
 
 [ 5 ] [
@@ -34,7 +34,7 @@ IN: monads.tests
 ] unit-test
 
 [ 8 ] [
-    5 state-monad return [ 3 + state-monad return ] with-variables
+    5 state-monad return [ 3 + state-monad return ] bind
     "initial state" run-st
 ] unit-test
 
@@ -52,9 +52,9 @@ IN: monads.tests
 
 [ 15 ] [
     f state-monad return
-    [ drop get-st ] with-variables
-    [ 4 + put-st ] with-variables
-    [ drop get-st ] with-variables
+    [ drop get-st ] bind
+    [ 4 + put-st ] bind
+    [ drop get-st ] bind
     11 run-st
 ] unit-test
 
@@ -104,12 +104,12 @@ LAZY: nats-from ( n -- list )
 ] unit-test
 
 [ 6 ] [
-    f reader-monad return [ drop ask ] with-variables [ 1 + ] local 5 run-reader
+    f reader-monad return [ drop ask ] bind [ 1 + ] local 5 run-reader
 ] unit-test
 
 [ f { 1 2 3 } ] [
     5 writer-monad return
-    [ drop { 1 2 3 } tell ] with-variables
+    [ drop { 1 2 3 } tell ] bind
     run-writer
 ] unit-test