libs-code/tree-sitter.tree-sitter
1
0
Fork 0
mirror of https://github.com/tree-sitter/tree-sitter.git synced 2026-09-10 07:26:23 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

generate: use the LexStateId typedef for lex state ids

Browse source 
Lex state ids were passed as bare usize in several spots. Route them
through the existing `LexStateId` typedef.
This commit is contained in:
Will Lillis 2026-08-09 11:51:45 -05:00
parent 142c60dca1
commit 87d14ddfc6
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
crates/generate/src/build_tables/build_lex_table.rs
View file

@ -13,7 +13,7 @@ use crate::{
grammars::{LexicalGrammar, SyntaxGrammar},
nfa::{CharacterSet, NfaCursor},
rules::{Symbol, TokenSet},
tables::{AdvanceAction, LexState, LexTable, ParseStateId, ParseTable},
tables::{AdvanceAction, LexState, LexStateId, LexTable, ParseStateId, ParseTable},
};
pub const LARGE_CHARACTER_RANGE_COUNT: usize = 8;
@ -131,7 +131,7 @@ pub fn build_lex_table(
}
struct QueueEntry {
state_id: usize,
state_id: LexStateId,
nfa_states: Vec<u32>,
eof_valid: bool,
}
@ -161,7 +161,7 @@ impl<'a> LexTableBuilder<'a> {
self.state_ids_by_nfa_state_set.clear();
}
fn add_state_for_tokens(&mut self, tokens: &TokenSet) -> usize {
fn add_state_for_tokens(&mut self, tokens: &TokenSet) -> LexStateId {
let mut eof_valid = false;
let nfa_states = tokens
.iter()
@ -197,7 +197,7 @@ impl<'a> LexTableBuilder<'a> {
state_id
}
fn add_state(&mut self, nfa_states: Vec<u32>, eof_valid: bool) -> (usize, bool) {
fn add_state(&mut self, nfa_states: Vec<u32>, eof_valid: bool) -> (LexStateId, bool) {
self.cursor.reset(nfa_states);
match self
.state_ids_by_nfa_state_set
@ -218,7 +218,7 @@ impl<'a> LexTableBuilder<'a> {
}
}
fn populate_state(&mut self, state_id: usize, nfa_states: Vec<u32>, eof_valid: bool) {
fn populate_state(&mut self, state_id: LexStateId, nfa_states: Vec<u32>, eof_valid: bool) {
self.cursor.force_reset(nfa_states);
// The EOF state is represented as an empty list of NFA states.
@ -417,7 +417,11 @@ fn minimize_lex_table(table: &mut LexTable, parse_table: &mut ParseTable) {
table.states = new_states;
}
fn lex_states_differ(left: &LexState, right: &LexState, group_ids_by_state_id: &[usize]) -> bool {
fn lex_states_differ(
left: &LexState,
right: &LexState,
group_ids_by_state_id: &[LexStateId],
) -> bool {
left.advance_actions
.iter()
.zip(right.advance_actions.iter())

4
crates/generate/src/tables.rs
View file

@ -134,8 +134,8 @@ pub struct ParseState {
pub terminal_entries: IndexMap<Symbol, ParseTableEntry, BuildHasherDefault<FxHasher>>,
pub nonterminal_entries: IndexMap<Symbol, GotoAction, BuildHasherDefault<FxHasher>>,
pub reserved_words: TokenSet,
pub lex_state_id: usize,
pub external_lex_state_id: usize,
pub lex_state_id: LexStateId,
pub external_lex_state_id: LexStateId,
pub core_id: usize,
}