difftreelog
build stable rustc support
in: master
7 files changed
bindings/jsonnet/src/lib.rsdiffbeforeafterboth--- a/bindings/jsonnet/src/lib.rs
+++ b/bindings/jsonnet/src/lib.rs
@@ -1,5 +1,3 @@
-#![feature(custom_inner_attributes)]
-
pub mod import;
pub mod interop;
pub mod val_extract;
crates/jrsonnet-evaluator/Cargo.tomldiffbeforeafterboth--- a/crates/jrsonnet-evaluator/Cargo.toml
+++ b/crates/jrsonnet-evaluator/Cargo.toml
@@ -20,6 +20,9 @@
# Rustc-like trace visualization
explaining-traces = ["annotate-snippets"]
+# Unlocks extra features, but works only on unstable
+unstable = []
+
[dependencies]
jrsonnet-parser = { path = "../jrsonnet-parser", version = "1.0.0" }
jrsonnet-stdlib = { path = "../jrsonnet-stdlib", version = "1.0.0" }
crates/jrsonnet-evaluator/src/ctx.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/ctx.rs
+++ b/crates/jrsonnet-evaluator/src/ctx.rs
@@ -2,12 +2,7 @@
error::Error::*, future_wrapper, map::LayeredHashMap, rc_fn_helper, resolved_lazy_val,
LazyBinding, LazyVal, ObjValue, Result, Val,
};
-use std::{
- cell::RefCell,
- collections::HashMap,
- fmt::Debug,
- rc::{Rc, Weak},
-};
+use std::{cell::RefCell, collections::HashMap, fmt::Debug, rc::Rc};
rc_fn_helper!(
ContextCreator,
@@ -138,6 +133,7 @@
}
Ok(self.extend(new, new_dollar, this, super_obj))
}
+ #[cfg(feature = "unstable")]
pub fn into_weak(self) -> WeakContext {
WeakContext(Rc::downgrade(&self.0))
}
@@ -155,13 +151,16 @@
}
}
+#[cfg(feature = "unstable")]
#[derive(Debug, Clone)]
-pub struct WeakContext(Weak<ContextInternals>);
+pub struct WeakContext(std::rc::Weak<ContextInternals>);
+#[cfg(feature = "unstable")]
impl WeakContext {
pub fn upgrade(&self) -> Context {
Context(self.0.upgrade().expect("context is removed"))
}
}
+#[cfg(feature = "unstable")]
impl PartialEq for WeakContext {
fn eq(&self, other: &Self) -> bool {
self.0.ptr_eq(&other.0)
crates/jrsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth1use crate::{2 builtin::format::{format_arr, format_obj},3 context_creator, equals,4 error::Error::*,5 escape_string_json, future_wrapper, lazy_val, manifest_json_ex, parse_args, primitive_equals,6 push, throw,7 val::ManifestJsonOptions,8 with_state, Context, ContextCreator, FuncDesc, LazyBinding, LazyVal, LocError, ManifestType,9 ObjMember, ObjValue, Result, Val, ValType,10};11use closure::closure;12use jrsonnet_parser::{13 ArgsDesc, AssertStmt, BinaryOpType, BindSpec, CompSpec, Expr, ExprLocation, FieldMember,14 ForSpecData, IfSpecData, LiteralType, LocExpr, Member, ObjBody, ParamsDesc, UnaryOpType,15 Visibility,16};17use std::{cmp::Ordering, collections::HashMap, path::PathBuf, rc::Rc};1819pub fn evaluate_binding(b: &BindSpec, context_creator: ContextCreator) -> (Rc<str>, LazyBinding) {20 let b = b.clone();21 if let Some(params) = &b.params {22 let params = params.clone();23 (24 b.name.clone(),25 LazyBinding::Bindable(Rc::new(move |this, super_obj| {26 Ok(lazy_val!(27 closure!(clone b, clone params, clone context_creator, || Ok(evaluate_method(28 context_creator.0(this.clone(), super_obj.clone())?,29 b.name.clone(),30 params.clone(),31 b.value.clone(),32 )))33 ))34 })),35 )36 } else {37 (38 b.name.clone(),39 LazyBinding::Bindable(Rc::new(move |this, super_obj| {40 Ok(lazy_val!(closure!(clone context_creator, clone b, ||41 evaluate_named(42 context_creator.0(this.clone(), super_obj.clone())?,43 &b.value,44 b.name.clone()45 )46 )))47 })),48 )49 }50}5152pub fn evaluate_method(ctx: Context, name: Rc<str>, params: ParamsDesc, body: LocExpr) -> Val {53 Val::Func(Rc::new(FuncDesc {54 name,55 ctx,56 params,57 body,58 }))59}6061pub fn evaluate_field_name(62 context: Context,63 field_name: &jrsonnet_parser::FieldName,64) -> Result<Option<Rc<str>>> {65 Ok(match field_name {66 jrsonnet_parser::FieldName::Fixed(n) => Some(n.clone()),67 jrsonnet_parser::FieldName::Dyn(expr) => {68 let lazy = evaluate(context, expr)?;69 let value = lazy.unwrap_if_lazy()?;70 if matches!(value, Val::Null) {71 None72 } else {73 Some(value.try_cast_str("dynamic field name")?)74 }75 }76 })77}7879pub fn evaluate_unary_op(op: UnaryOpType, b: &Val) -> Result<Val> {80 Ok(match (op, b) {81 (o, Val::Lazy(l)) => evaluate_unary_op(o, &l.evaluate()?)?,82 (UnaryOpType::Not, Val::Bool(v)) => Val::Bool(!v),83 (UnaryOpType::Minus, Val::Num(n)) => Val::Num(-*n),84 (UnaryOpType::BitNot, Val::Num(n)) => Val::Num(!(*n as i32) as f64),85 (op, o) => throw!(UnaryOperatorDoesNotOperateOnType(op, o.value_type()?)),86 })87}8889pub(crate) fn evaluate_add_op(a: &Val, b: &Val) -> Result<Val> {90 Ok(match (a, b) {91 (Val::Str(v1), Val::Str(v2)) => Val::Str(((**v1).to_owned() + &v2).into()),9293 // Can't use generic json serialization way, because it depends on number to string concatenation (std.jsonnet:890)94 (Val::Num(n), Val::Str(o)) => Val::Str(format!("{}{}", n, o).into()),95 (Val::Str(o), Val::Num(n)) => Val::Str(format!("{}{}", o, n).into()),9697 (Val::Str(s), o) => Val::Str(format!("{}{}", s, o.clone().into_string()?).into()),98 (o, Val::Str(s)) => Val::Str(format!("{}{}", o.clone().into_string()?, s).into()),99100 (Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),101 (Val::Arr(a), Val::Arr(b)) => Val::Arr(Rc::new([&a[..], &b[..]].concat())),102 (Val::Num(v1), Val::Num(v2)) => Val::new_checked_num(v1 + v2)?,103 _ => throw!(BinaryOperatorDoesNotOperateOnValues(104 BinaryOpType::Add,105 a.value_type()?,106 b.value_type()?,107 )),108 })109}110111pub fn evaluate_binary_op_special(112 context: Context,113 a: &LocExpr,114 op: BinaryOpType,115 b: &LocExpr,116) -> Result<Val> {117 Ok(118 match (evaluate(context.clone(), &a)?.unwrap_if_lazy()?, op, b) {119 (Val::Bool(true), BinaryOpType::Or, _o) => Val::Bool(true),120 (Val::Bool(false), BinaryOpType::And, _o) => Val::Bool(false),121 (a, op, eb) => {122 evaluate_binary_op_normal(&a, op, &evaluate(context, eb)?.unwrap_if_lazy()?)?123 }124 },125 )126}127128pub fn evaluate_binary_op_normal(a: &Val, op: BinaryOpType, b: &Val) -> Result<Val> {129 Ok(match (a, op, b) {130 (a, BinaryOpType::Add, b) => evaluate_add_op(a, b)?,131132 (Val::Str(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Str(v1.repeat(*v2 as usize).into()),133134 // Bool X Bool135 (Val::Bool(a), BinaryOpType::And, Val::Bool(b)) => Val::Bool(*a && *b),136 (Val::Bool(a), BinaryOpType::Or, Val::Bool(b)) => Val::Bool(*a || *b),137138 // Str X Str139 (Val::Str(v1), BinaryOpType::Lt, Val::Str(v2)) => Val::Bool(v1 < v2),140 (Val::Str(v1), BinaryOpType::Gt, Val::Str(v2)) => Val::Bool(v1 > v2),141 (Val::Str(v1), BinaryOpType::Lte, Val::Str(v2)) => Val::Bool(v1 <= v2),142 (Val::Str(v1), BinaryOpType::Gte, Val::Str(v2)) => Val::Bool(v1 >= v2),143144 // Num X Num145 (Val::Num(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::new_checked_num(v1 * v2)?,146 (Val::Num(v1), BinaryOpType::Div, Val::Num(v2)) => {147 if *v2 <= f64::EPSILON {148 throw!(DivisionByZero)149 }150 Val::new_checked_num(v1 / v2)?151 }152153 (Val::Num(v1), BinaryOpType::Sub, Val::Num(v2)) => Val::new_checked_num(v1 - v2)?,154155 (Val::Num(v1), BinaryOpType::Lt, Val::Num(v2)) => Val::Bool(v1 < v2),156 (Val::Num(v1), BinaryOpType::Gt, Val::Num(v2)) => Val::Bool(v1 > v2),157 (Val::Num(v1), BinaryOpType::Lte, Val::Num(v2)) => Val::Bool(v1 <= v2),158 (Val::Num(v1), BinaryOpType::Gte, Val::Num(v2)) => Val::Bool(v1 >= v2),159160 (Val::Num(v1), BinaryOpType::BitAnd, Val::Num(v2)) => {161 Val::Num(((*v1 as i32) & (*v2 as i32)) as f64)162 }163 (Val::Num(v1), BinaryOpType::BitOr, Val::Num(v2)) => {164 Val::Num(((*v1 as i32) | (*v2 as i32)) as f64)165 }166 (Val::Num(v1), BinaryOpType::BitXor, Val::Num(v2)) => {167 Val::Num(((*v1 as i32) ^ (*v2 as i32)) as f64)168 }169 (Val::Num(v1), BinaryOpType::Lhs, Val::Num(v2)) => {170 if *v2 < 0.0 {171 throw!(RuntimeError("shift by negative exponent".into()))172 }173 Val::Num(((*v1 as i32) << (*v2 as i32)) as f64)174 }175 (Val::Num(v1), BinaryOpType::Rhs, Val::Num(v2)) => {176 if *v2 < 0.0 {177 throw!(RuntimeError("shift by negative exponent".into()))178 }179 Val::Num(((*v1 as i32) >> (*v2 as i32)) as f64)180 }181182 _ => throw!(BinaryOperatorDoesNotOperateOnValues(183 op,184 a.value_type()?,185 b.value_type()?,186 )),187 })188}189190future_wrapper!(HashMap<Rc<str>, LazyBinding>, FutureNewBindings);191future_wrapper!(ObjValue, FutureObjValue);192193pub fn evaluate_comp<T>(194 context: Context,195 value: &impl Fn(Context) -> Result<T>,196 specs: &[CompSpec],197) -> Result<Option<Vec<T>>> {198 Ok(match specs.get(0) {199 None => Some(vec![value(context)?]),200 Some(CompSpec::IfSpec(IfSpecData(cond))) => {201 if evaluate(context.clone(), &cond)?.try_cast_bool("if spec")? {202 evaluate_comp(context, value, &specs[1..])?203 } else {204 None205 }206 }207 Some(CompSpec::ForSpec(ForSpecData(var, expr))) => {208 match evaluate(context.clone(), &expr)?.unwrap_if_lazy()? {209 Val::Arr(list) => {210 let mut out = Vec::new();211 for item in list.iter() {212 let item = item.unwrap_if_lazy()?;213 out.push(evaluate_comp(214 context.clone().with_var(var.clone(), item.clone()),215 value,216 &specs[1..],217 )?);218 }219 Some(out.into_iter().flatten().flatten().collect())220 }221 _ => throw!(InComprehensionCanOnlyIterateOverArray),222 }223 }224 })225}226227pub fn evaluate_member_list_object(context: Context, members: &[Member]) -> Result<ObjValue> {228 let new_bindings = FutureNewBindings::new();229 let future_this = FutureObjValue::new();230 let context_creator = context_creator!(231 closure!(clone context, clone new_bindings, |this: Option<ObjValue>, super_obj: Option<ObjValue>| {232 Ok(context.clone().extend_unbound(233 new_bindings.clone().unwrap(),234 context.dollar().clone().or_else(||this.clone()),235 Some(this.unwrap()),236 super_obj237 )?)238 })239 );240 {241 let mut bindings: HashMap<Rc<str>, LazyBinding> = HashMap::new();242 for (n, b) in members243 .iter()244 .filter_map(|m| match m {245 Member::BindStmt(b) => Some(b.clone()),246 _ => None,247 })248 .map(|b| evaluate_binding(&b, context_creator.clone()))249 {250 bindings.insert(n, b);251 }252 new_bindings.fill(bindings);253 }254255 let mut new_members = HashMap::new();256 for member in members.iter() {257 match member {258 Member::Field(FieldMember {259 name,260 plus,261 params: None,262 visibility,263 value,264 }) => {265 let name = evaluate_field_name(context.clone(), &name)?;266 if name.is_none() {267 continue;268 }269 let name = name.unwrap();270 new_members.insert(271 name.clone(),272 ObjMember {273 add: *plus,274 visibility: *visibility,275 invoke: LazyBinding::Bindable(Rc::new(276 closure!(clone name, clone value, clone context_creator, |this, super_obj| {277 Ok(LazyVal::new_resolved(evaluate(278 context_creator.0(this, super_obj)?,279 &value,280 )?))281 }),282 )),283 location: value.1.clone(),284 },285 );286 }287 Member::Field(FieldMember {288 name,289 params: Some(params),290 value,291 ..292 }) => {293 let name = evaluate_field_name(context.clone(), &name)?;294 if name.is_none() {295 continue;296 }297 let name = name.unwrap();298 new_members.insert(299 name.clone(),300 ObjMember {301 add: false,302 visibility: Visibility::Hidden,303 invoke: LazyBinding::Bindable(Rc::new(304 closure!(clone value, clone context_creator, clone params, clone name, |this, super_obj| {305 // TODO: Assert306 Ok(LazyVal::new_resolved(evaluate_method(307 context_creator.0(this, super_obj)?,308 name.clone(),309 params.clone(),310 value.clone(),311 )))312 }),313 )),314 location: value.1.clone(),315 },316 );317 }318 Member::BindStmt(_) => {}319 Member::AssertStmt(_) => {}320 }321 }322 Ok(future_this.fill(ObjValue::new(None, Rc::new(new_members))))323}324325pub fn evaluate_object(context: Context, object: &ObjBody) -> Result<ObjValue> {326 Ok(match object {327 ObjBody::MemberList(members) => evaluate_member_list_object(context, &members)?,328 ObjBody::ObjComp(obj) => {329 let future_this = FutureObjValue::new();330 let mut new_members = HashMap::new();331 for (k, v) in evaluate_comp(332 context.clone(),333 &|ctx| {334 let new_bindings = FutureNewBindings::new();335 let context_creator = context_creator!(336 closure!(clone context, clone new_bindings, |this: Option<ObjValue>, super_obj: Option<ObjValue>| {337 Ok(context.clone().extend_unbound(338 new_bindings.clone().unwrap(),339 context.dollar().clone().or_else(||this.clone()),340 None,341 super_obj342 )?)343 })344 );345 let mut bindings: HashMap<Rc<str>, LazyBinding> = HashMap::new();346 for (n, b) in obj347 .pre_locals348 .iter()349 .chain(obj.post_locals.iter())350 .map(|b| evaluate_binding(b, context_creator.clone()))351 {352 bindings.insert(n, b);353 }354 let bindings = new_bindings.fill(bindings);355 let ctx = ctx.extend_unbound(bindings, None, None, None)?;356 let key = evaluate(ctx.clone(), &obj.key)?;357 let value = LazyBinding::Bindable(Rc::new(358 closure!(clone ctx, clone obj.value, |this, _super_obj| {359 Ok(LazyVal::new_resolved(evaluate(ctx.clone().extend(HashMap::new(), None, this, None), &value)?))360 }),361 ));362363 Ok((key, value))364 },365 &obj.compspecs,366 )?367 .unwrap()368 {369 match k {370 Val::Null => {}371 Val::Str(n) => {372 new_members.insert(373 n,374 ObjMember {375 add: false,376 visibility: Visibility::Normal,377 invoke: v,378 location: obj.value.1.clone(),379 },380 );381 }382 v => throw!(FieldMustBeStringGot(v.value_type()?)),383 }384 }385386 future_this.fill(ObjValue::new(None, Rc::new(new_members)))387 }388 })389}390391/// Extracts code block and disables inlining for them392/// Fixes WASM to java bytecode compilation failing because of very large method393macro_rules! noinline {394 ($e:expr) => {395 (#[inline(never)]396 move || $e)()397 };398}399400pub fn evaluate_apply(401 context: Context,402 value: &LocExpr,403 args: &ArgsDesc,404 loc: &Option<ExprLocation>,405 tailstrict: bool,406) -> Result<Val> {407 let lazy = evaluate(context.clone(), value)?;408 let value = lazy.unwrap_if_lazy()?;409 Ok(match value {410 Val::Intristic(ns, name) => push(411 loc,412 || format!("intristic <{}.{}> call", ns, name),413 || {414 Ok(match (&ns as &str, &name as &str) {415 // arr/string/function416 ("std", "length") => parse_args!(context, "std.length", args, 1, [417 0, x: [Val::Str|Val::Arr|Val::Obj], vec![ValType::Str, ValType::Arr, ValType::Obj];418 ], {419 Ok(match x {420 Val::Str(n) => Val::Num(n.chars().count() as f64),421 Val::Arr(i) => Val::Num(i.len() as f64),422 Val::Obj(o) => Val::Num(423 o.fields_visibility()424 .into_iter()425 .filter(|(_k, v)| *v)426 .count() as f64,427 ),428 _ => unreachable!(),429 })430 })?,431 // any432 ("std", "type") => parse_args!(context, "std.type", args, 1, [433 0, x, vec![];434 ], {435 Ok(Val::Str(x.value_type()?.name().into()))436 })?,437 // length, idx=>any438 ("std", "makeArray") => {439 noinline!(parse_args!(context, "std.makeArray", args, 2, [440 0, sz: [Val::Num]!!Val::Num, vec![ValType::Num];441 1, func: [Val::Func]!!Val::Func, vec![ValType::Func];442 ], {443 if sz < 0.0 {444 throw!(RuntimeError(format!("makeArray requires size >= 0, got {}", sz).into()));445 }446 let mut out = Vec::with_capacity(sz as usize);447 for i in 0..sz as usize {448 out.push(func.evaluate_values(449 Context::new(),450 &[Val::Num(i as f64)]451 )?)452 }453 Ok(Val::Arr(Rc::new(out)))454 }))?455 }456 // string457 ("std", "codepoint") => parse_args!(context, "std.codepoint", args, 1, [458 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];459 ], {460 assert!(461 str.chars().count() == 1,462 "std.codepoint should receive single char string"463 );464 Ok(Val::Num(str.chars().take(1).next().unwrap() as u32 as f64))465 })?,466 // object, includeHidden467 ("std", "objectFieldsEx") => {468 noinline!(parse_args!(context, "std.objectFieldsEx",args, 2, [469 0, obj: [Val::Obj]!!Val::Obj, vec![ValType::Obj];470 1, inc_hidden: [Val::Bool]!!Val::Bool, vec![ValType::Bool];471 ], {472 let mut out = obj.fields_visibility()473 .into_iter()474 .filter(|(_k, v)| *v || inc_hidden)475 .map(|(k, _v)|k)476 .collect::<Vec<_>>();477 out.sort();478 Ok(Val::Arr(Rc::new(out.into_iter().map(Val::Str).collect())))479 }))?480 }481 // object, field, includeHidden482 ("std", "objectHasEx") => parse_args!(context, "std.objectHasEx", args, 3, [483 0, obj: [Val::Obj]!!Val::Obj, vec![ValType::Obj];484 1, f: [Val::Str]!!Val::Str, vec![ValType::Str];485 2, inc_hidden: [Val::Bool]!!Val::Bool, vec![ValType::Bool];486 ], {487 Ok(Val::Bool(488 obj.fields_visibility()489 .into_iter()490 .filter(|(_k, v)| *v || inc_hidden)491 .any(|(k, _v)| *k == *f),492 ))493 })?,494 ("std", "primitiveEquals") => {495 parse_args!(context, "std.primitiveEquals", args, 2, [496 0, a, vec![];497 1, b, vec![];498 ], {499 Ok(Val::Bool(primitive_equals(&a, &b)?))500 })?501 }502 // faster503 ("std", "equals") => parse_args!(context, "std.equals", args, 2, [504 0, a, vec![];505 1, b, vec![];506 ], {507 Ok(Val::Bool(equals(&a, &b)?))508 })?,509 ("std", "modulo") => parse_args!(context, "std.modulo", args, 2, [510 0, a: [Val::Num]!!Val::Num, vec![ValType::Num];511 1, b: [Val::Num]!!Val::Num, vec![ValType::Num];512 ], {513 Ok(Val::Num(a % b))514 })?,515 ("std", "floor") => parse_args!(context, "std.floor", args, 1, [516 0, x: [Val::Num]!!Val::Num, vec![ValType::Num];517 ], {518 Ok(Val::Num(x.floor()))519 })?,520 ("std", "log") => parse_args!(context, "std.log", args, 2, [521 0, n: [Val::Num]!!Val::Num, vec![ValType::Num];522 ], {523 Ok(Val::Num(n.ln()))524 })?,525 ("std", "trace") => parse_args!(context, "std.trace", args, 2, [526 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];527 1, rest, vec![];528 ], {529 eprint!("TRACE:");530 if let Some(loc) = loc {531 with_state(|s|{532 let locs = s.map_source_locations(&loc.0, &[loc.1]);533 eprint!(" {}:{}", loc.0.file_name().unwrap().to_str().unwrap(), locs[0].line);534 });535 }536 eprintln!(" {}", str);537 Ok(rest)538 })?,539 ("std", "pow") => parse_args!(context, "std.modulo", args, 2, [540 0, x: [Val::Num]!!Val::Num, vec![ValType::Num];541 1, n: [Val::Num]!!Val::Num, vec![ValType::Num];542 ], {543 Ok(Val::Num(x.powf(n)))544 })?,545 ("std", "extVar") => parse_args!(context, "std.extVar", args, 2, [546 0, x: [Val::Str]!!Val::Str, vec![ValType::Str];547 ], {548 Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or_else(549 || UndefinedExternalVariable(x),550 )?)551 })?,552 ("std", "filter") => noinline!(parse_args!(context, "std.filter", args, 2, [553 0, func: [Val::Func]!!Val::Func, vec![ValType::Func];554 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];555 ], {556 Ok(Val::Arr(Rc::new(557 arr.iter()558 .cloned()559 .filter(|e| {560 func561 .evaluate_values(context.clone(), &[e.clone()])562 .unwrap()563 .try_cast_bool("filter predicate")564 .unwrap()565 })566 .collect(),567 )))568 }))?,569 // faster570 ("std", "foldl") => noinline!(parse_args!(context, "std.foldl", args, 3, [571 0, func: [Val::Func]!!Val::Func, vec![ValType::Func];572 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];573 2, init, vec![];574 ], {575 let mut acc = init;576 for i in arr.iter().cloned() {577 acc = func.evaluate_values(context.clone(), &[acc, i])?;578 }579 Ok(acc)580 }))?,581 // faster582 ("std", "foldr") => noinline!(parse_args!(context, "std.foldr", args, 3, [583 0, func: [Val::Func]!!Val::Func, vec![ValType::Func];584 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];585 2, init, vec![];586 ], {587 let mut acc = init;588 for i in arr.iter().rev().cloned() {589 acc = func.evaluate_values(context.clone(), &[acc, i])?;590 }591 Ok(acc)592 }))?,593 // faster594 #[allow(non_snake_case)]595 ("std", "sortImpl") => noinline!(parse_args!(context, "std.sort", args, 2, [596 0, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];597 1, keyF: [Val::Func]!!Val::Func, vec![ValType::Func];598 ], {599 if arr.len() <= 1 {600 return Ok(Val::Arr(arr))601 }602 let mut new_arr = arr.iter().cloned().collect::<Vec<_>>();603 match keyF.evaluate_values(context.clone(), &[new_arr[0].clone()])? {604 Val::Str(_) => {605 let mut err = None;606 new_arr.sort_by_cached_key(|k| {607 match keyF.evaluate_values(context.clone(), &[k.clone()]) {608 Ok(Val::Str(v)) => v,609 Ok(_) => {610 err = Some(LocError::new(RuntimeError("types of all array elements should equal".into())));611 "".into()612 }613 Err(e) => {614 err = Some(e);615 "".into()616 }617 }618 });619 if let Some(e) = err {620 return Err(e);621 }622 },623 Val::Num(_) => {624 let mut err = None;625 new_arr.sort_unstable_by(|a, b| {626 match (keyF.evaluate_values(context.clone(), &[a.clone()]), keyF.evaluate_values(context.clone(), &[b.clone()])) {627 (Ok(Val::Num(a)), Ok(Val::Num(b))) => a.partial_cmp(&b).unwrap(),628 (Ok(_a), Ok(_b)) => {629 err = Some(RuntimeError("types of all array elements should equal".into()).into());630 Ordering::Equal631 }632 (Err(e), _) | (_, Err(e)) => {633 err = Some(e);634 Ordering::Equal635 }636 }637 });638 if let Some(e) = err {639 return Err(e);640 }641 },642 _ => throw!(RuntimeError("keys should be number or string".into()))643 }644 Ok(Val::Arr(Rc::new(new_arr)))645 }))?,646 // faster647 ("std", "format") => parse_args!(context, "std.format", args, 2, [648 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];649 1, vals, vec![]650 ], {651 push(&Some(ExprLocation(Rc::from(PathBuf::from("std.jsonnet")), 0, 0)), ||format!("std.format of {}", str), ||{652 Ok(match vals {653 Val::Arr(vals) => Val::Str(format_arr(&str, &vals)?.into()),654 Val::Obj(obj) => Val::Str(format_obj(&str, &obj)?.into()),655 o => Val::Str(format_arr(&str, &[o])?.into()),656 })657 })658 })?,659 // faster660 ("std", "range") => parse_args!(context, "std.range", args, 2, [661 0, from: [Val::Num]!!Val::Num, vec![ValType::Num];662 1, to: [Val::Num]!!Val::Num, vec![ValType::Num];663 ], {664 let mut out = Vec::with_capacity((1+to as usize-from as usize).max(0));665 for i in from as usize..=to as usize {666 out.push(Val::Num(i as f64));667 }668 Ok(Val::Arr(Rc::new(out)))669 })?,670 ("std", "char") => parse_args!(context, "std.char", args, 1, [671 0, n: [Val::Num]!!Val::Num, vec![ValType::Num];672 ], {673 let mut out = String::new();674 out.push(std::char::from_u32(n as u32).ok_or_else(||675 InvalidUnicodeCodepointGot(n as u32)676 )?);677 Ok(Val::Str(out.into()))678 })?,679 ("std", "encodeUTF8") => parse_args!(context, "std.encodeUtf8", args, 1, [680 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];681 ], {682 Ok(Val::Arr(Rc::new(str.bytes().map(|b| Val::Num(b as f64)).collect())))683 })?,684 ("std", "md5") => noinline!(parse_args!(context, "std.md5", args, 1, [685 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];686 ], {687 Ok(Val::Str(format!("{:x}", md5::compute(&str.as_bytes())).into()))688 }))?,689 // faster690 ("std", "base64") => parse_args!(context, "std.base64", args, 1, [691 0, input: [Val::Str | Val::Arr], vec![ValType::Arr, ValType::Str];692 ], {693 Ok(Val::Str(match input {694 Val::Str(s) => {695 base64::encode(s.bytes().collect::<Vec<_>>()).into()696 },697 Val::Arr(a) => {698 base64::encode(a.iter().map(|v| {699 Ok(v.clone().try_cast_num("base64 array")? as u8)700 }).collect::<Result<Vec<_>>>()?).into()701 },702 _ => unreachable!()703 }))704 })?,705 // faster706 ("std", "join") => noinline!(parse_args!(context, "std.join", args, 2, [707 0, sep: [Val::Str|Val::Arr], vec![ValType::Str, ValType::Arr];708 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];709 ], {710 Ok(match sep {711 Val::Arr(joiner_items) => {712 let mut out = Vec::new();713714 let mut first = true;715 for item in arr.iter().cloned() {716 if let Val::Arr(items) = item.unwrap_if_lazy()? {717 if !first {718 out.reserve(joiner_items.len());719 out.extend(joiner_items.iter().cloned());720 }721 first = false;722 out.reserve(items.len());723 out.extend(items.iter().cloned());724 } else {725 throw!(RuntimeError("in std.join all items should be arrays".into()));726 }727 }728729 Val::Arr(Rc::new(out))730 },731 Val::Str(sep) => {732 let mut out = String::new();733734 let mut first = true;735 for item in arr.iter().cloned() {736 if let Val::Str(item) = item.unwrap_if_lazy()? {737 if !first {738 out += &sep;739 }740 first = false;741 out += &item;742 } else {743 throw!(RuntimeError("in std.join all items should be strings".into()));744 }745 }746747 Val::Str(out.into())748 },749 _ => unreachable!()750 })751 }))?,752 // Faster753 ("std", "escapeStringJson") => {754 parse_args!(context, "std.escapeStringJson", args, 1, [755 0, str_: [Val::Str]!!Val::Str, vec![ValType::Str];756 ], {757 Ok(Val::Str(escape_string_json(&str_).into()))758 })?759 }760 // Faster761 ("std", "manifestJsonEx") => {762 parse_args!(context, "std.manifestJsonEx", args, 2, [763 0, value, vec![];764 1, indent: [Val::Str]!!Val::Str, vec![ValType::Str];765 ], {766 Ok(Val::Str(manifest_json_ex(&value, &ManifestJsonOptions {767 padding: &indent,768 mtype: ManifestType::Std,769 })?.into()))770 })?771 }772 (ns, name) => throw!(IntristicNotFound(ns.into(), name.into())),773 })774 },775 )?,776 Val::Func(f) => {777 let body = || f.evaluate(context, args, tailstrict);778 if tailstrict {779 body()?780 } else {781 push(loc, || format!("function <{}> call", f.name), body)?782 }783 }784 v => throw!(OnlyFunctionsCanBeCalledGot(v.value_type()?)),785 })786}787788pub fn evaluate_named(context: Context, lexpr: &LocExpr, name: Rc<str>) -> Result<Val> {789 use Expr::*;790 let LocExpr(expr, _loc) = lexpr;791 Ok(match &**expr {792 Function(params, body) => evaluate_method(context, name, params.clone(), body.clone()),793 _ => evaluate(context, lexpr)?,794 })795}796797pub fn evaluate(context: Context, expr: &LocExpr) -> Result<Val> {798 use Expr::*;799 let LocExpr(expr, loc) = expr;800 Ok(match &**expr {801 Literal(LiteralType::This) => Val::Obj(802 context803 .this()804 .clone()805 .ok_or_else(|| CantUseSelfOutsideOfObject)?,806 ),807 Literal(LiteralType::Dollar) => Val::Obj(808 context809 .dollar()810 .clone()811 .ok_or_else(|| NoTopLevelObjectFound)?,812 ),813 Literal(LiteralType::True) => Val::Bool(true),814 Literal(LiteralType::False) => Val::Bool(false),815 Literal(LiteralType::Null) => Val::Null,816 Parened(e) => evaluate(context, e)?,817 Str(v) => Val::Str(v.clone()),818 Num(v) => Val::new_checked_num(*v)?,819 BinaryOp(v1, o, v2) => evaluate_binary_op_special(context, &v1, *o, &v2)?,820 UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(context, v)?)?,821 Var(name) => push(822 loc,823 || format!("variable <{}>", name),824 || Ok(Val::Lazy(context.binding(name.clone())?).unwrap_if_lazy()?),825 )?,826 Index(LocExpr(v, _), index) if matches!(&**v, Expr::Literal(LiteralType::Super)) => {827 let name = evaluate(context.clone(), index)?.try_cast_str("object index")?;828 context829 .super_obj()830 .clone()831 .expect("no super found")832 .get_raw(name, &context.this().clone().expect("no this found"))?833 .expect("value not found")834 }835 Index(value, index) => {836 match (837 evaluate(context.clone(), value)?.unwrap_if_lazy()?,838 evaluate(context, index)?,839 ) {840 (Val::Obj(v), Val::Str(s)) => {841 let sn = s.clone();842 push(843 &loc,844 || format!("field <{}> access", sn),845 || {846 if let Some(v) = v.get(s.clone())? {847 Ok(v.unwrap_if_lazy()?)848 } else if let Some(Val::Str(n)) =849 v.get("__intristic_namespace__".into())?850 {851 Ok(Val::Intristic(n, s))852 } else {853 throw!(NoSuchField(s))854 }855 },856 )?857 }858 (Val::Obj(_), n) => throw!(ValueIndexMustBeTypeGot(859 ValType::Obj,860 ValType::Str,861 n.value_type()?,862 )),863864 (Val::Arr(v), Val::Num(n)) => {865 if n.fract() > f64::EPSILON {866 throw!(FractionalIndex)867 }868 v.get(n as usize)869 .ok_or_else(|| ArrayBoundsError(n as usize, v.len()))?870 .clone()871 .unwrap_if_lazy()?872 }873 (Val::Arr(_), Val::Str(n)) => throw!(AttemptedIndexAnArrayWithString(n)),874 (Val::Arr(_), n) => throw!(ValueIndexMustBeTypeGot(875 ValType::Arr,876 ValType::Num,877 n.value_type()?,878 )),879880 (Val::Str(s), Val::Num(n)) => Val::Str(881 s.chars()882 .skip(n as usize)883 .take(1)884 .collect::<String>()885 .into(),886 ),887 (Val::Str(_), n) => throw!(ValueIndexMustBeTypeGot(888 ValType::Str,889 ValType::Num,890 n.value_type()?,891 )),892893 (v, _) => throw!(CantIndexInto(v.value_type()?)),894 }895 }896 LocalExpr(bindings, returned) => {897 let mut new_bindings: HashMap<Rc<str>, LazyBinding> = HashMap::new();898 let future_context = Context::new_future();899900 let context_creator = context_creator!(901 closure!(clone future_context, |_, _| Ok(future_context.clone().unwrap()))902 );903904 for (k, v) in bindings905 .iter()906 .map(|b| evaluate_binding(b, context_creator.clone()))907 {908 new_bindings.insert(k, v);909 }910911 let context = context912 .extend_unbound(new_bindings, None, None, None)?913 .into_future(future_context);914 evaluate(context, &returned.clone())?915 }916 Arr(items) => {917 let mut out = Vec::with_capacity(items.len());918 for item in items {919 out.push(Val::Lazy(lazy_val!(920 closure!(clone context, clone item, || {921 evaluate(context.clone(), &item)922 })923 )));924 }925 Val::Arr(Rc::new(out))926 }927 ArrComp(expr, compspecs) => Val::Arr(928 // First compspec should be forspec, so no "None" possible here929 Rc::new(evaluate_comp(context, &|ctx| evaluate(ctx, expr), compspecs)?.unwrap()),930 ),931 Obj(body) => Val::Obj(evaluate_object(context, body)?),932 ObjExtend(s, t) => evaluate_add_op(933 &evaluate(context.clone(), s)?,934 &Val::Obj(evaluate_object(context, t)?),935 )?,936 Apply(value, args, tailstrict) => evaluate_apply(context, value, args, loc, *tailstrict)?,937 Function(params, body) => {938 evaluate_method(context, "anonymous".into(), params.clone(), body.clone())939 }940 AssertExpr(AssertStmt(value, msg), returned) => {941 let assertion_result = push(942 &value.1,943 || "assertion condition".to_owned(),944 || {945 evaluate(context.clone(), &value)?946 .try_cast_bool("assertion condition should be boolean")947 },948 )?;949 if assertion_result {950 evaluate(context, returned)?951 } else if let Some(msg) = msg {952 throw!(AssertionFailed(evaluate(context, msg)?));953 } else {954 throw!(AssertionFailed(Val::Null));955 }956 }957 ErrorStmt(e) => push(958 &loc,959 || "error statement".to_owned(),960 || {961 throw!(RuntimeError(962 evaluate(context, e)?.try_cast_str("error text should be string")?,963 ))964 },965 )?,966 IfElse {967 cond,968 cond_then,969 cond_else,970 } => {971 if evaluate(context.clone(), &cond.0)?972 .try_cast_bool("if condition should be boolean")?973 {974 evaluate(context, cond_then)?975 } else {976 match cond_else {977 Some(v) => evaluate(context, v)?,978 None => Val::Null,979 }980 }981 }982 Import(path) => {983 let mut tmp = loc984 .clone()985 .expect("imports can't be used without loc_data")986 .0;987 let import_location = Rc::make_mut(&mut tmp);988 import_location.pop();989 push(990 loc,991 || format!("import {:?}", path),992 || with_state(|s| s.import_file(&import_location, path)),993 )?994 }995 ImportStr(path) => {996 let mut tmp = loc997 .clone()998 .expect("imports can't be used without loc_data")999 .0;1000 let import_location = Rc::make_mut(&mut tmp);1001 import_location.pop();1002 Val::Str(with_state(|s| s.import_file_str(&import_location, path))?)1003 }1004 Literal(LiteralType::Super) => throw!(StandaloneSuper),1005 })1006}crates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -1,12 +1,6 @@
-#![feature(box_syntax, box_patterns)]
-#![feature(type_alias_impl_trait)]
-#![feature(debug_non_exhaustive)]
-#![feature(test)]
-#![feature(stmt_expr_attributes)]
+#![cfg_attr(feature = "unstable", feature(stmt_expr_attributes))]
#![allow(macro_expanded_macro_exports_accessed_by_absolute_paths)]
-extern crate test;
-
mod builtin;
mod ctx;
mod dynamic;
@@ -820,8 +814,6 @@
"#
);
}
-
- use test::Bencher;
// This test is commented out by default, because of huge compilation slowdown
// #[bench]
@@ -836,6 +828,7 @@
// })
// }
+ /*
#[bench]
fn bench_serialize(b: &mut Bencher) {
b.iter(|| {
@@ -859,6 +852,7 @@
)
})
}
+ */
#[test]
fn equality() {
crates/jrsonnet-evaluator/src/obj.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -35,7 +35,14 @@
for (name, member) in self.0.this_entries.iter() {
debug.field(name, member);
}
- debug.finish_non_exhaustive()
+ #[cfg(feature = "unstable")]
+ {
+ debug.finish_non_exhaustive()
+ }
+ #[cfg(not(feature = "unstable"))]
+ {
+ debug.finish()
+ }
}
}
crates/jrsonnet-parser/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-parser/src/lib.rs
+++ b/crates/jrsonnet-parser/src/lib.rs
@@ -1,8 +1,3 @@
-#![feature(box_syntax)]
-#![feature(test)]
-
-extern crate test;
-
use peg::parser;
use std::{path::PathBuf, rc::Rc};
mod expr;
@@ -581,11 +576,11 @@
parse!(jrsonnet_stdlib::STDLIB_STR);
}
- use test::Bencher;
-
// From source code
+ /*
#[bench]
fn bench_parse_peg(b: &mut Bencher) {
b.iter(|| parse!(jrsonnet_stdlib::STDLIB_STR))
}
+ */
}