difftreelog
style run rustfmt
in: master
4 files changed
cmds/jrsonnet/src/main.rsdiffbeforeafterboth--- a/cmds/jrsonnet/src/main.rs
+++ b/cmds/jrsonnet/src/main.rs
@@ -134,19 +134,30 @@
fn main_real(opts: Opts) {
let evaluator = jrsonnet_evaluator::EvaluationState::default();
- evaluator.set_max_trace(opts.max_trace);
- evaluator.set_max_stack(opts.max_stack);
- evaluator.set_import_resolver(Box::new(jrsonnet_evaluator::FileImportResolver {
- library_paths: opts.jpath.clone(),
- }));
+ {
+ let mut settings = evaluator.settings_mut();
+ settings.max_stack = opts.max_stack;
+ settings.max_trace = opts.max_trace;
+ settings.import_resolver = Box::new(jrsonnet_evaluator::FileImportResolver {
+ library_paths: opts.jpath.clone(),
+ });
+ }
if !opts.no_stdlib {
evaluator.with_stdlib();
}
for ExtStr { name, value } in opts.ext_str.iter().cloned() {
- evaluator.add_ext_var(name.into(), Val::Str(value.into()));
+ evaluator
+ .settings_mut()
+ .ext_vars
+ .insert(name.into(), Val::Str(value.into()));
}
for ExtStr { name, value } in opts.ext_code.iter().cloned() {
- evaluator.add_ext_var(name.into(), evaluator.parse_evaluate_raw(&value).unwrap());
+ evaluator.settings_mut().ext_vars.insert(
+ name.clone().into(),
+ evaluator
+ .parse_evaluate_raw(PathBuf::from(format!("ext_code {}", name)).into(), &value)
+ .unwrap(),
+ );
}
let resolver = PathResolver::Relative(std::env::current_dir().unwrap());
@@ -184,8 +195,11 @@
.unwrap(),
);
}
- evaluator.add_global("__tmp__tlf__".into(), Val::Func(f));
evaluator
+ .settings_mut()
+ .globals
+ .insert("__tmp__tlf__".into(), Val::Func(f));
+ evaluator
.evaluate_raw(el!(Expr::Apply(
el!(Expr::Var("__tmp__tlf__".into())),
ArgsDesc(desc_map.into_iter().map(|(k, v)| Arg(Some(k), v)).collect()),
crates/jrsonnet-evaluator/src/function.rsdiffbeforeafterboth1use crate::{2 create_error, create_error_result, evaluate, lazy_val, resolved_lazy_val, Context, Error,3 Result, Val,4};5use closure::closure;6use jrsonnet_parser::{ArgsDesc, ParamsDesc};7use std::collections::HashMap;89/// Creates correct [context](Context) for function body evaluation, returning error on invalid call10///11/// * `ctx` used for passed argument expressions execution, and for body execution (if `body_ctx` is not set)12/// * `body_ctx` used for default parameter values execution, and for body execution (if set)13/// * `params` function parameters definition14/// * `args` passed function arguments15/// * `tailstruct` if true - function arguments is eager executed, otherwise - lazy16pub fn parse_function_call(17 ctx: Context,18 body_ctx: Option<Context>,19 params: &ParamsDesc,20 args: &ArgsDesc,21 tailstrict: bool,22) -> Result<Context> {23 let mut out = HashMap::new();24 let mut positioned_args = vec![None; params.0.len()];25 for (id, arg) in args.iter().enumerate() {26 let idx = if let Some(name) = &arg.0 {27 params28 .iter()29 .position(|p| *p.0 == *name)30 .ok_or_else(|| create_error(Error::UnknownFunctionParameter(name.clone())))?31 } else {32 id33 };3435 if idx >= params.len() {36 create_error_result(Error::TooManyArgsFunctionHas(params.len()))?;37 }38 if positioned_args[idx].is_some() {39 create_error_result(Error::BindingParameterASecondTime(params[idx].0.clone()))?;40 }41 positioned_args[idx] = Some(arg.1.clone());42 }43 // Fill defaults44 for (id, p) in params.iter().enumerate() {45 let (ctx, expr) = if let Some(arg) = &positioned_args[id] {46 (ctx.clone(), arg)47 } else if let Some(default) = &p.1 {48 (49 body_ctx50 .clone()51 .expect("no default context set for call with defined default parameter value"),52 default,53 )54 } else {55 create_error_result(Error::FunctionParameterNotBoundInCall(p.0.clone()))?;56 unreachable!()57 };58 let val = if tailstrict {59 resolved_lazy_val!(evaluate(ctx, expr)?)60 } else {61 lazy_val!(closure!(clone ctx, clone expr, ||evaluate(ctx.clone(), &expr)))62 };63 out.insert(p.0.clone(), val);64 }6566 Ok(body_ctx.unwrap_or(ctx).extend(out, None, None, None)?)67}6869pub(crate) fn place_args(70 ctx: Context,71 body_ctx: Option<Context>,72 params: &ParamsDesc,73 args: &[Val],74) -> Result<Context> {75 let mut out = HashMap::new();76 let mut positioned_args = vec![None; params.0.len()];77 for (id, arg) in args.iter().enumerate() {78 if id >= params.len() {79 create_error_result(Error::TooManyArgsFunctionHas(params.len()))?;80 }81 positioned_args[id] = Some(arg);82 }83 // Fill defaults84 for (id, p) in params.iter().enumerate() {85 let val = if let Some(arg) = &positioned_args[id] {86 (*arg).clone()87 } else if let Some(default) = &p.1 {88 evaluate(ctx.clone(), default)?89 } else {90 create_error_result(Error::FunctionParameterNotBoundInCall(p.0.clone()))?;91 unreachable!()92 };93 out.insert(p.0.clone(), resolved_lazy_val!(val));94 }9596 Ok(body_ctx.unwrap_or(ctx).extend(out, None, None, None)?)97}9899#[macro_export]100macro_rules! parse_args {101 ($ctx: expr, $fn_name: expr, $args: expr, $total_args: expr, [102 $($id: expr, $name: ident $(: [$($p: path)|+] $(!! $a: path)?)?, $nt: expr);+ $(;)?103 ], $handler:block) => {{104 use crate::Error;105 let args = $args;106 if args.len() > $total_args {107 create_error_result(Error::TooManyArgsFunctionHas($total_args))?;108 }109 $(110 if args.len() <= $id {111 create_error_result(Error::FunctionParameterNotBoundInCall(stringify!($name).into()))?;112 }113 let $name = &args[$id];114 if $name.0.is_some() {115 if $name.0.as_ref().unwrap() != stringify!($name) {116 create_error_result(Error::IntristicArgumentReorderingIsNotSupportedYet)?;117 }118 }119 let $name = evaluate($ctx.clone(), &$name.1)?;120 $(121 match $name {122 $($p(_))|+ => {},123 _ => create_error_result(Error::TypeMismatch(concat!($fn_name, " ", stringify!($id), "nd argument"), $nt, $name.value_type()?))?,124 };125 $(126 let $name = match $name {127 $a(v) => v,128 _ => create_error_result(Error::TypeMismatch(concat!($fn_name, " ", stringify!($id), "nd argument"), $nt, $name.value_type()?))?,129 };130 )*131 )*132 )+133 $handler134 }};135}136137#[test]138fn test() -> Result<()> {139 use jrsonnet_parser::*;140 use crate::val::ValType;141 let state = crate::EvaluationState::default();142 let evaluator = state.with_stdlib();143 let ctx = evaluator.create_default_context()?;144 evaluator.run_in_state(|| {145 parse_args!(ctx, "test", ArgsDesc(vec![146 Arg(None, el!(Expr::Num(2.0))),147 Arg(Some("b".into()), el!(Expr::Num(1.0))),148 ]), 2, [149 0, a: [Val::Num]!!Val::Num, vec![ValType::Num];150 1, b: [Val::Num]!!Val::Num, vec![ValType::Num];151 ], {152 assert!((a - 2.0).abs() <= f64::EPSILON);153 assert!((b - 1.0).abs() <= f64::EPSILON);154 });155 Ok(())156 })157}crates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -7,6 +7,7 @@
extern crate test;
+mod builtin;
mod ctx;
mod dynamic;
mod error;
@@ -15,8 +16,8 @@
mod import;
mod map;
mod obj;
-mod val;
pub mod trace;
+mod val;
pub use ctx::*;
pub use dynamic::*;
@@ -26,9 +27,15 @@
pub use import::*;
use jrsonnet_parser::*;
pub use obj::*;
-use std::{cell::{Ref, RefCell, RefMut}, collections::HashMap, fmt::Debug, path::PathBuf, rc::Rc};
+use std::{
+ cell::{Ref, RefCell, RefMut},
+ collections::HashMap,
+ fmt::Debug,
+ path::PathBuf,
+ rc::Rc,
+};
+use trace::{offset_to_location, CodeLocation};
pub use val::*;
-use trace::{offset_to_location, CodeLocation};
type BindableFn = dyn Fn(Option<ObjValue>, Option<ObjValue>) -> Result<LazyVal>;
#[derive(Clone)]
@@ -319,7 +326,7 @@
drop(data);
return Err(self.error(Error::StackOverflow));
} else {
- *stack_depth+=1;
+ *stack_depth += 1;
}
}
let result = f();
@@ -355,30 +362,28 @@
#[cfg(test)]
pub mod tests {
use super::Val;
- use crate::{create_error, EvaluationState, primitive_equals};
+ use crate::{create_error, primitive_equals, EvaluationState};
use jrsonnet_parser::*;
use std::{path::PathBuf, rc::Rc};
#[test]
fn eval_state_stacktrace() {
let state = EvaluationState::default();
- state.run_in_state(||{
+ state.run_in_state(|| {
state
- .push(
- &ExprLocation(Rc::new(PathBuf::from("test1.jsonnet")), 10, 20),
- || "outer".to_owned(),
- || {
- state.push(
- &ExprLocation(Rc::new(PathBuf::from("test2.jsonnet")), 30, 40),
- || "inner".to_owned(),
- || {
- Err(create_error(crate::error::Error::RuntimeError("".into())))
- },
- )?;
- Ok(())
- },
- )
- .unwrap();
+ .push(
+ &ExprLocation(Rc::new(PathBuf::from("test1.jsonnet")), 10, 20),
+ || "outer".to_owned(),
+ || {
+ state.push(
+ &ExprLocation(Rc::new(PathBuf::from("test2.jsonnet")), 30, 40),
+ || "inner".to_owned(),
+ || Err(create_error(crate::error::Error::RuntimeError("".into()))),
+ )?;
+ Ok(())
+ },
+ )
+ .unwrap();
});
}
@@ -386,19 +391,23 @@
fn eval_state_standard() {
let state = EvaluationState::default();
state.with_stdlib();
- assert!(
- primitive_equals(
- &state.parse_evaluate_raw(r#"std.assertEqual(std.base64("test"), "dGVzdA==")"#).unwrap(),
- &Val::Bool(true),
- ).unwrap()
- );
+ assert!(primitive_equals(
+ &state
+ .parse_evaluate_raw(
+ Rc::new(PathBuf::from("raw.jsonnet")),
+ r#"std.assertEqual(std.base64("test"), "dGVzdA==")"#
+ )
+ .unwrap(),
+ &Val::Bool(true),
+ )
+ .unwrap());
}
macro_rules! eval {
($str: expr) => {
EvaluationState::default()
.with_stdlib()
- .parse_evaluate_raw($str)
+ .parse_evaluate_raw(Rc::new(PathBuf::from("raw.jsonnet")), $str)
.unwrap()
};
}
@@ -406,15 +415,15 @@
($str: expr) => {{
let evaluator = EvaluationState::default();
evaluator.with_stdlib();
- evaluator.run_in_state(||{
+ evaluator.run_in_state(|| {
evaluator
- .parse_evaluate_raw($str)
+ .parse_evaluate_raw(Rc::new(PathBuf::from("raw.jsonnet")), $str)
.unwrap()
.into_json(0)
.unwrap()
.replace("\n", "")
- })
- }}
+ })
+ }};
}
/// Asserts given code returns `true`
@@ -638,12 +647,11 @@
#[test]
fn string_is_string() {
- assert!(
- primitive_equals(
- &eval!("local arr = 'hello'; (!std.isArray(arr)) && (!std.isString(arr))"),
- &Val::Bool(false),
- ).unwrap()
- );
+ assert!(primitive_equals(
+ &eval!("local arr = 'hello'; (!std.isArray(arr)) && (!std.isString(arr))"),
+ &Val::Bool(false),
+ )
+ .unwrap());
}
#[test]
@@ -746,8 +754,14 @@
}
#[test]
- fn equality(){
- println!("{:?}", jrsonnet_parser::parse("{ x: 1, y: 2 } == { x: 1, y: 2 }", &ParserSettings::default()));
+ fn equality() {
+ println!(
+ "{:?}",
+ jrsonnet_parser::parse(
+ "{ x: 1, y: 2 } == { x: 1, y: 2 }",
+ &ParserSettings::default()
+ )
+ );
assert_eval!("{ x: 1, y: 2 } == { x: 1, y: 2 }")
}
}
crates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -358,7 +358,9 @@
buf.push_str(cur_padding);
buf.push('}');
}
- Val::Func(_) | Val::Intristic(_, _) => create_error_result(Error::RuntimeError("tried to manifest function".into()))?,
+ Val::Func(_) | Val::Intristic(_, _) => {
+ create_error_result(Error::RuntimeError("tried to manifest function".into()))?
+ }
Val::Lazy(_) => unreachable!(),
};
Ok(())