Skip to content
This repository was archived by the owner on Feb 3, 2021. It is now read-only.

Commit 4f57429

Browse files
committed
Track down remaining uses of Cursor2 type object and eliminate them.
1 parent 5cb2f1f commit 4f57429

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/HLL/Grammar.pm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ C< :!pair >, and C<< :pair<strval> >>.
169169
.local string spec, save
170170
.local int has_save
171171
self = find_lex 'self'
172-
cur_class = get_hll_global ['Regex'], 'Cursor2'
172+
cur_class = get_hll_global ['Regex'], 'Cursor'
173173
$P0 = find_lex '$spec'
174174
spec = $P0
175175
has_save = 0
@@ -311,7 +311,7 @@ of the match.
311311

312312
method panic(*@args) {
313313
my $pos := self.pos();
314-
my $target := pir::getattribute__PPPs(self, Regex::Cursor2, '$!target');
314+
my $target := pir::getattribute__PPPs(self, Regex::Cursor, '$!target');
315315
@args.push(' at line ');
316316
@args.push(HLL::Compiler.lineof($target, $pos) + 1);
317317
@args.push(', near "');
@@ -396,7 +396,7 @@ position C<pos>.
396396
Q:PIR {
397397
.local pmc self, cur_class, args
398398
self = find_lex 'self'
399-
cur_class = get_hll_global ['Regex'], 'Cursor2'
399+
cur_class = get_hll_global ['Regex'], 'Cursor'
400400
args = find_lex '@args'
401401
402402
.local pmc cur, debug
@@ -547,7 +547,7 @@ An operator precedence parser.
547547
Q:PIR {
548548
.local pmc self, cur_class
549549
self = find_lex 'self'
550-
cur_class = get_hll_global ['Regex'], 'Cursor2'
550+
cur_class = get_hll_global ['Regex'], 'Cursor'
551551
552552
.local string preclim
553553
$P0 = find_lex '$preclim'

src/NQP/Actions.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ sub package($/) {
430430
PAST::Var.new( :name('type_obj'), :scope('register') )
431431
),
432432
PAST::Var.new( :name('type_obj'), :scope('register') ),
433-
PAST::Var.new( :name('Cursor2'), :namespace('Regex'), :scope('package') )
433+
PAST::Var.new( :name('Cursor'), :namespace('Regex'), :scope('package') )
434434
));
435435
}
436436

src/Regex/Method.pir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Perform a match against target, return the result.
6262
.param pmc target
6363

6464
.local pmc curproto, match
65-
curproto = get_hll_global ['Regex'], 'Cursor2'
65+
curproto = get_hll_global ['Regex'], 'Cursor'
6666
match = curproto.'parse'(target, 'rule'=>self, 'c'=>0)
6767
.return (match)
6868
.end

0 commit comments

Comments
 (0)