difftreelog
feat varadic Either type
in: master
2 files changed
crates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth1use crate::function::StaticBuiltin;2use crate::typed::{Any, Either, Null, PositiveF64, VecVal, M1};3use crate::{self as jrsonnet_evaluator, ObjValue};4use crate::{5 builtin::manifest::{manifest_yaml_ex, ManifestYamlOptions},6 equals,7 error::{Error::*, Result},8 operator::evaluate_mod_op,9 primitive_equals, push_frame, throw, with_state, ArrValue, Context, FuncVal, IndexableVal, Val,10};11use format::{format_arr, format_obj};12use gcmodule::Cc;13use jrsonnet_interner::IStr;14use jrsonnet_parser::ExprLocation;15use serde::Deserialize;16use serde_yaml::DeserializingQuirks;17use std::collections::HashMap;18use std::convert::{TryFrom, TryInto};1920pub mod stdlib;21pub use stdlib::*;2223use self::manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType};2425pub mod format;26pub mod manifest;27pub mod sort;2829pub fn std_format(str: IStr, vals: Val) -> Result<String> {30 push_frame(31 None,32 || format!("std.format of {}", str),33 || {34 Ok(match vals {35 Val::Arr(vals) => format_arr(&str, &vals.evaluated()?)?,36 Val::Obj(obj) => format_obj(&str, &obj)?,37 o => format_arr(&str, &[o])?,38 })39 },40 )41}4243pub fn std_slice(44 indexable: IndexableVal,45 index: Option<usize>,46 end: Option<usize>,47 step: Option<usize>,48) -> Result<Val> {49 let index = index.unwrap_or(0);50 let end = end.unwrap_or_else(|| match &indexable {51 IndexableVal::Str(_) => usize::MAX,52 IndexableVal::Arr(v) => v.len(),53 });54 let step = step.unwrap_or(1);55 match &indexable {56 IndexableVal::Str(s) => Ok(Val::Str(57 (s.chars()58 .skip(index)59 .take(end - index)60 .step_by(step)61 .collect::<String>())62 .into(),63 )),64 IndexableVal::Arr(arr) => Ok(Val::Arr(65 (arr.iter()66 .skip(index)67 .take(end - index)68 .step_by(step)69 .collect::<Result<Vec<Val>>>()?)70 .into(),71 )),72 }73}7475type BuiltinsType = HashMap<IStr, &'static dyn StaticBuiltin>;7677thread_local! {78 pub static BUILTINS: BuiltinsType = {79 [80 ("length".into(), builtin_length::INST),81 ("type".into(), builtin_type::INST),82 ("makeArray".into(), builtin_make_array::INST),83 ("codepoint".into(), builtin_codepoint::INST),84 ("objectFieldsEx".into(), builtin_object_fields_ex::INST),85 ("objectHasEx".into(), builtin_object_has_ex::INST),86 ("slice".into(), builtin_slice::INST),87 ("substr".into(), builtin_substr::INST),88 ("primitiveEquals".into(), builtin_primitive_equals::INST),89 ("equals".into(), builtin_equals::INST),90 ("modulo".into(), builtin_modulo::INST),91 ("mod".into(), builtin_mod::INST),92 ("floor".into(), builtin_floor::INST),93 ("ceil".into(), builtin_ceil::INST),94 ("log".into(), builtin_log::INST),95 ("pow".into(), builtin_pow::INST),96 ("sqrt".into(), builtin_sqrt::INST),97 ("sin".into(), builtin_sin::INST),98 ("cos".into(), builtin_cos::INST),99 ("tan".into(), builtin_tan::INST),100 ("asin".into(), builtin_asin::INST),101 ("acos".into(), builtin_acos::INST),102 ("atan".into(), builtin_atan::INST),103 ("exp".into(), builtin_exp::INST),104 ("mantissa".into(), builtin_mantissa::INST),105 ("exponent".into(), builtin_exponent::INST),106 ("extVar".into(), builtin_ext_var::INST),107 ("native".into(), builtin_native::INST),108 ("filter".into(), builtin_filter::INST),109 ("map".into(), builtin_map::INST),110 ("flatMap".into(), builtin_flatmap::INST),111 ("foldl".into(), builtin_foldl::INST),112 ("foldr".into(), builtin_foldr::INST),113 ("sort".into(), builtin_sort::INST),114 ("format".into(), builtin_format::INST),115 ("range".into(), builtin_range::INST),116 ("char".into(), builtin_char::INST),117 ("encodeUTF8".into(), builtin_encode_utf8::INST),118 ("decodeUTF8".into(), builtin_decode_utf8::INST),119 ("md5".into(), builtin_md5::INST),120 ("base64".into(), builtin_base64::INST),121 ("base64DecodeBytes".into(), builtin_base64_decode_bytes::INST),122 ("base64Decode".into(), builtin_base64_decode::INST),123 ("trace".into(), builtin_trace::INST),124 ("join".into(), builtin_join::INST),125 ("escapeStringJson".into(), builtin_escape_string_json::INST),126 ("manifestJsonEx".into(), builtin_manifest_json_ex::INST),127 ("manifestYamlDoc".into(), builtin_manifest_yaml_doc::INST),128 ("reverse".into(), builtin_reverse::INST),129 ("id".into(), builtin_id::INST),130 ("strReplace".into(), builtin_str_replace::INST),131 ("splitLimit".into(), builtin_splitlimit::INST),132 ("parseJson".into(), builtin_parse_json::INST),133 ("parseYaml".into(), builtin_parse_yaml::INST),134 ("asciiUpper".into(), builtin_ascii_upper::INST),135 ("asciiLower".into(), builtin_ascii_lower::INST),136 ("member".into(), builtin_member::INST),137 ("count".into(), builtin_count::INST),138 ].iter().cloned().collect()139 };140}141142#[jrsonnet_macros::builtin]143fn builtin_length(x: Either<IStr, Either<VecVal, Either<ObjValue, Cc<FuncVal>>>>) -> Result<usize> {144 Ok(match x {145 Either::Left(x) => x.len(),146 Either::Right(Either::Left(x)) => x.0.len(),147 Either::Right(Either::Right(Either::Left(x))) => x148 .fields_visibility()149 .into_iter()150 .filter(|(_k, v)| *v)151 .count(),152 Either::Right(Either::Right(Either::Right(f))) => f.args_len(),153 })154}155156#[jrsonnet_macros::builtin]157fn builtin_type(x: Any) -> Result<IStr> {158 Ok(x.0.value_type().name().into())159}160161#[jrsonnet_macros::builtin]162fn builtin_make_array(sz: usize, func: Cc<FuncVal>) -> Result<VecVal> {163 let mut out = Vec::with_capacity(sz);164 for i in 0..sz {165 out.push(func.evaluate_simple(&[i as f64].as_slice())?)166 }167 Ok(VecVal(out))168}169170#[jrsonnet_macros::builtin]171const fn builtin_codepoint(str: char) -> Result<u32> {172 Ok(str as u32)173}174175#[jrsonnet_macros::builtin]176fn builtin_object_fields_ex(obj: ObjValue, inc_hidden: bool) -> Result<VecVal> {177 let out = obj.fields_ex(inc_hidden);178 Ok(VecVal(out.into_iter().map(Val::Str).collect::<Vec<_>>()))179}180181#[jrsonnet_macros::builtin]182fn builtin_object_has_ex(obj: ObjValue, f: IStr, inc_hidden: bool) -> Result<bool> {183 Ok(obj.has_field_ex(f, inc_hidden))184}185186#[jrsonnet_macros::builtin]187fn builtin_parse_json(s: IStr) -> Result<Any> {188 let value: serde_json::Value = serde_json::from_str(&s)189 .map_err(|e| RuntimeError(format!("failed to parse json: {}", e).into()))?;190 Ok(Any(Val::try_from(&value)?))191}192193#[jrsonnet_macros::builtin]194fn builtin_parse_yaml(s: IStr) -> Result<Any> {195 let value = serde_yaml::Deserializer::from_str_with_quirks(196 &s,197 DeserializingQuirks { old_octals: true },198 );199 let mut out = vec![];200 for item in value {201 let value = serde_json::Value::deserialize(item)202 .map_err(|e| RuntimeError(format!("failed to parse yaml: {}", e).into()))?;203 let val = Val::try_from(&value)?;204 out.push(val);205 }206 Ok(Any(if out.is_empty() {207 Val::Null208 } else if out.len() == 1 {209 out.into_iter().next().unwrap()210 } else {211 Val::Arr(out.into())212 }))213}214215#[jrsonnet_macros::builtin]216fn builtin_slice(217 indexable: IndexableVal,218 index: Either<usize, Null>,219 end: Either<usize, Null>,220 step: Either<usize, Null>,221) -> Result<Any> {222 std_slice(indexable, index.left(), end.left(), step.left()).map(Any)223}224225#[jrsonnet_macros::builtin]226fn builtin_substr(str: IStr, from: usize, len: usize) -> Result<String> {227 Ok(str.chars().skip(from as usize).take(len as usize).collect())228}229230#[jrsonnet_macros::builtin]231fn builtin_primitive_equals(a: Any, b: Any) -> Result<bool> {232 primitive_equals(&a.0, &b.0)233}234235#[jrsonnet_macros::builtin]236fn builtin_equals(a: Any, b: Any) -> Result<bool> {237 equals(&a.0, &b.0)238}239240#[jrsonnet_macros::builtin]241fn builtin_modulo(a: f64, b: f64) -> Result<f64> {242 Ok(a % b)243}244245#[jrsonnet_macros::builtin]246fn builtin_mod(a: Either<f64, IStr>, b: Any) -> Result<Any> {247 Ok(Any(evaluate_mod_op(248 &match a {249 Either::Left(v) => Val::Num(v),250 Either::Right(s) => Val::Str(s),251 },252 &b.0,253 )?))254}255256#[jrsonnet_macros::builtin]257fn builtin_floor(x: f64) -> Result<f64> {258 Ok(x.floor())259}260261#[jrsonnet_macros::builtin]262fn builtin_ceil(x: f64) -> Result<f64> {263 Ok(x.ceil())264}265266#[jrsonnet_macros::builtin]267fn builtin_log(n: f64) -> Result<f64> {268 Ok(n.ln())269}270271#[jrsonnet_macros::builtin]272fn builtin_pow(x: f64, n: f64) -> Result<f64> {273 Ok(x.powf(n))274}275276#[jrsonnet_macros::builtin]277fn builtin_sqrt(x: PositiveF64) -> Result<f64> {278 Ok(x.0.sqrt())279}280281#[jrsonnet_macros::builtin]282fn builtin_sin(x: f64) -> Result<f64> {283 Ok(x.sin())284}285286#[jrsonnet_macros::builtin]287fn builtin_cos(x: f64) -> Result<f64> {288 Ok(x.cos())289}290291#[jrsonnet_macros::builtin]292fn builtin_tan(x: f64) -> Result<f64> {293 Ok(x.tan())294}295296#[jrsonnet_macros::builtin]297fn builtin_asin(x: f64) -> Result<f64> {298 Ok(x.asin())299}300301#[jrsonnet_macros::builtin]302fn builtin_acos(x: f64) -> Result<f64> {303 Ok(x.acos())304}305306#[jrsonnet_macros::builtin]307fn builtin_atan(x: f64) -> Result<f64> {308 Ok(x.atan())309}310311#[jrsonnet_macros::builtin]312fn builtin_exp(x: f64) -> Result<f64> {313 Ok(x.exp())314}315316fn frexp(s: f64) -> (f64, i16) {317 if 0.0 == s {318 (s, 0)319 } else {320 let lg = s.abs().log2();321 let x = (lg - lg.floor() - 1.0).exp2();322 let exp = lg.floor() + 1.0;323 (s.signum() * x, exp as i16)324 }325}326327#[jrsonnet_macros::builtin]328fn builtin_mantissa(x: f64) -> Result<f64> {329 Ok(frexp(x).0)330}331332#[jrsonnet_macros::builtin]333fn builtin_exponent(x: f64) -> Result<i16> {334 Ok(frexp(x).1)335}336337#[jrsonnet_macros::builtin]338fn builtin_ext_var(x: IStr) -> Result<Any> {339 Ok(Any(with_state(|s| s.settings().ext_vars.get(&x).cloned())340 .ok_or(UndefinedExternalVariable(x))?))341}342343#[jrsonnet_macros::builtin]344fn builtin_native(name: IStr) -> Result<Cc<FuncVal>> {345 Ok(with_state(|s| s.settings().ext_natives.get(&name).cloned())346 .map(|v| Cc::new(FuncVal::NativeExt(name.clone(), v)))347 .ok_or(UndefinedExternalFunction(name))?)348}349350#[jrsonnet_macros::builtin]351fn builtin_filter(func: Cc<FuncVal>, arr: ArrValue) -> Result<ArrValue> {352 arr.filter(|val| bool::try_from(func.evaluate_simple(&[Any(val.clone())].as_slice())?))353}354355#[jrsonnet_macros::builtin]356fn builtin_map(func: Cc<FuncVal>, arr: ArrValue) -> Result<ArrValue> {357 arr.map(|val| func.evaluate_simple(&[Any(val)].as_slice()))358}359360#[jrsonnet_macros::builtin]361fn builtin_flatmap(func: Cc<FuncVal>, arr: IndexableVal) -> Result<IndexableVal> {362 match arr {363 IndexableVal::Str(s) => {364 let mut out = String::new();365 for c in s.chars() {366 match func.evaluate_simple(&[c.to_string()].as_slice())? {367 Val::Str(o) => out.push_str(&o),368 _ => throw!(RuntimeError(369 "in std.join all items should be strings".into()370 )),371 };372 }373 Ok(IndexableVal::Str(out.into()))374 }375 IndexableVal::Arr(a) => {376 let mut out = Vec::new();377 for el in a.iter() {378 let el = el?;379 match func.evaluate_simple(&[Any(el)].as_slice())? {380 Val::Arr(o) => {381 for oe in o.iter() {382 out.push(oe?)383 }384 }385 _ => throw!(RuntimeError(386 "in std.join all items should be arrays".into()387 )),388 };389 }390 Ok(IndexableVal::Arr(out.into()))391 }392 }393}394395#[jrsonnet_macros::builtin]396fn builtin_foldl(func: Cc<FuncVal>, arr: ArrValue, init: Any) -> Result<Any> {397 let mut acc = init.0;398 for i in arr.iter() {399 acc = func.evaluate_simple(&[Any(acc), Any(i?)].as_slice())?;400 }401 Ok(Any(acc))402}403404#[jrsonnet_macros::builtin]405fn builtin_foldr(func: Cc<FuncVal>, arr: ArrValue, init: Any) -> Result<Any> {406 let mut acc = init.0;407 for i in arr.iter().rev() {408 acc = func.evaluate_simple(&[Any(i?), Any(acc)].as_slice())?;409 }410 Ok(Any(acc))411}412413#[jrsonnet_macros::builtin]414#[allow(non_snake_case)]415fn builtin_sort(arr: ArrValue, keyF: Option<Cc<FuncVal>>) -> Result<ArrValue> {416 if arr.len() <= 1 {417 return Ok(arr);418 }419 Ok(ArrValue::Eager(sort::sort(420 arr.evaluated()?,421 keyF.as_deref(),422 )?))423}424425#[jrsonnet_macros::builtin]426fn builtin_format(str: IStr, vals: Any) -> Result<String> {427 std_format(str, vals.0)428}429430#[jrsonnet_macros::builtin]431fn builtin_range(from: i32, to: i32) -> Result<VecVal> {432 if to < from {433 return Ok(VecVal(Vec::new()));434 }435 let mut out = Vec::with_capacity((1 + to as usize - from as usize).max(0));436 for i in from as usize..=to as usize {437 out.push(Val::Num(i as f64));438 }439 Ok(VecVal(out))440}441442#[jrsonnet_macros::builtin]443fn builtin_char(n: u32) -> Result<char> {444 Ok(std::char::from_u32(n as u32).ok_or(InvalidUnicodeCodepointGot(n as u32))?)445}446447#[jrsonnet_macros::builtin]448fn builtin_encode_utf8(str: IStr) -> Result<VecVal> {449 Ok(VecVal(450 str.bytes()451 .map(|b| Val::Num(b as f64))452 .collect::<Vec<Val>>(),453 ))454}455456#[jrsonnet_macros::builtin]457fn builtin_decode_utf8(arr: Vec<u8>) -> Result<String> {458 Ok(String::from_utf8(arr).map_err(|_| RuntimeError("bad utf8".into()))?)459}460461#[jrsonnet_macros::builtin]462fn builtin_md5(str: IStr) -> Result<String> {463 Ok(format!("{:x}", md5::compute(&str.as_bytes())))464}465466#[jrsonnet_macros::builtin]467fn builtin_trace(#[location] loc: Option<&ExprLocation>, str: IStr, rest: Any) -> Result<Any> {468 eprint!("TRACE:");469 if let Some(loc) = loc {470 with_state(|s| {471 let locs = s.map_source_locations(&loc.0, &[loc.1]);472 eprint!(473 " {}:{}",474 loc.0.file_name().unwrap().to_str().unwrap(),475 locs[0].line476 );477 });478 }479 eprintln!(" {}", str);480 Ok(rest) as Result<Any>481}482483#[jrsonnet_macros::builtin]484fn builtin_base64(input: Either<Vec<u8>, IStr>) -> Result<String> {485 Ok(match input {486 Either::Left(a) => base64::encode(a),487 Either::Right(l) => base64::encode(l.bytes().collect::<Vec<_>>()),488 })489}490491#[jrsonnet_macros::builtin]492fn builtin_base64_decode_bytes(input: IStr) -> Result<Vec<u8>> {493 Ok(base64::decode(&input.as_bytes()).map_err(|_| RuntimeError("bad base64".into()))?)494}495496#[jrsonnet_macros::builtin]497fn builtin_base64_decode(input: IStr) -> Result<String> {498 let bytes = base64::decode(&input.as_bytes()).map_err(|_| RuntimeError("bad base64".into()))?;499 Ok(String::from_utf8(bytes).map_err(|_| RuntimeError("bad utf8".into()))?)500}501502#[jrsonnet_macros::builtin]503fn builtin_join(sep: IndexableVal, arr: ArrValue) -> Result<IndexableVal> {504 Ok(match sep {505 IndexableVal::Arr(joiner_items) => {506 let mut out = Vec::new();507508 let mut first = true;509 for item in arr.iter() {510 let item = item?.clone();511 if let Val::Arr(items) = item {512 if !first {513 out.reserve(joiner_items.len());514 // TODO: extend515 for item in joiner_items.iter() {516 out.push(item?);517 }518 }519 first = false;520 out.reserve(items.len());521 // TODO: extend522 for item in items.iter() {523 out.push(item?);524 }525 } else {526 throw!(RuntimeError(527 "in std.join all items should be arrays".into()528 ));529 }530 }531532 IndexableVal::Arr(out.into())533 }534 IndexableVal::Str(sep) => {535 let mut out = String::new();536537 let mut first = true;538 for item in arr.iter() {539 let item = item?.clone();540 if let Val::Str(item) = item {541 if !first {542 out += &sep;543 }544 first = false;545 out += &item;546 } else {547 throw!(RuntimeError(548 "in std.join all items should be strings".into()549 ));550 }551 }552553 IndexableVal::Str(out.into())554 }555 })556}557558#[jrsonnet_macros::builtin]559fn builtin_escape_string_json(str_: IStr) -> Result<String> {560 Ok(escape_string_json(&str_))561}562563#[jrsonnet_macros::builtin]564fn builtin_manifest_json_ex(value: Any, indent: IStr) -> Result<String> {565 manifest_json_ex(566 &value.0,567 &ManifestJsonOptions {568 padding: &indent,569 mtype: ManifestType::Std,570 },571 )572}573574#[jrsonnet_macros::builtin]575fn builtin_manifest_yaml_doc(576 value: Any,577 indent_array_in_object: Option<bool>,578 quote_keys: Option<bool>,579) -> Result<String> {580 manifest_yaml_ex(581 &value.0,582 &ManifestYamlOptions {583 padding: " ",584 arr_element_padding: if indent_array_in_object.unwrap_or(false) {585 " "586 } else {587 ""588 },589 quote_keys: quote_keys.unwrap_or(true),590 },591 )592}593594#[jrsonnet_macros::builtin]595fn builtin_reverse(value: ArrValue) -> Result<ArrValue> {596 Ok(value.reversed())597}598599#[jrsonnet_macros::builtin]600const fn builtin_id(v: Any) -> Result<Any> {601 Ok(v)602}603604#[jrsonnet_macros::builtin]605fn builtin_str_replace(str: String, from: IStr, to: IStr) -> Result<String> {606 Ok(str.replace(&from as &str, &to as &str))607}608609#[jrsonnet_macros::builtin]610fn builtin_splitlimit(str: IStr, c: char, maxsplits: Either<usize, M1>) -> Result<VecVal> {611 Ok(VecVal(match maxsplits {612 Either::Left(n) => str.splitn(n + 1, c).map(|s| Val::Str(s.into())).collect(),613 Either::Right(_) => str.split(c).map(|s| Val::Str(s.into())).collect(),614 }))615}616617#[jrsonnet_macros::builtin]618fn builtin_ascii_upper(str: IStr) -> Result<String> {619 Ok(str.to_ascii_uppercase())620}621622#[jrsonnet_macros::builtin]623fn builtin_ascii_lower(str: IStr) -> Result<String> {624 Ok(str.to_ascii_lowercase())625}626627#[jrsonnet_macros::builtin]628fn builtin_member(arr: IndexableVal, x: Any) -> Result<bool> {629 match arr {630 IndexableVal::Str(s) => {631 let x: IStr = IStr::try_from(x.0)?;632 Ok(!x.is_empty() && s.contains(&*x))633 }634 IndexableVal::Arr(a) => {635 for item in a.iter() {636 let item = item?;637 if equals(&item, &x.0)? {638 return Ok(true);639 }640 }641 Ok(false)642 }643 }644}645646#[jrsonnet_macros::builtin]647fn builtin_count(arr: Vec<Any>, v: Any) -> Result<usize> {648 let mut count = 0;649 for item in arr.iter() {650 if equals(&item.0, &v.0)? {651 count += 1;652 }653 }654 Ok(count)655}crates/jrsonnet-evaluator/src/typed/conversions.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/typed/conversions.rs
+++ b/crates/jrsonnet-evaluator/src/typed/conversions.rs
@@ -315,66 +315,68 @@
}
}
-pub enum Either<A, B> {
- Left(A),
- Right(B),
-}
+macro_rules! decl_either {
+ ($($name: ident, $($id: ident)*);*) => {$(
+ pub enum $name<$($id),*> {
+ $($id($id)),*
+ }
+ impl<$($id),*> Typed for $name<$($id),*>
+ where
+ $($id: Typed,)*
+ {
+ const TYPE: &'static ComplexValType = &ComplexValType::UnionRef(&[$($id::TYPE),*]);
+ }
+ impl<$($id),*> TryFrom<Val> for $name<$($id),*>
+ where
+ $($id: Typed,)*
+ {
+ type Error = LocError;
-impl<A, B> Either<A, B> {
- pub fn to_left(self, f: impl FnOnce(B) -> A) -> A {
- match self {
- Either::Left(l) => l,
- Either::Right(r) => f(r),
+ fn try_from(value: Val) -> Result<Self> {
+ $(
+ if $id::TYPE.check(&value).is_ok() {
+ $id::try_from(value).map(Self::$id)
+ } else
+ )* {
+ <Self as Typed>::TYPE.check(&value)?;
+ unreachable!()
+ }
+ }
}
- }
- #[allow(clippy::missing_const_for_fn)]
- pub fn left(self) -> Option<A> {
- match self {
- Either::Left(a) => Some(a),
- Either::Right(_) => None,
+ impl<$($id),*> TryFrom<$name<$($id),*>> for Val
+ where
+ $($id: Typed,)*
+ {
+ type Error = LocError;
+ fn try_from(value: $name<$($id),*>) -> Result<Self> {
+ match value {$(
+ $name::$id(v) => v.try_into()
+ ),*}
+ }
}
- }
+ )*}
}
-
-impl<A, B> Typed for Either<A, B>
-where
- A: Typed,
- B: Typed,
-{
- const TYPE: &'static ComplexValType = &ComplexValType::UnionRef(&[A::TYPE, B::TYPE]);
-}
-impl<A, B> TryFrom<Val> for Either<A, B>
-where
- A: Typed,
- B: Typed,
-{
- type Error = LocError;
-
- fn try_from(value: Val) -> Result<Self> {
- if A::TYPE.check(&value).is_ok() {
- A::try_from(value).map(Self::Left)
- } else if B::TYPE.check(&value).is_ok() {
- B::try_from(value).map(Self::Right)
- } else {
- <Self as Typed>::TYPE.check(&value)?;
- unreachable!()
- }
- }
+decl_either!(
+ Either1, A;
+ Either2, A B;
+ Either3, A B C;
+ Either4, A B C D;
+ Either5, A B C D E;
+ Either6, A B C D E F;
+ Either7, A B C D E F G
+);
+#[macro_export]
+macro_rules! Either {
+ ($a:ty) => {Either1<$a>};
+ ($a:ty, $b:ty) => {Either2<$a, $b>};
+ ($a:ty, $b:ty, $c:ty) => {Either3<$a, $b, $c>};
+ ($a:ty, $b:ty, $c:ty, $d:ty) => {Either4<$a, $b, $c, $d>};
+ ($a:ty, $b:ty, $c:ty, $d:ty, $e:ty) => {Either5<$a, $b, $c, $d, $e>};
+ ($a:ty, $b:ty, $c:ty, $d:ty, $e:ty, $f:ty) => {Either6<$a, $b, $c, $d, $e, $f>};
+ ($a:ty, $b:ty, $c:ty, $d:ty, $e:ty, $f:ty, $g:ty) => {Either7<$a, $b, $c, $d, $e, $f, $g>};
}
-impl<A, B> TryFrom<Either<A, B>> for Val
-where
- A: Typed,
- B: Typed,
-{
- type Error = LocError;
- fn try_from(value: Either<A, B>) -> Result<Self> {
- match value {
- Either::Left(a) => a.try_into(),
- Either::Right(b) => b.try_into(),
- }
- }
-}
+pub type MyType = Either![u32, f64, String];
impl Typed for ArrValue {
const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Arr);