nqp::eoffh on parrot does not detect EOF early

This re-introduced code that checks if we are at EOF. Also bump nqp for nqp::eoffh fix.
rakudo · Oct 5, 2014 · 58cd6f1 · 58cd6f1
1 parent d033738
commit 58cd6f1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/core/IO/Handle.pm b/src/core/IO/Handle.pm
@@ -299,7 +299,14 @@ my class IO::Handle does IO::FileTestable {
         if $.chomp {
             gather {
                 until nqp::eoffh($!PIO) {
+#?if parrot
+                    my Mu $line := nqp::readlinefh($!PIO);
+                    last unless $line.DEFINITE;
+                    take nqp::p6box_s($line).chomp;
+#?endif
+#?if !parrot
                     take nqp::p6box_s(nqp::readlinefh($!PIO)).chomp;
+#?endif
                     $!ins = $!ins + 1;
                 }
                 self.close if $close;
@@ -308,7 +315,14 @@ my class IO::Handle does IO::FileTestable {
         else {
             gather {
                 until nqp::eoffh($!PIO) {
+#?if parrot
+                    my Mu $line := nqp::readlinefh($!PIO);
+                    last unless $line.DEFINITE;
+                    take nqp::p6box_s($line);
+#?endif
+#?if !parrot
                     take nqp::p6box_s(nqp::readlinefh($!PIO));
+#?endif
                     $!ins = $!ins + 1;
                 }
                 self.close if $close;

diff --git a/tools/build/NQP_REVISION b/tools/build/NQP_REVISION
@@ -1 +1 @@
-2014.09-17-g5107793
+2014.09-20-gb79b20c