fix: rename variable to local

CertainLach · Aug 30, 2024 · a31a8ef · a31a8ef
1 parent 761e429
commit a31a8ef
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/crates/jrsonnet-evaluator/src/error.rs b/crates/jrsonnet-evaluator/src/error.rs
@@ -24,7 +24,12 @@ pub(crate) fn format_found(list: &[IStr], what: &str) -> String {
 		return String::new();
 	}
 	let mut out = String::new();
-	out.push_str("\nThere is ");
+	out.push_str("\nThere ");
+	if list.len() > 1 {
+		out.push_str("are ");
+	} else {
+		out.push_str("is a ");
+	}
 	out.push_str(what);
 	if list.len() > 1 {
 		out.push('s');
@@ -133,7 +138,7 @@ pub enum ErrorKind {
 	#[error("assert failed: {}", format_empty_str(.0))]
 	AssertionFailed(IStr),
 
-	#[error("variable is not defined: {0}{}", format_found(.1, "variable"))]
+	#[error("local is not defined: {0}{}", format_found(.1, "local"))]
 	VariableIsNotDefined(IStr, Vec<IStr>),
 	#[error("duplicate local var: {0}")]
 	DuplicateLocalVar(IStr),

diff --git a/crates/jrsonnet-evaluator/src/evaluate/mod.rs b/crates/jrsonnet-evaluator/src/evaluate/mod.rs
@@ -464,7 +464,7 @@ pub fn evaluate(ctx: Context, expr: &LocExpr) -> Result<Val> {
 		UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(ctx, v)?)?,
 		Var(name) => in_frame(
 			CallLocation::new(&loc),
-			|| format!("variable <{name}> access"),
+			|| format!("local <{name}> access"),
 			|| ctx.binding(name.clone())?.evaluate(),
 		)?,
 		Index { indexable, parts } => ensure_sufficient_stack(|| {