git.delta.rocks / jrsonnet / refs/commits / 8d08861d28f9

--- a/crates/jrsonnet-evaluator/src/builtin/manifest.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/manifest.rs
@@ -126,7 +126,6 @@
 			buf.push('}');
 		}
 		Val::Func(_) => throw!(RuntimeError("tried to manifest function".into())),
-		Val::DebugGcTraceValue(v) => manifest_json_ex_buf(&v.value, buf, cur_padding, options)?,
 	};
 	Ok(())
 }

1use crate::{1use crate::{
2	equals,2	equals,
3	error::{Error::*, Result},3	error::{Error::*, Result},
4	parse_args, primitive_equals, push, throw, with_state, ArrValue, Context, DebugGcTraceValue,4	parse_args, primitive_equals, push, throw, with_state, ArrValue, Context, EvaluationState,
5	EvaluationState, FuncVal, LazyVal, Val,5	FuncVal, LazyVal, Val,
6};6};
7use format::{format_arr, format_obj};7use format::{format_arr, format_obj};
69			("md5".into(), builtin_md5),69			("md5".into(), builtin_md5),
70			("base64".into(), builtin_base64),70			("base64".into(), builtin_base64),
71			("trace".into(), builtin_trace),71			("trace".into(), builtin_trace),
72			("gc".into(), builtin_gc),
73			("gcTrace".into(), builtin_gc_trace),
74			("join".into(), builtin_join),72			("join".into(), builtin_join),
75			("escapeStringJson".into(), builtin_escape_string_json),73			("escapeStringJson".into(), builtin_escape_string_json),
76			("manifestJsonEx".into(), builtin_manifest_json_ex),74			("manifestJsonEx".into(), builtin_manifest_json_ex),
449	})447	})
450}448}
451
452fn builtin_gc(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
453	parse_args!(context, "gc", args, 1, [
454		0, rest: ty!(any);
455	], {
456		println!("GC start");
457		jrsonnet_gc::force_collect();
458		println!("GC done");
459
460		Ok(rest)
461	})
462}
463
464fn builtin_gc_trace(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
465	parse_args!(context, "gcTrace", args, 2, [
466		0, name: ty!(string) => Val::Str;
467		1, rest: ty!(any);
468	], {
469		Ok(DebugGcTraceValue::create(name, rest))
470	})
471}
472449
473fn builtin_base64(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {450fn builtin_base64(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
474	parse_args!(context, "base64", args, 1, [451	parse_args!(context, "base64", args, 1, [

--- a/crates/jrsonnet-evaluator/src/evaluate.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate.rs
@@ -215,9 +215,6 @@
 
 pub fn evaluate_add_op(a: &Val, b: &Val) -> Result<Val> {
 	Ok(match (a, b) {
-		(Val::DebugGcTraceValue(v1), Val::DebugGcTraceValue(v2)) => {
-			evaluate_add_op(&v1.value, &v2.value)?
-		}
 		(Val::Str(v1), Val::Str(v2)) => Val::Str(((**v1).to_owned() + v2).into()),
 
 		// Can't use generic json serialization way, because it depends on number to string concatenation (std.jsonnet:890)

--- a/crates/jrsonnet-evaluator/src/integrations/serde.rs
+++ b/crates/jrsonnet-evaluator/src/integrations/serde.rs
@@ -42,7 +42,6 @@
 				Self::Object(out)
 			}
 			Val::Func(_) => throw!(RuntimeError("tried to manifest function".into())),
-			Val::DebugGcTraceValue(v) => Self::try_from(&*v.value as &Val)?,
 		})
 	}
 }

--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -9,7 +9,7 @@
 	native::NativeCallback,
 	throw, with_state, Context, ObjValue, Result,
 };
-use jrsonnet_gc::{Finalize, Gc, GcCell, Trace};
+use jrsonnet_gc::{Gc, GcCell, Trace};
 use jrsonnet_interner::IStr;
 use jrsonnet_parser::{el, Arg, ArgsDesc, Expr, ExprLocation, LiteralType, LocExpr, ParamsDesc};
 use jrsonnet_types::ValType;
@@ -345,65 +345,6 @@
 	}
 }
 
-#[derive(Debug)]
-pub struct DebugGcTraceValue {
-	name: IStr,
-	pub value: Box<Val>,
-}
-impl DebugGcTraceValue {
-	fn print(&self, action: &str) {
-		println!("{} {}#{:?}", action, self.name, &*self.value as *const _)
-	}
-}
-impl Finalize for DebugGcTraceValue {
-	fn finalize(&self) {
-		self.print("Garbage-collecting")
-	}
-}
-impl Drop for DebugGcTraceValue {
-	fn drop(&mut self) {
-		self.print("Garbage-collected")
-	}
-}
-unsafe impl Trace for DebugGcTraceValue {
-	unsafe fn trace(&self) {
-		self.print("Traced");
-		self.value.trace()
-	}
-	unsafe fn root(&self) {
-		self.print("Rooted");
-		self.value.root()
-	}
-	unsafe fn unroot(&self) {
-		self.print("Unrooted");
-		self.value.unroot()
-	}
-	fn finalize_glue(&self) {
-		Finalize::finalize(self)
-	}
-}
-impl Clone for DebugGcTraceValue {
-	fn clone(&self) -> Self {
-		self.print("Cloned");
-		let value = Self {
-			name: self.name.clone(),
-			value: self.value.clone(),
-		};
-		value.print("I'm clone");
-		value
-	}
-}
-impl DebugGcTraceValue {
-	pub fn create(name: IStr, value: Val) -> Val {
-		let value = Self {
-			name,
-			value: Box::new(value),
-		};
-		value.print("Constructed");
-		Val::DebugGcTraceValue(value)
-	}
-}
-
 #[derive(Debug, Clone, Trace)]
 #[trivially_drop]
 pub enum Val {
@@ -414,7 +355,6 @@
 	Arr(ArrValue),
 	Obj(ObjValue),
 	Func(Gc<FuncVal>),
-	DebugGcTraceValue(DebugGcTraceValue),
 }
 
 macro_rules! matches_unwrap {
@@ -471,7 +411,6 @@
 			Self::Bool(_) => ValType::Bool,
 			Self::Null => ValType::Null,
 			Self::Func(..) => ValType::Func,
-			Self::DebugGcTraceValue(v) => v.value.value_type(),
 		}
 	}