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

Give strings more implicit precedence than immediate tokens

Browse source
This commit is contained in:
Max Brunsfeld 2019-01-09 09:59:46 -08:00
parent 6972a8e3e8
commit 2e8b2ab8fb
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cli/src/generate/build_tables/mod.rs
View file

@ -43,12 +43,14 @@ pub(crate) fn build_tables(
lexical_grammar,
&coincident_token_index,
&token_conflict_map,
&keywords,
);
mark_fragile_tokens(&mut parse_table, lexical_grammar, &token_conflict_map);
if minimize {
minimize_parse_table(
&mut parse_table,
syntax_grammar,
lexical_grammar,
simple_aliases,
&token_conflict_map,
&keywords,
@ -77,6 +79,7 @@ fn populate_error_state(
lexical_grammar: &LexicalGrammar,
coincident_token_index: &CoincidentTokenIndex,
token_conflict_map: &TokenConflictMap,
keywords: &TokenSet,
) {
let state = &mut parse_table.states[0];
let n = lexical_grammar.variables.len();
@ -112,7 +115,7 @@ fn populate_error_state(
// the *conflict-free tokens* identified above.
for i in 0..n {
let symbol = Symbol::terminal(i);
if !conflict_free_tokens.contains(&symbol) {
if !conflict_free_tokens.contains(&symbol) && !keywords.contains(&symbol) {
if syntax_grammar.word_token != Some(symbol) {
if let Some(t) = conflict_free_tokens.iter().find(|t| {
!coincident_token_index.contains(symbol, *t)

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

@ -16,10 +16,10 @@ struct NfaBuilder {
fn get_implicit_precedence(rule: &Rule) -> i32 {
match rule {
Rule::String(_) => 1,
Rule::String(_) => 2,
Rule::Metadata { rule, params } => {
if params.is_main_token {
get_implicit_precedence(rule) + 2
get_implicit_precedence(rule) + 1
} else {
get_implicit_precedence(rule)
}