X-Git-Url: http://nitlanguage.org

diff --git a/lib/filter_stream.nit b/lib/filter_stream.nit
index bcd01be..32e5728 100644
--- a/lib/filter_stream.nit
+++ b/lib/filter_stream.nit
@@ -1,6 +1,7 @@
 # This file is part of NIT ( http://www.nitlanguage.org ).
 #
 # Copyright 2006 Floréal Morandat <morandat@lirmm.fr>
+# Copyright 2009 Jean-Sebastien Gelinas <calestar@gmail.com>
 #
 # This file is free software, which comes along with NIT.  This software is
 # distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
@@ -11,26 +12,21 @@
 # another product.
 
 class FilterIStream
-special IStream
+	super IStream
 	# Filter readed elements
-	readable var _stream: IStream 
+	var stream: nullable IStream = null
 
 	redef fun eof: Bool
 	do
 		assert stream != null
 		return stream.eof
 	end
-
-	private fun stream=(i: IStream)
-	do
-		_stream = i
-	end
 end
 
 class FilterOStream
-special OStream
+	super OStream
 	# Filter outputed elements
-	readable var _stream: OStream 
+	var stream: nullable OStream = null
 
 	# Can the stream be used to write
 	redef fun is_writable: Bool
@@ -38,15 +34,10 @@ special OStream
 		assert stream != null
 		return stream.is_writable
 	end
-
-	private fun stream=(i: OStream)
-	do
-		_stream = i
-	end
 end
 
 class StreamCat
-special FilterIStream
+	super FilterIStream
 	var _streams: Iterator[IStream]
 
 	redef fun eof: Bool
@@ -62,14 +53,16 @@ special FilterIStream
 		end
 	end
 
-	redef fun stream: IStream
+	redef fun stream: nullable IStream
 	do
-		if _stream == null and _streams.is_ok then
-			stream = _streams.item
-			assert _stream != null
+		var res = super
+		if res == null and _streams.is_ok then
+			res = _streams.item
+			stream = res
+			assert stream != null
 			_streams.next
 		end
-		return _stream
+		return res
 	end
 
 	redef fun read_char: Int
@@ -97,7 +90,7 @@ special FilterIStream
 end
 
 class StreamDemux
-special FilterOStream
+	super FilterOStream
 	var _streams: Array[OStream]
 
 	redef fun is_writable: Bool
@@ -115,7 +108,7 @@ special FilterOStream
 		end
 	end
 
-	redef fun write(s: String)
+	redef fun write(s: Text)
 	do
 		for i in _streams
 		do
@@ -126,6 +119,15 @@ special FilterOStream
 		end
 	end
 
+	redef fun close
+	do
+		for i in _streams
+		do
+			stream = i
+			stream.close
+		end
+	end
+
 	init with_streams(streams: Array[OStream])
 	do
 		_streams = streams