Skip to content

Commit 2d18985

Browse files
committed
Update various rules in QHLL::Grammar for new !cursor_start API.
1 parent f34a0f8 commit 2d18985

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

src/QHLL/Grammar.pm

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ C< :!pair >, and C<< :pair<strval> >>.
285285
# If we've been called as a subrule, then build a pass-cursor
286286
# to indicate success and set the hash as the subrule's match object.
287287
if has_save goto save_hash
288-
($P0, $I0) = self.'!cursor_start'()
288+
($P0, $S0, $I0) = self.'!cursor_start'()
289289
$P0.'!cursor_pass'($I0, '')
290290
setattribute $P0, cur_class, '$!match', hash
291291
.return ($P0)
@@ -407,7 +407,7 @@ position C<pos>.
407407
.local string target
408408
.local int pos
409409
410-
(cur, pos, target) = self.'!cursor_start'()
410+
(cur, target, pos) = self.'!cursor_start'()
411411
412412
.local pmc quotemod, true
413413
.lex '%*QUOTEMOD', quotemod
@@ -468,7 +468,7 @@ position C<pos>.
468468
.local int pos
469469
self = find_lex 'self'
470470
471-
(cur, pos, target) = self.'!cursor_start'()
471+
(cur, target, pos) = self.'!cursor_start'()
472472
473473
$P0 = find_dynamic_lex '$*QUOTE_START'
474474
if null $P0 goto fail
@@ -491,7 +491,7 @@ position C<pos>.
491491
.local int pos
492492
self = find_lex 'self'
493493
494-
(cur, pos, target) = self.'!cursor_start'()
494+
(cur, target, pos) = self.'!cursor_start'()
495495
496496
$P0 = find_dynamic_lex '$*QUOTE_STOP'
497497
if null $P0 goto fail
@@ -550,8 +550,9 @@ An operator precedence parser.
550550
preclim = $P0
551551
552552
.local pmc here
553+
.local string tgt
553554
.local int pos
554-
(here, pos) = self.'!cursor_start'()
555+
(here, tgt, pos) = self.'!cursor_start'()
555556
556557
.local string termishrx
557558
termishrx = 'termish'
@@ -827,10 +828,11 @@ An operator precedence parser.
827828
my $*ACTIONS := %*LANG{$lang ~ '-actions'};
828829
my $cur := Q:PIR {
829830
.local pmc self
831+
.local string tgt
830832
.local int pos
831833
self = find_lex 'self'
832834
$P0 = find_lex '$lang_cursor'
833-
(%r, pos) = self.'!cursor_start'($P0)
835+
(%r, tgt, pos) = self.'!cursor_start'($P0)
834836
%r.'!cursor_pos'(pos)
835837
};
836838
$cur."$regex"();

0 commit comments

Comments
 (0)