Merge branch 'master' of https://github.com/perl6/nqp

Author: tbrowder

README.pod

@@ -94,10 +94,14 @@ used.  On Mavericks use 10.9 (like above), on Yosemite use 10.10.
 
 The L<examples directory|https://github.com/perl6/nqp/tree/master/examples> is a good place to start, with the
 L<loops|https://github.com/perl6/nqp/blob/master/examples/loops.nqp> and other files. Opcodes are listed in
-L<the docs directory|https://github.com/perl6/nqp/blob/master/docs/ops.markdown>. You can use NQP from this
+L<the docs directory|https://github.com/perl6/nqp/blob/master/docs/ops.markdown>. NQP also has built-in routines
+listed in L<the docs directory|https://github.com/perl6/nqp/blob/master/docs/built-ins.md>. You can use NQP from this
 release, it will be already installed if you have built Perl6 from
 scratch.
 
+Developers and module authors should note that significant run-time speed-ups are sometimes possible by using NQP
+inside Perl 6 code.
+
 =head2 JavaScript backend
 
 The best thing before playing with it/hacking on it is to contact pmurias via IRC at #perl6 on irc.freenode.org.

docs/built-ins.md

@@ -37,7 +37,7 @@ Open file `$filename`. Options:
 Close the file attached to file handle `$fh`.
 
 ## slurp
-* `slurp ($filename --> str)`
+* `slurp($filename --> str)`
 
 Returns the contents of `$filename` as a single string.
 

docs/ops.markdown

@@ -1561,7 +1561,7 @@ Return 1 if this filehandle is at the end of the file, otherwise 0.
 
 ## filenofh
 * `filenofh(Handle $fh --> int)`
-Returns the filehandle number.
+Returns the filehandle number. Not usable on the JVM (always returns -1).
 
 ## flushfh
 * `flushfh(Handle $fh)`

examples/fib.nqp

@@ -10,5 +10,5 @@ my $t0 := nqp::time_n();
 my $z  := fib($N);
 my $t1 := nqp::time_n();
 
-nqp::say("fib($N) = " ~ fib($N));
-nqp::say("time    = " ~ ($t1-$t0));
+say("fib($N) = " ~ fib($N));
+say("time    = " ~ ($t1-$t0));

examples/loops.nqp

@@ -3,6 +3,5 @@
 
 my $i := 0;
 while $i < 10 {
-    say("i=$i");
-    $i++;
+    say("i={$i++}");
 }

src/vm/jvm/runtime/org/perl6/nqp/io/StandardReadHandle.java

