remove dipd, it's 2dip

diff --git a/extra/combinators/lib/lib-docs.factor b/extra/combinators/lib/lib-docs.factor
index c88ce8d9f9ea75c1e562cfcbd8db7f988fc7f4d4..355d5647df9b55eafe4efc0877eb64bd26cb7591 100755 (executable)
--- a/extra/combinators/lib/lib-docs.factor
+++ b/extra/combinators/lib/lib-docs.factor
@@ -23,7 +23,7 @@ HELP: ndip
   { $example "USING: combinators.lib kernel prettyprint ;" "1 2 [ dup ] 1 ndip .s" "1\n1\n2" }
   { $example "USING: combinators.lib kernel prettyprint ;" "1 2 3 [ drop ] 2 ndip .s" "2\n3" }
 }
-{ $see-also dip dipd } ;
+{ $see-also dip 2dip } ;
 
 HELP: nslip
 { $values { "n" number } }

diff --git a/extra/combinators/lib/lib-tests.factor b/extra/combinators/lib/lib-tests.factor
index 54847dc8b3d512395c988426ffd1c4309fd73756..200a667b6b39d400b87cded9aa3b642e0361ba78 100755 (executable)
--- a/extra/combinators/lib/lib-tests.factor
+++ b/extra/combinators/lib/lib-tests.factor
@@ -5,9 +5,6 @@ IN: combinators.lib.tests
 [ 5 ] [ [ 10 random ] [ 5 = ] generate ] unit-test
 [ t ] [ [ 10 random ] [ even? ] generate even? ] unit-test
 
-{ 6 2 } [ 1 2 [ 5 + ] dip ] unit-test
-{ 6 2 1 } [ 1 2 1 [ 5 + ] dipd ] unit-test
-
 [ [ 99 ] 1 2 3 4 5 5 nslip ] must-infer
 { 99 1 2 3 4 5 } [ [ 99 ] 1 2 3 4 5 5 nslip ] unit-test
 [ 1 2 3 4 5 [ drop drop drop drop drop 2 ] 5 nkeep ] must-infer

diff --git a/extra/combinators/lib/lib.factor b/extra/combinators/lib/lib.factor
index d4a938664927628e5adab5668287aa5ccf920c4d..4c4a98893531681cb780587138a7ce5d88a5c83a 100755 (executable)
--- a/extra/combinators/lib/lib.factor
+++ b/extra/combinators/lib/lib.factor
@@ -38,8 +38,6 @@ MACRO: napply ( n -- )
 
 : 3apply ( obj obj obj quot -- ) 3 napply ; inline
 
-: dipd ( x y quot -- y ) 2 ndip ; inline
-
 : 2with ( param1 param2 obj quot -- obj curry )
     with with ; inline
 

diff --git a/extra/lisp/parser/parser.factor b/extra/lisp/parser/parser.factor
index 44c79fd962cf8d565b0c7eea197ed8bc4f587ebf..cf5ff56331c8664363fcc505e828b4dd4be499ba 100644 (file)
--- a/extra/lisp/parser/parser.factor
+++ b/extra/lisp/parser/parser.factor
@@ -19,7 +19,7 @@ dquote       = '"'
 squote       = "'"
 digit        = [0-9]
 integer      = ("-")? (digit)+                           => [[ first2 append string>number ]]
-float        = integer "." (digit)*                      => [[ first3 >string [ number>string ] dipd 3append string>number ]]
+float        = integer "." (digit)*                      => [[ first3 >string [ number>string ] 2dip 3append string>number ]]
 rational     = integer "/" (digit)+                      => [[ first3 nip string>number / ]]
 number       = float
               | rational

diff --git a/extra/peg/ebnf/ebnf.factor b/extra/peg/ebnf/ebnf.factor
index c3252de5006bb2da5db90ab974236b32e7812c12..8a3a06c58d22f7476e333920f3d2d51a0430d4d5 100644 (file)
--- a/extra/peg/ebnf/ebnf.factor
+++ b/extra/peg/ebnf/ebnf.factor
@@ -50,7 +50,7 @@ C: <ebnf> ebnf
 : syntax-pack ( begin parser end -- parser )\r
   #! Parse 'parser' surrounded by syntax elements\r
   #! begin and end.\r
-  [ syntax ] dipd syntax pack ;\r
+  [ syntax ] 2dip syntax pack ;\r
 \r
 : 'identifier' ( -- parser )\r
   #! Return a parser that parses an identifer delimited by\r

diff --git a/extra/project-euler/047/047.factor b/extra/project-euler/047/047.factor
index 98e819a7dbd257f73cb8460e5f7a9de4d847b619..e59ca56f396d4e7e3be59bd08263c67eb1f26f22 100644 (file)
--- a/extra/project-euler/047/047.factor
+++ b/extra/project-euler/047/047.factor
@@ -35,8 +35,8 @@ IN: project-euler.047
     pick pick = [
         swap - nip
     ] [
-        dup prime? [ [ drop 0 ] dipd ] [
-            2dup unique-factors length = [ [ 1+ ] dipd ] [ [ drop 0 ] dipd ] if
+        dup prime? [ [ drop 0 ] 2dip ] [
+            2dup unique-factors length = [ [ 1+ ] 2dip ] [ [ drop 0 ] 2dip ] if
         ] if 1+ (consecutive)
     ] if ;
 

diff --git a/extra/reports/noise/noise.factor b/extra/reports/noise/noise.factor
index 3b37171da3e7f1a253c69b738174a4aaf1ca373b..f94c774943350e0799906cad2e200218f776c3ff 100755 (executable)
--- a/extra/reports/noise/noise.factor
+++ b/extra/reports/noise/noise.factor
@@ -35,7 +35,7 @@ IN: reports.noise
         { compose 1/2 }\r
         { curry 1/3 }\r
         { dip 1 }\r
-        { dipd 2 }\r
+        { 2dip 2 }\r
         { drop 1/3 }\r
         { dup 1/3 }\r
         { if 1/3 }\r

diff --git a/extra/space-invaders/space-invaders.factor b/extra/space-invaders/space-invaders.factor
index f773d331b1266a7dd5532f3f6b103a8e5bd9493b..d3ca3673f4ae0ebec30d808d3cc5578666b6ff24 100755 (executable)
--- a/extra/space-invaders/space-invaders.factor
+++ b/extra/space-invaders/space-invaders.factor
@@ -22,9 +22,9 @@ TUPLE: space-invaders port1 port2i port2o port3o port4lo port4hi port5o bitmap s
 : set-bitmap-pixel ( color point array -- )
   #! 'color' is a {r g b}. Point is {x y}.
   [ bitmap-index ] dip ! color index array
-  [ [ first ] dipd set-uchar-nth ] 3keep
-  [ [ second ] dipd [ 1 + ] dip set-uchar-nth ] 3keep
-  [ third ] dipd [ 2 + ] dip set-uchar-nth ;
+  [ [ first ] 2dip set-uchar-nth ] 3keep
+  [ [ second ] 2dip [ 1 + ] dip set-uchar-nth ] 3keep
+  [ third ] 2dip [ 2 + ] dip set-uchar-nth ;
 
 : get-bitmap-pixel ( point array -- color )
   #! Point is a {x y}. color is a {r g b} 
@@ -311,7 +311,7 @@ M: invaders-gadget draw-gadget* ( gadget -- )
 
 : plot-bitmap-bits ( bitmap point byte bit -- )
   #! point is a {x y}.
-  [ first2 ] dipd
+  [ first2 ] 2dip
   dup swapd -1 * shift 1 bitand 0 =
   [ - 2array ] dip
   [ black ] [ dup get-point-color ] if