core: remove ?string>number in favor of ?if

[factor.git] / basis / http / download / download.factor

diff --git a/basis/http/download/download.factor b/basis/http/download/download.factor
index df9fca6e593a0b9059b20c90f1deb9974c0563ec..1d087a07bd471aa3d45b4afa82d318a7493adc64 100644 (file)
--- a/basis/http/download/download.factor
+++ b/basis/http/download/download.factor
@@ -44,21 +44,26 @@ IN: http.download
     dup file-extension
     [ ?tail drop ]
     [
-        ?string>number
+        [ string>number ]
         [ 1 + number>string append ]
-        [ ".1" 3append ] if
+        [ ".1" 3append ] ?if
     ] bi ;
 
-: ?parenthesis-number ( str -- n/str ? )
-    dup { [ "(" head? ] [ ")" tail? ] } 1&&
-    [ rest but-last ?string>number ] [ f ] if ;
+: ?parenthesis-number ( str -- n/f )
+    [
+        {
+            [ "(" head? ]
+            [ ")" tail? ]
+            [ rest but-last string>number ]
+        } 1&&
+    ] [ drop f ] ?unless ;
 
 : increment-file-name ( path -- path' )
     [
         file-stem " " split1-last
-        ?parenthesis-number
+        [ ?parenthesis-number ]
         [ 1 + number>string "(" ")" surround " " glue ]
-        [ "(1)" append " " glue ] if
+        [ "(1)" append " " glue ] ?if
     ] [
         file-extension
     ] bi "." glue ;