From 55cf5472a56e58f40553b6a9b8c6ca0477123747 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Mon, 11 Jul 2016 19:50:37 -0700 Subject: [PATCH] using [ ] [ ... ] ?if instead of [ nip ] [ ... ] if*. --- basis/alien/libraries/finder/finder.factor | 2 +- basis/gobject-introspection/ffi/ffi.factor | 2 +- basis/ip-parser/ip-parser.factor | 2 +- basis/json/reader/reader.factor | 2 +- basis/math/matrices/elimination/elimination.factor | 2 +- basis/memoize/memoize.factor | 2 +- basis/ui/gadgets/paragraphs/paragraphs.factor | 2 +- basis/ui/tools/listener/listener.factor | 2 +- basis/unix/groups/groups.factor | 2 +- basis/xml/name/name.factor | 2 +- extra/benchmark/sha1/sha1.factor | 11 +++++++++++ extra/ecdsa/ecdsa.factor | 2 +- extra/gml/b-rep/b-rep.factor | 2 +- extra/gpu/shaders/shaders.factor | 2 +- extra/irc/client/base/base.factor | 2 +- extra/money/money.factor | 2 +- .../probabilistic-choice/probabilistic-choice.factor | 2 +- unmaintained/opengl-gadgets/gadgets.factor | 2 +- unmaintained/semantic-db/semantic-db.factor | 2 +- unmaintained/tangle/menu/menu.factor | 2 +- 20 files changed, 30 insertions(+), 19 deletions(-) diff --git a/basis/alien/libraries/finder/finder.factor b/basis/alien/libraries/finder/finder.factor index 268137a2db..8c26d23973 100644 --- a/basis/alien/libraries/finder/finder.factor +++ b/basis/alien/libraries/finder/finder.factor @@ -19,6 +19,6 @@ HOOK: find-library* os ( name -- path/f ) ! or "library_not_found" as a last resort for better debugging. : find-library-from-list ( seq -- path/f ) dup [ find-library* ] map-find drop - [ nip ] [ ?first "library_not_found" or ] if* ; + [ ] [ ?first "library_not_found" or ] ?if ; "alien.libraries.finder." os name>> append require diff --git a/basis/gobject-introspection/ffi/ffi.factor b/basis/gobject-introspection/ffi/ffi.factor index c501958c93..6e51f8010e 100644 --- a/basis/gobject-introspection/ffi/ffi.factor +++ b/basis/gobject-introspection/ffi/ffi.factor @@ -304,7 +304,7 @@ M: array-type field-type>c-type type>c-type ; [ [ dup find-existing-boxed-type - [ nip ] [ c-type>> defer-c-type ] if* + [ ] [ c-type>> defer-c-type ] ?if ] [ name>> qualified-name ] bi boxed-info new swap register-type diff --git a/basis/ip-parser/ip-parser.factor b/basis/ip-parser/ip-parser.factor index 45a3928247..d08477d5f9 100644 --- a/basis/ip-parser/ip-parser.factor +++ b/basis/ip-parser/ip-parser.factor @@ -59,7 +59,7 @@ ERROR: more-than-8-components ; [ nip ] [ bad-ipv6-component ] if* ; + dup hex> [ ] [ bad-ipv6-component ] ?if ; : split-ipv6 ( string -- seq ) ":" split CHAR: . over last member? [ unclip-last ] [ f ] if diff --git a/basis/json/reader/reader.factor b/basis/json/reader/reader.factor index 742d8773f5..e08e1ae5b4 100644 --- a/basis/json/reader/reader.factor +++ b/basis/json/reader/reader.factor @@ -17,7 +17,7 @@ ERROR: not-a-json-number string ; { "Infinity" [ 1/0. ] } { "-Infinity" [ -1/0. ] } { "NaN" [ 0/0. ] } - [ dup string>number [ nip ] [ not-a-json-number ] if* ] + [ dup string>number [ ] [ not-a-json-number ] ?if ] } case ] dip ; diff --git a/basis/math/matrices/elimination/elimination.factor b/basis/math/matrices/elimination/elimination.factor index 73c46730a2..176a140d4f 100644 --- a/basis/math/matrices/elimination/elimination.factor +++ b/basis/math/matrices/elimination/elimination.factor @@ -21,7 +21,7 @@ SYMBOL: matrix : cols ( -- n ) 0 nth-row length ; : skip ( i seq quot -- n ) - over [ find-from drop ] dip swap [ nip ] [ length ] if* ; inline + over [ find-from drop ] dip swap [ ] [ length ] ?if ; inline : first-col ( row# -- n ) ! First non-zero column diff --git a/basis/memoize/memoize.factor b/basis/memoize/memoize.factor index 12732b8090..bc34c481f3 100644 --- a/basis/memoize/memoize.factor +++ b/basis/memoize/memoize.factor @@ -46,7 +46,7 @@ IN: memoize out>> [ packer '[ _ dup first-unsafe - [ nip ] [ @ @ [ 0 rot set-nth-unsafe ] keep ] if* + [ ] [ @ @ [ 0 rot set-nth-unsafe ] keep ] ?if ] ] keep unpacker compose ; diff --git a/basis/ui/gadgets/paragraphs/paragraphs.factor b/basis/ui/gadgets/paragraphs/paragraphs.factor index 8c1817c9ef..e0ca89f44d 100644 --- a/basis/ui/gadgets/paragraphs/paragraphs.factor +++ b/basis/ui/gadgets/paragraphs/paragraphs.factor @@ -45,7 +45,7 @@ TUPLE: line words width height baseline ; : cached-wrapped ( paragraph -- wrapped-paragraph ) dup wrapped>> - [ nip ] [ [ wrap-paragraph dup ] keep wrapped<< ] if* ; + [ ] [ [ wrap-paragraph dup ] keep wrapped<< ] ?if ; : max-line-width ( wrapped-paragraph -- x ) [ width>> ] [ max ] map-reduce ; diff --git a/basis/ui/tools/listener/listener.factor b/basis/ui/tools/listener/listener.factor index 31e7325ab1..ca8b2e94d2 100644 --- a/basis/ui/tools/listener/listener.factor +++ b/basis/ui/tools/listener/listener.factor @@ -366,7 +366,7 @@ M: object accept-completion-hook 2drop ; M: interactor stream-read-quot ( stream -- quot/f ) dup interactor-yield dup array? [ over interactor-finish try-parse - [ nip ] [ stream-read-quot ] if* + [ ] [ stream-read-quot ] ?if ] [ nip ] if ; : interactor-operation ( gesture interactor -- ? ) diff --git a/basis/unix/groups/groups.factor b/basis/unix/groups/groups.factor index ad285a665e..b43f8d43ac 100644 --- a/basis/unix/groups/groups.factor +++ b/basis/unix/groups/groups.factor @@ -51,7 +51,7 @@ PRIVATE> ] [ group-struct [ gr_name>> ] [ f ] if* ] if* - [ nip ] [ number>string ] if* ; + [ ] [ number>string ] ?if ; : group-id ( string -- id/f ) group-struct dup [ gr_gid>> ] when ; diff --git a/basis/xml/name/name.factor b/basis/xml/name/name.factor index 77685e35b2..51b1dcf5ad 100644 --- a/basis/xml/name/name.factor +++ b/basis/xml/name/name.factor @@ -25,7 +25,7 @@ SYMBOL: ns-stack : add-ns ( name -- ) dup space>> dup ns-stack get assoc-stack - [ nip ] [ nonexist-ns ] if* >>url drop ; + [ ] [ nonexist-ns ] ?if >>url drop ; : push-ns ( hash -- ) ns-stack get push ; diff --git a/extra/benchmark/sha1/sha1.factor b/extra/benchmark/sha1/sha1.factor index 3dd067fea5..50675645e0 100644 --- a/extra/benchmark/sha1/sha1.factor +++ b/extra/benchmark/sha1/sha1.factor @@ -4,4 +4,15 @@ IN: benchmark.sha1 : sha1-benchmark ( -- ) 2000000 iota >byte-array sha1 checksum-bytes drop ; +: sha224-benchmark ( -- ) + 2000000 iota >byte-array sha-224 checksum-bytes drop ; + +: sha256-benchmark ( -- ) + 2000000 iota >byte-array sha-256 checksum-bytes drop ; + +USE: checksums.openssl + +: openssl-sha1-benchmark ( -- ) + 2000000 iota >byte-array openssl-sha1 checksum-bytes drop ; + MAIN: sha1-benchmark diff --git a/extra/ecdsa/ecdsa.factor b/extra/ecdsa/ecdsa.factor index 63fda8ab40..1044fa3893 100644 --- a/extra/ecdsa/ecdsa.factor +++ b/extra/ecdsa/ecdsa.factor @@ -19,7 +19,7 @@ M: ec-key dispose EC_KEY_new_by_curve_name dup ssl-error ec-key boa ; : ec-key-handle ( -- handle ) - ec-key get dup handle>> [ nip ] [ already-disposed ] if* ; + ec-key get dup handle>> [ ] [ already-disposed ] ?if ; DESTRUCTOR: BN_clear_free diff --git a/extra/gml/b-rep/b-rep.factor b/extra/gml/b-rep/b-rep.factor index ff514c3ab7..b946793294 100644 --- a/extra/gml/b-rep/b-rep.factor +++ b/extra/gml/b-rep/b-rep.factor @@ -43,7 +43,7 @@ GML: faceCCW ( e0 -- e1 ) face-ccw ; GML: baseface ( e0 -- e1 ) base-face>> ; -GML: nextring ( e0 -- e1 ) dup next-ring>> [ nip ] [ base-face>> ] if* ; +GML: nextring ( e0 -- e1 ) dup next-ring>> [ ] [ base-face>> ] ?if ; GML: facenormal ( e0 -- n ) face-normal ; GML: faceplanedist ( e0 -- d ) face-plane-dist ; diff --git a/extra/gpu/shaders/shaders.factor b/extra/gpu/shaders/shaders.factor index 559f46f560..8dac18ca70 100755 --- a/extra/gpu/shaders/shaders.factor +++ b/extra/gpu/shaders/shaders.factor @@ -310,7 +310,7 @@ SYMBOL: padding-no { } ; : shader-filename ( shader/program -- filename ) - dup filename>> [ nip ] [ name>> where first ] if* file-name ; + dup filename>> [ ] [ name>> where first ] ?if file-name ; : numbered-log-line? ( log-line-components -- ? ) { diff --git a/extra/irc/client/base/base.factor b/extra/irc/client/base/base.factor index ce343315a2..2f06fd6cfb 100644 --- a/extra/irc/client/base/base.factor +++ b/extra/irc/client/base/base.factor @@ -35,7 +35,7 @@ M: to-me chat-name sender>> ; ! ":flogbot2_!~flogbot2@c-50-174-221-28.hsd1.ca.comcast.net JOIN #concatenative-bots" ! The channel>> field is empty and it's in parameters instead. ! This fixes chat> for these kinds of messages. -M: to-channel chat-name dup channel>> [ nip ] [ parameters>> ?first ] if* ; +M: to-channel chat-name dup channel>> [ ] [ parameters>> ?first ] ?if ; GENERIC: chat> ( obj -- chat/f ) M: string chat> irc> chats>> at ; diff --git a/extra/money/money.factor b/extra/money/money.factor index a0ac13246d..3e352c8828 100644 --- a/extra/money/money.factor +++ b/extra/money/money.factor @@ -28,7 +28,7 @@ ERROR: not-an-integer x ; : parse-decimal ( str -- ratio ) split-decimal [ [ "0" ] when-empty ] bi@ [ - [ dup string>number [ nip ] [ not-an-integer ] if* ] bi@ + [ dup string>number [ ] [ not-an-integer ] ?if ] bi@ ] keep length 10^ / + swap [ neg ] when ; SYNTAX: DECIMAL: scan-token parse-decimal suffix! ; diff --git a/extra/rosetta-code/probabilistic-choice/probabilistic-choice.factor b/extra/rosetta-code/probabilistic-choice/probabilistic-choice.factor index f62c44d973..de7b176ab9 100644 --- a/extra/rosetta-code/probabilistic-choice/probabilistic-choice.factor +++ b/extra/rosetta-code/probabilistic-choice/probabilistic-choice.factor @@ -41,7 +41,7 @@ MACRO: case-probas ( data -- quot ) [ first2 [ 1quotation ] dip [ swap 2array ] when* ] map 1quotation ; : expected ( data name -- float ) - dupd of [ nip ] [ values sift sum 1 swap - ] if* ; + dupd of [ ] [ values sift sum 1 swap - ] ?if ; : generate ( # case-probas -- seq ) H{ } clone [ diff --git a/unmaintained/opengl-gadgets/gadgets.factor b/unmaintained/opengl-gadgets/gadgets.factor index b24783e4ef..70d7758a7b 100644 --- a/unmaintained/opengl-gadgets/gadgets.factor +++ b/unmaintained/opengl-gadgets/gadgets.factor @@ -34,7 +34,7 @@ C: cache-entry : get-entry ( gadget -- {texture,dims} ) dup cache-key* textures get at - [ nip ] [ make-entry ] if* ; + [ ] [ make-entry ] ?if ; : get-dims ( gadget -- dims ) get-entry dims>> ; diff --git a/unmaintained/semantic-db/semantic-db.factor b/unmaintained/semantic-db/semantic-db.factor index c4bb7728a3..f2bf9ad4b5 100644 --- a/unmaintained/semantic-db/semantic-db.factor +++ b/unmaintained/semantic-db/semantic-db.factor @@ -20,7 +20,7 @@ node "node" : load-node ( id -- node ) f select-tuple ; : node-content ( node -- content ) - dup content>> [ nip ] [ select-tuple content>> ] if* ; + dup content>> [ ] [ select-tuple content>> ] ?if ; : node= ( node node -- ? ) [ id>> ] same? ; diff --git a/unmaintained/tangle/menu/menu.factor b/unmaintained/tangle/menu/menu.factor index 9740acee1c..828db5dfc3 100644 --- a/unmaintained/tangle/menu/menu.factor +++ b/unmaintained/tangle/menu/menu.factor @@ -13,7 +13,7 @@ RELATION: before get-menus [ node-content = ] with find nip ; : ensure-menu ( name -- node ) - dup get-menu [ nip ] [ create-node ] if* ; + dup get-menu [ ] [ create-node ] ?if ; : load-menu ( name -- menu ) get-menu subitem-of-relation get-node-tree-s ;