difftreelog
refactor split Typed into FromUntyped and IntoUntyped
in: master
20 files changed
bindings/jsonnet/src/native.rsdiffbeforeafterboth--- a/bindings/jsonnet/src/native.rs
+++ b/bindings/jsonnet/src/native.rs
@@ -6,7 +6,7 @@
use jrsonnet_evaluator::{
error::{Error, ErrorKind},
function::builtin::{NativeCallback, NativeCallbackHandler},
- typed::Typed,
+ typed::FromUntyped as _,
IStr, Val,
};
cmds/jrsonnet/Cargo.tomldiffbeforeafterboth--- a/cmds/jrsonnet/Cargo.toml
+++ b/cmds/jrsonnet/Cargo.toml
@@ -11,10 +11,6 @@
workspace = true
[features]
-default = [
- "exp-regex",
-]
-
experimental = [
"exp-preserve-order",
"exp-destruct",
crates/jrsonnet-evaluator/src/arr/mod.rsdiffbeforeafterboth1use std::{2 any::Any,3 fmt::{self},4 num::NonZeroU32,5 rc::Rc,6};78use jrsonnet_gcmodule::{cc_dyn, Cc, Trace};9use jrsonnet_interner::IBytes;10use jrsonnet_parser::{Expr, Spanned};1112use crate::{function::NativeFn, typed::Typed, Context, Result, Thunk, Val};1314mod spec;15pub use spec::{ArrayLike, *};1617cc_dyn!(18 #[doc = "Represents a Jsonnet array value."]19 #[derive(Clone)]20 ArrValue,21 ArrayLike,22 pub fn new() {...}23);24impl fmt::Debug for ArrValue {25 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {26 self.0.fmt(f)27 }28}2930pub trait ArrayLikeIter<T>: Iterator<Item = T> + DoubleEndedIterator + ExactSizeIterator {}31impl<I, T> ArrayLikeIter<T> for I where32 I: Iterator<Item = T> + DoubleEndedIterator + ExactSizeIterator33{34}3536impl ArrValue {37 pub fn empty() -> Self {38 Self::new(RangeArray::empty())39 }4041 pub fn expr(ctx: Context, exprs: Rc<Vec<Spanned<Expr>>>) -> Self {42 Self::new(ExprArray::new(ctx, exprs))43 }4445 pub fn lazy(thunks: Vec<Thunk<Val>>) -> Self {46 Self::new(LazyArray(thunks))47 }4849 pub fn eager(values: Vec<Val>) -> Self {50 Self::new(EagerArray(values))51 }5253 pub fn repeated(data: Self, repeats: usize) -> Option<Self> {54 Some(Self::new(RepeatedArray::new(data, repeats)?))55 }5657 pub fn bytes(bytes: IBytes) -> Self {58 Self::new(BytesArray(bytes))59 }60 pub fn chars(chars: impl Iterator<Item = char>) -> Self {61 Self::new(CharArray(chars.collect()))62 }6364 #[must_use]65 pub fn map(self, mapper: NativeFn!((Val) -> Val)) -> Self {66 Self::new(<MappedArray>::new(self, ArrayMapper::Plain(mapper)))67 }6869 #[must_use]70 pub fn map_with_index(self, mapper: NativeFn!((u32, Val) -> Val)) -> Self {71 Self::new(<MappedArray>::new(self, ArrayMapper::WithIndex(mapper)))72 }7374 pub fn filter(self, filter: impl Fn(&Val) -> Result<bool>) -> Result<Self> {75 // TODO: ArrValue::Picked(inner, indexes) for large arrays76 let mut out = Vec::new();77 for i in self.iter() {78 let i = i?;79 if filter(&i)? {80 out.push(i);81 }82 }83 Ok(Self::eager(out))84 }8586 pub fn extended(a: Self, b: Self) -> Self {87 // TODO: benchmark for an optimal value, currently just a arbitrary choice88 const ARR_EXTEND_THRESHOLD: usize = 100;8990 if a.is_empty() {91 b92 } else if b.is_empty() {93 a94 } else if a.len() + b.len() > ARR_EXTEND_THRESHOLD {95 Self::new(ExtendedArray::new(a, b))96 } else if let (Some(a), Some(b)) = (a.iter_cheap(), b.iter_cheap()) {97 let mut out = Vec::with_capacity(a.len() + b.len());98 out.extend(a);99 out.extend(b);100 Self::eager(out)101 } else {102 let mut out = Vec::with_capacity(a.len() + b.len());103 out.extend(a.iter_lazy());104 out.extend(b.iter_lazy());105 Self::lazy(out)106 }107 }108109 pub fn range_exclusive(a: i32, b: i32) -> Self {110 Self::new(RangeArray::new_exclusive(a, b))111 }112 pub fn range_inclusive(a: i32, b: i32) -> Self {113 Self::new(RangeArray::new_inclusive(a, b))114 }115116 #[must_use]117 pub fn slice(self, index: Option<i32>, end: Option<i32>, step: Option<NonZeroU32>) -> Self {118 let get_idx = |pos: Option<i32>, len: usize, default| match pos {119 Some(v) if v < 0 => len.saturating_sub((-v) as usize),120 Some(v) => (v as usize).min(len),121 None => default,122 };123 let index = get_idx(index, self.len(), 0);124 let end = get_idx(end, self.len(), self.len());125 let step = step.unwrap_or_else(|| NonZeroU32::new(1).expect("1 != 0"));126127 if index >= end {128 return Self::empty();129 }130131 Self::new(SliceArray {132 inner: self,133 from: index as u32,134 to: end as u32,135 step: step.get(),136 })137 }138139 /// Array length.140 pub fn len(&self) -> usize {141 self.0.len()142 }143144 /// Is array contains no elements?145 pub fn is_empty(&self) -> bool {146 self.0.is_empty()147 }148149 /// Get array element by index, evaluating it, if it is lazy.150 ///151 /// Returns `None` on out-of-bounds condition.152 pub fn get(&self, index: usize) -> Result<Option<Val>> {153 self.0.get(index)154 }155156 /// Returns None if get is either non cheap, or out of bounds157 /// Note that non-cheap access includes errorable values158 ///159 /// Prefer it to `get_lazy`, but use `get` when you can.160 fn get_cheap(&self, index: usize) -> Option<Val> {161 self.0.get_cheap(index)162 }163164 /// Get array element by index, without evaluation.165 ///166 /// Returns `None` on out-of-bounds condition.167 pub fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {168 self.0.get_lazy(index)169 }170171 pub fn iter(&self) -> impl ArrayLikeIter<Result<Val>> + '_ {172 (0..self.len()).map(|i| self.get(i).transpose().expect("length checked"))173 }174175 /// Iterate over elements, returning lazy values.176 pub fn iter_lazy(&self) -> impl ArrayLikeIter<Thunk<Val>> + '_ {177 (0..self.len()).map(|i| self.get_lazy(i).expect("length checked"))178 }179180 /// Prefer it over `iter_lazy`, but do not use it where `iter` will do.181 pub fn iter_cheap(&self) -> Option<impl ArrayLikeIter<Val> + '_> {182 if self.is_cheap() {183 Some((0..self.len()).map(|i| self.get_cheap(i).expect("length and is_cheap checked")))184 } else {185 None186 }187 }188189 /// Return a reversed view on current array.190 #[must_use]191 pub fn reversed(self) -> Self {192 Self::new(ReverseArray(self))193 }194195 pub fn ptr_eq(a: &Self, b: &Self) -> bool {196 Cc::ptr_eq(&a.0, &b.0)197 }198199 /// Is this vec supports `.get_cheap()?`200 pub fn is_cheap(&self) -> bool {201 self.0.is_cheap()202 }203204 pub fn as_any(&self) -> &dyn Any {205 &self.0206 }207}208impl From<Vec<Val>> for ArrValue {209 fn from(value: Vec<Val>) -> Self {210 Self::eager(value)211 }212}213impl From<Vec<Thunk<Val>>> for ArrValue {214 fn from(value: Vec<Thunk<Val>>) -> Self {215 Self::lazy(value)216 }217}218impl FromIterator<Val> for ArrValue {219 fn from_iter<T: IntoIterator<Item = Val>>(iter: T) -> Self {220 Self::eager(iter.into_iter().collect())221 }222}223impl ArrayLike for ArrValue {224 fn len(&self) -> usize {225 self.0.len()226 }227228 fn get(&self, index: usize) -> Result<Option<Val>> {229 self.0.get(index)230 }231232 fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {233 self.0.get_lazy(index)234 }235236 fn get_cheap(&self, index: usize) -> Option<Val> {237 self.0.get_cheap(index)238 }239240 fn is_cheap(&self) -> bool {241 self.0.is_cheap()242 }243}2441use std::{2 any::Any,3 fmt::{self},4 num::NonZeroU32,5 rc::Rc,6};78use jrsonnet_gcmodule::{cc_dyn, Cc};9use jrsonnet_interner::IBytes;10use jrsonnet_parser::{Expr, Spanned};1112use crate::{function::NativeFn, Context, Result, Thunk, Val};1314mod spec;15pub use spec::{ArrayLike, *};1617cc_dyn!(18 #[doc = "Represents a Jsonnet array value."]19 #[derive(Clone)]20 ArrValue,21 ArrayLike,22 pub fn new() {...}23);24impl fmt::Debug for ArrValue {25 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {26 self.0.fmt(f)27 }28}2930pub trait ArrayLikeIter<T>: Iterator<Item = T> + DoubleEndedIterator + ExactSizeIterator {}31impl<I, T> ArrayLikeIter<T> for I where32 I: Iterator<Item = T> + DoubleEndedIterator + ExactSizeIterator33{34}3536impl ArrValue {37 pub fn empty() -> Self {38 Self::new(RangeArray::empty())39 }4041 pub fn expr(ctx: Context, exprs: Rc<Vec<Spanned<Expr>>>) -> Self {42 Self::new(ExprArray::new(ctx, exprs))43 }4445 pub fn lazy(thunks: Vec<Thunk<Val>>) -> Self {46 Self::new(LazyArray(thunks))47 }4849 pub fn eager(values: Vec<Val>) -> Self {50 Self::new(EagerArray(values))51 }5253 pub fn repeated(data: Self, repeats: usize) -> Option<Self> {54 Some(Self::new(RepeatedArray::new(data, repeats)?))55 }5657 pub fn bytes(bytes: IBytes) -> Self {58 Self::new(BytesArray(bytes))59 }60 pub fn chars(chars: impl Iterator<Item = char>) -> Self {61 Self::new(CharArray(chars.collect()))62 }6364 #[must_use]65 pub fn map(self, mapper: NativeFn!((Val) -> Val)) -> Self {66 Self::new(<MappedArray>::new(self, ArrayMapper::Plain(mapper)))67 }6869 #[must_use]70 pub fn map_with_index(self, mapper: NativeFn!((u32, Val) -> Val)) -> Self {71 Self::new(<MappedArray>::new(self, ArrayMapper::WithIndex(mapper)))72 }7374 pub fn filter(self, filter: impl Fn(&Val) -> Result<bool>) -> Result<Self> {75 // TODO: ArrValue::Picked(inner, indexes) for large arrays76 let mut out = Vec::new();77 for i in self.iter() {78 let i = i?;79 if filter(&i)? {80 out.push(i);81 }82 }83 Ok(Self::eager(out))84 }8586 pub fn extended(a: Self, b: Self) -> Self {87 // TODO: benchmark for an optimal value, currently just a arbitrary choice88 const ARR_EXTEND_THRESHOLD: usize = 100;8990 if a.is_empty() {91 b92 } else if b.is_empty() {93 a94 } else if a.len() + b.len() > ARR_EXTEND_THRESHOLD {95 Self::new(ExtendedArray::new(a, b))96 } else if let (Some(a), Some(b)) = (a.iter_cheap(), b.iter_cheap()) {97 let mut out = Vec::with_capacity(a.len() + b.len());98 out.extend(a);99 out.extend(b);100 Self::eager(out)101 } else {102 let mut out = Vec::with_capacity(a.len() + b.len());103 out.extend(a.iter_lazy());104 out.extend(b.iter_lazy());105 Self::lazy(out)106 }107 }108109 pub fn range_exclusive(a: i32, b: i32) -> Self {110 Self::new(RangeArray::new_exclusive(a, b))111 }112 pub fn range_inclusive(a: i32, b: i32) -> Self {113 Self::new(RangeArray::new_inclusive(a, b))114 }115116 #[must_use]117 pub fn slice(self, index: Option<i32>, end: Option<i32>, step: Option<NonZeroU32>) -> Self {118 let get_idx = |pos: Option<i32>, len: usize, default| match pos {119 Some(v) if v < 0 => len.saturating_sub((-v) as usize),120 Some(v) => (v as usize).min(len),121 None => default,122 };123 let index = get_idx(index, self.len(), 0);124 let end = get_idx(end, self.len(), self.len());125 let step = step.unwrap_or_else(|| NonZeroU32::new(1).expect("1 != 0"));126127 if index >= end {128 return Self::empty();129 }130131 Self::new(SliceArray {132 inner: self,133 from: index as u32,134 to: end as u32,135 step: step.get(),136 })137 }138139 /// Array length.140 pub fn len(&self) -> usize {141 self.0.len()142 }143144 /// Is array contains no elements?145 pub fn is_empty(&self) -> bool {146 self.0.is_empty()147 }148149 /// Get array element by index, evaluating it, if it is lazy.150 ///151 /// Returns `None` on out-of-bounds condition.152 pub fn get(&self, index: usize) -> Result<Option<Val>> {153 self.0.get(index)154 }155156 /// Returns None if get is either non cheap, or out of bounds157 /// Note that non-cheap access includes errorable values158 ///159 /// Prefer it to `get_lazy`, but use `get` when you can.160 fn get_cheap(&self, index: usize) -> Option<Val> {161 self.0.get_cheap(index)162 }163164 /// Get array element by index, without evaluation.165 ///166 /// Returns `None` on out-of-bounds condition.167 pub fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {168 self.0.get_lazy(index)169 }170171 pub fn iter(&self) -> impl ArrayLikeIter<Result<Val>> + '_ {172 (0..self.len()).map(|i| self.get(i).transpose().expect("length checked"))173 }174175 /// Iterate over elements, returning lazy values.176 pub fn iter_lazy(&self) -> impl ArrayLikeIter<Thunk<Val>> + '_ {177 (0..self.len()).map(|i| self.get_lazy(i).expect("length checked"))178 }179180 /// Prefer it over `iter_lazy`, but do not use it where `iter` will do.181 pub fn iter_cheap(&self) -> Option<impl ArrayLikeIter<Val> + '_> {182 if self.is_cheap() {183 Some((0..self.len()).map(|i| self.get_cheap(i).expect("length and is_cheap checked")))184 } else {185 None186 }187 }188189 /// Return a reversed view on current array.190 #[must_use]191 pub fn reversed(self) -> Self {192 Self::new(ReverseArray(self))193 }194195 pub fn ptr_eq(a: &Self, b: &Self) -> bool {196 Cc::ptr_eq(&a.0, &b.0)197 }198199 /// Is this vec supports `.get_cheap()?`200 pub fn is_cheap(&self) -> bool {201 self.0.is_cheap()202 }203204 pub fn as_any(&self) -> &dyn Any {205 &self.0206 }207}208impl From<Vec<Val>> for ArrValue {209 fn from(value: Vec<Val>) -> Self {210 Self::eager(value)211 }212}213impl From<Vec<Thunk<Val>>> for ArrValue {214 fn from(value: Vec<Thunk<Val>>) -> Self {215 Self::lazy(value)216 }217}218impl FromIterator<Val> for ArrValue {219 fn from_iter<T: IntoIterator<Item = Val>>(iter: T) -> Self {220 Self::eager(iter.into_iter().collect())221 }222}223impl ArrayLike for ArrValue {224 fn len(&self) -> usize {225 self.0.len()226 }227228 fn get(&self, index: usize) -> Result<Option<Val>> {229 self.0.get(index)230 }231232 fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {233 self.0.get_lazy(index)234 }235236 fn get_cheap(&self, index: usize) -> Option<Val> {237 self.0.get_cheap(index)238 }239240 fn is_cheap(&self) -> bool {241 self.0.is_cheap()242 }243}crates/jrsonnet-evaluator/src/arr/spec.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/arr/spec.rs
+++ b/crates/jrsonnet-evaluator/src/arr/spec.rs
@@ -8,8 +8,11 @@
use super::ArrValue;
use crate::function::NativeFn;
use crate::{
- error::ErrorKind::InfiniteRecursionDetected, evaluate, typed::Typed, val::ThunkValue, Context,
- Error, ObjValue, Result, Thunk, Val,
+ error::ErrorKind::InfiniteRecursionDetected,
+ evaluate,
+ typed::{IntoUntyped, Typed},
+ val::ThunkValue,
+ Context, Error, ObjValue, Result, Thunk, Val,
};
pub trait ArrayLike: Any + Trace + Debug {
crates/jrsonnet-evaluator/src/evaluate/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate/mod.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/mod.rs
@@ -20,7 +20,7 @@
function::{CallLocation, FuncDesc, FuncVal},
gc::WithCapacityExt as _,
in_frame,
- typed::Typed,
+ typed::{FromUntyped, IntoUntyped as _, Typed},
val::{CachedUnbound, IndexableVal, NumValue, StrValue, Thunk},
with_state, Context, Error, ObjValue, ObjValueBuilder, ObjectAssertion, Pending, Result,
ResultExt, SupThis, Unbound, Val,
@@ -620,7 +620,7 @@
}
}
Slice(slice) => {
- fn parse_idx<T: Typed>(
+ fn parse_idx<T: Typed + FromUntyped>(
loc: CallLocation<'_>,
ctx: Context,
expr: Option<&Spanned<Expr>>,
crates/jrsonnet-evaluator/src/evaluate/operator.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate/operator.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/operator.rs
@@ -8,7 +8,7 @@
error::ErrorKind::*,
evaluate,
stdlib::std_format,
- typed::Typed,
+ typed::IntoUntyped as _,
val::{equals, StrValue},
Context, Result, Val,
};
crates/jrsonnet-evaluator/src/function/native.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/function/native.rs
+++ b/crates/jrsonnet-evaluator/src/function/native.rs
@@ -3,7 +3,11 @@
use jrsonnet_gcmodule::Trace;
use super::PreparedFuncVal;
-use crate::{bail, function::FuncVal, typed::Typed, CallLocation, Result, Val};
+use crate::{
+ function::FuncVal,
+ typed::{FromUntyped, IntoUntyped, Typed},
+ CallLocation, Result, Val,
+};
use jrsonnet_types::{ComplexValType, ValType};
#[derive(Debug, Trace, Clone)]
@@ -12,8 +16,8 @@
($i:expr; $($gen:ident)*) => {
impl<$($gen,)* O> NativeFn<($($gen,)* O,)>
where
- $($gen: Typed,)*
- O: Typed,
+ $($gen: Typed + IntoUntyped,)*
+ O: Typed + FromUntyped,
{
#[allow(non_snake_case, clippy::too_many_arguments)]
pub fn call(
@@ -22,7 +26,7 @@
) -> Result<O> {
let val = self.0.call(
CallLocation::native(),
- &[$(Typed::into_lazy_untyped($gen),)*],
+ &[$(IntoUntyped::into_lazy_untyped($gen),)*],
&[],
)?;
O::from_untyped(val)
@@ -30,11 +34,9 @@
}
impl<$($gen,)* O> Typed for NativeFn<($($gen,)* O,)> {
const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Func);
-
- fn into_untyped(_typed: Self) -> Result<Val> {
- bail!("can only convert functions from jsonnet to native")
- }
+ }
+ impl<$($gen,)* O> FromUntyped for NativeFn<($($gen,)* O,)> {
fn from_untyped(untyped: Val) -> Result<Self> {
let func = FuncVal::from_untyped(untyped)?;
Ok(Self(
crates/jrsonnet-evaluator/src/stdlib/format.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/stdlib/format.rs
+++ b/crates/jrsonnet-evaluator/src/stdlib/format.rs
@@ -9,7 +9,7 @@
use crate::{
bail,
error::{format_found, suggest_object_fields, ErrorKind::*},
- typed::Typed,
+ typed::FromUntyped,
Error, ObjValue, Result, Val,
};
crates/jrsonnet-evaluator/src/typed/conversions.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/typed/conversions.rs
+++ b/crates/jrsonnet-evaluator/src/typed/conversions.rs
@@ -1,6 +1,6 @@
use std::{collections::BTreeMap, marker::PhantomData, ops::Deref};
-use jrsonnet_gcmodule::{Cc, Trace};
+use jrsonnet_gcmodule::Trace;
use jrsonnet_interner::{IBytes, IStr};
pub use jrsonnet_macros::Typed;
use jrsonnet_types::{ComplexValType, ValType};
@@ -8,17 +8,17 @@
use crate::{
arr::{ArrValue, BytesArray},
bail,
- function::{FuncDesc, FuncVal},
+ function::FuncVal,
typed::CheckType,
val::{IndexableVal, NumValue, StrValue, ThunkMapper},
ObjValue, ObjValueBuilder, Result, ResultExt, Thunk, Val,
};
#[derive(Trace)]
-struct FromUntyped<K: Trace>(PhantomData<fn() -> K>);
-impl<K> ThunkMapper<Val> for FromUntyped<K>
+struct ThunkFromUntyped<K: Trace>(PhantomData<fn() -> K>);
+impl<K> ThunkMapper<Val> for ThunkFromUntyped<K>
where
- K: Typed + Trace,
+ K: Typed + FromUntyped + Trace,
{
type Output = K;
@@ -26,12 +26,29 @@
K::from_untyped(from)
}
}
-impl<K: Trace> Default for FromUntyped<K> {
+impl<K: Trace> Default for ThunkFromUntyped<K> {
fn default() -> Self {
Self(PhantomData)
}
}
+#[derive(Trace)]
+struct ThunkIntoUntyped<K: Trace>(PhantomData<fn() -> K>);
+impl<K> ThunkMapper<K> for ThunkIntoUntyped<K>
+where
+ K: Typed + Trace + IntoUntyped,
+{
+ type Output = Val;
+ fn map(self, from: K) -> Result<Self::Output> {
+ K::into_untyped(from)
+ }
+}
+impl<K: Trace> Default for ThunkIntoUntyped<K> {
+ fn default() -> Self {
+ Self(PhantomData)
+ }
+}
+
pub trait TypedObj: Typed {
fn serialize(self, out: &mut ObjValueBuilder) -> Result<()>;
fn parse(obj: &ObjValue) -> Result<Self>;
@@ -44,31 +61,41 @@
pub trait Typed: Sized {
const TYPE: &'static ComplexValType;
+}
+pub trait IntoUntyped: Typed {
+ // Whatever caller should use `into_lazy_untyped` instead of `into_untyped`
+ fn provides_lazy() -> bool {
+ false
+ }
fn into_untyped(typed: Self) -> Result<Val>;
fn into_lazy_untyped(typed: Self) -> Thunk<Val> {
Thunk::from(Self::into_untyped(typed))
}
+}
+pub trait IntoUntypedResult: Typed {
+ /// Hack to make builtins be able to return non-result values, and make macros able to convert those values to result
+ /// This method returns identity in impl Typed for Result, and should not be overriden
+ #[doc(hidden)]
+ fn into_untyped_result(typed: Self) -> Result<Val>;
+}
+impl<T> IntoUntypedResult for T
+where
+ T: IntoUntyped,
+{
+ fn into_untyped_result(typed: Self) -> Result<Val> {
+ T::into_untyped(typed)
+ }
+}
+
+pub trait FromUntyped: Typed {
fn from_untyped(untyped: Val) -> Result<Self>;
fn from_lazy_untyped(lazy: Thunk<Val>) -> Result<Self> {
Self::from_untyped(lazy.evaluate()?)
}
- // Whatever caller should use `into_lazy_untyped` instead of `into_untyped`
- fn provides_lazy() -> bool {
- false
- }
-
// Whatever caller should use `from_lazy_untyped` instead of `from_untyped` when possible
fn wants_lazy() -> bool {
false
- }
-
- /// Hack to make builtins be able to return non-result values, and make macros able to convert those values to result
- /// This method returns identity in impl Typed for Result, and should not be overriden
- #[doc(hidden)]
- fn into_result(typed: Self) -> Result<Val> {
- let value = Self::into_untyped(typed)?;
- Ok(value)
}
}
@@ -77,38 +104,30 @@
T: Typed + Trace + Clone,
{
const TYPE: &'static ComplexValType = &ComplexValType::Lazy(T::TYPE);
+}
+impl<T> IntoUntyped for Thunk<T>
+where
+ T: Typed + IntoUntyped + Trace + Clone,
+{
fn into_untyped(typed: Self) -> Result<Val> {
T::into_untyped(typed.evaluate()?)
- }
-
- fn from_untyped(untyped: Val) -> Result<Self> {
- Self::from_lazy_untyped(Thunk::evaluated(untyped))
}
-
fn provides_lazy() -> bool {
true
}
fn into_lazy_untyped(inner: Self) -> Thunk<Val> {
- #[derive(Trace)]
- struct IntoUntyped<K: Trace>(PhantomData<fn() -> K>);
- impl<K> ThunkMapper<K> for IntoUntyped<K>
- where
- K: Typed + Trace,
- {
- type Output = Val;
+ inner.map(<ThunkIntoUntyped<T>>::default())
+ }
+}
- fn map(self, from: K) -> Result<Self::Output> {
- K::into_untyped(from)
- }
- }
- impl<K: Trace> Default for IntoUntyped<K> {
- fn default() -> Self {
- Self(PhantomData)
- }
- }
- inner.map(<IntoUntyped<T>>::default())
+impl<T> FromUntyped for Thunk<T>
+where
+ T: Typed + FromUntyped + Trace + Clone,
+{
+ fn from_untyped(untyped: Val) -> Result<Self> {
+ Self::from_lazy_untyped(Thunk::evaluated(untyped))
}
fn wants_lazy() -> bool {
@@ -116,7 +135,7 @@
}
fn from_lazy_untyped(inner: Thunk<Val>) -> Result<Self> {
- Ok(inner.map(<FromUntyped<T>>::default()))
+ Ok(inner.map(<ThunkFromUntyped<T>>::default()))
}
}
@@ -128,6 +147,8 @@
impl Typed for $ty {
const TYPE: &'static ComplexValType =
&ComplexValType::BoundedNumber(Some(Self::MIN as f64), Some(Self::MAX as f64));
+ }
+ impl FromUntyped for $ty {
fn from_untyped(value: Val) -> Result<Self> {
<Self as Typed>::TYPE.check(&value)?;
match value {
@@ -145,6 +166,8 @@
_ => unreachable!(),
}
}
+ }
+ impl IntoUntyped for $ty {
fn into_untyped(value: Self) -> Result<Val> {
Ok(Val::Num(value.into()))
}
@@ -183,7 +206,9 @@
Some(MIN as f64),
Some(MAX as f64),
);
+ }
+ impl<const MIN: $ty, const MAX: $ty> FromUntyped for $name<MIN, MAX> {
fn from_untyped(value: Val) -> Result<Self> {
<Self as Typed>::TYPE.check(&value)?;
match value {
@@ -201,7 +226,9 @@
_ => unreachable!(),
}
}
+ }
+ impl<const MIN: $ty, const MAX: $ty> IntoUntyped for $name<MIN, MAX> {
#[allow(clippy::cast_lossless)]
fn into_untyped(value: Self) -> Result<Val> {
Ok(Val::try_num(value.0)?)
@@ -220,11 +247,13 @@
impl Typed for f64 {
const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Num);
-
+}
+impl IntoUntyped for f64 {
fn into_untyped(value: Self) -> Result<Val> {
Ok(Val::try_num(value)?)
}
-
+}
+impl FromUntyped for f64 {
fn from_untyped(value: Val) -> Result<Self> {
<Self as Typed>::TYPE.check(&value)?;
match value {
@@ -237,11 +266,13 @@
pub struct PositiveF64(pub f64);
impl Typed for PositiveF64 {
const TYPE: &'static ComplexValType = &ComplexValType::BoundedNumber(Some(0.0), None);
-
+}
+impl IntoUntyped for PositiveF64 {
fn into_untyped(value: Self) -> Result<Val> {
Ok(Val::try_num(value.0)?)
}
-
+}
+impl FromUntyped for PositiveF64 {
fn from_untyped(value: Val) -> Result<Self> {
<Self as Typed>::TYPE.check(&value)?;
match value {
@@ -253,11 +284,13 @@
impl Typed for usize {
const TYPE: &'static ComplexValType =
&ComplexValType::BoundedNumber(Some(0.0), Some(MAX_SAFE_INTEGER));
-
+}
+impl IntoUntyped for usize {
fn into_untyped(value: Self) -> Result<Val> {
Ok(Val::try_num(value)?)
}
-
+}
+impl FromUntyped for usize {
fn from_untyped(value: Val) -> Result<Self> {
<Self as Typed>::TYPE.check(&value)?;
match value {
@@ -276,11 +309,13 @@
impl Typed for IStr {
const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Str);
-
+}
+impl IntoUntyped for IStr {
fn into_untyped(value: Self) -> Result<Val> {
Ok(Val::string(value))
}
-
+}
+impl FromUntyped for IStr {
fn from_untyped(value: Val) -> Result<Self> {
<Self as Typed>::TYPE.check(&value)?;
match value {
@@ -292,11 +327,13 @@
impl Typed for String {
const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Str);
-
+}
+impl IntoUntyped for String {
fn into_untyped(value: Self) -> Result<Val> {
Ok(Val::string(value))
}
-
+}
+impl FromUntyped for String {
fn from_untyped(value: Val) -> Result<Self> {
<Self as Typed>::TYPE.check(&value)?;
match value {
@@ -308,11 +345,13 @@
impl Typed for StrValue {
const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Str);
-
+}
+impl IntoUntyped for StrValue {
fn into_untyped(value: Self) -> Result<Val> {
Ok(Val::Str(value))
}
-
+}
+impl FromUntyped for StrValue {
fn from_untyped(value: Val) -> Result<Self> {
<Self as Typed>::TYPE.check(&value)?;
match value {
@@ -324,11 +363,13 @@
impl Typed for char {
const TYPE: &'static ComplexValType = &ComplexValType::Char;
-
+}
+impl IntoUntyped for char {
fn into_untyped(value: Self) -> Result<Val> {
Ok(Val::string(value))
}
-
+}
+impl FromUntyped for char {
fn from_untyped(value: Val) -> Result<Self> {
<Self as Typed>::TYPE.check(&value)?;
match value {
@@ -338,12 +379,14 @@
}
}
+// TODO: View into vec using ArrayLike?
impl<T> Typed for Vec<T>
where
T: Typed,
{
const TYPE: &'static ComplexValType = &ComplexValType::ArrayRef(T::TYPE);
-
+}
+impl<T: Typed + IntoUntyped> IntoUntyped for Vec<T> {
fn into_untyped(value: Self) -> Result<Val> {
Ok(Val::Arr(
value
@@ -352,7 +395,8 @@
.collect::<Result<ArrValue>>()?,
))
}
-
+}
+impl<T: Typed + FromUntyped> FromUntyped for Vec<T> {
fn from_untyped(value: Val) -> Result<Self> {
let Val::Arr(a) = value else {
<Self as Typed>::TYPE.check(&value)?;
@@ -369,9 +413,19 @@
}
}
-impl<K: Typed + Ord, V: Typed> Typed for BTreeMap<K, V> {
+// TODO: View into BTreeMap using ObjectCore?
+impl<K, V> Typed for BTreeMap<K, V>
+where
+ K: Typed + Ord,
+ V: Typed,
+{
const TYPE: &'static ComplexValType = &ComplexValType::AttrsOf(V::TYPE);
-
+}
+impl<K, V> IntoUntyped for BTreeMap<K, V>
+where
+ K: Typed + Ord + IntoUntyped,
+ V: Typed + IntoUntyped,
+{
fn into_untyped(typed: Self) -> Result<Val> {
let mut out = ObjValueBuilder::with_capacity(typed.len());
for (k, v) in typed {
@@ -383,7 +437,12 @@
}
Ok(Val::Obj(out.build()))
}
-
+}
+impl<K, V> FromUntyped for BTreeMap<K, V>
+where
+ K: FromUntyped + Ord,
+ V: FromUntyped,
+{
fn from_untyped(value: Val) -> Result<Self> {
Self::TYPE.check(&value)?;
let obj = value.as_obj().expect("typecheck should fail");
@@ -416,32 +475,27 @@
impl Typed for Val {
const TYPE: &'static ComplexValType = &ComplexValType::Any;
-
+}
+impl IntoUntyped for Val {
fn into_untyped(typed: Self) -> Result<Val> {
Ok(typed)
}
+}
+impl FromUntyped for Val {
fn from_untyped(untyped: Val) -> Result<Self> {
Ok(untyped)
}
}
-// Hack
#[doc(hidden)]
impl<T> Typed for Result<T>
where
T: Typed,
{
const TYPE: &'static ComplexValType = &ComplexValType::Any;
-
- fn into_untyped(_typed: Self) -> Result<Val> {
- panic!("do not use this conversion")
- }
-
- fn from_untyped(_untyped: Val) -> Result<Self> {
- panic!("do not use this conversion")
- }
-
- fn into_result(typed: Self) -> Result<Val> {
+}
+impl<T: IntoUntyped> IntoUntypedResult for Result<T> {
+ fn into_untyped_result(typed: Self) -> Result<Val> {
typed.map(T::into_untyped)?
}
}
@@ -450,11 +504,13 @@
impl Typed for IBytes {
const TYPE: &'static ComplexValType =
&ComplexValType::ArrayRef(&ComplexValType::BoundedNumber(Some(0.0), Some(255.0)));
-
+}
+impl IntoUntyped for IBytes {
fn into_untyped(value: Self) -> Result<Val> {
Ok(Val::Arr(ArrValue::bytes(value)))
}
-
+}
+impl FromUntyped for IBytes {
fn from_untyped(value: Val) -> Result<Self> {
let Val::Arr(a) = &value else {
<Self as Typed>::TYPE.check(&value)?;
@@ -477,11 +533,13 @@
pub struct M1;
impl Typed for M1 {
const TYPE: &'static ComplexValType = &ComplexValType::BoundedNumber(Some(-1.0), Some(-1.0));
-
+}
+impl IntoUntyped for M1 {
fn into_untyped(_: Self) -> Result<Val> {
Ok(Val::Num(NumValue::new(-1.0).expect("finite")))
}
-
+}
+impl FromUntyped for M1 {
fn from_untyped(value: Val) -> Result<Self> {
<Self as Typed>::TYPE.check(&value)?;
Ok(Self)
@@ -499,13 +557,22 @@
$($id: Typed,)*
{
const TYPE: &'static ComplexValType = &ComplexValType::UnionRef(&[$($id::TYPE),*]);
-
+ }
+ impl<$($id),*> IntoUntyped for $name<$($id),*>
+ where
+ $($id: Typed + IntoUntyped,)*
+ {
fn into_untyped(value: Self) -> Result<Val> {
match value {$(
$name::$id(v) => $id::into_untyped(v)
),*}
}
+ }
+ impl<$($id),*> FromUntyped for $name<$($id),*>
+ where
+ $($id: Typed + FromUntyped,)*
+ {
fn from_untyped(value: Val) -> Result<Self> {
$(
if $id::TYPE.check(&value).is_ok() {
@@ -544,11 +611,13 @@
impl Typed for ArrValue {
const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Arr);
-
+}
+impl IntoUntyped for ArrValue {
fn into_untyped(value: Self) -> Result<Val> {
Ok(Val::Arr(value))
}
-
+}
+impl FromUntyped for ArrValue {
fn from_untyped(value: Val) -> Result<Self> {
<Self as Typed>::TYPE.check(&value)?;
match value {
@@ -560,32 +629,17 @@
impl Typed for FuncVal {
const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Func);
-
+}
+impl IntoUntyped for FuncVal {
fn into_untyped(value: Self) -> Result<Val> {
Ok(Val::Func(value))
}
-
- fn from_untyped(value: Val) -> Result<Self> {
- <Self as Typed>::TYPE.check(&value)?;
- match value {
- Val::Func(a) => Ok(a),
- _ => unreachable!(),
- }
- }
}
-
-impl Typed for Cc<FuncDesc> {
- const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Func);
-
- fn into_untyped(value: Self) -> Result<Val> {
- Ok(Val::Func(FuncVal::Normal(value)))
- }
-
+impl FromUntyped for FuncVal {
fn from_untyped(value: Val) -> Result<Self> {
<Self as Typed>::TYPE.check(&value)?;
match value {
- Val::Func(FuncVal::Normal(desc)) => Ok(desc),
- Val::Func(_) => bail!("expected normal function, not builtin"),
+ Val::Func(a) => Ok(a),
_ => unreachable!(),
}
}
@@ -593,11 +647,13 @@
impl Typed for ObjValue {
const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Obj);
-
+}
+impl IntoUntyped for ObjValue {
fn into_untyped(value: Self) -> Result<Val> {
Ok(Val::Obj(value))
}
-
+}
+impl FromUntyped for ObjValue {
fn from_untyped(value: Val) -> Result<Self> {
<Self as Typed>::TYPE.check(&value)?;
match value {
@@ -609,11 +665,13 @@
impl Typed for bool {
const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Bool);
-
+}
+impl IntoUntyped for bool {
fn into_untyped(value: Self) -> Result<Val> {
Ok(Val::Bool(value))
}
-
+}
+impl FromUntyped for bool {
fn from_untyped(value: Val) -> Result<Self> {
<Self as Typed>::TYPE.check(&value)?;
match value {
@@ -622,19 +680,22 @@
}
}
}
+
impl Typed for IndexableVal {
const TYPE: &'static ComplexValType = &ComplexValType::UnionRef(&[
&ComplexValType::Simple(ValType::Arr),
&ComplexValType::Simple(ValType::Str),
]);
-
+}
+impl IntoUntyped for IndexableVal {
fn into_untyped(value: Self) -> Result<Val> {
match value {
Self::Str(s) => Ok(Val::string(s)),
Self::Arr(a) => Ok(Val::Arr(a)),
}
}
-
+}
+impl FromUntyped for IndexableVal {
fn from_untyped(value: Val) -> Result<Self> {
<Self as Typed>::TYPE.check(&value)?;
value.into_indexable()
@@ -644,11 +705,13 @@
pub struct Null;
impl Typed for Null {
const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Null);
-
+}
+impl IntoUntyped for Null {
fn into_untyped(_: Self) -> Result<Val> {
Ok(Val::Null)
}
-
+}
+impl FromUntyped for Null {
fn from_untyped(value: Val) -> Result<Self> {
<Self as Typed>::TYPE.check(&value)?;
Ok(Self)
@@ -661,11 +724,19 @@
{
const TYPE: &'static ComplexValType =
&ComplexValType::UnionRef(&[&ComplexValType::Simple(ValType::Null), T::TYPE]);
-
+}
+impl<T> IntoUntyped for Option<T>
+where
+ T: Typed + IntoUntyped,
+{
fn into_untyped(typed: Self) -> Result<Val> {
typed.map_or_else(|| Ok(Val::Null), |v| T::into_untyped(v))
}
-
+}
+impl<T> FromUntyped for Option<T>
+where
+ T: Typed + FromUntyped,
+{
fn from_untyped(untyped: Val) -> Result<Self> {
if matches!(untyped, Val::Null) {
Ok(None)
@@ -677,11 +748,13 @@
impl Typed for NumValue {
const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Num);
-
+}
+impl IntoUntyped for NumValue {
fn into_untyped(typed: Self) -> Result<Val> {
Ok(Val::Num(typed))
}
-
+}
+impl FromUntyped for NumValue {
fn from_untyped(untyped: Val) -> Result<Self> {
Self::TYPE.check(&untyped)?;
match untyped {
crates/jrsonnet-interner/src/names.rsdiffbeforeafterboth--- a/crates/jrsonnet-interner/src/names.rs
+++ b/crates/jrsonnet-interner/src/names.rs
@@ -0,0 +1 @@
+
crates/jrsonnet-macros/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-macros/src/lib.rs
+++ b/crates/jrsonnet-macros/src/lib.rs
@@ -8,15 +8,15 @@
parse_macro_input,
punctuated::Punctuated,
spanned::Spanned,
- token::{self, Comma},
+ token::Comma,
Attribute, DeriveInput, Error, Expr, ExprClosure, FnArg, GenericArgument, Ident, ItemFn,
LitStr, Meta, Pat, Path, PathArguments, Result, ReturnType, Token, Type,
};
use self::typed::derive_typed_inner;
+mod names;
mod typed;
-mod names;
fn try_parse_attr_noargs<I>(attrs: &[Attribute], ident: I) -> Result<bool>
where
@@ -202,7 +202,7 @@
_ => {}
}
- let (optionality, ty) = if try_parse_attr_noargs(&mut arg.attrs, "default")? {
+ let (optionality, ty) = if try_parse_attr_noargs(&arg.attrs, "default")? {
remove_attr(&mut arg.attrs, "default");
(Optionality::TypeDefault, ty.clone())
} else if let Some(default) = parse_attr::<_, _>(&arg.attrs, "default")? {
@@ -322,7 +322,7 @@
let name = name.as_ref().map_or("<unnamed>", String::as_str);
let eval = quote! {jrsonnet_evaluator::in_description_frame(
|| format!("argument <{}> evaluation", #name),
- || <#ty>::from_untyped(value.evaluate()?),
+ || <#ty as FromUntyped>::from_untyped(value.evaluate()?),
)?};
let value = match optionality {
Optionality::Required => quote! {{
@@ -411,7 +411,7 @@
use ::jrsonnet_evaluator::{
State, Val,
function::{builtin::{Builtin, StaticBuiltin}, FunctionSignature, ParamParse, ParamName, ParamDefault, CallLocation},
- Result, Context, typed::Typed,
+ Result, Context, typed::{Typed, FromUntyped, IntoUntypedResult},
parser::Span, params, Thunk,
};
params!(
@@ -432,7 +432,7 @@
#[allow(unused_variables)]
fn call(&self, location: CallLocation<'_>, parsed: &[Option<Thunk<Val>>]) -> Result<Val> {
let result: #result = #name(#(#pass)*);
- <_ as Typed>::into_result(result)
+ <_ as IntoUntypedResult>::into_untyped_result(result)
}
fn as_any(&self) -> &dyn ::std::any::Any {
self
crates/jrsonnet-macros/src/names.rsdiffbeforeafterboth--- a/crates/jrsonnet-macros/src/names.rs
+++ b/crates/jrsonnet-macros/src/names.rs
@@ -1,6 +1,5 @@
use proc_macro2::TokenStream;
use quote::quote;
-use std::cell::RefCell;
#[derive(Default)]
pub struct Names {
crates/jrsonnet-macros/src/typed.rsdiffbeforeafterboth--- a/crates/jrsonnet-macros/src/typed.rs
+++ b/crates/jrsonnet-macros/src/typed.rs
@@ -178,7 +178,7 @@
None
};
- __value.map(<#ty as Typed>::from_untyped).transpose()?
+ __value.map(<#ty as FromUntyped>::from_untyped).transpose()?
},
}
}
@@ -219,7 +219,7 @@
return Err(ErrorKind::NoSuchField(__names[#error_text].clone(), vec![]).into());
};
- <#ty as Typed>::from_untyped(__value)?
+ <#ty as FromUntyped>::from_untyped(__value)?
},
}
}
@@ -258,14 +258,14 @@
out.field(__names[#name].clone())
#hide
#add
- .try_thunk(<#ty as Typed>::into_lazy_untyped(value))?;
+ .try_thunk(<#ty as IntoUntyped>::into_lazy_untyped(value))?;
}
} else {
quote! {
out.field(__names[#name].clone())
#hide
#add
- .try_value(<#ty as Typed>::into_untyped(value)?)?;
+ .try_value(<#ty as IntoUntyped>::into_untyped(value)?)?;
}
};
if self.is_option {
@@ -313,18 +313,21 @@
const TYPE: &'static ComplexValType = &ComplexValType::ObjectRef(&[
#(#fields,)*
]);
+ }
+ impl #impl_generics FromUntyped for #ident #ty_generics #where_clause {
fn from_untyped(value: Val) -> JrResult<Self> {
let obj = value.as_obj().expect("shape is correct");
Self::parse(&obj)
}
+ }
+ impl #impl_generics IntoUntyped for #ident #ty_generics #where_clause {
fn into_untyped(value: Self) -> JrResult<Val> {
let mut out = ObjValueBuilder::with_capacity(#capacity);
value.serialize(&mut out)?;
Ok(Val::Obj(out.build()))
}
-
}
}
};
@@ -344,7 +347,7 @@
Ok(quote! {
const _: () = {
use ::jrsonnet_evaluator::{
- typed::{ComplexValType, Typed, TypedObj, CheckType},
+ typed::{ComplexValType, Typed, IntoUntyped, FromUntyped, TypedObj, CheckType},
Val, State,
error::{ErrorKind, Result as JrResult},
ObjValueBuilder, ObjValue, IStr,
crates/jrsonnet-stdlib/src/arrays.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/arrays.rs
+++ b/crates/jrsonnet-stdlib/src/arrays.rs
@@ -4,7 +4,7 @@
bail,
function::{builtin, FuncVal, NativeFn},
runtime_error,
- typed::{BoundedI32, BoundedUsize, Either2, Typed},
+ typed::{BoundedI32, BoundedUsize, Either2, FromUntyped},
val::{equals, ArrValue, IndexableVal},
Either, IStr, ObjValue, ObjValueBuilder, Result, ResultExt, Thunk, Val,
};
@@ -24,7 +24,7 @@
}
func.evaluate_trivial().map_or_else(
// TODO: Different mapped array impl avoiding allocating unnecessary vals
- || Ok(ArrValue::range_exclusive(0, *sz).map(Typed::from_untyped(Val::Func(func))?)),
+ || Ok(ArrValue::range_exclusive(0, *sz).map(FromUntyped::from_untyped(Val::Func(func))?)),
|trivial| {
let mut out = Vec::with_capacity(*sz as usize);
for _ in 0..*sz {
crates/jrsonnet-stdlib/src/keyf.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/keyf.rs
+++ b/crates/jrsonnet-stdlib/src/keyf.rs
@@ -1,5 +1,5 @@
use jrsonnet_evaluator::function::{CallLocation, FuncVal, PreparedFuncVal};
-use jrsonnet_evaluator::typed::{ComplexValType, Typed, ValType};
+use jrsonnet_evaluator::typed::{ComplexValType, FromUntyped, Typed, ValType};
use jrsonnet_evaluator::{Error, Result, Thunk, Val};
#[derive(Default, Clone)]
@@ -31,11 +31,9 @@
impl Typed for KeyF {
const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Func);
+}
+impl FromUntyped for KeyF {
fn from_untyped(untyped: Val) -> Result<Self> {
FuncVal::from_untyped(untyped).map(Self::new)
- }
-
- fn into_untyped(_typed: Self) -> Result<Val> {
- unreachable!("unused, todo: port split of Typed trait from #193")
}
}
crates/jrsonnet-stdlib/src/manifest/ini.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/manifest/ini.rs
+++ b/crates/jrsonnet-stdlib/src/manifest/ini.rs
@@ -2,7 +2,7 @@
use jrsonnet_evaluator::{
manifest::{ManifestFormat, ToStringFormat},
- typed::Typed,
+ typed::{FromUntyped, Typed},
ObjValue, Result, ResultExt, Val,
};
use jrsonnet_parser::IStr;
crates/jrsonnet-stdlib/src/manifest/xml.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/manifest/xml.rs
+++ b/crates/jrsonnet-stdlib/src/manifest/xml.rs
@@ -1,7 +1,7 @@
use jrsonnet_evaluator::{
bail, in_description_frame,
manifest::{ManifestFormat, ToStringFormat},
- typed::{ComplexValType, Either2, Typed, ValType},
+ typed::{ComplexValType, Either2, FromUntyped, Typed, ValType},
val::ArrValue,
Either, ObjValue, Result, ResultExt, Val,
};
@@ -32,11 +32,8 @@
}
impl Typed for JSONMLValue {
const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Arr);
-
- fn into_untyped(_typed: Self) -> Result<Val> {
- unreachable!("not used, reserved for parseXML?")
- }
-
+}
+impl FromUntyped for JSONMLValue {
fn from_untyped(untyped: Val) -> Result<Self> {
let val = <Either![ArrValue, String]>::from_untyped(untyped)
.description("parsing JSONML value (an array or string)")?;
@@ -73,7 +70,7 @@
children: in_description_frame(
|| "parsing children".to_owned(),
|| {
- Typed::from_untyped(Val::Arr(arr.slice(
+ FromUntyped::from_untyped(Val::Arr(arr.slice(
Some(if has_attrs { 2 } else { 1 }),
None,
None,
crates/jrsonnet-stdlib/src/strings.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/strings.rs
+++ b/crates/jrsonnet-stdlib/src/strings.rs
@@ -4,7 +4,7 @@
bail,
error::{ErrorKind::*, Result},
function::builtin,
- typed::{Either2, Typed, M1},
+ typed::{Either2, FromUntyped, M1},
val::{ArrValue, IndexableVal},
Either, IStr, Val,
};
tests/tests/builtin.rsdiffbeforeafterboth--- a/tests/tests/builtin.rs
+++ b/tests/tests/builtin.rs
@@ -5,7 +5,7 @@
function::{CallLocation, FuncVal, builtin, builtin::Builtin},
parser::Source,
trace::PathResolver,
- typed::Typed,
+ typed::FromUntyped,
};
use jrsonnet_gcmodule::Trace;
use jrsonnet_stdlib::ContextInitializer as StdContextInitializer;
tests/tests/typed_obj.rsdiffbeforeafterboth--- a/tests/tests/typed_obj.rs
+++ b/tests/tests/typed_obj.rs
@@ -2,7 +2,11 @@
use std::fmt::Debug;
-use jrsonnet_evaluator::{Result, State, trace::PathResolver, typed::Typed};
+use jrsonnet_evaluator::{
+ Result, State,
+ trace::PathResolver,
+ typed::{FromUntyped, IntoUntyped, Typed},
+};
use jrsonnet_stdlib::ContextInitializer;
#[derive(Clone, Typed, PartialEq, Debug)]
@@ -11,7 +15,9 @@
b: u16,
}
-fn test_roundtrip<T: Typed + PartialEq + Debug + Clone>(value: T) -> Result<()> {
+fn test_roundtrip<T: Typed + PartialEq + Debug + Clone + FromUntyped + IntoUntyped>(
+ value: T,
+) -> Result<()> {
let untyped = T::into_untyped(value.clone())?;
let value2 = T::from_untyped(untyped.clone())?;
ensure_eq!(value, value2);