difftreelog
refactor remove debug gc trace
in: master
5 files changed
crates/jrsonnet-evaluator/src/builtin/manifest.rsdiffbeforeafterboth--- 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(())
}
crates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth1use crate::{2 equals,3 error::{Error::*, Result},4 parse_args, primitive_equals, push, throw, with_state, ArrValue, Context, DebugGcTraceValue,5 EvaluationState, FuncVal, LazyVal, Val,6};7use format::{format_arr, format_obj};8use jrsonnet_gc::Gc;9use jrsonnet_interner::IStr;10use jrsonnet_parser::{ArgsDesc, BinaryOpType, ExprLocation};11use jrsonnet_types::ty;12use std::{collections::HashMap, path::PathBuf, rc::Rc};1314pub mod stdlib;15pub use stdlib::*;1617use self::manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType};1819pub mod format;20pub mod manifest;21pub mod sort;2223fn std_format(str: IStr, vals: Val) -> Result<Val> {24 push(25 Some(&ExprLocation(Rc::from(PathBuf::from("std.jsonnet")), 0, 0)),26 || format!("std.format of {}", str),27 || {28 Ok(match vals {29 Val::Arr(vals) => Val::Str(format_arr(&str, &vals.evaluated()?)?.into()),30 Val::Obj(obj) => Val::Str(format_obj(&str, &obj)?.into()),31 o => Val::Str(format_arr(&str, &[o])?.into()),32 })33 },34 )35}3637type Builtin = fn(context: Context, loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val>;3839type BuiltinsType = HashMap<Box<str>, Builtin>;4041thread_local! {42 static BUILTINS: BuiltinsType = {43 [44 ("length".into(), builtin_length as Builtin),45 ("type".into(), builtin_type),46 ("makeArray".into(), builtin_make_array),47 ("codepoint".into(), builtin_codepoint),48 ("objectFieldsEx".into(), builtin_object_fields_ex),49 ("objectHasEx".into(), builtin_object_has_ex),50 ("slice".into(), builtin_slice),51 ("primitiveEquals".into(), builtin_primitive_equals),52 ("equals".into(), builtin_equals),53 ("modulo".into(), builtin_modulo),54 ("mod".into(), builtin_mod),55 ("floor".into(), builtin_floor),56 ("log".into(), builtin_log),57 ("pow".into(), builtin_pow),58 ("extVar".into(), builtin_ext_var),59 ("native".into(), builtin_native),60 ("filter".into(), builtin_filter),61 ("map".into(), builtin_map),62 ("foldl".into(), builtin_foldl),63 ("foldr".into(), builtin_foldr),64 ("sortImpl".into(), builtin_sort_impl),65 ("format".into(), builtin_format),66 ("range".into(), builtin_range),67 ("char".into(), builtin_char),68 ("encodeUTF8".into(), builtin_encode_utf8),69 ("md5".into(), builtin_md5),70 ("base64".into(), builtin_base64),71 ("trace".into(), builtin_trace),72 ("gc".into(), builtin_gc),73 ("gcTrace".into(), builtin_gc_trace),74 ("join".into(), builtin_join),75 ("escapeStringJson".into(), builtin_escape_string_json),76 ("manifestJsonEx".into(), builtin_manifest_json_ex),77 ("reverse".into(), builtin_reverse),78 ("id".into(), builtin_id),79 ("strReplace".into(), builtin_str_replace),80 ("parseJson".into(), builtin_parse_json),81 ].iter().cloned().collect()82 };83}8485fn builtin_length(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {86 parse_args!(context, "length", args, 1, [87 0, x: ty!((string | object | array));88 ], {89 Ok(match x {90 Val::Str(n) => Val::Num(n.chars().count() as f64),91 Val::Arr(a) => Val::Num(a.len() as f64),92 Val::Obj(o) => Val::Num(93 o.fields_visibility()94 .into_iter()95 .filter(|(_k, v)| *v)96 .count() as f64,97 ),98 _ => unreachable!(),99 })100 })101}102103fn builtin_type(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {104 parse_args!(context, "type", args, 1, [105 0, x: ty!(any);106 ], {107 Ok(Val::Str(x.value_type().name().into()))108 })109}110111fn builtin_make_array(112 context: Context,113 _loc: Option<&ExprLocation>,114 args: &ArgsDesc,115) -> Result<Val> {116 parse_args!(context, "makeArray", args, 2, [117 0, sz: ty!(BoundedNumber<(Some(0.0)), (None)>) => Val::Num;118 1, func: ty!(function) => Val::Func;119 ], {120 let mut out = Vec::with_capacity(sz as usize);121 for i in 0..sz as usize {122 out.push(LazyVal::new_resolved(func.evaluate_values(123 context.clone(),124 &[Val::Num(i as f64)]125 )?))126 }127 Ok(Val::Arr(out.into()))128 })129}130131fn builtin_codepoint(132 context: Context,133 _loc: Option<&ExprLocation>,134 args: &ArgsDesc,135) -> Result<Val> {136 parse_args!(context, "codepoint", args, 1, [137 0, str: ty!(char) => Val::Str;138 ], {139 Ok(Val::Num(str.chars().next().unwrap() as u32 as f64))140 })141}142143fn builtin_object_fields_ex(144 context: Context,145 _loc: Option<&ExprLocation>,146 args: &ArgsDesc,147) -> Result<Val> {148 parse_args!(context, "objectFieldsEx", args, 2, [149 0, obj: ty!(object) => Val::Obj;150 1, inc_hidden: ty!(boolean) => Val::Bool;151 ], {152 let out = obj.fields_ex(inc_hidden);153 Ok(Val::Arr(out.into_iter().map(Val::Str).collect::<Vec<_>>().into()))154 })155}156157fn builtin_object_has_ex(158 context: Context,159 _loc: Option<&ExprLocation>,160 args: &ArgsDesc,161) -> Result<Val> {162 parse_args!(context, "objectHasEx", args, 3, [163 0, obj: ty!(object) => Val::Obj;164 1, f: ty!(string) => Val::Str;165 2, inc_hidden: ty!(boolean) => Val::Bool;166 ], {167 Ok(Val::Bool(obj.has_field_ex(f, inc_hidden)))168 })169}170171fn builtin_parse_json(172 context: Context,173 _loc: Option<&ExprLocation>,174 args: &ArgsDesc,175) -> Result<Val> {176 parse_args!(context, "parseJson", args, 1, [177 0, s: ty!(string) => Val::Str;178 ], {179 let state = EvaluationState::default();180 let path = PathBuf::from("std.parseJson").into();181 state.evaluate_snippet_raw(path ,s)182 })183}184185// faster186fn builtin_slice(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {187 parse_args!(context, "slice", args, 4, [188 0, indexable: ty!((string | array));189 1, index: ty!((number | null));190 2, end: ty!((number | null));191 3, step: ty!((number | null));192 ], {193 let index = match index {194 Val::Num(v) => v as usize,195 Val::Null => 0,196 _ => unreachable!(),197 };198 let end = match end {199 Val::Num(v) => v as usize,200 Val::Null => match &indexable {201 Val::Str(s) => s.chars().count(),202 Val::Arr(v) => v.len(),203 _ => unreachable!()204 },205 _ => unreachable!()206 };207 let step = match step {208 Val::Num(v) => v as usize,209 Val::Null => 1,210 _ => unreachable!()211 };212 match &indexable {213 Val::Str(s) => {214 Ok(Val::Str((s.chars().skip(index).take(end-index).step_by(step).collect::<String>()).into()))215 }216 Val::Arr(arr) => {217 Ok(Val::Arr((arr.iter().skip(index).take(end-index).step_by(step).collect::<Result<Vec<Val>>>()?).into()))218 }219 _ => unreachable!()220 }221 })222}223224// faster225fn builtin_primitive_equals(226 context: Context,227 _loc: Option<&ExprLocation>,228 args: &ArgsDesc,229) -> Result<Val> {230 parse_args!(context, "primitiveEquals", args, 2, [231 0, a: ty!(any);232 1, b: ty!(any);233 ], {234 Ok(Val::Bool(primitive_equals(&a, &b)?))235 })236}237238// faster239fn builtin_equals(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {240 parse_args!(context, "equals", args, 2, [241 0, a: ty!(any);242 1, b: ty!(any);243 ], {244 Ok(Val::Bool(equals(&a, &b)?))245 })246}247248fn builtin_modulo(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {249 parse_args!(context, "modulo", args, 2, [250 0, a: ty!(number) => Val::Num;251 1, b: ty!(number) => Val::Num;252 ], {253 Ok(Val::Num(a % b))254 })255}256257fn builtin_mod(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {258 parse_args!(context, "mod", args, 2, [259 0, a: ty!((number | string));260 1, b: ty!(any);261 ], {262 match (a, b) {263 (Val::Num(a), Val::Num(b)) => Ok(Val::Num(a % b)),264 (Val::Str(str), vals) => std_format(str, vals),265 (a, b) => throw!(BinaryOperatorDoesNotOperateOnValues(BinaryOpType::Mod, a.value_type(), b.value_type()))266 }267 })268}269270fn builtin_floor(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {271 parse_args!(context, "floor", args, 1, [272 0, x: ty!(number) => Val::Num;273 ], {274 Ok(Val::Num(x.floor()))275 })276}277278fn builtin_log(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {279 parse_args!(context, "log", args, 1, [280 0, n: ty!(number) => Val::Num;281 ], {282 Ok(Val::Num(n.ln()))283 })284}285286fn builtin_pow(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {287 parse_args!(context, "pow", args, 2, [288 0, x: ty!(number) => Val::Num;289 1, n: ty!(number) => Val::Num;290 ], {291 Ok(Val::Num(x.powf(n)))292 })293}294295fn builtin_ext_var(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {296 parse_args!(context, "extVar", args, 1, [297 0, x: ty!(string) => Val::Str;298 ], {299 Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or(UndefinedExternalVariable(x))?)300 })301}302303fn builtin_native(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {304 parse_args!(context, "native", args, 1, [305 0, x: ty!(string) => Val::Str;306 ], {307 Ok(with_state(|s| s.settings().ext_natives.get(&x).cloned()).map(|v| Val::Func(Gc::new(FuncVal::NativeExt(x.clone(), v)))).ok_or(UndefinedExternalFunction(x))?)308 })309}310311fn builtin_filter(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {312 parse_args!(context, "filter", args, 2, [313 0, func: ty!(function) => Val::Func;314 1, arr: ty!(array) => Val::Arr;315 ], {316 Ok(Val::Arr(arr.filter(|val| func317 .evaluate_values(context.clone(), &[val.clone()])?318 .try_cast_bool("filter predicate"))?))319 })320}321322fn builtin_map(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {323 parse_args!(context, "map", args, 2, [324 0, func: ty!(function) => Val::Func;325 1, arr: ty!(array) => Val::Arr;326 ], {327 Ok(Val::Arr(arr.map(|val| func328 .evaluate_values(context.clone(), &[val]))?))329 })330}331332fn builtin_foldl(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {333 parse_args!(context, "foldl", args, 3, [334 0, func: ty!(function) => Val::Func;335 1, arr: ty!(array) => Val::Arr;336 2, init: ty!(any);337 ], {338 let mut acc = init;339 for i in arr.iter() {340 acc = func.evaluate_values(context.clone(), &[acc, i?])?;341 }342 Ok(acc)343 })344}345346fn builtin_foldr(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {347 parse_args!(context, "foldr", args, 3, [348 0, func: ty!(function) => Val::Func;349 1, arr: ty!(array) => Val::Arr;350 2, init: ty!(any);351 ], {352 let mut acc = init;353 for i in arr.iter().rev() {354 acc = func.evaluate_values(context.clone(), &[acc, i?])?;355 }356 Ok(acc)357 })358}359360#[allow(non_snake_case)]361fn builtin_sort_impl(362 context: Context,363 _loc: Option<&ExprLocation>,364 args: &ArgsDesc,365) -> Result<Val> {366 parse_args!(context, "sort", args, 2, [367 0, arr: ty!(array) => Val::Arr;368 1, keyF: ty!(function) => Val::Func;369 ], {370 if arr.len() <= 1 {371 return Ok(Val::Arr(arr))372 }373 Ok(Val::Arr(ArrValue::Eager(sort::sort(context, arr.evaluated()?, &keyF)?)))374 })375}376377// faster378fn builtin_format(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {379 parse_args!(context, "format", args, 2, [380 0, str: ty!(string) => Val::Str;381 1, vals: ty!(any)382 ], {383 std_format(str, vals)384 })385}386387fn builtin_range(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {388 parse_args!(context, "range", args, 2, [389 0, from: ty!(number) => Val::Num;390 1, to: ty!(number) => Val::Num;391 ], {392 if to < from {393 return Ok(Val::Arr(ArrValue::new_eager()))394 }395 let mut out = Vec::with_capacity((1+to as usize-from as usize).max(0));396 for i in from as usize..=to as usize {397 out.push(Val::Num(i as f64));398 }399 Ok(Val::Arr(out.into()))400 })401}402403fn builtin_char(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {404 parse_args!(context, "char", args, 1, [405 0, n: ty!(number) => Val::Num;406 ], {407 let mut out = String::new();408 out.push(std::char::from_u32(n as u32).ok_or_else(||409 InvalidUnicodeCodepointGot(n as u32)410 )?);411 Ok(Val::Str(out.into()))412 })413}414415fn builtin_encode_utf8(416 context: Context,417 _loc: Option<&ExprLocation>,418 args: &ArgsDesc,419) -> Result<Val> {420 parse_args!(context, "encodeUTF8", args, 1, [421 0, str: ty!(string) => Val::Str;422 ], {423 Ok(Val::Arr((str.bytes().map(|b| Val::Num(b as f64)).collect::<Vec<Val>>()).into()))424 })425}426427fn builtin_md5(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {428 parse_args!(context, "md5", args, 1, [429 0, str: ty!(string) => Val::Str;430 ], {431 Ok(Val::Str(format!("{:x}", md5::compute(&str.as_bytes())).into()))432 })433}434435fn builtin_trace(context: Context, loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {436 parse_args!(context, "trace", args, 2, [437 0, str: ty!(string) => Val::Str;438 1, rest: ty!(any);439 ], {440 eprint!("TRACE:");441 if let Some(loc) = loc {442 with_state(|s|{443 let locs = s.map_source_locations(&loc.0, &[loc.1]);444 eprint!(" {}:{}", loc.0.file_name().unwrap().to_str().unwrap(), locs[0].line);445 });446 }447 eprintln!(" {}", str);448 Ok(rest)449 })450}451452fn 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");459460 Ok(rest)461 })462}463464fn 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}472473fn builtin_base64(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {474 parse_args!(context, "base64", args, 1, [475 0, input: ty!((string | (Array<number>)));476 ], {477 Ok(Val::Str(match input {478 Val::Str(s) => {479 base64::encode(s.bytes().collect::<Vec<_>>()).into()480 },481 Val::Arr(a) => {482 base64::encode(a.iter().map(|v| {483 Ok(v?.unwrap_num()? as u8)484 }).collect::<Result<Vec<_>>>()?).into()485 },486 _ => unreachable!()487 }))488 })489}490491fn builtin_join(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {492 parse_args!(context, "join", args, 2, [493 0, sep: ty!((string | array));494 1, arr: ty!(array) => Val::Arr;495 ], {496 Ok(match sep {497 Val::Arr(joiner_items) => {498 let mut out = Vec::new();499500 let mut first = true;501 for item in arr.iter() {502 let item = item?.clone();503 if let Val::Arr(items) = item {504 if !first {505 out.reserve(joiner_items.len());506 // TODO: extend507 for item in joiner_items.iter() {508 out.push(item?);509 }510 }511 first = false;512 out.reserve(items.len());513 // TODO: extend514 for item in items.iter() {515 out.push(item?);516 }517 } else {518 throw!(RuntimeError("in std.join all items should be arrays".into()));519 }520 }521522 Val::Arr(out.into())523 },524 Val::Str(sep) => {525 let mut out = String::new();526527 let mut first = true;528 for item in arr.iter() {529 let item = item?.clone();530 if let Val::Str(item) = item {531 if !first {532 out += &sep;533 }534 first = false;535 out += &item;536 } else {537 throw!(RuntimeError("in std.join all items should be strings".into()));538 }539 }540541 Val::Str(out.into())542 },543 _ => unreachable!()544 })545 })546}547548// faster549fn builtin_escape_string_json(550 context: Context,551 _loc: Option<&ExprLocation>,552 args: &ArgsDesc,553) -> Result<Val> {554 parse_args!(context, "escapeStringJson", args, 1, [555 0, str_: ty!(string) => Val::Str;556 ], {557 Ok(Val::Str(escape_string_json(&str_).into()))558 })559}560561// faster562fn builtin_manifest_json_ex(563 context: Context,564 _loc: Option<&ExprLocation>,565 args: &ArgsDesc,566) -> Result<Val> {567 parse_args!(context, "manifestJsonEx", args, 2, [568 0, value: ty!(any);569 1, indent: ty!(string) => Val::Str;570 ], {571 Ok(Val::Str(manifest_json_ex(&value, &ManifestJsonOptions {572 padding: &indent,573 mtype: ManifestType::Std,574 })?.into()))575 })576}577578// faster579fn builtin_reverse(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {580 parse_args!(context, "reverse", args, 1, [581 0, value: ty!(array) => Val::Arr;582 ], {583 Ok(Val::Arr(value.reversed()))584 })585}586587fn builtin_id(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {588 parse_args!(context, "id", args, 1, [589 0, v: ty!(any);590 ], {591 Ok(v)592 })593}594595// faster596fn builtin_str_replace(597 context: Context,598 _loc: Option<&ExprLocation>,599 args: &ArgsDesc,600) -> Result<Val> {601 parse_args!(context, "strReplace", args, 3, [602 0, str: ty!(string) => Val::Str;603 1, from: ty!(string) => Val::Str;604 2, to: ty!(string) => Val::Str;605 ], {606 let mut out = String::new();607 let mut last_idx = 0;608 while let Some(idx) = (&str[last_idx..]).find(&from as &str) {609 out.push_str(&str[last_idx..last_idx+idx]);610 out.push_str(&to);611 last_idx += idx + from.len();612 }613 if last_idx == 0 {614 return Ok(Val::Str(str))615 }616 out.push_str(&str[last_idx..]);617 Ok(Val::Str(out.into()))618 })619}620621pub fn call_builtin(622 context: Context,623 loc: Option<&ExprLocation>,624 name: &str,625 args: &ArgsDesc,626) -> Result<Val> {627 BUILTINS628 .with(|builtins| builtins.get(name).copied())629 .ok_or_else(|| IntrinsicNotFound(name.into()))?(context, loc, args)630}1use crate::{2 equals,3 error::{Error::*, Result},4 parse_args, primitive_equals, push, throw, with_state, ArrValue, Context, EvaluationState,5 FuncVal, LazyVal, Val,6};7use format::{format_arr, format_obj};8use jrsonnet_gc::Gc;9use jrsonnet_interner::IStr;10use jrsonnet_parser::{ArgsDesc, BinaryOpType, ExprLocation};11use jrsonnet_types::ty;12use std::{collections::HashMap, path::PathBuf, rc::Rc};1314pub mod stdlib;15pub use stdlib::*;1617use self::manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType};1819pub mod format;20pub mod manifest;21pub mod sort;2223fn std_format(str: IStr, vals: Val) -> Result<Val> {24 push(25 Some(&ExprLocation(Rc::from(PathBuf::from("std.jsonnet")), 0, 0)),26 || format!("std.format of {}", str),27 || {28 Ok(match vals {29 Val::Arr(vals) => Val::Str(format_arr(&str, &vals.evaluated()?)?.into()),30 Val::Obj(obj) => Val::Str(format_obj(&str, &obj)?.into()),31 o => Val::Str(format_arr(&str, &[o])?.into()),32 })33 },34 )35}3637type Builtin = fn(context: Context, loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val>;3839type BuiltinsType = HashMap<Box<str>, Builtin>;4041thread_local! {42 static BUILTINS: BuiltinsType = {43 [44 ("length".into(), builtin_length as Builtin),45 ("type".into(), builtin_type),46 ("makeArray".into(), builtin_make_array),47 ("codepoint".into(), builtin_codepoint),48 ("objectFieldsEx".into(), builtin_object_fields_ex),49 ("objectHasEx".into(), builtin_object_has_ex),50 ("slice".into(), builtin_slice),51 ("primitiveEquals".into(), builtin_primitive_equals),52 ("equals".into(), builtin_equals),53 ("modulo".into(), builtin_modulo),54 ("mod".into(), builtin_mod),55 ("floor".into(), builtin_floor),56 ("log".into(), builtin_log),57 ("pow".into(), builtin_pow),58 ("extVar".into(), builtin_ext_var),59 ("native".into(), builtin_native),60 ("filter".into(), builtin_filter),61 ("map".into(), builtin_map),62 ("foldl".into(), builtin_foldl),63 ("foldr".into(), builtin_foldr),64 ("sortImpl".into(), builtin_sort_impl),65 ("format".into(), builtin_format),66 ("range".into(), builtin_range),67 ("char".into(), builtin_char),68 ("encodeUTF8".into(), builtin_encode_utf8),69 ("md5".into(), builtin_md5),70 ("base64".into(), builtin_base64),71 ("trace".into(), builtin_trace),72 ("join".into(), builtin_join),73 ("escapeStringJson".into(), builtin_escape_string_json),74 ("manifestJsonEx".into(), builtin_manifest_json_ex),75 ("reverse".into(), builtin_reverse),76 ("id".into(), builtin_id),77 ("strReplace".into(), builtin_str_replace),78 ("parseJson".into(), builtin_parse_json),79 ].iter().cloned().collect()80 };81}8283fn builtin_length(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {84 parse_args!(context, "length", args, 1, [85 0, x: ty!((string | object | array));86 ], {87 Ok(match x {88 Val::Str(n) => Val::Num(n.chars().count() as f64),89 Val::Arr(a) => Val::Num(a.len() as f64),90 Val::Obj(o) => Val::Num(91 o.fields_visibility()92 .into_iter()93 .filter(|(_k, v)| *v)94 .count() as f64,95 ),96 _ => unreachable!(),97 })98 })99}100101fn builtin_type(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {102 parse_args!(context, "type", args, 1, [103 0, x: ty!(any);104 ], {105 Ok(Val::Str(x.value_type().name().into()))106 })107}108109fn builtin_make_array(110 context: Context,111 _loc: Option<&ExprLocation>,112 args: &ArgsDesc,113) -> Result<Val> {114 parse_args!(context, "makeArray", args, 2, [115 0, sz: ty!(BoundedNumber<(Some(0.0)), (None)>) => Val::Num;116 1, func: ty!(function) => Val::Func;117 ], {118 let mut out = Vec::with_capacity(sz as usize);119 for i in 0..sz as usize {120 out.push(LazyVal::new_resolved(func.evaluate_values(121 context.clone(),122 &[Val::Num(i as f64)]123 )?))124 }125 Ok(Val::Arr(out.into()))126 })127}128129fn builtin_codepoint(130 context: Context,131 _loc: Option<&ExprLocation>,132 args: &ArgsDesc,133) -> Result<Val> {134 parse_args!(context, "codepoint", args, 1, [135 0, str: ty!(char) => Val::Str;136 ], {137 Ok(Val::Num(str.chars().next().unwrap() as u32 as f64))138 })139}140141fn builtin_object_fields_ex(142 context: Context,143 _loc: Option<&ExprLocation>,144 args: &ArgsDesc,145) -> Result<Val> {146 parse_args!(context, "objectFieldsEx", args, 2, [147 0, obj: ty!(object) => Val::Obj;148 1, inc_hidden: ty!(boolean) => Val::Bool;149 ], {150 let out = obj.fields_ex(inc_hidden);151 Ok(Val::Arr(out.into_iter().map(Val::Str).collect::<Vec<_>>().into()))152 })153}154155fn builtin_object_has_ex(156 context: Context,157 _loc: Option<&ExprLocation>,158 args: &ArgsDesc,159) -> Result<Val> {160 parse_args!(context, "objectHasEx", args, 3, [161 0, obj: ty!(object) => Val::Obj;162 1, f: ty!(string) => Val::Str;163 2, inc_hidden: ty!(boolean) => Val::Bool;164 ], {165 Ok(Val::Bool(obj.has_field_ex(f, inc_hidden)))166 })167}168169fn builtin_parse_json(170 context: Context,171 _loc: Option<&ExprLocation>,172 args: &ArgsDesc,173) -> Result<Val> {174 parse_args!(context, "parseJson", args, 1, [175 0, s: ty!(string) => Val::Str;176 ], {177 let state = EvaluationState::default();178 let path = PathBuf::from("std.parseJson").into();179 state.evaluate_snippet_raw(path ,s)180 })181}182183// faster184fn builtin_slice(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {185 parse_args!(context, "slice", args, 4, [186 0, indexable: ty!((string | array));187 1, index: ty!((number | null));188 2, end: ty!((number | null));189 3, step: ty!((number | null));190 ], {191 let index = match index {192 Val::Num(v) => v as usize,193 Val::Null => 0,194 _ => unreachable!(),195 };196 let end = match end {197 Val::Num(v) => v as usize,198 Val::Null => match &indexable {199 Val::Str(s) => s.chars().count(),200 Val::Arr(v) => v.len(),201 _ => unreachable!()202 },203 _ => unreachable!()204 };205 let step = match step {206 Val::Num(v) => v as usize,207 Val::Null => 1,208 _ => unreachable!()209 };210 match &indexable {211 Val::Str(s) => {212 Ok(Val::Str((s.chars().skip(index).take(end-index).step_by(step).collect::<String>()).into()))213 }214 Val::Arr(arr) => {215 Ok(Val::Arr((arr.iter().skip(index).take(end-index).step_by(step).collect::<Result<Vec<Val>>>()?).into()))216 }217 _ => unreachable!()218 }219 })220}221222// faster223fn builtin_primitive_equals(224 context: Context,225 _loc: Option<&ExprLocation>,226 args: &ArgsDesc,227) -> Result<Val> {228 parse_args!(context, "primitiveEquals", args, 2, [229 0, a: ty!(any);230 1, b: ty!(any);231 ], {232 Ok(Val::Bool(primitive_equals(&a, &b)?))233 })234}235236// faster237fn builtin_equals(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {238 parse_args!(context, "equals", args, 2, [239 0, a: ty!(any);240 1, b: ty!(any);241 ], {242 Ok(Val::Bool(equals(&a, &b)?))243 })244}245246fn builtin_modulo(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {247 parse_args!(context, "modulo", args, 2, [248 0, a: ty!(number) => Val::Num;249 1, b: ty!(number) => Val::Num;250 ], {251 Ok(Val::Num(a % b))252 })253}254255fn builtin_mod(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {256 parse_args!(context, "mod", args, 2, [257 0, a: ty!((number | string));258 1, b: ty!(any);259 ], {260 match (a, b) {261 (Val::Num(a), Val::Num(b)) => Ok(Val::Num(a % b)),262 (Val::Str(str), vals) => std_format(str, vals),263 (a, b) => throw!(BinaryOperatorDoesNotOperateOnValues(BinaryOpType::Mod, a.value_type(), b.value_type()))264 }265 })266}267268fn builtin_floor(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {269 parse_args!(context, "floor", args, 1, [270 0, x: ty!(number) => Val::Num;271 ], {272 Ok(Val::Num(x.floor()))273 })274}275276fn builtin_log(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {277 parse_args!(context, "log", args, 1, [278 0, n: ty!(number) => Val::Num;279 ], {280 Ok(Val::Num(n.ln()))281 })282}283284fn builtin_pow(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {285 parse_args!(context, "pow", args, 2, [286 0, x: ty!(number) => Val::Num;287 1, n: ty!(number) => Val::Num;288 ], {289 Ok(Val::Num(x.powf(n)))290 })291}292293fn builtin_ext_var(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {294 parse_args!(context, "extVar", args, 1, [295 0, x: ty!(string) => Val::Str;296 ], {297 Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or(UndefinedExternalVariable(x))?)298 })299}300301fn builtin_native(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {302 parse_args!(context, "native", args, 1, [303 0, x: ty!(string) => Val::Str;304 ], {305 Ok(with_state(|s| s.settings().ext_natives.get(&x).cloned()).map(|v| Val::Func(Gc::new(FuncVal::NativeExt(x.clone(), v)))).ok_or(UndefinedExternalFunction(x))?)306 })307}308309fn builtin_filter(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {310 parse_args!(context, "filter", args, 2, [311 0, func: ty!(function) => Val::Func;312 1, arr: ty!(array) => Val::Arr;313 ], {314 Ok(Val::Arr(arr.filter(|val| func315 .evaluate_values(context.clone(), &[val.clone()])?316 .try_cast_bool("filter predicate"))?))317 })318}319320fn builtin_map(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {321 parse_args!(context, "map", args, 2, [322 0, func: ty!(function) => Val::Func;323 1, arr: ty!(array) => Val::Arr;324 ], {325 Ok(Val::Arr(arr.map(|val| func326 .evaluate_values(context.clone(), &[val]))?))327 })328}329330fn builtin_foldl(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {331 parse_args!(context, "foldl", args, 3, [332 0, func: ty!(function) => Val::Func;333 1, arr: ty!(array) => Val::Arr;334 2, init: ty!(any);335 ], {336 let mut acc = init;337 for i in arr.iter() {338 acc = func.evaluate_values(context.clone(), &[acc, i?])?;339 }340 Ok(acc)341 })342}343344fn builtin_foldr(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {345 parse_args!(context, "foldr", args, 3, [346 0, func: ty!(function) => Val::Func;347 1, arr: ty!(array) => Val::Arr;348 2, init: ty!(any);349 ], {350 let mut acc = init;351 for i in arr.iter().rev() {352 acc = func.evaluate_values(context.clone(), &[acc, i?])?;353 }354 Ok(acc)355 })356}357358#[allow(non_snake_case)]359fn builtin_sort_impl(360 context: Context,361 _loc: Option<&ExprLocation>,362 args: &ArgsDesc,363) -> Result<Val> {364 parse_args!(context, "sort", args, 2, [365 0, arr: ty!(array) => Val::Arr;366 1, keyF: ty!(function) => Val::Func;367 ], {368 if arr.len() <= 1 {369 return Ok(Val::Arr(arr))370 }371 Ok(Val::Arr(ArrValue::Eager(sort::sort(context, arr.evaluated()?, &keyF)?)))372 })373}374375// faster376fn builtin_format(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {377 parse_args!(context, "format", args, 2, [378 0, str: ty!(string) => Val::Str;379 1, vals: ty!(any)380 ], {381 std_format(str, vals)382 })383}384385fn builtin_range(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {386 parse_args!(context, "range", args, 2, [387 0, from: ty!(number) => Val::Num;388 1, to: ty!(number) => Val::Num;389 ], {390 if to < from {391 return Ok(Val::Arr(ArrValue::new_eager()))392 }393 let mut out = Vec::with_capacity((1+to as usize-from as usize).max(0));394 for i in from as usize..=to as usize {395 out.push(Val::Num(i as f64));396 }397 Ok(Val::Arr(out.into()))398 })399}400401fn builtin_char(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {402 parse_args!(context, "char", args, 1, [403 0, n: ty!(number) => Val::Num;404 ], {405 let mut out = String::new();406 out.push(std::char::from_u32(n as u32).ok_or_else(||407 InvalidUnicodeCodepointGot(n as u32)408 )?);409 Ok(Val::Str(out.into()))410 })411}412413fn builtin_encode_utf8(414 context: Context,415 _loc: Option<&ExprLocation>,416 args: &ArgsDesc,417) -> Result<Val> {418 parse_args!(context, "encodeUTF8", args, 1, [419 0, str: ty!(string) => Val::Str;420 ], {421 Ok(Val::Arr((str.bytes().map(|b| Val::Num(b as f64)).collect::<Vec<Val>>()).into()))422 })423}424425fn builtin_md5(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {426 parse_args!(context, "md5", args, 1, [427 0, str: ty!(string) => Val::Str;428 ], {429 Ok(Val::Str(format!("{:x}", md5::compute(&str.as_bytes())).into()))430 })431}432433fn builtin_trace(context: Context, loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {434 parse_args!(context, "trace", args, 2, [435 0, str: ty!(string) => Val::Str;436 1, rest: ty!(any);437 ], {438 eprint!("TRACE:");439 if let Some(loc) = loc {440 with_state(|s|{441 let locs = s.map_source_locations(&loc.0, &[loc.1]);442 eprint!(" {}:{}", loc.0.file_name().unwrap().to_str().unwrap(), locs[0].line);443 });444 }445 eprintln!(" {}", str);446 Ok(rest)447 })448}449450fn builtin_base64(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {451 parse_args!(context, "base64", args, 1, [452 0, input: ty!((string | (Array<number>)));453 ], {454 Ok(Val::Str(match input {455 Val::Str(s) => {456 base64::encode(s.bytes().collect::<Vec<_>>()).into()457 },458 Val::Arr(a) => {459 base64::encode(a.iter().map(|v| {460 Ok(v?.unwrap_num()? as u8)461 }).collect::<Result<Vec<_>>>()?).into()462 },463 _ => unreachable!()464 }))465 })466}467468fn builtin_join(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {469 parse_args!(context, "join", args, 2, [470 0, sep: ty!((string | array));471 1, arr: ty!(array) => Val::Arr;472 ], {473 Ok(match sep {474 Val::Arr(joiner_items) => {475 let mut out = Vec::new();476477 let mut first = true;478 for item in arr.iter() {479 let item = item?.clone();480 if let Val::Arr(items) = item {481 if !first {482 out.reserve(joiner_items.len());483 // TODO: extend484 for item in joiner_items.iter() {485 out.push(item?);486 }487 }488 first = false;489 out.reserve(items.len());490 // TODO: extend491 for item in items.iter() {492 out.push(item?);493 }494 } else {495 throw!(RuntimeError("in std.join all items should be arrays".into()));496 }497 }498499 Val::Arr(out.into())500 },501 Val::Str(sep) => {502 let mut out = String::new();503504 let mut first = true;505 for item in arr.iter() {506 let item = item?.clone();507 if let Val::Str(item) = item {508 if !first {509 out += &sep;510 }511 first = false;512 out += &item;513 } else {514 throw!(RuntimeError("in std.join all items should be strings".into()));515 }516 }517518 Val::Str(out.into())519 },520 _ => unreachable!()521 })522 })523}524525// faster526fn builtin_escape_string_json(527 context: Context,528 _loc: Option<&ExprLocation>,529 args: &ArgsDesc,530) -> Result<Val> {531 parse_args!(context, "escapeStringJson", args, 1, [532 0, str_: ty!(string) => Val::Str;533 ], {534 Ok(Val::Str(escape_string_json(&str_).into()))535 })536}537538// faster539fn builtin_manifest_json_ex(540 context: Context,541 _loc: Option<&ExprLocation>,542 args: &ArgsDesc,543) -> Result<Val> {544 parse_args!(context, "manifestJsonEx", args, 2, [545 0, value: ty!(any);546 1, indent: ty!(string) => Val::Str;547 ], {548 Ok(Val::Str(manifest_json_ex(&value, &ManifestJsonOptions {549 padding: &indent,550 mtype: ManifestType::Std,551 })?.into()))552 })553}554555// faster556fn builtin_reverse(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {557 parse_args!(context, "reverse", args, 1, [558 0, value: ty!(array) => Val::Arr;559 ], {560 Ok(Val::Arr(value.reversed()))561 })562}563564fn builtin_id(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {565 parse_args!(context, "id", args, 1, [566 0, v: ty!(any);567 ], {568 Ok(v)569 })570}571572// faster573fn builtin_str_replace(574 context: Context,575 _loc: Option<&ExprLocation>,576 args: &ArgsDesc,577) -> Result<Val> {578 parse_args!(context, "strReplace", args, 3, [579 0, str: ty!(string) => Val::Str;580 1, from: ty!(string) => Val::Str;581 2, to: ty!(string) => Val::Str;582 ], {583 let mut out = String::new();584 let mut last_idx = 0;585 while let Some(idx) = (&str[last_idx..]).find(&from as &str) {586 out.push_str(&str[last_idx..last_idx+idx]);587 out.push_str(&to);588 last_idx += idx + from.len();589 }590 if last_idx == 0 {591 return Ok(Val::Str(str))592 }593 out.push_str(&str[last_idx..]);594 Ok(Val::Str(out.into()))595 })596}597598pub fn call_builtin(599 context: Context,600 loc: Option<&ExprLocation>,601 name: &str,602 args: &ArgsDesc,603) -> Result<Val> {604 BUILTINS605 .with(|builtins| builtins.get(name).copied())606 .ok_or_else(|| IntrinsicNotFound(name.into()))?(context, loc, args)607}crates/jrsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth--- 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)
crates/jrsonnet-evaluator/src/integrations/serde.rsdiffbeforeafterboth--- 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)?,
})
}
}
crates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth--- 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(),
}
}