difftreelog
feat add std.round
in: master
Upstream issue: https://github.com/google/go-jsonnet/pull/683
2 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::*;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 ("contains", builtin_member::INST),84 ("count", builtin_count::INST),85 ("avg", builtin_avg::INST),86 // Math87 ("abs", builtin_abs::INST),88 ("sign", builtin_sign::INST),89 ("max", builtin_max::INST),90 ("min", builtin_min::INST),91 ("sum", builtin_sum::INST),92 ("modulo", builtin_modulo::INST),93 ("floor", builtin_floor::INST),94 ("ceil", builtin_ceil::INST),95 ("log", builtin_log::INST),96 ("pow", builtin_pow::INST),97 ("sqrt", builtin_sqrt::INST),98 ("sin", builtin_sin::INST),99 ("cos", builtin_cos::INST),100 ("tan", builtin_tan::INST),101 ("asin", builtin_asin::INST),102 ("acos", builtin_acos::INST),103 ("atan", builtin_atan::INST),104 ("exp", builtin_exp::INST),105 ("mantissa", builtin_mantissa::INST),106 ("exponent", builtin_exponent::INST),107 // Operator108 ("mod", builtin_mod::INST),109 ("primitiveEquals", builtin_primitive_equals::INST),110 ("equals", builtin_equals::INST),111 ("xor", builtin_xor::INST),112 ("format", builtin_format::INST),113 // Sort114 ("sort", builtin_sort::INST),115 ("uniq", builtin_uniq::INST),116 ("set", builtin_set::INST),117 ("minArray", builtin_min_array::INST),118 ("maxArray", builtin_max_array::INST),119 // Hash120 ("md5", builtin_md5::INST),121 ("sha256", builtin_sha256::INST),122 ("sha512", builtin_sha512::INST),123 // Encoding124 ("encodeUTF8", builtin_encode_utf8::INST),125 ("decodeUTF8", builtin_decode_utf8::INST),126 ("base64", builtin_base64::INST),127 ("base64Decode", builtin_base64_decode::INST),128 ("base64DecodeBytes", builtin_base64_decode_bytes::INST),129 // Objects130 ("objectFieldsEx", builtin_object_fields_ex::INST),131 ("objectHasEx", builtin_object_has_ex::INST),132 // Manifest133 ("escapeStringJson", builtin_escape_string_json::INST),134 ("manifestJsonEx", builtin_manifest_json_ex::INST),135 ("manifestYamlDoc", builtin_manifest_yaml_doc::INST),136 ("manifestTomlEx", builtin_manifest_toml_ex::INST),137 // Parsing138 ("parseJson", builtin_parse_json::INST),139 ("parseYaml", builtin_parse_yaml::INST),140 // Strings141 ("codepoint", builtin_codepoint::INST),142 ("substr", builtin_substr::INST),143 ("char", builtin_char::INST),144 ("strReplace", builtin_str_replace::INST),145 ("splitLimit", builtin_splitlimit::INST),146 ("asciiUpper", builtin_ascii_upper::INST),147 ("asciiLower", builtin_ascii_lower::INST),148 ("findSubstr", builtin_find_substr::INST),149 ("parseInt", builtin_parse_int::INST),150 #[cfg(feature = "exp-bigint")]151 ("bigint", builtin_bigint::INST),152 ("parseOctal", builtin_parse_octal::INST),153 ("parseHex", builtin_parse_hex::INST),154 // Misc155 ("length", builtin_length::INST),156 ("startsWith", builtin_starts_with::INST),157 ("endsWith", builtin_ends_with::INST),158 // Sets159 ("setMember", builtin_set_member::INST),160 ("setInter", builtin_set_inter::INST),161 // Compat162 ("__compare", builtin___compare::INST),163 ]164 .iter()165 .cloned()166 {167 builder168 .member(name.into())169 .hide()170 .value(Val::Func(FuncVal::StaticBuiltin(builtin)))171 .expect("no conflict");172 }173174 builder175 .member("extVar".into())176 .hide()177 .value(Val::Func(FuncVal::builtin(builtin_ext_var {178 settings: settings.clone(),179 })))180 .expect("no conflict");181 builder182 .member("native".into())183 .hide()184 .value(Val::Func(FuncVal::builtin(builtin_native {185 settings: settings.clone(),186 })))187 .expect("no conflict");188 builder189 .member("trace".into())190 .hide()191 .value(Val::Func(FuncVal::builtin(builtin_trace { settings })))192 .expect("no conflict");193194 builder195 .member("id".into())196 .hide()197 .value(Val::Func(FuncVal::Id))198 .expect("no conflict");199200 builder.build()201}202203pub trait TracePrinter {204 fn print_trace(&self, loc: CallLocation, value: IStr);205}206207pub struct StdTracePrinter {208 resolver: PathResolver,209}210impl StdTracePrinter {211 pub fn new(resolver: PathResolver) -> Self {212 Self { resolver }213 }214}215impl TracePrinter for StdTracePrinter {216 fn print_trace(&self, loc: CallLocation, value: IStr) {217 eprint!("TRACE:");218 if let Some(loc) = loc.0 {219 let locs = loc.0.map_source_locations(&[loc.1]);220 eprint!(221 " {}:{}",222 match loc.0.source_path().path() {223 Some(p) => self.resolver.resolve(p),224 None => loc.0.source_path().to_string(),225 },226 locs[0].line227 );228 }229 eprintln!(" {value}");230 }231}232233pub struct Settings {234 /// Used for `std.extVar`235 pub ext_vars: HashMap<IStr, TlaArg>,236 /// Used for `std.native`237 pub ext_natives: HashMap<IStr, Cc<TraceBox<dyn Builtin>>>,238 /// Helper to add globals without implementing custom ContextInitializer239 pub globals: GcHashMap<IStr, Thunk<Val>>,240 /// Used for `std.trace`241 pub trace_printer: Box<dyn TracePrinter>,242 /// Used for `std.thisFile`243 pub path_resolver: PathResolver,244}245246fn extvar_source(name: &str, code: impl Into<IStr>) -> Source {247 let source_name = format!("<extvar:{name}>");248 Source::new_virtual(source_name.into(), code.into())249}250251#[derive(Trace, Clone)]252pub struct ContextInitializer {253 // When we don't need to support legacy-this-file, we can reuse same context for all files254 #[cfg(not(feature = "legacy-this-file"))]255 context: Context,256 // Otherwise, we can only keep first stdlib layer, and then stack thisFile on top of it257 #[cfg(feature = "legacy-this-file")]258 stdlib_obj: ObjValue,259 settings: Rc<RefCell<Settings>>,260}261impl ContextInitializer {262 pub fn new(_s: State, resolver: PathResolver) -> Self {263 let settings = Settings {264 ext_vars: Default::default(),265 ext_natives: Default::default(),266 globals: Default::default(),267 trace_printer: Box::new(StdTracePrinter::new(resolver.clone())),268 path_resolver: resolver,269 };270 let settings = Rc::new(RefCell::new(settings));271 Self {272 #[cfg(not(feature = "legacy-this-file"))]273 context: {274 let mut context = ContextBuilder::with_capacity(_s, 1);275 context.bind(276 "std".into(),277 Thunk::evaluated(Val::Obj(stdlib_uncached(settings.clone()))),278 );279 context.build()280 },281 #[cfg(feature = "legacy-this-file")]282 stdlib_obj: stdlib_uncached(settings.clone()),283 settings,284 }285 }286 pub fn settings(&self) -> Ref<Settings> {287 self.settings.borrow()288 }289 pub fn settings_mut(&self) -> RefMut<Settings> {290 self.settings.borrow_mut()291 }292 pub fn add_ext_var(&self, name: IStr, value: Val) {293 self.settings_mut()294 .ext_vars295 .insert(name, TlaArg::Val(value));296 }297 pub fn add_ext_str(&self, name: IStr, value: IStr) {298 self.settings_mut()299 .ext_vars300 .insert(name, TlaArg::String(value));301 }302 pub fn add_ext_code(&self, name: &str, code: impl Into<IStr>) -> Result<()> {303 let code = code.into();304 let source = extvar_source(name, code.clone());305 let parsed = jrsonnet_parser::parse(306 &code,307 &jrsonnet_parser::ParserSettings {308 source: source.clone(),309 },310 )311 .map_err(|e| ImportSyntaxError {312 path: source,313 error: Box::new(e),314 })?;315 // self.data_mut().volatile_files.insert(source_name, code);316 self.settings_mut()317 .ext_vars318 .insert(name.into(), TlaArg::Code(parsed));319 Ok(())320 }321 pub fn add_native(&self, name: IStr, cb: impl Builtin) {322 self.settings_mut()323 .ext_natives324 .insert(name, Cc::new(tb!(cb)));325 }326}327impl jrsonnet_evaluator::ContextInitializer for ContextInitializer {328 #[cfg(not(feature = "legacy-this-file"))]329 fn initialize(&self, _s: State, _source: Source) -> jrsonnet_evaluator::Context {330 let out = self.context.clone();331 let globals = &self.settings().globals;332 if globals.is_empty() {333 return out;334 }335336 let mut out = ContextBuilder::extend(out);337 for (k, v) in globals.iter() {338 out.bind(k.clone(), v.clone());339 }340 out.build()341 }342 #[cfg(feature = "legacy-this-file")]343 fn initialize(&self, s: State, source: Source) -> Context {344 use jrsonnet_evaluator::val::StrValue;345346 let mut builder = ObjValueBuilder::new();347 builder.with_super(self.stdlib_obj.clone());348 builder349 .member("thisFile".into())350 .hide()351 .value(Val::Str(StrValue::Flat(352 match source.source_path().path() {353 Some(p) => self.settings().path_resolver.resolve(p).into(),354 None => source.source_path().to_string().into(),355 },356 )))357 .expect("this object builder is empty");358 let stdlib_with_this_file = builder.build();359360 let mut context = ContextBuilder::with_capacity(s, 1);361 context.bind(362 "std".into(),363 Thunk::evaluated(Val::Obj(stdlib_with_this_file)),364 );365 for (k, v) in self.settings().globals.iter() {366 context.bind(k.clone(), v.clone());367 }368 context.build()369 }370 fn as_any(&self) -> &dyn std::any::Any {371 self372 }373}374375pub trait StateExt {376 /// This method was previously implemented in jrsonnet-evaluator itself377 fn with_stdlib(&self);378 fn add_global(&self, name: IStr, value: Thunk<Val>);379}380381impl StateExt for State {382 fn with_stdlib(&self) {383 let initializer = ContextInitializer::new(self.clone(), PathResolver::new_cwd_fallback());384 self.settings_mut().context_initializer = tb!(initializer)385 }386 fn add_global(&self, name: IStr, value: Thunk<Val>) {387 self.settings()388 .context_initializer389 .as_any()390 .downcast_ref::<ContextInitializer>()391 .expect("not standard context initializer")392 .settings_mut()393 .globals394 .insert(name, value);395 }396}crates/jrsonnet-stdlib/src/math.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/math.rs
+++ b/crates/jrsonnet-stdlib/src/math.rs
@@ -114,3 +114,8 @@
pub fn builtin_exponent(x: f64) -> i16 {
frexp(x).1
}
+
+#[builtin]
+pub fn builtin_round(x: f64) -> f64 {
+ x.round()
+}