lib: remove usage of old-style getters and setters

[nit.git] / lib / filter_stream.nit

diff --git a/lib/filter_stream.nit b/lib/filter_stream.nit
index a32c288..32e5728 100644 (file)
--- a/lib/filter_stream.nit
+++ b/lib/filter_stream.nit
@@ -14,24 +14,19 @@
 class FilterIStream
        super IStream
        # Filter readed elements
-       readable var _stream: nullable IStream = null
+       var stream: nullable IStream = null
 
        redef fun eof: Bool
        do
                assert stream != null
                return stream.eof
        end
-
-       private fun stream=(i: nullable IStream)
-       do
-               _stream = i
-       end
 end
 
 class FilterOStream
        super OStream
        # Filter outputed elements
-       readable var _stream: nullable OStream = null
+       var stream: nullable OStream = null
 
        # Can the stream be used to write
        redef fun is_writable: Bool
@@ -39,11 +34,6 @@ class FilterOStream
                assert stream != null
                return stream.is_writable
        end
-
-       private fun stream=(i: OStream)
-       do
-               _stream = i
-       end
 end
 
 class StreamCat
@@ -65,12 +55,14 @@ class StreamCat
 
        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