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

Generator::add_parse_table: Store entries in hash map

Browse source 
This avoids a quadratic behaviour due to repeatedly using `find` on a
growing `Vec`.
This commit is contained in:
Paul Gey 2021-08-04 21:31:25 +02:00
parent cf69a2c94c
commit 965e3c9e5e
2 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
cli/src/generate/render.rs
View file

@ -1057,7 +1057,7 @@ impl Generator {
}
fn add_parse_table(&mut self) {
let mut parse_table_entries = Vec::new();
let mut parse_table_entries = HashMap::new();
let mut next_parse_action_list_index = 0;
self.get_parse_action_list_id(
@ -1224,6 +1224,11 @@ impl Generator {
add_line!(self, "");
}
let mut parse_table_entries: Vec<_> = parse_table_entries
.into_iter()
.map(|(entry, i)| (i, entry))
.collect();
parse_table_entries.sort_by_key(|(index, _)| *index);
self.add_parse_action_list(parse_table_entries);
}
@ -1404,17 +1409,17 @@ impl Generator {
fn get_parse_action_list_id(
&self,
entry: &ParseTableEntry,
parse_table_entries: &mut Vec<(usize, ParseTableEntry)>,
parse_table_entries: &mut HashMap<ParseTableEntry, usize>,
next_parse_action_list_index: &mut usize,
) -> usize {
if let Some((index, _)) = parse_table_entries.iter().find(|(_, e)| *e == *entry) {
return *index;
if let Some(&index) = parse_table_entries.get(entry) {
index
} else {
let result = *next_parse_action_list_index;
parse_table_entries.insert(entry.clone(), result);
*next_parse_action_list_index += 1 + entry.actions.len();
result
}
let result = *next_parse_action_list_index;
parse_table_entries.push((result, entry.clone()));
*next_parse_action_list_index += 1 + entry.actions.len();
result
}
fn get_field_map_id(

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

@ -10,7 +10,7 @@ use std::hash::BuildHasherDefault;
use indexmap::IndexMap;
use rustc_hash::FxHasher;
#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub(crate) enum ParseAction {
Accept,
Shift {
@ -33,7 +33,7 @@ pub(crate) enum GotoAction {
ShiftExtra,
}
#[derive(Clone, Debug, PartialEq, Eq)]
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
pub(crate) struct ParseTableEntry {
pub actions: Vec<ParseAction>,
pub reusable: bool,