difftreelog
Merge pull request #19 from CertainLach/std-intrinsic
in: master
Prevent changing meaning of std in desugared expressions
7 files changed
crates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/builtin/mod.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/mod.rs
@@ -20,13 +20,12 @@
pub fn call_builtin(
context: Context,
loc: &Option<ExprLocation>,
- ns: &str,
name: &str,
args: &ArgsDesc,
) -> Result<Val> {
- Ok(match (ns, name as &str) {
+ Ok(match name as &str {
// arr/string/function
- ("std", "length") => parse_args!(context, "std.length", args, 1, [
+ "length" => parse_args!(context, "std.length", args, 1, [
0, x: [Val::Str|Val::Arr|Val::Obj], vec![ValType::Str, ValType::Arr, ValType::Obj];
], {
Ok(match x {
@@ -42,13 +41,13 @@
})
})?,
// any
- ("std", "type") => parse_args!(context, "std.type", args, 1, [
+ "type" => parse_args!(context, "std.type", args, 1, [
0, x, vec![];
], {
Ok(Val::Str(x.value_type()?.name().into()))
})?,
// length, idx=>any
- ("std", "makeArray") => parse_args!(context, "std.makeArray", args, 2, [
+ "makeArray" => parse_args!(context, "std.makeArray", args, 2, [
0, sz: [Val::Num]!!Val::Num, vec![ValType::Num];
1, func: [Val::Func]!!Val::Func, vec![ValType::Func];
], {
@@ -65,7 +64,7 @@
Ok(Val::Arr(Rc::new(out)))
})?,
// string
- ("std", "codepoint") => parse_args!(context, "std.codepoint", args, 1, [
+ "codepoint" => parse_args!(context, "std.codepoint", args, 1, [
0, str: [Val::Str]!!Val::Str, vec![ValType::Str];
], {
assert!(
@@ -75,7 +74,7 @@
Ok(Val::Num(str.chars().take(1).next().unwrap() as u32 as f64))
})?,
// object, includeHidden
- ("std", "objectFieldsEx") => parse_args!(context, "std.objectFieldsEx",args, 2, [
+ "objectFieldsEx" => parse_args!(context, "std.objectFieldsEx",args, 2, [
0, obj: [Val::Obj]!!Val::Obj, vec![ValType::Obj];
1, inc_hidden: [Val::Bool]!!Val::Bool, vec![ValType::Bool];
], {
@@ -88,7 +87,7 @@
Ok(Val::Arr(Rc::new(out.into_iter().map(Val::Str).collect())))
})?,
// object, field, includeHidden
- ("std", "objectHasEx") => parse_args!(context, "std.objectHasEx", args, 3, [
+ "objectHasEx" => parse_args!(context, "std.objectHasEx", args, 3, [
0, obj: [Val::Obj]!!Val::Obj, vec![ValType::Obj];
1, f: [Val::Str]!!Val::Str, vec![ValType::Str];
2, inc_hidden: [Val::Bool]!!Val::Bool, vec![ValType::Bool];
@@ -100,36 +99,36 @@
.any(|(k, _v)| *k == *f),
))
})?,
- ("std", "primitiveEquals") => parse_args!(context, "std.primitiveEquals", args, 2, [
+ "primitiveEquals" => parse_args!(context, "std.primitiveEquals", args, 2, [
0, a, vec![];
1, b, vec![];
], {
Ok(Val::Bool(primitive_equals(&a, &b)?))
})?,
// faster
- ("std", "equals") => parse_args!(context, "std.equals", args, 2, [
+ "equals" => parse_args!(context, "std.equals", args, 2, [
0, a, vec![];
1, b, vec![];
], {
Ok(Val::Bool(equals(&a, &b)?))
})?,
- ("std", "modulo") => parse_args!(context, "std.modulo", args, 2, [
+ "modulo" => parse_args!(context, "std.modulo", args, 2, [
0, a: [Val::Num]!!Val::Num, vec![ValType::Num];
1, b: [Val::Num]!!Val::Num, vec![ValType::Num];
], {
Ok(Val::Num(a % b))
})?,
- ("std", "floor") => parse_args!(context, "std.floor", args, 1, [
+ "floor" => parse_args!(context, "std.floor", args, 1, [
0, x: [Val::Num]!!Val::Num, vec![ValType::Num];
], {
Ok(Val::Num(x.floor()))
})?,
- ("std", "log") => parse_args!(context, "std.log", args, 2, [
+ "log" => parse_args!(context, "std.log", args, 2, [
0, n: [Val::Num]!!Val::Num, vec![ValType::Num];
], {
Ok(Val::Num(n.ln()))
})?,
- ("std", "trace") => parse_args!(context, "std.trace", args, 2, [
+ "trace" => parse_args!(context, "std.trace", args, 2, [
0, str: [Val::Str]!!Val::Str, vec![ValType::Str];
1, rest, vec![];
], {
@@ -143,27 +142,27 @@
eprintln!(" {}", str);
Ok(rest)
})?,
- ("std", "pow") => parse_args!(context, "std.modulo", args, 2, [
+ "pow" => parse_args!(context, "std.modulo", args, 2, [
0, x: [Val::Num]!!Val::Num, vec![ValType::Num];
1, n: [Val::Num]!!Val::Num, vec![ValType::Num];
], {
Ok(Val::Num(x.powf(n)))
})?,
- ("std", "extVar") => parse_args!(context, "std.extVar", args, 1, [
+ "extVar" => parse_args!(context, "std.extVar", args, 1, [
0, x: [Val::Str]!!Val::Str, vec![ValType::Str];
], {
Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or_else(
|| UndefinedExternalVariable(x),
)?)
})?,
- ("std", "native") => parse_args!(context, "std.native", args, 1, [
+ "native" => parse_args!(context, "std.native", args, 1, [
0, x: [Val::Str]!!Val::Str, vec![ValType::Str];
], {
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(
|| UndefinedExternalFunction(x),
)?)
})?,
- ("std", "filter") => parse_args!(context, "std.filter", args, 2, [
+ "filter" => parse_args!(context, "std.filter", args, 2, [
0, func: [Val::Func]!!Val::Func, vec![ValType::Func];
1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];
], {
@@ -181,7 +180,7 @@
)))
})?,
// faster
- ("std", "foldl") => parse_args!(context, "std.foldl", args, 3, [
+ "foldl" => parse_args!(context, "std.foldl", args, 3, [
0, func: [Val::Func]!!Val::Func, vec![ValType::Func];
1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];
2, init, vec![];
@@ -193,7 +192,7 @@
Ok(acc)
})?,
// faster
- ("std", "foldr") => parse_args!(context, "std.foldr", args, 3, [
+ "foldr" => parse_args!(context, "std.foldr", args, 3, [
0, func: [Val::Func]!!Val::Func, vec![ValType::Func];
1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];
2, init, vec![];
@@ -206,7 +205,7 @@
})?,
// faster
#[allow(non_snake_case)]
- ("std", "sortImpl") => parse_args!(context, "std.sort", args, 2, [
+ "sortImpl" => parse_args!(context, "std.sort", args, 2, [
0, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];
1, keyF: [Val::Func]!!Val::Func, vec![ValType::Func];
], {
@@ -216,7 +215,7 @@
Ok(Val::Arr(sort::sort(context, arr, &keyF)?))
})?,
// faster
- ("std", "format") => parse_args!(context, "std.format", args, 2, [
+ "format" => parse_args!(context, "std.format", args, 2, [
0, str: [Val::Str]!!Val::Str, vec![ValType::Str];
1, vals, vec![]
], {
@@ -229,7 +228,7 @@
})
})?,
// faster
- ("std", "range") => parse_args!(context, "std.range", args, 2, [
+ "range" => parse_args!(context, "std.range", args, 2, [
0, from: [Val::Num]!!Val::Num, vec![ValType::Num];
1, to: [Val::Num]!!Val::Num, vec![ValType::Num];
], {
@@ -239,7 +238,7 @@
}
Ok(Val::Arr(Rc::new(out)))
})?,
- ("std", "char") => parse_args!(context, "std.char", args, 1, [
+ "char" => parse_args!(context, "std.char", args, 1, [
0, n: [Val::Num]!!Val::Num, vec![ValType::Num];
], {
let mut out = String::new();
@@ -248,18 +247,18 @@
)?);
Ok(Val::Str(out.into()))
})?,
- ("std", "encodeUTF8") => parse_args!(context, "std.encodeUtf8", args, 1, [
+ "encodeUTF8" => parse_args!(context, "std.encodeUtf8", args, 1, [
0, str: [Val::Str]!!Val::Str, vec![ValType::Str];
], {
Ok(Val::Arr(Rc::new(str.bytes().map(|b| Val::Num(b as f64)).collect())))
})?,
- ("std", "md5") => parse_args!(context, "std.md5", args, 1, [
+ "md5" => parse_args!(context, "std.md5", args, 1, [
0, str: [Val::Str]!!Val::Str, vec![ValType::Str];
], {
Ok(Val::Str(format!("{:x}", md5::compute(&str.as_bytes())).into()))
})?,
// faster
- ("std", "base64") => parse_args!(context, "std.base64", args, 1, [
+ "base64" => parse_args!(context, "std.base64", args, 1, [
0, input: [Val::Str | Val::Arr], vec![ValType::Arr, ValType::Str];
], {
Ok(Val::Str(match input {
@@ -275,7 +274,7 @@
}))
})?,
// faster
- ("std", "join") => parse_args!(context, "std.join", args, 2, [
+ "join" => parse_args!(context, "std.join", args, 2, [
0, sep: [Val::Str|Val::Arr], vec![ValType::Str, ValType::Arr];
1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];
], {
@@ -322,13 +321,13 @@
})
})?,
// Faster
- ("std", "escapeStringJson") => parse_args!(context, "std.escapeStringJson", args, 1, [
+ "escapeStringJson" => parse_args!(context, "std.escapeStringJson", args, 1, [
0, str_: [Val::Str]!!Val::Str, vec![ValType::Str];
], {
Ok(Val::Str(escape_string_json(&str_).into()))
})?,
// Faster
- ("std", "manifestJsonEx") => parse_args!(context, "std.manifestJsonEx", args, 2, [
+ "manifestJsonEx" => parse_args!(context, "std.manifestJsonEx", args, 2, [
0, value, vec![];
1, indent: [Val::Str]!!Val::Str, vec![ValType::Str];
], {
@@ -338,18 +337,18 @@
})?.into()))
})?,
// Faster
- ("std", "reverse") => parse_args!(context, "std.reverse", args, 1, [
+ "reverse" => parse_args!(context, "std.reverse", args, 1, [
0, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];
], {
let mut marr = arr;
Rc::make_mut(&mut marr).reverse();
Ok(Val::Arr(marr))
})?,
- ("std", "id") => parse_args!(context, "std.id", args, 1, [
+ "id" => parse_args!(context, "std.id", args, 1, [
0, v, vec![];
], {
Ok(v)
})?,
- (ns, name) => throw!(IntrinsicNotFound(ns.into(), name.into())),
+ name => throw!(IntrinsicNotFound(name.into())),
})
}
crates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -8,8 +8,8 @@
#[derive(Error, Debug, Clone)]
pub enum Error {
- #[error("intrinsic not found: {0}.{1}")]
- IntrinsicNotFound(Rc<str>, Rc<str>),
+ #[error("intrinsic not found: {0}")]
+ IntrinsicNotFound(Rc<str>),
#[error("argument reordering in intrisics not supported yet")]
IntrinsicArgumentReorderingIsNotSupportedYet,
crates/jrsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate.rs
@@ -466,10 +466,8 @@
|| {
if let Some(v) = v.get(s.clone())? {
Ok(v.unwrap_if_lazy()?)
- } else if let Some(Val::Str(n)) =
- v.get("__intrinsic_namespace__".into())?
- {
- Ok(Val::Func(Rc::new(FuncVal::Intrinsic(n, s))))
+ } else if v.get("__intrinsic_namespace__".into())?.is_some() {
+ Ok(Val::Func(Rc::new(FuncVal::Intrinsic(s))))
} else {
throw!(NoSuchField(s))
}
@@ -558,6 +556,7 @@
Function(params, body) => {
evaluate_method(context, "anonymous".into(), params.clone(), body.clone())
}
+ Intrinsic(name) => Val::Func(Rc::new(FuncVal::Intrinsic(name.clone()))),
AssertExpr(AssertStmt(value, msg), returned) => {
let assertion_result = push(
&value.1,
crates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -893,4 +893,12 @@
)?;
Ok(())
}
+
+ #[test]
+ fn constant_intrinsic() -> crate::error::Result<()> {
+ assert_eval!(
+ "local std2 = std; local std = std2 { primitiveEquals(a, b):: false }; 1 == 1"
+ );
+ Ok(())
+ }
}
crates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -76,7 +76,7 @@
/// Plain function implemented in jsonnet
Normal(FuncDesc),
/// Standard library function
- Intrinsic(Rc<str>, Rc<str>),
+ Intrinsic(Rc<str>),
/// Library functions implemented in native
NativeExt(Rc<str>, Rc<NativeCallback>),
}
@@ -85,7 +85,7 @@
fn eq(&self, other: &Self) -> bool {
match (self, other) {
(Self::Normal(a), Self::Normal(b)) => a == b,
- (Self::Intrinsic(ans, an), Self::Intrinsic(bns, bn)) => ans == bns && an == bn,
+ (Self::Intrinsic(an), Self::Intrinsic(bn)) => an == bn,
(Self::NativeExt(an, _), Self::NativeExt(bn, _)) => an == bn,
(..) => false,
}
@@ -93,12 +93,12 @@
}
impl FuncVal {
pub fn is_ident(&self) -> bool {
- matches!(&self, Self::Intrinsic(ns, n) if ns as &str == "std" && n as &str == "id")
+ matches!(&self, Self::Intrinsic(n) if n as &str == "id")
}
pub fn name(&self) -> Rc<str> {
match self {
Self::Normal(normal) => normal.name.clone(),
- Self::Intrinsic(ns, name) => format!("intrinsic.{}.{}", ns, name).into(),
+ Self::Intrinsic(name) => format!("std.{}", name).into(),
Self::NativeExt(n, _) => format!("native.{}", n).into(),
}
}
@@ -120,7 +120,7 @@
)?;
evaluate(ctx, &func.body)
}
- Self::Intrinsic(ns, name) => call_builtin(call_ctx, loc, ns, name, args),
+ Self::Intrinsic(name) => call_builtin(call_ctx, loc, name, args),
Self::NativeExt(_name, handler) => {
let args = parse_function_call(call_ctx, None, &handler.params, args, true)?;
let mut out_args = Vec::with_capacity(handler.params.len());
@@ -149,7 +149,7 @@
)?;
evaluate(ctx, &func.body)
}
- Self::Intrinsic(_, _) => todo!(),
+ Self::Intrinsic(_) => todo!(),
Self::NativeExt(_, _) => todo!(),
}
}
@@ -160,7 +160,7 @@
let ctx = place_args(call_ctx, Some(func.ctx.clone()), &func.params, args)?;
evaluate(ctx, &func.body)
}
- Self::Intrinsic(_, _) => todo!(),
+ Self::Intrinsic(_) => todo!(),
Self::NativeExt(_, _) => todo!(),
}
}
crates/jrsonnet-parser/src/expr.rsdiffbeforeafterboth--- a/crates/jrsonnet-parser/src/expr.rs
+++ b/crates/jrsonnet-parser/src/expr.rs
@@ -311,6 +311,8 @@
Index(LocExpr, LocExpr),
/// function(x) x
Function(ParamsDesc, LocExpr),
+ /// std.primitiveEquals
+ Intrinsic(Rc<str>),
/// if true == false then 1 else 2
IfElse {
cond: IfSpecData,
crates/jrsonnet-parser/src/lib.rsdiffbeforeafterboth1use peg::parser;2use std::{path::PathBuf, rc::Rc};3mod expr;4pub use expr::*;5pub use peg;67#[derive(Default)]8pub struct ParserSettings {9 pub loc_data: bool,10 pub file_name: Rc<PathBuf>,11}1213parser! {14 grammar jsonnet_parser() for str {15 use peg::ParseLiteral;1617 /// Standard C-like comments18 rule comment()19 = "//" (!['\n'][_])* "\n"20 / "/*" ("\\*/" / "\\\\" / (!("*/")[_]))* "*/"21 / "#" (!['\n'][_])* "\n"2223 rule single_whitespace() = quiet!{([' ' | '\r' | '\n' | '\t'] / comment())} / expected!("<whitespace>")24 rule _() = single_whitespace()*2526 /// For comma-delimited elements27 rule comma() = quiet!{_ "," _} / expected!("<comma>")28 rule alpha() -> char = c:$(['_' | 'a'..='z' | 'A'..='Z']) {c.chars().next().unwrap()}29 rule digit() -> char = d:$(['0'..='9']) {d.chars().next().unwrap()}30 rule end_of_ident() = !['0'..='9' | '_' | 'a'..='z' | 'A'..='Z']31 /// Sequence of digits32 rule uint() -> u64 = a:$(digit()+) { a.parse().unwrap() }33 /// Number in scientific notation format34 rule number() -> f64 = quiet!{a:$(uint() ("." uint())? (['e'|'E'] (s:['+'|'-'])? uint())?) { a.parse().unwrap() }} / expected!("<number>")3536 /// Reserved word followed by any non-alphanumberic37 rule reserved() = ("assert" / "else" / "error" / "false" / "for" / "function" / "if" / "import" / "importstr" / "in" / "local" / "null" / "tailstrict" / "then" / "self" / "super" / "true") end_of_ident()38 rule id() = quiet!{ !reserved() alpha() (alpha() / digit())*} / expected!("<identifier>")3940 rule keyword(id: &'static str)41 = ##parse_string_literal(id) end_of_ident()42 // Adds location data information to existing expression43 rule l(s: &ParserSettings, x: rule<Expr>) -> LocExpr44 = start:position!() v:x() end:position!() {loc_expr!(v, s.loc_data, (s.file_name.clone(), start, end))}4546 pub rule param(s: &ParserSettings) -> expr::Param = name:$(id()) expr:(_ "=" _ expr:expr(s){expr})? { expr::Param(name.into(), expr) }47 pub rule params(s: &ParserSettings) -> expr::ParamsDesc48 = params:param(s) ** comma() comma()? {49 let mut defaults_started = false;50 for param in ¶ms {51 defaults_started = defaults_started || param.1.is_some();52 assert_eq!(defaults_started, param.1.is_some(), "defauld parameters should be used after all positionals");53 }54 expr::ParamsDesc(Rc::new(params))55 }56 / { expr::ParamsDesc(Rc::new(Vec::new())) }5758 pub rule arg(s: &ParserSettings) -> expr::Arg59 = name:$(id()) _ "=" _ expr:expr(s) {expr::Arg(Some(name.into()), expr)}60 / expr:expr(s) {expr::Arg(None, expr)}61 pub rule args(s: &ParserSettings) -> expr::ArgsDesc62 = args:arg(s) ** comma() comma()? {63 let mut named_started = false;64 for arg in &args {65 named_started = named_started || arg.0.is_some();66 assert_eq!(named_started, arg.0.is_some(), "named args should be used after all positionals");67 }68 expr::ArgsDesc(args)69 }70 / { expr::ArgsDesc(Vec::new()) }7172 pub rule bind(s: &ParserSettings) -> expr::BindSpec73 = name:$(id()) _ "=" _ expr:expr(s) {expr::BindSpec{name:name.into(), params: None, value: expr}}74 / name:$(id()) _ "(" _ params:params(s) _ ")" _ "=" _ expr:expr(s) {expr::BindSpec{name:name.into(), params: Some(params), value: expr}}75 pub rule assertion(s: &ParserSettings) -> expr::AssertStmt76 = keyword("assert") _ cond:expr(s) msg:(_ ":" _ e:expr(s) {e})? { expr::AssertStmt(cond, msg) }7778 pub rule whole_line() -> &'input str79 = str:$((!['\n'][_])* "\n") {str}80 pub rule string_block() -> String81 = "|||" (!['\n']single_whitespace())* "\n"82 empty_lines:$(['\n']*)83 prefix:[' ' | '\t']+ first_line:whole_line()84 lines:("\n" {"\n"} / [' ' | '\t']*<{prefix.len()}> s:whole_line() {s})*85 [' ' | '\t']*<, {prefix.len() - 1}> "|||"86 {let mut l = empty_lines.to_owned(); l.push_str(first_line); l.extend(lines); l}87 pub rule string() -> String88 = "\"" str:$(("\\\"" / "\\\\" / (!['"'][_]))*) "\"" {unescape::unescape(str).unwrap()}89 / "'" str:$(("\\'" / "\\\\" / (!['\''][_]))*) "'" {unescape::unescape(str).unwrap()}90 / "@'" str:$(("''" / (!['\''][_]))*) "'" {str.replace("''", "'")}91 / "@\"" str:$(("\"\"" / (!['"'][_]))*) "\"" {str.replace("\"\"", "\"")}92 / string_block()9394 pub rule field_name(s: &ParserSettings) -> expr::FieldName95 = name:$(id()) {expr::FieldName::Fixed(name.into())}96 / name:string() {expr::FieldName::Fixed(name.into())}97 / "[" _ expr:expr(s) _ "]" {expr::FieldName::Dyn(expr)}98 pub rule visibility() -> expr::Visibility99 = ":::" {expr::Visibility::Unhide}100 / "::" {expr::Visibility::Hidden}101 / ":" {expr::Visibility::Normal}102 pub rule field(s: &ParserSettings) -> expr::FieldMember103 = name:field_name(s) _ plus:"+"? _ visibility:visibility() _ value:expr(s) {expr::FieldMember{104 name,105 plus: plus.is_some(),106 params: None,107 visibility,108 value,109 }}110 / name:field_name(s) _ "(" _ params:params(s) _ ")" _ visibility:visibility() _ value:expr(s) {expr::FieldMember{111 name,112 plus: false,113 params: Some(params),114 visibility,115 value,116 }}117 pub rule obj_local(s: &ParserSettings) -> BindSpec118 = keyword("local") _ bind:bind(s) {bind}119 pub rule member(s: &ParserSettings) -> expr::Member120 = bind:obj_local(s) {expr::Member::BindStmt(bind)}121 / assertion:assertion(s) {expr::Member::AssertStmt(assertion)}122 / field:field(s) {expr::Member::Field(field)}123 pub rule objinside(s: &ParserSettings) -> expr::ObjBody124 = pre_locals:(b: obj_local(s) comma() {b})* "[" _ key:expr(s) _ "]" _ ":" _ value:expr(s) post_locals:(comma() b:obj_local(s) {b})* _ forspec:forspec(s) others:(_ rest:compspec(s) {rest})? {125 let mut compspecs = vec![CompSpec::ForSpec(forspec)];126 compspecs.extend(others.unwrap_or_default());127 expr::ObjBody::ObjComp(expr::ObjComp{128 pre_locals,129 key,130 value,131 post_locals,132 compspecs,133 })134 }135 / members:(member(s) ** comma()) comma()? {expr::ObjBody::MemberList(members)}136 pub rule ifspec(s: &ParserSettings) -> IfSpecData137 = keyword("if") _ expr:expr(s) {IfSpecData(expr)}138 pub rule forspec(s: &ParserSettings) -> ForSpecData139 = keyword("for") _ id:$(id()) _ keyword("in") _ cond:expr(s) {ForSpecData(id.into(), cond)}140 pub rule compspec(s: &ParserSettings) -> Vec<expr::CompSpec>141 = s:(i:ifspec(s) { expr::CompSpec::IfSpec(i) } / f:forspec(s) {expr::CompSpec::ForSpec(f)} ) ** _ {s}142 pub rule local_expr(s: &ParserSettings) -> LocExpr143 = l(s,<keyword("local") _ binds:bind(s) ** comma() _ ";" _ expr:expr(s) { Expr::LocalExpr(binds, expr) }>)144 pub rule string_expr(s: &ParserSettings) -> LocExpr145 = l(s, <s:string() {Expr::Str(s.into())}>)146 pub rule obj_expr(s: &ParserSettings) -> LocExpr147 = l(s,<"{" _ body:objinside(s) _ "}" {Expr::Obj(body)}>)148 pub rule array_expr(s: &ParserSettings) -> LocExpr149 = l(s,<"[" _ elems:(expr(s) ** comma()) _ comma()? "]" {Expr::Arr(elems)}>)150 pub rule array_comp_expr(s: &ParserSettings) -> LocExpr151 = l(s,<"[" _ expr:expr(s) _ comma()? _ forspec:forspec(s) _ others:(others: compspec(s) _ {others})? "]" {152 let mut specs = vec![CompSpec::ForSpec(forspec)];153 specs.extend(others.unwrap_or_default());154 Expr::ArrComp(expr, specs)155 }>)156 pub rule number_expr(s: &ParserSettings) -> LocExpr157 = l(s,<n:number() { expr::Expr::Num(n) }>)158 pub rule var_expr(s: &ParserSettings) -> LocExpr159 = l(s,<n:$(id()) { expr::Expr::Var(n.into()) }>)160 pub rule if_then_else_expr(s: &ParserSettings) -> LocExpr161 = l(s,<cond:ifspec(s) _ keyword("then") _ cond_then:expr(s) cond_else:(_ keyword("else") _ e:expr(s) {e})? {Expr::IfElse{162 cond,163 cond_then,164 cond_else,165 }}>)166167 pub rule literal(s: &ParserSettings) -> LocExpr168 = l(s,<v:(169 keyword("null") {LiteralType::Null}170 / keyword("true") {LiteralType::True}171 / keyword("false") {LiteralType::False}172 / keyword("self") {LiteralType::This}173 / keyword("$") {LiteralType::Dollar}174 / keyword("super") {LiteralType::Super}175 ) {Expr::Literal(v)}>)176177 pub rule expr_basic(s: &ParserSettings) -> LocExpr178 = literal(s)179180 / string_expr(s) / number_expr(s)181 / array_expr(s)182 / obj_expr(s)183 / array_expr(s)184 / array_comp_expr(s)185186 / l(s,<keyword("importstr") _ path:string() {Expr::ImportStr(PathBuf::from(path))}>)187 / l(s,<keyword("import") _ path:string() {Expr::Import(PathBuf::from(path))}>)188189 / var_expr(s)190 / local_expr(s)191 / if_then_else_expr(s)192193 / l(s,<keyword("function") _ "(" _ params:params(s) _ ")" _ expr:expr(s) {Expr::Function(params, expr)}>)194 / l(s,<assertion:assertion(s) _ ";" _ expr:expr(s) { Expr::AssertExpr(assertion, expr) }>)195196 / l(s,<keyword("error") _ expr:expr(s) { Expr::ErrorStmt(expr) }>)197198 rule slice_part(s: &ParserSettings) -> Option<LocExpr>199 = e:(_ e:expr(s) _{e})? {e}200 pub rule slice_desc(s: &ParserSettings) -> SliceDesc201 = start:slice_part(s) ":" pair:(end:slice_part(s) step:(":" e:slice_part(s){e})? {(end, step.flatten())})? {202 let (end, step) = if let Some((end, step)) = pair {203 (end, step)204 }else{205 (None, None)206 };207208 SliceDesc { start, end, step }209 }210211 rule expr(s: &ParserSettings) -> LocExpr212 = start:position!() a:precedence! {213 a:(@) _ "||" _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Or, b))}214 --215 a:(@) _ "&&" _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::And, b))}216 --217 a:(@) _ "|" _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::BitOr, b))}218 --219 a:@ _ "^" _ b:(@) {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::BitXor, b))}220 --221 a:(@) _ "&" _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::BitAnd, b))}222 --223 a:(@) _ "==" _ b:@ {loc_expr_todo!(Expr::Apply(224 el!(Expr::Index(225 el!(Expr::Var("std".into())),226 el!(Expr::Str("equals".into()))227 )),228 ArgsDesc(vec![Arg(None, a), Arg(None, b)]),229 true230 ))}231 a:(@) _ "!=" _ b:@ {loc_expr_todo!(Expr::UnaryOp(UnaryOpType::Not, el!(Expr::Apply(232 el!(Expr::Index(233 el!(Expr::Var("std".into())),234 el!(Expr::Str("equals".into()))235 )),236 ArgsDesc(vec![Arg(None, a), Arg(None, b)]),237 true238 ))))}239 --240 a:(@) _ "<" _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Lt, b))}241 a:(@) _ ">" _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Gt, b))}242 a:(@) _ "<=" _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Lte, b))}243 a:(@) _ ">=" _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Gte, b))}244 a:(@) _ keyword("in") _ b:@ {loc_expr_todo!(Expr::Apply(245 el!(Expr::Index(246 el!(Expr::Var("std".into())),247 el!(Expr::Str("objectHasEx".into()))248 )), ArgsDesc(vec![Arg(None, b), Arg(None, a), Arg(None, el!(Expr::Literal(LiteralType::True)))]),249 true250 ))}251 --252 a:(@) _ "<<" _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Lhs, b))}253 a:(@) _ ">>" _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Rhs, b))}254 --255 a:(@) _ "+" _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Add, b))}256 a:(@) _ "-" _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Sub, b))}257 --258 a:(@) _ "*" _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Mul, b))}259 a:(@) _ "/" _ b:@ {loc_expr_todo!(Expr::BinaryOp(a, BinaryOpType::Div, b))}260 a:(@) _ "%" _ b:@ {loc_expr_todo!(Expr::Apply(261 el!(Expr::Index(262 el!(Expr::Var("std".into())),263 el!(Expr::Str("mod".into()))264 )), ArgsDesc(vec![Arg(None, a), Arg(None, b)]),265 false266 ))}267 --268 "-" _ b:@ {loc_expr_todo!(Expr::UnaryOp(UnaryOpType::Minus, b))}269 "!" _ b:@ {loc_expr_todo!(Expr::UnaryOp(UnaryOpType::Not, b))}270 "~" _ b:@ { loc_expr_todo!(Expr::UnaryOp(UnaryOpType::BitNot, b)) }271 --272 a:(@) _ "[" _ s:slice_desc(s) _ "]" {loc_expr_todo!(Expr::Apply(273 el!(Expr::Index(274 el!(Expr::Var("std".into())),275 el!(Expr::Str("slice".into())),276 )),277 ArgsDesc(vec![278 Arg(None, a),279 Arg(None, s.start.unwrap_or_else(||el!(Expr::Literal(LiteralType::Null)))),280 Arg(None, s.end.unwrap_or_else(||el!(Expr::Literal(LiteralType::Null)))),281 Arg(None, s.step.unwrap_or_else(||el!(Expr::Literal(LiteralType::Null)))),282 ]),283 true,284 ))}285 a:(@) _ "." _ s:$(id()) {loc_expr_todo!(Expr::Index(a, el!(Expr::Str(s.into()))))}286 a:(@) _ "[" _ s:expr(s) _ "]" {loc_expr_todo!(Expr::Index(a, s))}287 a:(@) _ "(" _ args:args(s) _ ")" ts:(_ keyword("tailstrict"))? {loc_expr_todo!(Expr::Apply(a, args, ts.is_some()))}288 a:(@) _ "{" _ body:objinside(s) _ "}" {loc_expr_todo!(Expr::ObjExtend(a, body))}289 --290 e:expr_basic(s) {e}291 "(" _ e:expr(s) _ ")" {loc_expr_todo!(Expr::Parened(e))}292 } end:position!() {293 let LocExpr(e, _) = a;294 LocExpr(e, if s.loc_data {295 Some(ExprLocation(s.file_name.clone(), start, end))296 } else {297 None298 })299 }300 / e:expr_basic(s) {e}301302 pub rule jsonnet(s: &ParserSettings) -> LocExpr = _ e:expr(s) _ {e}303 }304}305306pub type ParseError = peg::error::ParseError<peg::str::LineCol>;307pub fn parse(str: &str, settings: &ParserSettings) -> Result<LocExpr, ParseError> {308 jsonnet_parser::jsonnet(str, settings)309}310311#[macro_export]312macro_rules! el {313 ($expr:expr) => {314 LocExpr(std::rc::Rc::new($expr), None)315 };316}317318#[cfg(test)]319pub mod tests {320 use super::{expr::*, parse};321 use crate::ParserSettings;322 use std::path::PathBuf;323 use std::rc::Rc;324325 macro_rules! parse {326 ($s:expr) => {327 parse(328 $s,329 &ParserSettings {330 loc_data: false,331 file_name: Rc::new(PathBuf::from("/test.jsonnet")),332 },333 )334 .unwrap()335 };336 }337338 mod expressions {339 use super::*;340341 pub fn basic_math() -> LocExpr {342 el!(Expr::BinaryOp(343 el!(Expr::Num(2.0)),344 BinaryOpType::Add,345 el!(Expr::BinaryOp(346 el!(Expr::Num(2.0)),347 BinaryOpType::Mul,348 el!(Expr::Num(2.0)),349 )),350 ))351 }352 }353354 #[test]355 fn multiline_string() {356 assert_eq!(357 parse!("|||\n Hello world!\n a\n|||"),358 el!(Expr::Str("Hello world!\n a\n".into())),359 );360 assert_eq!(361 parse!("|||\n Hello world!\n a\n|||"),362 el!(Expr::Str("Hello world!\n a\n".into())),363 );364 assert_eq!(365 parse!("|||\n\t\tHello world!\n\t\t\ta\n|||"),366 el!(Expr::Str("Hello world!\n\ta\n".into())),367 );368 assert_eq!(369 parse!("|||\n Hello world!\n a\n |||"),370 el!(Expr::Str("Hello world!\n a\n".into())),371 );372 }373374 #[test]375 fn slice() {376 parse!("a[1:]");377 parse!("a[1::]");378 parse!("a[:1:]");379 parse!("a[::1]");380 parse!("str[:len - 1]");381 }382383 #[test]384 fn string_escaping() {385 assert_eq!(386 parse!(r#""Hello, \"world\"!""#),387 el!(Expr::Str(r#"Hello, "world"!"#.into())),388 );389 assert_eq!(390 parse!(r#"'Hello \'world\'!'"#),391 el!(Expr::Str("Hello 'world'!".into())),392 );393 assert_eq!(parse!(r#"'\\\\'"#), el!(Expr::Str("\\\\".into())),);394 }395396 #[test]397 fn string_unescaping() {398 assert_eq!(399 parse!(r#""Hello\nWorld""#),400 el!(Expr::Str("Hello\nWorld".into())),401 );402 }403404 #[test]405 fn string_verbantim() {406 assert_eq!(407 parse!(r#"@"Hello\n""World""""#),408 el!(Expr::Str("Hello\\n\"World\"".into())),409 );410 }411412 #[test]413 fn imports() {414 assert_eq!(415 parse!("import \"hello\""),416 el!(Expr::Import(PathBuf::from("hello"))),417 );418 assert_eq!(419 parse!("importstr \"garnish.txt\""),420 el!(Expr::ImportStr(PathBuf::from("garnish.txt")))421 );422 }423424 #[test]425 fn empty_object() {426 assert_eq!(parse!("{}"), el!(Expr::Obj(ObjBody::MemberList(vec![]))));427 }428429 #[test]430 fn basic_math() {431 assert_eq!(432 parse!("2+2*2"),433 el!(Expr::BinaryOp(434 el!(Expr::Num(2.0)),435 BinaryOpType::Add,436 el!(Expr::BinaryOp(437 el!(Expr::Num(2.0)),438 BinaryOpType::Mul,439 el!(Expr::Num(2.0))440 ))441 ))442 );443 }444445 #[test]446 fn basic_math_with_indents() {447 assert_eq!(parse!("2 + 2 * 2 "), expressions::basic_math());448 }449450 #[test]451 fn basic_math_parened() {452 assert_eq!(453 parse!("2+(2+2*2)"),454 el!(Expr::BinaryOp(455 el!(Expr::Num(2.0)),456 BinaryOpType::Add,457 el!(Expr::Parened(expressions::basic_math())),458 ))459 );460 }461462 /// Comments should not affect parsing463 #[test]464 fn comments() {465 assert_eq!(466 parse!("2//comment\n+//comment\n3/*test*/*/*test*/4"),467 el!(Expr::BinaryOp(468 el!(Expr::Num(2.0)),469 BinaryOpType::Add,470 el!(Expr::BinaryOp(471 el!(Expr::Num(3.0)),472 BinaryOpType::Mul,473 el!(Expr::Num(4.0))474 ))475 ))476 );477 }478479 /// Comments should be able to be escaped480 #[test]481 fn comment_escaping() {482 assert_eq!(483 parse!("2/*\\*/+*/ - 22"),484 el!(Expr::BinaryOp(485 el!(Expr::Num(2.0)),486 BinaryOpType::Sub,487 el!(Expr::Num(22.0))488 ))489 );490 }491492 #[test]493 fn suffix() {494 // assert_eq!(parse!("std.test"), el!(Expr::Num(2.2)));495 // assert_eq!(parse!("std(2)"), el!(Expr::Num(2.2)));496 // assert_eq!(parse!("std.test(2)"), el!(Expr::Num(2.2)));497 // assert_eq!(parse!("a[b]"), el!(Expr::Num(2.2)))498 }499500 #[test]501 fn array_comp() {502 use Expr::*;503 assert_eq!(504 parse!("[std.deepJoin(x) for x in arr]"),505 el!(ArrComp(506 el!(Apply(507 el!(Index(el!(Var("std".into())), el!(Str("deepJoin".into())))),508 ArgsDesc(vec![Arg(None, el!(Var("x".into())))]),509 false,510 )),511 vec![CompSpec::ForSpec(ForSpecData(512 "x".into(),513 el!(Var("arr".into()))514 ))]515 )),516 )517 }518519 #[test]520 fn reserved() {521 use Expr::*;522 assert_eq!(parse!("null"), el!(Literal(LiteralType::Null)));523 assert_eq!(parse!("nulla"), el!(Var("nulla".into())));524 }525526 #[test]527 fn multiple_args_buf() {528 parse!("a(b, null_fields)");529 }530531 #[test]532 fn infix_precedence() {533 use Expr::*;534 assert_eq!(535 parse!("!a && !b"),536 el!(BinaryOp(537 el!(UnaryOp(UnaryOpType::Not, el!(Var("a".into())))),538 BinaryOpType::And,539 el!(UnaryOp(UnaryOpType::Not, el!(Var("b".into()))))540 ))541 );542 }543544 #[test]545 fn infix_precedence_division() {546 use Expr::*;547 assert_eq!(548 parse!("!a / !b"),549 el!(BinaryOp(550 el!(UnaryOp(UnaryOpType::Not, el!(Var("a".into())))),551 BinaryOpType::Div,552 el!(UnaryOp(UnaryOpType::Not, el!(Var("b".into()))))553 ))554 );555 }556557 #[test]558 fn double_negation() {559 use Expr::*;560 assert_eq!(561 parse!("!!a"),562 el!(UnaryOp(563 UnaryOpType::Not,564 el!(UnaryOp(UnaryOpType::Not, el!(Var("a".into()))))565 ))566 )567 }568569 #[test]570 fn array_test_error() {571 parse!("[a for a in b if c for e in f]");572 // ^^^^ failed code573 }574575 #[test]576 fn can_parse_stdlib() {577 parse!(jrsonnet_stdlib::STDLIB_STR);578 }579580 // From source code581 /*582 #[bench]583 fn bench_parse_peg(b: &mut Bencher) {584 b.iter(|| parse!(jrsonnet_stdlib::STDLIB_STR))585 }586 */587}