difftreelog
perf move std.setInter to native
in: master
3 files changed
crates/jrsonnet-stdlib/src/lib.rsdiffbeforeafterboth1use std::{2 cell::{Ref, RefCell, RefMut},3 collections::HashMap,4 rc::Rc,5};67use jrsonnet_evaluator::{8 error::{ErrorKind::*, Result},9 function::{builtin::Builtin, CallLocation, FuncVal, TlaArg},10 gc::{GcHashMap, TraceBox},11 tb,12 trace::PathResolver,13 Context, ContextBuilder, IStr, ObjValue, ObjValueBuilder, State, Thunk, Val,14};15use jrsonnet_gcmodule::{Cc, Trace};16use jrsonnet_parser::Source;1718mod expr;19mod types;20pub use types::*;21mod arrays;22pub use arrays::*;23mod math;24pub use math::*;25mod operator;26pub use operator::*;27mod sort;28pub use sort::*;29mod hash;30pub use hash::*;31mod encoding;32pub use encoding::*;33mod objects;34pub use objects::*;35mod manifest;36pub use manifest::*;37mod parse;38pub use parse::*;39mod strings;40pub use strings::*;41mod misc;42pub use misc::*;43mod sets;44pub use sets::*;4546pub fn stdlib_uncached(settings: Rc<RefCell<Settings>>) -> ObjValue {47 let mut builder = ObjValueBuilder::new();4849 let expr = expr::stdlib_expr();50 let eval = jrsonnet_evaluator::evaluate(ContextBuilder::dangerous_empty_state().build(), &expr)51 .expect("stdlib.jsonnet should have no errors")52 .as_obj()53 .expect("stdlib.jsonnet should evaluate to object");5455 builder.with_super(eval);5657 for (name, builtin) in [58 // Types59 ("type", builtin_type::INST),60 ("isString", builtin_is_string::INST),61 ("isNumber", builtin_is_number::INST),62 ("isBoolean", builtin_is_boolean::INST),63 ("isObject", builtin_is_object::INST),64 ("isArray", builtin_is_array::INST),65 ("isFunction", builtin_is_function::INST),66 // Arrays67 ("makeArray", builtin_make_array::INST),68 ("repeat", builtin_repeat::INST),69 ("slice", builtin_slice::INST),70 ("map", builtin_map::INST),71 ("flatMap", builtin_flatmap::INST),72 ("filter", builtin_filter::INST),73 ("foldl", builtin_foldl::INST),74 ("foldr", builtin_foldr::INST),75 ("range", builtin_range::INST),76 ("join", builtin_join::INST),77 ("reverse", builtin_reverse::INST),78 ("any", builtin_any::INST),79 ("all", builtin_all::INST),80 ("member", builtin_member::INST),81 ("count", builtin_count::INST),82 // Math83 ("abs", builtin_abs::INST),84 ("sign", builtin_sign::INST),85 ("max", builtin_max::INST),86 ("min", builtin_min::INST),87 ("modulo", builtin_modulo::INST),88 ("floor", builtin_floor::INST),89 ("ceil", builtin_ceil::INST),90 ("log", builtin_log::INST),91 ("pow", builtin_pow::INST),92 ("sqrt", builtin_sqrt::INST),93 ("sin", builtin_sin::INST),94 ("cos", builtin_cos::INST),95 ("tan", builtin_tan::INST),96 ("asin", builtin_asin::INST),97 ("acos", builtin_acos::INST),98 ("atan", builtin_atan::INST),99 ("exp", builtin_exp::INST),100 ("mantissa", builtin_mantissa::INST),101 ("exponent", builtin_exponent::INST),102 // Operator103 ("mod", builtin_mod::INST),104 ("primitiveEquals", builtin_primitive_equals::INST),105 ("equals", builtin_equals::INST),106 ("format", builtin_format::INST),107 // Sort108 ("sort", builtin_sort::INST),109 ("uniq", builtin_uniq::INST),110 ("set", builtin_set::INST),111 // Hash112 ("md5", builtin_md5::INST),113 #[cfg(feature = "exp-more-hashes")]114 ("sha256", builtin_sha256::INST),115 // Encoding116 ("encodeUTF8", builtin_encode_utf8::INST),117 ("decodeUTF8", builtin_decode_utf8::INST),118 ("base64", builtin_base64::INST),119 ("base64Decode", builtin_base64_decode::INST),120 ("base64DecodeBytes", builtin_base64_decode_bytes::INST),121 // Objects122 ("objectFieldsEx", builtin_object_fields_ex::INST),123 ("objectHasEx", builtin_object_has_ex::INST),124 // Manifest125 ("escapeStringJson", builtin_escape_string_json::INST),126 ("manifestJsonEx", builtin_manifest_json_ex::INST),127 ("manifestYamlDoc", builtin_manifest_yaml_doc::INST),128 ("manifestTomlEx", builtin_manifest_toml_ex::INST),129 // Parsing130 ("parseJson", builtin_parse_json::INST),131 ("parseYaml", builtin_parse_yaml::INST),132 // Strings133 ("codepoint", builtin_codepoint::INST),134 ("substr", builtin_substr::INST),135 ("char", builtin_char::INST),136 ("strReplace", builtin_str_replace::INST),137 ("splitLimit", builtin_splitlimit::INST),138 ("asciiUpper", builtin_ascii_upper::INST),139 ("asciiLower", builtin_ascii_lower::INST),140 ("findSubstr", builtin_find_substr::INST),141 ("parseInt", builtin_parse_int::INST),142 ("parseOctal", builtin_parse_octal::INST),143 ("parseHex", builtin_parse_hex::INST),144 // Misc145 ("length", builtin_length::INST),146 ("startsWith", builtin_starts_with::INST),147 ("endsWith", builtin_ends_with::INST),148 // Sets149 ("setMember", builtin_set_member::INST),150 ]151 .iter()152 .cloned()153 {154 builder155 .member(name.into())156 .hide()157 .value(Val::Func(FuncVal::StaticBuiltin(builtin)))158 .expect("no conflict");159 }160161 builder162 .member("extVar".into())163 .hide()164 .value(Val::Func(FuncVal::builtin(builtin_ext_var {165 settings: settings.clone(),166 })))167 .expect("no conflict");168 builder169 .member("native".into())170 .hide()171 .value(Val::Func(FuncVal::builtin(builtin_native {172 settings: settings.clone(),173 })))174 .expect("no conflict");175 builder176 .member("trace".into())177 .hide()178 .value(Val::Func(FuncVal::builtin(builtin_trace { settings })))179 .expect("no conflict");180181 builder182 .member("id".into())183 .hide()184 .value(Val::Func(FuncVal::Id))185 .expect("no conflict");186187 builder.build()188}189190pub trait TracePrinter {191 fn print_trace(&self, loc: CallLocation, value: IStr);192}193194pub struct StdTracePrinter {195 resolver: PathResolver,196}197impl StdTracePrinter {198 pub fn new(resolver: PathResolver) -> Self {199 Self { resolver }200 }201}202impl TracePrinter for StdTracePrinter {203 fn print_trace(&self, loc: CallLocation, value: IStr) {204 eprint!("TRACE:");205 if let Some(loc) = loc.0 {206 let locs = loc.0.map_source_locations(&[loc.1]);207 eprint!(208 " {}:{}",209 match loc.0.source_path().path() {210 Some(p) => self.resolver.resolve(p),211 None => loc.0.source_path().to_string(),212 },213 locs[0].line214 );215 }216 eprintln!(" {value}");217 }218}219220pub struct Settings {221 /// Used for `std.extVar`222 pub ext_vars: HashMap<IStr, TlaArg>,223 /// Used for `std.native`224 pub ext_natives: HashMap<IStr, Cc<TraceBox<dyn Builtin>>>,225 /// Helper to add globals without implementing custom ContextInitializer226 pub globals: GcHashMap<IStr, Thunk<Val>>,227 /// Used for `std.trace`228 pub trace_printer: Box<dyn TracePrinter>,229 /// Used for `std.thisFile`230 pub path_resolver: PathResolver,231}232233fn extvar_source(name: &str, code: impl Into<IStr>) -> Source {234 let source_name = format!("<extvar:{name}>");235 Source::new_virtual(source_name.into(), code.into())236}237238#[derive(Trace, Clone)]239pub struct ContextInitializer {240 // When we don't need to support legacy-this-file, we can reuse same context for all files241 #[cfg(not(feature = "legacy-this-file"))]242 context: Context,243 // Otherwise, we can only keep first stdlib layer, and then stack thisFile on top of it244 #[cfg(feature = "legacy-this-file")]245 stdlib_obj: ObjValue,246 settings: Rc<RefCell<Settings>>,247}248impl ContextInitializer {249 pub fn new(_s: State, resolver: PathResolver) -> Self {250 let settings = Settings {251 ext_vars: Default::default(),252 ext_natives: Default::default(),253 globals: Default::default(),254 trace_printer: Box::new(StdTracePrinter::new(resolver.clone())),255 path_resolver: resolver,256 };257 let settings = Rc::new(RefCell::new(settings));258 Self {259 #[cfg(not(feature = "legacy-this-file"))]260 context: {261 let mut context = ContextBuilder::with_capacity(_s, 1);262 context.bind(263 "std".into(),264 Thunk::evaluated(Val::Obj(stdlib_uncached(settings.clone()))),265 );266 context.build()267 },268 #[cfg(feature = "legacy-this-file")]269 stdlib_obj: stdlib_uncached(settings.clone()),270 settings,271 }272 }273 pub fn settings(&self) -> Ref<Settings> {274 self.settings.borrow()275 }276 pub fn settings_mut(&self) -> RefMut<Settings> {277 self.settings.borrow_mut()278 }279 pub fn add_ext_var(&self, name: IStr, value: Val) {280 self.settings_mut()281 .ext_vars282 .insert(name, TlaArg::Val(value));283 }284 pub fn add_ext_str(&self, name: IStr, value: IStr) {285 self.settings_mut()286 .ext_vars287 .insert(name, TlaArg::String(value));288 }289 pub fn add_ext_code(&self, name: &str, code: impl Into<IStr>) -> Result<()> {290 let code = code.into();291 let source = extvar_source(name, code.clone());292 let parsed = jrsonnet_parser::parse(293 &code,294 &jrsonnet_parser::ParserSettings {295 source: source.clone(),296 },297 )298 .map_err(|e| ImportSyntaxError {299 path: source,300 error: Box::new(e),301 })?;302 // self.data_mut().volatile_files.insert(source_name, code);303 self.settings_mut()304 .ext_vars305 .insert(name.into(), TlaArg::Code(parsed));306 Ok(())307 }308 pub fn add_native(&self, name: IStr, cb: impl Builtin) {309 self.settings_mut()310 .ext_natives311 .insert(name, Cc::new(tb!(cb)));312 }313}314impl jrsonnet_evaluator::ContextInitializer for ContextInitializer {315 #[cfg(not(feature = "legacy-this-file"))]316 fn initialize(&self, _s: State, _source: Source) -> jrsonnet_evaluator::Context {317 let out = self.context.clone();318 let globals = &self.settings().globals;319 if globals.is_empty() {320 return out;321 }322323 let mut out = ContextBuilder::extend(out);324 for (k, v) in globals.iter() {325 out.bind(k.clone(), v.clone());326 }327 out.build()328 }329 #[cfg(feature = "legacy-this-file")]330 fn initialize(&self, s: State, source: Source) -> Context {331 use jrsonnet_evaluator::val::StrValue;332333 let mut builder = ObjValueBuilder::new();334 builder.with_super(self.stdlib_obj.clone());335 builder336 .member("thisFile".into())337 .hide()338 .value(Val::Str(StrValue::Flat(339 match source.source_path().path() {340 Some(p) => self.settings().path_resolver.resolve(p).into(),341 None => source.source_path().to_string().into(),342 },343 )))344 .expect("this object builder is empty");345 let stdlib_with_this_file = builder.build();346347 let mut context = ContextBuilder::with_capacity(s, 1);348 context.bind(349 "std".into(),350 Thunk::evaluated(Val::Obj(stdlib_with_this_file)),351 );352 for (k, v) in self.settings().globals.iter() {353 context.bind(k.clone(), v.clone());354 }355 context.build()356 }357 fn as_any(&self) -> &dyn std::any::Any {358 self359 }360}361362pub trait StateExt {363 /// This method was previously implemented in jrsonnet-evaluator itself364 fn with_stdlib(&self);365 fn add_global(&self, name: IStr, value: Thunk<Val>);366}367368impl StateExt for State {369 fn with_stdlib(&self) {370 let initializer = ContextInitializer::new(self.clone(), PathResolver::new_cwd_fallback());371 self.settings_mut().context_initializer = tb!(initializer)372 }373 fn add_global(&self, name: IStr, value: Thunk<Val>) {374 self.settings()375 .context_initializer376 .as_any()377 .downcast_ref::<ContextInitializer>()378 .expect("not standard context initializer")379 .settings_mut()380 .globals381 .insert(name, value);382 }383}1use std::{2 cell::{Ref, RefCell, RefMut},3 collections::HashMap,4 rc::Rc,5};67use jrsonnet_evaluator::{8 error::{ErrorKind::*, Result},9 function::{builtin::Builtin, CallLocation, FuncVal, TlaArg},10 gc::{GcHashMap, TraceBox},11 tb,12 trace::PathResolver,13 Context, ContextBuilder, IStr, ObjValue, ObjValueBuilder, State, Thunk, Val,14};15use jrsonnet_gcmodule::{Cc, Trace};16use jrsonnet_parser::Source;1718mod expr;19mod types;20pub use types::*;21mod arrays;22pub use arrays::*;23mod math;24pub use math::*;25mod operator;26pub use operator::*;27mod sort;28pub use sort::*;29mod hash;30pub use hash::*;31mod encoding;32pub use encoding::*;33mod objects;34pub use objects::*;35mod manifest;36pub use manifest::*;37mod parse;38pub use parse::*;39mod strings;40pub use strings::*;41mod misc;42pub use misc::*;43mod sets;44pub use sets::*;45mod compat;46pub use compat::*;4748pub fn stdlib_uncached(settings: Rc<RefCell<Settings>>) -> ObjValue {49 let mut builder = ObjValueBuilder::new();5051 let expr = expr::stdlib_expr();52 let eval = jrsonnet_evaluator::evaluate(ContextBuilder::dangerous_empty_state().build(), &expr)53 .expect("stdlib.jsonnet should have no errors")54 .as_obj()55 .expect("stdlib.jsonnet should evaluate to object");5657 builder.with_super(eval);5859 for (name, builtin) in [60 // Types61 ("type", builtin_type::INST),62 ("isString", builtin_is_string::INST),63 ("isNumber", builtin_is_number::INST),64 ("isBoolean", builtin_is_boolean::INST),65 ("isObject", builtin_is_object::INST),66 ("isArray", builtin_is_array::INST),67 ("isFunction", builtin_is_function::INST),68 // Arrays69 ("makeArray", builtin_make_array::INST),70 ("repeat", builtin_repeat::INST),71 ("slice", builtin_slice::INST),72 ("map", builtin_map::INST),73 ("flatMap", builtin_flatmap::INST),74 ("filter", builtin_filter::INST),75 ("foldl", builtin_foldl::INST),76 ("foldr", builtin_foldr::INST),77 ("range", builtin_range::INST),78 ("join", builtin_join::INST),79 ("reverse", builtin_reverse::INST),80 ("any", builtin_any::INST),81 ("all", builtin_all::INST),82 ("member", builtin_member::INST),83 ("count", builtin_count::INST),84 // Math85 ("abs", builtin_abs::INST),86 ("sign", builtin_sign::INST),87 ("max", builtin_max::INST),88 ("min", builtin_min::INST),89 ("modulo", builtin_modulo::INST),90 ("floor", builtin_floor::INST),91 ("ceil", builtin_ceil::INST),92 ("log", builtin_log::INST),93 ("pow", builtin_pow::INST),94 ("sqrt", builtin_sqrt::INST),95 ("sin", builtin_sin::INST),96 ("cos", builtin_cos::INST),97 ("tan", builtin_tan::INST),98 ("asin", builtin_asin::INST),99 ("acos", builtin_acos::INST),100 ("atan", builtin_atan::INST),101 ("exp", builtin_exp::INST),102 ("mantissa", builtin_mantissa::INST),103 ("exponent", builtin_exponent::INST),104 // Operator105 ("mod", builtin_mod::INST),106 ("primitiveEquals", builtin_primitive_equals::INST),107 ("equals", builtin_equals::INST),108 ("format", builtin_format::INST),109 // Sort110 ("sort", builtin_sort::INST),111 ("uniq", builtin_uniq::INST),112 ("set", builtin_set::INST),113 // Hash114 ("md5", builtin_md5::INST),115 #[cfg(feature = "exp-more-hashes")]116 ("sha256", builtin_sha256::INST),117 // Encoding118 ("encodeUTF8", builtin_encode_utf8::INST),119 ("decodeUTF8", builtin_decode_utf8::INST),120 ("base64", builtin_base64::INST),121 ("base64Decode", builtin_base64_decode::INST),122 ("base64DecodeBytes", builtin_base64_decode_bytes::INST),123 // Objects124 ("objectFieldsEx", builtin_object_fields_ex::INST),125 ("objectHasEx", builtin_object_has_ex::INST),126 // Manifest127 ("escapeStringJson", builtin_escape_string_json::INST),128 ("manifestJsonEx", builtin_manifest_json_ex::INST),129 ("manifestYamlDoc", builtin_manifest_yaml_doc::INST),130 ("manifestTomlEx", builtin_manifest_toml_ex::INST),131 // Parsing132 ("parseJson", builtin_parse_json::INST),133 ("parseYaml", builtin_parse_yaml::INST),134 // Strings135 ("codepoint", builtin_codepoint::INST),136 ("substr", builtin_substr::INST),137 ("char", builtin_char::INST),138 ("strReplace", builtin_str_replace::INST),139 ("splitLimit", builtin_splitlimit::INST),140 ("asciiUpper", builtin_ascii_upper::INST),141 ("asciiLower", builtin_ascii_lower::INST),142 ("findSubstr", builtin_find_substr::INST),143 ("parseInt", builtin_parse_int::INST),144 ("parseOctal", builtin_parse_octal::INST),145 ("parseHex", builtin_parse_hex::INST),146 // Misc147 ("length", builtin_length::INST),148 ("startsWith", builtin_starts_with::INST),149 ("endsWith", builtin_ends_with::INST),150 // Sets151 ("setMember", builtin_set_member::INST),152 ("setInter", builtin_set_inter::INST),153 ]154 .iter()155 .cloned()156 {157 builder158 .member(name.into())159 .hide()160 .value(Val::Func(FuncVal::StaticBuiltin(builtin)))161 .expect("no conflict");162 }163164 builder165 .member("extVar".into())166 .hide()167 .value(Val::Func(FuncVal::builtin(builtin_ext_var {168 settings: settings.clone(),169 })))170 .expect("no conflict");171 builder172 .member("native".into())173 .hide()174 .value(Val::Func(FuncVal::builtin(builtin_native {175 settings: settings.clone(),176 })))177 .expect("no conflict");178 builder179 .member("trace".into())180 .hide()181 .value(Val::Func(FuncVal::builtin(builtin_trace { settings })))182 .expect("no conflict");183184 builder185 .member("id".into())186 .hide()187 .value(Val::Func(FuncVal::Id))188 .expect("no conflict");189190 builder.build()191}192193pub trait TracePrinter {194 fn print_trace(&self, loc: CallLocation, value: IStr);195}196197pub struct StdTracePrinter {198 resolver: PathResolver,199}200impl StdTracePrinter {201 pub fn new(resolver: PathResolver) -> Self {202 Self { resolver }203 }204}205impl TracePrinter for StdTracePrinter {206 fn print_trace(&self, loc: CallLocation, value: IStr) {207 eprint!("TRACE:");208 if let Some(loc) = loc.0 {209 let locs = loc.0.map_source_locations(&[loc.1]);210 eprint!(211 " {}:{}",212 match loc.0.source_path().path() {213 Some(p) => self.resolver.resolve(p),214 None => loc.0.source_path().to_string(),215 },216 locs[0].line217 );218 }219 eprintln!(" {value}");220 }221}222223pub struct Settings {224 /// Used for `std.extVar`225 pub ext_vars: HashMap<IStr, TlaArg>,226 /// Used for `std.native`227 pub ext_natives: HashMap<IStr, Cc<TraceBox<dyn Builtin>>>,228 /// Helper to add globals without implementing custom ContextInitializer229 pub globals: GcHashMap<IStr, Thunk<Val>>,230 /// Used for `std.trace`231 pub trace_printer: Box<dyn TracePrinter>,232 /// Used for `std.thisFile`233 pub path_resolver: PathResolver,234}235236fn extvar_source(name: &str, code: impl Into<IStr>) -> Source {237 let source_name = format!("<extvar:{name}>");238 Source::new_virtual(source_name.into(), code.into())239}240241#[derive(Trace, Clone)]242pub struct ContextInitializer {243 // When we don't need to support legacy-this-file, we can reuse same context for all files244 #[cfg(not(feature = "legacy-this-file"))]245 context: Context,246 // Otherwise, we can only keep first stdlib layer, and then stack thisFile on top of it247 #[cfg(feature = "legacy-this-file")]248 stdlib_obj: ObjValue,249 settings: Rc<RefCell<Settings>>,250}251impl ContextInitializer {252 pub fn new(_s: State, resolver: PathResolver) -> Self {253 let settings = Settings {254 ext_vars: Default::default(),255 ext_natives: Default::default(),256 globals: Default::default(),257 trace_printer: Box::new(StdTracePrinter::new(resolver.clone())),258 path_resolver: resolver,259 };260 let settings = Rc::new(RefCell::new(settings));261 Self {262 #[cfg(not(feature = "legacy-this-file"))]263 context: {264 let mut context = ContextBuilder::with_capacity(_s, 1);265 context.bind(266 "std".into(),267 Thunk::evaluated(Val::Obj(stdlib_uncached(settings.clone()))),268 );269 context.build()270 },271 #[cfg(feature = "legacy-this-file")]272 stdlib_obj: stdlib_uncached(settings.clone()),273 settings,274 }275 }276 pub fn settings(&self) -> Ref<Settings> {277 self.settings.borrow()278 }279 pub fn settings_mut(&self) -> RefMut<Settings> {280 self.settings.borrow_mut()281 }282 pub fn add_ext_var(&self, name: IStr, value: Val) {283 self.settings_mut()284 .ext_vars285 .insert(name, TlaArg::Val(value));286 }287 pub fn add_ext_str(&self, name: IStr, value: IStr) {288 self.settings_mut()289 .ext_vars290 .insert(name, TlaArg::String(value));291 }292 pub fn add_ext_code(&self, name: &str, code: impl Into<IStr>) -> Result<()> {293 let code = code.into();294 let source = extvar_source(name, code.clone());295 let parsed = jrsonnet_parser::parse(296 &code,297 &jrsonnet_parser::ParserSettings {298 source: source.clone(),299 },300 )301 .map_err(|e| ImportSyntaxError {302 path: source,303 error: Box::new(e),304 })?;305 // self.data_mut().volatile_files.insert(source_name, code);306 self.settings_mut()307 .ext_vars308 .insert(name.into(), TlaArg::Code(parsed));309 Ok(())310 }311 pub fn add_native(&self, name: IStr, cb: impl Builtin) {312 self.settings_mut()313 .ext_natives314 .insert(name, Cc::new(tb!(cb)));315 }316}317impl jrsonnet_evaluator::ContextInitializer for ContextInitializer {318 #[cfg(not(feature = "legacy-this-file"))]319 fn initialize(&self, _s: State, _source: Source) -> jrsonnet_evaluator::Context {320 let out = self.context.clone();321 let globals = &self.settings().globals;322 if globals.is_empty() {323 return out;324 }325326 let mut out = ContextBuilder::extend(out);327 for (k, v) in globals.iter() {328 out.bind(k.clone(), v.clone());329 }330 out.build()331 }332 #[cfg(feature = "legacy-this-file")]333 fn initialize(&self, s: State, source: Source) -> Context {334 use jrsonnet_evaluator::val::StrValue;335336 let mut builder = ObjValueBuilder::new();337 builder.with_super(self.stdlib_obj.clone());338 builder339 .member("thisFile".into())340 .hide()341 .value(Val::Str(StrValue::Flat(342 match source.source_path().path() {343 Some(p) => self.settings().path_resolver.resolve(p).into(),344 None => source.source_path().to_string().into(),345 },346 )))347 .expect("this object builder is empty");348 let stdlib_with_this_file = builder.build();349350 let mut context = ContextBuilder::with_capacity(s, 1);351 context.bind(352 "std".into(),353 Thunk::evaluated(Val::Obj(stdlib_with_this_file)),354 );355 for (k, v) in self.settings().globals.iter() {356 context.bind(k.clone(), v.clone());357 }358 context.build()359 }360 fn as_any(&self) -> &dyn std::any::Any {361 self362 }363}364365pub trait StateExt {366 /// This method was previously implemented in jrsonnet-evaluator itself367 fn with_stdlib(&self);368 fn add_global(&self, name: IStr, value: Thunk<Val>);369}370371impl StateExt for State {372 fn with_stdlib(&self) {373 let initializer = ContextInitializer::new(self.clone(), PathResolver::new_cwd_fallback());374 self.settings_mut().context_initializer = tb!(initializer)375 }376 fn add_global(&self, name: IStr, value: Thunk<Val>) {377 self.settings()378 .context_initializer379 .as_any()380 .downcast_ref::<ContextInitializer>()381 .expect("not standard context initializer")382 .settings_mut()383 .globals384 .insert(name, value);385 }386}crates/jrsonnet-stdlib/src/sets.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/sets.rs
+++ b/crates/jrsonnet-stdlib/src/sets.rs
@@ -5,23 +5,27 @@
function::{builtin, FuncVal},
operator::evaluate_compare_op,
val::ArrValue,
- Val,
+ Thunk, Val,
};
+use jrsonnet_gcmodule::Cc;
use jrsonnet_parser::BinaryOpType;
#[builtin]
#[allow(non_snake_case)]
-pub fn builtin_set_member(x: Val, arr: ArrValue, keyF: Option<FuncVal>) -> Result<bool> {
+pub fn builtin_set_member(x: Thunk<Val>, arr: ArrValue, keyF: Option<FuncVal>) -> Result<bool> {
let mut low = 0;
let mut high = arr.len();
- let keyF = keyF.unwrap_or(FuncVal::Id).into_native::<((Val,), Val)>();
+ let keyF = keyF
+ .unwrap_or(FuncVal::Id)
+ .into_native::<((Thunk<Val>,), Val)>();
let x = keyF(x)?;
while low < high {
let middle = (high + low) / 2;
- match evaluate_compare_op(&arr.get(middle)?.expect("in bounds"), &x, BinaryOpType::Lt)? {
+ let comp = keyF(arr.get_lazy(middle).expect("in bounds"))?;
+ match evaluate_compare_op(&comp, &x, BinaryOpType::Lt)? {
Ordering::Less => low = middle + 1,
Ordering::Equal => return Ok(true),
Ordering::Greater => high = middle,
@@ -29,3 +33,42 @@
}
Ok(false)
}
+
+#[builtin]
+#[allow(non_snake_case)]
+pub fn builtin_set_inter(a: ArrValue, b: ArrValue, keyF: Option<FuncVal>) -> Result<ArrValue> {
+ let mut a = a.iter_lazy();
+ let mut b = b.iter_lazy();
+
+ let keyF = keyF
+ .unwrap_or(FuncVal::identity())
+ .into_native::<((Thunk<Val>,), Val)>();
+ let keyF = |v| keyF(v);
+
+ let mut av = a.next();
+ let mut bv = b.next();
+ let mut ak = av.clone().map(keyF).transpose()?;
+ let mut bk = bv.map(keyF).transpose()?;
+
+ let mut out = Vec::new();
+ while let (Some(ac), Some(bc)) = (&ak, &bk) {
+ match evaluate_compare_op(ac, bc, BinaryOpType::Lt)? {
+ Ordering::Less => {
+ av = a.next();
+ ak = av.clone().map(keyF).transpose()?;
+ }
+ Ordering::Greater => {
+ bv = b.next();
+ bk = bv.map(keyF).transpose()?;
+ }
+ Ordering::Equal => {
+ out.push(av.clone().expect("ak != None => av != None"));
+ av = a.next();
+ ak = av.clone().map(keyF).transpose()?;
+ bv = b.next();
+ bk = bv.map(keyF).transpose()?;
+ }
+ };
+ }
+ Ok(ArrValue::lazy(Cc::new(out)))
+}
crates/jrsonnet-stdlib/src/std.jsonnetdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/std.jsonnet
+++ b/crates/jrsonnet-stdlib/src/std.jsonnet
@@ -214,19 +214,6 @@
aux(a, b, i, j + 1, acc + [b[j]]) tailstrict;
aux(a, b, 0, 0, []),
- setInter(a, b, keyF=id)::
- local aux(a, b, i, j, acc) =
- if i >= std.length(a) || j >= std.length(b) then
- acc
- else
- if keyF(a[i]) == keyF(b[j]) then
- aux(a, b, i + 1, j + 1, acc + [a[i]]) tailstrict
- else if keyF(a[i]) < keyF(b[j]) then
- aux(a, b, i + 1, j, acc) tailstrict
- else
- aux(a, b, i, j + 1, acc) tailstrict;
- aux(a, b, 0, 0, []) tailstrict,
-
setDiff(a, b, keyF=id)::
local aux(a, b, i, j, acc) =
if i >= std.length(a) then