Oliver/neoscim
1
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases Wiki Activity

fix #33

Browse Source
This commit is contained in:
Rushmore75
2026-01-27 13:49:46 -07:00
parent 052828c89c
commit 0c78e7834b
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/app/logic/ctx.rs
View File

@@ -24,7 +24,7 @@ impl<'a> CallbackContext<'a> {
let as_index = |s: &str| { let as_index = |s: &str| {
s.char_indices() s.char_indices()
// .filter(|f| f.1 as u8 >= 97) // prevent sub with overflow errors // .filter(|f| f.1 as u8 >= 97) // prevent sub with overflow errors
.map(|(idx, c)| (c.to_ascii_lowercase() as usize - 97) + (26 * idx)) .map(|(idx, c)| ((c.to_ascii_lowercase() as usize).saturating_sub(97)) + (26 * idx))
.fold(0, |a, b| a + b) .fold(0, |a, b| a + b)
}; };
@@ -162,8 +162,8 @@ impl<'a> Context for CallbackContext<'a> {
} }
if let Ok(mut trail) = self.eval_breadcrumbs.write() { if let Ok(mut trail) = self.eval_breadcrumbs.write() {
let find = trail.iter().filter(|id| *id == identifier).collect::<Vec<&String>>(); let find = trail.iter().filter(|id| *id == identifier).count();
if find.len() > 0 { if find > 0 {
// recursion detected // recursion detected
return None; return None;
} else { } else {
@@ -195,7 +195,7 @@ impl<'a> Context for CallbackContext<'a> {
}, },
Err(e) => { Err(e) => {
match e { match e {
EvalexprError::VariableIdentifierNotFound(_) => { EvalexprError::VariableIdentifierNotFound(_err) => {
// If the variable isn't found, that's ~~probably~~ because // If the variable isn't found, that's ~~probably~~ because
// of recursive reference, considering all references // of recursive reference, considering all references
// are grabbed straight from the table. // are grabbed straight from the table.
@@ -217,8 +217,14 @@ impl<'a> Context for CallbackContext<'a> {
CellType::Number(e) => vals.push(Value::Float(*e)), CellType::Number(e) => vals.push(Value::Float(*e)),
CellType::String(s) => vals.push(Value::String(s.to_owned())), CellType::String(s) => vals.push(Value::String(s.to_owned())),
CellType::Equation(eq) => { CellType::Equation(eq) => {
if let Ok(val) = eval_with_context(&eq[1..], self) { match eval_with_context(&eq[1..], self) {
vals.push(val); Ok(val) => vals.push(val),
Err(_err) => {
// At this point we are getting an error because
// recursion protection made this equation return
// None. We now don't get any evaluation.
return None
},
} }
} }
} }
@@ -272,6 +278,7 @@ impl ExtractionContext {
pub fn dump_vars(&self) -> Vec<String> { pub fn dump_vars(&self) -> Vec<String> {
if let Ok(r) = self.var_registry.read() { r.clone() } else { Vec::new() } if let Ok(r) = self.var_registry.read() { r.clone() } else { Vec::new() }
} }
#[allow(dead_code)]
pub fn dump_fns(&self) -> Vec<String> { pub fn dump_fns(&self) -> Vec<String> {
if let Ok(r) = self.fn_registry.read() { r.clone() } else { Vec::new() } if let Ok(r) = self.fn_registry.read() { r.clone() } else { Vec::new() }
} }