git.delta.rocks / jrsonnet / refs/commits / bc97bc99f5fd

difftreelog

fix(evaluator) missing intrinsics for slice, mod

Yaroslav Bolyukin2021-01-06parent: #7c1d01a.patch.diff
in: master
Fixes #30

3 files changed

modifiedcrates/jrsonnet-evaluator/build.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/build.rs
+++ b/crates/jrsonnet-evaluator/build.rs
@@ -39,7 +39,8 @@
 								if **name == *"join" || **name == *"manifestJsonEx" ||
 								**name == *"escapeStringJson" || **name == *"equals" ||
 								**name == *"base64" || **name == *"foldl" || **name == *"foldr" ||
-								**name == *"sortImpl" || **name == *"format" || **name == *"range" || **name == *"reverse"
+								**name == *"sortImpl" || **name == *"format" || **name == *"range" ||
+								**name == *"reverse" || **name == *"slice" || **name == *"mod"
 							)
 						})
 						.collect(),
modifiedcrates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth
before · crates/jrsonnet-evaluator/src/builtin/mod.rs
1use crate::{2	equals,3	error::{Error::*, Result},4	evaluate, parse_args, primitive_equals, push, throw, with_state, Context, FuncVal, Val,5	ValType,6};7use format::{format_arr, format_obj};8use jrsonnet_parser::{ArgsDesc, ExprLocation};9use manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType};10use std::{path::PathBuf, rc::Rc};1112pub mod stdlib;13pub use stdlib::*;1415pub mod format;16pub mod manifest;17pub mod sort;1819#[allow(clippy::cognitive_complexity)]20pub fn call_builtin(21	context: Context,22	loc: &Option<ExprLocation>,23	name: &str,24	args: &ArgsDesc,25) -> Result<Val> {26	Ok(match name as &str {27		// arr/string/function28		"length" => parse_args!(context, "std.length", args, 1, [29			0, x: [Val::Str|Val::Arr|Val::Obj], vec![ValType::Str, ValType::Arr, ValType::Obj];30		], {31			Ok(match x {32				Val::Str(n) => Val::Num(n.chars().count() as f64),33				Val::Arr(i) => Val::Num(i.len() as f64),34				Val::Obj(o) => Val::Num(35					o.fields_visibility()36						.into_iter()37						.filter(|(_k, v)| *v)38						.count() as f64,39				),40				_ => unreachable!(),41			})42		})?,43		// any44		"type" => parse_args!(context, "std.type", args, 1, [45			0, x, vec![];46		], {47			Ok(Val::Str(x.value_type()?.name().into()))48		})?,49		// length, idx=>any50		"makeArray" => parse_args!(context, "std.makeArray", args, 2, [51			0, sz: [Val::Num]!!Val::Num, vec![ValType::Num];52			1, func: [Val::Func]!!Val::Func, vec![ValType::Func];53		], {54			if sz < 0.0 {55				throw!(RuntimeError(format!("makeArray requires size >= 0, got {}", sz).into()));56			}57			let mut out = Vec::with_capacity(sz as usize);58			for i in 0..sz as usize {59				out.push(func.evaluate_values(60					Context::new(),61					&[Val::Num(i as f64)]62				)?)63			}64			Ok(Val::Arr(Rc::new(out)))65		})?,66		// string67		"codepoint" => parse_args!(context, "std.codepoint", args, 1, [68			0, str: [Val::Str]!!Val::Str, vec![ValType::Str];69		], {70			assert!(71				str.chars().count() == 1,72				"std.codepoint should receive single char string"73			);74			Ok(Val::Num(str.chars().take(1).next().unwrap() as u32 as f64))75		})?,76		// object, includeHidden77		"objectFieldsEx" => parse_args!(context, "std.objectFieldsEx",args, 2, [78			0, obj: [Val::Obj]!!Val::Obj, vec![ValType::Obj];79			1, inc_hidden: [Val::Bool]!!Val::Bool, vec![ValType::Bool];80		], {81			let mut out = obj.fields_visibility()82				.into_iter()83				.filter(|(_k, v)| *v || inc_hidden)84				.map(|(k, _v)|k)85				.collect::<Vec<_>>();86			out.sort();87			Ok(Val::Arr(Rc::new(out.into_iter().map(Val::Str).collect())))88		})?,89		// object, field, includeHidden90		"objectHasEx" => parse_args!(context, "std.objectHasEx", args, 3, [91			0, obj: [Val::Obj]!!Val::Obj, vec![ValType::Obj];92			1, f: [Val::Str]!!Val::Str, vec![ValType::Str];93			2, inc_hidden: [Val::Bool]!!Val::Bool, vec![ValType::Bool];94		], {95			Ok(Val::Bool(96				obj.fields_visibility()97					.into_iter()98					.filter(|(_k, v)| *v || inc_hidden)99					.any(|(k, _v)| *k == *f),100			))101		})?,102		"primitiveEquals" => parse_args!(context, "std.primitiveEquals", args, 2, [103			0, a, vec![];104			1, b, vec![];105		], {106			Ok(Val::Bool(primitive_equals(&a, &b)?))107		})?,108		// faster109		"equals" => parse_args!(context, "std.equals", args, 2, [110			0, a, vec![];111			1, b, vec![];112		], {113			Ok(Val::Bool(equals(&a, &b)?))114		})?,115		"modulo" => parse_args!(context, "std.modulo", args, 2, [116			0, a: [Val::Num]!!Val::Num, vec![ValType::Num];117			1, b: [Val::Num]!!Val::Num, vec![ValType::Num];118		], {119			Ok(Val::Num(a % b))120		})?,121		"floor" => parse_args!(context, "std.floor", args, 1, [122			0, x: [Val::Num]!!Val::Num, vec![ValType::Num];123		], {124			Ok(Val::Num(x.floor()))125		})?,126		"log" => parse_args!(context, "std.log", args, 2, [127			0, n: [Val::Num]!!Val::Num, vec![ValType::Num];128		], {129			Ok(Val::Num(n.ln()))130		})?,131		"trace" => parse_args!(context, "std.trace", args, 2, [132			0, str: [Val::Str]!!Val::Str, vec![ValType::Str];133			1, rest, vec![];134		], {135			eprint!("TRACE:");136			if let Some(loc) = loc {137				with_state(|s|{138					let locs = s.map_source_locations(&loc.0, &[loc.1]);139					eprint!(" {}:{}", loc.0.file_name().unwrap().to_str().unwrap(), locs[0].line);140				});141			}142			eprintln!(" {}", str);143			Ok(rest)144		})?,145		"pow" => parse_args!(context, "std.modulo", args, 2, [146			0, x: [Val::Num]!!Val::Num, vec![ValType::Num];147			1, n: [Val::Num]!!Val::Num, vec![ValType::Num];148		], {149			Ok(Val::Num(x.powf(n)))150		})?,151		"extVar" => parse_args!(context, "std.extVar", args, 1, [152			0, x: [Val::Str]!!Val::Str, vec![ValType::Str];153		], {154			Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or_else(155				|| UndefinedExternalVariable(x),156			)?)157		})?,158		"native" => parse_args!(context, "std.native", args, 1, [159			0, x: [Val::Str]!!Val::Str, vec![ValType::Str];160		], {161			Ok(with_state(|s| s.settings().ext_natives.get(&x).cloned()).map(|v| Val::Func(Rc::new(FuncVal::NativeExt(x.clone(), v)))).ok_or_else(162				|| UndefinedExternalFunction(x),163			)?)164		})?,165		"filter" => parse_args!(context, "std.filter", args, 2, [166			0, func: [Val::Func]!!Val::Func, vec![ValType::Func];167			1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];168		], {169			Ok(Val::Arr(Rc::new(170				arr.iter()171					.cloned()172					.filter(|e| {173						func174							.evaluate_values(context.clone(), &[e.clone()])175							.unwrap()176							.try_cast_bool("filter predicate")177							.unwrap()178					})179					.collect(),180			)))181		})?,182		// faster183		"foldl" => parse_args!(context, "std.foldl", args, 3, [184			0, func: [Val::Func]!!Val::Func, vec![ValType::Func];185			1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];186			2, init, vec![];187		], {188			let mut acc = init;189			for i in arr.iter().cloned() {190				acc = func.evaluate_values(context.clone(), &[acc, i])?;191			}192			Ok(acc)193		})?,194		// faster195		"foldr" => parse_args!(context, "std.foldr", args, 3, [196			0, func: [Val::Func]!!Val::Func, vec![ValType::Func];197			1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];198			2, init, vec![];199		], {200			let mut acc = init;201			for i in arr.iter().rev().cloned() {202				acc = func.evaluate_values(context.clone(), &[acc, i])?;203			}204			Ok(acc)205		})?,206		// faster207		#[allow(non_snake_case)]208		"sortImpl" => parse_args!(context, "std.sort", args, 2, [209			0, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];210			1, keyF: [Val::Func]!!Val::Func, vec![ValType::Func];211		], {212			if arr.len() <= 1 {213				return Ok(Val::Arr(arr))214			}215			Ok(Val::Arr(sort::sort(context, arr, &keyF)?))216		})?,217		// faster218		"format" => parse_args!(context, "std.format", args, 2, [219			0, str: [Val::Str]!!Val::Str, vec![ValType::Str];220			1, vals, vec![]221		], {222			push(&Some(ExprLocation(Rc::from(PathBuf::from("std.jsonnet")), 0, 0)), ||format!("std.format of {}", str), ||{223				Ok(match vals {224					Val::Arr(vals) => Val::Str(format_arr(&str, &vals)?.into()),225					Val::Obj(obj) => Val::Str(format_obj(&str, &obj)?.into()),226					o => Val::Str(format_arr(&str, &[o])?.into()),227				})228			})229		})?,230		// faster231		"range" => parse_args!(context, "std.range", args, 2, [232			0, from: [Val::Num]!!Val::Num, vec![ValType::Num];233			1, to: [Val::Num]!!Val::Num, vec![ValType::Num];234		], {235			let mut out = Vec::with_capacity((1+to as usize-from as usize).max(0));236			for i in from as usize..=to as usize {237				out.push(Val::Num(i as f64));238			}239			Ok(Val::Arr(Rc::new(out)))240		})?,241		"char" => parse_args!(context, "std.char", args, 1, [242			0, n: [Val::Num]!!Val::Num, vec![ValType::Num];243		], {244			let mut out = String::new();245			out.push(std::char::from_u32(n as u32).ok_or_else(||246				InvalidUnicodeCodepointGot(n as u32)247			)?);248			Ok(Val::Str(out.into()))249		})?,250		"encodeUTF8" => parse_args!(context, "std.encodeUtf8", args, 1, [251			0, str: [Val::Str]!!Val::Str, vec![ValType::Str];252		], {253			Ok(Val::Arr(Rc::new(str.bytes().map(|b| Val::Num(b as f64)).collect())))254		})?,255		"md5" => parse_args!(context, "std.md5", args, 1, [256			0, str: [Val::Str]!!Val::Str, vec![ValType::Str];257		], {258			Ok(Val::Str(format!("{:x}", md5::compute(&str.as_bytes())).into()))259		})?,260		// faster261		"base64" => parse_args!(context, "std.base64", args, 1, [262			0, input: [Val::Str | Val::Arr], vec![ValType::Arr, ValType::Str];263		], {264			Ok(Val::Str(match input {265				Val::Str(s) => {266					base64::encode(s.bytes().collect::<Vec<_>>()).into()267				},268				Val::Arr(a) => {269					base64::encode(a.iter().map(|v| {270						Ok(v.clone().try_cast_num("base64 array")? as u8)271					}).collect::<Result<Vec<_>>>()?).into()272				},273				_ => unreachable!()274			}))275		})?,276		// faster277		"join" => parse_args!(context, "std.join", args, 2, [278			0, sep: [Val::Str|Val::Arr], vec![ValType::Str, ValType::Arr];279			1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];280		], {281			Ok(match sep {282				Val::Arr(joiner_items) => {283					let mut out = Vec::new();284285					let mut first = true;286					for item in arr.iter().cloned() {287						if let Val::Arr(items) = item.unwrap_if_lazy()? {288							if !first {289								out.reserve(joiner_items.len());290								out.extend(joiner_items.iter().cloned());291							}292							first = false;293							out.reserve(items.len());294							out.extend(items.iter().cloned());295						} else {296							throw!(RuntimeError("in std.join all items should be arrays".into()));297						}298					}299300					Val::Arr(Rc::new(out))301				},302				Val::Str(sep) => {303					let mut out = String::new();304305					let mut first = true;306					for item in arr.iter().cloned() {307						if let Val::Str(item) = item.unwrap_if_lazy()? {308							if !first {309								out += &sep;310							}311							first = false;312							out += &item;313						} else {314							throw!(RuntimeError("in std.join all items should be strings".into()));315						}316					}317318					Val::Str(out.into())319				},320				_ => unreachable!()321			})322		})?,323		// Faster324		"escapeStringJson" => parse_args!(context, "std.escapeStringJson", args, 1, [325			0, str_: [Val::Str]!!Val::Str, vec![ValType::Str];326		], {327			Ok(Val::Str(escape_string_json(&str_).into()))328		})?,329		// Faster330		"manifestJsonEx" => parse_args!(context, "std.manifestJsonEx", args, 2, [331			0, value, vec![];332			1, indent: [Val::Str]!!Val::Str, vec![ValType::Str];333		], {334			Ok(Val::Str(manifest_json_ex(&value, &ManifestJsonOptions {335				padding: &indent,336				mtype: ManifestType::Std,337			})?.into()))338		})?,339		// Faster340		"reverse" => parse_args!(context, "std.reverse", args, 1, [341			0, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];342		], {343			let mut marr = arr;344			Rc::make_mut(&mut marr).reverse();345			Ok(Val::Arr(marr))346		})?,347		"id" => parse_args!(context, "std.id", args, 1, [348			0, v, vec![];349		], {350			Ok(v)351		})?,352		name => throw!(IntrinsicNotFound(name.into())),353	})354}
modifiedcrates/jrsonnet-parser/src/expr.rsdiffbeforeafterboth
--- a/crates/jrsonnet-parser/src/expr.rs
+++ b/crates/jrsonnet-parser/src/expr.rs
@@ -97,6 +97,8 @@
 	Mul,
 	Div,
 
+	Mod,
+
 	Add,
 	Sub,
 
@@ -124,6 +126,7 @@
 			match self {
 				Mul => "*",
 				Div => "/",
+				Mod => "%",
 				Add => "+",
 				Sub => "-",
 				Lhs => "<<",