Skip to content

Commit 9e503bd

Browse files
committed
Toss some P6Regex code that's ported.
1 parent a1c54d8 commit 9e503bd

File tree

2 files changed

+1
-63
lines changed

2 files changed

+1
-63
lines changed

src/QRegex/P5Regex/Actions.nqp

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -374,10 +374,6 @@ class QRegex::P5Regex::Actions is HLL::Actions {
374374
make $qast;
375375
}
376376

377-
method metachar:sym<[ ]>($/) {
378-
make $<nibbler>.ast;
379-
}
380-
381377
method metachar:sym<'>($/) {
382378
my $quote := $<quote_EXPR>.ast;
383379
if QAST::SVal.ACCEPTS($quote) { $quote := $quote.value; }
@@ -506,38 +502,6 @@ class QRegex::P5Regex::Actions is HLL::Actions {
506502
make QAST::Regex.new( $<charspec>.ast, :rxtype('literal'), :node($/) );
507503
}
508504

509-
method assertion:sym<?>($/) {
510-
my $qast;
511-
if $<assertion> {
512-
$qast := $<assertion>.ast;
513-
$qast.subtype('zerowidth');
514-
}
515-
else {
516-
$qast := QAST::Regex.new( :rxtype<anchor>, :subtype<pass>, :node($/) );
517-
}
518-
make $qast;
519-
}
520-
521-
method assertion:sym<!>($/) {
522-
my $qast;
523-
if $<assertion> {
524-
$qast := $<assertion>.ast;
525-
$qast.negate( !$qast.negate );
526-
$qast.subtype('zerowidth');
527-
}
528-
else {
529-
$qast := QAST::Regex.new( :rxtype<anchor>, :subtype<fail>, :node($/) );
530-
}
531-
make $qast;
532-
}
533-
534-
method assertion:sym<method>($/) {
535-
my $qast := $<assertion>.ast;
536-
$qast.subtype('method');
537-
$qast.name('');
538-
make $qast;
539-
}
540-
541505
method assertion:sym<name>($/) {
542506
my $name := ~$<longname>;
543507
my $qast;
@@ -580,12 +544,6 @@ class QRegex::P5Regex::Actions is HLL::Actions {
580544
make $past;
581545
}
582546

583-
method mod_internal($/) {
584-
my $n := $<n>[0] gt '' ?? +$<n>[0] !! 1;
585-
%*RX{ ~$<mod_ident><sym> } := $n;
586-
make 0;
587-
}
588-
589547
method subrule_alias($ast, $name) {
590548
if $ast.name gt '' { $ast.name( $name ~ '=' ~ $ast.name ); }
591549
else { $ast.name($name); }

src/QRegex/P5Regex/Grammar.nqp

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ grammar QRegex::P5Regex::Grammar is HLL::Grammar {
122122

123123
token ws { [ \s+ | '#' \N* ]* }
124124

125+
125126
# XXX Below here is straight from P6Regex and unreviewed.
126127

127128
token normspace { <?before \s | '#' > <.ws> }
@@ -140,14 +141,12 @@ grammar QRegex::P5Regex::Grammar is HLL::Grammar {
140141

141142
proto token metachar { <...> }
142143
token metachar:sym<ws> { <.normspace> }
143-
token metachar:sym<[ ]> { '[' <nibbler> ']' }
144144
token metachar:sym<'> { <?[']> <quote_EXPR: ':q'> }
145145
token metachar:sym<"> { <?["]> <quote_EXPR: ':qq'> }
146146
token metachar:sym<lwb> { $<sym>=['<<'|'«'] }
147147
token metachar:sym<rwb> { $<sym>=['>>'|'»'] }
148148
token metachar:sym<from> { '<(' }
149149
token metachar:sym<to> { ')>' }
150-
token metachar:sym<mod> { <mod_internal> }
151150

152151
token metachar:sym<var> {
153152
[
@@ -176,13 +175,6 @@ grammar QRegex::P5Regex::Grammar is HLL::Grammar {
176175

177176
proto token assertion { <...> }
178177

179-
token assertion:sym<?> { '?' [ <?before '>' > | <assertion> ] }
180-
token assertion:sym<!> { '!' [ <?before '>' > | <assertion> ] }
181-
182-
token assertion:sym<method> {
183-
'.' <assertion>
184-
}
185-
186178
token assertion:sym<name> {
187179
<longname=.identifier>
188180
[
@@ -193,16 +185,4 @@ grammar QRegex::P5Regex::Grammar is HLL::Grammar {
193185
| <.normspace> <nibbler>
194186
]?
195187
}
196-
197-
token mod_internal {
198-
[
199-
| ':' $<n>=('!' | \d+)**1 <mod_ident> »
200-
| ':' <mod_ident> [ '(' $<n>=[\d+] ')' ]?
201-
]
202-
}
203-
204-
proto token mod_ident { <...> }
205-
token mod_ident:sym<ignorecase> { $<sym>=[i] 'gnorecase'? }
206-
token mod_ident:sym<ratchet> { $<sym>=[r] 'atchet'? }
207-
token mod_ident:sym<sigspace> { $<sym>=[s] 'igspace'? }
208188
}

0 commit comments

Comments
 (0)