Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Chase !cursor_start changes.
  • Loading branch information
jnthn committed Feb 11, 2013
1 parent a3869a0 commit 7e22a79
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions src/Perl6/Grammar.pm
Expand Up @@ -142,7 +142,7 @@ role STD {
}

method heredoc () {
my $here := self.'!cursor_start'();
my $here := self.'!cursor_start_cur'();
$here.'!cursor_pos'(self.pos);
while @herestub_queue {
my $herestub := nqp::shift(@herestub_queue);
Expand Down Expand Up @@ -2973,15 +2973,15 @@ grammar Perl6::Grammar is HLL::Grammar does STD {

method copyO($from) {
my $O := $from<OPER><O>;
my $cur := self.'!cursor_start'();
my $cur := self.'!cursor_start_cur'();
$cur.'!cursor_pass'(self.pos());
nqp::bindattr($cur, NQPCursor, '$!match', $O);
$cur
}

method copyOPER($from) {
my $OPER := $from<OPER>;
my $cur := self.'!cursor_start'();
my $cur := self.'!cursor_start_cur'();
$cur.'!cursor_pass'(self.pos());
nqp::bindattr($cur, NQPCursor, '$!match', $OPER);
$cur
Expand Down
4 changes: 2 additions & 2 deletions src/core/Cursor.pm
Expand Up @@ -48,7 +48,7 @@ my class Cursor does NQPCursorRole {
method INTERPOLATE($var, $i = 0) {
nqp::isconcrete($var) ??
($var ~~ Callable ?? $var(self) !! self."!LITERAL"(nqp::unbox_s($var.Str), $i)) !!
self."!cursor_start"()
self."!cursor_start_cur"()
}

method OTHERGRAMMAR($grammar, $name, |) {
Expand All @@ -63,7 +63,7 @@ my class Cursor does NQPCursorRole {
method prior() {
nqp::isconcrete($last_match) ??
self."!LITERAL"(nqp::unbox_s(~$last_match)) !!
self."!cursor_start"()
self."!cursor_start_cur"()
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/core/Str.pm
Expand Up @@ -605,7 +605,7 @@ my class Str does Stringy {
if nqp::istype($pat, Regex) {
try $caller_dollar_slash = +@matches
?? @matches[ +@matches - 1 ]
!! Cursor.'!cursor_init'(nqp::unbox_s('self')).'!cursor_start'().MATCH;
!! Cursor.'!cursor_init'(nqp::unbox_s('self')).'!cursor_start_cur'().MATCH;
}
@matches
}
Expand Down
2 changes: 1 addition & 1 deletion tools/build/NQP_REVISION
@@ -1 +1 @@
2013.01-139-g8654841
2013.01-159-g44f22ef

0 comments on commit 7e22a79

Please sign in to comment.