difftreelog
refactor do not desugar mod/slice
in: master
7 files changed
crates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/builtin/mod.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/mod.rs
@@ -1,13 +1,14 @@
use crate::{
equals,
error::{Error::*, Result},
+ operator::evaluate_mod_op,
parse_args, primitive_equals, push, throw, with_state, ArrValue, Context, EvaluationState,
- FuncVal, LazyVal, Val,
+ FuncVal, IndexableVal, LazyVal, Val,
};
use format::{format_arr, format_obj};
use jrsonnet_gc::Gc;
use jrsonnet_interner::IStr;
-use jrsonnet_parser::{ArgsDesc, BinaryOpType, ExprLocation};
+use jrsonnet_parser::{ArgsDesc, ExprLocation};
use jrsonnet_types::ty;
use std::{collections::HashMap, path::PathBuf, rc::Rc};
@@ -20,7 +21,7 @@
pub mod manifest;
pub mod sort;
-fn std_format(str: IStr, vals: Val) -> Result<Val> {
+pub fn std_format(str: IStr, vals: Val) -> Result<Val> {
push(
Some(&ExprLocation(Rc::from(PathBuf::from("std.jsonnet")), 0, 0)),
|| format!("std.format of {}", str),
@@ -34,6 +35,38 @@
)
}
+pub fn std_slice(
+ indexable: IndexableVal,
+ index: Option<usize>,
+ end: Option<usize>,
+ step: Option<usize>,
+) -> Result<Val> {
+ let index = index.unwrap_or(0);
+ let end = end.unwrap_or_else(|| match &indexable {
+ IndexableVal::Str(_) => usize::MAX,
+ IndexableVal::Arr(v) => v.len(),
+ });
+ let step = step.unwrap_or(1);
+ match &indexable {
+ IndexableVal::Str(s) => Ok(Val::Str(
+ (s.chars()
+ .skip(index)
+ .take(end - index)
+ .step_by(step)
+ .collect::<String>())
+ .into(),
+ )),
+ IndexableVal::Arr(arr) => Ok(Val::Arr(
+ (arr.iter()
+ .skip(index)
+ .take(end - index)
+ .step_by(step)
+ .collect::<Result<Vec<Val>>>()?)
+ .into(),
+ )),
+ }
+}
+
type Builtin = fn(context: Context, loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val>;
type BuiltinsType = HashMap<Box<str>, Builtin>;
@@ -188,34 +221,12 @@
2, end: ty!((number | null));
3, step: ty!((number | null));
], {
- let index = match index {
- Val::Num(v) => v as usize,
- Val::Null => 0,
- _ => unreachable!(),
- };
- let end = match end {
- Val::Num(v) => v as usize,
- Val::Null => match &indexable {
- Val::Str(s) => s.chars().count(),
- Val::Arr(v) => v.len(),
- _ => unreachable!()
- },
- _ => unreachable!()
- };
- let step = match step {
- Val::Num(v) => v as usize,
- Val::Null => 1,
- _ => unreachable!()
- };
- match &indexable {
- Val::Str(s) => {
- Ok(Val::Str((s.chars().skip(index).take(end-index).step_by(step).collect::<String>()).into()))
- }
- Val::Arr(arr) => {
- Ok(Val::Arr((arr.iter().skip(index).take(end-index).step_by(step).collect::<Result<Vec<Val>>>()?).into()))
- }
- _ => unreachable!()
- }
+ std_slice(
+ indexable.to_indexable()?,
+ index.try_cast_nullable_num("index")?.map(|v| v as usize),
+ end.try_cast_nullable_num("end")?.map(|v| v as usize),
+ step.try_cast_nullable_num("step")?.map(|v| v as usize),
+ )
})
}
@@ -257,11 +268,7 @@
0, a: ty!((number | string));
1, b: ty!(any);
], {
- match (a, b) {
- (Val::Num(a), Val::Num(b)) => Ok(Val::Num(a % b)),
- (Val::Str(str), vals) => std_format(str, vals),
- (a, b) => throw!(BinaryOperatorDoesNotOperateOnValues(BinaryOpType::Mod, a.value_type(), b.value_type()))
- }
+ evaluate_mod_op(&a, &b)
})
}
crates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -73,6 +73,8 @@
ValueIndexMustBeTypeGot(ValType, ValType, ValType),
#[error("cant index into {0}")]
CantIndexInto(ValType),
+ #[error("{0} is not indexable")]
+ ValueIsNotIndexable(ValType),
#[error("super can't be used standalone")]
StandaloneSuper,
crates/jrsonnet-evaluator/src/evaluate/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate/mod.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/mod.rs
@@ -1,4 +1,5 @@
use crate::{
+ builtin::std_slice,
error::Error::*,
evaluate::operator::{evaluate_add_op, evaluate_binary_op_special, evaluate_unary_op},
push, throw, with_state, ArrValue, Bindable, Context, ContextCreator, FuncDesc, FuncVal,
@@ -679,6 +680,28 @@
}
}
}
+ Slice(value, desc) => {
+ let indexable = evaluate(context.clone(), value)?;
+
+ fn parse_num(
+ context: &Context,
+ expr: Option<&LocExpr>,
+ desc: &'static str,
+ ) -> Result<Option<usize>> {
+ Ok(match expr {
+ Some(s) => evaluate(context.clone(), &s)?
+ .try_cast_nullable_num(desc)?
+ .map(|v| v as usize),
+ None => None,
+ })
+ }
+
+ let start = parse_num(&context, desc.start.as_ref(), "start")?;
+ let end = parse_num(&context, desc.end.as_ref(), "end")?;
+ let step = parse_num(&context, desc.step.as_ref(), "step")?;
+
+ std_slice(indexable.to_indexable()?, start, end, step)?
+ }
Import(path) => {
let tmp = loc
.clone()
crates/jrsonnet-evaluator/src/evaluate/operator.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate/operator.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/operator.rs
@@ -1,3 +1,4 @@
+use crate::builtin::std_format;
use crate::{equals, evaluate, Context, Val};
use crate::{error::Error::*, throw, Result};
use jrsonnet_parser::{BinaryOpType, LocExpr, UnaryOpType};
@@ -41,6 +42,19 @@
})
}
+pub fn evaluate_mod_op(a: &Val, b: &Val) -> Result<Val> {
+ use Val::*;
+ match (a, b) {
+ (Num(a), Num(b)) => Ok(Num(a % b)),
+ (Str(str), vals) => std_format(str.clone(), vals.clone()),
+ (a, b) => throw!(BinaryOperatorDoesNotOperateOnValues(
+ BinaryOpType::Mod,
+ a.value_type(),
+ b.value_type()
+ )),
+ }
+}
+
pub fn evaluate_binary_op_special(
context: Context,
a: &LocExpr,
@@ -60,13 +74,14 @@
use BinaryOpType::*;
use Val::*;
Ok(match (a, op, b) {
- (Str(a), In, Obj(obj)) => Bool(obj.has_field_ex(a.clone(), true)),
-
(a, Add, b) => evaluate_add_op(a, b)?,
(a, Eq, b) => Bool(equals(a, b)?),
(a, Neq, b) => Bool(!equals(a, b)?),
+ (Str(a), In, Obj(obj)) => Bool(obj.has_field_ex(a.clone(), true)),
+ (a, Mod, b) => evaluate_mod_op(a, b)?,
+
(Str(v1), Mul, Num(v2)) => Str(v1.repeat(*v2 as usize).into()),
// Bool X Bool
crates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth1use crate::{2 builtin::{3 call_builtin,4 manifest::{manifest_json_ex, ManifestJsonOptions, ManifestType},5 },6 error::{Error::*, LocError},7 evaluate,8 function::{parse_function_call, parse_function_call_map, place_args},9 native::NativeCallback,10 throw, with_state, Context, ObjValue, Result,11};12use jrsonnet_gc::{Gc, GcCell, Trace};13use jrsonnet_interner::IStr;14use jrsonnet_parser::{el, Arg, ArgsDesc, Expr, ExprLocation, LiteralType, LocExpr, ParamsDesc};15use jrsonnet_types::ValType;16use std::{collections::HashMap, fmt::Debug, rc::Rc};1718pub trait LazyValValue: Trace {19 fn get(self: Box<Self>) -> Result<Val>;20}2122#[derive(Trace)]23#[trivially_drop]24enum LazyValInternals {25 Computed(Val),26 Errored(LocError),27 Waiting(Box<dyn LazyValValue>),28 Pending,29}3031#[derive(Clone, Trace)]32#[trivially_drop]33pub struct LazyVal(Gc<GcCell<LazyValInternals>>);34impl LazyVal {35 pub fn new(f: Box<dyn LazyValValue>) -> Self {36 Self(Gc::new(GcCell::new(LazyValInternals::Waiting(f))))37 }38 pub fn new_resolved(val: Val) -> Self {39 Self(Gc::new(GcCell::new(LazyValInternals::Computed(val))))40 }41 pub fn evaluate(&self) -> Result<Val> {42 match &*self.0.borrow() {43 LazyValInternals::Computed(v) => return Ok(v.clone()),44 LazyValInternals::Errored(e) => return Err(e.clone()),45 LazyValInternals::Pending => return Err(RecursiveLazyValueEvaluation.into()),46 _ => (),47 };48 let value = if let LazyValInternals::Waiting(value) =49 std::mem::replace(&mut *self.0.borrow_mut(), LazyValInternals::Pending)50 {51 value52 } else {53 unreachable!()54 };55 let new_value = match value.get() {56 Ok(v) => v,57 Err(e) => {58 *self.0.borrow_mut() = LazyValInternals::Errored(e.clone());59 return Err(e);60 }61 };62 *self.0.borrow_mut() = LazyValInternals::Computed(new_value.clone());63 Ok(new_value)64 }65}6667impl Debug for LazyVal {68 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {69 write!(f, "Lazy")70 }71}72impl PartialEq for LazyVal {73 fn eq(&self, other: &Self) -> bool {74 Gc::ptr_eq(&self.0, &other.0)75 }76}7778#[derive(Debug, PartialEq, Trace)]79#[trivially_drop]80pub struct FuncDesc {81 pub name: IStr,82 pub ctx: Context,83 pub params: ParamsDesc,84 pub body: LocExpr,85}8687#[derive(Debug, Trace)]88#[trivially_drop]89pub enum FuncVal {90 /// Plain function implemented in jsonnet91 Normal(FuncDesc),92 /// Standard library function93 Intrinsic(IStr),94 /// Library functions implemented in native95 NativeExt(IStr, Gc<NativeCallback>),96}9798impl PartialEq for FuncVal {99 fn eq(&self, other: &Self) -> bool {100 match (self, other) {101 (Self::Normal(a), Self::Normal(b)) => a == b,102 (Self::Intrinsic(an), Self::Intrinsic(bn)) => an == bn,103 (Self::NativeExt(an, _), Self::NativeExt(bn, _)) => an == bn,104 (..) => false,105 }106 }107}108impl FuncVal {109 pub fn is_ident(&self) -> bool {110 matches!(&self, Self::Intrinsic(n) if n as &str == "id")111 }112 pub fn name(&self) -> IStr {113 match self {114 Self::Normal(normal) => normal.name.clone(),115 Self::Intrinsic(name) => format!("std.{}", name).into(),116 Self::NativeExt(n, _) => format!("native.{}", n).into(),117 }118 }119 pub fn evaluate(120 &self,121 call_ctx: Context,122 loc: Option<&ExprLocation>,123 args: &ArgsDesc,124 tailstrict: bool,125 ) -> Result<Val> {126 match self {127 Self::Normal(func) => {128 let ctx = parse_function_call(129 call_ctx,130 Some(func.ctx.clone()),131 &func.params,132 args,133 tailstrict,134 )?;135 evaluate(ctx, &func.body)136 }137 Self::Intrinsic(name) => call_builtin(call_ctx, loc, name, args),138 Self::NativeExt(_name, handler) => {139 let args = parse_function_call(call_ctx, None, &handler.params, args, true)?;140 let mut out_args = Vec::with_capacity(handler.params.len());141 for p in handler.params.0.iter() {142 out_args.push(args.binding(p.0.clone())?.evaluate()?);143 }144 Ok(handler.call(loc.map(|l| l.0.clone()), &out_args)?)145 }146 }147 }148149 pub fn evaluate_map(150 &self,151 call_ctx: Context,152 args: &HashMap<IStr, Val>,153 tailstrict: bool,154 ) -> Result<Val> {155 match self {156 Self::Normal(func) => {157 let ctx = parse_function_call_map(158 call_ctx,159 Some(func.ctx.clone()),160 &func.params,161 args,162 tailstrict,163 )?;164 evaluate(ctx, &func.body)165 }166 Self::Intrinsic(_) => todo!(),167 Self::NativeExt(_, _) => todo!(),168 }169 }170171 pub fn evaluate_values(&self, call_ctx: Context, args: &[Val]) -> Result<Val> {172 match self {173 Self::Normal(func) => {174 let ctx = place_args(call_ctx, Some(func.ctx.clone()), &func.params, args)?;175 evaluate(ctx, &func.body)176 }177 Self::Intrinsic(_) => todo!(),178 Self::NativeExt(_, _) => todo!(),179 }180 }181}182183#[derive(Clone)]184pub enum ManifestFormat {185 YamlStream(Box<ManifestFormat>),186 Yaml(usize),187 Json(usize),188 ToString,189 String,190}191192#[derive(Debug, Clone, Trace)]193#[trivially_drop]194pub enum ArrValue {195 Lazy(Gc<Vec<LazyVal>>),196 Eager(Gc<Vec<Val>>),197 Extended(Box<(Self, Self)>),198}199impl ArrValue {200 pub fn new_eager() -> Self {201 Self::Eager(Gc::new(Vec::new()))202 }203204 pub fn len(&self) -> usize {205 match self {206 Self::Lazy(l) => l.len(),207 Self::Eager(e) => e.len(),208 Self::Extended(v) => v.0.len() + v.1.len(),209 }210 }211212 pub fn is_empty(&self) -> bool {213 self.len() == 0214 }215216 pub fn get(&self, index: usize) -> Result<Option<Val>> {217 match self {218 Self::Lazy(vec) => {219 if let Some(v) = vec.get(index) {220 Ok(Some(v.evaluate()?))221 } else {222 Ok(None)223 }224 }225 Self::Eager(vec) => Ok(vec.get(index).cloned()),226 Self::Extended(v) => {227 let a_len = v.0.len();228 if a_len > index {229 v.0.get(index)230 } else {231 v.1.get(index - a_len)232 }233 }234 }235 }236237 pub fn get_lazy(&self, index: usize) -> Option<LazyVal> {238 match self {239 Self::Lazy(vec) => vec.get(index).cloned(),240 Self::Eager(vec) => vec.get(index).cloned().map(LazyVal::new_resolved),241 Self::Extended(v) => {242 let a_len = v.0.len();243 if a_len > index {244 v.0.get_lazy(index)245 } else {246 v.1.get_lazy(index - a_len)247 }248 }249 }250 }251252 pub fn evaluated(&self) -> Result<Gc<Vec<Val>>> {253 Ok(match self {254 Self::Lazy(vec) => {255 let mut out = Vec::with_capacity(vec.len());256 for item in vec.iter() {257 out.push(item.evaluate()?);258 }259 Gc::new(out)260 }261 Self::Eager(vec) => vec.clone(),262 Self::Extended(_v) => {263 let mut out = Vec::with_capacity(self.len());264 for item in self.iter() {265 out.push(item?);266 }267 Gc::new(out)268 }269 })270 }271272 pub fn iter(&self) -> impl DoubleEndedIterator<Item = Result<Val>> + '_ {273 (0..self.len()).map(move |idx| match self {274 Self::Lazy(l) => l[idx].evaluate(),275 Self::Eager(e) => Ok(e[idx].clone()),276 Self::Extended(_) => self.get(idx).map(|e| e.unwrap()),277 })278 }279280 pub fn iter_lazy(&self) -> impl DoubleEndedIterator<Item = LazyVal> + '_ {281 (0..self.len()).map(move |idx| match self {282 Self::Lazy(l) => l[idx].clone(),283 Self::Eager(e) => LazyVal::new_resolved(e[idx].clone()),284 Self::Extended(_) => self.get_lazy(idx).unwrap(),285 })286 }287288 pub fn reversed(self) -> Self {289 match self {290 Self::Lazy(vec) => {291 let mut out = (&vec as &Vec<_>).clone();292 out.reverse();293 Self::Lazy(Gc::new(out))294 }295 Self::Eager(vec) => {296 let mut out = (&vec as &Vec<_>).clone();297 out.reverse();298 Self::Eager(Gc::new(out))299 }300 Self::Extended(b) => Self::Extended(Box::new((b.1.reversed(), b.0.reversed()))),301 }302 }303304 pub fn map(self, mapper: impl Fn(Val) -> Result<Val>) -> Result<Self> {305 let mut out = Vec::with_capacity(self.len());306307 for value in self.iter() {308 out.push(mapper(value?)?);309 }310311 Ok(Self::Eager(Gc::new(out)))312 }313314 pub fn filter(self, filter: impl Fn(&Val) -> Result<bool>) -> Result<Self> {315 let mut out = Vec::with_capacity(self.len());316317 for value in self.iter() {318 let value = value?;319 if filter(&value)? {320 out.push(value);321 }322 }323324 Ok(Self::Eager(Gc::new(out)))325 }326327 pub fn ptr_eq(a: &Self, b: &Self) -> bool {328 match (a, b) {329 (Self::Lazy(a), Self::Lazy(b)) => Gc::ptr_eq(a, b),330 (Self::Eager(a), Self::Eager(b)) => Gc::ptr_eq(a, b),331 _ => false,332 }333 }334}335336impl From<Vec<LazyVal>> for ArrValue {337 fn from(v: Vec<LazyVal>) -> Self {338 Self::Lazy(Gc::new(v))339 }340}341342impl From<Vec<Val>> for ArrValue {343 fn from(v: Vec<Val>) -> Self {344 Self::Eager(Gc::new(v))345 }346}347348#[derive(Debug, Clone, Trace)]349#[trivially_drop]350pub enum Val {351 Bool(bool),352 Null,353 Str(IStr),354 Num(f64),355 Arr(ArrValue),356 Obj(ObjValue),357 Func(Gc<FuncVal>),358}359360macro_rules! matches_unwrap {361 ($e: expr, $p: pat, $r: expr) => {362 match $e {363 $p => $r,364 _ => panic!("no match"),365 }366 };367}368impl Val {369 /// Creates `Val::Num` after checking for numeric overflow.370 /// As numbers are `f64`, we can just check for their finity.371 pub fn new_checked_num(num: f64) -> Result<Self> {372 if num.is_finite() {373 Ok(Self::Num(num))374 } else {375 throw!(RuntimeError("overflow".into()))376 }377 }378379 pub fn assert_type(&self, context: &'static str, val_type: ValType) -> Result<()> {380 let this_type = self.value_type();381 if this_type != val_type {382 throw!(TypeMismatch(context, vec![val_type], this_type))383 } else {384 Ok(())385 }386 }387 pub fn unwrap_num(self) -> Result<f64> {388 Ok(matches_unwrap!(self, Self::Num(v), v))389 }390 pub fn unwrap_func(self) -> Result<Gc<FuncVal>> {391 Ok(matches_unwrap!(self, Self::Func(v), v))392 }393 pub fn try_cast_bool(self, context: &'static str) -> Result<bool> {394 self.assert_type(context, ValType::Bool)?;395 Ok(matches_unwrap!(self, Self::Bool(v), v))396 }397 pub fn try_cast_str(self, context: &'static str) -> Result<IStr> {398 self.assert_type(context, ValType::Str)?;399 Ok(matches_unwrap!(self, Self::Str(v), v))400 }401 pub fn try_cast_num(self, context: &'static str) -> Result<f64> {402 self.assert_type(context, ValType::Num)?;403 self.unwrap_num()404 }405 pub const fn value_type(&self) -> ValType {406 match self {407 Self::Str(..) => ValType::Str,408 Self::Num(..) => ValType::Num,409 Self::Arr(..) => ValType::Arr,410 Self::Obj(..) => ValType::Obj,411 Self::Bool(_) => ValType::Bool,412 Self::Null => ValType::Null,413 Self::Func(..) => ValType::Func,414 }415 }416417 pub fn to_string(&self) -> Result<IStr> {418 Ok(match self {419 Self::Bool(true) => "true".into(),420 Self::Bool(false) => "false".into(),421 Self::Null => "null".into(),422 Self::Str(s) => s.clone(),423 v => manifest_json_ex(424 v,425 &ManifestJsonOptions {426 padding: "",427 mtype: ManifestType::ToString,428 },429 )?430 .into(),431 })432 }433434 /// Expects value to be object, outputs (key, manifested value) pairs435 pub fn manifest_multi(&self, ty: &ManifestFormat) -> Result<Vec<(IStr, IStr)>> {436 let obj = match self {437 Self::Obj(obj) => obj,438 _ => throw!(MultiManifestOutputIsNotAObject),439 };440 let keys = obj.fields();441 let mut out = Vec::with_capacity(keys.len());442 for key in keys {443 let value = obj444 .get(key.clone())?445 .expect("item in object")446 .manifest(ty)?;447 out.push((key, value));448 }449 Ok(out)450 }451452 /// Expects value to be array, outputs manifested values453 pub fn manifest_stream(&self, ty: &ManifestFormat) -> Result<Vec<IStr>> {454 let arr = match self {455 Self::Arr(a) => a,456 _ => throw!(StreamManifestOutputIsNotAArray),457 };458 let mut out = Vec::with_capacity(arr.len());459 for i in arr.iter() {460 out.push(i?.manifest(ty)?);461 }462 Ok(out)463 }464465 pub fn manifest(&self, ty: &ManifestFormat) -> Result<IStr> {466 Ok(match ty {467 ManifestFormat::YamlStream(format) => {468 let arr = match self {469 Self::Arr(a) => a,470 _ => throw!(StreamManifestOutputIsNotAArray),471 };472 let mut out = String::new();473474 match format as &ManifestFormat {475 ManifestFormat::YamlStream(_) => throw!(StreamManifestOutputCannotBeRecursed),476 ManifestFormat::String => throw!(StreamManifestCannotNestString),477 _ => {}478 };479480 if !arr.is_empty() {481 for v in arr.iter() {482 out.push_str("---\n");483 out.push_str(&v?.manifest(format)?);484 out.push('\n');485 }486 out.push_str("...");487 }488489 out.into()490 }491 ManifestFormat::Yaml(padding) => self.to_yaml(*padding)?,492 ManifestFormat::Json(padding) => self.to_json(*padding)?,493 ManifestFormat::ToString => self.to_string()?,494 ManifestFormat::String => match self {495 Self::Str(s) => s.clone(),496 _ => throw!(StringManifestOutputIsNotAString),497 },498 })499 }500501 /// For manifestification502 pub fn to_json(&self, padding: usize) -> Result<IStr> {503 manifest_json_ex(504 self,505 &ManifestJsonOptions {506 padding: &" ".repeat(padding),507 mtype: if padding == 0 {508 ManifestType::Minify509 } else {510 ManifestType::Manifest511 },512 },513 )514 .map(|s| s.into())515 }516517 /// Calls `std.manifestJson`518 #[cfg(feature = "faster")]519 pub fn to_std_json(&self, padding: usize) -> Result<Rc<str>> {520 manifest_json_ex(521 self,522 &ManifestJsonOptions {523 padding: &" ".repeat(padding),524 mtype: ManifestType::Std,525 },526 )527 .map(|s| s.into())528 }529530 /// Calls `std.manifestJson`531 #[cfg(not(feature = "faster"))]532 pub fn to_std_json(&self, padding: usize) -> Result<Rc<str>> {533 with_state(|s| {534 let ctx = s535 .create_default_context()?536 .with_var("__tmp__to_json__".into(), self.clone())?;537 Ok(evaluate(538 ctx,539 &el!(Expr::Apply(540 el!(Expr::Index(541 el!(Expr::Var("std".into())),542 el!(Expr::Str("manifestJsonEx".into()))543 )),544 ArgsDesc(vec![545 Arg(None, el!(Expr::Var("__tmp__to_json__".into()))),546 Arg(None, el!(Expr::Str(" ".repeat(padding).into())))547 ]),548 false549 )),550 )?551 .try_cast_str("to json")?)552 })553 }554 pub fn to_yaml(&self, padding: usize) -> Result<IStr> {555 with_state(|s| {556 let ctx = s557 .create_default_context()558 .with_var("__tmp__to_json__".into(), self.clone());559 evaluate(560 ctx,561 &el!(Expr::Apply(562 el!(Expr::Index(563 el!(Expr::Var("std".into())),564 el!(Expr::Str("manifestYamlDoc".into()))565 )),566 ArgsDesc(vec![567 Arg(None, el!(Expr::Var("__tmp__to_json__".into()))),568 Arg(569 None,570 el!(Expr::Literal(if padding != 0 {571 LiteralType::True572 } else {573 LiteralType::False574 }))575 )576 ]),577 false578 )),579 )?580 .try_cast_str("to json")581 })582 }583}584585const fn is_function_like(val: &Val) -> bool {586 matches!(val, Val::Func(_))587}588589/// Native implementation of `std.primitiveEquals`590pub fn primitive_equals(val_a: &Val, val_b: &Val) -> Result<bool> {591 Ok(match (val_a, val_b) {592 (Val::Bool(a), Val::Bool(b)) => a == b,593 (Val::Null, Val::Null) => true,594 (Val::Str(a), Val::Str(b)) => a == b,595 (Val::Num(a), Val::Num(b)) => (a - b).abs() <= f64::EPSILON,596 (Val::Arr(_), Val::Arr(_)) => throw!(RuntimeError(597 "primitiveEquals operates on primitive types, got array".into(),598 )),599 (Val::Obj(_), Val::Obj(_)) => throw!(RuntimeError(600 "primitiveEquals operates on primitive types, got object".into(),601 )),602 (a, b) if is_function_like(a) && is_function_like(b) => {603 throw!(RuntimeError("cannot test equality of functions".into()))604 }605 (_, _) => false,606 })607}608609/// Native implementation of `std.equals`610pub fn equals(val_a: &Val, val_b: &Val) -> Result<bool> {611 if val_a.value_type() != val_b.value_type() {612 return Ok(false);613 }614 match (val_a, val_b) {615 (Val::Arr(a), Val::Arr(b)) => {616 if ArrValue::ptr_eq(a, b) {617 return Ok(true);618 }619 if a.len() != b.len() {620 return Ok(false);621 }622 for (a, b) in a.iter().zip(b.iter()) {623 if !equals(&a?, &b?)? {624 return Ok(false);625 }626 }627 Ok(true)628 }629 (Val::Obj(a), Val::Obj(b)) => {630 if ObjValue::ptr_eq(a, b) {631 return Ok(true);632 }633 let fields = a.fields();634 if fields != b.fields() {635 return Ok(false);636 }637 for field in fields {638 if !equals(&a.get(field.clone())?.unwrap(), &b.get(field)?.unwrap())? {639 return Ok(false);640 }641 }642 Ok(true)643 }644 (a, b) => Ok(primitive_equals(a, b)?),645 }646}1use crate::{2 builtin::{3 call_builtin,4 manifest::{manifest_json_ex, ManifestJsonOptions, ManifestType},5 },6 error::{Error::*, LocError},7 evaluate,8 function::{parse_function_call, parse_function_call_map, place_args},9 native::NativeCallback,10 throw, with_state, Context, ObjValue, Result,11};12use jrsonnet_gc::{Gc, GcCell, Trace};13use jrsonnet_interner::IStr;14use jrsonnet_parser::{el, Arg, ArgsDesc, Expr, ExprLocation, LiteralType, LocExpr, ParamsDesc};15use jrsonnet_types::ValType;16use std::{collections::HashMap, fmt::Debug, rc::Rc};1718pub trait LazyValValue: Trace {19 fn get(self: Box<Self>) -> Result<Val>;20}2122#[derive(Trace)]23#[trivially_drop]24enum LazyValInternals {25 Computed(Val),26 Errored(LocError),27 Waiting(Box<dyn LazyValValue>),28 Pending,29}3031#[derive(Clone, Trace)]32#[trivially_drop]33pub struct LazyVal(Gc<GcCell<LazyValInternals>>);34impl LazyVal {35 pub fn new(f: Box<dyn LazyValValue>) -> Self {36 Self(Gc::new(GcCell::new(LazyValInternals::Waiting(f))))37 }38 pub fn new_resolved(val: Val) -> Self {39 Self(Gc::new(GcCell::new(LazyValInternals::Computed(val))))40 }41 pub fn evaluate(&self) -> Result<Val> {42 match &*self.0.borrow() {43 LazyValInternals::Computed(v) => return Ok(v.clone()),44 LazyValInternals::Errored(e) => return Err(e.clone()),45 LazyValInternals::Pending => return Err(RecursiveLazyValueEvaluation.into()),46 _ => (),47 };48 let value = if let LazyValInternals::Waiting(value) =49 std::mem::replace(&mut *self.0.borrow_mut(), LazyValInternals::Pending)50 {51 value52 } else {53 unreachable!()54 };55 let new_value = match value.get() {56 Ok(v) => v,57 Err(e) => {58 *self.0.borrow_mut() = LazyValInternals::Errored(e.clone());59 return Err(e);60 }61 };62 *self.0.borrow_mut() = LazyValInternals::Computed(new_value.clone());63 Ok(new_value)64 }65}6667impl Debug for LazyVal {68 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {69 write!(f, "Lazy")70 }71}72impl PartialEq for LazyVal {73 fn eq(&self, other: &Self) -> bool {74 Gc::ptr_eq(&self.0, &other.0)75 }76}7778#[derive(Debug, PartialEq, Trace)]79#[trivially_drop]80pub struct FuncDesc {81 pub name: IStr,82 pub ctx: Context,83 pub params: ParamsDesc,84 pub body: LocExpr,85}8687#[derive(Debug, Trace)]88#[trivially_drop]89pub enum FuncVal {90 /// Plain function implemented in jsonnet91 Normal(FuncDesc),92 /// Standard library function93 Intrinsic(IStr),94 /// Library functions implemented in native95 NativeExt(IStr, Gc<NativeCallback>),96}9798impl PartialEq for FuncVal {99 fn eq(&self, other: &Self) -> bool {100 match (self, other) {101 (Self::Normal(a), Self::Normal(b)) => a == b,102 (Self::Intrinsic(an), Self::Intrinsic(bn)) => an == bn,103 (Self::NativeExt(an, _), Self::NativeExt(bn, _)) => an == bn,104 (..) => false,105 }106 }107}108impl FuncVal {109 pub fn is_ident(&self) -> bool {110 matches!(&self, Self::Intrinsic(n) if n as &str == "id")111 }112 pub fn name(&self) -> IStr {113 match self {114 Self::Normal(normal) => normal.name.clone(),115 Self::Intrinsic(name) => format!("std.{}", name).into(),116 Self::NativeExt(n, _) => format!("native.{}", n).into(),117 }118 }119 pub fn evaluate(120 &self,121 call_ctx: Context,122 loc: Option<&ExprLocation>,123 args: &ArgsDesc,124 tailstrict: bool,125 ) -> Result<Val> {126 match self {127 Self::Normal(func) => {128 let ctx = parse_function_call(129 call_ctx,130 Some(func.ctx.clone()),131 &func.params,132 args,133 tailstrict,134 )?;135 evaluate(ctx, &func.body)136 }137 Self::Intrinsic(name) => call_builtin(call_ctx, loc, name, args),138 Self::NativeExt(_name, handler) => {139 let args = parse_function_call(call_ctx, None, &handler.params, args, true)?;140 let mut out_args = Vec::with_capacity(handler.params.len());141 for p in handler.params.0.iter() {142 out_args.push(args.binding(p.0.clone())?.evaluate()?);143 }144 Ok(handler.call(loc.map(|l| l.0.clone()), &out_args)?)145 }146 }147 }148149 pub fn evaluate_map(150 &self,151 call_ctx: Context,152 args: &HashMap<IStr, Val>,153 tailstrict: bool,154 ) -> Result<Val> {155 match self {156 Self::Normal(func) => {157 let ctx = parse_function_call_map(158 call_ctx,159 Some(func.ctx.clone()),160 &func.params,161 args,162 tailstrict,163 )?;164 evaluate(ctx, &func.body)165 }166 Self::Intrinsic(_) => todo!(),167 Self::NativeExt(_, _) => todo!(),168 }169 }170171 pub fn evaluate_values(&self, call_ctx: Context, args: &[Val]) -> Result<Val> {172 match self {173 Self::Normal(func) => {174 let ctx = place_args(call_ctx, Some(func.ctx.clone()), &func.params, args)?;175 evaluate(ctx, &func.body)176 }177 Self::Intrinsic(_) => todo!(),178 Self::NativeExt(_, _) => todo!(),179 }180 }181}182183#[derive(Clone)]184pub enum ManifestFormat {185 YamlStream(Box<ManifestFormat>),186 Yaml(usize),187 Json(usize),188 ToString,189 String,190}191192#[derive(Debug, Clone, Trace)]193#[trivially_drop]194pub enum ArrValue {195 Lazy(Gc<Vec<LazyVal>>),196 Eager(Gc<Vec<Val>>),197 Extended(Box<(Self, Self)>),198}199impl ArrValue {200 pub fn new_eager() -> Self {201 Self::Eager(Gc::new(Vec::new()))202 }203204 pub fn len(&self) -> usize {205 match self {206 Self::Lazy(l) => l.len(),207 Self::Eager(e) => e.len(),208 Self::Extended(v) => v.0.len() + v.1.len(),209 }210 }211212 pub fn is_empty(&self) -> bool {213 self.len() == 0214 }215216 pub fn get(&self, index: usize) -> Result<Option<Val>> {217 match self {218 Self::Lazy(vec) => {219 if let Some(v) = vec.get(index) {220 Ok(Some(v.evaluate()?))221 } else {222 Ok(None)223 }224 }225 Self::Eager(vec) => Ok(vec.get(index).cloned()),226 Self::Extended(v) => {227 let a_len = v.0.len();228 if a_len > index {229 v.0.get(index)230 } else {231 v.1.get(index - a_len)232 }233 }234 }235 }236237 pub fn get_lazy(&self, index: usize) -> Option<LazyVal> {238 match self {239 Self::Lazy(vec) => vec.get(index).cloned(),240 Self::Eager(vec) => vec.get(index).cloned().map(LazyVal::new_resolved),241 Self::Extended(v) => {242 let a_len = v.0.len();243 if a_len > index {244 v.0.get_lazy(index)245 } else {246 v.1.get_lazy(index - a_len)247 }248 }249 }250 }251252 pub fn evaluated(&self) -> Result<Gc<Vec<Val>>> {253 Ok(match self {254 Self::Lazy(vec) => {255 let mut out = Vec::with_capacity(vec.len());256 for item in vec.iter() {257 out.push(item.evaluate()?);258 }259 Gc::new(out)260 }261 Self::Eager(vec) => vec.clone(),262 Self::Extended(_v) => {263 let mut out = Vec::with_capacity(self.len());264 for item in self.iter() {265 out.push(item?);266 }267 Gc::new(out)268 }269 })270 }271272 pub fn iter(&self) -> impl DoubleEndedIterator<Item = Result<Val>> + '_ {273 (0..self.len()).map(move |idx| match self {274 Self::Lazy(l) => l[idx].evaluate(),275 Self::Eager(e) => Ok(e[idx].clone()),276 Self::Extended(_) => self.get(idx).map(|e| e.unwrap()),277 })278 }279280 pub fn iter_lazy(&self) -> impl DoubleEndedIterator<Item = LazyVal> + '_ {281 (0..self.len()).map(move |idx| match self {282 Self::Lazy(l) => l[idx].clone(),283 Self::Eager(e) => LazyVal::new_resolved(e[idx].clone()),284 Self::Extended(_) => self.get_lazy(idx).unwrap(),285 })286 }287288 pub fn reversed(self) -> Self {289 match self {290 Self::Lazy(vec) => {291 let mut out = (&vec as &Vec<_>).clone();292 out.reverse();293 Self::Lazy(Gc::new(out))294 }295 Self::Eager(vec) => {296 let mut out = (&vec as &Vec<_>).clone();297 out.reverse();298 Self::Eager(Gc::new(out))299 }300 Self::Extended(b) => Self::Extended(Box::new((b.1.reversed(), b.0.reversed()))),301 }302 }303304 pub fn map(self, mapper: impl Fn(Val) -> Result<Val>) -> Result<Self> {305 let mut out = Vec::with_capacity(self.len());306307 for value in self.iter() {308 out.push(mapper(value?)?);309 }310311 Ok(Self::Eager(Gc::new(out)))312 }313314 pub fn filter(self, filter: impl Fn(&Val) -> Result<bool>) -> Result<Self> {315 let mut out = Vec::with_capacity(self.len());316317 for value in self.iter() {318 let value = value?;319 if filter(&value)? {320 out.push(value);321 }322 }323324 Ok(Self::Eager(Gc::new(out)))325 }326327 pub fn ptr_eq(a: &Self, b: &Self) -> bool {328 match (a, b) {329 (Self::Lazy(a), Self::Lazy(b)) => Gc::ptr_eq(a, b),330 (Self::Eager(a), Self::Eager(b)) => Gc::ptr_eq(a, b),331 _ => false,332 }333 }334}335336impl From<Vec<LazyVal>> for ArrValue {337 fn from(v: Vec<LazyVal>) -> Self {338 Self::Lazy(Gc::new(v))339 }340}341342impl From<Vec<Val>> for ArrValue {343 fn from(v: Vec<Val>) -> Self {344 Self::Eager(Gc::new(v))345 }346}347348pub enum IndexableVal {349 Str(IStr),350 Arr(ArrValue),351}352353#[derive(Debug, Clone, Trace)]354#[trivially_drop]355pub enum Val {356 Bool(bool),357 Null,358 Str(IStr),359 Num(f64),360 Arr(ArrValue),361 Obj(ObjValue),362 Func(Gc<FuncVal>),363}364365macro_rules! matches_unwrap {366 ($e: expr, $p: pat, $r: expr) => {367 match $e {368 $p => $r,369 _ => panic!("no match"),370 }371 };372}373impl Val {374 /// Creates `Val::Num` after checking for numeric overflow.375 /// As numbers are `f64`, we can just check for their finity.376 pub fn new_checked_num(num: f64) -> Result<Self> {377 if num.is_finite() {378 Ok(Self::Num(num))379 } else {380 throw!(RuntimeError("overflow".into()))381 }382 }383384 pub fn assert_type(&self, context: &'static str, val_type: ValType) -> Result<()> {385 let this_type = self.value_type();386 if this_type != val_type {387 throw!(TypeMismatch(context, vec![val_type], this_type))388 } else {389 Ok(())390 }391 }392 pub fn unwrap_num(self) -> Result<f64> {393 Ok(matches_unwrap!(self, Self::Num(v), v))394 }395 pub fn unwrap_func(self) -> Result<Gc<FuncVal>> {396 Ok(matches_unwrap!(self, Self::Func(v), v))397 }398 pub fn try_cast_bool(self, context: &'static str) -> Result<bool> {399 self.assert_type(context, ValType::Bool)?;400 Ok(matches_unwrap!(self, Self::Bool(v), v))401 }402 pub fn try_cast_str(self, context: &'static str) -> Result<IStr> {403 self.assert_type(context, ValType::Str)?;404 Ok(matches_unwrap!(self, Self::Str(v), v))405 }406 pub fn try_cast_num(self, context: &'static str) -> Result<f64> {407 self.assert_type(context, ValType::Num)?;408 self.unwrap_num()409 }410 pub fn try_cast_nullable_num(self, context: &'static str) -> Result<Option<f64>> {411 Ok(match self {412 Val::Null => None,413 Val::Num(num) => Some(num),414 _ => throw!(TypeMismatch(415 context,416 vec![ValType::Null, ValType::Num],417 self.value_type()418 )),419 })420 }421 pub const fn value_type(&self) -> ValType {422 match self {423 Self::Str(..) => ValType::Str,424 Self::Num(..) => ValType::Num,425 Self::Arr(..) => ValType::Arr,426 Self::Obj(..) => ValType::Obj,427 Self::Bool(_) => ValType::Bool,428 Self::Null => ValType::Null,429 Self::Func(..) => ValType::Func,430 }431 }432433 pub fn to_string(&self) -> Result<IStr> {434 Ok(match self {435 Self::Bool(true) => "true".into(),436 Self::Bool(false) => "false".into(),437 Self::Null => "null".into(),438 Self::Str(s) => s.clone(),439 v => manifest_json_ex(440 v,441 &ManifestJsonOptions {442 padding: "",443 mtype: ManifestType::ToString,444 },445 )?446 .into(),447 })448 }449450 /// Expects value to be object, outputs (key, manifested value) pairs451 pub fn manifest_multi(&self, ty: &ManifestFormat) -> Result<Vec<(IStr, IStr)>> {452 let obj = match self {453 Self::Obj(obj) => obj,454 _ => throw!(MultiManifestOutputIsNotAObject),455 };456 let keys = obj.fields();457 let mut out = Vec::with_capacity(keys.len());458 for key in keys {459 let value = obj460 .get(key.clone())?461 .expect("item in object")462 .manifest(ty)?;463 out.push((key, value));464 }465 Ok(out)466 }467468 /// Expects value to be array, outputs manifested values469 pub fn manifest_stream(&self, ty: &ManifestFormat) -> Result<Vec<IStr>> {470 let arr = match self {471 Self::Arr(a) => a,472 _ => throw!(StreamManifestOutputIsNotAArray),473 };474 let mut out = Vec::with_capacity(arr.len());475 for i in arr.iter() {476 out.push(i?.manifest(ty)?);477 }478 Ok(out)479 }480481 pub fn manifest(&self, ty: &ManifestFormat) -> Result<IStr> {482 Ok(match ty {483 ManifestFormat::YamlStream(format) => {484 let arr = match self {485 Self::Arr(a) => a,486 _ => throw!(StreamManifestOutputIsNotAArray),487 };488 let mut out = String::new();489490 match format as &ManifestFormat {491 ManifestFormat::YamlStream(_) => throw!(StreamManifestOutputCannotBeRecursed),492 ManifestFormat::String => throw!(StreamManifestCannotNestString),493 _ => {}494 };495496 if !arr.is_empty() {497 for v in arr.iter() {498 out.push_str("---\n");499 out.push_str(&v?.manifest(format)?);500 out.push('\n');501 }502 out.push_str("...");503 }504505 out.into()506 }507 ManifestFormat::Yaml(padding) => self.to_yaml(*padding)?,508 ManifestFormat::Json(padding) => self.to_json(*padding)?,509 ManifestFormat::ToString => self.to_string()?,510 ManifestFormat::String => match self {511 Self::Str(s) => s.clone(),512 _ => throw!(StringManifestOutputIsNotAString),513 },514 })515 }516517 /// For manifestification518 pub fn to_json(&self, padding: usize) -> Result<IStr> {519 manifest_json_ex(520 self,521 &ManifestJsonOptions {522 padding: &" ".repeat(padding),523 mtype: if padding == 0 {524 ManifestType::Minify525 } else {526 ManifestType::Manifest527 },528 },529 )530 .map(|s| s.into())531 }532533 /// Calls `std.manifestJson`534 #[cfg(feature = "faster")]535 pub fn to_std_json(&self, padding: usize) -> Result<Rc<str>> {536 manifest_json_ex(537 self,538 &ManifestJsonOptions {539 padding: &" ".repeat(padding),540 mtype: ManifestType::Std,541 },542 )543 .map(|s| s.into())544 }545546 /// Calls `std.manifestJson`547 #[cfg(not(feature = "faster"))]548 pub fn to_std_json(&self, padding: usize) -> Result<Rc<str>> {549 with_state(|s| {550 let ctx = s551 .create_default_context()?552 .with_var("__tmp__to_json__".into(), self.clone())?;553 Ok(evaluate(554 ctx,555 &el!(Expr::Apply(556 el!(Expr::Index(557 el!(Expr::Var("std".into())),558 el!(Expr::Str("manifestJsonEx".into()))559 )),560 ArgsDesc(vec![561 Arg(None, el!(Expr::Var("__tmp__to_json__".into()))),562 Arg(None, el!(Expr::Str(" ".repeat(padding).into())))563 ]),564 false565 )),566 )?567 .try_cast_str("to json")?)568 })569 }570 pub fn to_yaml(&self, padding: usize) -> Result<IStr> {571 with_state(|s| {572 let ctx = s573 .create_default_context()574 .with_var("__tmp__to_json__".into(), self.clone());575 evaluate(576 ctx,577 &el!(Expr::Apply(578 el!(Expr::Index(579 el!(Expr::Var("std".into())),580 el!(Expr::Str("manifestYamlDoc".into()))581 )),582 ArgsDesc(vec![583 Arg(None, el!(Expr::Var("__tmp__to_json__".into()))),584 Arg(585 None,586 el!(Expr::Literal(if padding != 0 {587 LiteralType::True588 } else {589 LiteralType::False590 }))591 )592 ]),593 false594 )),595 )?596 .try_cast_str("to json")597 })598 }599 pub fn to_indexable(self) -> Result<IndexableVal> {600 Ok(match self {601 Val::Str(s) => IndexableVal::Str(s),602 Val::Arr(arr) => IndexableVal::Arr(arr),603 _ => throw!(ValueIsNotIndexable(self.value_type())),604 })605 }606}607608const fn is_function_like(val: &Val) -> bool {609 matches!(val, Val::Func(_))610}611612/// Native implementation of `std.primitiveEquals`613pub fn primitive_equals(val_a: &Val, val_b: &Val) -> Result<bool> {614 Ok(match (val_a, val_b) {615 (Val::Bool(a), Val::Bool(b)) => a == b,616 (Val::Null, Val::Null) => true,617 (Val::Str(a), Val::Str(b)) => a == b,618 (Val::Num(a), Val::Num(b)) => (a - b).abs() <= f64::EPSILON,619 (Val::Arr(_), Val::Arr(_)) => throw!(RuntimeError(620 "primitiveEquals operates on primitive types, got array".into(),621 )),622 (Val::Obj(_), Val::Obj(_)) => throw!(RuntimeError(623 "primitiveEquals operates on primitive types, got object".into(),624 )),625 (a, b) if is_function_like(a) && is_function_like(b) => {626 throw!(RuntimeError("cannot test equality of functions".into()))627 }628 (_, _) => false,629 })630}631632/// Native implementation of `std.equals`633pub fn equals(val_a: &Val, val_b: &Val) -> Result<bool> {634 if val_a.value_type() != val_b.value_type() {635 return Ok(false);636 }637 match (val_a, val_b) {638 (Val::Arr(a), Val::Arr(b)) => {639 if ArrValue::ptr_eq(a, b) {640 return Ok(true);641 }642 if a.len() != b.len() {643 return Ok(false);644 }645 for (a, b) in a.iter().zip(b.iter()) {646 if !equals(&a?, &b?)? {647 return Ok(false);648 }649 }650 Ok(true)651 }652 (Val::Obj(a), Val::Obj(b)) => {653 if ObjValue::ptr_eq(a, b) {654 return Ok(true);655 }656 let fields = a.fields();657 if fields != b.fields() {658 return Ok(false);659 }660 for field in fields {661 if !equals(&a.get(field.clone())?.unwrap(), &b.get(field)?.unwrap())? {662 return Ok(false);663 }664 }665 Ok(true)666 }667 (a, b) => Ok(primitive_equals(a, b)?),668 }669}crates/jrsonnet-parser/src/expr.rsdiffbeforeafterboth--- a/crates/jrsonnet-parser/src/expr.rs
+++ b/crates/jrsonnet-parser/src/expr.rs
@@ -274,6 +274,8 @@
False,
}
+#[cfg_attr(feature = "serialize", derive(Serialize))]
+#[cfg_attr(feature = "deserialize", derive(Deserialize))]
#[derive(Debug, PartialEq, Trace)]
#[trivially_drop]
pub struct SliceDesc {
@@ -349,6 +351,7 @@
cond_then: LocExpr,
cond_else: Option<LocExpr>,
},
+ Slice(LocExpr, SliceDesc),
}
/// file, begin offset, end offset
crates/jrsonnet-parser/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-parser/src/lib.rs
+++ b/crates/jrsonnet-parser/src/lib.rs
@@ -14,6 +14,17 @@
pub file_name: Rc<Path>,
}
+macro_rules! expr_bin {
+ ($a:ident $op:ident $b:ident) => {
+ loc_expr_todo!(Expr::BinaryOp($a, $op, $b))
+ };
+}
+macro_rules! expr_un {
+ ($op:ident $a:ident) => {
+ loc_expr_todo!(Expr::UnaryOp($op, $a))
+ };
+}
+
parser! {
grammar jsonnet_parser() for str {
use peg::ParseLiteral;
@@ -219,54 +230,43 @@
use BinaryOpType::*;
+ use UnaryOpType::*;
rule expr(s: &ParserSettings) -> LocExpr
= start:position!() a:precedence! {
- a:(@) _ binop(<"||">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, Or, b))}
+ a:(@) _ binop(<"||">) _ b:@ {expr_bin!(a Or b)}
--
- a:(@) _ binop(<"&&">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, And, b))}
+ a:(@) _ binop(<"&&">) _ b:@ {expr_bin!(a And b)}
--
- a:(@) _ binop(<"|">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BitOr, b))}
+ a:(@) _ binop(<"|">) _ b:@ {expr_bin!(a BitOr b)}
--
- a:@ _ binop(<"^">) _ b:(@) {loc_expr_todo!(Expr::BinaryOp(a, BitXor, b))}
+ a:@ _ binop(<"^">) _ b:(@) {expr_bin!(a BitXor b)}
--
- a:(@) _ binop(<"&">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BitAnd, b))}
+ a:(@) _ binop(<"&">) _ b:@ {expr_bin!(a BitAnd b)}
--
- a:(@) _ binop(<"==">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, Eq, b))}
- a:(@) _ binop(<"!=">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, Neq, b))}
+ a:(@) _ binop(<"==">) _ b:@ {expr_bin!(a Eq b)}
+ a:(@) _ binop(<"!=">) _ b:@ {expr_bin!(a Neq b)}
--
- a:(@) _ binop(<"<">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, Lt, b))}
- a:(@) _ binop(<">">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, Gt, b))}
- a:(@) _ binop(<"<=">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, Lte, b))}
- a:(@) _ binop(<">=">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, Gte, b))}
- a:(@) _ binop(<keyword("in")>) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, In, b))}
+ a:(@) _ binop(<"<">) _ b:@ {expr_bin!(a Lt b)}
+ a:(@) _ binop(<">">) _ b:@ {expr_bin!(a Gt b)}
+ a:(@) _ binop(<"<=">) _ b:@ {expr_bin!(a Lte b)}
+ a:(@) _ binop(<">=">) _ b:@ {expr_bin!(a Gte b)}
+ a:(@) _ binop(<keyword("in")>) _ b:@ {expr_bin!(a In b)}
--
- a:(@) _ binop(<"<<">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, Lhs, b))}
- a:(@) _ binop(<">>">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, Rhs, b))}
+ a:(@) _ binop(<"<<">) _ b:@ {expr_bin!(a Lhs b)}
+ a:(@) _ binop(<">>">) _ b:@ {expr_bin!(a Rhs b)}
--
- a:(@) _ binop(<"+">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, Add, b))}
- a:(@) _ binop(<"-">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, Sub, b))}
+ a:(@) _ binop(<"+">) _ b:@ {expr_bin!(a Add b)}
+ a:(@) _ binop(<"-">) _ b:@ {expr_bin!(a Sub b)}
--
- a:(@) _ binop(<"*">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, Mul, b))}
- a:(@) _ binop(<"/">) _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, Div, b))}
- a:(@) _ binop(<"%">) _ b:@ {loc_expr_todo!(Expr::Apply(
- el!(Expr::Intrinsic("mod".into())), ArgsDesc(vec![Arg(None, a), Arg(None, b)]),
- false
- ))}
+ a:(@) _ binop(<"*">) _ b:@ {expr_bin!(a Mul b)}
+ a:(@) _ binop(<"/">) _ b:@ {expr_bin!(a Div b)}
+ a:(@) _ binop(<"%">) _ b:@ {expr_bin!(a Mod b)}
--
- unaryop(<"-">) _ b:@ {loc_expr_todo!(Expr::UnaryOp(UnaryOpType::Minus, b))}
- unaryop(<"!">) _ b:@ {loc_expr_todo!(Expr::UnaryOp(UnaryOpType::Not, b))}
- unaryop(<"~">) _ b:@ { loc_expr_todo!(Expr::UnaryOp(UnaryOpType::BitNot, b)) }
+ unaryop(<"-">) _ b:@ {expr_un!(Minus b)}
+ unaryop(<"!">) _ b:@ {expr_un!(Not b)}
+ unaryop(<"~">) _ b:@ {expr_un!(BitNot b)}
--
- a:(@) _ "[" _ s:slice_desc(s) _ "]" {loc_expr_todo!(Expr::Apply(
- el!(Expr::Intrinsic("slice".into())),
- ArgsDesc(vec![
- Arg(None, a),
- Arg(None, s.start.unwrap_or_else(||el!(Expr::Literal(LiteralType::Null)))),
- Arg(None, s.end.unwrap_or_else(||el!(Expr::Literal(LiteralType::Null)))),
- Arg(None, s.step.unwrap_or_else(||el!(Expr::Literal(LiteralType::Null)))),
- ]),
- true,
- ))}
+ a:(@) _ "[" _ s:slice_desc(s) _ "]" {loc_expr_todo!(Expr::Slice(a, s))}
a:(@) _ "." _ s:$(id()) {loc_expr_todo!(Expr::Index(a, el!(Expr::Str(s.into()))))}
a:(@) _ "[" _ s:expr(s) _ "]" {loc_expr_todo!(Expr::Index(a, s))}
a:(@) _ "(" _ args:args(s) _ ")" ts:(_ keyword("tailstrict"))? {loc_expr_todo!(Expr::Apply(a, args, ts.is_some()))}