     2dup length 2 - >= [
         2drop
     ] [
-        [ 1 + dup 2 + ] dip subseq  hex> [ , ] when*
+        [ 1 + dup 2 + ] dip subseq hex> [ , ] when*
     ] if ;
-
-: url-decode-% ( index str -- index str )
-    2dup url-decode-hex ;
 
 : url-decode-iter ( index str -- )
     2dup length >= [
         2drop
     ] [
         2dup nth dup CHAR: % = [
-            drop url-decode-% [ 3 + ] dip
+            drop 2dup url-decode-hex [ 3 + ] dip
         ] [
             , [ 1 + ] dip
         ] if url-decode-iter

    1string utf8 encode
    [ CHAR: % , >hex >upper 2 CHAR: 0 pad-head % ] each ;

PRIVATE>

: url-encode ( str -- encoded )
    [
        [ dup url-quotable? [ , ] [ push-utf8 ] if ] each
    ] "" make ;

: url-encode-full ( str -- encoded )
    [
        [ dup unreserved? [ , ] [ push-utf8 ] if ] each
    ] "" make ;

<PRIVATE


! Copyright (C) 2008, 2010 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
USING: arrays ascii assocs combinators combinators.short-circuit
fry io.encodings.string io.encodings.utf8 kernel make math
math.parser present sequences splitting strings ;
IN: urls.encoding

: url-quotable? ( ch -- ? )
