difftreelog
perf unify function calls
in: master
8 files changed
crates/jrsonnet-evaluator/build.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/build.rs
+++ b/crates/jrsonnet-evaluator/build.rs
@@ -39,7 +39,7 @@
if **name == *"join" || **name == *"manifestJsonEx" ||
**name == *"escapeStringJson" || **name == *"equals" ||
**name == *"base64" || **name == *"foldl" || **name == *"foldr" ||
- **name == *"sortImpl" || **name == *"format" || **name == *"range"
+ **name == *"sortImpl" || **name == *"format" || **name == *"range" || **name == *"reverse"
)
})
.collect(),
crates/jrsonnet-evaluator/src/builtin/manifest.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/builtin/manifest.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/manifest.rs
@@ -117,9 +117,7 @@
}
buf.push('}');
}
- Val::Func(_) | Val::Intristic(_, _) | Val::NativeExt(_, _) => {
- throw!(RuntimeError("tried to manifest function".into()))
- }
+ Val::Func(_) => throw!(RuntimeError("tried to manifest function".into())),
Val::Lazy(_) => unreachable!(),
};
Ok(())
crates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/builtin/mod.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/mod.rs
@@ -1,5 +1,354 @@
+use crate::{
+ equals,
+ error::{Error::*, Result},
+ evaluate, parse_args, primitive_equals, push, throw, with_state, Context, FuncVal, Val,
+ ValType,
+};
+use format::{format_arr, format_obj};
+use jrsonnet_parser::{ArgsDesc, ExprLocation};
+use manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType};
+use std::{path::PathBuf, rc::Rc};
+
pub mod stdlib;
pub use stdlib::*;
pub mod format;
pub mod manifest;
+pub mod sort;
+
+pub fn call_builtin(
+ context: Context,
+ loc: &Option<ExprLocation>,
+ ns: &str,
+ name: &str,
+ args: &ArgsDesc,
+) -> Result<Val> {
+ Ok(match (ns, &name as &str) {
+ // arr/string/function
+ ("std", "length") => parse_args!(context, "std.length", args, 1, [
+ 0, x: [Val::Str|Val::Arr|Val::Obj], vec![ValType::Str, ValType::Arr, ValType::Obj];
+ ], {
+ Ok(match x {
+ Val::Str(n) => Val::Num(n.chars().count() as f64),
+ Val::Arr(i) => Val::Num(i.len() as f64),
+ Val::Obj(o) => Val::Num(
+ o.fields_visibility()
+ .into_iter()
+ .filter(|(_k, v)| *v)
+ .count() as f64,
+ ),
+ _ => unreachable!(),
+ })
+ })?,
+ // any
+ ("std", "type") => parse_args!(context, "std.type", args, 1, [
+ 0, x, vec![];
+ ], {
+ Ok(Val::Str(x.value_type()?.name().into()))
+ })?,
+ // length, idx=>any
+ ("std", "makeArray") => parse_args!(context, "std.makeArray", args, 2, [
+ 0, sz: [Val::Num]!!Val::Num, vec![ValType::Num];
+ 1, func: [Val::Func]!!Val::Func, vec![ValType::Func];
+ ], {
+ if sz < 0.0 {
+ throw!(RuntimeError(format!("makeArray requires size >= 0, got {}", sz).into()));
+ }
+ let mut out = Vec::with_capacity(sz as usize);
+ for i in 0..sz as usize {
+ out.push(func.evaluate_values(
+ Context::new(),
+ &[Val::Num(i as f64)]
+ )?)
+ }
+ Ok(Val::Arr(Rc::new(out)))
+ })?,
+ // string
+ ("std", "codepoint") => parse_args!(context, "std.codepoint", args, 1, [
+ 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];
+ ], {
+ assert!(
+ str.chars().count() == 1,
+ "std.codepoint should receive single char string"
+ );
+ Ok(Val::Num(str.chars().take(1).next().unwrap() as u32 as f64))
+ })?,
+ // object, includeHidden
+ ("std", "objectFieldsEx") => parse_args!(context, "std.objectFieldsEx",args, 2, [
+ 0, obj: [Val::Obj]!!Val::Obj, vec![ValType::Obj];
+ 1, inc_hidden: [Val::Bool]!!Val::Bool, vec![ValType::Bool];
+ ], {
+ let mut out = obj.fields_visibility()
+ .into_iter()
+ .filter(|(_k, v)| *v || inc_hidden)
+ .map(|(k, _v)|k)
+ .collect::<Vec<_>>();
+ out.sort();
+ Ok(Val::Arr(Rc::new(out.into_iter().map(Val::Str).collect())))
+ })?,
+ // object, field, includeHidden
+ ("std", "objectHasEx") => parse_args!(context, "std.objectHasEx", args, 3, [
+ 0, obj: [Val::Obj]!!Val::Obj, vec![ValType::Obj];
+ 1, f: [Val::Str]!!Val::Str, vec![ValType::Str];
+ 2, inc_hidden: [Val::Bool]!!Val::Bool, vec![ValType::Bool];
+ ], {
+ Ok(Val::Bool(
+ obj.fields_visibility()
+ .into_iter()
+ .filter(|(_k, v)| *v || inc_hidden)
+ .any(|(k, _v)| *k == *f),
+ ))
+ })?,
+ ("std", "primitiveEquals") => parse_args!(context, "std.primitiveEquals", args, 2, [
+ 0, a, vec![];
+ 1, b, vec![];
+ ], {
+ Ok(Val::Bool(primitive_equals(&a, &b)?))
+ })?,
+ // faster
+ ("std", "equals") => parse_args!(context, "std.equals", args, 2, [
+ 0, a, vec![];
+ 1, b, vec![];
+ ], {
+ Ok(Val::Bool(equals(&a, &b)?))
+ })?,
+ ("std", "modulo") => parse_args!(context, "std.modulo", args, 2, [
+ 0, a: [Val::Num]!!Val::Num, vec![ValType::Num];
+ 1, b: [Val::Num]!!Val::Num, vec![ValType::Num];
+ ], {
+ Ok(Val::Num(a % b))
+ })?,
+ ("std", "floor") => parse_args!(context, "std.floor", args, 1, [
+ 0, x: [Val::Num]!!Val::Num, vec![ValType::Num];
+ ], {
+ Ok(Val::Num(x.floor()))
+ })?,
+ ("std", "log") => parse_args!(context, "std.log", args, 2, [
+ 0, n: [Val::Num]!!Val::Num, vec![ValType::Num];
+ ], {
+ Ok(Val::Num(n.ln()))
+ })?,
+ ("std", "trace") => parse_args!(context, "std.trace", args, 2, [
+ 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];
+ 1, rest, vec![];
+ ], {
+ eprint!("TRACE:");
+ if let Some(loc) = loc {
+ with_state(|s|{
+ let locs = s.map_source_locations(&loc.0, &[loc.1]);
+ eprint!(" {}:{}", loc.0.file_name().unwrap().to_str().unwrap(), locs[0].line);
+ });
+ }
+ eprintln!(" {}", str);
+ Ok(rest)
+ })?,
+ ("std", "pow") => parse_args!(context, "std.modulo", args, 2, [
+ 0, x: [Val::Num]!!Val::Num, vec![ValType::Num];
+ 1, n: [Val::Num]!!Val::Num, vec![ValType::Num];
+ ], {
+ Ok(Val::Num(x.powf(n)))
+ })?,
+ ("std", "extVar") => parse_args!(context, "std.extVar", args, 1, [
+ 0, x: [Val::Str]!!Val::Str, vec![ValType::Str];
+ ], {
+ Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or_else(
+ || UndefinedExternalVariable(x),
+ )?)
+ })?,
+ ("std", "native") => parse_args!(context, "std.native", args, 1, [
+ 0, x: [Val::Str]!!Val::Str, vec![ValType::Str];
+ ], {
+ Ok(with_state(|s| s.settings().ext_natives.get(&x).cloned()).map(|v| Val::Func(FuncVal::NativeExt(x.clone(), v))).ok_or_else(
+ || UndefinedExternalFunction(x),
+ )?)
+ })?,
+ ("std", "filter") => parse_args!(context, "std.filter", args, 2, [
+ 0, func: [Val::Func]!!Val::Func, vec![ValType::Func];
+ 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];
+ ], {
+ Ok(Val::Arr(Rc::new(
+ arr.iter()
+ .cloned()
+ .filter(|e| {
+ func
+ .evaluate_values(context.clone(), &[e.clone()])
+ .unwrap()
+ .try_cast_bool("filter predicate")
+ .unwrap()
+ })
+ .collect(),
+ )))
+ })?,
+ // faster
+ ("std", "foldl") => parse_args!(context, "std.foldl", args, 3, [
+ 0, func: [Val::Func]!!Val::Func, vec![ValType::Func];
+ 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];
+ 2, init, vec![];
+ ], {
+ let mut acc = init;
+ for i in arr.iter().cloned() {
+ acc = func.evaluate_values(context.clone(), &[acc, i])?;
+ }
+ Ok(acc)
+ })?,
+ // faster
+ ("std", "foldr") => parse_args!(context, "std.foldr", args, 3, [
+ 0, func: [Val::Func]!!Val::Func, vec![ValType::Func];
+ 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];
+ 2, init, vec![];
+ ], {
+ let mut acc = init;
+ for i in arr.iter().rev().cloned() {
+ acc = func.evaluate_values(context.clone(), &[acc, i])?;
+ }
+ Ok(acc)
+ })?,
+ // faster
+ #[allow(non_snake_case)]
+ ("std", "sortImpl") => parse_args!(context, "std.sort", args, 2, [
+ 0, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];
+ 1, keyF: [Val::Func]!!Val::Func, vec![ValType::Func];
+ ], {
+ if arr.len() <= 1 {
+ return Ok(Val::Arr(arr))
+ }
+ Ok(Val::Arr(sort::sort(context, arr, keyF)?))
+ })?,
+ // faster
+ ("std", "format") => parse_args!(context, "std.format", args, 2, [
+ 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];
+ 1, vals, vec![]
+ ], {
+ push(&Some(ExprLocation(Rc::from(PathBuf::from("std.jsonnet")), 0, 0)), ||format!("std.format of {}", str), ||{
+ Ok(match vals {
+ Val::Arr(vals) => Val::Str(format_arr(&str, &vals)?.into()),
+ Val::Obj(obj) => Val::Str(format_obj(&str, &obj)?.into()),
+ o => Val::Str(format_arr(&str, &[o])?.into()),
+ })
+ })
+ })?,
+ // faster
+ ("std", "range") => parse_args!(context, "std.range", args, 2, [
+ 0, from: [Val::Num]!!Val::Num, vec![ValType::Num];
+ 1, to: [Val::Num]!!Val::Num, vec![ValType::Num];
+ ], {
+ let mut out = Vec::with_capacity((1+to as usize-from as usize).max(0));
+ for i in from as usize..=to as usize {
+ out.push(Val::Num(i as f64));
+ }
+ Ok(Val::Arr(Rc::new(out)))
+ })?,
+ ("std", "char") => parse_args!(context, "std.char", args, 1, [
+ 0, n: [Val::Num]!!Val::Num, vec![ValType::Num];
+ ], {
+ let mut out = String::new();
+ out.push(std::char::from_u32(n as u32).ok_or_else(||
+ InvalidUnicodeCodepointGot(n as u32)
+ )?);
+ Ok(Val::Str(out.into()))
+ })?,
+ ("std", "encodeUTF8") => parse_args!(context, "std.encodeUtf8", args, 1, [
+ 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];
+ ], {
+ Ok(Val::Arr(Rc::new(str.bytes().map(|b| Val::Num(b as f64)).collect())))
+ })?,
+ ("std", "md5") => parse_args!(context, "std.md5", args, 1, [
+ 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];
+ ], {
+ Ok(Val::Str(format!("{:x}", md5::compute(&str.as_bytes())).into()))
+ })?,
+ // faster
+ ("std", "base64") => parse_args!(context, "std.base64", args, 1, [
+ 0, input: [Val::Str | Val::Arr], vec![ValType::Arr, ValType::Str];
+ ], {
+ Ok(Val::Str(match input {
+ Val::Str(s) => {
+ base64::encode(s.bytes().collect::<Vec<_>>()).into()
+ },
+ Val::Arr(a) => {
+ base64::encode(a.iter().map(|v| {
+ Ok(v.clone().try_cast_num("base64 array")? as u8)
+ }).collect::<Result<Vec<_>>>()?).into()
+ },
+ _ => unreachable!()
+ }))
+ })?,
+ // faster
+ ("std", "join") => parse_args!(context, "std.join", args, 2, [
+ 0, sep: [Val::Str|Val::Arr], vec![ValType::Str, ValType::Arr];
+ 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];
+ ], {
+ Ok(match sep {
+ Val::Arr(joiner_items) => {
+ let mut out = Vec::new();
+
+ let mut first = true;
+ for item in arr.iter().cloned() {
+ if let Val::Arr(items) = item.unwrap_if_lazy()? {
+ if !first {
+ out.reserve(joiner_items.len());
+ out.extend(joiner_items.iter().cloned());
+ }
+ first = false;
+ out.reserve(items.len());
+ out.extend(items.iter().cloned());
+ } else {
+ throw!(RuntimeError("in std.join all items should be arrays".into()));
+ }
+ }
+
+ Val::Arr(Rc::new(out))
+ },
+ Val::Str(sep) => {
+ let mut out = String::new();
+
+ let mut first = true;
+ for item in arr.iter().cloned() {
+ if let Val::Str(item) = item.unwrap_if_lazy()? {
+ if !first {
+ out += &sep;
+ }
+ first = false;
+ out += &item;
+ } else {
+ throw!(RuntimeError("in std.join all items should be strings".into()));
+ }
+ }
+
+ Val::Str(out.into())
+ },
+ _ => unreachable!()
+ })
+ })?,
+ // Faster
+ ("std", "escapeStringJson") => parse_args!(context, "std.escapeStringJson", args, 1, [
+ 0, str_: [Val::Str]!!Val::Str, vec![ValType::Str];
+ ], {
+ Ok(Val::Str(escape_string_json(&str_).into()))
+ })?,
+ // Faster
+ ("std", "manifestJsonEx") => parse_args!(context, "std.manifestJsonEx", args, 2, [
+ 0, value, vec![];
+ 1, indent: [Val::Str]!!Val::Str, vec![ValType::Str];
+ ], {
+ Ok(Val::Str(manifest_json_ex(&value, &ManifestJsonOptions {
+ padding: &indent,
+ mtype: ManifestType::Std,
+ })?.into()))
+ })?,
+ // Faster
+ ("std", "reverse") => parse_args!(context, "std.reverse", args, 1, [
+ 0, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];
+ ], {
+ let mut marr = arr;
+ Rc::make_mut(&mut marr).reverse();
+ Ok(Val::Arr(marr))
+ })?,
+ ("std", "id") => parse_args!(context, "std.id", args, 1, [
+ 0, v, vec![];
+ ], {
+ Ok(v)
+ })?,
+ (ns, name) => throw!(IntristicNotFound(ns.into(), name.into())),
+ })
+}
crates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -1,4 +1,7 @@
-use crate::{builtin::format::FormatError, ValType};
+use crate::{
+ builtin::{format::FormatError, sort::SortError},
+ ValType,
+};
use jrsonnet_parser::{BinaryOpType, ExprLocation, UnaryOpType};
use std::{path::PathBuf, rc::Rc};
@@ -69,6 +72,7 @@
InvalidUnicodeCodepointGot(u32),
Format(FormatError),
+ Sort(SortError),
}
impl From<Error> for LocError {
fn from(e: Error) -> Self {
crates/jrsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth1use crate::{1use crate::{2 builtin::{3 format::{format_arr, format_obj},4 manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType},5 },6 context_creator, equals,2 context_creator, error::Error::*, future_wrapper, lazy_val, push, throw, with_state, Context,7 error::Error::*,8 future_wrapper, lazy_val, parse_args, parse_function_call, primitive_equals, push, throw,9 with_state, Context, ContextCreator, FuncDesc, LazyBinding, LazyVal, LocError, ObjMember,3 ContextCreator, FuncDesc, FuncVal, LazyBinding, LazyVal, ObjMember, ObjValue, Result, Val,10 ObjValue, Result, Val, ValType,4 ValType,11};5};12use closure::closure;6use closure::closure;15 ForSpecData, IfSpecData, LiteralType, LocExpr, Member, ObjBody, ParamsDesc, UnaryOpType,9 ForSpecData, IfSpecData, LiteralType, LocExpr, Member, ObjBody, ParamsDesc, UnaryOpType,16 Visibility,10 Visibility,17};11};18use std::{cmp::Ordering, collections::HashMap, path::PathBuf, rc::Rc};12use std::{collections::HashMap, rc::Rc};191320pub fn evaluate_binding(b: &BindSpec, context_creator: ContextCreator) -> (Rc<str>, LazyBinding) {14pub fn evaluate_binding(b: &BindSpec, context_creator: ContextCreator) -> (Rc<str>, LazyBinding) {21 let b = b.clone();15 let b = b.clone();51}45}524653pub fn evaluate_method(ctx: Context, name: Rc<str>, params: ParamsDesc, body: LocExpr) -> Val {47pub fn evaluate_method(ctx: Context, name: Rc<str>, params: ParamsDesc, body: LocExpr) -> Val {54 Val::Func(Rc::new(FuncDesc {48 Val::Func(FuncVal::Normal(Rc::new(FuncDesc {55 name,49 name,56 ctx,50 ctx,57 params,51 params,58 body,52 body,59 }))53 })))60}54}615562pub fn evaluate_field_name(56pub fn evaluate_field_name(389 })383 })390}384}391392/// Extracts code block and disables inlining for them393/// Fixes WASM to java bytecode compilation failing because of very large method394#[cfg(feature = "unstable")]395macro_rules! noinline {396 ($e:expr) => {397 (#![inline(never)] move || $e)()398 };399}400#[cfg(not(feature = "unstable"))]401macro_rules! noinline {402 ($e:expr) => {403 (move || $e)()404 };405}406385407pub fn evaluate_apply(386pub fn evaluate_apply(408 context: Context,387 context: Context,414 let lazy = evaluate(context.clone(), value)?;393 let lazy = evaluate(context.clone(), value)?;415 let value = lazy.unwrap_if_lazy()?;394 let value = lazy.unwrap_if_lazy()?;416 Ok(match value {395 Ok(match value {417 Val::Intristic(ns, name) => push(418 loc,419 || format!("intristic <{}.{}> call", ns, name),420 || {421 Ok(match (&ns as &str, &name as &str) {422 // arr/string/function423 ("std", "length") => parse_args!(context, "std.length", args, 1, [424 0, x: [Val::Str|Val::Arr|Val::Obj], vec![ValType::Str, ValType::Arr, ValType::Obj];425 ], {426 Ok(match x {427 Val::Str(n) => Val::Num(n.chars().count() as f64),428 Val::Arr(i) => Val::Num(i.len() as f64),429 Val::Obj(o) => Val::Num(430 o.fields_visibility()431 .into_iter()432 .filter(|(_k, v)| *v)433 .count() as f64,434 ),435 _ => unreachable!(),436 })437 })?,438 // any439 ("std", "type") => parse_args!(context, "std.type", args, 1, [440 0, x, vec![];441 ], {442 Ok(Val::Str(x.value_type()?.name().into()))443 })?,444 // length, idx=>any445 ("std", "makeArray") => {446 noinline!(parse_args!(context, "std.makeArray", args, 2, [447 0, sz: [Val::Num]!!Val::Num, vec![ValType::Num];448 1, func: [Val::Func]!!Val::Func, vec![ValType::Func];449 ], {450 if sz < 0.0 {451 throw!(RuntimeError(format!("makeArray requires size >= 0, got {}", sz).into()));452 }453 let mut out = Vec::with_capacity(sz as usize);454 for i in 0..sz as usize {455 out.push(func.evaluate_values(456 Context::new(),457 &[Val::Num(i as f64)]458 )?)459 }460 Ok(Val::Arr(Rc::new(out)))461 }))?462 }463 // string464 ("std", "codepoint") => parse_args!(context, "std.codepoint", args, 1, [465 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];466 ], {467 assert!(468 str.chars().count() == 1,469 "std.codepoint should receive single char string"470 );471 Ok(Val::Num(str.chars().take(1).next().unwrap() as u32 as f64))472 })?,473 // object, includeHidden474 ("std", "objectFieldsEx") => {475 noinline!(parse_args!(context, "std.objectFieldsEx",args, 2, [476 0, obj: [Val::Obj]!!Val::Obj, vec![ValType::Obj];477 1, inc_hidden: [Val::Bool]!!Val::Bool, vec![ValType::Bool];478 ], {479 let mut out = obj.fields_visibility()480 .into_iter()481 .filter(|(_k, v)| *v || inc_hidden)482 .map(|(k, _v)|k)483 .collect::<Vec<_>>();484 out.sort();485 Ok(Val::Arr(Rc::new(out.into_iter().map(Val::Str).collect())))486 }))?487 }488 // object, field, includeHidden489 ("std", "objectHasEx") => parse_args!(context, "std.objectHasEx", args, 3, [490 0, obj: [Val::Obj]!!Val::Obj, vec![ValType::Obj];491 1, f: [Val::Str]!!Val::Str, vec![ValType::Str];492 2, inc_hidden: [Val::Bool]!!Val::Bool, vec![ValType::Bool];493 ], {494 Ok(Val::Bool(495 obj.fields_visibility()496 .into_iter()497 .filter(|(_k, v)| *v || inc_hidden)498 .any(|(k, _v)| *k == *f),499 ))500 })?,501 ("std", "primitiveEquals") => {502 parse_args!(context, "std.primitiveEquals", args, 2, [503 0, a, vec![];504 1, b, vec![];505 ], {506 Ok(Val::Bool(primitive_equals(&a, &b)?))507 })?508 }509 // faster510 ("std", "equals") => parse_args!(context, "std.equals", args, 2, [511 0, a, vec![];512 1, b, vec![];513 ], {514 Ok(Val::Bool(equals(&a, &b)?))515 })?,516 ("std", "modulo") => parse_args!(context, "std.modulo", args, 2, [517 0, a: [Val::Num]!!Val::Num, vec![ValType::Num];518 1, b: [Val::Num]!!Val::Num, vec![ValType::Num];519 ], {520 Ok(Val::Num(a % b))521 })?,522 ("std", "floor") => parse_args!(context, "std.floor", args, 1, [523 0, x: [Val::Num]!!Val::Num, vec![ValType::Num];524 ], {525 Ok(Val::Num(x.floor()))526 })?,527 ("std", "log") => parse_args!(context, "std.log", args, 2, [528 0, n: [Val::Num]!!Val::Num, vec![ValType::Num];529 ], {530 Ok(Val::Num(n.ln()))531 })?,532 ("std", "trace") => parse_args!(context, "std.trace", args, 2, [533 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];534 1, rest, vec![];535 ], {536 eprint!("TRACE:");537 if let Some(loc) = loc {538 with_state(|s|{539 let locs = s.map_source_locations(&loc.0, &[loc.1]);540 eprint!(" {}:{}", loc.0.file_name().unwrap().to_str().unwrap(), locs[0].line);541 });542 }543 eprintln!(" {}", str);544 Ok(rest)545 })?,546 ("std", "pow") => parse_args!(context, "std.modulo", args, 2, [547 0, x: [Val::Num]!!Val::Num, vec![ValType::Num];548 1, n: [Val::Num]!!Val::Num, vec![ValType::Num];549 ], {550 Ok(Val::Num(x.powf(n)))551 })?,552 ("std", "extVar") => parse_args!(context, "std.extVar", args, 1, [553 0, x: [Val::Str]!!Val::Str, vec![ValType::Str];554 ], {555 Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or_else(556 || UndefinedExternalVariable(x),557 )?)558 })?,559 ("std", "native") => parse_args!(context, "std.native", args, 1, [560 0, x: [Val::Str]!!Val::Str, vec![ValType::Str];561 ], {562 Ok(with_state(|s| s.settings().ext_natives.get(&x).cloned()).map(|v| Val::NativeExt(x.clone(), v)).ok_or_else(563 || UndefinedExternalFunction(x),564 )?)565 })?,566 ("std", "filter") => noinline!(parse_args!(context, "std.filter", args, 2, [567 0, func: [Val::Func]!!Val::Func, vec![ValType::Func];568 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];569 ], {570 Ok(Val::Arr(Rc::new(571 arr.iter()572 .cloned()573 .filter(|e| {574 func575 .evaluate_values(context.clone(), &[e.clone()])576 .unwrap()577 .try_cast_bool("filter predicate")578 .unwrap()579 })580 .collect(),581 )))582 }))?,583 // faster584 ("std", "foldl") => noinline!(parse_args!(context, "std.foldl", args, 3, [585 0, func: [Val::Func]!!Val::Func, vec![ValType::Func];586 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];587 2, init, vec![];588 ], {589 let mut acc = init;590 for i in arr.iter().cloned() {591 acc = func.evaluate_values(context.clone(), &[acc, i])?;592 }593 Ok(acc)594 }))?,595 // faster596 ("std", "foldr") => noinline!(parse_args!(context, "std.foldr", args, 3, [597 0, func: [Val::Func]!!Val::Func, vec![ValType::Func];598 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];599 2, init, vec![];600 ], {601 let mut acc = init;602 for i in arr.iter().rev().cloned() {603 acc = func.evaluate_values(context.clone(), &[acc, i])?;604 }605 Ok(acc)606 }))?,607 // faster608 #[allow(non_snake_case)]609 ("std", "sortImpl") => noinline!(parse_args!(context, "std.sort", args, 2, [610 0, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];611 1, keyF: [Val::Func]!!Val::Func, vec![ValType::Func];612 ], {613 if arr.len() <= 1 {614 return Ok(Val::Arr(arr))615 }616 let mut new_arr = arr.iter().cloned().collect::<Vec<_>>();617 match keyF.evaluate_values(context.clone(), &[new_arr[0].clone()])? {618 Val::Str(_) => {619 let mut err = None;620 new_arr.sort_by_cached_key(|k| {621 match keyF.evaluate_values(context.clone(), &[k.clone()]) {622 Ok(Val::Str(v)) => v,623 Ok(_) => {624 err = Some(LocError::new(RuntimeError("types of all array elements should equal".into())));625 "".into()626 }627 Err(e) => {628 err = Some(e);629 "".into()630 }631 }632 });633 if let Some(e) = err {634 return Err(e);635 }636 },637 Val::Num(_) => {638 let mut err = None;639 new_arr.sort_unstable_by(|a, b| {640 match (keyF.evaluate_values(context.clone(), &[a.clone()]), keyF.evaluate_values(context.clone(), &[b.clone()])) {641 (Ok(Val::Num(a)), Ok(Val::Num(b))) => a.partial_cmp(&b).unwrap(),642 (Ok(_a), Ok(_b)) => {643 err = Some(RuntimeError("types of all array elements should equal".into()).into());644 Ordering::Equal645 }646 (Err(e), _) | (_, Err(e)) => {647 err = Some(e);648 Ordering::Equal649 }650 }651 });652 if let Some(e) = err {653 return Err(e);654 }655 },656 _ => throw!(RuntimeError("keys should be number or string".into()))657 }658 Ok(Val::Arr(Rc::new(new_arr)))659 }))?,660 // faster661 ("std", "format") => parse_args!(context, "std.format", args, 2, [662 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];663 1, vals, vec![]664 ], {665 push(&Some(ExprLocation(Rc::from(PathBuf::from("std.jsonnet")), 0, 0)), ||format!("std.format of {}", str), ||{666 Ok(match vals {667 Val::Arr(vals) => Val::Str(format_arr(&str, &vals)?.into()),668 Val::Obj(obj) => Val::Str(format_obj(&str, &obj)?.into()),669 o => Val::Str(format_arr(&str, &[o])?.into()),670 })671 })672 })?,673 // faster674 ("std", "range") => parse_args!(context, "std.range", args, 2, [675 0, from: [Val::Num]!!Val::Num, vec![ValType::Num];676 1, to: [Val::Num]!!Val::Num, vec![ValType::Num];677 ], {678 let mut out = Vec::with_capacity((1+to as usize-from as usize).max(0));679 for i in from as usize..=to as usize {680 out.push(Val::Num(i as f64));681 }682 Ok(Val::Arr(Rc::new(out)))683 })?,684 ("std", "char") => parse_args!(context, "std.char", args, 1, [685 0, n: [Val::Num]!!Val::Num, vec![ValType::Num];686 ], {687 let mut out = String::new();688 out.push(std::char::from_u32(n as u32).ok_or_else(||689 InvalidUnicodeCodepointGot(n as u32)690 )?);691 Ok(Val::Str(out.into()))692 })?,693 ("std", "encodeUTF8") => parse_args!(context, "std.encodeUtf8", args, 1, [694 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];695 ], {696 Ok(Val::Arr(Rc::new(str.bytes().map(|b| Val::Num(b as f64)).collect())))697 })?,698 ("std", "md5") => noinline!(parse_args!(context, "std.md5", args, 1, [699 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];700 ], {701 Ok(Val::Str(format!("{:x}", md5::compute(&str.as_bytes())).into()))702 }))?,703 // faster704 ("std", "base64") => parse_args!(context, "std.base64", args, 1, [705 0, input: [Val::Str | Val::Arr], vec![ValType::Arr, ValType::Str];706 ], {707 Ok(Val::Str(match input {708 Val::Str(s) => {709 base64::encode(s.bytes().collect::<Vec<_>>()).into()710 },711 Val::Arr(a) => {712 base64::encode(a.iter().map(|v| {713 Ok(v.clone().try_cast_num("base64 array")? as u8)714 }).collect::<Result<Vec<_>>>()?).into()715 },716 _ => unreachable!()717 }))718 })?,719 // faster720 ("std", "join") => noinline!(parse_args!(context, "std.join", args, 2, [721 0, sep: [Val::Str|Val::Arr], vec![ValType::Str, ValType::Arr];722 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];723 ], {724 Ok(match sep {725 Val::Arr(joiner_items) => {726 let mut out = Vec::new();727728 let mut first = true;729 for item in arr.iter().cloned() {730 if let Val::Arr(items) = item.unwrap_if_lazy()? {731 if !first {732 out.reserve(joiner_items.len());733 out.extend(joiner_items.iter().cloned());734 }735 first = false;736 out.reserve(items.len());737 out.extend(items.iter().cloned());738 } else {739 throw!(RuntimeError("in std.join all items should be arrays".into()));740 }741 }742743 Val::Arr(Rc::new(out))744 },745 Val::Str(sep) => {746 let mut out = String::new();747748 let mut first = true;749 for item in arr.iter().cloned() {750 if let Val::Str(item) = item.unwrap_if_lazy()? {751 if !first {752 out += &sep;753 }754 first = false;755 out += &item;756 } else {757 throw!(RuntimeError("in std.join all items should be strings".into()));758 }759 }760761 Val::Str(out.into())762 },763 _ => unreachable!()764 })765 }))?,766 // Faster767 ("std", "escapeStringJson") => {768 parse_args!(context, "std.escapeStringJson", args, 1, [769 0, str_: [Val::Str]!!Val::Str, vec![ValType::Str];770 ], {771 Ok(Val::Str(escape_string_json(&str_).into()))772 })?773 }774 // Faster775 ("std", "manifestJsonEx") => {776 parse_args!(context, "std.manifestJsonEx", args, 2, [777 0, value, vec![];778 1, indent: [Val::Str]!!Val::Str, vec![ValType::Str];779 ], {780 Ok(Val::Str(manifest_json_ex(&value, &ManifestJsonOptions {781 padding: &indent,782 mtype: ManifestType::Std,783 })?.into()))784 })?785 }786 (ns, name) => throw!(IntristicNotFound(ns.into(), name.into())),787 })788 },789 )?,790 Val::NativeExt(n, f) => push(791 loc,792 || format!("native <{}> call", n),793 || {794 let args = parse_function_call(context, None, &f.params, args, true)?;795 let mut out_args = Vec::with_capacity(f.params.len());796 for p in f.params.0.iter() {797 out_args.push(args.binding(p.0.clone())?.evaluate()?);798 }799 Ok(f.call(&out_args)?)800 },801 )?,802 Val::Func(f) => {396 Val::Func(f) => {803 let body = || f.evaluate(context, args, tailstrict);397 let body = || f.evaluate(context, loc, args, tailstrict);804 if tailstrict {398 if tailstrict {805 body()?399 body()?806 } else {400 } else {807 push(loc, || format!("function <{}> call", f.name), body)?401 push(loc, || format!("function <{}> call", f.name()), body)?808 }402 }809 }403 }810 v => throw!(OnlyFunctionsCanBeCalledGot(v.value_type()?)),404 v => throw!(OnlyFunctionsCanBeCalledGot(v.value_type()?)),874 } else if let Some(Val::Str(n)) =468 } else if let Some(Val::Str(n)) =875 v.get("__intristic_namespace__".into())?469 v.get("__intristic_namespace__".into())?876 {470 {877 Ok(Val::Intristic(n, s))471 Ok(Val::Func(FuncVal::Intristic(n, s)))878 } else {472 } else {879 throw!(NoSuchField(s))473 throw!(NoSuchField(s))880 }474 }crates/jrsonnet-evaluator/src/integrations/serde.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/integrations/serde.rs
+++ b/crates/jrsonnet-evaluator/src/integrations/serde.rs
@@ -40,9 +40,7 @@
}
Value::Object(out)
}
- Val::Func(_) | Val::Intristic(_, _) | Val::NativeExt(_, _) => {
- throw!(RuntimeError("tried to manifest function".into()))
- }
+ Val::Func(_) => throw!(RuntimeError("tried to manifest function".into())),
})
}
}
crates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -1,12 +1,15 @@
use crate::{
- builtin::manifest::{manifest_json_ex, ManifestJsonOptions, ManifestType},
+ builtin::{
+ call_builtin,
+ manifest::{manifest_json_ex, ManifestJsonOptions, ManifestType},
+ },
error::Error::*,
evaluate,
function::{parse_function_call, parse_function_call_map, place_args},
native::NativeCallback,
throw, with_state, Context, ObjValue, Result,
};
-use jrsonnet_parser::{el, Arg, ArgsDesc, Expr, LocExpr, ParamsDesc};
+use jrsonnet_parser::{el, Arg, ArgsDesc, Expr, ExprLocation, LocExpr, ParamsDesc};
use std::{
cell::RefCell,
collections::HashMap,
@@ -67,18 +70,66 @@
pub params: ParamsDesc,
pub body: LocExpr,
}
-impl FuncDesc {
- /// This function is always inlined to make tailstrict work
- pub fn evaluate(&self, call_ctx: Context, args: &ArgsDesc, tailstrict: bool) -> Result<Val> {
- let ctx = parse_function_call(
- call_ctx,
- Some(self.ctx.clone()),
- &self.params,
- args,
- tailstrict,
- )?;
- evaluate(ctx, &self.body)
+
+#[derive(Debug, Clone)]
+pub enum FuncVal {
+ /// Plain function implemented in jsonnet
+ Normal(Rc<FuncDesc>),
+ /// Standard library function
+ Intristic(Rc<str>, Rc<str>),
+ /// Library functions implemented in native
+ NativeExt(Rc<str>, Rc<NativeCallback>),
+}
+impl PartialEq for FuncVal {
+ fn eq(&self, other: &Self) -> bool {
+ match (self, other) {
+ (FuncVal::Normal(a), FuncVal::Normal(b)) => a == b,
+ (FuncVal::Intristic(ans, an), FuncVal::Intristic(bns, bn)) => ans == bns && an == bn,
+ (FuncVal::NativeExt(an, _), FuncVal::NativeExt(bn, _)) => an == bn,
+ (..) => false,
+ }
+ }
+}
+impl FuncVal {
+ pub fn is_ident(&self) -> bool {
+ matches!(&self, FuncVal::Intristic(ns, n) if ns as &str == "std" && n as &str == "id")
+ }
+ pub fn name(&self) -> Rc<str> {
+ match self {
+ FuncVal::Normal(normal) => normal.name.clone(),
+ FuncVal::Intristic(ns, name) => format!("intristic.{}.{}", ns, name).into(),
+ FuncVal::NativeExt(n, _) => format!("native.{}", n).into(),
+ }
}
+ pub fn evaluate(
+ &self,
+ call_ctx: Context,
+ loc: &Option<ExprLocation>,
+ args: &ArgsDesc,
+ tailstrict: bool,
+ ) -> Result<Val> {
+ match self {
+ FuncVal::Normal(func) => {
+ let ctx = parse_function_call(
+ call_ctx,
+ Some(func.ctx.clone()),
+ &func.params,
+ args,
+ tailstrict,
+ )?;
+ evaluate(ctx, &func.body)
+ }
+ FuncVal::Intristic(ns, name) => call_builtin(call_ctx, loc, &ns, &name, args),
+ FuncVal::NativeExt(_name, handler) => {
+ let args = parse_function_call(call_ctx, None, &handler.params, args, true)?;
+ let mut out_args = Vec::with_capacity(handler.params.len());
+ for p in handler.params.0.iter() {
+ out_args.push(args.binding(p.0.clone())?.evaluate()?);
+ }
+ Ok(handler.call(&out_args)?)
+ }
+ }
+ }
pub fn evaluate_map(
&self,
@@ -86,19 +137,31 @@
args: &HashMap<Rc<str>, Val>,
tailstrict: bool,
) -> Result<Val> {
- let ctx = parse_function_call_map(
- call_ctx,
- Some(self.ctx.clone()),
- &self.params,
- args,
- tailstrict,
- )?;
- evaluate(ctx, &self.body)
+ match self {
+ FuncVal::Normal(func) => {
+ let ctx = parse_function_call_map(
+ call_ctx,
+ Some(func.ctx.clone()),
+ &func.params,
+ args,
+ tailstrict,
+ )?;
+ evaluate(ctx, &func.body)
+ }
+ FuncVal::Intristic(_, _) => todo!(),
+ FuncVal::NativeExt(_, _) => todo!(),
+ }
}
pub fn evaluate_values(&self, call_ctx: Context, args: &[Val]) -> Result<Val> {
- let ctx = place_args(call_ctx, Some(self.ctx.clone()), &self.params, args)?;
- evaluate(ctx, &self.body)
+ match self {
+ FuncVal::Normal(func) => {
+ let ctx = place_args(call_ctx, Some(func.ctx.clone()), &func.params, args)?;
+ evaluate(ctx, &func.body)
+ }
+ FuncVal::Intristic(_, _) => todo!(),
+ FuncVal::NativeExt(_, _) => todo!(),
+ }
}
}
@@ -149,11 +212,7 @@
Lazy(LazyVal),
Arr(Rc<Vec<Val>>),
Obj(ObjValue),
- Func(Rc<FuncDesc>),
-
- // Library functions implemented in native
- Intristic(Rc<str>, Rc<str>),
- NativeExt(Rc<str>, Rc<NativeCallback>),
+ Func(FuncVal),
}
macro_rules! matches_unwrap {
($e: expr, $p: pat, $r: expr) => {
@@ -193,6 +252,12 @@
self.assert_type(context, ValType::Num)?;
Ok(matches_unwrap!(self.unwrap_if_lazy()?, Val::Num(v), v))
}
+ pub fn inplace_unwrap(&mut self) -> Result<()> {
+ while let Val::Lazy(lazy) = self {
+ *self = lazy.evaluate()?;
+ }
+ Ok(())
+ }
pub fn unwrap_if_lazy(&self) -> Result<Self> {
Ok(if let Val::Lazy(v) = self {
v.evaluate()?.unwrap_if_lazy()?
@@ -208,7 +273,7 @@
Val::Obj(..) => ValType::Obj,
Val::Bool(_) => ValType::Bool,
Val::Null => ValType::Null,
- Val::Func(..) | Val::Intristic(_, _) | Val::NativeExt(_, _) => ValType::Func,
+ Val::Func(..) => ValType::Func,
Val::Lazy(_) => self.clone().unwrap_if_lazy()?.value_type()?,
})
}
@@ -374,7 +439,7 @@
}
fn is_function_like(val: &Val) -> bool {
- matches!(val, Val::Func(_) | Val::Intristic(_, _) | Val::NativeExt(_, _))
+ matches!(val, Val::Func(_))
}
/// Implements std.primitiveEquals builtin
crates/jrsonnet-stdlib/src/std.jsonnetdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/std.jsonnet
+++ b/crates/jrsonnet-stdlib/src/std.jsonnet
@@ -2,7 +2,7 @@
__intristic_namespace__:: 'std',
local std = self,
- local id = function(x) x,
+ local id = std.id,
isString(v):: std.type(v) == 'string',
isNumber(v):: std.type(v) == 'number',