Skip to content

Commit a7d0042

Browse files
authored
Remove capture groups from lexer regexes (#35)
Capture groups aree unused by Logos and thus only complicate the syntax.
1 parent 6899325 commit a7d0042

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/lexer.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,21 +161,21 @@ pub fn lex(contents: &[u8], span_offset: usize) -> (Tokens, Result<(), ()>) {
161161
#[logos(skip r"[ \t]+")]
162162
#[logos(source = [u8])]
163163
pub enum Token {
164-
#[regex("(?:0[xob])?[0-9][0-9_]*", priority = 10)]
164+
#[regex("(0[xob])?[0-9][0-9_]*", priority = 10)]
165165
Int,
166-
#[regex(r"(:?[0-9][0-9_]*)*\.([0-9][0-9_]*)*(?:[eE][+-]?[0-9_]+)?")]
166+
#[regex(r"([0-9][0-9_]*)*\.([0-9][0-9_]*)*([eE][+-]?[0-9_]+)?")]
167167
Float,
168168
#[regex("\n|\r\n|\x0C")]
169169
Newline,
170-
#[regex(r#""(?:[^"\\]|\\["\\bnfrt])*""#)]
170+
#[regex(r#""([^"\\]|\\["\\bnfrt])*""#)]
171171
DoubleQuotedString,
172172
#[regex(r#"'[^']*'"#)]
173173
SingleQuotedString,
174174
#[regex(r#"`[^`]*`"#)]
175175
BacktickBareword,
176176
// #[regex(r#"[ \t]+"#)]
177177
// HorizontalWhitespace,
178-
#[regex(r#"[0-9]{4}-[0-9]{2}-[0-9]{2}(?:T[0-9]{2}:[0-9]{2}:[0-9]{2}(?:\.[0-9]+)?)?(?:Z|[\+-][0-9]{2}:[0-9]{2})?"#)]
178+
#[regex(r#"[0-9]{4}-[0-9]{2}-[0-9]{2}(T[0-9]{2}:[0-9]{2}:[0-9]{2}(\.[0-9]+)?)?(Z|[\+-][0-9]{2}:[0-9]{2})?"#)]
179179
Datetime,
180180
#[regex(r#"#[^\n]*"#, priority = 20)]
181181
Comment,

0 commit comments

Comments
 (0)