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

difftreelog

feat(evaluator) number overflow checks

Лач2020-07-01parent: #625fbae.patch.diff
in: master

2 files changed

modifiedcrates/jrsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate.rs
@@ -92,7 +92,7 @@
 
 		(Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),
 		(Val::Arr(a), Val::Arr(b)) => Val::Arr(Rc::new([&a[..], &b[..]].concat())),
-		(Val::Num(v1), Val::Num(v2)) => Val::Num(v1 + v2),
+		(Val::Num(v1), Val::Num(v2)) => Val::new_checked_num(v1 + v2)?,
 		_ => create_error_result(Error::BinaryOperatorDoesNotOperateOnValues(
 			BinaryOpType::Add,
 			a.value_type()?,
@@ -135,15 +135,15 @@
 		(Val::Str(v1), BinaryOpType::Gte, Val::Str(v2)) => Val::Bool(v1 >= v2),
 
 		// Num X Num
-		(Val::Num(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Num(v1 * v2),
+		(Val::Num(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::new_checked_num(v1 * v2)?,
 		(Val::Num(v1), BinaryOpType::Div, Val::Num(v2)) => {
 			if *v2 <= f64::EPSILON {
 				create_error_result(crate::Error::DivisionByZero)?
 			}
-			Val::Num(v1 / v2)
+			Val::new_checked_num(v1 / v2)?
 		}
 
-		(Val::Num(v1), BinaryOpType::Sub, Val::Num(v2)) => Val::Num(v1 - v2),
+		(Val::Num(v1), BinaryOpType::Sub, Val::Num(v2)) => Val::new_checked_num(v1 - v2)?,
 
 		(Val::Num(v1), BinaryOpType::Lt, Val::Num(v2)) => Val::Bool(v1 < v2),
 		(Val::Num(v1), BinaryOpType::Gt, Val::Num(v2)) => Val::Bool(v1 > v2),
@@ -644,7 +644,7 @@
 		Literal(LiteralType::Null) => Val::Null,
 		Parened(e) => evaluate(context, e)?,
 		Str(v) => Val::Str(v.clone()),
-		Num(v) => Val::Num(*v),
+		Num(v) => Val::new_checked_num(*v)?,
 		BinaryOp(v1, o, v2) => evaluate_binary_op_special(context, &v1, *o, &v2)?,
 		UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(context, v)?)?,
 		Var(name) => push(loc, "var", || {
modifiedcrates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth
before · crates/jrsonnet-evaluator/src/val.rs
1use crate::{2	create_error_result, evaluate,3	function::{parse_function_call, place_args},4	Context, Error, ObjValue, Result,5};6use jrsonnet_parser::{ArgsDesc, LocExpr, ParamsDesc};7use std::{8	cell::RefCell,9	fmt::{Debug, Display},10	rc::Rc,11};1213enum LazyValInternals {14	Computed(Val),15	Waiting(Box<dyn Fn() -> Result<Val>>),16}17#[derive(Clone)]18pub struct LazyVal(Rc<RefCell<LazyValInternals>>);19impl LazyVal {20	pub fn new(f: Box<dyn Fn() -> Result<Val>>) -> Self {21		LazyVal(Rc::new(RefCell::new(LazyValInternals::Waiting(f))))22	}23	pub fn new_resolved(val: Val) -> Self {24		LazyVal(Rc::new(RefCell::new(LazyValInternals::Computed(val))))25	}26	pub fn evaluate(&self) -> Result<Val> {27		let new_value = match &*self.0.borrow() {28			LazyValInternals::Computed(v) => return Ok(v.clone()),29			LazyValInternals::Waiting(f) => f()?,30		};31		*self.0.borrow_mut() = LazyValInternals::Computed(new_value.clone());32		Ok(new_value)33	}34}3536#[macro_export]37macro_rules! lazy_val {38	($f: expr) => {39		$crate::LazyVal::new(Box::new($f))40	};41}42#[macro_export]43macro_rules! resolved_lazy_val {44	($f: expr) => {45		$crate::LazyVal::new_resolved($f)46	};47}48impl Debug for LazyVal {49	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {50		write!(f, "Lazy")51	}52}53impl PartialEq for LazyVal {54	fn eq(&self, other: &Self) -> bool {55		Rc::ptr_eq(&self.0, &other.0)56	}57}5859#[derive(Debug, PartialEq, Clone)]60pub struct FuncDesc {61	pub ctx: Context,62	pub params: ParamsDesc,63	pub body: LocExpr,64}65impl FuncDesc {66	/// This function is always inlined to make tailstrict work67	pub fn evaluate(&self, call_ctx: Context, args: &ArgsDesc, tailstrict: bool) -> Result<Val> {68		let ctx = parse_function_call(69			call_ctx,70			Some(self.ctx.clone()),71			&self.params,72			args,73			tailstrict,74		)?;75		evaluate(ctx, &self.body)76	}7778	pub fn evaluate_values(&self, call_ctx: Context, args: &[Val]) -> Result<Val> {79		let ctx = place_args(call_ctx, Some(self.ctx.clone()), &self.params, args)?;80		evaluate(ctx, &self.body)81	}82}8384#[derive(Debug, Clone, Copy, PartialEq)]85pub enum ValType {86	Bool,87	Null,88	Str,89	Num,90	Arr,91	Obj,92	Func,93}94impl ValType {95	pub fn name(&self) -> &'static str {96		use ValType::*;97		match self {98			Bool => "boolean",99			Null => "null",100			Str => "string",101			Num => "number",102			Arr => "array",103			Obj => "object",104			Func => "function",105		}106	}107}108impl Display for ValType {109	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {110		write!(f, "{}", self.name())111	}112}113114#[derive(Debug, PartialEq, Clone)]115pub enum Val {116	Bool(bool),117	Null,118	Str(Rc<str>),119	Num(f64),120	Lazy(LazyVal),121	Arr(Rc<Vec<Val>>),122	Obj(ObjValue),123	Func(FuncDesc),124125	// Library functions implemented in native126	Intristic(Rc<str>, Rc<str>),127}128macro_rules! matches_unwrap {129	($e: expr, $p: pat, $r: expr) => {130		match $e {131			$p => $r,132			_ => panic!("no match"),133			}134	};135}136impl Val {137	pub fn assert_type(&self, context: &'static str, val_type: ValType) -> Result<()> {138		let this_type = self.value_type()?;139		if this_type != val_type {140			create_error_result(Error::TypeMismatch(context, vec![val_type], this_type))141		} else {142			Ok(())143		}144	}145	pub fn try_cast_bool(self, context: &'static str) -> Result<bool> {146		self.assert_type(context, ValType::Bool)?;147		Ok(matches_unwrap!(self.unwrap_if_lazy()?, Val::Bool(v), v))148	}149	pub fn try_cast_str(self, context: &'static str) -> Result<Rc<str>> {150		self.assert_type(context, ValType::Str)?;151		Ok(matches_unwrap!(self.unwrap_if_lazy()?, Val::Str(v), v))152	}153	pub fn try_cast_num(self, context: &'static str) -> Result<f64> {154		self.assert_type(context, ValType::Num)?;155		Ok(matches_unwrap!(self.unwrap_if_lazy()?, Val::Num(v), v))156	}157	pub fn unwrap_if_lazy(&self) -> Result<Self> {158		Ok(if let Val::Lazy(v) = self {159			v.evaluate()?.unwrap_if_lazy()?160		} else {161			self.clone()162		})163	}164	pub fn value_type(&self) -> Result<ValType> {165		Ok(match self {166			Val::Str(..) => ValType::Str,167			Val::Num(..) => ValType::Num,168			Val::Arr(..) => ValType::Arr,169			Val::Obj(..) => ValType::Obj,170			Val::Func(..) => ValType::Func,171			Val::Bool(_) => ValType::Bool,172			Val::Null => ValType::Null,173			Val::Intristic(_, _) => ValType::Func,174			Val::Lazy(_) => self.clone().unwrap_if_lazy()?.value_type()?,175		})176	}177	#[cfg(feature = "faster")]178	pub fn into_json(self, padding: usize) -> Result<Rc<str>> {179		manifest_json_ex(&self, &" ".repeat(padding)).map(|s| s.into())180	}181	#[cfg(not(feature = "faster"))]182	pub fn into_json(self, padding: usize) -> Result<Rc<str>> {183		with_state(|s| {184			let ctx = s185				.create_default_context()?186				.with_var("__tmp__to_json__".into(), self)?;187			Ok(evaluate(188				ctx,189				&el!(Expr::Apply(190					el!(Expr::Index(191						el!(Expr::Var("std".into())),192						el!(Expr::Str("manifestJsonEx".into()))193					)),194					ArgsDesc(vec![195						Arg(None, el!(Expr::Var("__tmp__to_json__".into()))),196						Arg(None, el!(Expr::Str(" ".repeat(padding).into())))197					]),198					false199				)),200			)?201			.try_cast_str("to json")?)202		})203	}204}205206pub fn manifest_json_ex(val: &Val, padding: &str) -> Result<String> {207	let mut out = String::new();208	manifest_json_ex_buf(val, &mut out, padding, &mut String::new())?;209	Ok(out)210}211fn manifest_json_ex_buf(212	val: &Val,213	buf: &mut String,214	padding: &str,215	cur_padding: &mut String,216) -> Result<()> {217	use std::fmt::Write;218	match val.unwrap_if_lazy()? {219		Val::Bool(v) => {220			if v {221				buf.push_str("true");222			} else {223				buf.push_str("false");224			}225		}226		Val::Null => buf.push_str("null"),227		Val::Str(s) => buf.push_str(&escape_string_json(&s)),228		Val::Num(n) => write!(buf, "{}", n).unwrap(),229		Val::Arr(items) => {230			buf.push_str("[\n");231			if !items.is_empty() {232				let old_len = cur_padding.len();233				cur_padding.push_str(padding);234				for (i, item) in items.iter().enumerate() {235					if i != 0 {236						buf.push_str(",\n")237					}238					buf.push_str(cur_padding);239					manifest_json_ex_buf(item, buf, padding, cur_padding)?;240				}241				cur_padding.truncate(old_len);242			}243			buf.push('\n');244			buf.push_str(cur_padding);245			buf.push(']');246		}247		Val::Obj(obj) => {248			buf.push_str("{\n");249			let mut fields = obj.visible_fields();250			fields.sort();251			if !fields.is_empty() {252				let old_len = cur_padding.len();253				cur_padding.push_str(padding);254				for (i, field) in fields.into_iter().enumerate() {255					if i != 0 {256						buf.push_str(",\n")257					}258					buf.push_str(cur_padding);259					buf.push_str(&escape_string_json(&field));260					buf.push_str(": ");261					manifest_json_ex_buf(&obj.get(field)?.unwrap(), buf, padding, cur_padding)?;262				}263				cur_padding.truncate(old_len);264			}265			buf.push('\n');266			buf.push_str(cur_padding);267			buf.push('}');268		}269		Val::Func(_) | Val::Intristic(_, _) => create_error_result(Error::RuntimeError("tried to manifest function".into()))?,270		Val::Lazy(_) => unreachable!(),271	};272	Ok(())273}274pub fn escape_string_json(s: &str) -> String {275	use std::fmt::Write;276	let mut out = String::new();277	out.push('"');278	for c in s.chars() {279		match c {280			'"' => out.push_str("\\\""),281			'\\' => out.push_str("\\\\"),282			'\u{0008}' => out.push_str("\\b"),283			'\u{000c}' => out.push_str("\\f"),284			'\n' => out.push_str("\\n"),285			'\r' => out.push_str("\\r"),286			'\t' => out.push_str("\\t"),287			c if c < 32 as char || (c >= 127 as char && c <= 159 as char) => {288				write!(out, "\\u{:04x}", c as u32).unwrap()289			}290			c => out.push(c),291		}292	}293	out.push('"');294	out295}296297#[test]298fn json_test() {299	assert_eq!(escape_string_json("\u{001f}"), "\"\\u001f\"")300}
after · crates/jrsonnet-evaluator/src/val.rs
1use crate::{2	create_error_result, evaluate,3	function::{parse_function_call, place_args},4	Context, Error, ObjValue, Result,5};6use jrsonnet_parser::{ArgsDesc, LocExpr, ParamsDesc};7use std::{8	cell::RefCell,9	fmt::{Debug, Display},10	rc::Rc,11};1213enum LazyValInternals {14	Computed(Val),15	Waiting(Box<dyn Fn() -> Result<Val>>),16}17#[derive(Clone)]18pub struct LazyVal(Rc<RefCell<LazyValInternals>>);19impl LazyVal {20	pub fn new(f: Box<dyn Fn() -> Result<Val>>) -> Self {21		LazyVal(Rc::new(RefCell::new(LazyValInternals::Waiting(f))))22	}23	pub fn new_resolved(val: Val) -> Self {24		LazyVal(Rc::new(RefCell::new(LazyValInternals::Computed(val))))25	}26	pub fn evaluate(&self) -> Result<Val> {27		let new_value = match &*self.0.borrow() {28			LazyValInternals::Computed(v) => return Ok(v.clone()),29			LazyValInternals::Waiting(f) => f()?,30		};31		*self.0.borrow_mut() = LazyValInternals::Computed(new_value.clone());32		Ok(new_value)33	}34}3536#[macro_export]37macro_rules! lazy_val {38	($f: expr) => {39		$crate::LazyVal::new(Box::new($f))40	};41}42#[macro_export]43macro_rules! resolved_lazy_val {44	($f: expr) => {45		$crate::LazyVal::new_resolved($f)46	};47}48impl Debug for LazyVal {49	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {50		write!(f, "Lazy")51	}52}53impl PartialEq for LazyVal {54	fn eq(&self, other: &Self) -> bool {55		Rc::ptr_eq(&self.0, &other.0)56	}57}5859#[derive(Debug, PartialEq, Clone)]60pub struct FuncDesc {61	pub ctx: Context,62	pub params: ParamsDesc,63	pub body: LocExpr,64}65impl FuncDesc {66	/// This function is always inlined to make tailstrict work67	pub fn evaluate(&self, call_ctx: Context, args: &ArgsDesc, tailstrict: bool) -> Result<Val> {68		let ctx = parse_function_call(69			call_ctx,70			Some(self.ctx.clone()),71			&self.params,72			args,73			tailstrict,74		)?;75		evaluate(ctx, &self.body)76	}7778	pub fn evaluate_values(&self, call_ctx: Context, args: &[Val]) -> Result<Val> {79		let ctx = place_args(call_ctx, Some(self.ctx.clone()), &self.params, args)?;80		evaluate(ctx, &self.body)81	}82}8384#[derive(Debug, Clone, Copy, PartialEq)]85pub enum ValType {86	Bool,87	Null,88	Str,89	Num,90	Arr,91	Obj,92	Func,93}94impl ValType {95	pub fn name(&self) -> &'static str {96		use ValType::*;97		match self {98			Bool => "boolean",99			Null => "null",100			Str => "string",101			Num => "number",102			Arr => "array",103			Obj => "object",104			Func => "function",105		}106	}107}108impl Display for ValType {109	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {110		write!(f, "{}", self.name())111	}112}113114#[derive(Debug, PartialEq, Clone)]115pub enum Val {116	Bool(bool),117	Null,118	Str(Rc<str>),119	Num(f64),120	Lazy(LazyVal),121	Arr(Rc<Vec<Val>>),122	Obj(ObjValue),123	Func(FuncDesc),124125	// Library functions implemented in native126	Intristic(Rc<str>, Rc<str>),127}128macro_rules! matches_unwrap {129	($e: expr, $p: pat, $r: expr) => {130		match $e {131			$p => $r,132			_ => panic!("no match"),133			}134	};135}136impl Val {137	/// Creates Val::Num after checking for overflow. As numbers are f64, we can just check for finity138	pub fn new_checked_num(num: f64) -> Result<Val> {139		if num.is_finite() {140			Ok(Val::Num(num))141		} else {142			create_error_result(Error::RuntimeError("overflow".into()))143		}144	}145146	pub fn assert_type(&self, context: &'static str, val_type: ValType) -> Result<()> {147		let this_type = self.value_type()?;148		if this_type != val_type {149			create_error_result(Error::TypeMismatch(context, vec![val_type], this_type))150		} else {151			Ok(())152		}153	}154	pub fn try_cast_bool(self, context: &'static str) -> Result<bool> {155		self.assert_type(context, ValType::Bool)?;156		Ok(matches_unwrap!(self.unwrap_if_lazy()?, Val::Bool(v), v))157	}158	pub fn try_cast_str(self, context: &'static str) -> Result<Rc<str>> {159		self.assert_type(context, ValType::Str)?;160		Ok(matches_unwrap!(self.unwrap_if_lazy()?, Val::Str(v), v))161	}162	pub fn try_cast_num(self, context: &'static str) -> Result<f64> {163		self.assert_type(context, ValType::Num)?;164		Ok(matches_unwrap!(self.unwrap_if_lazy()?, Val::Num(v), v))165	}166	pub fn unwrap_if_lazy(&self) -> Result<Self> {167		Ok(if let Val::Lazy(v) = self {168			v.evaluate()?.unwrap_if_lazy()?169		} else {170			self.clone()171		})172	}173	pub fn value_type(&self) -> Result<ValType> {174		Ok(match self {175			Val::Str(..) => ValType::Str,176			Val::Num(..) => ValType::Num,177			Val::Arr(..) => ValType::Arr,178			Val::Obj(..) => ValType::Obj,179			Val::Func(..) => ValType::Func,180			Val::Bool(_) => ValType::Bool,181			Val::Null => ValType::Null,182			Val::Intristic(_, _) => ValType::Func,183			Val::Lazy(_) => self.clone().unwrap_if_lazy()?.value_type()?,184		})185	}186	#[cfg(feature = "faster")]187	pub fn into_json(self, padding: usize) -> Result<Rc<str>> {188		manifest_json_ex(&self, &" ".repeat(padding)).map(|s| s.into())189	}190	#[cfg(not(feature = "faster"))]191	pub fn into_json(self, padding: usize) -> Result<Rc<str>> {192		with_state(|s| {193			let ctx = s194				.create_default_context()?195				.with_var("__tmp__to_json__".into(), self)?;196			Ok(evaluate(197				ctx,198				&el!(Expr::Apply(199					el!(Expr::Index(200						el!(Expr::Var("std".into())),201						el!(Expr::Str("manifestJsonEx".into()))202					)),203					ArgsDesc(vec![204						Arg(None, el!(Expr::Var("__tmp__to_json__".into()))),205						Arg(None, el!(Expr::Str(" ".repeat(padding).into())))206					]),207					false208				)),209			)?210			.try_cast_str("to json")?)211		})212	}213}214215pub fn manifest_json_ex(val: &Val, padding: &str) -> Result<String> {216	let mut out = String::new();217	manifest_json_ex_buf(val, &mut out, padding, &mut String::new())?;218	Ok(out)219}220fn manifest_json_ex_buf(221	val: &Val,222	buf: &mut String,223	padding: &str,224	cur_padding: &mut String,225) -> Result<()> {226	use std::fmt::Write;227	match val.unwrap_if_lazy()? {228		Val::Bool(v) => {229			if v {230				buf.push_str("true");231			} else {232				buf.push_str("false");233			}234		}235		Val::Null => buf.push_str("null"),236		Val::Str(s) => buf.push_str(&escape_string_json(&s)),237		Val::Num(n) => write!(buf, "{}", n).unwrap(),238		Val::Arr(items) => {239			buf.push_str("[\n");240			if !items.is_empty() {241				let old_len = cur_padding.len();242				cur_padding.push_str(padding);243				for (i, item) in items.iter().enumerate() {244					if i != 0 {245						buf.push_str(",\n")246					}247					buf.push_str(cur_padding);248					manifest_json_ex_buf(item, buf, padding, cur_padding)?;249				}250				cur_padding.truncate(old_len);251			}252			buf.push('\n');253			buf.push_str(cur_padding);254			buf.push(']');255		}256		Val::Obj(obj) => {257			buf.push_str("{\n");258			let mut fields = obj.visible_fields();259			fields.sort();260			if !fields.is_empty() {261				let old_len = cur_padding.len();262				cur_padding.push_str(padding);263				for (i, field) in fields.into_iter().enumerate() {264					if i != 0 {265						buf.push_str(",\n")266					}267					buf.push_str(cur_padding);268					buf.push_str(&escape_string_json(&field));269					buf.push_str(": ");270					manifest_json_ex_buf(&obj.get(field)?.unwrap(), buf, padding, cur_padding)?;271				}272				cur_padding.truncate(old_len);273			}274			buf.push('\n');275			buf.push_str(cur_padding);276			buf.push('}');277		}278		Val::Func(_) | Val::Intristic(_, _) => create_error_result(Error::RuntimeError("tried to manifest function".into()))?,279		Val::Lazy(_) => unreachable!(),280	};281	Ok(())282}283pub fn escape_string_json(s: &str) -> String {284	use std::fmt::Write;285	let mut out = String::new();286	out.push('"');287	for c in s.chars() {288		match c {289			'"' => out.push_str("\\\""),290			'\\' => out.push_str("\\\\"),291			'\u{0008}' => out.push_str("\\b"),292			'\u{000c}' => out.push_str("\\f"),293			'\n' => out.push_str("\\n"),294			'\r' => out.push_str("\\r"),295			'\t' => out.push_str("\\t"),296			c if c < 32 as char || (c >= 127 as char && c <= 159 as char) => {297				write!(out, "\\u{:04x}", c as u32).unwrap()298			}299			c => out.push(c),300		}301	}302	out.push('"');303	out304}305306#[test]307fn json_test() {308	assert_eq!(escape_string_json("\u{001f}"), "\"\\u001f\"")309}