- Timestamp:
- 11/06/08 06:16:32 (2 months ago)
- Files:
-
- 1 modified
-
src/perl6/Cursor.pmc (modified) (15 diffs)
Legend:
- Unmodified
- Added
- Removed
-
src/perl6/Cursor.pmc
r22891 r22894 111 111 $args{'_' . $name} = shift; 112 112 } 113 my $self = CORE::bless \%args, ref $class || $class;113 my $self = bless \%args, ref $class || $class; 114 114 $self->BUILD; 115 115 $self; … … 189 189 sub orig { \$::ORIG } 190 190 sub WHAT { ref $_[0] || $_[0] } 191 sub bless { CORE::bless $_[1], $_[0]->WHAT }192 191 193 192 sub item { exists $_[0]->{''} ? $_[0]->{''} : $_[0]->text } … … 230 229 } 231 230 $key = 'termish' if $key eq 'EXPR'; 232 return $ self->lexers->{$key} //= $self->_AUTOLEXgen($key, $retree);231 return $::LEXERS{ref $self}->{$key} //= $self->_AUTOLEXgen($key, $retree); 233 232 } 234 233 … … 438 437 sub new { my $self = shift; 439 438 my %args = @_; 440 CORE::bless \%args, $self;439 bless \%args, $self; 441 440 } 442 441 … … 454 453 my %r = %$self; 455 454 $r{_peek} = 1; 456 CORE::bless \%r, ref $self;455 bless \%r, ref $self; 457 456 } 458 457 … … 465 464 $r{_fate} = $self->{_fate}; 466 465 $r{_herelang} = $self->{_herelang} if $self->{_herelang}; 467 CORE::bless \%r, ref $lang || $lang;466 bless \%r, ref $lang || $lang; 468 467 } 469 468 … … 472 471 my %r = %$self; 473 472 $r{_herelang} = $self; 474 CORE::bless \%r, 'STD::Q';473 bless \%r, 'STD::Q'; 475 474 } 476 475 … … 565 564 $submatch->{_from} = $r{_from} = $r{_pos}; 566 565 $r{_pos} = $submatch->{_pos}; 567 CORE::bless \%r, ref $self; # return new match cursor for parent566 bless \%r, ref $self; # return new match cursor for parent 568 567 } 569 568 … … 578 577 my $try; 579 578 580 my $lexer = $ self->lexers->{$name} // do {579 my $lexer = $::LEXERS{ref $self}->{$name} // do { 581 580 local %AUTOLEXED; 582 581 $self->_AUTOLEXpeek($name,$retree); … … 841 840 $r{_pos} = $tpos; 842 841 843 CORE::bless \%r, ref $self;842 bless \%r, ref $self; 844 843 } 845 844 … … 871 870 $r{_pos} = $tpos; 872 871 873 CORE::bless \%r, ref $self;872 bless \%r, ref $self; 874 873 } 875 874 … … 887 886 # $r{_from} = $self->{_from}; 888 887 889 CORE::bless \%r, ref $self;888 bless \%r, ref $self; 890 889 } 891 890 … … 1266 1265 1267 1266 local $CTX = $self->callm if $DEBUG & DEBUG::trace_call; 1268 lazymap(sub { CORE::bless($_[0],ref($self))->retm() },1267 lazymap(sub { bless($_[0],ref($self))->retm() }, 1269 1268 $block->($self)); 1270 1269 } … … 1275 1274 local $CTX = $self->callm if $DEBUG & DEBUG::trace_call; 1276 1275 my ($val) = $block->($self) or return (); 1277 CORE::bless($val,ref($self))->retm();1276 bless($val,ref($self))->retm(); 1278 1277 } 1279 1278 … … 1930 1929 return (); 1931 1930 } 1931 1932 sub bless { CORE::bless $_[1], $_[0]->WHAT } 1932 1933 1933 1934 #############################################################3
