Changeset 22824 for src

Timestamp:

10/30/08 00:21:44 (2 months ago)

Author:

lwall

Message:

[STD,Cursor,etc] shrink Cursor footprint by removing constant attributes:

the original string is now just $+ORIG
the positional memoization array is now @+MEMOS

Location:

src/perl6

Files:

• Cursor.pmc (modified) (57 diffs)
• DumpMatch.pm (modified) (1 diff)
• STD.pm (modified) (19 diffs)
• STD_syntax_highlight (modified) (2 diffs)
• gimme5 (modified) (3 diffs)
• viv (modified) (5 diffs)

src/perl6/Cursor.pmc

@@ -94 +94 @@
 sub new {
     my $class = shift;
-    my $orig = shift() . "\n";
-    my @memos;
-    $#memos = length $orig;     # memos kept by position
-    my %args = ('_pos' => 0, '_from' => 0, '_orig' => \$orig, '_' => \@memos);
+    $::ORIG = shift() . "\n";           # original string
+    $::MEMOS[length $::ORIG] = undef;   # memos kept by position
+    my %args = ('_pos' => 0, '_from' => 0);
     while (@_) {
         my $name = shift;
@@ -103 +102 @@
     }
     my $self = CORE::bless \%args, ref $class || $class;
-    my $buf = $self->{_orig};
-#    $self->deb(" orig ", $$buf) if $DEBUG & DEBUG::cursors;
     $self->BUILD;
     $self;
@@ -172 +169 @@
 our %lexers;       # per language, the cache of lexers, keyed by rule name
 
-# most cursors just copy forward the previous value of the following two items:
-#has $._orig;          # per match, the original string we are matching against
-#has StrPos $._from = 0;
-#has StrPos $._to = 0;
-#has StrPos $._pos = 0;
-#has Cursor $._prior;
-
 sub from { $_[0]->{_from} }
 sub to { $_[0]->{_to} }
 sub chars { $_[0]->{_to} - $_[0]->{_from} }
-sub text { substr(${$_[0]->{_orig}}, $_[0]->{_from}, $_[0]->{_to} - $_[0]->{_from}) }
+sub text { substr($::ORIG, $_[0]->{_from}, $_[0]->{_to} - $_[0]->{_from}) }
 sub pos { $_[0]->{_pos} }
 sub peek { $_[0]->{_peek} }
-sub orig { $_[0]->{_orig} }
+sub orig { \$::ORIG }
 sub WHAT { ref $_[0] || $_[0] }
 sub bless { CORE::bless $_[1], $_[0]->WHAT }
@@ -432 +422 @@
     };
     $self->highwater($lexer->{DBA}) if $self->{_pos} >= $::HIGHWATER;
-    my $buf = $self->{_orig};
     my $P = $self->{_pos};
