jeff/dust
1
0
Fork 0
Code

Fix context scope bug

Browse Source
This commit is contained in:
Jeff 2024-09-02 12:57:27 -04:00
parent 3c2a70803e
commit 0edb42836d
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
dust-lang/src/context.rs
View File

@ -268,6 +268,32 @@ impl Context {
&self,
identifier: &Identifier,
position: usize,
) -> Result<bool, ContextError> {
let found = self.update_position_if_found(identifier, position)?;
if found {
Ok(true)
} else if let Some(parent) = &self.parent {
let found_in_ancestor = parent.update_last_position(identifier, position)?;
if !found_in_ancestor {
let mut associations = self.associations.write()?;
log::trace!("Updating {identifier}'s last position to {position:?}");
associations.insert(identifier.clone(), (ContextData::Reserved, position));
}
Ok(false)
} else {
Ok(false)
}
}
fn update_position_if_found(
&self,
identifier: &Identifier,
position: usize,
) -> Result<bool, ContextError> {
let mut associations = self.associations.write()?;
@ -278,21 +304,7 @@ impl Context {
Ok(true)
} else {
let ancestor_contains = if let Some(parent) = &self.parent {
parent.contains(identifier)?
} else {
false
};
if ancestor_contains {
Ok(true)
} else {
log::trace!("Reserving {identifier} at {position:?}");
associations.insert(identifier.clone(), (ContextData::Reserved, position));
Ok(false)
}
Ok(false)
}
}