difftreelog
refactor move field sorting to visible_fields
in: master
2 files changed
crates/jrsonnet-evaluator/src/obj.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -86,11 +86,14 @@
Rc::try_unwrap(out).unwrap().into_inner()
}
pub fn visible_fields(&self) -> Vec<Rc<str>> {
- self.fields_visibility()
+ let mut visible_fields: Vec<_> = self
+ .fields_visibility()
.into_iter()
.filter(|(_k, v)| *v)
.map(|(k, _)| k)
- .collect()
+ .collect();
+ visible_fields.sort();
+ visible_fields
}
pub fn get(&self, key: Rc<str>) -> Result<Option<Val>> {
if let Some(v) = self.0.value_cache.borrow().get(&key) {
crates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth1use 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}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 fields = obj.visible_fields();259 if !fields.is_empty() {260 let old_len = cur_padding.len();261 cur_padding.push_str(padding);262 for (i, field) in fields.into_iter().enumerate() {263 if i != 0 {264 buf.push_str(",\n")265 }266 buf.push_str(cur_padding);267 buf.push_str(&escape_string_json(&field));268 buf.push_str(": ");269 manifest_json_ex_buf(&obj.get(field)?.unwrap(), buf, padding, cur_padding)?;270 }271 cur_padding.truncate(old_len);272 }273 buf.push('\n');274 buf.push_str(cur_padding);275 buf.push('}');276 }277 Val::Func(_) | Val::Intristic(_, _) => create_error_result(Error::RuntimeError("tried to manifest function".into()))?,278 Val::Lazy(_) => unreachable!(),279 };280 Ok(())281}282pub fn escape_string_json(s: &str) -> String {283 use std::fmt::Write;284 let mut out = String::new();285 out.push('"');286 for c in s.chars() {287 match c {288 '"' => out.push_str("\\\""),289 '\\' => out.push_str("\\\\"),290 '\u{0008}' => out.push_str("\\b"),291 '\u{000c}' => out.push_str("\\f"),292 '\n' => out.push_str("\\n"),293 '\r' => out.push_str("\\r"),294 '\t' => out.push_str("\\t"),295 c if c < 32 as char || (c >= 127 as char && c <= 159 as char) => {296 write!(out, "\\u{:04x}", c as u32).unwrap()297 }298 c => out.push(c),299 }300 }301 out.push('"');302 out303}304305#[test]306fn json_test() {307 assert_eq!(escape_string_json("\u{001f}"), "\"\\u001f\"")308}