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

Make supertypes automatically hidden, without underscore prefix

Browse source
This commit is contained in:
Max Brunsfeld 2020-09-23 09:35:14 -07:00
parent a8d77001c2
commit 5003064da7
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cli/src/generate/node_types.rs
View file

@ -325,15 +325,8 @@ pub(crate) fn get_variable_info(
}
for supertype_symbol in &syntax_grammar.supertype_symbols {
let variable = &syntax_grammar.variables[supertype_symbol.index];
if variable.kind != VariableType::Hidden {
return Err(Error::grammar(&format!(
"Supertype symbols must be hidden, but `{}` is not",
variable.name
)));
}
if result[supertype_symbol.index].has_multi_step_production {
let variable = &syntax_grammar.variables[supertype_symbol.index];
return Err(Error::grammar(&format!(
"Supertype symbols must always have a single visible child, but `{}` can have multiple",
variable.name

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

@ -73,6 +73,12 @@ pub(super) fn intern_symbols(grammar: &InputGrammar) -> Result<InternedGrammar>
);
}
for (i, variable) in variables.iter_mut().enumerate() {
if supertype_symbols.contains(&Symbol::non_terminal(i)) {
variable.kind = VariableType::Hidden;
}
}
Ok(InternedGrammar {
variables,
external_tokens,