traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix NFA generation w/ nested groups

Browse source
This commit is contained in:
Max Brunsfeld 2019-01-15 15:57:29 -08:00
parent d8ab36b2a5
commit 522021b107
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
cli/src/generate/prepare_grammar/expand_tokens.rs
View file

@ -263,7 +263,7 @@ impl NfaBuilder {
Ok(result)
}
},
Ast::Group(group) => self.expand_regex(&group.ast, self.nfa.last_state_id()),
Ast::Group(group) => self.expand_regex(&group.ast, next_state_id),
Ast::Alternation(alternation) => {
let mut alternative_state_ids = Vec::new();
for ast in alternation.asts.iter() {
@ -619,7 +619,18 @@ mod tests {
("12e34", Some((0, "12e34"))),
],
},
// Allowing unrecognized escape sequences
// nested groups
Row {
rules: vec![Rule::seq(vec![
Rule::pattern(r#"([^x\\]|\\(.|\n))+"#),
])],
separators: vec![],
examples: vec![
("abcx", Some((0, "abc"))),
("abc\\0x", Some((0, "abc\\0"))),
],
},
// allowing unrecognized escape sequences
Row {
rules: vec![
// Escaped forward slash (used in JS because '/' is the regex delimiter)
@ -636,7 +647,7 @@ mod tests {
(r#"'\'a"#, Some((2, r#"'\'"#))),
],
},
// Allowing un-escaped curly braces
// allowing un-escaped curly braces
Row {
rules: vec![
// Un-escaped curly braces
@ -649,7 +660,6 @@ mod tests {
("u{1234} ok", Some((0, "u{1234}"))),
("{aba}}", Some((1, "{aba}"))),
],
}
];