Use nqp::readlinechompfh for .get and .lines.

Saves us chomping the strings that come from the VM, decreasing the amount of GC-able objects me make when reading lines.
rakudo · Nov 5, 2015 · 13936ab · 13936ab
1 parent 9cc7465
commit 13936ab
Showing 1 changed file with 18 additions and 19 deletions.
diff --git a/src/core/IO/Handle.pm b/src/core/IO/Handle.pm
@@ -143,13 +143,12 @@ my class IO::Handle does IO {
     }
 
     method get(IO::Handle:D:) {
-        return Str if self.eof;
+        return Str if nqp::eoffh($!PIO);
 
-        my Str $x = nqp::p6box_s(nqp::readlinefh($!PIO));
+        my Str $x = nqp::p6box_s($!chomp ?? nqp::readlinechompfh($!PIO) !! nqp::readlinefh($!PIO));
         # XXX don't fail() as long as it's fatal
         # fail('end of file') if self.eof && $x eq '';
-        $x.=chomp if $.chomp;
-        return Str if self.eof && $x eq '';
+        return Str if nqp::eoffh($!PIO) && $x eq '';
 
         $!ins = $!ins + 1;
         $x;
@@ -656,16 +655,16 @@ my class IO::Handle does IO {
         }
     }
     multi method lines(IO::Handle:D: :$close) {
-        if $.chomp {  # this can go as soon as we have chomp support on PIO
+        if $!chomp {  # this can go as soon as we have chomp support on PIO
             Seq.new(class :: does LinesIterCommon {
                 method pull-one() {
-                    my str $line = nqp::readlinefh($!PIO);
-                    if nqp::chars($line) {
+                    my str $line = nqp::readlinechompfh($!PIO);
+                    if nqp::chars($line) || !nqp::eoffh($!PIO) {
                         nqp::bindattr_i($!handle, IO::Handle, '$!ins',
                           nqp::add_i(
                             nqp::getattr_i($!handle, IO::Handle, '$!ins'),
                             1));
-                        nqp::p6box_s($line).chomp;
+                        nqp::p6box_s($line)
                     }
                     else {
                         $!handle.close if $!close;
@@ -674,13 +673,13 @@ my class IO::Handle does IO {
                 }
                 method push-exactly($target, int $n) {
                     my int $found;
-                    my str $line = nqp::readlinefh($!PIO);
-                    while nqp::chars($line) {
-                        $target.push(nqp::p6box_s($line).chomp);
+                    my str $line = nqp::readlinechompfh($!PIO);
+                    while nqp::chars($line) || !nqp::eoffh($!PIO) {
+                        $target.push(nqp::p6box_s($line));
                         $found = $found + 1;
                         last if $found == $n;
 
-                        $line = nqp::readlinefh($!PIO);
+                        $line = nqp::readlinechompfh($!PIO);
                     }
 
                     if $!close { # don't bother updating .ins
@@ -695,20 +694,20 @@ my class IO::Handle does IO {
                     nqp::p6box_i($found);
                 }
                 method push-all($target) {
-                    my str $line = nqp::readlinefh($!PIO);
+                    my str $line = nqp::readlinechompfh($!PIO);
                     if $!close {   # don't bother keeping track of $!ins
-                        while nqp::chars($line) {
-                            $target.push(nqp::p6box_s($line).chomp);
-                            $line = nqp::readlinefh($!PIO);
+                        while nqp::chars($line) || !nqp::eoffh($!PIO) {
+                            $target.push(nqp::p6box_s($line));
+                            $line = nqp::readlinechompfh($!PIO);
                         }
                         $!handle.close;
                     }
                     else {
                         my int $found;
-                        while nqp::chars($line) {
-                            $target.push(nqp::p6box_s($line).chomp);
+                        while nqp::chars($line) || !nqp::eoffh($!PIO) {
+                            $target.push(nqp::p6box_s($line));
                             $found = $found + 1;
-                            $line  = nqp::readlinefh($!PIO);
+                            $line  = nqp::readlinechompfh($!PIO);
                         }
                         nqp::bindattr_i($!handle, IO::Handle, '$!ins',
                           nqp::add_i(