get rid of $*ACTIONS

The current actions class is now passed via the cursor.

Author: TimToady

src/HLL/Grammar.nqp

@@ -612,11 +612,13 @@ An operator precedence parser.
     }
 
     method LANG($lang, $regex, *@args) {
-        my $lang_cursor := %*LANG{$lang}.'!cursor_init'(self.orig(), :p(self.pos()), :shared(self.'!shared'()));
+        my $actions     := %*LANG{$lang ~ '-actions'};
+        my $lang_cursor := %*LANG{$lang}.'!cursor_init'(self.orig(), :p(self.pos()), :shared(self.'!shared'()), actions => $actions);
         if self.HOW.traced(self) {
             $lang_cursor.HOW.trace-on($lang_cursor, self.HOW.trace_depth(self));
         }
-        my $*ACTIONS    := %*LANG{$lang ~ '-actions'};
-        $lang_cursor."$regex"(|@args);
+        my $result := $lang_cursor."$regex"(|@args);
+	nqp::bindattr($result,NQPCursor,'$!actions', nqp::getattr(self, NQPCursor, '$!actions'));
+	$result;
     }
 }

src/QRegex/Cursor.nqp

@@ -35,6 +35,7 @@ role NQPCursorRole is export {
     has $!cstack;
     has $!regexsub;
     has $!restart;
+    has $!actions;
 
     method orig()   { nqp::getattr($!shared, ParseShared, '$!orig') }
     method target() { nqp::getattr_s($!shared, ParseShared, '$!target') }
@@ -48,6 +49,14 @@ role NQPCursorRole is export {
         $!regexsub := NQPMu;
     }
 
+#    method AOK($actions, $where) {
+#        my $got := nqp::getattr(self,NQPCursor,'$!actions');
+#	if nqp::objectid(nqp::getattr(self,NQPCursor,'$!actions')) != nqp::objectid($actions) {
+#	    nqp::printfh(nqp::getstderr(), "actions bad in $where (expected " ~ $actions.HOW.name($actions) ~ " but got " ~ $got.HOW.name($got) ~ ")\n");
+#	}
+#	self;
+#    }
+
     method !APPEND_TO_ORIG($value) {
         my $orig := nqp::getattr($!shared, ParseShared, '$!orig');
         $orig := $orig ~ $value;
@@ -115,7 +124,7 @@ role NQPCursorRole is export {
         $caps;
     }
 
-    method !cursor_init($orig, :$p = 0, :$c, :$shared, *%ignore) {
+    method !cursor_init($orig, :$p = 0, :$c, :$shared, :$actions, *%ignore) {
         my $new := self.CREATE();
         unless $shared {
             $shared := nqp::create(ParseShared);
@@ -127,6 +136,7 @@ role NQPCursorRole is export {
             nqp::bindattr($shared, ParseShared, '%!marks', nqp::hash());
         }
         nqp::bindattr($new, $?CLASS, '$!shared', $shared);
+	nqp::bindattr($new, $?CLASS, '$!actions', $actions);
         if nqp::defined($c) {
             nqp::bindattr_i($new, $?CLASS, '$!from', -1);
             nqp::bindattr_i($new, $?CLASS, '$!pos', $c);
@@ -150,6 +160,7 @@ role NQPCursorRole is export {
         # Uncomment following to log cursor creation.
         #$!shared.log_cc(nqp::getcodename($sub));
         nqp::bindattr($new, $?CLASS, '$!shared', $!shared);
+	nqp::bindattr($new, $?CLASS, '$!actions', $!actions) if nqp::isconcrete(self);
         nqp::bindattr($new, $?CLASS, '$!regexsub', nqp::ifnull(nqp::getcodeobj($sub), $sub));
         if nqp::defined($!restart) {
             nqp::bindattr_i($new, $?CLASS, '$!pos', $!pos);
@@ -182,6 +193,7 @@ role NQPCursorRole is export {
         # Uncomment following to log cursor creation.
         #$!shared.log_cc(nqp::getcodename($sub));
         nqp::bindattr($new, $?CLASS, '$!shared', $!shared);
+	nqp::bindattr($new, $?CLASS, '$!actions', $!actions) if nqp::isconcrete(self);
         nqp::bindattr($new, $?CLASS, '$!regexsub', nqp::ifnull(nqp::getcodeobj($sub), $sub));
         if nqp::defined($!restart) {
             nqp::bindattr_i($new, $?CLASS, '$!pos', $!pos);
@@ -205,6 +217,7 @@ role NQPCursorRole is export {
         # Uncomment following to log cursor creation.
         #$!shared.log_cc(nqp::getcodename($sub));
         nqp::bindattr($new, $?CLASS, '$!shared', $!shared);
+	nqp::bindattr($new, $?CLASS, '$!actions', $!actions) if nqp::isconcrete(self);
         nqp::bindattr($new, $?CLASS, '$!regexsub', nqp::ifnull(nqp::getcodeobj($sub), $sub));
         if nqp::defined($!restart) {
             nqp::die("!cursor_start_cur cannot restart a cursor");
@@ -222,6 +235,7 @@ role NQPCursorRole is export {
     method !cursor_start_subcapture($from) {
         my $new := nqp::create(self);
         nqp::bindattr($new, $?CLASS, '$!shared', $!shared);
+	nqp::bindattr($new, $?CLASS, '$!actions', $!actions) if nqp::isconcrete(self);
         nqp::bindattr_i($new, $?CLASS, '$!from', $from);
         nqp::bindattr_i($new, $?CLASS, '$!pos', -3);
         $new;
@@ -312,14 +326,14 @@ role NQPCursorRole is export {
     }
 
     method !reduce(str $name) {
-        my $actions := nqp::getlexdyn('$*ACTIONS');
+	my $actions := $!actions;
         nqp::findmethod($actions, $name)($actions, self.MATCH)
             if !nqp::isnull($actions) && nqp::can($actions, $name);
         self;
     }
 
     method !reduce_with_match(str $name, str $key, $match) {
-        my $actions := nqp::getlexdyn('$*ACTIONS');
+	my $actions := $!actions;
         nqp::findmethod($actions, $name)($actions, $match, $key)
             if !nqp::isnull($actions) && nqp::can($actions, $name);
     }
@@ -1070,8 +1084,8 @@ class NQPCursor does NQPCursorRole {
     }
 
     method parse($target, :$rule = 'TOP', :$actions, *%options) {
-        my $*ACTIONS := $actions;
-        my $cur      := self.'!cursor_init'($target, |%options);
+        my $cur      := self.'!cursor_init'($target, :actions($actions), |%options);
+
         nqp::isinvokable($rule) ??
             $rule($cur).MATCH() !!
             nqp::findmethod($cur, $rule)($cur).MATCH()