1
1
class QRegex::P6Regex::Actions is HLL::Actions {
2
2
method TOP ($/ ) {
3
- make buildsub ($ < nibbler > . ast);
3
+ make qbuildsub ($ < nibbler > . ast, : anon( 1 ), : addself( 1 ) );
4
4
}
5
5
6
6
method nibbler ($/ ) { make $ < termaltseq > . ast }
@@ -135,15 +135,14 @@ class QRegex::P6Regex::Actions is HLL::Actions {
135
135
}
136
136
137
137
method metachar :sym < ( )> ($/ ) {
138
- my $ subpast := PAST ::Node. new (buildsub ($ < nibbler > . ast, : anon(1 )));
138
+ my $ subpast := QAST ::Node. new (qbuildsub ($ < nibbler > . ast, : anon( 1 ), : addself (1 )));
139
139
my $ qast := QAST ::Regex. new ( $ subpast , $ < nibbler > . ast, : rxtype(' subrule' ),
140
140
: subtype(' capture' ), : node($/ ) );
141
141
make $ qast ;
142
142
}
143
143
144
144
method metachar :sym <' >($/ ) {
145
145
my $ quote := $ < quote_EXPR > . ast;
146
- if PAST::Val. ACCEPTS ($ quote ) { $ quote := $ quote . value ; }
147
146
if QAST ::SVal. ACCEPTS ($ quote ) { $ quote := $ quote . value ; }
148
147
my $ qast := QAST ::Regex. new ( $ quote , : rxtype<literal >, : node($/ ) );
149
148
$ qast . subtype(' ignorecase' ) if % * RX <i >;
@@ -152,7 +151,6 @@ class QRegex::P6Regex::Actions is HLL::Actions {
152
151
153
152
method metachar :sym <" >($/ ) {
154
153
my $ quote := $ < quote_EXPR > . ast;
155
- if PAST::Val. ACCEPTS ($ quote ) { $ quote := $ quote . value ; }
156
154
if QAST ::SVal. ACCEPTS ($ quote ) { $ quote := $ quote . value ; }
157
155
my $ qast := QAST ::Regex. new ( $ quote , : rxtype<literal >, : node($/ ) );
158
156
$ qast . subtype(' ignorecase' ) if % * RX <i >;
@@ -392,8 +390,8 @@ class QRegex::P6Regex::Actions is HLL::Actions {
392
390
}
393
391
elsif $ < nibbler > {
394
392
$ name eq ' after' ??
395
- $ qast [0 ]. push (buildsub (self . flip_ast($ < nibbler > [0 ]. ast), : anon(1 ))) !!
396
- $ qast [0 ]. push (buildsub ($ < nibbler > [0 ]. ast, : anon(1 )));
393
+ $ qast [0 ]. push (qbuildsub (self . flip_ast($ < nibbler > [0 ]. ast), : anon( 1 ), : addself (1 ))) !!
394
+ $ qast [0 ]. push (qbuildsub ($ < nibbler > [0 ]. ast, : anon( 1 ), : addself (1 )));
397
395
}
398
396
}
399
397
make $ qast ;
@@ -429,7 +427,7 @@ class QRegex::P6Regex::Actions is HLL::Actions {
429
427
}
430
428
431
429
method arglist ($/ ) {
432
- my $ past := PAST ::Op. new ( : pasttype (' list' ) );
430
+ my $ past := QAST ::Op. new ( : op (' list' ) );
433
431
for $ < arg > { $ past . push ( $ _ . ast ); }
434
432
make $ past ;
435
433
}
0 commit comments