@@ -57,7 +57,7 @@ grammar QRegex::P6Regex::Grammar is HLL::Grammar {
57
57
58
58
token ws { [ \s + | '#' \N * ]* }
59
59
60
- token normspace { <? before \s | '#' > <.ws > }
60
+ token normspace { <?[ \s# ] > <.ws > }
61
61
62
62
token identifier { <.ident > [ <[ \-' ] > <.ident > ]* }
63
63
@@ -107,7 +107,7 @@ grammar QRegex::P6Regex::Grammar is HLL::Grammar {
107
107
[
108
108
| <? before <[ \) \} \] ] > >
109
109
| <? before '>' <- [ > ] > >
110
- | <? before < rxstopper > >
110
+ | <?rxstopper >
111
111
]
112
112
}
113
113
@@ -125,12 +125,12 @@ grammar QRegex::P6Regex::Grammar is HLL::Grammar {
125
125
126
126
token termalt {
127
127
<termconj >
128
- [ <! before < rxstopper > > '|' <![ | ] > [ { $ * SEQ := 0 ; } <termconj > || <.throw_null_pattern > ] ]*
128
+ [ <!rxstopper > '|' <![ | ] > [ { $ * SEQ := 0 ; } <termconj > || <.throw_null_pattern > ] ]*
129
129
}
130
130
131
131
token termconj {
132
132
<termish >
133
- [ <! before < rxstopper > > '&' <![ & ] > [ { $ * SEQ := 0 ; } <termish > || <.throw_null_pattern > ] ]*
133
+ [ <!rxstopper > '&' <![ & ] > [ { $ * SEQ := 0 ; } <termish > || <.throw_null_pattern > ] ]*
134
134
}
135
135
136
136
token termish {
@@ -143,7 +143,7 @@ grammar QRegex::P6Regex::Grammar is HLL::Grammar {
143
143
<!rxstopper >
144
144
<atom >
145
145
[
146
- <.ws > [ <! before < rxstopper > > <quantifier > | <? before ':' > <backmod > <!alpha > ]
146
+ <.ws > [ <!rxstopper > <quantifier > | <? before ':' > <backmod > <!alpha > ]
147
147
[ <.ws > <separator > ]** 0.. 1
148
148
]** 0.. 1
149
149
}
@@ -208,7 +208,7 @@ grammar QRegex::P6Regex::Grammar is HLL::Grammar {
208
208
token metachar :sym <bs > { \\ <backslash > }
209
209
token metachar :sym <mod > { <mod_internal > }
210
210
token metachar :sym <quantifier > {
211
- <! before < rxstopper > > <quantifier > <.panic : 'Quantifier quantifies nothing' >
211
+ <!rxstopper > <quantifier > <.panic : 'Quantifier quantifies nothing' >
212
212
}
213
213
214
214
# # we cheat here, really should be regex_infix:sym<~>
0 commit comments