Merge commit '0c53231dd9930d2cbaea6d03d2655d6d7b322476' into uncursej

Raku · Apr 17, 2017 · 694725e · 694725e
2 parents 56b7f7b + 0c53231
commit 694725e
Show file tree

Hide file tree

Showing 4 changed files with 160 additions and 157 deletions.
diff --git a/src/HLL/Actions.nqp b/src/HLL/Actions.nqp
@@ -77,7 +77,7 @@ class HLL::Actions {
     }
 
     method O($/) {
-        make %*SPEC
+        make %*SPEC;
     }
 
     method EXPR($/, $key?) {

diff --git a/src/HLL/Grammar.nqp b/src/HLL/Grammar.nqp
@@ -519,10 +519,9 @@ An operator precedence parser.
 
         self.EXPR_reduce(@termstack, @opstack) while @opstack;
         $pos := nqp::getattr_i($here, NQPCursor, '$!pos');
-        $here := self.'!cursor_start_cur'();
+        $here := nqp::pop(@termstack);
         $here.'!cursor_pass'($pos);
         nqp::bindattr_i($here, NQPCursor, '$!pos', $pos);
-        nqp::bindattr($here, NQPCursor, '$!match', nqp::pop(@termstack));
         $here.'!reduce'('EXPR');
         $here;
     }

diff --git a/src/NQP/World.nqp b/src/NQP/World.nqp
@@ -610,6 +610,10 @@ class NQP::World is HLL::World {
             if nqp::existskey($result.WHO, ~$_) {
                 $result := ($result.WHO){$_};
             }
+	    # XXX temp shim to avoid bootstrapping funniness
+	    elsif nqp::elems(@name) == 1 && @name[0] eq 'NQPCursor' {
+		return self.find_sym(['NQPMatch']);
+	    }
             else {
                 nqp::die("Could not locate compile-time value for symbol " ~
                     join('::', @name));