Fix conflict

[factor.git] / core / io / encodings / encodings.factor

diff --git a/core/io/encodings/encodings.factor b/core/io/encodings/encodings.factor
index e8735afa6aac8feb4c102d8b78f328e0c3b7e278..d8ad1274f219bd909355d6663df407ac2d83bf43 100644 (file)
--- a/core/io/encodings/encodings.factor
+++ b/core/io/encodings/encodings.factor
@@ -61,9 +61,8 @@ M: decoder stream-read1
 : (read) ( n quot -- n string )
     over 0 <string> [
         [
-            slip over
-            [ swapd set-nth-unsafe f ] [ 3drop t ] if
-        ] 2curry find-integer
+            over [ swapd set-nth-unsafe f ] [ 3drop t ] if
+        ] curry compose find-integer
     ] keep ; inline
 
 : finish-read ( n string -- string/f )
@@ -74,7 +73,8 @@ M: decoder stream-read1
     } cond ; inline
 
 M: decoder stream-read
-    tuck >decoder< [ decode-char ] 2curry (read) finish-read fix-read ;
+    [ nip ] [ >decoder< [ decode-char ] 2curry (read) finish-read ] 2bi
+    fix-read ;
 
 M: decoder stream-read-partial stream-read ;