From ab2c1503636c4e161db4f16b16b67ef32dbbc951 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Mon, 18 Jun 2012 17:24:21 -0700
Subject: [PATCH] io.streams.memory: adding with-memory-reader.

---
 basis/environment/windows/windows.factor | 4 ++--
 core/io/streams/memory/memory.factor     | 3 +++
 extra/tokyo/utils/utils.factor           | 3 ---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/basis/environment/windows/windows.factor b/basis/environment/windows/windows.factor
index ae12482e95..dbadff3761 100644
--- a/basis/environment/windows/windows.factor
+++ b/basis/environment/windows/windows.factor
@@ -26,8 +26,8 @@ M: windows unset-os-env ( key -- )
 
 M: windows (os-envs) ( -- seq )
     GetEnvironmentStrings [
-        <memory-stream> [
+        [
             utf16n decode-input
             [ "\0" read-until drop dup empty? not ] [ ] produce nip
-        ] with-input-stream*
+        ] with-memory-reader
     ] [ FreeEnvironmentStrings win32-error=0/f ] bi ;
diff --git a/core/io/streams/memory/memory.factor b/core/io/streams/memory/memory.factor
index 9099b620e4..9e07143839 100644
--- a/core/io/streams/memory/memory.factor
+++ b/core/io/streams/memory/memory.factor
@@ -15,3 +15,6 @@ M: memory-stream stream-element-type drop +byte+ ;
 M: memory-stream stream-read1
     [ 1 over <displaced-alien> ] change-alien drop
     0 alien-unsigned-1 ; inline
+
+: with-memory-reader ( alien quot -- )
+    [ <memory-stream> ] dip with-input-stream* ; inline
diff --git a/extra/tokyo/utils/utils.factor b/extra/tokyo/utils/utils.factor
index 2b589e4a4b..d18039ec72 100644
--- a/extra/tokyo/utils/utils.factor
+++ b/extra/tokyo/utils/utils.factor
@@ -3,8 +3,5 @@
 USING: io io.streams.memory serialize kernel ;
 IN: tokyo.utils
 
-: with-memory-reader ( memory quot -- )
-    [ <memory-stream> ] dip with-input-stream* ; inline
-
 : memory>object ( memory -- object )
     [ deserialize ] with-memory-reader ;