From 017c57fab196c2aa33f2a399cff89dc2827e2b53 Mon Sep 17 00:00:00 2001
From: Daniel Ehrenberg <ehrenbed@carleton.edu>
Date: Fri, 15 Feb 2008 20:29:08 -0600
Subject: [PATCH] latin1 and binary encodings updated

---
 core/io/encodings/binary/binary.factor |  3 ---
 core/io/encodings/latin1/latin1.factor | 17 ++++-------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/core/io/encodings/binary/binary.factor b/core/io/encodings/binary/binary.factor
index b58f9836c0..c4c6237715 100644
--- a/core/io/encodings/binary/binary.factor
+++ b/core/io/encodings/binary/binary.factor
@@ -1,6 +1,3 @@
 USING: kernel io.encodings ;
 
 TUPLE: binary ;
-
-M: binary init-decoding drop ;
-M: binary init-encoding drop ;
diff --git a/core/io/encodings/latin1/latin1.factor b/core/io/encodings/latin1/latin1.factor
index 468324316d..e6d6281eb6 100755
--- a/core/io/encodings/latin1/latin1.factor
+++ b/core/io/encodings/latin1/latin1.factor
@@ -1,19 +1,10 @@
 USING: io io.encodings strings kernel ;
 IN: io.encodings.latin1
 
-TUPLE: latin1 stream ;
+TUPLE: latin1 ;
 
-M: latin1 init-decoding tuck set-latin1-stream ;
-M: latin1 init-encoding drop ;
+M: latin1 stream-read delegate stream-read >string ;
 
-M: latin1 stream-read1
-    latin1-stream stream-read1 ;
+M: latin1 stream-read-until delegate stream-read-until >string ;
 
-M: latin1 stream-read
-    latin1-stream stream-read >string ;
-
-M: latin1 stream-read-until
-    latin1-stream stream-read-until >string ;
-
-M: latin1 stream-readln
-    latin1-stream stream-readln >string ;
+M: latin1 stream-read-partial delegate stream-read-partial >string ;