Start to move some methods in IO over to the Perl 6 setting, improvin…

…g error handling to be more in line with S32 along the way.
rakudo · Mar 20, 2009 · 7b9f811 · 7b9f811
1 parent 83e060f
commit 7b9f811
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 53 deletions.
diff --git a/build/Makefile.in b/build/Makefile.in
@@ -114,6 +114,7 @@ SETTING = \
   src/setting/Array.pm \
   src/setting/Bool.pm \
   src/setting/Hash.pm \
+  src/setting/IO.pm \
   src/setting/List.pm \
   src/setting/Match.pm \
   src/setting/Object.pm \

diff --git a/src/classes/IO.pir b/src/classes/IO.pir
@@ -26,20 +26,7 @@ This file implements the IO file handle class.
 
 =over 4
 
-=item close
-
-Closes the file.
-
-=cut
-
 .namespace ['IO']
-.sub 'close' :method
-    .local pmc pio
-    pio = getattribute self, "$!PIO"
-    close pio
-    .return(1)
-.end
-
 
 =item eof
 
@@ -89,30 +76,6 @@ See also slurp.
 .end
 
 
-=item print
-
-Writes the given list of items to the file.
-
-=cut
-
-.namespace ['IO']
-.sub 'print' :method
-    .param pmc args            :slurpy
-    .local pmc it
-    .local pmc pio
-    pio = getattribute self, "$!PIO"
-    args = 'list'(args)
-    it = iter args
-  iter_loop:
-    unless it goto iter_end
-    $S0 = shift it
-    print pio, $S0
-    goto iter_loop
-  iter_end:
-    .return (1)
-.end
-
-
 =item printf
 
 Parses a format string and prints formatted output according to it.
@@ -142,22 +105,6 @@ Reads a line from the file handle.
 .end
 
 
-=item say
-
-Writes the given list of items to the file, then a newline character.
-
-=cut
-
-.sub 'say' :method
-    .param pmc list            :slurpy
-    .local pmc pio
-    pio = getattribute self, "$!PIO"
-    self.'print'(list)
-    print pio, "\n"
-    .return (1)
-.end
-
-
 =item slurp
 
 Slurp a file into a string.

diff --git a/src/setting/IO.pm b/src/setting/IO.pm
@@ -0,0 +1,32 @@
+class IO is also {
+
+    multi method close() is export {
+        try {
+            ?$!PIO.close()
+        }
+        $! ?? fail($!) !! Bool::True
+    }
+
+    multi method print(*@items) is export {
+        try {
+            $!PIO.print($_) for @items;
+        }
+        $! ?? fail($!) !! Bool::True
+    }
+
+    multi method say(*@items) is export {
+        my $print_res = self.print(|@items);
+        if $print_res {
+            try {
+                $!PIO.print("\n");
+            }
+            return $! ?? fail($!) !! Bool::True
+        }
+        else {
+            return $print_res;
+        }
+    }
+
+}
+
+# vim: ft=perl6