-    if ($P == length($$buf)) {
+    if ($P == length($::ORIG)) {
         return sub { return };
     }
-    pos($$buf) = $P;
-    $$buf =~ m/\G(\[[\\<>«»]*..|[<>][<>]..|[ -~].|.)/smgc;
+    pos($::ORIG) = $P;
+    $::ORIG =~ m/\G(\[[\\<>«»]*..|[<>][<>]..|[ -~].|.)/smgc;
     my $ch2 = $1;
 
@@ -460 +449 @@
             };
 #           if (@pats > 10) {
-#               print STDERR "PATS: ",0+@pats," $ch2 ", substr($$buf,$P+length($ch2), 5), "\n";
-#               print "PATS: ",0+@pats," $ch2 ", substr($$buf,$P+length($ch2), 5), "\n";
+#               print STDERR "PATS: ",0+@pats," $ch2 ", substr($::ORIG,$P+length($ch2), 5), "\n";
+#               print "PATS: ",0+@pats," $ch2 ", substr($::ORIG,$P+length($ch2), 5), "\n";
 #               print join "\n", @pats, '';
 #           }
@@ -532 +521 @@
                 my $C = shift;
 
-                # die "orig disappeared!!!" unless length($$buf);
+                # die "orig disappeared!!!" unless length($::ORIG);
 
                 return unless $lexer;
 
                 my $P = $C->{_pos};
-                pos($$buf) = $P;
+                pos($::ORIG) = $P;
 
                 if ($DEBUG & DEBUG::lexer) {
-                    my $peek = substr($$buf,$C->{_pos},20);
+                    my $peek = substr($::ORIG,$C->{_pos},20);
                     $peek =~ s/\n/\\n/g;
                     $peek =~ s/\t/\\t/g;
@@ -575 +564 @@
                                 if ($l == -1) {
                                     my $p = $pats[$px];
-                                    pos($$buf) = $P;
-                                    if (($$buf =~ m/\G$p/gc)) {
-                                        $$rxlens[$px] = $l = pos($$buf) - $P;
+                                    pos($::ORIG) = $P;
+                                    if (($::ORIG =~ m/\G$p/gc)) {
+                                        $$rxlens[$px] = $l = pos($::ORIG) - $P;
                                         if ($l == $$trylen) {
                                             push @result, $fates->[$px];
@@ -596 +585 @@
                                     else {
                                         my $p = $pats[$px];
-                                        pos($$buf) = $P;
-                                        if ($$buf =~ m/\G$p/gc) {
+                                        pos($::ORIG) = $P;
+                                        if ($::ORIG =~ m/\G$p/gc) {
                                             push @result, $fates->[$px];
                                         }
@@ -616 +605 @@
 
 
-                    $self->deb("/ running tre match at @{[ pos($$buf) ]} /") if $DEBUG & DEBUG::lexer;
+                    $self->deb("/ running tre match at @{[ pos($::ORIG) ]} /") if $DEBUG & DEBUG::lexer;
                     $pat =~ s/\$\.\?/\$(?:.?)/;   # XXX egregious hack to not interpolate $.
 
@@ -624 +613 @@
                         my \$C = shift;
                         my \$P = \$C->{_pos};
-                        pos(\$\$buf) = \$P;
+                        pos(\$::ORIG) = \$P;
 
                         my \$result;
-                        if ((\$\$buf =~ m\0$pat\0xgc)) {
+                        if (\$::ORIG =~ m\0$pat\0xgc) {
 END
 <<'END'; $prog; });
@@ -649 +638 @@
                                     }
                                 }
-                                $C->deb("success at '", substr($$buf,$C->{_pos},10), "'") if $DEBUG & DEBUG::lexer;
+                                $C->deb("success at '", substr($::ORIG,$C->{_pos},10), "'") if $DEBUG & DEBUG::lexer;
                             }
                             my $tried = "";
                             vec($tried,$last-1,1) = 1 if $last;
-                            $_[0] = [$tried, pos($$buf) - $P, []];
+                            $_[0] = [$tried, pos($::ORIG) - $P, []];
                         }
                         $result;
@@ -722 +711 @@
     my $lang = @_ && $_[0] ? shift() : ref $self;
     $self->deb("cursor_fresh lang $lang") if $DEBUG & DEBUG::cursors;
-    $r{_} = $self->{_};
-    $r{_orig} = $self->{_orig};
     $r{_to} = $r{_from} = $r{_pos} = $self->{_pos};
     $r{_fate} = $self->{_fate};
@@ -779 +766 @@
     my $self = shift;
     delete $self->{_fate};
-    delete $self->{_};
-#    delete $self->{_orig};     # needs some kind of weakening
-#    delete $self->{_pos};      # EXPR blows up without this for some reason
-#    delete $self->{_reduced};
     $self;
 }
@@ -789 +772 @@
     my $self = shift;
     delete $self->{_fate};
-    delete $self->{_};
-    delete $self->{_orig};      # needs some kind of weakening
     delete $self->{_pos};       # EXPR blows up without this for some reason
     delete $self->{_reduced};
@@ -814 +795 @@
     my $self = shift;
     my %copy = %$self;
-    delete $copy{_};
     delete $copy{_reduced};
     delete $copy{_fate};
-    delete $copy{_orig};
     my $text = STD::Dump(\%copy);
     $text =~ s/^\s*_(?:pos|orig):.*\n//mg;
@@ -903 +882 @@
 
     if ($DEBUG & DEBUG::cursors) {
-        my $buf = $self->{_orig};
-        my $peek = substr($$buf,$tpos,20);
+        my $peek = substr($::ORIG,$tpos,20);
         $peek =~ s/\n/\\n/g;
         $peek =~ s/\t/\\t/g;
@@ -921 +899 @@
 
     if ($DEBUG & DEBUG::cursors) {
-        my $buf = $self->{_orig};
-        my $peek = substr($$buf,$fpos,20);
+        my $peek = substr($::ORIG,$fpos,20);
         $peek =~ s/\n/\\n/g;
         $peek =~ s/\t/\\t/g;
@@ -1114 +1091 @@
     local $CTX = $self->callm if $DEBUG & DEBUG::trace_call;
     my $pos = $self->{_pos};
-    my $eos = length(${$self->{_orig}});
+    my $eos = length(${\$::ORIG});
 
     lazymap( sub { $self->cursor($_[0])->retm() }, LazyRange->new($pos,$eos) );
@@ -1123 +1100 @@
     local $CTX = $self->callm if $DEBUG & DEBUG::trace_call;
     my $pos = $self->{_pos};
-    my $eos = length(${$self->{_orig}});
+    my $eos = length(${\$::ORIG});
 
     lazymap( sub { $self->cursor($_[0])->retm() }, LazyRangeRev->new($eos,$pos) );
@@ -1157 +1134 @@
     my $prev_to = $to->{_to} // 0;
     my @all;
-    my $eos = length(${$self->{_orig}});
+    my $eos = length(${\$::ORIG});
     for (;;) {
       last if $to->{_pos} == $eos;
@@ -1179 +1156 @@
 
     # don't go beyond end of string
-    return () if $self->{_pos} == length(${$self->{_orig}});
+    return () if $self->{_pos} == length(${\$::ORIG});
     lazymap(
         sub {
@@ -1206 +1183 @@
     my $to = $self;
     my @all;
-    my $eos = length(${$self->{_orig}});
+    my $eos = length(${\$::ORIG});
     for (;;) {
       last if $to->{_pos} == $eos;
@@ -1230 +1207 @@
     my @result;
     # don't go beyond end of string
-    return () if $self->{_pos} == length(${$self->{_orig}});
+    return () if $self->{_pos} == length(${\$::ORIG});
     do {
         for my $x ($block->($self)) {
@@ -1257 +1234 @@
     my $to = $self;
     my @all;
-    my $eos = length(${$self->{_orig}});
+    my $eos = length(${\$::ORIG});
     for (;;) {
       last if $to->{_pos} == $eos;
@@ -1381 +1358 @@
     }
     local $CTX = $self->callm() if $DEBUG & DEBUG::trace_call;
-    my @stub = return $self if exists $$self{_}[$self->{_pos}]{ws};
+    my @stub = return $self if exists $::MEMOS[$self->{_pos}]{ws};
 
     my $C = $self;
     my $startpos = $C->pos;
-    $$self{_}[$startpos]{ws} = undef;   # exists means we know, undef means no ws  before here
+    $::MEMOS[$startpos]{ws} = undef;    # exists means we know, undef means no ws  before here
 
     $self->_MATCHIFY( 'ws',
@@ -1408 +1385 @@
                     push @gather, (map { my $C=$_;
                         (map { my $C=$_;
-                            scalar(do { $C->{_}[$C->{_pos}]{ws} = $startpos unless $C->{_pos} == $startpos }, $C)
+                            scalar(do { $::MEMOS[$C->{_pos}]{ws} = $startpos unless $C->{_pos} == $startpos }, $C)
                         } $C->_STARr(sub { my $C=shift;
                             $C->_SPACE()
@@ -1463 +1440 @@
     my $P = $self->{_pos} // 0;
     my $len = length($s);
-    my $buf = $self->{_orig};
-    if (substr($$buf, $P, $len) eq $s) {
-        $self->deb("EXACT $s matched @{[substr($$buf,$P,$len)]} at $P $len") if $DEBUG & DEBUG::matchers;
+    if (substr($::ORIG, $P, $len) eq $s) {
+        $self->deb("EXACT $s matched @{[substr($::ORIG,$P,$len)]} at $P $len") if $DEBUG & DEBUG::matchers;
         my $r = $self->cursor($P+$len);
         $r->retm();
     }
     else {
-        $self->deb("EXACT $s didn't match @{[substr($$buf,$P,$len)]} at $P $len") if $DEBUG & DEBUG::matchers;
+        $self->deb("EXACT $s didn't match @{[substr($::ORIG,$P,$len)]} at $P $len") if $DEBUG & DEBUG::matchers;
         return ();
     }
@@ -1480 +1456 @@
     local $CTX = $self->callm($qr) if $DEBUG & DEBUG::trace_call;
     my $P = $self->{_pos} // 0;
-    my $buf = $self->{_orig};
-    pos($$buf) = $P;
-    if ($$buf =~ /$qr/gc) {
-        my $len = pos($$buf) - $P;
-        $self->deb("PATTERN $qr matched @{[substr($$buf,$P,$len)]} at $P $len") if $DEBUG & DEBUG::matchers;
+    pos($::ORIG) = $P;
+    if ($::ORIG =~ /$qr/gc) {
+        my $len = pos($::ORIG) - $P;
+        $self->deb("PATTERN $qr matched @{[substr($::ORIG,$P,$len)]} at $P $len") if $DEBUG & DEBUG::matchers;
         my $r = $self->cursor($P+$len);
         $r->retm();
@@ -1501 +1476 @@
     my $s = $self->{$n}->text;
     my $len = length($s);
-    my $buf = $self->{_orig};
-    if (substr($$buf, $P, $len) eq $s) {
-        $self->deb("EXACT $s matched @{[substr($$buf,$P,$len)]} at $P $len") if $DEBUG & DEBUG::matchers;
+    if (substr($::ORIG, $P, $len) eq $s) {
+        $self->deb("EXACT $s matched @{[substr($::ORIG,$P,$len)]} at $P $len") if $DEBUG & DEBUG::matchers;
         my $r = $self->cursor($P+$len);
         $r->retm();
     }
     else {
-        $self->deb("EXACT $s didn't match @{[substr($$buf,$P,$len)]} at $P $len") if $DEBUG & DEBUG::matchers;
+        $self->deb("EXACT $s didn't match @{[substr($::ORIG,$P,$len)]} at $P $len") if $DEBUG & DEBUG::matchers;
         return ();
     }
@@ -1522 +1496 @@
     my $P = $self->{_pos} // 0;
     my $len = length($s);
-    my $buf = $self->{_orig};
     if ($i
-        ? lc substr($$buf, $P, $len) eq lc $s
-        : substr($$buf, $P, $len) eq $s
+        ? lc substr($::ORIG, $P, $len) eq lc $s
+        : substr($::ORIG, $P, $len) eq $s
     ) {
-        $self->deb("SYM $s matched @{[substr($$buf,$P,$len)]} at $P $len") if $DEBUG & DEBUG::matchers;
+        $self->deb("SYM $s matched @{[substr($::ORIG,$P,$len)]} at $P $len") if $DEBUG & DEBUG::matchers;
         my $r = $self->cursor($P+$len);
         $r->{sym} = $s;
@@ -1533 +1506 @@
     }
     else {
-        $self->deb("SYM $s didn't match @{[substr($$buf,$P,$len)]} at $P $len") if $DEBUG & DEBUG::matchers;
+        $self->deb("SYM $s didn't match @{[substr($::ORIG,$P,$len)]} at $P $len") if $DEBUG & DEBUG::matchers;
         return ();
     }
@@ -1544 +1517 @@
     my $len = length($s);
     my $from = $self->{_from} - $len;
-    my $buf = $self->{_orig};
-    if ($from >= 0 and substr($$buf, $from, $len) eq $s) {
+    if ($from >= 0 and substr($::ORIG, $from, $len) eq $s) {
         my $r = $self->cursor_rev($from);
         $r->retm();
@@ -1558 +1530 @@
     local $CTX = $self->callm(0+@_) if $DEBUG & DEBUG::trace_call;
     my $P = $self->{_pos} // 0;
-    my $buf = $self->{_orig};
     my @array = sort { length($b) <=> length($a) } @_;  # XXX suboptimal
     my @result = ();
     for my $s (@array) {
         my $len = length($s);
-        if (substr($$buf, $P, $len) eq $s) {
-            $self->deb("ARRAY elem $s matched @{[substr($$buf,$P,$len)]} at $P $len") if $DEBUG & DEBUG::matchers;
+        if (substr($::ORIG, $P, $len) eq $s) {
+            $self->deb("ARRAY elem $s matched @{[substr($::ORIG,$P,$len)]} at $P $len") if $DEBUG & DEBUG::matchers;
             my $r = $self->cursor($P+$len);
             push @result, $r->retm('');
@@ -1574 +1545 @@
 sub _ARRAY_rev { my $self = shift;
     local $CTX = $self->callm(0+@_) if $DEBUG & DEBUG::trace_call;
-    my $buf = $self->{_orig};
     my @array = sort { length($b) <=> length($a) } @_;  # XXX suboptimal
     my @result = ();
@@ -1580 +1550 @@
         my $len = length($s);
         my $from = $self->{_from} = $len;
-        if (substr($$buf, $from, $len) eq $s) {
-            $self->deb("ARRAY_rev elem $s matched @{[substr($$buf,$from,$len)]} at $from $len") if $DEBUG & DEBUG::matchers;
+        if (substr($::ORIG, $from, $len) eq $s) {
+            $self->deb("ARRAY_rev elem $s matched @{[substr($::ORIG,$from,$len)]} at $from $len") if $DEBUG & DEBUG::matchers;
             my $r = $self->cursor_rev($from);
             push @result, $r->retm('');
@@ -1592 +1562 @@
     local $CTX = $self->callm if $DEBUG & DEBUG::trace_call;
     my $P = $self->{_pos};
-    my $buf = $self->{_orig};
-    my $char = substr($$buf, $P, 1);
+    my $char = substr($::ORIG, $P, 1);
     if ($char =~ /^\d$/) {
         my $r = $self->cursor($P+1);
@@ -1611 +1580 @@
         return ();
     }
-    my $buf = $self->{_orig};
-    my $char = substr($$buf, $from, 1);
+    my $char = substr($::ORIG, $from, 1);
     if ($char =~ /^\d$/) {
         my $r = $self->cursor_rev($from);
@@ -1626 +1594 @@
     local $CTX = $self->callm if $DEBUG & DEBUG::trace_call;
     my $P = $self->{_pos};
-    my $buf = $self->{_orig};
-    my $char = substr($$buf, $P, 1);
+    my $char = substr($::ORIG, $P, 1);
     if ($char =~ /^\w$/) {
         my $r = $self->cursor($P+1);
@@ -1645 +1612 @@
         return ();
     }
-    my $buf = $self->{_orig};
-    my $char = substr($$buf, $from, 1);
+    my $char = substr($::ORIG, $from, 1);
     if ($char =~ /^\w$/) {
         my $r = $self->cursor_rev($from);
@@ -1660 +1626 @@
     local $CTX = $self->callm if $DEBUG & DEBUG::trace_call;
     my $P = $self->{_pos};
-    my $buf = $self->{_orig};
-    my $char = substr($$buf, $P, 1);
+    my $char = substr($::ORIG, $P, 1);
     if ($char =~ /^[[:alpha:]_]$/) {
         my $r = $self->cursor($P+1);
@@ -1678 +1643 @@
         return ();
     }
-    my $buf = $self->{_orig};
-    my $char = substr($$buf, $from, 1);
+    my $char = substr($::ORIG, $from, 1);
     if ($char =~ /^[_[:alpha:]]$/) {
         my $r = $self->cursor_rev($from);
@@ -1692 +1656 @@
     local $CTX = $self->callm if $DEBUG & DEBUG::trace_call;
     my $P = $self->{_pos};
-    my $buf = $self->{_orig};
-    my $char = substr($$buf, $P, 1);
+    my $char = substr($::ORIG, $P, 1);
     if ($char =~ /^\s$/) {
         my $r = $self->cursor($P+1);
@@ -1711 +1674 @@
         return ();
     }
-    my $buf = $self->{_orig};
-    my $char = substr($$buf, $from, 1);
+    my $char = substr($::ORIG, $from, 1);
     if ($char =~ /^\s$/) {
         my $r = $self->cursor_rev($from);
@@ -1726 +1688 @@
     local $CTX = $self->callm if $DEBUG & DEBUG::trace_call;
     my $P = $self->{_pos};
-    my $buf = $self->{_orig};
-    my $char = substr($$buf, $P, 1);
+    my $char = substr($::ORIG, $P, 1);
     if ($char =~ /^[ \t\r]$/ or ($char =~ /^\s$/ and $char !~ /^[\n\f\0x0b\x{2028}\x{2029}]$/)) {
         my $r = $self->cursor($P+1);
@@ -1745 +1706 @@
         return ();
     }
-    my $buf = $self->{_orig};
-    my $char = substr($$buf, $from, 1);
+    my $char = substr($::ORIG, $from, 1);
     if ($char =~ /^[ \t\r]$/ or ($char =~ /^\s$/ and $char !~ /^[\n\f\0x0b\x{2028}\x{2029}]$/)) {
         my $r = $self->cursor_rev($from);
@@ -1760 +1720 @@
     local $CTX = $self->callm if $DEBUG & DEBUG::trace_call;
     my $P = $self->{_pos};
-    my $buf = $self->{_orig};
-    my $char = substr($$buf, $P, 1);
+    my $char = substr($::ORIG, $P, 1);
     if ($char =~ /^[\n\f\x0b\x{2028}\x{2029}]$/) {
         my $r = $self->cursor($P+1);
@@ -1779 +1738 @@
         return ();
     }
-    my $buf = $self->{_orig};
-    my $char = substr($$buf, $from, 1);
+    my $char = substr($::ORIG, $from, 1);
     if ($char =~ /^[\n\f\x0b\x{2028}\x{2029}]$/) {
         my $r = $self->cursor_rev($from);
@@ -1796 +1754 @@
     local $CTX = $self->callm if $DEBUG & DEBUG::trace_call;
     my $P = $self->{_pos};
-    my $buf = $self->{_orig};
-    my $char = substr($$buf, $P, 1);
+    my $char = substr($::ORIG, $P, 1);
     if ($char =~ /$cc/) {
         my $r = $self->cursor($P+1);
@@ -1817 +1774 @@
         return ();
     }
-    my $buf = $self->{_orig};
-    my $char = substr($$buf, $from, 1);
+    my $char = substr($::ORIG, $from, 1);
     if ($char =~ /$cc/) {
         my $r = $self->cursor_rev($from);
@@ -1832 +1788 @@
     local $CTX = $self->callm if $DEBUG & DEBUG::trace_call;
     my $P = $self->{_pos};
-    my $buf = $self->{_orig};
-    if ($P < length($$buf)) {
+    if ($P < length($::ORIG)) {
         $self->cursor($P+1)->retm();
     }
@@ -1866 +1821 @@
     local $CTX = $self->callm if $DEBUG & DEBUG::trace_call;
     my $P = $self->{_pos};
-    my $buf = $self->{_orig};
-    if ($P == 0 or substr($$buf, $P-1, 1) =~ /^[\n\f\x0b\x{2028}\x{2029}]$/) {
+    if ($P == 0 or substr($::ORIG, $P-1, 1) =~ /^[\n\f\x0b\x{2028}\x{2029}]$/) {
         $self->cursor($P)->retm();
     }
@@ -1879 +1833 @@
     local $CTX = $self->callm if $DEBUG & DEBUG::trace_call;
     my $P = $self->{_pos};
-    my $buf = $self->{_orig};
-    if ($P == length($$buf)) {
+    if ($P == length($::ORIG)) {
         $self->cursor($P)->retm();
     }
@@ -1892 +1845 @@
     local $CTX = $self->callm if $DEBUG & DEBUG::trace_call;
     my $P = $self->{_pos};
-    my $buf = $self->{_orig};
-    if ($P == length($$buf) or substr($$buf, $P, 1) =~ /^(?:\r\n|[\n\f\x0b\x{2028}\x{2029}])$/) {
+    if ($P == length($::ORIG) or substr($::ORIG, $P, 1) =~ /^(?:\r\n|[\n\f\x0b\x{2028}\x{2029}])$/) {
         $self->cursor($P)->retm();
     }
@@ -1905 +1857 @@
     local $CTX = $self->callm if $DEBUG & DEBUG::trace_call;
     my $P = $self->{_pos};
-    my $buf = $self->{_orig};
-    pos($$buf) = $P - 1;
-    if ($$buf =~ /\w\b/) {
+    pos($::ORIG) = $P - 1;
+    if ($::ORIG =~ /\w\b/) {
         $self->cursor($P)->retm();
     }
@@ -1919 +1870 @@
     local $CTX = $self->callm if $DEBUG & DEBUG::trace_call;
     my $P = $self->{_pos};
-    my $buf = $self->{_orig};
-    pos($$buf) = $P;
-    if ($$buf =~ /\b(?=\w)/) {
+    pos($::ORIG) = $P;
+    if ($::ORIG =~ /\b(?=\w)/) {
         $self->cursor($P)->retm();
     }
@@ -1933 +1883 @@
     local $CTX = $self->callm if $DEBUG & DEBUG::trace_call;
     my $P = $self->{_pos};
-    my $buf = $self->{_orig};
-    pos($$buf) = $P;
-    if ($$buf =~ /\b(?=\w)/) {
+    pos($::ORIG) = $P;
+    if ($::ORIG =~ /\b(?=\w)/) {
         $self->cursor($P)->retm();
     }
@@ -1961 +1910 @@
     my $P = $self->{_pos};
     my $F = $self->{_from};
-    my $buf = $self->{_orig};
-    $self->{FIRST} = substr($$buf, $F, $P - $F);
+    $self->{FIRST} = substr($::ORIG, $F, $P - $F);
     $self->deb("Commit branch to $P") if $DEBUG & DEBUG::matchers;
     $self, LazyMap->new(sub { $self->deb("ABORTBRANCH") if $DEBUG & DEBUG::trace_call; die "ABORTBRANCH" }, $self);

src/perl6/DumpMatch.pm

@@ -90 +90 @@
     local %seen;
     traverse_match($r,$name,0,$events,$opt);
-    process_events(${$r->{_orig}},$events,$opt);
+    process_events($::ORIG,$events,$opt);
 }
 1;

src/perl6/STD.pm

@@ -11 +11 @@
 my $IN_DECL is context<rw>;
 my %ROUTINES;