Merge pull request #272 from donaldh/parrot_io

Remove some more parrot specifics in IO.pm
rakudo · May 28, 2014 · 42cd53f · 42cd53f
2 parents ac74318 + 0a5072c
commit 42cd53f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 19 deletions.
diff --git a/src/core/IO.pm b/src/core/IO.pm
@@ -261,17 +261,7 @@ my class IO::Handle does IO::FileTestable {
     }
 
     method write(IO::Handle:D: Blob:D $buf) {
-#?if parrot
-        # This relies on the Parrot 'binary' encoding and that nqp::decode
-        # passes encoding straight down to Parrot.
-        my str $encoding = $!PIO.encoding;
-        $!PIO.encoding('binary');
-        $!PIO.print(nqp::decode(nqp::decont($buf), 'binary'));
-        $!PIO.encoding($encoding) unless $encoding eq 'binary';
-#?endif
-#?if !parrot
         nqp::writefh($!PIO, nqp::decont($buf));
-#?endif
         True;
     }
 
@@ -724,14 +714,7 @@ multi sub spurt(Cool $filename,
     proto sub cwd(|) { * }
     multi sub cwd() {
         return nqp::p6box_s(
-#?if parrot
-            pir::trans_encoding__Ssi(
-                nqp::cwd(),
-                pir::find_encoding__Is('utf8'))
-#?endif
-#?if !parrot
-            nqp::cwd(),
-#?endif
+            nqp::cwd()
         );
         CATCH {
             default {

diff --git a/tools/build/NQP_REVISION b/tools/build/NQP_REVISION
@@ -1 +1 @@
-2014.05-1-gb436340
+2014.05-4-g6cc7d6e