git.delta.rocks / jrsonnet / refs/commits / a31a8ef0c018

difftreelog

fix rename variable to local

Yaroslav Bolyukin2024-08-30parent: #761e429.patch.diff
in: master

2 files changed

modifiedcrates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth
24 return String::new();24 return String::new();
25 }25 }
26 let mut out = String::new();26 let mut out = String::new();
27 out.push_str("\nThere is ");27 out.push_str("\nThere ");
28 if list.len() > 1 {
29 out.push_str("are ");
30 } else {
31 out.push_str("is a ");
32 }
28 out.push_str(what);33 out.push_str(what);
29 if list.len() > 1 {34 if list.len() > 1 {
30 out.push('s');35 out.push('s');
133 #[error("assert failed: {}", format_empty_str(.0))]138 #[error("assert failed: {}", format_empty_str(.0))]
134 AssertionFailed(IStr),139 AssertionFailed(IStr),
135140
136 #[error("variable is not defined: {0}{}", format_found(.1, "variable"))]141 #[error("local is not defined: {0}{}", format_found(.1, "local"))]
137 VariableIsNotDefined(IStr, Vec<IStr>),142 VariableIsNotDefined(IStr, Vec<IStr>),
138 #[error("duplicate local var: {0}")]143 #[error("duplicate local var: {0}")]
139 DuplicateLocalVar(IStr),144 DuplicateLocalVar(IStr),
modifiedcrates/jrsonnet-evaluator/src/evaluate/mod.rsdiffbeforeafterboth
464 UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(ctx, v)?)?,464 UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(ctx, v)?)?,
465 Var(name) => in_frame(465 Var(name) => in_frame(
466 CallLocation::new(&loc),466 CallLocation::new(&loc),
467 || format!("variable <{name}> access"),467 || format!("local <{name}> access"),
468 || ctx.binding(name.clone())?.evaluate(),468 || ctx.binding(name.clone())?.evaluate(),
469 )?,469 )?,
470 Index { indexable, parts } => ensure_sufficient_stack(|| {470 Index { indexable, parts } => ensure_sufficient_stack(|| {