difftreelog
feat field destructuring
in: master
22 files changed
bindings/jsonnet/src/native.rsdiffbeforeafterboth--- a/bindings/jsonnet/src/native.rs
+++ b/bindings/jsonnet/src/native.rs
@@ -9,7 +9,7 @@
use jrsonnet_evaluator::{
error::{Error, LocError},
function::builtin::{BuiltinParam, NativeCallback, NativeCallbackHandler},
- gc::TraceBox,
+ tb,
typed::Typed,
IStr, State, Val,
};
@@ -78,9 +78,9 @@
vm.add_native(
name,
#[allow(deprecated)]
- Cc::new(TraceBox(Box::new(NativeCallback::new(
+ Cc::new(tb!(NativeCallback::new(
params,
- TraceBox(Box::new(JsonnetNativeCallbackHandler { ctx, cb })),
- )))),
+ tb!(JsonnetNativeCallbackHandler { ctx, cb }),
+ ))),
)
}
bindings/jsonnet/src/val_modify.rsdiffbeforeafterboth--- a/bindings/jsonnet/src/val_modify.rs
+++ b/bindings/jsonnet/src/val_modify.rs
@@ -5,7 +5,7 @@
use std::{ffi::CStr, os::raw::c_char};
use gcmodule::Cc;
-use jrsonnet_evaluator::{val::ArrValue, LazyVal, State, Val};
+use jrsonnet_evaluator::{val::ArrValue, State, Thunk, Val};
/// # Safety
///
@@ -18,7 +18,8 @@
for item in old.iter_lazy() {
new.push(item);
}
- new.push(LazyVal::new_resolved(val.clone()));
+
+ new.push(Thunk::evaluated(val.clone()));
*arr = Val::Arr(ArrValue::Lazy(Cc::new(new)));
}
_ => panic!("should receive array"),
cmds/jrsonnet/Cargo.tomldiffbeforeafterboth--- a/cmds/jrsonnet/Cargo.toml
+++ b/cmds/jrsonnet/Cargo.toml
@@ -16,6 +16,8 @@
"jrsonnet-evaluator/exp-serde-preserve-order",
"jrsonnet-cli/exp-preserve-order",
]
+# Destructuring of locals
+exp-destruct = ["jrsonnet-evaluator/exp-destruct"]
[dependencies]
jrsonnet-evaluator = { path = "../../crates/jrsonnet-evaluator", version = "0.4.2" }
crates/jrsonnet-evaluator/Cargo.tomldiffbeforeafterboth--- a/crates/jrsonnet-evaluator/Cargo.toml
+++ b/crates/jrsonnet-evaluator/Cargo.toml
@@ -18,6 +18,8 @@
# Allows to preserve field order in objects
exp-preserve-order = []
exp-serde-preserve-order = ["serde_json/preserve_order"]
+# Implements field destructuring
+exp-destruct = []
[dependencies]
jrsonnet-interner = { path = "../jrsonnet-interner", version = "0.4.2" }
crates/jrsonnet-evaluator/src/ctx.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/ctx.rs
+++ b/crates/jrsonnet-evaluator/src/ctx.rs
@@ -4,12 +4,12 @@
use jrsonnet_interner::IStr;
use crate::{
- cc_ptr_eq, error::Error::*, gc::GcHashMap, map::LayeredHashMap, FutureWrapper, LazyBinding,
- LazyVal, ObjValue, Result, State, Val,
+ cc_ptr_eq, error::Error::*, gc::GcHashMap, map::LayeredHashMap, LazyBinding, ObjValue, Pending,
+ Result, State, Thunk, Val,
};
#[derive(Clone, Trace)]
-pub struct ContextCreator(pub Context, pub FutureWrapper<GcHashMap<IStr, LazyBinding>>);
+pub struct ContextCreator(pub Context, pub Pending<GcHashMap<IStr, LazyBinding>>);
impl ContextCreator {
pub fn create(
&self,
@@ -43,8 +43,8 @@
#[derive(Debug, Clone, Trace)]
pub struct Context(Cc<ContextInternals>);
impl Context {
- pub fn new_future() -> FutureWrapper<Self> {
- FutureWrapper::new()
+ pub fn new_future() -> Pending<Self> {
+ Pending::new()
}
pub fn dollar(&self) -> &Option<ObjValue> {
@@ -68,7 +68,7 @@
}))
}
- pub fn binding(&self, name: IStr) -> Result<LazyVal> {
+ pub fn binding(&self, name: IStr) -> Result<Thunk<Val>> {
Ok(self
.0
.bindings
@@ -80,7 +80,7 @@
self.0.bindings.contains_key(&name)
}
#[must_use]
- pub fn into_future(self, ctx: FutureWrapper<Self>) -> Self {
+ pub fn into_future(self, ctx: Pending<Self>) -> Self {
{
ctx.0.borrow_mut().replace(self);
}
@@ -90,7 +90,7 @@
#[must_use]
pub fn with_var(self, name: IStr, value: Val) -> Self {
let mut new_bindings = GcHashMap::with_capacity(1);
- new_bindings.insert(name, LazyVal::new_resolved(value));
+ new_bindings.insert(name, Thunk::evaluated(value));
self.extend(new_bindings, None, None, None)
}
@@ -102,7 +102,7 @@
#[must_use]
pub fn extend(
self,
- new_bindings: GcHashMap<IStr, LazyVal>,
+ new_bindings: GcHashMap<IStr, Thunk<Val>>,
new_dollar: Option<ObjValue>,
new_this: Option<ObjValue>,
new_super_obj: Option<ObjValue>,
@@ -124,7 +124,7 @@
}))
}
#[must_use]
- pub fn extend_bound(self, new_bindings: GcHashMap<IStr, LazyVal>) -> Self {
+ pub fn extend_bound(self, new_bindings: GcHashMap<IStr, Thunk<Val>>) -> Self {
let new_this = self.0.this.clone();
let new_super_obj = self.0.super_obj.clone();
self.extend(new_bindings, None, new_this, new_super_obj)
crates/jrsonnet-evaluator/src/dynamic.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/dynamic.rs
+++ b/crates/jrsonnet-evaluator/src/dynamic.rs
@@ -3,8 +3,8 @@
use gcmodule::{Cc, Trace};
#[derive(Clone, Trace)]
-pub struct FutureWrapper<V: Trace + 'static>(pub Cc<RefCell<Option<V>>>);
-impl<T: Trace + 'static> FutureWrapper<T> {
+pub struct Pending<V: Trace + 'static>(pub Cc<RefCell<Option<V>>>);
+impl<T: Trace + 'static> Pending<T> {
pub fn new() -> Self {
Self(Cc::new(RefCell::new(None)))
}
@@ -15,7 +15,7 @@
self.0.borrow_mut().replace(value);
}
}
-impl<T: Clone + Trace + 'static> FutureWrapper<T> {
+impl<T: Clone + Trace + 'static> Pending<T> {
/// # Panics
/// If wrapper is not yet filled
pub fn unwrap(&self) -> T {
@@ -23,7 +23,7 @@
}
}
-impl<T: Trace + 'static> Default for FutureWrapper<T> {
+impl<T: Trace + 'static> Default for Pending<T> {
fn default() -> Self {
Self::new()
}
crates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -45,6 +45,9 @@
#[error("variable is not defined: {0}")]
VariableIsNotDefined(IStr),
+ #[error("duplicate local var: {0}")]
+ DuplicateLocalVar(IStr),
+
#[error("type mismatch: expected {}, got {2} {0}", .1.iter().map(|e| format!("{}", e)).collect::<Vec<_>>().join(", "))]
TypeMismatch(&'static str, Vec<ValType>, ValType),
#[error("no such field: {0}")]
crates/jrsonnet-evaluator/src/evaluate/destructure.rsdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-evaluator/src/evaluate/destructure.rs
@@ -0,0 +1,294 @@
+use gcmodule::Trace;
+use jrsonnet_interner::IStr;
+use jrsonnet_parser::{BindSpec, Destruct, LocExpr, ParamsDesc};
+
+use crate::{
+ error::{Error::*, Result},
+ evaluate, evaluate_method,
+ gc::GcHashMap,
+ tb, throw,
+ val::ThunkValue,
+ Context, Pending, State, Thunk, Val,
+};
+
+fn destruct(
+ d: &Destruct,
+ parent: Thunk<Val>,
+ new_bindings: &mut GcHashMap<IStr, Thunk<Val>>,
+) -> Result<()> {
+ Ok(match d {
+ Destruct::Full(v) => {
+ let old = new_bindings.insert(v.clone(), parent);
+ if old.is_some() {
+ throw!(DuplicateLocalVar(v.clone()))
+ }
+ }
+ #[cfg(feature = "exp-destruct")]
+ Destruct::Skip => {}
+ #[cfg(feature = "exp-destruct")]
+ Destruct::Array { start, rest, end } => {
+ use jrsonnet_parser::DestructRest;
+
+ use crate::{throw_runtime, val::ArrValue};
+
+ #[derive(Trace)]
+ struct DataThunk {
+ parent: Thunk<Val>,
+ min_len: usize,
+ has_rest: bool,
+ }
+ impl ThunkValue for DataThunk {
+ type Output = ArrValue;
+
+ fn get(self: Box<Self>, s: State) -> Result<Self::Output> {
+ let v = self.parent.evaluate(s)?;
+ let arr = match v {
+ Val::Arr(a) => a,
+ _ => throw_runtime!("expected array"),
+ };
+ if !self.has_rest {
+ if arr.len() != self.min_len {
+ throw_runtime!("expected {} elements, got {}", self.min_len, arr.len())
+ }
+ } else if arr.len() < self.min_len {
+ throw_runtime!(
+ "expected at least {} elements, but array was only {}",
+ self.min_len,
+ arr.len()
+ )
+ }
+ Ok(arr)
+ }
+ }
+
+ let full = Thunk::new(tb!(DataThunk {
+ min_len: start.len() + end.len(),
+ has_rest: rest.is_some(),
+ parent,
+ }));
+
+ {
+ #[derive(Trace)]
+ struct BaseThunk {
+ full: Thunk<ArrValue>,
+ index: usize,
+ }
+ impl ThunkValue for BaseThunk {
+ type Output = Val;
+
+ fn get(self: Box<Self>, s: State) -> Result<Self::Output> {
+ let full = self.full.evaluate(s.clone())?;
+ Ok(full.get(s, self.index)?.expect("length is checked"))
+ }
+ }
+ for (i, d) in start.iter().enumerate() {
+ destruct(
+ d,
+ Thunk::new(tb!(BaseThunk {
+ full: full.clone(),
+ index: i,
+ })),
+ new_bindings,
+ )?;
+ }
+ }
+
+ match rest {
+ Some(DestructRest::Keep(v)) => {
+ #[derive(Trace)]
+ struct RestThunk {
+ full: Thunk<ArrValue>,
+ start: usize,
+ end: usize,
+ }
+ impl ThunkValue for RestThunk {
+ type Output = Val;
+
+ fn get(self: Box<Self>, s: State) -> Result<Self::Output> {
+ let full = self.full.evaluate(s)?;
+ let to = full.len() - self.end;
+ Ok(Val::Arr(full.slice(Some(self.start), Some(to), None)))
+ }
+ }
+
+ destruct(
+ &Destruct::Full(v.clone()),
+ Thunk::new(tb!(RestThunk {
+ full: full.clone(),
+ start: start.len(),
+ end: end.len(),
+ })),
+ new_bindings,
+ )?;
+ }
+ Some(DestructRest::Drop) => {}
+ None => {}
+ }
+
+ {
+ #[derive(Trace)]
+ struct EndThunk {
+ full: Thunk<ArrValue>,
+ index: usize,
+ end: usize,
+ }
+ impl ThunkValue for EndThunk {
+ type Output = Val;
+
+ fn get(self: Box<Self>, s: State) -> Result<Self::Output> {
+ let full = self.full.evaluate(s.clone())?;
+ Ok(full
+ .get(s, full.len() - self.end + self.index)?
+ .expect("length is checked"))
+ }
+ }
+ for (i, d) in end.iter().enumerate() {
+ destruct(
+ d,
+ Thunk::new(tb!(EndThunk {
+ full: full.clone(),
+ index: i,
+ end: end.len(),
+ })),
+ new_bindings,
+ )?;
+ }
+ }
+ }
+ #[cfg(feature = "exp-destruct")]
+ Destruct::Object { fields, rest } => {
+ use jrsonnet_parser::DestructRest;
+
+ use crate::{obj::ObjValue, throw_runtime};
+
+ #[derive(Trace)]
+ struct DataThunk {
+ parent: Thunk<Val>,
+ field_names: Vec<IStr>,
+ has_rest: bool,
+ }
+ impl ThunkValue for DataThunk {
+ type Output = ObjValue;
+
+ fn get(self: Box<Self>, s: State) -> Result<Self::Output> {
+ let v = self.parent.evaluate(s)?;
+ let obj = match v {
+ Val::Obj(o) => o,
+ _ => throw_runtime!("expected object"),
+ };
+ for field in &self.field_names {
+ if !obj.has_field_ex(field.clone(), true) {
+ throw_runtime!("missing field: {}", field);
+ }
+ }
+ if !self.has_rest {
+ let len = obj.len();
+ if len != self.field_names.len() {
+ throw_runtime!("too many fields, and rest not found");
+ }
+ }
+ Ok(obj)
+ }
+ }
+ let field_names: Vec<_> = fields.iter().map(|f| f.0.clone()).collect();
+ let full = Thunk::new(tb!(DataThunk {
+ parent,
+ field_names: field_names.clone(),
+ has_rest: rest.is_some()
+ }));
+
+ for (field, d) in fields {
+ #[derive(Trace)]
+ struct FieldThunk {
+ full: Thunk<ObjValue>,
+ field: IStr,
+ }
+ impl ThunkValue for FieldThunk {
+ type Output = Val;
+
+ fn get(self: Box<Self>, s: State) -> Result<Self::Output> {
+ let full = self.full.evaluate(s.clone())?;
+ let field = full.get(s, self.field)?.expect("shape is checked");
+ Ok(field)
+ }
+ }
+ let value = Thunk::new(tb!(FieldThunk {
+ full: full.clone(),
+ field: field.clone()
+ }));
+ if let Some(d) = d {
+ destruct(d, value, new_bindings)?;
+ } else {
+ destruct(&Destruct::Full(field.clone()), value, new_bindings)?;
+ }
+ }
+ }
+ })
+}
+
+pub fn evaluate_dest(
+ d: &BindSpec,
+ fctx: Pending<Context>,
+ new_bindings: &mut GcHashMap<IStr, Thunk<Val>>,
+) -> Result<()> {
+ match d {
+ BindSpec::Field { into, value } => {
+ #[derive(Trace)]
+ struct EvaluateThunkValue {
+ fctx: Pending<Context>,
+ expr: LocExpr,
+ }
+ impl ThunkValue for EvaluateThunkValue {
+ type Output = Val;
+ fn get(self: Box<Self>, s: State) -> Result<Self::Output> {
+ evaluate(s, self.fctx.unwrap(), &self.expr)
+ }
+ }
+ // TODO: Generate some name, as destructure spec may be used with plain functions
+ let data = Thunk::new(tb!(EvaluateThunkValue {
+ fctx,
+ expr: value.clone(),
+ }));
+ destruct(into, data, new_bindings)?;
+ }
+ BindSpec::Function {
+ name,
+ params,
+ value,
+ } => {
+ #[derive(Trace)]
+ struct MethodThunk {
+ fctx: Pending<Context>,
+ name: IStr,
+ params: ParamsDesc,
+ value: LocExpr,
+ }
+ impl ThunkValue for MethodThunk {
+ type Output = Val;
+
+ fn get(self: Box<Self>, _s: State) -> Result<Self::Output> {
+ Ok(evaluate_method(
+ self.fctx.unwrap(),
+ self.name,
+ self.params,
+ self.value,
+ ))
+ }
+ }
+
+ let old = new_bindings.insert(
+ name.clone(),
+ Thunk::new(tb!(MethodThunk {
+ fctx,
+ name: name.clone(),
+ params: params.clone(),
+ value: value.clone()
+ })),
+ );
+ if old.is_some() {
+ throw!(DuplicateLocalVar(name.clone()))
+ }
+ }
+ }
+ Ok(())
+}
crates/jrsonnet-evaluator/src/evaluate/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate/mod.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/mod.rs
@@ -1,189 +1,157 @@
use gcmodule::{Cc, Trace};
use jrsonnet_interner::IStr;
use jrsonnet_parser::{
- ArgsDesc, AssertStmt, BindSpec, CompSpec, Expr, FieldMember, ForSpecData, IfSpecData,
+ ArgsDesc, AssertStmt, BindSpec, CompSpec, Destruct, Expr, FieldMember, ForSpecData, IfSpecData,
LiteralType, LocExpr, Member, ObjBody, ParamsDesc,
};
use jrsonnet_types::ValType;
use crate::{
+ destructure::evaluate_dest,
error::Error::*,
evaluate::operator::{evaluate_add_op, evaluate_binary_op_special, evaluate_unary_op},
function::{CallLocation, FuncDesc, FuncVal},
- gc::TraceBox,
stdlib::{std_slice, BUILTINS},
- throw,
+ tb, throw,
typed::Typed,
- val::{ArrValue, LazyValValue},
- Bindable, Context, ContextCreator, FutureWrapper, GcHashMap, LazyBinding, LazyVal, ObjValue,
- ObjValueBuilder, ObjectAssertion, Result, State, Val,
+ val::{ArrValue, Thunk, ThunkValue},
+ Bindable, Context, ContextCreator, GcHashMap, LazyBinding, ObjValue, ObjValueBuilder,
+ ObjectAssertion, Pending, Result, State, Val,
};
+pub mod destructure;
pub mod operator;
-pub fn evaluate_binding_in_future(b: &BindSpec, fctx: FutureWrapper<Context>) -> LazyVal {
- let b = b.clone();
- if let Some(params) = &b.params {
- #[derive(Trace)]
- struct LazyMethodBinding {
- fctx: FutureWrapper<Context>,
- name: IStr,
- params: ParamsDesc,
- value: LocExpr,
- }
- impl LazyValValue for LazyMethodBinding {
- fn get(self: Box<Self>, _: State) -> Result<Val> {
- Ok(evaluate_method(
- self.fctx.unwrap(),
- self.name,
- self.params,
- self.value,
- ))
+#[allow(clippy::too_many_lines)]
+pub fn evaluate_binding(b: BindSpec, cctx: ContextCreator) -> Result<(IStr, LazyBinding)> {
+ match b {
+ BindSpec::Field {
+ into: Destruct::Full(name),
+ value,
+ } => {
+ #[derive(Trace)]
+ struct BindableNamedThunk {
+ this: Option<ObjValue>,
+ super_obj: Option<ObjValue>,
+
+ cctx: ContextCreator,
+ name: IStr,
+ value: LocExpr,
}
- }
+ impl ThunkValue for BindableNamedThunk {
+ type Output = Val;
+ fn get(self: Box<Self>, s: State) -> Result<Val> {
+ evaluate_named(
+ s.clone(),
+ self.cctx.create(s, self.this, self.super_obj)?,
+ &self.value,
+ self.name,
+ )
+ }
+ }
- let params = params.clone();
+ #[derive(Trace)]
+ struct BindableNamed {
+ cctx: ContextCreator,
+ name: IStr,
+ value: LocExpr,
+ }
+ impl Bindable for BindableNamed {
+ fn bind(
+ &self,
+ _: State,
+ this: Option<ObjValue>,
+ super_obj: Option<ObjValue>,
+ ) -> Result<Thunk<Val>> {
+ Ok(Thunk::new(tb!(BindableNamedThunk {
+ this,
+ super_obj,
- LazyVal::new(TraceBox(Box::new(LazyMethodBinding {
- fctx,
- name: b.name.clone(),
- params,
- value: b.value.clone(),
- })))
- } else {
- #[derive(Trace)]
- struct LazyNamedBinding {
- fctx: FutureWrapper<Context>,
- name: IStr,
- value: LocExpr,
- }
- impl LazyValValue for LazyNamedBinding {
- fn get(self: Box<Self>, s: State) -> Result<Val> {
- evaluate_named(s, self.fctx.unwrap(), &self.value, self.name)
+ cctx: self.cctx.clone(),
+ name: self.name.clone(),
+ value: self.value.clone(),
+ })))
+ }
}
- }
- LazyVal::new(TraceBox(Box::new(LazyNamedBinding {
- fctx,
- name: b.name.clone(),
- value: b.value,
- })))
- }
-}
-#[allow(clippy::too_many_lines)]
-pub fn evaluate_binding(b: &BindSpec, cctx: ContextCreator) -> (IStr, LazyBinding) {
- let b = b.clone();
- if let Some(params) = &b.params {
- #[derive(Trace)]
- struct BindableMethodLazyVal {
- this: Option<ObjValue>,
- super_obj: Option<ObjValue>,
-
- cctx: ContextCreator,
- name: IStr,
- params: ParamsDesc,
- value: LocExpr,
- }
- impl LazyValValue for BindableMethodLazyVal {
- fn get(self: Box<Self>, s: State) -> Result<Val> {
- Ok(evaluate_method(
- self.cctx.create(s, self.this, self.super_obj)?,
- self.name,
- self.params,
- self.value,
- ))
- }
+ Ok((
+ name.clone(),
+ LazyBinding::Bindable(Cc::new(tb!(BindableNamed {
+ cctx,
+ name: name.clone(),
+ value: value.clone(),
+ }))),
+ ))
}
-
- #[derive(Trace)]
- struct BindableMethod {
- cctx: ContextCreator,
- name: IStr,
- params: ParamsDesc,
- value: LocExpr,
+ #[cfg(feature = "exp-destruct")]
+ BindSpec::Field { into: _, .. } => {
+ use crate::throw_runtime;
+ throw_runtime!("destructuring is not yet supported here")
}
- impl Bindable for BindableMethod {
- fn bind(
- &self,
- _: State,
+ BindSpec::Function {
+ name,
+ params,
+ value,
+ } => {
+ #[derive(Trace)]
+ struct BindableMethodThunk {
this: Option<ObjValue>,
super_obj: Option<ObjValue>,
- ) -> Result<LazyVal> {
- Ok(LazyVal::new(TraceBox(Box::new(BindableMethodLazyVal {
- this,
- super_obj,
- cctx: self.cctx.clone(),
- name: self.name.clone(),
- params: self.params.clone(),
- value: self.value.clone(),
- }))))
+ cctx: ContextCreator,
+ name: IStr,
+ params: ParamsDesc,
+ value: LocExpr,
}
- }
+ impl ThunkValue for BindableMethodThunk {
+ type Output = Val;
+ fn get(self: Box<Self>, s: State) -> Result<Val> {
+ Ok(evaluate_method(
+ self.cctx.create(s, self.this, self.super_obj)?,
+ self.name,
+ self.params,
+ self.value,
+ ))
+ }
+ }
- let params = params.clone();
-
- (
- b.name.clone(),
- LazyBinding::Bindable(Cc::new(TraceBox(Box::new(BindableMethod {
- cctx,
- name: b.name.clone(),
- params,
- value: b.value.clone(),
- })))),
- )
- } else {
- #[derive(Trace)]
- struct BindableNamedLazyVal {
- this: Option<ObjValue>,
- super_obj: Option<ObjValue>,
+ #[derive(Trace)]
+ struct BindableMethod {
+ cctx: ContextCreator,
+ name: IStr,
+ params: ParamsDesc,
+ value: LocExpr,
+ }
+ impl Bindable for BindableMethod {
+ fn bind(
+ &self,
+ _: State,
+ this: Option<ObjValue>,
+ super_obj: Option<ObjValue>,
+ ) -> Result<Thunk<Val>> {
+ Ok(Thunk::<Val>::new(tb!(BindableMethodThunk {
+ this,
+ super_obj,
- cctx: ContextCreator,
- name: IStr,
- value: LocExpr,
- }
- impl LazyValValue for BindableNamedLazyVal {
- fn get(self: Box<Self>, s: State) -> Result<Val> {
- evaluate_named(
- s.clone(),
- self.cctx.create(s, self.this, self.super_obj)?,
- &self.value,
- self.name,
- )
+ cctx: self.cctx.clone(),
+ name: self.name.clone(),
+ params: self.params.clone(),
+ value: self.value.clone(),
+ })))
+ }
}
- }
- #[derive(Trace)]
- struct BindableNamed {
- cctx: ContextCreator,
- name: IStr,
- value: LocExpr,
- }
- impl Bindable for BindableNamed {
- fn bind(
- &self,
- _: State,
- this: Option<ObjValue>,
- super_obj: Option<ObjValue>,
- ) -> Result<LazyVal> {
- Ok(LazyVal::new(TraceBox(Box::new(BindableNamedLazyVal {
- this,
- super_obj,
+ let params = params.clone();
- cctx: self.cctx.clone(),
- name: self.name.clone(),
- value: self.value.clone(),
- }))))
- }
+ Ok((
+ name.clone(),
+ LazyBinding::Bindable(Cc::new(tb!(BindableMethod {
+ cctx,
+ name: name.clone(),
+ params,
+ value,
+ }))),
+ ))
}
-
- (
- b.name.clone(),
- LazyBinding::Bindable(Cc::new(TraceBox(Box::new(BindableNamed {
- cctx,
- name: b.name.clone(),
- value: b.value.clone(),
- })))),
- )
}
}
@@ -252,19 +220,20 @@
#[allow(clippy::too_many_lines)]
pub fn evaluate_member_list_object(s: State, ctx: Context, members: &[Member]) -> Result<ObjValue> {
- let new_bindings = FutureWrapper::new();
- let future_this = FutureWrapper::new();
+ let new_bindings = Pending::new();
+ let future_this = Pending::new();
let cctx = ContextCreator(ctx.clone(), new_bindings.clone());
{
let mut bindings: GcHashMap<IStr, LazyBinding> = GcHashMap::with_capacity(members.len());
- for (n, b) in members
+ for r in members
.iter()
.filter_map(|m| match m {
Member::BindStmt(b) => Some(b.clone()),
_ => None,
})
- .map(|b| evaluate_binding(&b, cctx.clone()))
+ .map(|b| evaluate_binding(b.clone(), cctx.clone()))
{
+ let (n, b) = r?;
bindings.insert(n, b);
}
new_bindings.fill(bindings);
@@ -292,8 +261,8 @@
s: State,
this: Option<ObjValue>,
super_obj: Option<ObjValue>,
- ) -> Result<LazyVal> {
- Ok(LazyVal::new_resolved(evaluate_named(
+ ) -> Result<Thunk<Val>> {
+ Ok(Thunk::evaluated(evaluate_named(
s.clone(),
self.cctx.create(s, this, super_obj)?,
&self.value,
@@ -316,11 +285,11 @@
.with_location(value.1.clone())
.bindable(
s.clone(),
- TraceBox(Box::new(ObjMemberBinding {
+ tb!(ObjMemberBinding {
cctx: cctx.clone(),
value: value.clone(),
name,
- })),
+ }),
)?;
}
Member::Field(FieldMember {
@@ -342,8 +311,8 @@
s: State,
this: Option<ObjValue>,
super_obj: Option<ObjValue>,
- ) -> Result<LazyVal> {
- Ok(LazyVal::new_resolved(evaluate_method(
+ ) -> Result<Thunk<Val>> {
+ Ok(Thunk::evaluated(evaluate_method(
self.cctx.create(s, this, super_obj)?,
self.name.clone(),
self.params.clone(),
@@ -364,12 +333,12 @@
.with_location(value.1.clone())
.bindable(
s.clone(),
- TraceBox(Box::new(ObjMemberBinding {
+ tb!(ObjMemberBinding {
cctx: cctx.clone(),
value: value.clone(),
params: params.clone(),
name,
- })),
+ }),
)?;
}
Member::BindStmt(_) => {}
@@ -390,10 +359,10 @@
evaluate_assert(s, ctx, &self.assert)
}
}
- builder.assert(TraceBox(Box::new(ObjectAssert {
+ builder.assert(tb!(ObjectAssert {
cctx: cctx.clone(),
assert: stmt.clone(),
- })));
+ }));
}
}
}
@@ -406,19 +375,20 @@
Ok(match object {
ObjBody::MemberList(members) => evaluate_member_list_object(s, ctx, members)?,
ObjBody::ObjComp(obj) => {
- let future_this = FutureWrapper::new();
+ let future_this = Pending::new();
let mut builder = ObjValueBuilder::new();
evaluate_comp(s.clone(), ctx, &obj.compspecs, &mut |ctx| {
- let new_bindings = FutureWrapper::new();
+ let new_bindings = Pending::new();
let cctx = ContextCreator(ctx.clone(), new_bindings.clone());
let mut bindings: GcHashMap<IStr, LazyBinding> =
GcHashMap::with_capacity(obj.pre_locals.len() + obj.post_locals.len());
- for (n, b) in obj
+ for r in obj
.pre_locals
.iter()
.chain(obj.post_locals.iter())
- .map(|b| evaluate_binding(b, cctx.clone()))
+ .map(|b| evaluate_binding(b.clone(), cctx.clone()))
{
+ let (n, b) = r?;
bindings.insert(n, b);
}
new_bindings.fill(bindings.clone());
@@ -439,8 +409,8 @@
s: State,
this: Option<ObjValue>,
_super_obj: Option<ObjValue>,
- ) -> Result<LazyVal> {
- Ok(LazyVal::new_resolved(evaluate(
+ ) -> Result<Thunk<Val>> {
+ Ok(Thunk::evaluated(evaluate(
s,
self.ctx.clone().extend(GcHashMap::new(), None, this, None),
&self.value,
@@ -453,10 +423,10 @@
.with_add(obj.plus)
.bindable(
s.clone(),
- TraceBox(Box::new(ObjCompBinding {
+ tb!(ObjCompBinding {
ctx,
value: obj.value.clone(),
- })),
+ }),
)?;
}
v => throw!(FieldMustBeStringGot(v.value_type())),
@@ -620,11 +590,11 @@
}
}
LocalExpr(bindings, returned) => {
- let mut new_bindings: GcHashMap<IStr, LazyVal> =
+ let mut new_bindings: GcHashMap<IStr, Thunk<Val>> =
GcHashMap::with_capacity(bindings.len());
let fctx = Context::new_future();
for b in bindings {
- new_bindings.insert(b.name.clone(), evaluate_binding_in_future(b, fctx.clone()));
+ evaluate_dest(b, fctx.clone(), &mut new_bindings)?;
}
let ctx = ctx.extend_bound(new_bindings).into_future(fctx);
evaluate(s, ctx, &returned.clone())?
@@ -638,15 +608,16 @@
ctx: Context,
item: LocExpr,
}
- impl LazyValValue for ArrayElement {
+ impl ThunkValue for ArrayElement {
+ type Output = Val;
fn get(self: Box<Self>, s: State) -> Result<Val> {
evaluate(s, self.ctx, &self.item)
}
}
- out.push(LazyVal::new(TraceBox(Box::new(ArrayElement {
+ out.push(Thunk::new(tb!(ArrayElement {
ctx: ctx.clone(),
item: item.clone(),
- }))));
+ })));
}
Val::Arr(out.into())
}
crates/jrsonnet-evaluator/src/function/arglike.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/function/arglike.rs
+++ b/crates/jrsonnet-evaluator/src/function/arglike.rs
@@ -5,34 +5,34 @@
use jrsonnet_parser::{ArgsDesc, LocExpr};
use crate::{
- error::Result, evaluate, gc::TraceBox, typed::Typed, val::LazyValValue, Context, LazyVal,
- State, Val,
+ error::Result, evaluate, tb, typed::Typed, val::ThunkValue, Context, State, Thunk, Val,
};
#[derive(Trace)]
-struct EvaluateLazyVal {
+struct EvaluateThunk {
ctx: Context,
expr: LocExpr,
}
-impl LazyValValue for EvaluateLazyVal {
+impl ThunkValue for EvaluateThunk {
+ type Output = Val;
fn get(self: Box<Self>, s: State) -> Result<Val> {
evaluate(s, self.ctx, &self.expr)
}
}
pub trait ArgLike {
- fn evaluate_arg(&self, s: State, ctx: Context, tailstrict: bool) -> Result<LazyVal>;
+ fn evaluate_arg(&self, s: State, ctx: Context, tailstrict: bool) -> Result<Thunk<Val>>;
}
impl ArgLike for &LocExpr {
- fn evaluate_arg(&self, s: State, ctx: Context, tailstrict: bool) -> Result<LazyVal> {
+ fn evaluate_arg(&self, s: State, ctx: Context, tailstrict: bool) -> Result<Thunk<Val>> {
Ok(if tailstrict {
- LazyVal::new_resolved(evaluate(s, ctx, self)?)
+ Thunk::evaluated(evaluate(s, ctx, self)?)
} else {
- LazyVal::new(TraceBox(Box::new(EvaluateLazyVal {
+ Thunk::new(tb!(EvaluateThunk {
ctx,
expr: (*self).clone(),
- })))
+ }))
})
}
}
@@ -41,9 +41,9 @@
where
T: Typed + Clone,
{
- fn evaluate_arg(&self, s: State, _ctx: Context, _tailstrict: bool) -> Result<LazyVal> {
+ fn evaluate_arg(&self, s: State, _ctx: Context, _tailstrict: bool) -> Result<Thunk<Val>> {
let val = T::into_untyped(self.clone(), s)?;
- Ok(LazyVal::new_resolved(val))
+ Ok(Thunk::evaluated(val))
}
}
@@ -53,18 +53,18 @@
Val(Val),
}
impl ArgLike for TlaArg {
- fn evaluate_arg(&self, s: State, ctx: Context, tailstrict: bool) -> Result<LazyVal> {
+ fn evaluate_arg(&self, s: State, ctx: Context, tailstrict: bool) -> Result<Thunk<Val>> {
match self {
- TlaArg::String(s) => Ok(LazyVal::new_resolved(Val::Str(s.clone()))),
+ TlaArg::String(s) => Ok(Thunk::evaluated(Val::Str(s.clone()))),
TlaArg::Code(code) => Ok(if tailstrict {
- LazyVal::new_resolved(evaluate(s, ctx, code)?)
+ Thunk::evaluated(evaluate(s, ctx, code)?)
} else {
- LazyVal::new(TraceBox(Box::new(EvaluateLazyVal {
+ Thunk::new(tb!(EvaluateThunk {
ctx,
expr: code.clone(),
- })))
+ }))
}),
- TlaArg::Val(val) => Ok(LazyVal::new_resolved(val.clone())),
+ TlaArg::Val(val) => Ok(Thunk::evaluated(val.clone())),
}
}
}
@@ -83,14 +83,14 @@
s: State,
ctx: Context,
tailstrict: bool,
- handler: &mut dyn FnMut(usize, LazyVal) -> Result<()>,
+ handler: &mut dyn FnMut(usize, Thunk<Val>) -> Result<()>,
) -> Result<()>;
fn named_iter(
&self,
s: State,
ctx: Context,
tailstrict: bool,
- handler: &mut dyn FnMut(&IStr, LazyVal) -> Result<()>,
+ handler: &mut dyn FnMut(&IStr, Thunk<Val>) -> Result<()>,
) -> Result<()>;
fn named_names(&self, handler: &mut dyn FnMut(&IStr));
}
@@ -105,18 +105,18 @@
s: State,
ctx: Context,
tailstrict: bool,
- handler: &mut dyn FnMut(usize, LazyVal) -> Result<()>,
+ handler: &mut dyn FnMut(usize, Thunk<Val>) -> Result<()>,
) -> Result<()> {
for (id, arg) in self.unnamed.iter().enumerate() {
handler(
id,
if tailstrict {
- LazyVal::new_resolved(evaluate(s.clone(), ctx.clone(), arg)?)
+ Thunk::evaluated(evaluate(s.clone(), ctx.clone(), arg)?)
} else {
- LazyVal::new(TraceBox(Box::new(EvaluateLazyVal {
+ Thunk::new(tb!(EvaluateThunk {
ctx: ctx.clone(),
expr: arg.clone(),
- })))
+ }))
},
)?;
}
@@ -128,18 +128,18 @@
s: State,
ctx: Context,
tailstrict: bool,
- handler: &mut dyn FnMut(&IStr, LazyVal) -> Result<()>,
+ handler: &mut dyn FnMut(&IStr, Thunk<Val>) -> Result<()>,
) -> Result<()> {
for (name, arg) in &self.named {
handler(
name,
if tailstrict {
- LazyVal::new_resolved(evaluate(s.clone(), ctx.clone(), arg)?)
+ Thunk::evaluated(evaluate(s.clone(), ctx.clone(), arg)?)
} else {
- LazyVal::new(TraceBox(Box::new(EvaluateLazyVal {
+ Thunk::new(tb!(EvaluateThunk {
ctx: ctx.clone(),
expr: arg.clone(),
- })))
+ }))
},
)?;
}
@@ -164,7 +164,7 @@
_s: State,
_ctx: Context,
_tailstrict: bool,
- _handler: &mut dyn FnMut(usize, LazyVal) -> Result<()>,
+ _handler: &mut dyn FnMut(usize, Thunk<Val>) -> Result<()>,
) -> Result<()> {
Ok(())
}
@@ -174,7 +174,7 @@
s: State,
ctx: Context,
tailstrict: bool,
- handler: &mut dyn FnMut(&IStr, LazyVal) -> Result<()>,
+ handler: &mut dyn FnMut(&IStr, Thunk<Val>) -> Result<()>,
) -> Result<()> {
for (name, value) in self.iter() {
handler(
@@ -205,7 +205,7 @@
s: State,
ctx: Context,
tailstrict: bool,
- handler: &mut dyn FnMut(usize, LazyVal) -> Result<()>,
+ handler: &mut dyn FnMut(usize, Thunk<Val>) -> Result<()>,
) -> Result<()> {
let mut i = 0usize;
let ($($gen,)*) = self;
@@ -220,7 +220,7 @@
_s: State,
_ctx: Context,
_tailstrict: bool,
- _handler: &mut dyn FnMut(&IStr, LazyVal) -> Result<()>,
+ _handler: &mut dyn FnMut(&IStr, Thunk<Val>) -> Result<()>,
) -> Result<()> {
Ok(())
}
@@ -236,7 +236,7 @@
_s: State,
_ctx: Context,
_tailstrict: bool,
- _handler: &mut dyn FnMut(usize, LazyVal) -> Result<()>,
+ _handler: &mut dyn FnMut(usize, Thunk<Val>) -> Result<()>,
) -> Result<()> {
Ok(())
}
@@ -246,7 +246,7 @@
s: State,
ctx: Context,
tailstrict: bool,
- handler: &mut dyn FnMut(&IStr, LazyVal) -> Result<()>,
+ handler: &mut dyn FnMut(&IStr, Thunk<Val>) -> Result<()>,
) -> Result<()> {
let ($($gen,)*) = self;
$(
@@ -285,7 +285,7 @@
_s: State,
_ctx: Context,
_tailstrict: bool,
- _handler: &mut dyn FnMut(usize, LazyVal) -> Result<()>,
+ _handler: &mut dyn FnMut(usize, Thunk<Val>) -> Result<()>,
) -> Result<()> {
Ok(())
}
@@ -295,7 +295,7 @@
_s: State,
_ctx: Context,
_tailstrict: bool,
- _handler: &mut dyn FnMut(&IStr, LazyVal) -> Result<()>,
+ _handler: &mut dyn FnMut(&IStr, Thunk<Val>) -> Result<()>,
) -> Result<()> {
Ok(())
}
crates/jrsonnet-evaluator/src/function/parse.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/function/parse.rs
+++ b/crates/jrsonnet-evaluator/src/function/parse.rs
@@ -9,20 +9,21 @@
use crate::{
error::{Error::*, Result},
evaluate_named,
- gc::{GcHashMap, TraceBox},
- throw,
- val::LazyValValue,
- Context, FutureWrapper, LazyVal, State, Val,
+ gc::GcHashMap,
+ tb, throw,
+ val::ThunkValue,
+ Context, Pending, State, Thunk, Val,
};
#[derive(Trace)]
-struct EvaluateNamedLazyVal {
- ctx: FutureWrapper<Context>,
+struct EvaluateNamedThunk {
+ ctx: Pending<Context>,
name: IStr,
value: LocExpr,
}
-impl LazyValValue for EvaluateNamedLazyVal {
+impl ThunkValue for EvaluateNamedThunk {
+ type Output = Val;
fn get(self: Box<Self>, s: State) -> Result<Val> {
evaluate_named(s, self.ctx.unwrap(), &self.value, self.name)
}
@@ -83,11 +84,11 @@
defaults.insert(
param.0.clone(),
- LazyVal::new(TraceBox(Box::new(EvaluateNamedLazyVal {
+ Thunk::new(tb!(EvaluateNamedThunk {
ctx: fctx.clone(),
name: param.0.clone(),
value: param.1.clone().expect("default exists"),
- }))),
+ })),
);
filled_args += 1;
}
@@ -131,7 +132,7 @@
params: &[BuiltinParam],
args: &dyn ArgsLike,
tailstrict: bool,
-) -> Result<GcHashMap<BuiltinParamName, LazyVal>> {
+) -> Result<GcHashMap<BuiltinParamName, Thunk<Val>>> {
let mut passed_args = GcHashMap::with_capacity(params.len());
if args.unnamed_len() > params.len() {
throw!(TooManyArgsFunctionHas(params.len()))
@@ -191,7 +192,8 @@
pub fn parse_default_function_call(body_ctx: Context, params: &ParamsDesc) -> Context {
#[derive(Trace)]
struct DependsOnUnbound(IStr);
- impl LazyValValue for DependsOnUnbound {
+ impl ThunkValue for DependsOnUnbound {
+ type Output = Val;
fn get(self: Box<Self>, _: State) -> Result<Val> {
Err(FunctionParameterNotBoundInCall(self.0.clone()).into())
}
@@ -205,16 +207,16 @@
if let Some(v) = ¶m.1 {
bindings.insert(
param.0.clone(),
- LazyVal::new(TraceBox(Box::new(EvaluateNamedLazyVal {
+ Thunk::new(tb!(EvaluateNamedThunk {
ctx: fctx.clone(),
name: param.0.clone(),
value: v.clone(),
- }))),
+ })),
);
} else {
bindings.insert(
param.0.clone(),
- LazyVal::new(TraceBox(Box::new(DependsOnUnbound(param.0.clone())))),
+ Thunk::new(tb!(DependsOnUnbound(param.0.clone()))),
);
}
}
crates/jrsonnet-evaluator/src/gc.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/gc.rs
+++ b/crates/jrsonnet-evaluator/src/gc.rs
@@ -10,8 +10,15 @@
use rustc_hash::{FxHashMap, FxHashSet};
/// Replacement for box, which assumes that the underlying type is [`Trace`]
+/// Used in places, where Cc<dyn Trait> should be used instead, but it can't, because CoerceUnsiced is not stable
#[derive(Debug, Clone)]
pub struct TraceBox<T: ?Sized>(pub Box<T>);
+#[macro_export]
+macro_rules! tb {
+ ($v:expr) => {
+ $crate::gc::TraceBox(Box::new($v))
+ };
+}
impl<T: ?Sized + Trace> Trace for TraceBox<T> {
fn trace(&self, tracer: &mut Tracer) {
crates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -58,7 +58,7 @@
use jrsonnet_parser::*;
pub use obj::*;
use trace::{location_to_offset, offset_to_location, CodeLocation, CompactFormat, TraceFormat};
-pub use val::{LazyVal, ManifestFormat, Val};
+pub use val::{ManifestFormat, Thunk, Val};
pub trait Bindable: Trace + 'static {
fn bind(
@@ -66,13 +66,13 @@
s: State,
this: Option<ObjValue>,
super_obj: Option<ObjValue>,
- ) -> Result<LazyVal>;
+ ) -> Result<Thunk<Val>>;
}
#[derive(Clone, Trace)]
pub enum LazyBinding {
Bindable(Cc<TraceBox<dyn Bindable>>),
- Bound(LazyVal),
+ Bound(Thunk<Val>),
}
impl Debug for LazyBinding {
@@ -86,7 +86,7 @@
s: State,
this: Option<ObjValue>,
super_obj: Option<ObjValue>,
- ) -> Result<LazyVal> {
+ ) -> Result<Thunk<Val>> {
match self {
Self::Bindable(v) => v.bind(s, this, super_obj),
Self::Bound(v) => Ok(v.clone()),
@@ -343,7 +343,7 @@
let globals = &self.settings().globals;
let mut new_bindings = GcHashMap::with_capacity(globals.len());
for (name, value) in globals.iter() {
- new_bindings.insert(name.clone(), LazyVal::new_resolved(value.clone()));
+ new_bindings.insert(name.clone(), Thunk::evaluated(value.clone()));
}
Context::new().extend_bound(new_bindings)
}
crates/jrsonnet-evaluator/src/map.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/map.rs
+++ b/crates/jrsonnet-evaluator/src/map.rs
@@ -1,27 +1,27 @@
use gcmodule::{Cc, Trace};
use jrsonnet_interner::IStr;
-use crate::{GcHashMap, LazyVal};
+use crate::{GcHashMap, Thunk, Val};
#[derive(Trace)]
#[force_tracking]
pub struct LayeredHashMapInternals {
parent: Option<LayeredHashMap>,
- current: GcHashMap<IStr, LazyVal>,
+ current: GcHashMap<IStr, Thunk<Val>>,
}
#[derive(Trace)]
pub struct LayeredHashMap(Cc<LayeredHashMapInternals>);
impl LayeredHashMap {
- pub fn extend(self, new_layer: GcHashMap<IStr, LazyVal>) -> Self {
+ pub fn extend(self, new_layer: GcHashMap<IStr, Thunk<Val>>) -> Self {
Self(Cc::new(LayeredHashMapInternals {
parent: Some(self),
current: new_layer,
}))
}
- pub fn get(&self, key: &IStr) -> Option<&LazyVal> {
+ pub fn get(&self, key: &IStr) -> Option<&Thunk<Val>> {
(self.0)
.current
.get(key)
crates/jrsonnet-evaluator/src/obj.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -16,7 +16,7 @@
function::CallLocation,
gc::{GcHashMap, GcHashSet, TraceBox},
operator::evaluate_add_op,
- throw, weak_ptr_eq, weak_raw, Bindable, LazyBinding, LazyVal, Result, State, Val,
+ throw, weak_ptr_eq, weak_raw, Bindable, LazyBinding, Result, State, Thunk, Val,
};
#[cfg(not(feature = "exp-preserve-order"))]
@@ -581,7 +581,7 @@
pub struct ValueBuilder<'v>(&'v mut ObjValueBuilder);
impl<'v> ObjMemberBuilder<ValueBuilder<'v>> {
pub fn value(self, s: State, value: Val) -> Result<()> {
- self.binding(s, LazyBinding::Bound(LazyVal::new_resolved(value)))
+ self.binding(s, LazyBinding::Bound(Thunk::evaluated(value)))
}
pub fn bindable(self, s: State, bindable: TraceBox<dyn Bindable>) -> Result<()> {
self.binding(s, LazyBinding::Bindable(Cc::new(bindable)))
@@ -604,7 +604,7 @@
pub struct ExtendBuilder<'v>(&'v mut ObjValue);
impl<'v> ObjMemberBuilder<ExtendBuilder<'v>> {
pub fn value(self, value: Val) {
- self.binding(LazyBinding::Bound(LazyVal::new_resolved(value)));
+ self.binding(LazyBinding::Bound(Thunk::evaluated(value)));
}
pub fn bindable(self, bindable: TraceBox<dyn Bindable>) {
self.binding(LazyBinding::Bindable(Cc::new(bindable)));
crates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -15,41 +15,45 @@
throw, ObjValue, Result, State,
};
-pub trait LazyValValue: Trace {
- fn get(self: Box<Self>, s: State) -> Result<Val>;
+pub trait ThunkValue: Trace {
+ type Output;
+ fn get(self: Box<Self>, s: State) -> Result<Self::Output>;
}
#[derive(Trace)]
-enum LazyValInternals {
- Computed(Val),
+enum ThunkInner<T> {
+ Computed(T),
Errored(LocError),
- Waiting(TraceBox<dyn LazyValValue>),
+ Waiting(TraceBox<dyn ThunkValue<Output = T>>),
Pending,
}
#[allow(clippy::module_name_repetitions)]
#[derive(Clone, Trace)]
-pub struct LazyVal(Cc<RefCell<LazyValInternals>>);
-impl LazyVal {
- pub fn new(f: TraceBox<dyn LazyValValue>) -> Self {
- Self(Cc::new(RefCell::new(LazyValInternals::Waiting(f))))
+pub struct Thunk<T>(Cc<RefCell<ThunkInner<T>>>);
+impl<T> Thunk<T>
+where
+ T: Clone + Trace,
+{
+ pub fn new(f: TraceBox<dyn ThunkValue<Output = T>>) -> Self {
+ Self(Cc::new(RefCell::new(ThunkInner::Waiting(f))))
}
- pub fn new_resolved(val: Val) -> Self {
- Self(Cc::new(RefCell::new(LazyValInternals::Computed(val))))
+ pub fn evaluated(val: T) -> Self {
+ Self(Cc::new(RefCell::new(ThunkInner::Computed(val))))
}
pub fn force(&self, s: State) -> Result<()> {
self.evaluate(s)?;
Ok(())
}
- pub fn evaluate(&self, s: State) -> Result<Val> {
+ pub fn evaluate(&self, s: State) -> Result<T> {
match &*self.0.borrow() {
- LazyValInternals::Computed(v) => return Ok(v.clone()),
- LazyValInternals::Errored(e) => return Err(e.clone()),
- LazyValInternals::Pending => return Err(InfiniteRecursionDetected.into()),
- LazyValInternals::Waiting(..) => (),
+ ThunkInner::Computed(v) => return Ok(v.clone()),
+ ThunkInner::Errored(e) => return Err(e.clone()),
+ ThunkInner::Pending => return Err(InfiniteRecursionDetected.into()),
+ ThunkInner::Waiting(..) => (),
};
- let value = if let LazyValInternals::Waiting(value) =
- std::mem::replace(&mut *self.0.borrow_mut(), LazyValInternals::Pending)
+ let value = if let ThunkInner::Waiting(value) =
+ std::mem::replace(&mut *self.0.borrow_mut(), ThunkInner::Pending)
{
value
} else {
@@ -58,21 +62,21 @@
let new_value = match value.0.get(s) {
Ok(v) => v,
Err(e) => {
- *self.0.borrow_mut() = LazyValInternals::Errored(e.clone());
+ *self.0.borrow_mut() = ThunkInner::Errored(e.clone());
return Err(e);
}
};
- *self.0.borrow_mut() = LazyValInternals::Computed(new_value.clone());
+ *self.0.borrow_mut() = ThunkInner::Computed(new_value.clone());
Ok(new_value)
}
}
-impl Debug for LazyVal {
+impl<T: Debug> Debug for Thunk<T> {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "Lazy")
}
}
-impl PartialEq for LazyVal {
+impl<T> PartialEq for Thunk<T> {
fn eq(&self, other: &Self) -> bool {
cc_ptr_eq(&self.0, &other.0)
}
@@ -142,7 +146,7 @@
#[force_tracking]
pub enum ArrValue {
Bytes(#[skip_trace] Rc<[u8]>),
- Lazy(Cc<Vec<LazyVal>>),
+ Lazy(Cc<Vec<Thunk<Val>>>),
Eager(Cc<Vec<Val>>),
Extended(Box<(Self, Self)>),
Range(i32, i32),
@@ -240,13 +244,13 @@
}
}
- pub fn get_lazy(&self, index: usize) -> Option<LazyVal> {
+ pub fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {
match self {
Self::Bytes(i) => i
.get(index)
- .map(|b| LazyVal::new_resolved(Val::Num(f64::from(*b)))),
+ .map(|b| Thunk::evaluated(Val::Num(f64::from(*b)))),
Self::Lazy(vec) => vec.get(index).cloned(),
- Self::Eager(vec) => vec.get(index).cloned().map(LazyVal::new_resolved),
+ Self::Eager(vec) => vec.get(index).cloned().map(Thunk::evaluated),
Self::Extended(v) => {
let a_len = v.0.len();
if a_len > index {
@@ -259,7 +263,7 @@
if index >= self.len() {
return None;
}
- Some(LazyVal::new_resolved(Val::Num(
+ Some(Thunk::evaluated(Val::Num(
((*a as isize) + index as isize) as f64,
)))
}
@@ -343,11 +347,11 @@
})
}
- pub fn iter_lazy(&self) -> impl DoubleEndedIterator<Item = LazyVal> + '_ {
+ pub fn iter_lazy(&self) -> impl DoubleEndedIterator<Item = Thunk<Val>> + '_ {
(0..self.len()).map(move |idx| match self {
- Self::Bytes(b) => LazyVal::new_resolved(Val::Num(f64::from(b[idx]))),
+ Self::Bytes(b) => Thunk::evaluated(Val::Num(f64::from(b[idx]))),
Self::Lazy(l) => l[idx].clone(),
- Self::Eager(e) => LazyVal::new_resolved(e[idx].clone()),
+ Self::Eager(e) => Thunk::evaluated(e[idx].clone()),
Self::Slice(..) | Self::Extended(..) | Self::Range(..) | Self::Reversed(..) => {
self.get_lazy(idx).expect("idx < len")
}
@@ -391,8 +395,8 @@
}
}
-impl From<Vec<LazyVal>> for ArrValue {
- fn from(v: Vec<LazyVal>) -> Self {
+impl From<Vec<Thunk<Val>>> for ArrValue {
+ fn from(v: Vec<Thunk<Val>>) -> Self {
Self::Lazy(Cc::new(v))
}
}
crates/jrsonnet-evaluator/tests/builtin.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/tests/builtin.rs
+++ b/crates/jrsonnet-evaluator/tests/builtin.rs
@@ -7,6 +7,7 @@
error::Result,
function::{builtin, builtin::Builtin, CallLocation, FuncVal},
gc::TraceBox,
+ tb,
typed::Typed,
State, Val,
};
@@ -70,9 +71,7 @@
#[builtin]
fn curry_add(a: u32) -> Result<FuncVal> {
- Ok(FuncVal::Builtin(Cc::new(TraceBox(Box::new(curried_add {
- a,
- })))))
+ Ok(FuncVal::Builtin(Cc::new(tb!(curried_add { a }))))
}
#[test]
crates/jrsonnet-evaluator/tests/common.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/tests/common.rs
+++ b/crates/jrsonnet-evaluator/tests/common.rs
@@ -1,7 +1,7 @@
use jrsonnet_evaluator::{
error::Result,
function::{builtin, FuncVal},
- throw_runtime, LazyVal, ObjValueBuilder, State, Val,
+ throw_runtime, ObjValueBuilder, State, Thunk, Val,
};
#[macro_export]
@@ -38,7 +38,7 @@
}
#[builtin]
-fn assert_throw(s: State, lazy: LazyVal, message: String) -> Result<bool> {
+fn assert_throw(s: State, lazy: Thunk<Val>, message: String) -> Result<bool> {
match lazy.evaluate(s) {
Ok(_) => {
throw_runtime!("expected argument to throw on evaluation, but it returned instead")
crates/jrsonnet-macros/src/lib.rsdiffbeforeafterboth1use proc_macro2::TokenStream;2use quote::quote;3use syn::{4 parenthesized,5 parse::{Parse, ParseStream},6 parse_macro_input,7 punctuated::Punctuated,8 spanned::Spanned,9 token::{self, Comma},10 Attribute, DeriveInput, Error, FnArg, GenericArgument, Ident, ItemFn, LitStr, Pat, Path,11 PathArguments, Result, ReturnType, Token, Type,12};1314fn parse_attr<A: Parse, I>(attrs: &[Attribute], ident: I) -> Result<Option<A>>15where16 Ident: PartialEq<I>,17{18 let attrs = attrs19 .iter()20 .filter(|a| a.path.is_ident(&ident))21 .collect::<Vec<_>>();22 if attrs.len() > 1 {23 return Err(Error::new(24 attrs[1].span(),25 "this attribute may be specified only once",26 ));27 } else if attrs.is_empty() {28 return Ok(None);29 }30 let attr = attrs[0];31 let attr = attr.parse_args::<A>()?;3233 Ok(Some(attr))34}3536fn path_is(path: &Path, needed: &str) -> bool {37 path.leading_colon.is_none()38 && !path.segments.is_empty()39 && path.segments.iter().last().unwrap().ident == needed40}4142fn type_is_path<'ty>(ty: &'ty Type, needed: &str) -> Option<&'ty PathArguments> {43 match ty {44 Type::Path(path) if path.qself.is_none() && path_is(&path.path, needed) => {45 let args = &path.path.segments.iter().last().unwrap().arguments;46 Some(args)47 }48 _ => None,49 }50}5152fn extract_type_from_option(ty: &Type) -> Result<Option<&Type>> {53 Ok(if let Some(args) = type_is_path(ty, "Option") {54 // It should have only on angle-bracketed param ("<String>"):55 let generic_arg = match args {56 PathArguments::AngleBracketed(params) => params.args.iter().next().unwrap(),57 _ => return Err(Error::new(args.span(), "missing option generic")),58 };59 // This argument must be a type:60 match generic_arg {61 GenericArgument::Type(ty) => Some(ty),62 _ => {63 return Err(Error::new(64 generic_arg.span(),65 "option generic should be a type",66 ))67 }68 }69 } else {70 None71 })72}7374struct Field {75 name: Ident,76 _colon: Token![:],77 ty: Type,78}79impl Parse for Field {80 fn parse(input: ParseStream) -> syn::Result<Self> {81 Ok(Self {82 name: input.parse()?,83 _colon: input.parse()?,84 ty: input.parse()?,85 })86 }87}8889mod kw {90 syn::custom_keyword!(fields);91 syn::custom_keyword!(rename);92 syn::custom_keyword!(flatten);93 syn::custom_keyword!(ok);94}9596struct EmptyAttr;97impl Parse for EmptyAttr {98 fn parse(_input: ParseStream) -> Result<Self> {99 Ok(Self)100 }101}102103struct BuiltinAttrs {104 fields: Vec<Field>,105}106impl Parse for BuiltinAttrs {107 fn parse(input: ParseStream) -> syn::Result<Self> {108 if input.is_empty() {109 return Ok(Self { fields: Vec::new() });110 }111 input.parse::<kw::fields>()?;112 let fields;113 parenthesized!(fields in input);114 let p = Punctuated::<Field, Comma>::parse_terminated(&fields)?;115 Ok(Self {116 fields: p.into_iter().collect(),117 })118 }119}120121enum ArgInfo {122 Normal {123 ty: Box<Type>,124 is_option: bool,125 name: String,126 cfg_attrs: Vec<Attribute>,127 // ident: Ident,128 },129 Lazy {130 is_option: bool,131 name: String,132 },133 State,134 Location,135 This,136}137138impl ArgInfo {139 fn parse(name: &str, arg: &FnArg) -> Result<Self> {140 let arg = match arg {141 FnArg::Receiver(_) => unreachable!(),142 FnArg::Typed(a) => a,143 };144 let ident = match &arg.pat as &Pat {145 Pat::Ident(i) => i.ident.clone(),146 _ => return Err(Error::new(arg.pat.span(), "arg should be plain identifier")),147 };148 let ty = &arg.ty;149 if type_is_path(ty, "State").is_some() {150 return Ok(Self::State);151 } else if type_is_path(ty, "CallLocation").is_some() {152 return Ok(Self::Location);153 } else if type_is_path(ty, "LazyVal").is_some() {154 return Ok(Self::Lazy {155 is_option: false,156 name: ident.to_string(),157 });158 }159160 match ty as &Type {161 Type::Reference(r) if type_is_path(&r.elem, name).is_some() => return Ok(Self::This),162 _ => {}163 }164165 let (is_option, ty) = if let Some(ty) = extract_type_from_option(ty)? {166 if type_is_path(ty, "LazyVal").is_some() {167 return Ok(Self::Lazy {168 is_option: true,169 name: ident.to_string(),170 });171 }172173 (true, Box::new(ty.clone()))174 } else {175 (false, ty.clone())176 };177178 let cfg_attrs = arg179 .attrs180 .iter()181 .filter(|a| a.path.is_ident("cfg"))182 .cloned()183 .collect();184185 Ok(Self::Normal {186 ty,187 is_option,188 name: ident.to_string(),189 cfg_attrs,190 })191 }192}193194#[proc_macro_attribute]195pub fn builtin(196 attr: proc_macro::TokenStream,197 item: proc_macro::TokenStream,198) -> proc_macro::TokenStream {199 let attr = parse_macro_input!(attr as BuiltinAttrs);200 let item: ItemFn = parse_macro_input!(item);201202 match builtin_inner(attr, item) {203 Ok(v) => v.into(),204 Err(e) => e.into_compile_error().into(),205 }206}207208fn builtin_inner(attr: BuiltinAttrs, fun: ItemFn) -> syn::Result<TokenStream> {209 let result = match fun.sig.output {210 ReturnType::Default => {211 return Err(Error::new(212 fun.sig.span(),213 "builtin should return something",214 ))215 }216 ReturnType::Type(_, ref ty) => ty.clone(),217 };218 let result_inner = if let Some(args) = type_is_path(&result, "Result") {219 let generic_arg = match args {220 PathArguments::AngleBracketed(params) => params.args.iter().next().unwrap(),221 _ => return Err(Error::new(args.span(), "missing result generic")),222 };223 // This argument must be a type:224 match generic_arg {225 GenericArgument::Type(ty) => ty,226 _ => {227 return Err(Error::new(228 generic_arg.span(),229 "option generic should be a type",230 ))231 }232 }233 } else {234 return Err(Error::new(result.span(), "return value should be result"));235 };236237 let name = fun.sig.ident.to_string();238 let args = fun239 .sig240 .inputs241 .iter()242 .map(|arg| ArgInfo::parse(&name, arg))243 .collect::<Result<Vec<_>>>()?;244245 let params_desc = args.iter().flat_map(|a| match a {246 ArgInfo::Normal {247 is_option,248 name,249 cfg_attrs,250 ..251 } => Some(quote! {252 #(#cfg_attrs)*253 BuiltinParam {254 name: std::borrow::Cow::Borrowed(#name),255 has_default: #is_option,256 },257 }),258 ArgInfo::Lazy { is_option, name } => Some(quote! {259 BuiltinParam {260 name: std::borrow::Cow::Borrowed(#name),261 has_default: #is_option,262 },263 }),264 ArgInfo::State => None,265 ArgInfo::Location => None,266 ArgInfo::This => None,267 });268269 let pass = args.iter().map(|a| match a {270 ArgInfo::Normal {271 ty,272 is_option,273 name,274 cfg_attrs,275 } => {276 let eval = quote! {s.push_description(277 || format!("argument <{}> evaluation", #name),278 || <#ty>::from_untyped(value.evaluate(s.clone())?, s.clone()),279 )?};280 let value = if *is_option {281 quote! {if let Some(value) = parsed.get(#name) {282 Some(#eval)283 } else {284 None285 },}286 } else {287 quote! {{288 let value = parsed.get(#name).expect("args shape is checked");289 #eval290 },}291 };292 quote! {293 #(#cfg_attrs)*294 #value295 }296 }297 ArgInfo::Lazy { is_option, name } => {298 if *is_option {299 quote! {if let Some(value) = parsed.get(#name) {300 Some(value.clone())301 } else {302 None303 }}304 } else {305 quote! {306 parsed.get(#name).expect("args shape is correct").clone(),307 }308 }309 }310 ArgInfo::State => quote! {s.clone(),},311 ArgInfo::Location => quote! {location,},312 ArgInfo::This => quote! {self,},313 });314315 let fields = attr.fields.iter().map(|field| {316 let name = &field.name;317 let ty = &field.ty;318 quote! {319 pub #name: #ty,320 }321 });322323 let name = &fun.sig.ident;324 let vis = &fun.vis;325 let static_ext = if attr.fields.is_empty() {326 quote! {327 impl #name {328 pub const INST: &'static dyn StaticBuiltin = &#name {};329 }330 impl StaticBuiltin for #name {}331 }332 } else {333 quote! {}334 };335 let static_derive_copy = if attr.fields.is_empty() {336 quote! {, Copy}337 } else {338 quote! {}339 };340341 Ok(quote! {342 #fun343 #[doc(hidden)]344 #[allow(non_camel_case_types)]345 #[derive(Clone, gcmodule::Trace #static_derive_copy)]346 #vis struct #name {347 #(#fields)*348 }349 const _: () = {350 use ::jrsonnet_evaluator::{351 State, Val,352 function::{builtin::{Builtin, StaticBuiltin, BuiltinParam}, CallLocation, ArgsLike, parse::parse_builtin_call},353 error::Result, Context, typed::Typed,354 parser::ExprLocation,355 };356 const PARAMS: &'static [BuiltinParam] = &[357 #(#params_desc)*358 ];359360 #static_ext361 impl Builtin for #name362 where363 Self: 'static364 {365 fn name(&self) -> &str {366 stringify!(#name)367 }368 fn params(&self) -> &[BuiltinParam] {369 PARAMS370 }371 fn call(&self, s: State, ctx: Context, location: CallLocation, args: &dyn ArgsLike) -> Result<Val> {372 let parsed = parse_builtin_call(s.clone(), ctx, &PARAMS, args, false)?;373374 let result: #result = #name(#(#pass)*);375 let result = result?;376 <#result_inner>::into_untyped(result, s)377 }378 }379 };380 })381}382383#[derive(Default)]384struct TypedAttr {385 rename: Option<String>,386 flatten: bool,387 /// flatten(ok) strategy for flattened optionals388 /// field would be None in case of any parsing error (as in serde)389 flatten_ok: bool,390}391impl Parse for TypedAttr {392 fn parse(input: ParseStream) -> syn::Result<Self> {393 let mut out = Self::default();394 loop {395 let lookahead = input.lookahead1();396 if lookahead.peek(kw::rename) {397 input.parse::<kw::rename>()?;398 input.parse::<Token![=]>()?;399 let name = input.parse::<LitStr>()?;400 if out.rename.is_some() {401 return Err(Error::new(402 name.span(),403 "rename attribute may only be specified once",404 ));405 }406 out.rename = Some(name.value());407 } else if lookahead.peek(kw::flatten) {408 input.parse::<kw::flatten>()?;409 out.flatten = true;410 if input.peek(token::Paren) {411 let content;412 parenthesized!(content in input);413 let lookahead = content.lookahead1();414 if lookahead.peek(kw::ok) {415 content.parse::<kw::ok>()?;416 out.flatten_ok = true;417 } else {418 return Err(lookahead.error());419 }420 }421 } else if input.is_empty() {422 break;423 } else {424 return Err(lookahead.error());425 }426 if input.peek(Token![,]) {427 input.parse::<Token![,]>()?;428 } else {429 break;430 }431 }432 // input.parse::<kw::rename>()?;433 // input.parse::<Token![=]>()?;434 // let rename = input.parse::<LitStr>()?.value();435 Ok(out)436 }437}438439struct TypedField {440 attr: TypedAttr,441 ident: Ident,442 ty: Type,443 is_option: bool,444}445impl TypedField {446 fn parse(field: &syn::Field) -> Result<Self> {447 let attr = parse_attr::<TypedAttr, _>(&field.attrs, "typed")?.unwrap_or_default();448 let ident = if let Some(ident) = field.ident.clone() {449 ident450 } else {451 return Err(Error::new(452 field.span(),453 "this field should appear in output object, but it has no visible name",454 ));455 };456 let (is_option, ty) = if let Some(ty) = extract_type_from_option(&field.ty)? {457 (true, ty.clone())458 } else {459 (false, field.ty.clone())460 };461 if is_option && attr.flatten {462 if !attr.flatten_ok {463 return Err(Error::new(464 field.span(),465 "strategy should be set when flattening Option",466 ));467 }468 } else if attr.flatten_ok {469 return Err(Error::new(470 field.span(),471 "flatten(ok) is only useable on optional fields",472 ));473 }474475 Ok(Self {476 attr,477 ident,478 ty,479 is_option,480 })481 }482 /// None if this field is flattened in jsonnet output483 fn name(&self) -> Option<String> {484 if self.attr.flatten {485 return None;486 }487 Some(488 self.attr489 .rename490 .clone()491 .unwrap_or_else(|| self.ident.to_string()),492 )493 }494495 fn expand_field(&self) -> Option<TokenStream> {496 if self.is_option {497 return None;498 }499 let name = self.name()?;500 let ty = &self.ty;501 Some(quote! {502 (#name, <#ty>::TYPE)503 })504 }505 fn expand_parse(&self) -> TokenStream {506 let ident = &self.ident;507 let ty = &self.ty;508 if self.attr.flatten {509 // optional flatten is handled in same way as serde510 return if self.is_option {511 quote! {512 #ident: <#ty>::parse(&obj, s.clone()).ok(),513 }514 } else {515 quote! {516 #ident: <#ty>::parse(&obj, s.clone())?,517 }518 };519 };520521 let name = self.name().unwrap();522 let value = if self.is_option {523 quote! {524 if let Some(value) = obj.get(s.clone(), #name.into())? {525 Some(<#ty>::from_untyped(value, s.clone())?)526 } else {527 None528 }529 }530 } else {531 quote! {532 <#ty>::from_untyped(obj.get(s.clone(), #name.into())?.ok_or_else(|| Error::NoSuchField(#name.into()))?, s.clone())?533 }534 };535536 quote! {537 #ident: #value,538 }539 }540 fn expand_serialize(&self) -> Result<TokenStream> {541 let ident = &self.ident;542 let ty = &self.ty;543 Ok(if let Some(name) = self.name() {544 if self.is_option {545 quote! {546 if let Some(value) = self.#ident {547 out.member(#name.into()).value(s.clone(), <#ty>::into_untyped(value, s.clone())?)?;548 }549 }550 } else {551 quote! {552 out.member(#name.into()).value(s.clone(), <#ty>::into_untyped(self.#ident, s.clone())?)?;553 }554 }555 } else if self.is_option {556 quote! {557 if let Some(value) = self.#ident {558 value.serialize(s.clone(), out)?;559 }560 }561 } else {562 quote! {563 self.#ident.serialize(s.clone(), out)?;564 }565 })566 }567}568569#[proc_macro_derive(Typed, attributes(typed))]570pub fn derive_typed(item: proc_macro::TokenStream) -> proc_macro::TokenStream {571 let input = parse_macro_input!(item as DeriveInput);572573 match derive_typed_inner(input) {574 Ok(v) => v.into(),575 Err(e) => e.to_compile_error().into(),576 }577}578579fn derive_typed_inner(input: DeriveInput) -> Result<TokenStream> {580 let data = match &input.data {581 syn::Data::Struct(s) => s,582 _ => return Err(Error::new(input.span(), "only structs supported")),583 };584585 let ident = &input.ident;586 let fields = data587 .fields588 .iter()589 .map(TypedField::parse)590 .collect::<Result<Vec<_>>>()?;591592 let typed = {593 let fields = fields594 .iter()595 .flat_map(TypedField::expand_field)596 .collect::<Vec<_>>();597 let len = fields.len();598 quote! {599 const ITEMS: [(&'static str, &'static ComplexValType); #len] = [600 #(#fields,)*601 ];602 impl Typed for #ident {603 const TYPE: &'static ComplexValType = &ComplexValType::ObjectRef(&ITEMS);604605 fn from_untyped(value: Val, s: State) -> Result<Self> {606 let obj = value.as_obj().expect("shape is correct");607 Self::parse(&obj, s)608 }609610 fn into_untyped(value: Self, s: State) -> Result<Val> {611 let mut out = ObjValueBuilder::new();612 value.serialize(s, &mut out)?;613 Ok(Val::Obj(out.build()))614 }615616 }617 }618 };619620 let fields_parse = fields.iter().map(TypedField::expand_parse);621 let fields_serialize = fields622 .iter()623 .map(TypedField::expand_serialize)624 .collect::<Result<Vec<_>>>()?;625626 Ok(quote! {627 const _: () = {628 use ::jrsonnet_evaluator::{629 typed::{ComplexValType, Typed, TypedObj, CheckType},630 Val, State,631 error::{LocError, Error, Result},632 ObjValueBuilder, ObjValue,633 };634635 #typed636637 impl TypedObj for #ident {638 fn serialize(self, s: State, out: &mut ObjValueBuilder) -> Result<(), LocError> {639 #(#fields_serialize)*640641 Ok(())642 }643 fn parse(obj: &ObjValue, s: State) -> Result<Self, LocError> {644 Ok(Self {645 #(#fields_parse)*646 })647 }648 }649 };650 })651}1use proc_macro2::TokenStream;2use quote::quote;3use syn::{4 parenthesized,5 parse::{Parse, ParseStream},6 parse_macro_input,7 punctuated::Punctuated,8 spanned::Spanned,9 token::{self, Comma},10 Attribute, DeriveInput, Error, FnArg, GenericArgument, Ident, ItemFn, LitStr, Pat, Path,11 PathArguments, Result, ReturnType, Token, Type,12};1314fn parse_attr<A: Parse, I>(attrs: &[Attribute], ident: I) -> Result<Option<A>>15where16 Ident: PartialEq<I>,17{18 let attrs = attrs19 .iter()20 .filter(|a| a.path.is_ident(&ident))21 .collect::<Vec<_>>();22 if attrs.len() > 1 {23 return Err(Error::new(24 attrs[1].span(),25 "this attribute may be specified only once",26 ));27 } else if attrs.is_empty() {28 return Ok(None);29 }30 let attr = attrs[0];31 let attr = attr.parse_args::<A>()?;3233 Ok(Some(attr))34}3536fn path_is(path: &Path, needed: &str) -> bool {37 path.leading_colon.is_none()38 && !path.segments.is_empty()39 && path.segments.iter().last().unwrap().ident == needed40}4142fn type_is_path<'ty>(ty: &'ty Type, needed: &str) -> Option<&'ty PathArguments> {43 match ty {44 Type::Path(path) if path.qself.is_none() && path_is(&path.path, needed) => {45 let args = &path.path.segments.iter().last().unwrap().arguments;46 Some(args)47 }48 _ => None,49 }50}5152fn extract_type_from_option(ty: &Type) -> Result<Option<&Type>> {53 Ok(if let Some(args) = type_is_path(ty, "Option") {54 // It should have only on angle-bracketed param ("<String>"):55 let generic_arg = match args {56 PathArguments::AngleBracketed(params) => params.args.iter().next().unwrap(),57 _ => return Err(Error::new(args.span(), "missing option generic")),58 };59 // This argument must be a type:60 match generic_arg {61 GenericArgument::Type(ty) => Some(ty),62 _ => {63 return Err(Error::new(64 generic_arg.span(),65 "option generic should be a type",66 ))67 }68 }69 } else {70 None71 })72}7374struct Field {75 name: Ident,76 _colon: Token![:],77 ty: Type,78}79impl Parse for Field {80 fn parse(input: ParseStream) -> syn::Result<Self> {81 Ok(Self {82 name: input.parse()?,83 _colon: input.parse()?,84 ty: input.parse()?,85 })86 }87}8889mod kw {90 syn::custom_keyword!(fields);91 syn::custom_keyword!(rename);92 syn::custom_keyword!(flatten);93 syn::custom_keyword!(ok);94}9596struct EmptyAttr;97impl Parse for EmptyAttr {98 fn parse(_input: ParseStream) -> Result<Self> {99 Ok(Self)100 }101}102103struct BuiltinAttrs {104 fields: Vec<Field>,105}106impl Parse for BuiltinAttrs {107 fn parse(input: ParseStream) -> syn::Result<Self> {108 if input.is_empty() {109 return Ok(Self { fields: Vec::new() });110 }111 input.parse::<kw::fields>()?;112 let fields;113 parenthesized!(fields in input);114 let p = Punctuated::<Field, Comma>::parse_terminated(&fields)?;115 Ok(Self {116 fields: p.into_iter().collect(),117 })118 }119}120121enum ArgInfo {122 Normal {123 ty: Box<Type>,124 is_option: bool,125 name: String,126 cfg_attrs: Vec<Attribute>,127 // ident: Ident,128 },129 Lazy {130 is_option: bool,131 name: String,132 },133 State,134 Location,135 This,136}137138impl ArgInfo {139 fn parse(name: &str, arg: &FnArg) -> Result<Self> {140 let arg = match arg {141 FnArg::Receiver(_) => unreachable!(),142 FnArg::Typed(a) => a,143 };144 let ident = match &arg.pat as &Pat {145 Pat::Ident(i) => i.ident.clone(),146 _ => return Err(Error::new(arg.pat.span(), "arg should be plain identifier")),147 };148 let ty = &arg.ty;149 if type_is_path(ty, "State").is_some() {150 return Ok(Self::State);151 } else if type_is_path(ty, "CallLocation").is_some() {152 return Ok(Self::Location);153 } else if type_is_path(ty, "Thunk").is_some() {154 return Ok(Self::Lazy {155 is_option: false,156 name: ident.to_string(),157 });158 }159160 match ty as &Type {161 Type::Reference(r) if type_is_path(&r.elem, name).is_some() => return Ok(Self::This),162 _ => {}163 }164165 let (is_option, ty) = if let Some(ty) = extract_type_from_option(ty)? {166 if type_is_path(ty, "Thunk").is_some() {167 return Ok(Self::Lazy {168 is_option: true,169 name: ident.to_string(),170 });171 }172173 (true, Box::new(ty.clone()))174 } else {175 (false, ty.clone())176 };177178 let cfg_attrs = arg179 .attrs180 .iter()181 .filter(|a| a.path.is_ident("cfg"))182 .cloned()183 .collect();184185 Ok(Self::Normal {186 ty,187 is_option,188 name: ident.to_string(),189 cfg_attrs,190 })191 }192}193194#[proc_macro_attribute]195pub fn builtin(196 attr: proc_macro::TokenStream,197 item: proc_macro::TokenStream,198) -> proc_macro::TokenStream {199 let attr = parse_macro_input!(attr as BuiltinAttrs);200 let item: ItemFn = parse_macro_input!(item);201202 match builtin_inner(attr, item) {203 Ok(v) => v.into(),204 Err(e) => e.into_compile_error().into(),205 }206}207208fn builtin_inner(attr: BuiltinAttrs, fun: ItemFn) -> syn::Result<TokenStream> {209 let result = match fun.sig.output {210 ReturnType::Default => {211 return Err(Error::new(212 fun.sig.span(),213 "builtin should return something",214 ))215 }216 ReturnType::Type(_, ref ty) => ty.clone(),217 };218 let result_inner = if let Some(args) = type_is_path(&result, "Result") {219 let generic_arg = match args {220 PathArguments::AngleBracketed(params) => params.args.iter().next().unwrap(),221 _ => return Err(Error::new(args.span(), "missing result generic")),222 };223 // This argument must be a type:224 match generic_arg {225 GenericArgument::Type(ty) => ty,226 _ => {227 return Err(Error::new(228 generic_arg.span(),229 "option generic should be a type",230 ))231 }232 }233 } else {234 return Err(Error::new(result.span(), "return value should be result"));235 };236237 let name = fun.sig.ident.to_string();238 let args = fun239 .sig240 .inputs241 .iter()242 .map(|arg| ArgInfo::parse(&name, arg))243 .collect::<Result<Vec<_>>>()?;244245 let params_desc = args.iter().flat_map(|a| match a {246 ArgInfo::Normal {247 is_option,248 name,249 cfg_attrs,250 ..251 } => Some(quote! {252 #(#cfg_attrs)*253 BuiltinParam {254 name: std::borrow::Cow::Borrowed(#name),255 has_default: #is_option,256 },257 }),258 ArgInfo::Lazy { is_option, name } => Some(quote! {259 BuiltinParam {260 name: std::borrow::Cow::Borrowed(#name),261 has_default: #is_option,262 },263 }),264 ArgInfo::State => None,265 ArgInfo::Location => None,266 ArgInfo::This => None,267 });268269 let pass = args.iter().map(|a| match a {270 ArgInfo::Normal {271 ty,272 is_option,273 name,274 cfg_attrs,275 } => {276 let eval = quote! {s.push_description(277 || format!("argument <{}> evaluation", #name),278 || <#ty>::from_untyped(value.evaluate(s.clone())?, s.clone()),279 )?};280 let value = if *is_option {281 quote! {if let Some(value) = parsed.get(#name) {282 Some(#eval)283 } else {284 None285 },}286 } else {287 quote! {{288 let value = parsed.get(#name).expect("args shape is checked");289 #eval290 },}291 };292 quote! {293 #(#cfg_attrs)*294 #value295 }296 }297 ArgInfo::Lazy { is_option, name } => {298 if *is_option {299 quote! {if let Some(value) = parsed.get(#name) {300 Some(value.clone())301 } else {302 None303 }}304 } else {305 quote! {306 parsed.get(#name).expect("args shape is correct").clone(),307 }308 }309 }310 ArgInfo::State => quote! {s.clone(),},311 ArgInfo::Location => quote! {location,},312 ArgInfo::This => quote! {self,},313 });314315 let fields = attr.fields.iter().map(|field| {316 let name = &field.name;317 let ty = &field.ty;318 quote! {319 pub #name: #ty,320 }321 });322323 let name = &fun.sig.ident;324 let vis = &fun.vis;325 let static_ext = if attr.fields.is_empty() {326 quote! {327 impl #name {328 pub const INST: &'static dyn StaticBuiltin = &#name {};329 }330 impl StaticBuiltin for #name {}331 }332 } else {333 quote! {}334 };335 let static_derive_copy = if attr.fields.is_empty() {336 quote! {, Copy}337 } else {338 quote! {}339 };340341 Ok(quote! {342 #fun343 #[doc(hidden)]344 #[allow(non_camel_case_types)]345 #[derive(Clone, gcmodule::Trace #static_derive_copy)]346 #vis struct #name {347 #(#fields)*348 }349 const _: () = {350 use ::jrsonnet_evaluator::{351 State, Val,352 function::{builtin::{Builtin, StaticBuiltin, BuiltinParam}, CallLocation, ArgsLike, parse::parse_builtin_call},353 error::Result, Context, typed::Typed,354 parser::ExprLocation,355 };356 const PARAMS: &'static [BuiltinParam] = &[357 #(#params_desc)*358 ];359360 #static_ext361 impl Builtin for #name362 where363 Self: 'static364 {365 fn name(&self) -> &str {366 stringify!(#name)367 }368 fn params(&self) -> &[BuiltinParam] {369 PARAMS370 }371 fn call(&self, s: State, ctx: Context, location: CallLocation, args: &dyn ArgsLike) -> Result<Val> {372 let parsed = parse_builtin_call(s.clone(), ctx, &PARAMS, args, false)?;373374 let result: #result = #name(#(#pass)*);375 let result = result?;376 <#result_inner>::into_untyped(result, s)377 }378 }379 };380 })381}382383#[derive(Default)]384struct TypedAttr {385 rename: Option<String>,386 flatten: bool,387 /// flatten(ok) strategy for flattened optionals388 /// field would be None in case of any parsing error (as in serde)389 flatten_ok: bool,390}391impl Parse for TypedAttr {392 fn parse(input: ParseStream) -> syn::Result<Self> {393 let mut out = Self::default();394 loop {395 let lookahead = input.lookahead1();396 if lookahead.peek(kw::rename) {397 input.parse::<kw::rename>()?;398 input.parse::<Token![=]>()?;399 let name = input.parse::<LitStr>()?;400 if out.rename.is_some() {401 return Err(Error::new(402 name.span(),403 "rename attribute may only be specified once",404 ));405 }406 out.rename = Some(name.value());407 } else if lookahead.peek(kw::flatten) {408 input.parse::<kw::flatten>()?;409 out.flatten = true;410 if input.peek(token::Paren) {411 let content;412 parenthesized!(content in input);413 let lookahead = content.lookahead1();414 if lookahead.peek(kw::ok) {415 content.parse::<kw::ok>()?;416 out.flatten_ok = true;417 } else {418 return Err(lookahead.error());419 }420 }421 } else if input.is_empty() {422 break;423 } else {424 return Err(lookahead.error());425 }426 if input.peek(Token![,]) {427 input.parse::<Token![,]>()?;428 } else {429 break;430 }431 }432 // input.parse::<kw::rename>()?;433 // input.parse::<Token![=]>()?;434 // let rename = input.parse::<LitStr>()?.value();435 Ok(out)436 }437}438439struct TypedField {440 attr: TypedAttr,441 ident: Ident,442 ty: Type,443 is_option: bool,444}445impl TypedField {446 fn parse(field: &syn::Field) -> Result<Self> {447 let attr = parse_attr::<TypedAttr, _>(&field.attrs, "typed")?.unwrap_or_default();448 let ident = if let Some(ident) = field.ident.clone() {449 ident450 } else {451 return Err(Error::new(452 field.span(),453 "this field should appear in output object, but it has no visible name",454 ));455 };456 let (is_option, ty) = if let Some(ty) = extract_type_from_option(&field.ty)? {457 (true, ty.clone())458 } else {459 (false, field.ty.clone())460 };461 if is_option && attr.flatten {462 if !attr.flatten_ok {463 return Err(Error::new(464 field.span(),465 "strategy should be set when flattening Option",466 ));467 }468 } else if attr.flatten_ok {469 return Err(Error::new(470 field.span(),471 "flatten(ok) is only useable on optional fields",472 ));473 }474475 Ok(Self {476 attr,477 ident,478 ty,479 is_option,480 })481 }482 /// None if this field is flattened in jsonnet output483 fn name(&self) -> Option<String> {484 if self.attr.flatten {485 return None;486 }487 Some(488 self.attr489 .rename490 .clone()491 .unwrap_or_else(|| self.ident.to_string()),492 )493 }494495 fn expand_field(&self) -> Option<TokenStream> {496 if self.is_option {497 return None;498 }499 let name = self.name()?;500 let ty = &self.ty;501 Some(quote! {502 (#name, <#ty>::TYPE)503 })504 }505 fn expand_parse(&self) -> TokenStream {506 let ident = &self.ident;507 let ty = &self.ty;508 if self.attr.flatten {509 // optional flatten is handled in same way as serde510 return if self.is_option {511 quote! {512 #ident: <#ty>::parse(&obj, s.clone()).ok(),513 }514 } else {515 quote! {516 #ident: <#ty>::parse(&obj, s.clone())?,517 }518 };519 };520521 let name = self.name().unwrap();522 let value = if self.is_option {523 quote! {524 if let Some(value) = obj.get(s.clone(), #name.into())? {525 Some(<#ty>::from_untyped(value, s.clone())?)526 } else {527 None528 }529 }530 } else {531 quote! {532 <#ty>::from_untyped(obj.get(s.clone(), #name.into())?.ok_or_else(|| Error::NoSuchField(#name.into()))?, s.clone())?533 }534 };535536 quote! {537 #ident: #value,538 }539 }540 fn expand_serialize(&self) -> Result<TokenStream> {541 let ident = &self.ident;542 let ty = &self.ty;543 Ok(if let Some(name) = self.name() {544 if self.is_option {545 quote! {546 if let Some(value) = self.#ident {547 out.member(#name.into()).value(s.clone(), <#ty>::into_untyped(value, s.clone())?)?;548 }549 }550 } else {551 quote! {552 out.member(#name.into()).value(s.clone(), <#ty>::into_untyped(self.#ident, s.clone())?)?;553 }554 }555 } else if self.is_option {556 quote! {557 if let Some(value) = self.#ident {558 value.serialize(s.clone(), out)?;559 }560 }561 } else {562 quote! {563 self.#ident.serialize(s.clone(), out)?;564 }565 })566 }567}568569#[proc_macro_derive(Typed, attributes(typed))]570pub fn derive_typed(item: proc_macro::TokenStream) -> proc_macro::TokenStream {571 let input = parse_macro_input!(item as DeriveInput);572573 match derive_typed_inner(input) {574 Ok(v) => v.into(),575 Err(e) => e.to_compile_error().into(),576 }577}578579fn derive_typed_inner(input: DeriveInput) -> Result<TokenStream> {580 let data = match &input.data {581 syn::Data::Struct(s) => s,582 _ => return Err(Error::new(input.span(), "only structs supported")),583 };584585 let ident = &input.ident;586 let fields = data587 .fields588 .iter()589 .map(TypedField::parse)590 .collect::<Result<Vec<_>>>()?;591592 let typed = {593 let fields = fields594 .iter()595 .flat_map(TypedField::expand_field)596 .collect::<Vec<_>>();597 let len = fields.len();598 quote! {599 const ITEMS: [(&'static str, &'static ComplexValType); #len] = [600 #(#fields,)*601 ];602 impl Typed for #ident {603 const TYPE: &'static ComplexValType = &ComplexValType::ObjectRef(&ITEMS);604605 fn from_untyped(value: Val, s: State) -> Result<Self> {606 let obj = value.as_obj().expect("shape is correct");607 Self::parse(&obj, s)608 }609610 fn into_untyped(value: Self, s: State) -> Result<Val> {611 let mut out = ObjValueBuilder::new();612 value.serialize(s, &mut out)?;613 Ok(Val::Obj(out.build()))614 }615616 }617 }618 };619620 let fields_parse = fields.iter().map(TypedField::expand_parse);621 let fields_serialize = fields622 .iter()623 .map(TypedField::expand_serialize)624 .collect::<Result<Vec<_>>>()?;625626 Ok(quote! {627 const _: () = {628 use ::jrsonnet_evaluator::{629 typed::{ComplexValType, Typed, TypedObj, CheckType},630 Val, State,631 error::{LocError, Error, Result},632 ObjValueBuilder, ObjValue,633 };634635 #typed636637 impl TypedObj for #ident {638 fn serialize(self, s: State, out: &mut ObjValueBuilder) -> Result<(), LocError> {639 #(#fields_serialize)*640641 Ok(())642 }643 fn parse(obj: &ObjValue, s: State) -> Result<Self, LocError> {644 Ok(Self {645 #(#fields_parse)*646 })647 }648 }649 };650 })651}crates/jrsonnet-parser/Cargo.tomldiffbeforeafterboth--- a/crates/jrsonnet-parser/Cargo.toml
+++ b/crates/jrsonnet-parser/Cargo.toml
@@ -6,6 +6,9 @@
license = "MIT"
edition = "2021"
+[features]
+exp-destruct = []
+
[dependencies]
jrsonnet-interner = { path = "../jrsonnet-interner", version = "0.4.2" }
crates/jrsonnet-parser/src/expr.rsdiffbeforeafterboth--- a/crates/jrsonnet-parser/src/expr.rs
+++ b/crates/jrsonnet-parser/src/expr.rs
@@ -179,10 +179,44 @@
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
#[derive(Debug, Clone, PartialEq, Trace)]
-pub struct BindSpec {
- pub name: IStr,
- pub params: Option<ParamsDesc>,
- pub value: LocExpr,
+pub enum DestructRest {
+ /// ...rest
+ Keep(IStr),
+ /// ...
+ Drop,
+}
+
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[derive(Debug, Clone, PartialEq, Trace)]
+pub enum Destruct {
+ Full(IStr),
+ #[cfg(feature = "exp-destruct")]
+ Skip,
+ #[cfg(feature = "exp-destruct")]
+ Array {
+ start: Vec<Destruct>,
+ rest: Option<DestructRest>,
+ end: Vec<Destruct>,
+ },
+ #[cfg(feature = "exp-destruct")]
+ Object {
+ fields: Vec<(IStr, Option<Destruct>)>,
+ rest: Option<DestructRest>,
+ },
+}
+
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[derive(Debug, Clone, PartialEq, Trace)]
+pub enum BindSpec {
+ Field {
+ into: Destruct,
+ value: LocExpr,
+ },
+ Function {
+ name: IStr,
+ params: ParamsDesc,
+ value: LocExpr,
+ },
}
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
crates/jrsonnet-parser/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-parser/src/lib.rs
+++ b/crates/jrsonnet-parser/src/lib.rs
@@ -55,18 +55,18 @@
/// Reserved word followed by any non-alphanumberic
rule reserved() = ("assert" / "else" / "error" / "false" / "for" / "function" / "if" / "import" / "importstr" / "importbin" / "in" / "local" / "null" / "tailstrict" / "then" / "self" / "super" / "true") end_of_ident()
- rule id() = quiet!{ !reserved() alpha() (alpha() / digit())*} / expected!("<identifier>")
+ rule id() -> IStr = v:$(quiet!{ !reserved() alpha() (alpha() / digit())*} / expected!("<identifier>")) { v.into() }
rule keyword(id: &'static str) -> ()
= ##parse_string_literal(id) end_of_ident()
- pub rule param(s: &ParserSettings) -> expr::Param = name:$(id()) expr:(_ "=" _ expr:expr(s){expr})? { expr::Param(name.into(), expr) }
+ pub rule param(s: &ParserSettings) -> expr::Param = name:id() expr:(_ "=" _ expr:expr(s){expr})? { expr::Param(name, expr) }
pub rule params(s: &ParserSettings) -> expr::ParamsDesc
= params:param(s) ** comma() comma()? { expr::ParamsDesc(Rc::new(params)) }
/ { expr::ParamsDesc(Rc::new(Vec::new())) }
pub rule arg(s: &ParserSettings) -> (Option<IStr>, LocExpr)
- = quiet! { name:(s:$(id()) _ "=" _ {s})? expr:expr(s) {(name.map(Into::into), expr)} }
+ = quiet! { name:(s:id() _ "=" _ {s})? expr:expr(s) {(name, expr)} }
/ expected!("<argument>")
pub rule args(s: &ParserSettings) -> expr::ArgsDesc
@@ -89,9 +89,52 @@
Ok(expr::ArgsDesc::new(unnamed, named))
}
+ pub rule destruct_rest() -> expr::DestructRest
+ = "..." into:(_ into:id() {into})? {if let Some(into) = into {
+ expr::DestructRest::Keep(into)
+ } else {expr::DestructRest::Drop}}
+ pub rule destruct_array(s: &ParserSettings) -> expr::Destruct
+ = "[" _ start:destruct(s)**comma() rest:(
+ comma() _ rest:destruct_rest()? end:(
+ comma() end:destruct(s)**comma() (_ comma())? {end}
+ / comma()? {Vec::new()}
+ ) {(rest, end)}
+ / comma()? {(None, Vec::new())}
+ ) _ "]" {?
+ #[cfg(feature = "exp-destruct")] return Ok(expr::Destruct::Array {
+ start,
+ rest: rest.0,
+ end: rest.1,
+ });
+ #[cfg(not(feature = "exp-destruct"))] Err("experimental destructuring was not enabled")
+ }
+ pub rule destruct_object(s: &ParserSettings) -> expr::Destruct
+ = "{" _
+ fields:(name:id() _ into:(":" _ into:destruct(s) {into})? {(name, into)})**comma()
+ rest:(
+ comma() rest:destruct_rest()? {rest}
+ / comma()? {None}
+ )
+ _ "}" {?
+ #[cfg(feature = "exp-destruct")] return Ok(expr::Destruct::Object {
+ fields,
+ rest,
+ });
+ #[cfg(not(feature = "exp-destruct"))] Err("experimental destructuring was not enabled")
+ }
+ pub rule destruct(s: &ParserSettings) -> expr::Destruct
+ = v:id() {expr::Destruct::Full(v)}
+ / "?" {?
+ #[cfg(feature = "exp-destruct")] return Ok(expr::Destruct::Skip);
+ #[cfg(not(feature = "exp-destruct"))] Err("experimental destructuring was not enabled")
+ }
+ / arr:destruct_array(s) {arr}
+ / obj:destruct_object(s) {obj}
+
pub rule bind(s: &ParserSettings) -> expr::BindSpec
- = name:$(id()) _ "=" _ expr:expr(s) {expr::BindSpec{name:name.into(), params: None, value: expr}}
- / name:$(id()) _ "(" _ params:params(s) _ ")" _ "=" _ expr:expr(s) {expr::BindSpec{name:name.into(), params: Some(params), value: expr}}
+ = into:destruct(s) _ "=" _ expr:expr(s) {expr::BindSpec::Field{into, value: expr}}
+ / name:id() _ "(" _ params:params(s) _ ")" _ "=" _ expr:expr(s) {expr::BindSpec::Function{name, params, value: expr}}
+
pub rule assertion(s: &ParserSettings) -> expr::AssertStmt
= keyword("assert") _ cond:expr(s) msg:(_ ":" _ e:expr(s) {e})? { expr::AssertStmt(cond, msg) }
@@ -122,7 +165,7 @@
/ string_block() } / expected!("<string>")
pub rule field_name(s: &ParserSettings) -> expr::FieldName
- = name:$(id()) {expr::FieldName::Fixed(name.into())}
+ = name:id() {expr::FieldName::Fixed(name.into())}
/ name:string() {expr::FieldName::Fixed(name.into())}
/ "[" _ expr:expr(s) _ "]" {expr::FieldName::Dyn(expr)}
pub rule visibility() -> expr::Visibility
@@ -167,7 +210,7 @@
pub rule ifspec(s: &ParserSettings) -> IfSpecData
= keyword("if") _ expr:expr(s) {IfSpecData(expr)}
pub rule forspec(s: &ParserSettings) -> ForSpecData
- = keyword("for") _ id:$(id()) _ keyword("in") _ cond:expr(s) {ForSpecData(id.into(), cond)}
+ = keyword("for") _ id:id() _ keyword("in") _ cond:expr(s) {ForSpecData(id, cond)}
pub rule compspec(s: &ParserSettings) -> Vec<expr::CompSpec>
= s:(i:ifspec(s) { expr::CompSpec::IfSpec(i) } / f:forspec(s) {expr::CompSpec::ForSpec(f)} ) ** _ {s}
pub rule local_expr(s: &ParserSettings) -> Expr
@@ -187,9 +230,9 @@
pub rule number_expr(s: &ParserSettings) -> Expr
= n:number() { expr::Expr::Num(n) }
pub rule var_expr(s: &ParserSettings) -> Expr
- = n:$(id()) { expr::Expr::Var(n.into()) }
+ = n:id() { expr::Expr::Var(n) }
pub rule id_loc(s: &ParserSettings) -> LocExpr
- = a:position!() n:$(id()) b:position!() { LocExpr(Rc::new(expr::Expr::Str(n.into())), ExprLocation(s.file_name.clone(), a,b)) }
+ = a:position!() n:id() b:position!() { LocExpr(Rc::new(expr::Expr::Str(n)), ExprLocation(s.file_name.clone(), a,b)) }
pub rule if_then_else_expr(s: &ParserSettings) -> Expr
= cond:ifspec(s) _ keyword("then") _ cond_then:expr(s) cond_else:(_ keyword("else") _ e:expr(s) {e})? {Expr::IfElse{
cond,
@@ -212,7 +255,7 @@
/ quiet!{"$intrinsicThisFile" {Expr::IntrinsicThisFile}}
/ quiet!{"$intrinsicId" {Expr::IntrinsicId}}
- / quiet!{"$intrinsic(" name:$(id()) ")" {Expr::Intrinsic(name.into())}}
+ / quiet!{"$intrinsic(" name:id() ")" {Expr::Intrinsic(name)}}
/ string_expr(s) / number_expr(s)
/ array_expr(s)
@@ -693,9 +736,8 @@
ObjExtend(
el!(Obj(ObjBody::MemberList(vec![])), 0, 2),
ObjBody::MemberList(vec![
- Member::BindStmt(BindSpec {
- name: "x".into(),
- params: None,
+ Member::BindStmt(BindSpec::Field {
+ into: Destruct::Full("x".into()),
value: el!(Num(1.0), 15, 16)
}),
Member::Field(FieldMember {