difftreelog
feat optional tailstrict in FuncVal::evaluate_simple
in: master
7 files changed
crates/jrsonnet-evaluator/src/arr/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/arr/mod.rs
+++ b/crates/jrsonnet-evaluator/src/arr/mod.rs
@@ -234,6 +234,7 @@
}
}
+ /// Is this vec supports .get_cheap()?
pub fn is_cheap(&self) -> bool {
match self {
ArrValue::Eager(_) | ArrValue::Range(..) | ArrValue::Bytes(_) => true,
crates/jrsonnet-evaluator/src/arr/spec.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/arr/spec.rs
+++ b/crates/jrsonnet-evaluator/src/arr/spec.rs
@@ -748,7 +748,7 @@
.get(index)
.transpose()
.expect("index checked")
- .and_then(|r| self.0.mapper.evaluate_simple(&(r,)));
+ .and_then(|r| self.0.mapper.evaluate_simple(&(r,), false));
let new_value = match val {
Ok(v) => v,
crates/jrsonnet-evaluator/src/evaluate/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate/mod.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/mod.rs
@@ -414,6 +414,7 @@
#[allow(clippy::too_many_lines)]
pub fn evaluate(ctx: Context, expr: &LocExpr) -> Result<Val> {
use Expr::*;
+
if let Some(trivial) = evaluate_trivial(expr) {
return Ok(trivial);
}
crates/jrsonnet-evaluator/src/function/mod.rsdiffbeforeafterboth1use std::fmt::Debug;23pub use arglike::{ArgLike, ArgsLike, TlaArg};4use jrsonnet_gcmodule::{Cc, Trace};5use jrsonnet_interner::IStr;6pub use jrsonnet_macros::builtin;7use jrsonnet_parser::{Destruct, Expr, ExprLocation, LocExpr, ParamsDesc};89use self::{10 arglike::OptionalContext,11 builtin::{Builtin, StaticBuiltin},12 native::NativeDesc,13 parse::{parse_default_function_call, parse_function_call},14};15use crate::{evaluate, evaluate_trivial, gc::TraceBox, tb, Context, ContextBuilder, Result, Val};1617pub mod arglike;18pub mod builtin;19pub mod native;20pub mod parse;2122/// Function callsite location.23/// Either from other jsonnet code, specified by expression location, or from native (without location).24#[derive(Clone, Copy)]25pub struct CallLocation<'l>(pub Option<&'l ExprLocation>);26impl<'l> CallLocation<'l> {27 /// Construct new location for calls coming from specified jsonnet expression location.28 pub const fn new(loc: &'l ExprLocation) -> Self {29 Self(Some(loc))30 }31}32impl CallLocation<'static> {33 /// Construct new location for calls coming from native code.34 pub const fn native() -> Self {35 Self(None)36 }37}3839/// Represents Jsonnet function defined in code.40#[derive(Debug, PartialEq, Trace)]41pub struct FuncDesc {42 /// # Example43 ///44 /// In expressions like this, deducted to `a`, unspecified otherwise.45 /// ```jsonnet46 /// local a = function() ...47 /// local a() ...48 /// { a: function() ... }49 /// { a() = ... }50 /// ```51 pub name: IStr,52 /// Context, in which this function was evaluated.53 ///54 /// # Example55 /// In56 /// ```jsonnet57 /// local a = 2;58 /// function() ...59 /// ```60 /// context will contain `a`.61 pub ctx: Context,6263 /// Function parameter definition64 pub params: ParamsDesc,65 /// Function body66 pub body: LocExpr,67}68impl FuncDesc {69 /// Create body context, but fill arguments without defaults with lazy error70 pub fn default_body_context(&self) -> Result<Context> {71 parse_default_function_call(self.ctx.clone(), &self.params)72 }7374 /// Create context, with which body code will run75 pub fn call_body_context(76 &self,77 call_ctx: Context,78 args: &dyn ArgsLike,79 tailstrict: bool,80 ) -> Result<Context> {81 parse_function_call(call_ctx, self.ctx.clone(), &self.params, args, tailstrict)82 }8384 pub fn evaluate_trivial(&self) -> Option<Val> {85 evaluate_trivial(&self.body)86 }87}8889/// Represents a Jsonnet function value, including plain functions and user-provided builtins.90#[allow(clippy::module_name_repetitions)]91#[derive(Trace, Clone)]92pub enum FuncVal {93 /// Identity function, kept this way for comparsions.94 Id,95 /// Plain function implemented in jsonnet.96 Normal(Cc<FuncDesc>),97 /// Standard library function.98 StaticBuiltin(#[trace(skip)] &'static dyn StaticBuiltin),99 /// User-provided function.100 Builtin(Cc<TraceBox<dyn Builtin>>),101}102103impl Debug for FuncVal {104 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {105 match self {106 Self::Id => f.debug_tuple("Id").finish(),107 Self::Normal(arg0) => f.debug_tuple("Normal").field(arg0).finish(),108 Self::StaticBuiltin(arg0) => {109 f.debug_tuple("StaticBuiltin").field(&arg0.name()).finish()110 }111 Self::Builtin(arg0) => f.debug_tuple("Builtin").field(&arg0.name()).finish(),112 }113 }114}115116impl FuncVal {117 pub fn builtin(builtin: impl Builtin) -> Self {118 Self::Builtin(Cc::new(tb!(builtin)))119 }120 /// Amount of non-default required arguments121 pub fn params_len(&self) -> usize {122 match self {123 Self::Id => 1,124 Self::Normal(n) => n.params.iter().filter(|p| p.1.is_none()).count(),125 Self::StaticBuiltin(i) => i.params().iter().filter(|p| !p.has_default).count(),126 Self::Builtin(i) => i.params().iter().filter(|p| !p.has_default).count(),127 }128 }129 /// Function name, as defined in code.130 pub fn name(&self) -> IStr {131 match self {132 Self::Id => "id".into(),133 Self::Normal(normal) => normal.name.clone(),134 Self::StaticBuiltin(builtin) => builtin.name().into(),135 Self::Builtin(builtin) => builtin.name().into(),136 }137 }138 /// Call function using arguments evaluated in specified `call_ctx` [`Context`].139 ///140 /// If `tailstrict` is specified - then arguments will be evaluated before being passed to function body.141 pub fn evaluate(142 &self,143 call_ctx: Context,144 loc: CallLocation<'_>,145 args: &dyn ArgsLike,146 tailstrict: bool,147 ) -> Result<Val> {148 match self {149 Self::Id => {150 #[allow(clippy::unnecessary_wraps)]151 #[builtin]152 const fn builtin_id(x: Val) -> Val {153 x154 }155 static ID: &builtin_id = &builtin_id {};156157 ID.call(call_ctx, loc, args)158 }159 Self::Normal(func) => {160 let body_ctx = func.call_body_context(call_ctx, args, tailstrict)?;161 evaluate(body_ctx, &func.body)162 }163 Self::StaticBuiltin(b) => b.call(call_ctx, loc, args),164 Self::Builtin(b) => b.call(call_ctx, loc, args),165 }166 }167 pub fn evaluate_simple<A: ArgsLike + OptionalContext>(&self, args: &A) -> Result<Val> {168 self.evaluate(169 ContextBuilder::dangerous_empty_state().build(),170 CallLocation::native(),171 args,172 true,173 )174 }175 /// Convert jsonnet function to plain `Fn` value.176 pub fn into_native<D: NativeDesc>(self) -> D::Value {177 D::into_native(self)178 }179180 /// Is this function an indentity function.181 ///182 /// Currently only works for builtin `std.id`, aka `Self::Id` value, and `function(x) x`.183 ///184 /// This function should only be used for optimization, not for the conditional logic, i.e code should work with syntetic identity function too185 pub fn is_identity(&self) -> bool {186 match self {187 Self::Id => true,188 Self::Normal(desc) => {189 if desc.params.len() != 1 {190 return false;191 }192 let param = &desc.params[0];193 if param.1.is_some() {194 return false;195 }196 #[allow(clippy::infallible_destructuring_match)]197 let id = match ¶m.0 {198 Destruct::Full(id) => id,199 #[cfg(feature = "exp-destruct")]200 _ => return false,201 };202 &desc.body.0 as &Expr == &Expr::Var(id.clone())203 }204 _ => false,205 }206 }207 /// Identity function value.208 pub const fn identity() -> Self {209 Self::Id210 }211212 pub fn evaluate_trivial(&self) -> Option<Val> {213 match self {214 FuncVal::Normal(n) => n.evaluate_trivial(),215 _ => None,216 }217 }218}1use std::fmt::Debug;23pub use arglike::{ArgLike, ArgsLike, TlaArg};4use jrsonnet_gcmodule::{Cc, Trace};5use jrsonnet_interner::IStr;6pub use jrsonnet_macros::builtin;7use jrsonnet_parser::{Destruct, Expr, ExprLocation, LocExpr, ParamsDesc};89use self::{10 arglike::OptionalContext,11 builtin::{Builtin, StaticBuiltin},12 native::NativeDesc,13 parse::{parse_default_function_call, parse_function_call},14};15use crate::{evaluate, evaluate_trivial, gc::TraceBox, tb, Context, ContextBuilder, Result, Val};1617pub mod arglike;18pub mod builtin;19pub mod native;20pub mod parse;2122/// Function callsite location.23/// Either from other jsonnet code, specified by expression location, or from native (without location).24#[derive(Clone, Copy)]25pub struct CallLocation<'l>(pub Option<&'l ExprLocation>);26impl<'l> CallLocation<'l> {27 /// Construct new location for calls coming from specified jsonnet expression location.28 pub const fn new(loc: &'l ExprLocation) -> Self {29 Self(Some(loc))30 }31}32impl CallLocation<'static> {33 /// Construct new location for calls coming from native code.34 pub const fn native() -> Self {35 Self(None)36 }37}3839/// Represents Jsonnet function defined in code.40#[derive(Debug, PartialEq, Trace)]41pub struct FuncDesc {42 /// # Example43 ///44 /// In expressions like this, deducted to `a`, unspecified otherwise.45 /// ```jsonnet46 /// local a = function() ...47 /// local a() ...48 /// { a: function() ... }49 /// { a() = ... }50 /// ```51 pub name: IStr,52 /// Context, in which this function was evaluated.53 ///54 /// # Example55 /// In56 /// ```jsonnet57 /// local a = 2;58 /// function() ...59 /// ```60 /// context will contain `a`.61 pub ctx: Context,6263 /// Function parameter definition64 pub params: ParamsDesc,65 /// Function body66 pub body: LocExpr,67}68impl FuncDesc {69 /// Create body context, but fill arguments without defaults with lazy error70 pub fn default_body_context(&self) -> Result<Context> {71 parse_default_function_call(self.ctx.clone(), &self.params)72 }7374 /// Create context, with which body code will run75 pub fn call_body_context(76 &self,77 call_ctx: Context,78 args: &dyn ArgsLike,79 tailstrict: bool,80 ) -> Result<Context> {81 parse_function_call(call_ctx, self.ctx.clone(), &self.params, args, tailstrict)82 }8384 pub fn evaluate_trivial(&self) -> Option<Val> {85 evaluate_trivial(&self.body)86 }87}8889/// Represents a Jsonnet function value, including plain functions and user-provided builtins.90#[allow(clippy::module_name_repetitions)]91#[derive(Trace, Clone)]92pub enum FuncVal {93 /// Identity function, kept this way for comparsions.94 Id,95 /// Plain function implemented in jsonnet.96 Normal(Cc<FuncDesc>),97 /// Standard library function.98 StaticBuiltin(#[trace(skip)] &'static dyn StaticBuiltin),99 /// User-provided function.100 Builtin(Cc<TraceBox<dyn Builtin>>),101}102103impl Debug for FuncVal {104 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {105 match self {106 Self::Id => f.debug_tuple("Id").finish(),107 Self::Normal(arg0) => f.debug_tuple("Normal").field(arg0).finish(),108 Self::StaticBuiltin(arg0) => {109 f.debug_tuple("StaticBuiltin").field(&arg0.name()).finish()110 }111 Self::Builtin(arg0) => f.debug_tuple("Builtin").field(&arg0.name()).finish(),112 }113 }114}115116impl FuncVal {117 pub fn builtin(builtin: impl Builtin) -> Self {118 Self::Builtin(Cc::new(tb!(builtin)))119 }120 /// Amount of non-default required arguments121 pub fn params_len(&self) -> usize {122 match self {123 Self::Id => 1,124 Self::Normal(n) => n.params.iter().filter(|p| p.1.is_none()).count(),125 Self::StaticBuiltin(i) => i.params().iter().filter(|p| !p.has_default).count(),126 Self::Builtin(i) => i.params().iter().filter(|p| !p.has_default).count(),127 }128 }129 /// Function name, as defined in code.130 pub fn name(&self) -> IStr {131 match self {132 Self::Id => "id".into(),133 Self::Normal(normal) => normal.name.clone(),134 Self::StaticBuiltin(builtin) => builtin.name().into(),135 Self::Builtin(builtin) => builtin.name().into(),136 }137 }138 /// Call function using arguments evaluated in specified `call_ctx` [`Context`].139 ///140 /// If `tailstrict` is specified - then arguments will be evaluated before being passed to function body.141 pub fn evaluate(142 &self,143 call_ctx: Context,144 loc: CallLocation<'_>,145 args: &dyn ArgsLike,146 tailstrict: bool,147 ) -> Result<Val> {148 match self {149 Self::Id => {150 #[allow(clippy::unnecessary_wraps)]151 #[builtin]152 const fn builtin_id(x: Val) -> Val {153 x154 }155 static ID: &builtin_id = &builtin_id {};156157 ID.call(call_ctx, loc, args)158 }159 Self::Normal(func) => {160 let body_ctx = func.call_body_context(call_ctx, args, tailstrict)?;161 evaluate(body_ctx, &func.body)162 }163 Self::StaticBuiltin(b) => b.call(call_ctx, loc, args),164 Self::Builtin(b) => b.call(call_ctx, loc, args),165 }166 }167 pub fn evaluate_simple<A: ArgsLike + OptionalContext>(168 &self,169 args: &A,170 tailstrict: bool,171 ) -> Result<Val> {172 self.evaluate(173 ContextBuilder::dangerous_empty_state().build(),174 CallLocation::native(),175 args,176 tailstrict,177 )178 }179 /// Convert jsonnet function to plain `Fn` value.180 pub fn into_native<D: NativeDesc>(self) -> D::Value {181 D::into_native(self)182 }183184 /// Is this function an indentity function.185 ///186 /// Currently only works for builtin `std.id`, aka `Self::Id` value, and `function(x) x`.187 ///188 /// This function should only be used for optimization, not for the conditional logic, i.e code should work with syntetic identity function too189 pub fn is_identity(&self) -> bool {190 match self {191 Self::Id => true,192 Self::Normal(desc) => {193 if desc.params.len() != 1 {194 return false;195 }196 let param = &desc.params[0];197 if param.1.is_some() {198 return false;199 }200 #[allow(clippy::infallible_destructuring_match)]201 let id = match ¶m.0 {202 Destruct::Full(id) => id,203 #[cfg(feature = "exp-destruct")]204 _ => return false,205 };206 &desc.body.0 as &Expr == &Expr::Var(id.clone())207 }208 _ => false,209 }210 }211 /// Identity function value.212 pub const fn identity() -> Self {213 Self::Id214 }215216 pub fn evaluate_trivial(&self) -> Option<Val> {217 match self {218 FuncVal::Normal(n) => n.evaluate_trivial(),219 _ => None,220 }221 }222}crates/jrsonnet-evaluator/src/function/native.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/function/native.rs
+++ b/crates/jrsonnet-evaluator/src/function/native.rs
@@ -22,6 +22,7 @@
Box::new(move |$($gen),*| {
let val = val.evaluate_simple(
&($($gen,)*),
+ false,
)?;
O::from_untyped(val)
})
crates/jrsonnet-interner/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-interner/src/lib.rs
+++ b/crates/jrsonnet-interner/src/lib.rs
@@ -174,7 +174,6 @@
}
// First reference - current object, second - POOL
if Inner::strong_count(&self.0) <= 2 {
- eprintln!("unpool");
unpool(&self.0);
}
}
crates/jrsonnet-stdlib/src/arrays.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/arrays.rs
+++ b/crates/jrsonnet-stdlib/src/arrays.rs
@@ -88,14 +88,14 @@
#[builtin]
pub fn builtin_filter(func: FuncVal, arr: ArrValue) -> Result<ArrValue> {
- arr.filter(|val| bool::from_untyped(func.evaluate_simple(&(val.clone(),))?))
+ arr.filter(|val| bool::from_untyped(func.evaluate_simple(&(val.clone(),), false)?))
}
#[builtin]
pub fn builtin_foldl(func: FuncVal, arr: ArrValue, init: Val) -> Result<Val> {
let mut acc = init;
for i in arr.iter() {
- acc = func.evaluate_simple(&(acc, i?))?;
+ acc = func.evaluate_simple(&(acc, i?), false)?;
}
Ok(acc)
}
@@ -104,7 +104,7 @@
pub fn builtin_foldr(func: FuncVal, arr: ArrValue, init: Val) -> Result<Val> {
let mut acc = init;
for i in arr.iter().rev() {
- acc = func.evaluate_simple(&(i?, acc))?;
+ acc = func.evaluate_simple(&(i?, acc), false)?;
}
Ok(acc)
}