difftreelog
fix align std.format output with standard jsonnet changes
in: master
4 files changed
crates/jrsonnet-evaluator/src/evaluate/operator.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate/operator.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/operator.rs
@@ -225,15 +225,20 @@
if v2.get() < 0.0 {
bail!("shift by negative exponent")
}
- let exp = ((v2.get() as i64) & 63) as u32;
- Val::try_num((v1.get() as i64).wrapping_shl(exp) as f64)?
+ let base = v1.truncate_for_bitwise()?;
+ let exp = v2.truncate_for_bitwise()? % 64;
+
+ if exp >= 1 && base >= (1i64 << (63 - exp as u32)) {
+ bail!("left shift would overflow")
+ }
+ Val::try_num(base.wrapping_shl(exp as u32) as f64)?
}
(Num(v1), Rhs, Num(v2)) => {
if v2.get() < 0.0 {
bail!("shift by negative exponent")
}
let exp = ((v2.get() as i64) & 63) as u32;
- Val::try_num((v1.get() as i64).wrapping_shr(exp) as f64)?
+ Val::try_num(v1.truncate_for_bitwise()?.wrapping_shr(exp) as f64)?
}
// Bigint X Bigint
crates/jrsonnet-evaluator/src/stdlib/format.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/stdlib/format.rs
+++ b/crates/jrsonnet-evaluator/src/stdlib/format.rs
@@ -137,7 +137,7 @@
#[derive(Debug, PartialEq, Eq)]
pub enum Width {
Star,
- Fixed(usize),
+ Fixed(u16),
}
pub fn try_parse_field_width(str: &str) -> ParseResult<'_, Width> {
if str.is_empty() {
@@ -147,11 +147,11 @@
if bytes[0] == b'*' {
return Ok((Width::Star, &str[1..]));
}
- let mut out: usize = 0;
+ let mut out: u16 = 0;
let mut digits = 0;
while let Some(digit) = (bytes[digits] as char).to_digit(10) {
out *= 10;
- out += digit as usize;
+ out += digit as u16;
digits += 1;
if digits == bytes.len() {
return Err(TruncatedFormatCode);
@@ -299,15 +299,18 @@
#[inline]
pub fn render_integer(
out: &mut String,
+ neg: bool,
iv: f64,
- padding: usize,
- precision: usize,
+ padding: u16,
+ precision: u16,
blank: bool,
sign: bool,
radix: i64,
- prefix: &str,
+ zero_prefix: &str,
+ prefix_in_padding: bool,
caps: bool,
) {
+ debug_assert!(iv >= 0.0, "render_integer receives sign using arg");
let iv = iv.floor() as i64;
// Digit char indexes in reverse order, i.e
// for radix = 16 and n = 12f: [15, 2, 1]
@@ -322,12 +325,14 @@
}
nums
};
- let neg = iv < 0;
#[allow(clippy::bool_to_int_with_if)]
let zp = padding.saturating_sub(if neg || blank || sign { 1 } else { 0 });
+
+ let pref_len = zero_prefix.len() as u16;
let zp2 = zp
+ .saturating_sub(if !prefix_in_padding { pref_len } else { 0 })
.max(precision)
- .saturating_sub(prefix.len() + digits.len());
+ .saturating_sub(if prefix_in_padding { pref_len } else { 0 } + digits.len() as u16);
if neg {
out.push('-');
@@ -337,11 +342,13 @@
out.push(' ');
}
- out.reserve(zp2);
+ out.reserve(zp2 as usize);
+ if iv != 0 {
+ out.push_str(zero_prefix);
+ }
for _ in 0..zp2 {
out.push('0');
}
- out.push_str(prefix);
for digit in digits.into_iter().rev() {
let ch = NUMBERS[digit as usize] as char;
@@ -351,25 +358,30 @@
pub fn render_decimal(
out: &mut String,
+ neg: bool,
iv: f64,
- padding: usize,
- precision: usize,
+ padding: u16,
+ precision: u16,
blank: bool,
sign: bool,
) {
- render_integer(out, iv, padding, precision, blank, sign, 10, "", false);
+ render_integer(
+ out, neg, iv, padding, precision, blank, sign, 10, "", false, false,
+ );
}
pub fn render_octal(
out: &mut String,
+ neg: bool,
iv: f64,
- padding: usize,
- precision: usize,
+ padding: u16,
+ precision: u16,
alt: bool,
blank: bool,
sign: bool,
) {
render_integer(
out,
+ neg,
iv,
padding,
precision,
@@ -377,6 +389,7 @@
sign,
8,
if alt && iv != 0.0 { "0" } else { "" },
+ true,
false,
);
}
@@ -385,8 +398,8 @@
pub fn render_hexadecimal(
out: &mut String,
iv: f64,
- padding: usize,
- precision: usize,
+ padding: u16,
+ precision: u16,
alt: bool,
blank: bool,
sign: bool,
@@ -394,7 +407,8 @@
) {
render_integer(
out,
- iv,
+ iv < 0.0,
+ iv.abs(),
padding,
precision,
blank,
@@ -405,6 +419,7 @@
(true, false) => "0x",
(false, _) => "",
},
+ false,
caps,
);
}
@@ -413,31 +428,36 @@
pub fn render_float(
out: &mut String,
n: f64,
- mut padding: usize,
- precision: usize,
+ mut padding: u16,
+ precision: u16,
blank: bool,
sign: bool,
ensure_pt: bool,
trailing: bool,
) {
+ // Represent the rounded number as an integer * 1/10**prec.
+ // Note that it can also be equal to 10**prec and we'll need to carry
+ // over to the wholes. We operate on the absolute numbers, so that we
+ // don't have trouble with the rounding direction.
+ let denominator = 10.0f64.powi(precision as i32);
+ let numerator = n.abs() * denominator + 0.5;
+ let whole = (numerator / denominator).floor();
+ let frac = numerator.floor() % denominator;
+
#[allow(clippy::bool_to_int_with_if)]
let dot_size = if precision == 0 && !ensure_pt { 0 } else { 1 };
padding = padding.saturating_sub(dot_size + precision);
- render_decimal(out, n.floor(), padding, 0, blank, sign);
+ render_decimal(out, n < 0.0, whole, padding, 0, blank, sign);
if precision == 0 {
if ensure_pt {
out.push('.');
}
return;
}
- let frac = n
- .fract()
- .mul_add(10.0_f64.powf(precision as f64), 0.5)
- .floor();
if trailing || frac > 0.0 {
out.push('.');
let mut frac_str = String::new();
- render_decimal(&mut frac_str, frac, precision, 0, false, false);
+ render_decimal(&mut frac_str, false, frac, precision, 0, false, false);
let mut trim = frac_str.len();
if !trailing {
for b in frac_str.as_bytes().iter().rev() {
@@ -458,25 +478,38 @@
pub fn render_float_sci(
out: &mut String,
n: f64,
- mut padding: usize,
- precision: usize,
+ mut padding: u16,
+ precision: u16,
blank: bool,
sign: bool,
ensure_pt: bool,
trailing: bool,
caps: bool,
) {
- let exponent = n.log10().floor();
+ let exponent = if n == 0.0 {
+ 0.0
+ } else {
+ n.abs().log10().floor()
+ };
+
let mantissa = if exponent as i16 == -324 {
n * 10.0 / 10.0_f64.powf(exponent + 1.0)
} else {
n / 10.0_f64.powf(exponent)
};
let mut exponent_str = String::new();
- render_decimal(&mut exponent_str, exponent, 3, 0, false, true);
+ render_decimal(
+ &mut exponent_str,
+ exponent < 0.0,
+ exponent.abs(),
+ 3,
+ 0,
+ false,
+ true,
+ );
// +1 for e
- padding = padding.saturating_sub(exponent_str.len() + 1);
+ padding = padding.saturating_sub(exponent_str.len() as u16 + 1);
render_float(
out, mantissa, padding, precision, blank, sign, ensure_pt, trailing,
@@ -490,8 +523,8 @@
out: &mut String,
value: &Val,
code: &Code<'_>,
- width: usize,
- precision: Option<usize>,
+ width: u16,
+ precision: Option<u16>,
) -> Result<()> {
let clfags = &code.cflags;
let (fpprec, iprec) = precision.map_or((6, 0), |v| (v, v));
@@ -510,7 +543,8 @@
let value = f64::from_untyped(value.clone())?;
render_decimal(
&mut tmp_out,
- value,
+ value <= -1.0,
+ value.abs(),
padding,
iprec,
clfags.blank,
@@ -521,7 +555,8 @@
let value = f64::from_untyped(value.clone())?;
render_octal(
&mut tmp_out,
- value,
+ value <= -1.0,
+ value.abs(),
padding,
iprec,
clfags.alt,
@@ -589,7 +624,7 @@
code.caps,
);
} else {
- let digits_before_pt = 1.max(exponent as usize + 1);
+ let digits_before_pt = 1.max(exponent as u16 + 1);
render_float(
&mut tmp_out,
value,
@@ -628,7 +663,7 @@
ConvTypeV::Percent => tmp_out.push('%'),
};
- let padding = width.saturating_sub(tmp_out.len());
+ let padding = width.saturating_sub(tmp_out.len() as u16);
if !clfags.left {
for _ in 0..padding {
@@ -663,7 +698,7 @@
}
let value = &values[0];
values = &values[1..];
- usize::from_untyped(value.clone())?
+ u16::from_untyped(value.clone())?
}
Width::Fixed(n) => n,
};
@@ -674,7 +709,7 @@
}
let value = &values[0];
values = &values[1..];
- Some(usize::from_untyped(value.clone())?)
+ Some(u16::from_untyped(value.clone())?)
}
Some(Width::Fixed(n)) => Some(n),
None => None,
crates/jrsonnet-evaluator/src/typed/conversions.rsdiffbeforeafterboth1use std::{collections::BTreeMap, marker::PhantomData, ops::Deref};23use jrsonnet_gcmodule::{Cc, Trace};4use jrsonnet_interner::{IBytes, IStr};5pub use jrsonnet_macros::Typed;6use jrsonnet_types::{ComplexValType, ValType};78use crate::{9 arr::{ArrValue, BytesArray},10 bail,11 function::{native::NativeDesc, FuncDesc, FuncVal},12 typed::CheckType,13 val::{IndexableVal, NumValue, StrValue, ThunkMapper},14 ObjValue, ObjValueBuilder, Result, ResultExt, Thunk, Val,15};1617#[derive(Trace)]18struct FromUntyped<K: Trace>(PhantomData<fn() -> K>);19impl<K> ThunkMapper<Val> for FromUntyped<K>20where21 K: Typed + Trace,22{23 type Output = K;2425 fn map(self, from: Val) -> Result<Self::Output> {26 K::from_untyped(from)27 }28}29impl<K: Trace> Default for FromUntyped<K> {30 fn default() -> Self {31 Self(PhantomData)32 }33}3435pub trait TypedObj: Typed {36 fn serialize(self, out: &mut ObjValueBuilder) -> Result<()>;37 fn parse(obj: &ObjValue) -> Result<Self>;38 fn into_object(self) -> Result<ObjValue> {39 let mut builder = ObjValueBuilder::new();40 self.serialize(&mut builder)?;41 Ok(builder.build())42 }43}4445pub trait Typed: Sized {46 const TYPE: &'static ComplexValType;47 fn into_untyped(typed: Self) -> Result<Val>;48 fn into_lazy_untyped(typed: Self) -> Thunk<Val> {49 Thunk::from(Self::into_untyped(typed))50 }51 fn from_untyped(untyped: Val) -> Result<Self>;52 fn from_lazy_untyped(lazy: Thunk<Val>) -> Result<Self> {53 Self::from_untyped(lazy.evaluate()?)54 }5556 // Whatever caller should use `into_lazy_untyped` instead of `into_untyped`57 fn provides_lazy() -> bool {58 false59 }6061 // Whatever caller should use `from_lazy_untyped` instead of `from_untyped` when possible62 fn wants_lazy() -> bool {63 false64 }6566 /// Hack to make builtins be able to return non-result values, and make macros able to convert those values to result67 /// This method returns identity in impl Typed for Result, and should not be overriden68 #[doc(hidden)]69 fn into_result(typed: Self) -> Result<Val> {70 let value = Self::into_untyped(typed)?;71 Ok(value)72 }73}7475impl<T> Typed for Thunk<T>76where77 T: Typed + Trace + Clone,78{79 const TYPE: &'static ComplexValType = &ComplexValType::Lazy(T::TYPE);8081 fn into_untyped(typed: Self) -> Result<Val> {82 T::into_untyped(typed.evaluate()?)83 }8485 fn from_untyped(untyped: Val) -> Result<Self> {86 Self::from_lazy_untyped(Thunk::evaluated(untyped))87 }8889 fn provides_lazy() -> bool {90 true91 }9293 fn into_lazy_untyped(inner: Self) -> Thunk<Val> {94 #[derive(Trace)]95 struct IntoUntyped<K: Trace>(PhantomData<fn() -> K>);96 impl<K> ThunkMapper<K> for IntoUntyped<K>97 where98 K: Typed + Trace,99 {100 type Output = Val;101102 fn map(self, from: K) -> Result<Self::Output> {103 K::into_untyped(from)104 }105 }106 impl<K: Trace> Default for IntoUntyped<K> {107 fn default() -> Self {108 Self(PhantomData)109 }110 }111 inner.map(<IntoUntyped<T>>::default())112 }113114 fn wants_lazy() -> bool {115 true116 }117118 fn from_lazy_untyped(inner: Thunk<Val>) -> Result<Self> {119 Ok(inner.map(<FromUntyped<T>>::default()))120 }121}122123pub const MAX_SAFE_INTEGER: f64 = ((1u64 << (f64::MANTISSA_DIGITS + 1)) - 1) as f64;124pub const MIN_SAFE_INTEGER: f64 = -MAX_SAFE_INTEGER;125126macro_rules! impl_int {127 ($($ty:ty)*) => {$(128 impl Typed for $ty {129 const TYPE: &'static ComplexValType =130 &ComplexValType::BoundedNumber(Some(Self::MIN as f64), Some(Self::MAX as f64));131 fn from_untyped(value: Val) -> Result<Self> {132 <Self as Typed>::TYPE.check(&value)?;133 match value {134 Val::Num(n) => {135 let n = n.get();136 #[allow(clippy::float_cmp)]137 if n.trunc() != n {138 bail!(139 "cannot convert number with fractional part to {}",140 stringify!($ty)141 )142 }143 Ok(n as Self)144 }145 _ => unreachable!(),146 }147 }148 fn into_untyped(value: Self) -> Result<Val> {149 Ok(Val::Num(value.into()))150 }151 }152 )*};153}154155impl_int!(i8 u8 i16 u16 i32 u32);156157macro_rules! impl_bounded_int {158 ($($name:ident = $ty:ty)*) => {$(159 #[derive(Clone, Copy)]160 pub struct $name<const MIN: $ty, const MAX: $ty>($ty);161 impl<const MIN: $ty, const MAX: $ty> $name<MIN, MAX> {162 pub const fn new(value: $ty) -> Option<$name<MIN, MAX>> {163 if value >= MIN && value <= MAX {164 Some(Self(value))165 } else {166 None167 }168 }169 pub const fn value(self) -> $ty {170 self.0171 }172 }173 impl<const MIN: $ty, const MAX: $ty> Deref for $name<MIN, MAX> {174 type Target = $ty;175 fn deref(&self) -> &Self::Target {176 &self.0177 }178 }179180 impl<const MIN: $ty, const MAX: $ty> Typed for $name<MIN, MAX> {181 const TYPE: &'static ComplexValType =182 &ComplexValType::BoundedNumber(183 Some(MIN as f64),184 Some(MAX as f64),185 );186187 fn from_untyped(value: Val) -> Result<Self> {188 <Self as Typed>::TYPE.check(&value)?;189 match value {190 Val::Num(n) => {191 let n = n.get();192 #[allow(clippy::float_cmp)]193 if n.trunc() != n {194 bail!(195 "cannot convert number with fractional part to {}",196 stringify!($ty)197 )198 }199 Ok(Self(n as $ty))200 }201 _ => unreachable!(),202 }203 }204205 #[allow(clippy::cast_lossless)]206 fn into_untyped(value: Self) -> Result<Val> {207 Ok(Val::try_num(value.0)?)208 }209 }210 )*};211}212213impl_bounded_int!(214 BoundedI8 = i8215 BoundedI16 = i16216 BoundedI32 = i32217 BoundedI64 = i64218 BoundedUsize = usize219);220221impl Typed for f64 {222 const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Num);223224 fn into_untyped(value: Self) -> Result<Val> {225 Ok(Val::try_num(value)?)226 }227228 fn from_untyped(value: Val) -> Result<Self> {229 <Self as Typed>::TYPE.check(&value)?;230 match value {231 Val::Num(n) => Ok(n.get()),232 _ => unreachable!(),233 }234 }235}236237pub struct PositiveF64(pub f64);238impl Typed for PositiveF64 {239 const TYPE: &'static ComplexValType = &ComplexValType::BoundedNumber(Some(0.0), None);240241 fn into_untyped(value: Self) -> Result<Val> {242 Ok(Val::try_num(value.0)?)243 }244245 fn from_untyped(value: Val) -> Result<Self> {246 <Self as Typed>::TYPE.check(&value)?;247 match value {248 Val::Num(n) => Ok(Self(n.get())),249 _ => unreachable!(),250 }251 }252}253impl Typed for usize {254 const TYPE: &'static ComplexValType =255 &ComplexValType::BoundedNumber(Some(0.0), Some(MAX_SAFE_INTEGER));256257 fn into_untyped(value: Self) -> Result<Val> {258 Ok(Val::try_num(value)?)259 }260261 fn from_untyped(value: Val) -> Result<Self> {262 <Self as Typed>::TYPE.check(&value)?;263 match value {264 Val::Num(n) => {265 let n = n.get();266 #[allow(clippy::float_cmp)]267 if n.trunc() != n {268 bail!("cannot convert number with fractional part to usize")269 }270 Ok(n as Self)271 }272 _ => unreachable!(),273 }274 }275}276277impl Typed for IStr {278 const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Str);279280 fn into_untyped(value: Self) -> Result<Val> {281 Ok(Val::string(value))282 }283284 fn from_untyped(value: Val) -> Result<Self> {285 <Self as Typed>::TYPE.check(&value)?;286 match value {287 Val::Str(s) => Ok(s.into_flat()),288 _ => unreachable!(),289 }290 }291}292293impl Typed for String {294 const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Str);295296 fn into_untyped(value: Self) -> Result<Val> {297 Ok(Val::string(value))298 }299300 fn from_untyped(value: Val) -> Result<Self> {301 <Self as Typed>::TYPE.check(&value)?;302 match value {303 Val::Str(s) => Ok(s.to_string()),304 _ => unreachable!(),305 }306 }307}308309impl Typed for StrValue {310 const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Str);311312 fn into_untyped(value: Self) -> Result<Val> {313 Ok(Val::Str(value))314 }315316 fn from_untyped(value: Val) -> Result<Self> {317 <Self as Typed>::TYPE.check(&value)?;318 match value {319 Val::Str(s) => Ok(s),320 _ => unreachable!(),321 }322 }323}324325impl Typed for char {326 const TYPE: &'static ComplexValType = &ComplexValType::Char;327328 fn into_untyped(value: Self) -> Result<Val> {329 Ok(Val::string(value))330 }331332 fn from_untyped(value: Val) -> Result<Self> {333 <Self as Typed>::TYPE.check(&value)?;334 match value {335 Val::Str(s) => Ok(s.into_flat().chars().next().unwrap()),336 _ => unreachable!(),337 }338 }339}340341impl<T> Typed for Vec<T>342where343 T: Typed,344{345 const TYPE: &'static ComplexValType = &ComplexValType::ArrayRef(T::TYPE);346347 fn into_untyped(value: Self) -> Result<Val> {348 Ok(Val::Arr(349 value350 .into_iter()351 .map(T::into_untyped)352 .collect::<Result<ArrValue>>()?,353 ))354 }355356 fn from_untyped(value: Val) -> Result<Self> {357 let Val::Arr(a) = value else {358 <Self as Typed>::TYPE.check(&value)?;359 unreachable!("typecheck should fail")360 };361 a.iter()362 .enumerate()363 .map(|(i, r)| {364 r.and_then(|t| {365 T::from_untyped(t).with_description(|| format!("parsing elem <{i}>"))366 })367 })368 .collect::<Result<Self>>()369 }370}371372impl<K: Typed + Ord, V: Typed> Typed for BTreeMap<K, V> {373 const TYPE: &'static ComplexValType = &ComplexValType::AttrsOf(V::TYPE);374375 fn into_untyped(typed: Self) -> Result<Val> {376 let mut out = ObjValueBuilder::with_capacity(typed.len());377 for (k, v) in typed {378 let Some(key) = K::into_untyped(k)?.as_str() else {379 bail!("map key should serialize to string");380 };381 let value = V::into_untyped(v)?;382 out.field(key).value(value);383 }384 Ok(Val::Obj(out.build()))385 }386387 fn from_untyped(value: Val) -> Result<Self> {388 Self::TYPE.check(&value)?;389 let obj = value.as_obj().expect("typecheck should fail");390391 let mut out = Self::new();392 if V::wants_lazy() {393 for key in obj.fields_ex(394 false,395 #[cfg(feature = "exp-preserve-order")]396 false,397 ) {398 let value = obj.get_lazy(key.clone()).expect("field exists");399 let value = V::from_lazy_untyped(value)?;400 let key = K::from_untyped(Val::Str(key.into()))?;401 let _ = out.insert(key, value);402 }403 } else {404 for (key, value) in obj.iter(405 #[cfg(feature = "exp-preserve-order")]406 false,407 ) {408 let key = K::from_untyped(Val::Str(key.into()))?;409 let value = V::from_untyped(value?)?;410 let _ = out.insert(key, value);411 }412 }413 Ok(out)414 }415}416417impl Typed for Val {418 const TYPE: &'static ComplexValType = &ComplexValType::Any;419420 fn into_untyped(typed: Self) -> Result<Val> {421 Ok(typed)422 }423 fn from_untyped(untyped: Val) -> Result<Self> {424 Ok(untyped)425 }426}427428// Hack429#[doc(hidden)]430impl<T> Typed for Result<T>431where432 T: Typed,433{434 const TYPE: &'static ComplexValType = &ComplexValType::Any;435436 fn into_untyped(_typed: Self) -> Result<Val> {437 panic!("do not use this conversion")438 }439440 fn from_untyped(_untyped: Val) -> Result<Self> {441 panic!("do not use this conversion")442 }443444 fn into_result(typed: Self) -> Result<Val> {445 typed.map(T::into_untyped)?446 }447}448449/// Specialization450impl Typed for IBytes {451 const TYPE: &'static ComplexValType =452 &ComplexValType::ArrayRef(&ComplexValType::BoundedNumber(Some(0.0), Some(255.0)));453454 fn into_untyped(value: Self) -> Result<Val> {455 Ok(Val::Arr(ArrValue::bytes(value)))456 }457458 fn from_untyped(value: Val) -> Result<Self> {459 let Val::Arr(a) = &value else {460 <Self as Typed>::TYPE.check(&value)?;461 unreachable!()462 };463 if let Some(bytes) = a.as_any().downcast_ref::<BytesArray>() {464 return Ok(bytes.0.as_slice().into());465 };466 <Self as Typed>::TYPE.check(&value)?;467 // Any::downcast_ref::<ByteArray>(&a);468 let mut out = Vec::with_capacity(a.len());469 for e in a.iter() {470 let r = e?;471 out.push(u8::from_untyped(r)?);472 }473 Ok(out.as_slice().into())474 }475}476477pub struct M1;478impl Typed for M1 {479 const TYPE: &'static ComplexValType = &ComplexValType::BoundedNumber(Some(-1.0), Some(-1.0));480481 fn into_untyped(_: Self) -> Result<Val> {482 Ok(Val::Num(NumValue::new(-1.0).expect("finite")))483 }484485 fn from_untyped(value: Val) -> Result<Self> {486 <Self as Typed>::TYPE.check(&value)?;487 Ok(Self)488 }489}490491macro_rules! decl_either {492 ($($name: ident, $($id: ident)*);*) => {$(493 #[derive(Clone)]494 pub enum $name<$($id),*> {495 $($id($id)),*496 }497 impl<$($id),*> Typed for $name<$($id),*>498 where499 $($id: Typed,)*500 {501 const TYPE: &'static ComplexValType = &ComplexValType::UnionRef(&[$($id::TYPE),*]);502503 fn into_untyped(value: Self) -> Result<Val> {504 match value {$(505 $name::$id(v) => $id::into_untyped(v)506 ),*}507 }508509 fn from_untyped(value: Val) -> Result<Self> {510 $(511 if $id::TYPE.check(&value).is_ok() {512 $id::from_untyped(value).map(Self::$id)513 } else514 )* {515 <Self as Typed>::TYPE.check(&value)?;516 unreachable!()517 }518 }519 }520 )*}521}522decl_either!(523 Either1, A;524 Either2, A B;525 Either3, A B C;526 Either4, A B C D;527 Either5, A B C D E;528 Either6, A B C D E F;529 Either7, A B C D E F G530);531#[macro_export]532macro_rules! Either {533 ($a:ty) => {$crate::typed::Either1<$a>};534 ($a:ty, $b:ty) => {$crate::typed::Either2<$a, $b>};535 ($a:ty, $b:ty, $c:ty) => {$crate::typed::Either3<$a, $b, $c>};536 ($a:ty, $b:ty, $c:ty, $d:ty) => {$crate::typed::Either4<$a, $b, $c, $d>};537 ($a:ty, $b:ty, $c:ty, $d:ty, $e:ty) => {$crate::typed::Either5<$a, $b, $c, $d, $e>};538 ($a:ty, $b:ty, $c:ty, $d:ty, $e:ty, $f:ty) => {$crate::typed::Either6<$a, $b, $c, $d, $e, $f>};539 ($a:ty, $b:ty, $c:ty, $d:ty, $e:ty, $f:ty, $g:ty) => {$crate::typed::Either7<$a, $b, $c, $d, $e, $f, $g>};540}541pub use Either;542543pub type MyType = Either![u32, f64, String];544545impl Typed for ArrValue {546 const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Arr);547548 fn into_untyped(value: Self) -> Result<Val> {549 Ok(Val::Arr(value))550 }551552 fn from_untyped(value: Val) -> Result<Self> {553 <Self as Typed>::TYPE.check(&value)?;554 match value {555 Val::Arr(a) => Ok(a),556 _ => unreachable!(),557 }558 }559}560561impl Typed for FuncVal {562 const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Func);563564 fn into_untyped(value: Self) -> Result<Val> {565 Ok(Val::Func(value))566 }567568 fn from_untyped(value: Val) -> Result<Self> {569 <Self as Typed>::TYPE.check(&value)?;570 match value {571 Val::Func(a) => Ok(a),572 _ => unreachable!(),573 }574 }575}576577impl Typed for Cc<FuncDesc> {578 const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Func);579580 fn into_untyped(value: Self) -> Result<Val> {581 Ok(Val::Func(FuncVal::Normal(value)))582 }583584 fn from_untyped(value: Val) -> Result<Self> {585 <Self as Typed>::TYPE.check(&value)?;586 match value {587 Val::Func(FuncVal::Normal(desc)) => Ok(desc),588 Val::Func(_) => bail!("expected normal function, not builtin"),589 _ => unreachable!(),590 }591 }592}593594impl Typed for ObjValue {595 const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Obj);596597 fn into_untyped(value: Self) -> Result<Val> {598 Ok(Val::Obj(value))599 }600601 fn from_untyped(value: Val) -> Result<Self> {602 <Self as Typed>::TYPE.check(&value)?;603 match value {604 Val::Obj(a) => Ok(a),605 _ => unreachable!(),606 }607 }608}609610impl Typed for bool {611 const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Bool);612613 fn into_untyped(value: Self) -> Result<Val> {614 Ok(Val::Bool(value))615 }616617 fn from_untyped(value: Val) -> Result<Self> {618 <Self as Typed>::TYPE.check(&value)?;619 match value {620 Val::Bool(a) => Ok(a),621 _ => unreachable!(),622 }623 }624}625impl Typed for IndexableVal {626 const TYPE: &'static ComplexValType = &ComplexValType::UnionRef(&[627 &ComplexValType::Simple(ValType::Arr),628 &ComplexValType::Simple(ValType::Str),629 ]);630631 fn into_untyped(value: Self) -> Result<Val> {632 match value {633 Self::Str(s) => Ok(Val::string(s)),634 Self::Arr(a) => Ok(Val::Arr(a)),635 }636 }637638 fn from_untyped(value: Val) -> Result<Self> {639 <Self as Typed>::TYPE.check(&value)?;640 value.into_indexable()641 }642}643644pub struct Null;645impl Typed for Null {646 const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Null);647648 fn into_untyped(_: Self) -> Result<Val> {649 Ok(Val::Null)650 }651652 fn from_untyped(value: Val) -> Result<Self> {653 <Self as Typed>::TYPE.check(&value)?;654 Ok(Self)655 }656}657658impl<T> Typed for Option<T>659where660 T: Typed,661{662 const TYPE: &'static ComplexValType =663 &ComplexValType::UnionRef(&[&ComplexValType::Simple(ValType::Null), T::TYPE]);664665 fn into_untyped(typed: Self) -> Result<Val> {666 typed.map_or_else(|| Ok(Val::Null), |v| T::into_untyped(v))667 }668669 fn from_untyped(untyped: Val) -> Result<Self> {670 if matches!(untyped, Val::Null) {671 Ok(None)672 } else {673 T::from_untyped(untyped).map(Some)674 }675 }676}677678pub struct NativeFn<D: NativeDesc>(D::Value);679impl<D: NativeDesc> Deref for NativeFn<D> {680 type Target = D::Value;681682 fn deref(&self) -> &Self::Target {683 &self.0684 }685}686impl<D: NativeDesc> Typed for NativeFn<D> {687 const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Func);688689 fn into_untyped(_typed: Self) -> Result<Val> {690 bail!("can only convert functions from jsonnet to native")691 }692693 fn from_untyped(untyped: Val) -> Result<Self> {694 Ok(Self(695 untyped696 .as_func()697 .expect("shape is checked")698 .into_native::<D>(),699 ))700 }701}702703impl Typed for NumValue {704 const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Num);705706 fn into_untyped(typed: Self) -> Result<Val> {707 Ok(Val::Num(typed))708 }709710 fn from_untyped(untyped: Val) -> Result<Self> {711 Self::TYPE.check(&untyped)?;712 match untyped {713 Val::Num(v) => Ok(v),714 _ => unreachable!(),715 }716 }717}1use std::{collections::BTreeMap, marker::PhantomData, ops::Deref};23use jrsonnet_gcmodule::{Cc, Trace};4use jrsonnet_interner::{IBytes, IStr};5pub use jrsonnet_macros::Typed;6use jrsonnet_types::{ComplexValType, ValType};78use crate::{9 arr::{ArrValue, BytesArray},10 bail,11 function::{native::NativeDesc, FuncDesc, FuncVal},12 typed::CheckType,13 val::{IndexableVal, NumValue, StrValue, ThunkMapper},14 ObjValue, ObjValueBuilder, Result, ResultExt, Thunk, Val,15};1617#[derive(Trace)]18struct FromUntyped<K: Trace>(PhantomData<fn() -> K>);19impl<K> ThunkMapper<Val> for FromUntyped<K>20where21 K: Typed + Trace,22{23 type Output = K;2425 fn map(self, from: Val) -> Result<Self::Output> {26 K::from_untyped(from)27 }28}29impl<K: Trace> Default for FromUntyped<K> {30 fn default() -> Self {31 Self(PhantomData)32 }33}3435pub trait TypedObj: Typed {36 fn serialize(self, out: &mut ObjValueBuilder) -> Result<()>;37 fn parse(obj: &ObjValue) -> Result<Self>;38 fn into_object(self) -> Result<ObjValue> {39 let mut builder = ObjValueBuilder::new();40 self.serialize(&mut builder)?;41 Ok(builder.build())42 }43}4445pub trait Typed: Sized {46 const TYPE: &'static ComplexValType;47 fn into_untyped(typed: Self) -> Result<Val>;48 fn into_lazy_untyped(typed: Self) -> Thunk<Val> {49 Thunk::from(Self::into_untyped(typed))50 }51 fn from_untyped(untyped: Val) -> Result<Self>;52 fn from_lazy_untyped(lazy: Thunk<Val>) -> Result<Self> {53 Self::from_untyped(lazy.evaluate()?)54 }5556 // Whatever caller should use `into_lazy_untyped` instead of `into_untyped`57 fn provides_lazy() -> bool {58 false59 }6061 // Whatever caller should use `from_lazy_untyped` instead of `from_untyped` when possible62 fn wants_lazy() -> bool {63 false64 }6566 /// Hack to make builtins be able to return non-result values, and make macros able to convert those values to result67 /// This method returns identity in impl Typed for Result, and should not be overriden68 #[doc(hidden)]69 fn into_result(typed: Self) -> Result<Val> {70 let value = Self::into_untyped(typed)?;71 Ok(value)72 }73}7475impl<T> Typed for Thunk<T>76where77 T: Typed + Trace + Clone,78{79 const TYPE: &'static ComplexValType = &ComplexValType::Lazy(T::TYPE);8081 fn into_untyped(typed: Self) -> Result<Val> {82 T::into_untyped(typed.evaluate()?)83 }8485 fn from_untyped(untyped: Val) -> Result<Self> {86 Self::from_lazy_untyped(Thunk::evaluated(untyped))87 }8889 fn provides_lazy() -> bool {90 true91 }9293 fn into_lazy_untyped(inner: Self) -> Thunk<Val> {94 #[derive(Trace)]95 struct IntoUntyped<K: Trace>(PhantomData<fn() -> K>);96 impl<K> ThunkMapper<K> for IntoUntyped<K>97 where98 K: Typed + Trace,99 {100 type Output = Val;101102 fn map(self, from: K) -> Result<Self::Output> {103 K::into_untyped(from)104 }105 }106 impl<K: Trace> Default for IntoUntyped<K> {107 fn default() -> Self {108 Self(PhantomData)109 }110 }111 inner.map(<IntoUntyped<T>>::default())112 }113114 fn wants_lazy() -> bool {115 true116 }117118 fn from_lazy_untyped(inner: Thunk<Val>) -> Result<Self> {119 Ok(inner.map(<FromUntyped<T>>::default()))120 }121}122123pub const MAX_SAFE_INTEGER: f64 = ((1u64 << (f64::MANTISSA_DIGITS)) - 1) as f64;124pub const MIN_SAFE_INTEGER: f64 = (-((1i64 << (f64::MANTISSA_DIGITS)) - 1)) as f64;125126macro_rules! impl_int {127 ($($ty:ty)*) => {$(128 impl Typed for $ty {129 const TYPE: &'static ComplexValType =130 &ComplexValType::BoundedNumber(Some(Self::MIN as f64), Some(Self::MAX as f64));131 fn from_untyped(value: Val) -> Result<Self> {132 <Self as Typed>::TYPE.check(&value)?;133 match value {134 Val::Num(n) => {135 let n = n.get();136 #[allow(clippy::float_cmp)]137 if n.trunc() != n {138 bail!(139 "cannot convert number with fractional part to {}",140 stringify!($ty)141 )142 }143 Ok(n as Self)144 }145 _ => unreachable!(),146 }147 }148 fn into_untyped(value: Self) -> Result<Val> {149 Ok(Val::Num(value.into()))150 }151 }152 )*};153}154155impl_int!(i8 u8 i16 u16 i32 u32);156157macro_rules! impl_bounded_int {158 ($($name:ident = $ty:ty)*) => {$(159 #[derive(Clone, Copy)]160 pub struct $name<const MIN: $ty, const MAX: $ty>($ty);161 impl<const MIN: $ty, const MAX: $ty> $name<MIN, MAX> {162 pub const fn new(value: $ty) -> Option<$name<MIN, MAX>> {163 if value >= MIN && value <= MAX {164 Some(Self(value))165 } else {166 None167 }168 }169 pub const fn value(self) -> $ty {170 self.0171 }172 }173 impl<const MIN: $ty, const MAX: $ty> Deref for $name<MIN, MAX> {174 type Target = $ty;175 fn deref(&self) -> &Self::Target {176 &self.0177 }178 }179180 impl<const MIN: $ty, const MAX: $ty> Typed for $name<MIN, MAX> {181 const TYPE: &'static ComplexValType =182 &ComplexValType::BoundedNumber(183 Some(MIN as f64),184 Some(MAX as f64),185 );186187 fn from_untyped(value: Val) -> Result<Self> {188 <Self as Typed>::TYPE.check(&value)?;189 match value {190 Val::Num(n) => {191 let n = n.get();192 #[allow(clippy::float_cmp)]193 if n.trunc() != n {194 bail!(195 "cannot convert number with fractional part to {}",196 stringify!($ty)197 )198 }199 Ok(Self(n as $ty))200 }201 _ => unreachable!(),202 }203 }204205 #[allow(clippy::cast_lossless)]206 fn into_untyped(value: Self) -> Result<Val> {207 Ok(Val::try_num(value.0)?)208 }209 }210 )*};211}212213impl_bounded_int!(214 BoundedI8 = i8215 BoundedI16 = i16216 BoundedI32 = i32217 BoundedI64 = i64218 BoundedUsize = usize219);220221impl Typed for f64 {222 const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Num);223224 fn into_untyped(value: Self) -> Result<Val> {225 Ok(Val::try_num(value)?)226 }227228 fn from_untyped(value: Val) -> Result<Self> {229 <Self as Typed>::TYPE.check(&value)?;230 match value {231 Val::Num(n) => Ok(n.get()),232 _ => unreachable!(),233 }234 }235}236237pub struct PositiveF64(pub f64);238impl Typed for PositiveF64 {239 const TYPE: &'static ComplexValType = &ComplexValType::BoundedNumber(Some(0.0), None);240241 fn into_untyped(value: Self) -> Result<Val> {242 Ok(Val::try_num(value.0)?)243 }244245 fn from_untyped(value: Val) -> Result<Self> {246 <Self as Typed>::TYPE.check(&value)?;247 match value {248 Val::Num(n) => Ok(Self(n.get())),249 _ => unreachable!(),250 }251 }252}253impl Typed for usize {254 const TYPE: &'static ComplexValType =255 &ComplexValType::BoundedNumber(Some(0.0), Some(MAX_SAFE_INTEGER));256257 fn into_untyped(value: Self) -> Result<Val> {258 Ok(Val::try_num(value)?)259 }260261 fn from_untyped(value: Val) -> Result<Self> {262 <Self as Typed>::TYPE.check(&value)?;263 match value {264 Val::Num(n) => {265 let n = n.get();266 #[allow(clippy::float_cmp)]267 if n.trunc() != n {268 bail!("cannot convert number with fractional part to usize")269 }270 Ok(n as Self)271 }272 _ => unreachable!(),273 }274 }275}276277impl Typed for IStr {278 const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Str);279280 fn into_untyped(value: Self) -> Result<Val> {281 Ok(Val::string(value))282 }283284 fn from_untyped(value: Val) -> Result<Self> {285 <Self as Typed>::TYPE.check(&value)?;286 match value {287 Val::Str(s) => Ok(s.into_flat()),288 _ => unreachable!(),289 }290 }291}292293impl Typed for String {294 const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Str);295296 fn into_untyped(value: Self) -> Result<Val> {297 Ok(Val::string(value))298 }299300 fn from_untyped(value: Val) -> Result<Self> {301 <Self as Typed>::TYPE.check(&value)?;302 match value {303 Val::Str(s) => Ok(s.to_string()),304 _ => unreachable!(),305 }306 }307}308309impl Typed for StrValue {310 const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Str);311312 fn into_untyped(value: Self) -> Result<Val> {313 Ok(Val::Str(value))314 }315316 fn from_untyped(value: Val) -> Result<Self> {317 <Self as Typed>::TYPE.check(&value)?;318 match value {319 Val::Str(s) => Ok(s),320 _ => unreachable!(),321 }322 }323}324325impl Typed for char {326 const TYPE: &'static ComplexValType = &ComplexValType::Char;327328 fn into_untyped(value: Self) -> Result<Val> {329 Ok(Val::string(value))330 }331332 fn from_untyped(value: Val) -> Result<Self> {333 <Self as Typed>::TYPE.check(&value)?;334 match value {335 Val::Str(s) => Ok(s.into_flat().chars().next().unwrap()),336 _ => unreachable!(),337 }338 }339}340341impl<T> Typed for Vec<T>342where343 T: Typed,344{345 const TYPE: &'static ComplexValType = &ComplexValType::ArrayRef(T::TYPE);346347 fn into_untyped(value: Self) -> Result<Val> {348 Ok(Val::Arr(349 value350 .into_iter()351 .map(T::into_untyped)352 .collect::<Result<ArrValue>>()?,353 ))354 }355356 fn from_untyped(value: Val) -> Result<Self> {357 let Val::Arr(a) = value else {358 <Self as Typed>::TYPE.check(&value)?;359 unreachable!("typecheck should fail")360 };361 a.iter()362 .enumerate()363 .map(|(i, r)| {364 r.and_then(|t| {365 T::from_untyped(t).with_description(|| format!("parsing elem <{i}>"))366 })367 })368 .collect::<Result<Self>>()369 }370}371372impl<K: Typed + Ord, V: Typed> Typed for BTreeMap<K, V> {373 const TYPE: &'static ComplexValType = &ComplexValType::AttrsOf(V::TYPE);374375 fn into_untyped(typed: Self) -> Result<Val> {376 let mut out = ObjValueBuilder::with_capacity(typed.len());377 for (k, v) in typed {378 let Some(key) = K::into_untyped(k)?.as_str() else {379 bail!("map key should serialize to string");380 };381 let value = V::into_untyped(v)?;382 out.field(key).value(value);383 }384 Ok(Val::Obj(out.build()))385 }386387 fn from_untyped(value: Val) -> Result<Self> {388 Self::TYPE.check(&value)?;389 let obj = value.as_obj().expect("typecheck should fail");390391 let mut out = Self::new();392 if V::wants_lazy() {393 for key in obj.fields_ex(394 false,395 #[cfg(feature = "exp-preserve-order")]396 false,397 ) {398 let value = obj.get_lazy(key.clone()).expect("field exists");399 let value = V::from_lazy_untyped(value)?;400 let key = K::from_untyped(Val::Str(key.into()))?;401 let _ = out.insert(key, value);402 }403 } else {404 for (key, value) in obj.iter(405 #[cfg(feature = "exp-preserve-order")]406 false,407 ) {408 let key = K::from_untyped(Val::Str(key.into()))?;409 let value = V::from_untyped(value?)?;410 let _ = out.insert(key, value);411 }412 }413 Ok(out)414 }415}416417impl Typed for Val {418 const TYPE: &'static ComplexValType = &ComplexValType::Any;419420 fn into_untyped(typed: Self) -> Result<Val> {421 Ok(typed)422 }423 fn from_untyped(untyped: Val) -> Result<Self> {424 Ok(untyped)425 }426}427428// Hack429#[doc(hidden)]430impl<T> Typed for Result<T>431where432 T: Typed,433{434 const TYPE: &'static ComplexValType = &ComplexValType::Any;435436 fn into_untyped(_typed: Self) -> Result<Val> {437 panic!("do not use this conversion")438 }439440 fn from_untyped(_untyped: Val) -> Result<Self> {441 panic!("do not use this conversion")442 }443444 fn into_result(typed: Self) -> Result<Val> {445 typed.map(T::into_untyped)?446 }447}448449/// Specialization450impl Typed for IBytes {451 const TYPE: &'static ComplexValType =452 &ComplexValType::ArrayRef(&ComplexValType::BoundedNumber(Some(0.0), Some(255.0)));453454 fn into_untyped(value: Self) -> Result<Val> {455 Ok(Val::Arr(ArrValue::bytes(value)))456 }457458 fn from_untyped(value: Val) -> Result<Self> {459 let Val::Arr(a) = &value else {460 <Self as Typed>::TYPE.check(&value)?;461 unreachable!()462 };463 if let Some(bytes) = a.as_any().downcast_ref::<BytesArray>() {464 return Ok(bytes.0.as_slice().into());465 };466 <Self as Typed>::TYPE.check(&value)?;467 // Any::downcast_ref::<ByteArray>(&a);468 let mut out = Vec::with_capacity(a.len());469 for e in a.iter() {470 let r = e?;471 out.push(u8::from_untyped(r)?);472 }473 Ok(out.as_slice().into())474 }475}476477pub struct M1;478impl Typed for M1 {479 const TYPE: &'static ComplexValType = &ComplexValType::BoundedNumber(Some(-1.0), Some(-1.0));480481 fn into_untyped(_: Self) -> Result<Val> {482 Ok(Val::Num(NumValue::new(-1.0).expect("finite")))483 }484485 fn from_untyped(value: Val) -> Result<Self> {486 <Self as Typed>::TYPE.check(&value)?;487 Ok(Self)488 }489}490491macro_rules! decl_either {492 ($($name: ident, $($id: ident)*);*) => {$(493 #[derive(Clone)]494 pub enum $name<$($id),*> {495 $($id($id)),*496 }497 impl<$($id),*> Typed for $name<$($id),*>498 where499 $($id: Typed,)*500 {501 const TYPE: &'static ComplexValType = &ComplexValType::UnionRef(&[$($id::TYPE),*]);502503 fn into_untyped(value: Self) -> Result<Val> {504 match value {$(505 $name::$id(v) => $id::into_untyped(v)506 ),*}507 }508509 fn from_untyped(value: Val) -> Result<Self> {510 $(511 if $id::TYPE.check(&value).is_ok() {512 $id::from_untyped(value).map(Self::$id)513 } else514 )* {515 <Self as Typed>::TYPE.check(&value)?;516 unreachable!()517 }518 }519 }520 )*}521}522decl_either!(523 Either1, A;524 Either2, A B;525 Either3, A B C;526 Either4, A B C D;527 Either5, A B C D E;528 Either6, A B C D E F;529 Either7, A B C D E F G530);531#[macro_export]532macro_rules! Either {533 ($a:ty) => {$crate::typed::Either1<$a>};534 ($a:ty, $b:ty) => {$crate::typed::Either2<$a, $b>};535 ($a:ty, $b:ty, $c:ty) => {$crate::typed::Either3<$a, $b, $c>};536 ($a:ty, $b:ty, $c:ty, $d:ty) => {$crate::typed::Either4<$a, $b, $c, $d>};537 ($a:ty, $b:ty, $c:ty, $d:ty, $e:ty) => {$crate::typed::Either5<$a, $b, $c, $d, $e>};538 ($a:ty, $b:ty, $c:ty, $d:ty, $e:ty, $f:ty) => {$crate::typed::Either6<$a, $b, $c, $d, $e, $f>};539 ($a:ty, $b:ty, $c:ty, $d:ty, $e:ty, $f:ty, $g:ty) => {$crate::typed::Either7<$a, $b, $c, $d, $e, $f, $g>};540}541pub use Either;542543pub type MyType = Either![u32, f64, String];544545impl Typed for ArrValue {546 const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Arr);547548 fn into_untyped(value: Self) -> Result<Val> {549 Ok(Val::Arr(value))550 }551552 fn from_untyped(value: Val) -> Result<Self> {553 <Self as Typed>::TYPE.check(&value)?;554 match value {555 Val::Arr(a) => Ok(a),556 _ => unreachable!(),557 }558 }559}560561impl Typed for FuncVal {562 const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Func);563564 fn into_untyped(value: Self) -> Result<Val> {565 Ok(Val::Func(value))566 }567568 fn from_untyped(value: Val) -> Result<Self> {569 <Self as Typed>::TYPE.check(&value)?;570 match value {571 Val::Func(a) => Ok(a),572 _ => unreachable!(),573 }574 }575}576577impl Typed for Cc<FuncDesc> {578 const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Func);579580 fn into_untyped(value: Self) -> Result<Val> {581 Ok(Val::Func(FuncVal::Normal(value)))582 }583584 fn from_untyped(value: Val) -> Result<Self> {585 <Self as Typed>::TYPE.check(&value)?;586 match value {587 Val::Func(FuncVal::Normal(desc)) => Ok(desc),588 Val::Func(_) => bail!("expected normal function, not builtin"),589 _ => unreachable!(),590 }591 }592}593594impl Typed for ObjValue {595 const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Obj);596597 fn into_untyped(value: Self) -> Result<Val> {598 Ok(Val::Obj(value))599 }600601 fn from_untyped(value: Val) -> Result<Self> {602 <Self as Typed>::TYPE.check(&value)?;603 match value {604 Val::Obj(a) => Ok(a),605 _ => unreachable!(),606 }607 }608}609610impl Typed for bool {611 const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Bool);612613 fn into_untyped(value: Self) -> Result<Val> {614 Ok(Val::Bool(value))615 }616617 fn from_untyped(value: Val) -> Result<Self> {618 <Self as Typed>::TYPE.check(&value)?;619 match value {620 Val::Bool(a) => Ok(a),621 _ => unreachable!(),622 }623 }624}625impl Typed for IndexableVal {626 const TYPE: &'static ComplexValType = &ComplexValType::UnionRef(&[627 &ComplexValType::Simple(ValType::Arr),628 &ComplexValType::Simple(ValType::Str),629 ]);630631 fn into_untyped(value: Self) -> Result<Val> {632 match value {633 Self::Str(s) => Ok(Val::string(s)),634 Self::Arr(a) => Ok(Val::Arr(a)),635 }636 }637638 fn from_untyped(value: Val) -> Result<Self> {639 <Self as Typed>::TYPE.check(&value)?;640 value.into_indexable()641 }642}643644pub struct Null;645impl Typed for Null {646 const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Null);647648 fn into_untyped(_: Self) -> Result<Val> {649 Ok(Val::Null)650 }651652 fn from_untyped(value: Val) -> Result<Self> {653 <Self as Typed>::TYPE.check(&value)?;654 Ok(Self)655 }656}657658impl<T> Typed for Option<T>659where660 T: Typed,661{662 const TYPE: &'static ComplexValType =663 &ComplexValType::UnionRef(&[&ComplexValType::Simple(ValType::Null), T::TYPE]);664665 fn into_untyped(typed: Self) -> Result<Val> {666 typed.map_or_else(|| Ok(Val::Null), |v| T::into_untyped(v))667 }668669 fn from_untyped(untyped: Val) -> Result<Self> {670 if matches!(untyped, Val::Null) {671 Ok(None)672 } else {673 T::from_untyped(untyped).map(Some)674 }675 }676}677678pub struct NativeFn<D: NativeDesc>(D::Value);679impl<D: NativeDesc> Deref for NativeFn<D> {680 type Target = D::Value;681682 fn deref(&self) -> &Self::Target {683 &self.0684 }685}686impl<D: NativeDesc> Typed for NativeFn<D> {687 const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Func);688689 fn into_untyped(_typed: Self) -> Result<Val> {690 bail!("can only convert functions from jsonnet to native")691 }692693 fn from_untyped(untyped: Val) -> Result<Self> {694 Ok(Self(695 untyped696 .as_func()697 .expect("shape is checked")698 .into_native::<D>(),699 ))700 }701}702703impl Typed for NumValue {704 const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Num);705706 fn into_untyped(typed: Self) -> Result<Val> {707 Ok(Val::Num(typed))708 }709710 fn from_untyped(untyped: Val) -> Result<Self> {711 Self::TYPE.check(&untyped)?;712 match untyped {713 Val::Num(v) => Ok(v),714 _ => unreachable!(),715 }716 }717}crates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -22,7 +22,7 @@
function::FuncVal,
gc::WithCapacityExt as _,
manifest::{ManifestFormat, ToStringFormat},
- typed::BoundedUsize,
+ typed::{BoundedUsize, MAX_SAFE_INTEGER, MIN_SAFE_INTEGER},
ObjValue, Result, Unbound, WeakObjValue,
};
@@ -418,6 +418,12 @@
pub const fn get(&self) -> f64 {
self.0
}
+ pub(crate) fn truncate_for_bitwise(&self) -> Result<i64> {
+ if self.0 < MIN_SAFE_INTEGER || self.0 > dbg!(MAX_SAFE_INTEGER) {
+ bail!("numberic value outside of safe integer range for bitwise operation");
+ }
+ Ok(self.0 as i64)
+ }
}
impl PartialEq for NumValue {
fn eq(&self, other: &Self) -> bool {
@@ -490,7 +496,6 @@
type Error = ConvertNumValueError;
#[inline]
fn try_from(value: $ty) -> Result<Self, ConvertNumValueError> {
- use crate::typed::conversions::{MIN_SAFE_INTEGER, MAX_SAFE_INTEGER};
let value = value as f64;
if value < MIN_SAFE_INTEGER {
return Err(ConvertNumValueError::Underflow)