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

🎨 Use base struct syntax to clean up grammar expectations

Browse source
This commit is contained in:
Max Brunsfeld 2022-01-20 16:27:21 -08:00
parent 584b55df8d
commit 82ceebc10d
7 changed files with 33 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cli/src/generate/prepare_grammar/expand_repeats.rs
View file

@ -283,13 +283,7 @@ mod tests {
fn build_grammar(variables: Vec<Variable>) -> ExtractedSyntaxGrammar {
ExtractedSyntaxGrammar {
variables,
extra_symbols: Vec::new(),
external_tokens: Vec::new(),
supertype_symbols: Vec::new(),
expected_conflicts: Vec::new(),
variables_to_inline: Vec::new(),
precedence_orderings: Vec::new(),
word_token: None,
..Default::default()
}
}
}

8
cli/src/generate/prepare_grammar/extract_default_aliases.rs
View file

@ -197,13 +197,7 @@ mod tests {
}],
},
],
extra_symbols: vec![],
external_tokens: vec![],
supertype_symbols: vec![],
expected_conflicts: vec![],
variables_to_inline: vec![],
precedence_orderings: vec![],
word_token: None,
..Default::default()
};
let lexical_grammar = LexicalGrammar {

8
cli/src/generate/prepare_grammar/extract_tokens.rs
View file

@ -493,13 +493,7 @@ mod test {
fn build_grammar(variables: Vec<Variable>) -> InternedGrammar {
InternedGrammar {
variables,
extra_symbols: Vec::new(),
external_tokens: Vec::new(),
supertype_symbols: Vec::new(),
expected_conflicts: Vec::new(),
variables_to_inline: Vec::new(),
precedence_orderings: Vec::new(),
word_token: None,
..Default::default()
}
}
}

8
cli/src/generate/prepare_grammar/intern_symbols.rs
View file

@ -243,13 +243,7 @@ mod tests {
InputGrammar {
variables,
name: "the_language".to_string(),
extra_symbols: Vec::new(),
external_tokens: Vec::new(),
supertype_symbols: Vec::new(),
expected_conflicts: Vec::new(),
variables_to_inline: Vec::new(),
precedence_orderings: Vec::new(),
word_token: None,
..Default::default()
}
}
}

31
cli/src/generate/prepare_grammar/mod.rs
View file

@ -47,6 +47,21 @@ pub(crate) struct ExtractedLexicalGrammar {
pub separators: Vec<Rule>,
}
impl<T, U> Default for IntermediateGrammar<T, U> {
fn default() -> Self {
Self {
variables: Default::default(),
extra_symbols: Default::default(),
expected_conflicts: Default::default(),
precedence_orderings: Default::default(),
external_tokens: Default::default(),
variables_to_inline: Default::default(),
supertype_symbols: Default::default(),
word_token: Default::default(),
}
}
}
/// Transform an input grammar into separate components that are ready
/// for parse table construction.
pub(crate) fn prepare_grammar(
@ -158,13 +173,6 @@ mod tests {
#[test]
fn test_validate_precedences_with_undeclared_precedence() {
let grammar = InputGrammar {
name: String::new(),
word_token: None,
extra_symbols: vec![],
external_tokens: vec![],
supertype_symbols: vec![],
expected_conflicts: vec![],
variables_to_inline: vec![],
precedence_orderings: vec![
vec![
PrecedenceEntry::Name("a".to_string()),
@ -194,6 +202,7 @@ mod tests {
])),
},
],
..Default::default()
};
let result = validate_precedences(&grammar);
@ -206,13 +215,6 @@ mod tests {
#[test]
fn test_validate_precedences_with_conflicting_order() {
let grammar = InputGrammar {
name: String::new(),
word_token: None,
extra_symbols: vec![],
external_tokens: vec![],
supertype_symbols: vec![],
expected_conflicts: vec![],
variables_to_inline: vec![],
precedence_orderings: vec![
vec![
PrecedenceEntry::Name("a".to_string()),
@ -242,6 +244,7 @@ mod tests {
])),
},
],
..Default::default()
};
let result = validate_precedences(&grammar);