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

--- a/crates/jrsonnet-evaluator/src/evaluate.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate.rs
@@ -92,7 +92,7 @@
 		(Val::Str(s), o) => Val::Str(format!("{}{}", s, o.clone().to_string()?).into()),
 		(o, Val::Str(s)) => Val::Str(format!("{}{}", o.clone().to_string()?, s).into()),
 
-		(Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),
+		(Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.extend_from(v1.clone())),
 		(Val::Arr(a), Val::Arr(b)) => {
 			let mut out = Vec::with_capacity(a.len() + b.len());
 			out.extend(a.iter_lazy());

62	pub fn new_empty() -> Self {62	pub fn new_empty() -> Self {
63		Self::new(None, Rc::new(FxHashMap::default()))63		Self::new(None, Rc::new(FxHashMap::default()))
64	}64	}
65	pub fn with_super(&self, super_obj: Self) -> Self {65	pub fn extend_from(&self, super_obj: Self) -> Self {
66		match &self.0.super_obj {66		match &self.0.super_obj {
67			None => Self::new(Some(super_obj), self.0.this_entries.clone()),67			None => Self::new(Some(super_obj), self.0.this_entries.clone()),
68			Some(v) => Self::new(Some(v.with_super(super_obj)), self.0.this_entries.clone()),68			Some(v) => Self::new(Some(v.extend_from(super_obj)), self.0.this_entries.clone()),
69		}69		}
70	}70	}
71	pub fn with_this(&self, this_obj: Self) -> Self {71	pub fn with_this(&self, this_obj: Self) -> Self {