From: Doug Coleman Date: Wed, 20 Jun 2018 04:39:33 +0000 (-0500) Subject: factor: fix a few issues with new patch. X-Git-Tag: 0.98~86 X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=88e58f9da81f7ded291bd58ca8bbfe62ca30ae67 factor: fix a few issues with new patch. --- diff --git a/basis/shuffle/shuffle.factor b/basis/shuffle/shuffle.factor index bc78fd6dc8..d4619b1c5f 100644 --- a/basis/shuffle/shuffle.factor +++ b/basis/shuffle/shuffle.factor @@ -14,6 +14,4 @@ MACRO: shuffle-effect ( effect -- quot ) SYNTAX: shuffle( ")" parse-effect suffix! \ shuffle-effect suffix! ; -: spin ( x y z -- z y x ) swap rot ; inline deprecated - : 2swap ( x y z t -- z t x y ) 2 2 mnswap ; inline diff --git a/extra/24-game/24-game.factor b/extra/24-game/24-game.factor index fa13438081..7dc68f89b4 100644 --- a/extra/24-game/24-game.factor +++ b/extra/24-game/24-game.factor @@ -1,7 +1,7 @@ ! Copyright © 2008 Reginald Keith Ford II ! 24, the Factor game! USING: accessors backtrack combinators continuations formatting fry io -kernel math prettyprint quotations random sequences shuffle ; +kernel math prettyprint quotations random sequences ; IN: 24-game : nop ( -- ) ; diff --git a/extra/pcre/pcre.factor b/extra/pcre/pcre.factor index f30f70a71f..3bff03aaab 100644 --- a/extra/pcre/pcre.factor +++ b/extra/pcre/pcre.factor @@ -90,7 +90,7 @@ ERROR: pcre-error value ; 0 { c-string } [ pcre_study ] with-out-parameters drop ; : exec ( pcre extra subject ofs opts -- count match-data ) - [ dup length ] 2dip 30 int 30 [ pcre_exec ] keepd; + [ dup length ] 2dip 30 int 30 [ pcre_exec ] keepd ; TUPLE: matcher pcre extra subject ofs exec-opts ;