Changeset 294

Timestamp:

04/28/08 23:13:47 (7 months ago)

Author:

JarrettBillingsley

Message:

Closes #58. That was easy enough.

Files:

• branches/v2/minid/iolib.d (modified) (5 diffs)

branches/v2/minid/iolib.d

@@ -67 +67 @@
-    {
-        inputStreamClass = new MDInputStreamClass(_Object);
-        outputStreamClass = new MDOutputStreamClass(_Object);
-        streamClass = new MDStreamClass(_Object);
+        outputStreamClass = new MDOutputStreamClass(_Object, inputStreamClass, streamClass);
-    }
-
@@ -499 +499 @@
-    {
-        private Layout!(char) mLayout;
-
-
+
+
+
+
-        {
-            super("OutputStream", owner);
-
-            mLayout = new Layout!(char)();
+            mInputStreamClass = inputStreamClass;
+            mStreamClass = streamClass;
-
-            mFields.addList
@@ -523 +527 @@
-                "writeChars"d,  new MDClosure(mFields, &writeChars,        "OutputStream.writeChars"),
-                "writeJSON"d,   new MDClosure(mFields, &writeJSON,         "OutputStream.writeJSON"),
-
+
+
-            );
-            
@@ -590 +595 @@
-        {
-            s.push(s.safeCode(s.getContext!(MDOutputStream).flush()));
+            return 1;
+        }
+        
+        public int copy(MDState s, uint numParams)
+        {
+            auto o = s.getParam!(MDObject)(0);
+            
+            InputStream stream;
+
+            if(auto i = cast(MDInputStream)o)
+                stream = i.mInput;
+            else if(auto s = cast(MDStream)o)
+                stream = s.mInput.mInput;
+            else
+                s.throwRuntimeException("object must be either an InputStream or a Stream, not a '{}'", s.getParam(0u).typeString());
+
+            s.push(s.getContext!(MDOutputStream).copy(stream));
-            return 1;
-        }
@@ -668 +690 @@
-        {
-            mOutput.flush();
+            return this;
+        }
+        
+        public MDOutputStream copy(InputStream s)
+        {
+            mOutput.copy(s);
-            return this;
-        }