From a31a8ef0c0189f88ed32d84cb2dcae3b7d7861af Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Fri, 30 Aug 2024 08:36:40 +0000
Subject: [PATCH] fix: rename variable to local


---
--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -24,7 +24,12 @@
 		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 @@
 	#[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),
--- a/crates/jrsonnet-evaluator/src/evaluate/mod.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/mod.rs
@@ -464,7 +464,7 @@
 		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(|| {

-- 
gitstuff