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

difftreelog

perf move std.assertEqual, std.find to native

Yaroslav Bolyukin2024-06-18parent: #541910c.patch.diff
in: master

4 files changed

modifiedcrates/jrsonnet-stdlib/src/arrays.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/arrays.rs
+++ b/crates/jrsonnet-stdlib/src/arrays.rs
@@ -276,6 +276,18 @@
 }
 
 #[builtin]
+pub fn builtin_find(value: Val, arr: ArrValue) -> Result<Vec<usize>> {
+	let mut out = Vec::new();
+	for (i, ele) in arr.iter().enumerate() {
+		let ele = ele?;
+		if equals(&ele, &value)? {
+			out.push(i);
+		}
+	}
+	Ok(out)
+}
+
+#[builtin]
 pub fn builtin_contains(arr: IndexableVal, elem: Val) -> Result<bool> {
 	builtin_member(arr, elem)
 }
modifiedcrates/jrsonnet-stdlib/src/lib.rsdiffbeforeafterboth
after · crates/jrsonnet-stdlib/src/lib.rs
1#![allow(clippy::similar_names)]23use std::{4	cell::{Ref, RefCell, RefMut},5	collections::HashMap,6	rc::Rc,7};89pub use arrays::*;10pub use compat::*;11pub use encoding::*;12pub use hash::*;13use jrsonnet_evaluator::{14	error::{ErrorKind::*, Result},15	function::{CallLocation, FuncVal, TlaArg},16	tb,17	trace::PathResolver,18	ContextBuilder, IStr, ObjValue, ObjValueBuilder, State, Thunk, Val,19};20use jrsonnet_gcmodule::Trace;21use jrsonnet_parser::Source;22pub use manifest::*;23pub use math::*;24pub use misc::*;25pub use objects::*;26pub use operator::*;27pub use parse::*;28pub use sets::*;29pub use sort::*;30pub use strings::*;31pub use types::*;3233#[cfg(feature = "exp-regex")]34pub use crate::regex::*;3536mod arrays;37mod compat;38mod encoding;39mod expr;40mod hash;41mod manifest;42mod math;43mod misc;44mod objects;45mod operator;46mod parse;47#[cfg(feature = "exp-regex")]48mod regex;49mod sets;50mod sort;51mod strings;52mod types;5354#[allow(clippy::too_many_lines)]55pub fn stdlib_uncached(settings: Rc<RefCell<Settings>>) -> ObjValue {56	let mut builder = ObjValueBuilder::new();5758	let expr = expr::stdlib_expr();59	let eval = jrsonnet_evaluator::evaluate(ContextBuilder::dangerous_empty_state().build(), &expr)60		.expect("stdlib.jsonnet should have no errors")61		.as_obj()62		.expect("stdlib.jsonnet should evaluate to object");6364	builder.with_super(eval);6566	// FIXME: Use PHF67	for (name, builtin) in [68		// Types69		("type", builtin_type::INST),70		("isString", builtin_is_string::INST),71		("isNumber", builtin_is_number::INST),72		("isBoolean", builtin_is_boolean::INST),73		("isObject", builtin_is_object::INST),74		("isArray", builtin_is_array::INST),75		("isFunction", builtin_is_function::INST),76		// Arrays77		("makeArray", builtin_make_array::INST),78		("repeat", builtin_repeat::INST),79		("slice", builtin_slice::INST),80		("map", builtin_map::INST),81		("mapWithIndex", builtin_map_with_index::INST),82		("flatMap", builtin_flatmap::INST),83		("filter", builtin_filter::INST),84		("foldl", builtin_foldl::INST),85		("foldr", builtin_foldr::INST),86		("range", builtin_range::INST),87		("join", builtin_join::INST),88		("lines", builtin_lines::INST),89		("deepJoin", builtin_deep_join::INST),90		("reverse", builtin_reverse::INST),91		("any", builtin_any::INST),92		("all", builtin_all::INST),93		("member", builtin_member::INST),94		("find", builtin_find::INST),95		("contains", builtin_contains::INST),96		("count", builtin_count::INST),97		("avg", builtin_avg::INST),98		("removeAt", builtin_remove_at::INST),99		("remove", builtin_remove::INST),100		("flattenArrays", builtin_flatten_arrays::INST),101		("flattenDeepArray", builtin_flatten_deep_array::INST),102		("prune", builtin_prune::INST),103		("filterMap", builtin_filter_map::INST),104		// Math105		("abs", builtin_abs::INST),106		("sign", builtin_sign::INST),107		("max", builtin_max::INST),108		("min", builtin_min::INST),109		("clamp", builtin_clamp::INST),110		("sum", builtin_sum::INST),111		("modulo", builtin_modulo::INST),112		("floor", builtin_floor::INST),113		("ceil", builtin_ceil::INST),114		("log", builtin_log::INST),115		("pow", builtin_pow::INST),116		("sqrt", builtin_sqrt::INST),117		("sin", builtin_sin::INST),118		("cos", builtin_cos::INST),119		("tan", builtin_tan::INST),120		("asin", builtin_asin::INST),121		("acos", builtin_acos::INST),122		("atan", builtin_atan::INST),123		("atan2", builtin_atan2::INST),124		("exp", builtin_exp::INST),125		("mantissa", builtin_mantissa::INST),126		("exponent", builtin_exponent::INST),127		("round", builtin_round::INST),128		("isEven", builtin_is_even::INST),129		("isOdd", builtin_is_odd::INST),130		("isInteger", builtin_is_integer::INST),131		("isDecimal", builtin_is_decimal::INST),132		// Operator133		("mod", builtin_mod::INST),134		("primitiveEquals", builtin_primitive_equals::INST),135		("equals", builtin_equals::INST),136		("xor", builtin_xor::INST),137		("xnor", builtin_xnor::INST),138		("format", builtin_format::INST),139		// Sort140		("sort", builtin_sort::INST),141		("uniq", builtin_uniq::INST),142		("set", builtin_set::INST),143		("minArray", builtin_min_array::INST),144		("maxArray", builtin_max_array::INST),145		// Hash146		("md5", builtin_md5::INST),147		("sha1", builtin_sha1::INST),148		("sha256", builtin_sha256::INST),149		("sha512", builtin_sha512::INST),150		("sha3", builtin_sha3::INST),151		// Encoding152		("encodeUTF8", builtin_encode_utf8::INST),153		("decodeUTF8", builtin_decode_utf8::INST),154		("base64", builtin_base64::INST),155		("base64Decode", builtin_base64_decode::INST),156		("base64DecodeBytes", builtin_base64_decode_bytes::INST),157		// Objects158		("objectFieldsEx", builtin_object_fields_ex::INST),159		("objectFields", builtin_object_fields::INST),160		("objectFieldsAll", builtin_object_fields_all::INST),161		("objectValues", builtin_object_values::INST),162		("objectValuesAll", builtin_object_values_all::INST),163		("objectKeysValues", builtin_object_keys_values::INST),164		("objectKeysValuesAll", builtin_object_keys_values_all::INST),165		("objectHasEx", builtin_object_has_ex::INST),166		("objectHas", builtin_object_has::INST),167		("objectHasAll", builtin_object_has_all::INST),168		("objectRemoveKey", builtin_object_remove_key::INST),169		// Manifest170		("escapeStringJson", builtin_escape_string_json::INST),171		("escapeStringPython", builtin_escape_string_python::INST),172		("escapeStringXML", builtin_escape_string_xml::INST),173		("manifestJsonEx", builtin_manifest_json_ex::INST),174		("manifestJson", builtin_manifest_json::INST),175		("manifestJsonMinified", builtin_manifest_json_minified::INST),176		("manifestYamlDoc", builtin_manifest_yaml_doc::INST),177		("manifestYamlStream", builtin_manifest_yaml_stream::INST),178		("manifestTomlEx", builtin_manifest_toml_ex::INST),179		("manifestToml", builtin_manifest_toml::INST),180		("toString", builtin_to_string::INST),181		("manifestPython", builtin_manifest_python::INST),182		("manifestPythonVars", builtin_manifest_python_vars::INST),183		("manifestXmlJsonml", builtin_manifest_xml_jsonml::INST),184		("manifestIni", builtin_manifest_ini::INST),185		// Parse186		("parseJson", builtin_parse_json::INST),187		("parseYaml", builtin_parse_yaml::INST),188		// Strings189		("codepoint", builtin_codepoint::INST),190		("substr", builtin_substr::INST),191		("char", builtin_char::INST),192		("strReplace", builtin_str_replace::INST),193		("escapeStringBash", builtin_escape_string_bash::INST),194		("escapeStringDollars", builtin_escape_string_dollars::INST),195		("isEmpty", builtin_is_empty::INST),196		("equalsIgnoreCase", builtin_equals_ignore_case::INST),197		("splitLimit", builtin_splitlimit::INST),198		("splitLimitR", builtin_splitlimitr::INST),199		("split", builtin_split::INST),200		("asciiUpper", builtin_ascii_upper::INST),201		("asciiLower", builtin_ascii_lower::INST),202		("findSubstr", builtin_find_substr::INST),203		("parseInt", builtin_parse_int::INST),204		#[cfg(feature = "exp-bigint")]205		("bigint", builtin_bigint::INST),206		("parseOctal", builtin_parse_octal::INST),207		("parseHex", builtin_parse_hex::INST),208		("stringChars", builtin_string_chars::INST),209		("lstripChars", builtin_lstrip_chars::INST),210		("rstripChars", builtin_rstrip_chars::INST),211		("stripChars", builtin_strip_chars::INST),212		// Misc213		("length", builtin_length::INST),214		("get", builtin_get::INST),215		("startsWith", builtin_starts_with::INST),216		("endsWith", builtin_ends_with::INST),217		("assertEqual", builtin_assert_equal::INST),218		// Sets219		("setMember", builtin_set_member::INST),220		("setInter", builtin_set_inter::INST),221		("setDiff", builtin_set_diff::INST),222		("setUnion", builtin_set_union::INST),223		// Regex224		#[cfg(feature = "exp-regex")]225		("regexQuoteMeta", builtin_regex_quote_meta::INST),226		// Compat227		("__compare", builtin___compare::INST),228		("__compare_array", builtin___compare_array::INST),229		("__array_less", builtin___array_less::INST),230		("__array_greater", builtin___array_greater::INST),231		("__array_less_or_equal", builtin___array_less_or_equal::INST),232		(233			"__array_greater_or_equal",234			builtin___array_greater_or_equal::INST,235		),236	]237	.iter()238	.copied()239	{240		builder.method(name, builtin);241	}242243	builder.method(244		"extVar",245		builtin_ext_var {246			settings: settings.clone(),247		},248	);249	builder.method(250		"native",251		builtin_native {252			settings: settings.clone(),253		},254	);255	builder.method("trace", builtin_trace { settings });256	builder.method("id", FuncVal::Id);257258	#[cfg(feature = "exp-regex")]259	{260		// Regex261		let regex_cache = RegexCache::default();262		builder.method(263			"regexFullMatch",264			builtin_regex_full_match {265				cache: regex_cache.clone(),266			},267		);268		builder.method(269			"regexPartialMatch",270			builtin_regex_partial_match {271				cache: regex_cache.clone(),272			},273		);274		builder.method(275			"regexReplace",276			builtin_regex_replace {277				cache: regex_cache.clone(),278			},279		);280		builder.method(281			"regexGlobalReplace",282			builtin_regex_global_replace { cache: regex_cache },283		);284	};285286	builder.build()287}288289pub trait TracePrinter {290	fn print_trace(&self, loc: CallLocation, value: IStr);291}292293pub struct StdTracePrinter {294	resolver: PathResolver,295}296impl StdTracePrinter {297	pub fn new(resolver: PathResolver) -> Self {298		Self { resolver }299	}300}301impl TracePrinter for StdTracePrinter {302	fn print_trace(&self, loc: CallLocation, value: IStr) {303		eprint!("TRACE:");304		if let Some(loc) = loc.0 {305			let locs = loc.0.map_source_locations(&[loc.1]);306			eprint!(307				" {}:{}",308				loc.0.source_path().path().map_or_else(309					|| loc.0.source_path().to_string(),310					|p| self.resolver.resolve(p)311				),312				locs[0].line313			);314		}315		eprintln!(" {value}");316	}317}318319pub struct Settings {320	/// Used for `std.extVar`321	pub ext_vars: HashMap<IStr, TlaArg>,322	/// Used for `std.native`323	pub ext_natives: HashMap<IStr, FuncVal>,324	/// Used for `std.trace`325	pub trace_printer: Box<dyn TracePrinter>,326	/// Used for `std.thisFile`327	pub path_resolver: PathResolver,328}329330fn extvar_source(name: &str, code: impl Into<IStr>) -> Source {331	let source_name = format!("<extvar:{name}>");332	Source::new_virtual(source_name.into(), code.into())333}334335#[derive(Trace, Clone)]336pub struct ContextInitializer {337	/// When we don't need to support legacy-this-file, we can reuse same context for all files338	#[cfg(not(feature = "legacy-this-file"))]339	context: jrsonnet_evaluator::Context,340	/// For `populate`341	#[cfg(not(feature = "legacy-this-file"))]342	stdlib_thunk: Thunk<Val>,343	/// Otherwise, we can only keep first stdlib layer, and then stack thisFile on top of it344	#[cfg(feature = "legacy-this-file")]345	stdlib_obj: ObjValue,346	settings: Rc<RefCell<Settings>>,347}348impl ContextInitializer {349	pub fn new(s: State, resolver: PathResolver) -> Self {350		let settings = Settings {351			ext_vars: HashMap::new(),352			ext_natives: HashMap::new(),353			trace_printer: Box::new(StdTracePrinter::new(resolver.clone())),354			path_resolver: resolver,355		};356		let settings = Rc::new(RefCell::new(settings));357		let stdlib_obj = stdlib_uncached(settings.clone());358		#[cfg(not(feature = "legacy-this-file"))]359		let stdlib_thunk = Thunk::evaluated(Val::Obj(stdlib_obj));360		#[cfg(feature = "legacy-this-file")]361		let _ = s;362		Self {363			#[cfg(not(feature = "legacy-this-file"))]364			context: {365				let mut context = ContextBuilder::with_capacity(s, 1);366				context.bind("std", stdlib_thunk.clone());367				context.build()368			},369			#[cfg(not(feature = "legacy-this-file"))]370			stdlib_thunk,371			#[cfg(feature = "legacy-this-file")]372			stdlib_obj,373			settings,374		}375	}376	pub fn settings(&self) -> Ref<Settings> {377		self.settings.borrow()378	}379	pub fn settings_mut(&self) -> RefMut<Settings> {380		self.settings.borrow_mut()381	}382	pub fn add_ext_var(&self, name: IStr, value: Val) {383		self.settings_mut()384			.ext_vars385			.insert(name, TlaArg::Val(value));386	}387	pub fn add_ext_str(&self, name: IStr, value: IStr) {388		self.settings_mut()389			.ext_vars390			.insert(name, TlaArg::String(value));391	}392	pub fn add_ext_code(&self, name: &str, code: impl Into<IStr>) -> Result<()> {393		let code = code.into();394		let source = extvar_source(name, code.clone());395		let parsed = jrsonnet_parser::parse(396			&code,397			&jrsonnet_parser::ParserSettings {398				source: source.clone(),399			},400		)401		.map_err(|e| ImportSyntaxError {402			path: source,403			error: Box::new(e),404		})?;405		// self.data_mut().volatile_files.insert(source_name, code);406		self.settings_mut()407			.ext_vars408			.insert(name.into(), TlaArg::Code(parsed));409		Ok(())410	}411	pub fn add_native(&self, name: impl Into<IStr>, cb: impl Into<FuncVal>) {412		self.settings_mut()413			.ext_natives414			.insert(name.into(), cb.into());415	}416}417impl jrsonnet_evaluator::ContextInitializer for ContextInitializer {418	fn reserve_vars(&self) -> usize {419		1420	}421	#[cfg(not(feature = "legacy-this-file"))]422	fn initialize(&self, _s: State, _source: Source) -> jrsonnet_evaluator::Context {423		self.context.clone()424	}425	#[cfg(not(feature = "legacy-this-file"))]426	fn populate(&self, _for_file: Source, builder: &mut ContextBuilder) {427		builder.bind("std", self.stdlib_thunk.clone());428	}429	#[cfg(feature = "legacy-this-file")]430	fn populate(&self, source: Source, builder: &mut ContextBuilder) {431		let mut std = ObjValueBuilder::new();432		std.with_super(self.stdlib_obj.clone());433		std.field("thisFile").hide().value({434			let source_path = source.source_path();435			source_path.path().map_or_else(436				|| source_path.to_string(),437				|p| self.settings().path_resolver.resolve(p),438			)439		});440		let stdlib_with_this_file = std.build();441442		builder.bind("std", Thunk::evaluated(Val::Obj(stdlib_with_this_file)));443	}444	fn as_any(&self) -> &dyn std::any::Any {445		self446	}447}448449pub trait StateExt {450	/// This method was previously implemented in jrsonnet-evaluator itself451	fn with_stdlib(&self);452}453454impl StateExt for State {455	fn with_stdlib(&self) {456		let initializer = ContextInitializer::new(self.clone(), PathResolver::new_cwd_fallback());457		self.settings_mut().context_initializer = tb!(initializer);458	}459}
modifiedcrates/jrsonnet-stdlib/src/misc.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/misc.rs
+++ b/crates/jrsonnet-stdlib/src/misc.rs
@@ -7,7 +7,7 @@
 	manifest::JsonFormat,
 	typed::{Either2, Either4},
 	val::{equals, ArrValue},
