Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fitzery with cursor

Browse source
This commit is contained in:
Piotr Osiewicz 2025-08-08 16:49:42 +02:00
parent b43153a99f
commit 4e2907e296
2 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

37
crates/sum_tree/src/cursor.rs
View file

@ -322,7 +322,10 @@ where
if entry.index < child_summaries.len() { if entry.index < child_summaries.len() {
let index = child_summaries[entry.index..] let index = child_summaries[entry.index..]
.partition_point(|item| filter_node(item).is_lt()); .partition_point(|item| filter_node(item).is_lt());
entry.index += index; if index < child_summaries.len() - entry.index {
entry.index += index;
}
let position = Some(entry.index) let position = Some(entry.index)
.filter(|index| *index < child_summaries.len()) .filter(|index| *index < child_summaries.len())
.unwrap_or(child_summaries.len()); .unwrap_or(child_summaries.len());
@ -332,10 +335,12 @@ where
self.position.add_summary(summary, self.cx); self.position.add_summary(summary, self.cx);
} }
} }
dbg!((entry.index, child_trees.len()));
child_trees.get(entry.index) child_trees.get(entry.index)
} }
Node::Leaf { item_summaries, .. } => { Node::Leaf { item_summaries, .. } => {
dbg!("Ayo");
if !descend { if !descend {
let item_summary = &item_summaries[entry.index]; let item_summary = &item_summaries[entry.index];
entry.index += 1; entry.index += 1;
@ -343,22 +348,24 @@ where
self.position.add_summary(item_summary, self.cx); self.position.add_summary(item_summary, self.cx);
} }
loop { if entry.index < item_summaries.len() {
if entry.index < item_summaries.len() { let index = item_summaries[entry.index..]
let index = item_summaries[entry.index..] .partition_point(|item| filter_node(item).is_lt());
.partition_point(|item| filter_node(item).is_lt()); if index < item_summaries.len() - entry.index {
entry.index += index; entry.index += index;
let position = Some(entry.index)
.filter(|index| *index < item_summaries.len())
.unwrap_or(item_summaries.len());
if let Some(summary) = item_summaries.get(position) {
entry.position.add_summary(summary, self.cx);
self.position.add_summary(summary, self.cx);
}
} else {
break None;
} }
entry.index += index;
let position = Some(entry.index)
.filter(|index| *index < item_summaries.len())
.unwrap_or(item_summaries.len());
if let Some(summary) = item_summaries.get(position) {
entry.position.add_summary(summary, self.cx);
self.position.add_summary(summary, self.cx);
}
return;
} else {
None
} }
} }
} }

2
crates/sum_tree/src/tree_map.rs
View file

@ -406,7 +406,7 @@ mod tests {
map.insert("baa", 3); map.insert("baa", 3);
map.insert("baaab", 4); map.insert("baaab", 4);
map.insert("c", 5); map.insert("c", 5);
dbg!(&map);
let result = map let result = map
.iter_from(&"ba") .iter_from(&"ba")
.take_while(|(key, _)| key.starts_with("ba")) .take_while(|(key, _)| key.starts_with("ba"))