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

fix(rust): clarify error message for non-token reserved words

Browse source 
Improve the `NonTokenReservedWord` error message by including the
specific reserved word that was not used as a token.
This commit is contained in:
Jon Shea 2025-03-31 14:36:44 -04:00 • committed by Will Lillis
parent abc5c6bc50
commit 92c5d3b8e2
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,8 +28,8 @@ unless they are used only as the grammar's start rule.
NonSymbolExternalToken,
#[error("Non-terminal symbol '{0}' cannot be used as the word token, because its rule is duplicated in '{1}'")]
NonTerminalWordToken(String, String),
#[error("Reserved words must be tokens")]
NonTokenReservedWord,
#[error("Reserved word '{0}' must be a token")]
NonTokenReservedWord(String),
}
pub(super) fn extract_tokens(
@ -188,7 +188,12 @@ pub(super) fn extract_tokens(
{
reserved_words.push(Symbol::terminal(index));
} else {
Err(ExtractTokensError::NonTokenReservedWord)?;
let token_name = match &reserved_rule {
Rule::String(s) => s.clone(),
Rule::Pattern(p, _) => p.clone(),
_ => "unknown".to_string(),
};
Err(ExtractTokensError::NonTokenReservedWord(token_name))?;
}
}
reserved_word_contexts.push(ReservedWordContext {