Clean up JVM/Parrot divergences in src/core.

Author: jnthn

src/core/NQPMu.pm

@@ -26,29 +26,29 @@ my class NQPMu {
                 # See if we have a value to initialize this attr with.
                 my $key_name := nqp::atpos($task, 2);
                 if nqp::existskey(%attrinit, $key_name) {
-                    nqp::bindattr(self, nqp::atpos($task, 1), nqp::atpos_s($task, 3), %attrinit{$key_name});
+                    nqp::bindattr(self, nqp::atpos($task, 1), nqp::atpos($task, 3), %attrinit{$key_name});
                 }
             }
             elsif nqp::iseq_i($code, 2) {
                 # See if we have a value to initialize this attr with;
                 # if not, set it to an empty array.
                 my $key_name := nqp::atpos($task, 2);
                 if nqp::existskey(%attrinit, $key_name) {
-                    nqp::bindattr(self, nqp::atpos($task, 1), nqp::atpos_s($task, 3), %attrinit{$key_name});
+                    nqp::bindattr(self, nqp::atpos($task, 1), nqp::atpos($task, 3), %attrinit{$key_name});
                 }
                 else {
-                    nqp::bindattr(self, nqp::atpos($task, 1), nqp::atpos_s($task, 3), nqp::list());
+                    nqp::bindattr(self, nqp::atpos($task, 1), nqp::atpos($task, 3), nqp::list());
                 }
             }
             elsif nqp::iseq_i($code, 3) {
                 # See if we have a value to initialize this attr with;
-                # if not, set it to an empty hash.
+                # if not, set it to an empty array.
                 my $key_name := nqp::atpos($task, 2);
                 if nqp::existskey(%attrinit, $key_name) {
-                    nqp::bindattr(self, nqp::atpos($task, 1), nqp::atpos_s($task, 3), %attrinit{$key_name});
+                    nqp::bindattr(self, nqp::atpos($task, 1), nqp::atpos($task, 3), %attrinit{$key_name});
                 }
                 else {
-                    nqp::bindattr(self, nqp::atpos($task, 1), nqp::atpos_s($task, 3), nqp::hash());
+                    nqp::bindattr(self, nqp::atpos($task, 1), nqp::atpos($task, 3), nqp::hash());
                 }
             }
             elsif nqp::iseq_i($code, 4) {

src/core/NQPRoutine.pm

@@ -276,7 +276,7 @@ my knowhow NQPRoutine {
                 my $param_type := pir::what_or_null__PP($param); # Parrot hack; just .WHAT on JVM etc.
                 my $type_obj := $cur_candidate<types>[$i];
                 my $definedness := $cur_candidate<definednesses>[$i];
-                unless nqp::eqaddr($param_type, $type_obj) || is_narrower_type($param_type, $type_obj) {
+                unless nqp::eqaddr($param_type, $type_obj) || nqp::isnull($type_obj) || is_narrower_type($param_type, $type_obj) {
                     $type_mismatch := 1;
                     last;
                 }
@@ -348,8 +348,6 @@ my knowhow NQPRoutine {
 }
 nqp::setinvokespec(NQPRoutine, NQPRoutine, '$!do', nqp::null);
 nqp::setboolspec(NQPRoutine, 5, nqp::null());
-pir::stable_publish_vtable_handler_mapping__vPP(NQPRoutine,
-    nqp::hash('get_string', nqp::list(NQPRoutine, '$!do')));
 
 my knowhow NQPSignature {
     has $!types;
@@ -439,5 +437,3 @@ my knowhow NQPRegex {
 }
 nqp::setinvokespec(NQPRegex, NQPRegex, '$!do', nqp::null);
 nqp::setboolspec(NQPRegex, 5, nqp::null());
-pir::stable_publish_vtable_handler_mapping__vPP(NQPRegex,
-    nqp::hash('get_string', nqp::list(NQPRegex, '$!do')));

src/core/Regex.pm

@@ -14,7 +14,7 @@ sub match ($text, $regex, :$global?) {
     if $global {
         my @matches;
         while $match {
-            @matches.push($match);
+            nqp::push(@matches, $match);
             $match := $match.CURSOR.parse($text, :rule($regex), :c($match.to));
         }
         @matches;