@@ -41,7 +41,11 @@ public byte[] read(ThreadContext tc, int bytes) {
             byte[] array = new byte[bytes];
             int read = 0;
             int offset = 0;
-            while ((read = is.read(array, offset, bytes - offset)) != -1) {
+            while (offset < bytes) {
+                if ((read = is.read(array, offset, bytes - offset)) == -1) {
+                    eof = true;
+                    break;
+                }
                 offset += read;
             }
             byte[] compact = new byte[offset];

src/vm/moar/HLL/Backend.nqp

@@ -291,18 +291,37 @@ class HLL::Backend::MoarVM {
             my int $node_id := 0;
             #my %profile := nqp::hash();
             my $mapping := nqp::shift($obj);
+            my $pieces := nqp::list_s();
+            my $empty-array := nqp::list_s();
             for $mapping -> $k {
                 my $v := $mapping{$k};
                 if nqp::ishash($v) {
-                    $profile_fh.say("INSERT INTO routines VALUES ('" ~ nqp::join("','", nqp::list(nqp::iterkey_s($k), literal_subst(~$v<name>, "'", "''"), ~$v<line>, ~$v<file>)) ~ "');");
+                    nqp::push_s($pieces, "INSERT INTO routines VALUES ('");
+                    nqp::push_s($pieces,
+                        nqp::join("','",
+                                  nqp::list(
+                                      nqp::iterkey_s($k),
+                                      literal_subst(~$v<name>, "'", "''"),
+                                      ~$v<line>,
+                                      ~$v<file>))
+                                  ~ "');\n");
                 }
                 else {
-                    $profile_fh.say("INSERT INTO types VALUES ('" ~ nqp::join("','", nqp::list(nqp::iterkey_s($k), literal_subst(~$v, "'", "''"))) ~ "');");
+                    nqp::push_s($pieces, "INSERT INTO types VALUES ('");
+                    nqp::push_s($pieces,
+                        nqp::join("','",
+                            nqp::list(
+                                nqp::iterkey_s($k),
+                                literal_subst(~$v, "'", "''")))
+                        ~ "');\n");
+                }
+                if nqp::elems($pieces) > 500 {
+                    $profile_fh.say(nqp::join("", $pieces));
+                    nqp::splice($pieces, $empty-array, 0, nqp::elems($pieces));
                 }
             }
             for $obj -> $thread {
                 my $thisprof := nqp::list;
-                note($thread<thread>);
                 $thisprof[3] := "NULL";
                 for $thread -> $k {
                     my $v := $thread{$k};
@@ -322,7 +341,8 @@ class HLL::Backend::MoarVM {
                                 nqp::push_s(@g, ~($gc{$f} // '0'));
                             }
                             nqp::push_s(@g, ~$thread<thread>);
-                            $profile_fh.say('INSERT INTO gcs VALUES (' ~ nqp::join(',', @g) ~ ');');
+                            nqp::push_s($pieces, 'INSERT INTO gcs VALUES (');
+                            nqp::push_s($pieces, nqp::join(',', @g) ~ ");\n");
                         }
                     }
                     elsif $k eq 'call_graph' {
@@ -338,14 +358,16 @@ class HLL::Backend::MoarVM {
                             my str $routine_id := ~%call_graph<id>;
                             %call_rec_depth{$routine_id} := 0 unless %call_rec_depth{$routine_id};
                             nqp::push_s(@call, ~%call_rec_depth{$routine_id});
-                            $profile_fh.say('INSERT INTO calls VALUES (' ~ nqp::join(',', @call) ~ ');');
+                            nqp::push_s($pieces, 'INSERT INTO calls VALUES (');
+                            nqp::push_s($pieces, nqp::join(',', @call) ~ ");\n");
                             if %call_graph<allocations> {
                                 for %call_graph<allocations> -> $a {
                                     my @a := nqp::list_s($call_id);
                                     for <id spesh jit count> -> $f {
                                         nqp::push_s(@a, ~($a{$f} // '0'));
                                     }
-                                    $profile_fh.say('INSERT INTO allocations VALUES (' ~ nqp::join(',', @a) ~ ');');
+                                    nqp::push_s($pieces, 'INSERT INTO allocations VALUES (');
+                                    nqp::push_s($pieces, nqp::join(',', @a) ~ ");\n");
                                 }
                             }
                             if %call_graph<callees> {
@@ -355,12 +377,23 @@ class HLL::Backend::MoarVM {
                                 }
                                 %call_rec_depth{$routine_id}--;
                             }
+                            if nqp::elems($pieces) > 500 {
+                                $profile_fh.say(nqp::join("", $pieces));
+                                nqp::splice($pieces, $empty-array, 0, nqp::elems($pieces));
+                            }
                         }
                         collect_calls(~$node_id, $v);
                     }
                 }
-                $profile_fh.say('INSERT INTO profile VALUES (' ~ nqp::join(',', $thisprof) ~ ');');
+                nqp::push_s($pieces, 'INSERT INTO profile VALUES (');
+                nqp::push_s($pieces, nqp::join(',', $thisprof) ~ ");\n");
+                if nqp::elems($pieces) > 500 {
+                    $profile_fh.say(nqp::join("", $pieces));
+                    nqp::splice($pieces, $empty-array, 0, nqp::elems($pieces));
+                }
             }
+            $profile_fh.say(nqp::join("", $pieces));
+            nqp::splice($pieces, $empty-array, 0, nqp::elems($pieces));
         }
 
         # Post-process the call data, turning objects into flat data.

tools/build/MOAR_REVISION

@@ -1 +1 @@
-2018.02-21-gc6543e21f
+2018.02-31-g408555456