-	Context, Either, IStr, ObjValue, Thunk, Val,
+	Context, Either, IStr, ObjValue, ResultExt, Thunk, Val,
 };
 
 use crate::{extvar_source, Settings};
@@ -141,3 +141,14 @@
 		_ => bail!("both arguments should be of the same type"),
 	})
 }
+
+#[builtin]
+pub fn builtin_assert_equal(a: Val, b: Val) -> Result<bool> {
+	if equals(&a, &b)? {
+		return Ok(true);
+	}
+	let format = JsonFormat::std_to_json("  ".to_owned(), "\n", ": ");
+	let a = a.manifest(&format).description("<a> manifestification")?;
+	let b = b.manifest(&format).description("<b> manifestification")?;
+	bail!("assertion failed: A != B\nA: {a}\nB: {b}")
+}
modifiedcrates/jrsonnet-stdlib/src/std.jsonnetdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/std.jsonnet
+++ b/crates/jrsonnet-stdlib/src/std.jsonnet
@@ -11,12 +11,6 @@
     else
       { [k]: func(k, obj[k]) for k in std.objectFields(obj) },
 
-  assertEqual(a, b)::
-    if a == b then
-      true
-    else
-      error 'Assertion failed. ' + a + ' != ' + b,
-
   mergePatch(target, patch)::
     if std.isObject(patch) then
       local target_object =
@@ -44,10 +38,4 @@
   resolvePath(f, r)::
     local arr = std.split(f, '/');
     std.join('/', std.makeArray(std.length(arr) - 1, function(i) arr[i]) + [r]),
-
-  find(value, arr)::
-    if !std.isArray(arr) then
-      error 'find second parameter should be an array, got ' + std.type(arr)
-    else
-      std.filter(function(i) arr[i] == value, std.range(0, std.length(arr) - 1)),
 }