difftreelog
refactor always use prepared calls
in: master
17 files changed
crates/jrsonnet-evaluator/src/evaluate/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate/mod.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/mod.rs
@@ -19,7 +19,7 @@
destructure::evaluate_dest,
error::{ErrorKind::*, suggest_object_fields},
evaluate::operator::{evaluate_binary_op_special, evaluate_unary_op},
- function::{CallLocation, FuncDesc, FuncVal},
+ function::{CallLocation, FuncDesc, FuncVal, PreparedFuncVal},
gc::WithCapacityExt as _,
in_frame,
typed::{FromUntyped, IntoUntyped as _, Typed},
@@ -430,11 +430,25 @@
let value = evaluate(ctx.clone(), value)?;
Ok(match value {
Val::Func(f) => {
- let body = || f.evaluate(ctx, loc, args, tailstrict);
+ let name = f.name();
+ let prepare = PreparedFuncVal::new(f, args.unnamed.len(), &args.names)?;
+ let unnamed = args
+ .unnamed
+ .iter()
+ .cloned()
+ .map(|un| evaluate_thunk(ctx.clone(), un, tailstrict))
+ .collect::<Result<Vec<_>>>()?;
+ let named = args
+ .values
+ .iter()
+ .cloned()
+ .map(|un| evaluate_thunk(ctx.clone(), un, tailstrict))
+ .collect::<Result<Vec<_>>>()?;
+ let body = || prepare.call(loc, &unnamed, &named);
if tailstrict {
body()?
} else {
- in_frame(loc, || format!("function <{}> call", f.name()), body)?
+ in_frame(loc, || format!("function <{name}> call"), body)?
}
}
v => bail!(OnlyFunctionsCanBeCalledGot(v.value_type())),
@@ -479,6 +493,13 @@
})
}
+pub fn evaluate_thunk(ctx: Context, expr: Rc<Expr>, tailstrict: bool) -> Result<Thunk<Val>> {
+ Ok(if tailstrict {
+ Thunk::evaluated(evaluate(ctx, &expr)?)
+ } else {
+ Thunk!(move || { evaluate(ctx, &expr) })
+ })
+}
#[allow(clippy::too_many_lines)]
pub fn evaluate(ctx: Context, expr: &Expr) -> Result<Val> {
use Expr::*;
crates/jrsonnet-evaluator/src/function/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/function/mod.rs
+++ b/crates/jrsonnet-evaluator/src/function/mod.rs
@@ -3,12 +3,12 @@
use educe::Educe;
use jrsonnet_gcmodule::{Cc, Trace};
use jrsonnet_interner::IStr;
-use jrsonnet_ir::{ArgsDesc, Destruct, Expr, ExprParams, Span};
+use jrsonnet_ir::{Destruct, Expr, ExprParams, Span};
pub use jrsonnet_macros::builtin;
use self::{
builtin::Builtin,
- parse::{parse_builtin_call, parse_default_function_call, parse_function_call},
+ parse::parse_default_function_call,
prepared::{PreparedCall, parse_prepared_builtin_call, parse_prepared_function_call},
};
use crate::{
@@ -22,7 +22,7 @@
pub use jrsonnet_ir::function::*;
pub use native::NativeFn;
-pub use prepared::PreparedFuncVal;
+pub(crate) use prepared::PreparedFuncVal;
/// Function callsite location.
/// Either from other jsonnet code, specified by expression location, or from native (without location).
@@ -77,16 +77,6 @@
parse_default_function_call(self.ctx.clone(), &self.params)
}
- /// Create context, with which body code will run
- pub(crate) fn call_body_context(
- &self,
- call_ctx: Context,
- args: &ArgsDesc,
- tailstrict: bool,
- ) -> Result<Context> {
- parse_function_call(call_ctx, self.ctx.clone(), &self.params, args, tailstrict)
- }
-
pub fn evaluate_trivial(&self) -> Option<Val> {
evaluate_trivial(&self.body)
}
@@ -137,27 +127,6 @@
match self {
Self::Normal(normal) => normal.name.clone(),
Self::Builtin(builtin) => builtin.name().into(),
- }
- }
- /// Call function using arguments evaluated in specified `call_ctx` [`Context`].
- ///
- /// If `tailstrict` is specified - then arguments will be evaluated before being passed to function body.
- pub fn evaluate(
- &self,
- call_ctx: Context,
- loc: CallLocation<'_>,
- args: &ArgsDesc,
- tailstrict: bool,
- ) -> Result<Val> {
- match self {
- Self::Normal(func) => {
- let body_ctx = func.call_body_context(call_ctx, args, tailstrict)?;
- evaluate(body_ctx, &func.body)
- }
- Self::Builtin(b) => {
- let args = parse_builtin_call(call_ctx, b.params(), args, tailstrict)?;
- b.call(loc, &args)
- }
}
}
crates/jrsonnet-evaluator/src/function/native.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/function/native.rs
+++ b/crates/jrsonnet-evaluator/src/function/native.rs
@@ -39,12 +39,19 @@
impl<$($gen,)* O> FromUntyped for NativeFn<($($gen,)* O,)> {
fn from_untyped(untyped: Val) -> Result<Self> {
let func = FuncVal::from_untyped(untyped)?;
+ Self::try_from(func)
+ }
+ }
+ impl<$($gen,)* O> TryFrom<FuncVal> for NativeFn<($($gen,)* O,)> {
+ type Error = crate::Error;
+ fn try_from(v: FuncVal) -> Result<Self> {
Ok(Self(
- PreparedFuncVal::new(func, $i, &[])?,
+ PreparedFuncVal::new(v, $i, &[])?,
PhantomData,
))
}
}
+
};
($i:expr; $($cur:ident)* @ $c:ident $($rest:ident)*) => {
impl_native_desc!($i; $($cur)*);
crates/jrsonnet-evaluator/src/function/parse.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/function/parse.rs
+++ b/crates/jrsonnet-evaluator/src/function/parse.rs
@@ -1,215 +1,13 @@
-use std::rc::Rc;
-
-use jrsonnet_ir::{
- ArgsDesc, Expr, ExprParams,
- function::{FunctionSignature, ParamName},
-};
+use jrsonnet_ir::ExprParams;
use rustc_hash::FxHashMap;
use crate::{
- Context, Pending, Thunk, Val, bail,
+ Context, Thunk,
destructure::destruct,
error::{ErrorKind::*, Result},
- evaluate, evaluate_named_param,
+ evaluate_named_param,
gc::WithCapacityExt as _,
};
-
-fn eval_arg(ctx: Context, arg: &Rc<Expr>, tailstrict: bool) -> Result<Thunk<Val>> {
- if tailstrict {
- Ok(Thunk::evaluated(evaluate(ctx, arg)?))
- } else {
- let arg = arg.clone();
- Ok(Thunk!(move || evaluate(ctx, &arg)))
- }
-}
-
-/// Creates correct [context](Context) for function body evaluation returning error on invalid call.
-///
-/// ## Parameters
-/// * `ctx`: used for passed argument expressions' execution and for body execution (if `body_ctx` is not set)
-/// * `body_ctx`: used for default parameter values' execution and for body execution (if set)
-/// * `params`: function parameters' definition
-/// * `args`: passed function arguments
-/// * `tailstrict`: if set to `true` function arguments are eagerly executed, otherwise - lazily
-pub(crate) fn parse_function_call(
- ctx: Context,
- body_ctx: Context,
- params: &ExprParams,
- args: &ArgsDesc,
- tailstrict: bool,
-) -> Result<Context> {
- let mut passed_args = FxHashMap::with_capacity(params.binds_len());
- if args.unnamed.len() > params.signature.len() {
- bail!(TooManyArgsFunctionHas(
- params.signature.len(),
- params.signature.clone(),
- ))
- }
-
- let mut filled_named = 0;
- let mut filled_positionals = 0;
-
- for (id, arg) in args.unnamed.iter().enumerate() {
- destruct(
- ¶ms.exprs[id].destruct,
- eval_arg(ctx.clone(), arg, tailstrict)?,
- Pending::new_filled(ctx.clone()),
- &mut passed_args,
- )?;
- filled_positionals += 1;
- }
-
- for (name, value) in &args.named {
- // FIXME: O(n) for arg existence check
- if !params.exprs.iter().any(|p| &p.destruct.name() == name) {
- bail!(UnknownFunctionParameter(name.clone()));
- }
- if passed_args
- .insert(name.clone(), eval_arg(ctx.clone(), value, tailstrict)?)
- .is_some()
- {
- bail!(BindingParameterASecondTime(name.clone()));
- }
- filled_named += 1;
- }
-
- if filled_named + filled_positionals < params.len() {
- // Some args are unset, but maybe we have defaults for them
- // Default values should be created in newly created context
- let fctx = Context::new_future();
- let mut defaults =
- FxHashMap::with_capacity(params.binds_len() - filled_named - filled_positionals);
-
- for (idx, into, default) in params
- .exprs
- .iter()
- .enumerate()
- .filter_map(|(i, p)| Some((i, &p.destruct, p.default.as_ref()?)))
- {
- if let ParamName::Named(name) = into.name() {
- if passed_args.contains_key(&name) {
- continue;
- }
- } else if idx < filled_positionals {
- continue;
- }
-
- destruct(
- into,
- {
- let ctx = fctx.clone();
- let name = into.name();
- let value = default.clone();
- Thunk!(move || evaluate_named_param(ctx.unwrap(), &value, name))
- },
- fctx.clone(),
- &mut defaults,
- )?;
- if into.name().is_named() {
- filled_named += 1;
- } else {
- filled_positionals += 1;
- }
- }
-
- // Some args still weren't filled
- if filled_named + filled_positionals != params.len() {
- for param in params.exprs.iter().skip(args.unnamed.len()) {
- let mut found = false;
- for (name, _) in &args.named {
- if ¶m.destruct.name() == name {
- found = true;
- }
- }
- if !found {
- bail!(FunctionParameterNotBoundInCall(
- param.destruct.name(),
- params.signature.clone()
- ));
- }
- }
- unreachable!();
- }
-
- Ok(body_ctx
- .extend_bindings(passed_args)
- .extend_bindings(defaults)
- .into_future(fctx))
- } else {
- let body_ctx = body_ctx.extend_bindings(passed_args);
- Ok(body_ctx)
- }
-}
-
-/// You shouldn't probally use this function, use `jrsonnet_macros::builtin` instead
-///
-/// ## Parameters
-/// * `ctx`: used for passed argument expressions' execution and for body execution (if `body_ctx` is not set)
-/// * `params`: function parameters' definition
-/// * `args`: passed function arguments
-/// * `tailstrict`: if set to `true` function arguments are eagerly executed, otherwise - lazily
-pub fn parse_builtin_call(
- ctx: Context,
- params: FunctionSignature,
- args: &ArgsDesc,
- tailstrict: bool,
-) -> Result<Vec<Option<Thunk<Val>>>> {
- let mut passed_args: Vec<Option<Thunk<Val>>> = vec![None; params.len()];
- if args.unnamed.len() > params.len() {
- bail!(TooManyArgsFunctionHas(params.len(), params,))
- }
-
- let mut filled_args = 0;
-
- for (id, arg) in args.unnamed.iter().enumerate() {
- passed_args[id] = Some(eval_arg(ctx.clone(), arg, tailstrict)?);
- filled_args += 1;
- }
-
- for (name, arg) in &args.named {
- // FIXME: O(n) for arg existence check
- let id = params
- .iter()
- .position(|p| p.name() == name)
- .ok_or_else(|| UnknownFunctionParameter(name.clone()))?;
- if passed_args[id]
- .replace(eval_arg(ctx.clone(), arg, tailstrict)?)
- .is_some()
- {
- bail!(BindingParameterASecondTime(name.clone()));
- }
- filled_args += 1;
- }
-
- if filled_args < params.len() {
- for (id, _) in params.iter().enumerate().filter(|(_, p)| p.has_default()) {
- if passed_args[id].is_some() {
- continue;
- }
- filled_args += 1;
- }
-
- // Some args still wasn't filled
- if filled_args != params.len() {
- for param in params.iter().skip(args.unnamed.len()) {
- let mut found = false;
- for (name, _) in &args.named {
- if param.name() == name {
- found = true;
- }
- }
- if !found {
- bail!(FunctionParameterNotBoundInCall(
- param.name().clone(),
- params,
- ));
- }
- }
- unreachable!();
- }
- }
- Ok(passed_args)
-}
/// Creates Context, which has all argument default values applied
/// and with unbound values causing error to be returned
crates/jrsonnet-ir-parser/src/lib.rsdiffbeforeafterboth1use std::rc::Rc;23use jrsonnet_gcmodule::Acyclic;4use jrsonnet_ir::{5 ArgsDesc, AssertExpr, AssertStmt, BinaryOp, BinaryOpType, BindSpec, CompSpec, Destruct, Expr,6 ExprParam, ExprParams, FieldMember, FieldName, ForSpecData, IStr, IfElse, IfSpecData,7 ImportKind, IndexPart, LiteralType, Member, ObjBody, ObjComp, ObjMembers, Slice, SliceDesc,8 Source, Span, Spanned, UnaryOpType, Visibility, unescape,9};10use jrsonnet_lexer::{Lexeme, Lexer, Span as LexSpan, SyntaxKind, T, collect_lexed_str_block};1112pub struct ParserSettings {13 pub source: Source,14}1516#[derive(Debug, Clone)]17pub struct ParseError {18 pub message: String,19 pub location: LexSpan,20}2122impl std::fmt::Display for ParseError {23 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {24 write!(f, "{}", self.message)25 }26}2728type Result<T> = std::result::Result<T, ParseError>;2930struct Parser<'a> {31 lexemes: Vec<Lexeme<'a>>,32 offset: usize,33 source: Source,34}3536impl<'a> Parser<'a> {37 fn new(code: &'a str, source: Source) -> Self {38 Self {39 lexemes: Lexer::new(code)40 .filter(|l| {41 !matches!(42 l.kind,43 SyntaxKind::WHITESPACE44 | SyntaxKind::SINGLE_LINE_SLASH_COMMENT45 | SyntaxKind::SINGLE_LINE_HASH_COMMENT46 | SyntaxKind::MULTI_LINE_COMMENT47 )48 })49 .collect(),50 offset: 0,51 source,52 }53 }5455 fn peek(&self) -> SyntaxKind {56 if self.at_eof() {57 SyntaxKind::EOF58 } else {59 self.lexemes[self.offset].kind60 }61 }6263 fn text(&self) -> &'a str {64 self.lexemes[self.offset].text65 }6667 fn at(&self, kind: SyntaxKind) -> bool {68 !self.at_eof() && self.peek() == kind69 }7071 fn eat_any(&mut self) {72 self.offset += 1;73 }7475 fn at_eof(&self) -> bool {76 self.offset >= self.lexemes.len()77 }7879 fn try_eat(&mut self, t: SyntaxKind) -> bool {80 if self.at(t) {81 self.eat_any();82 return true;83 }84 false85 }8687 fn current_desc(&self) -> String {88 if self.at_eof() {89 return "end of file".to_owned();90 }91 let kind = self.peek();92 let text = self.text();93 let name = kind.display_name();94 if matches!(kind, SyntaxKind::IDENT | SyntaxKind::FLOAT) {95 format!("{name} \"{text}\"")96 } else {97 name.to_owned()98 }99 }100101 fn eat(&mut self, t: SyntaxKind) -> Result<()> {102 if !self.at(t) {103 return Err(self.error(format!(104 "expected {}, got {}",105 t.display_name(),106 self.current_desc(),107 )));108 }109 self.eat_any();110 Ok(())111 }112113 fn span_start(&self) -> u32 {114 if self.at_eof() {115 if let Some(last) = self.lexemes.last() {116 return last.range.1;117 }118 return 0;119 }120 self.lexemes[self.offset].range.0121 }122123 fn span_end(&self) -> u32 {124 self.lexemes[self.offset - 1].range.1125 }126127 fn error(&self, message: String) -> ParseError {128 ParseError {129 location: self.lexemes[self.offset].range,130 message,131 }132 }133}134135fn spanned<T: Acyclic>(136 p: &mut Parser<'_>,137 cb: impl FnOnce(&mut Parser<'_>) -> Result<T>,138) -> Result<Spanned<T>> {139 let start = p.span_start();140 let v = cb(p)?;141 let end = p.span_end();142 Ok(Spanned::new(v, Span(p.source.clone(), start, end)))143}144145fn parse_string_content(p: &mut Parser<'_>) -> Result<IStr> {146 let kind = p.peek();147 let text = p.text();148 let s = match kind {149 SyntaxKind::STRING_DOUBLE => {150 let inner = &text[1..text.len() - 1];151 unescape::unescape(inner).ok_or_else(|| p.error("invalid string escape".into()))?152 }153 SyntaxKind::STRING_SINGLE => {154 let inner = &text[1..text.len() - 1];155 unescape::unescape(inner).ok_or_else(|| p.error("invalid string escape".into()))?156 }157 SyntaxKind::STRING_DOUBLE_VERBATIM => {158 let inner = &text[2..text.len() - 1];159 inner.replace("\"\"", "\"")160 }161 SyntaxKind::STRING_SINGLE_VERBATIM => {162 let inner = &text[2..text.len() - 1];163 inner.replace("''", "'")164 }165 SyntaxKind::STRING_BLOCK => {166 let inner = &text[3..];167 let collected = collect_lexed_str_block(inner)168 .map_err(|_| p.error("invalid string block".into()))?;169 let mut result = String::new();170 for (i, line) in collected.lines.iter().enumerate() {171 if i > 0 {172 result.push('\n');173 }174 result.push_str(line);175 }176 if !collected.truncate {177 result.push('\n');178 }179 result180 }181 _ => return Err(p.error(format!("expected string, got {}", p.current_desc()))),182 };183 p.eat_any();184 Ok(s.into())185}186187fn is_string_token(kind: SyntaxKind) -> bool {188 matches!(189 kind,190 SyntaxKind::STRING_DOUBLE191 | SyntaxKind::STRING_SINGLE192 | SyntaxKind::STRING_DOUBLE_VERBATIM193 | SyntaxKind::STRING_SINGLE_VERBATIM194 | SyntaxKind::STRING_BLOCK195 )196}197198fn parse_number(p: &mut Parser<'_>) -> Result<f64> {199 let text = p.text();200 let n: f64 = text201 .replace('_', "")202 .parse()203 .map_err(|_| p.error(format!("invalid number literal: {text}")))?;204 if !n.is_finite() {205 return Err(p.error("numbers are finite".into()));206 }207 p.eat_any();208 Ok(n)209}210211fn ident(p: &mut Parser<'_>) -> Result<IStr> {212 let text = p.text();213 p.eat(SyntaxKind::IDENT)?;214 Ok(IStr::from(text))215}216217fn literal(p: &mut Parser<'_>) -> Option<LiteralType> {218 let t = match p.peek() {219 T![self] => LiteralType::This,220 T![super] => LiteralType::Super,221 T!['$'] => LiteralType::Dollar,222 T![null] => LiteralType::Null,223 T![true] => LiteralType::True,224 T![false] => LiteralType::False,225 _ => return None,226 };227 p.eat_any();228 Some(t)229}230231fn assert_stmt(p: &mut Parser<'_>) -> Result<AssertStmt> {232 p.eat(T![assert])?;233 let cond = spanned(p, expr)?;234 let msg = if p.try_eat(T![:]) {235 Some(spanned(p, expr)?)236 } else {237 None238 };239 Ok(AssertStmt(cond, msg))240}241242fn if_spec_data(p: &mut Parser<'_>) -> Result<IfSpecData> {243 let v = spanned(p, |p| p.eat(T![if]))?;244 let cond = expr(p)?;245 Ok(IfSpecData { span: v.span, cond })246}247248fn if_else(p: &mut Parser<'_>) -> Result<IfElse> {249 let cond = if_spec_data(p)?;250 p.eat(T![then])?;251 let cond_then = expr(p)?;252 let cond_else = if p.try_eat(T![else]) {253 Some(expr(p)?)254 } else {255 None256 };257 Ok(IfElse {258 cond,259 cond_then,260 cond_else,261 })262}263264fn slice_desc(p: &mut Parser<'_>, start: Option<Spanned<Expr>>) -> Result<SliceDesc> {265 p.eat(T![:])?;266 let end = if !p.at(T![:]) && !p.at(T![']']) {267 Some(spanned(p, expr)?)268 } else {269 None270 };271 let step = if p.try_eat(T![:]) {272 if p.at(T![']']) {273 None274 } else {275 Some(spanned(p, expr)?)276 }277 } else {278 None279 };280 Ok(SliceDesc { start, end, step })281}282283fn destruct(p: &mut Parser<'_>) -> Result<Destruct> {284 if p.at(SyntaxKind::IDENT) {285 return Ok(Destruct::Full(ident(p)?));286 }287 #[cfg(not(feature = "exp-destruct"))]288 return Err(p.error(format!("expected identifier, got {}", p.current_desc())));289 #[cfg(feature = "exp-destruct")]290 {291 if p.try_eat(T![?]) {292 return Ok(Destruct::Skip);293 }294 if p.at(T!['[']) {295 return destruct_array(p);296 }297 if p.at(T!['{']) {298 return destruct_object(p);299 }300 Err(p.error(format!(301 "expected destructure pattern, got {}",302 p.current_desc()303 )))304 }305}306307#[cfg(feature = "exp-destruct")]308fn destruct_rest(p: &mut Parser<'_>) -> Result<jrsonnet_ir::DestructRest> {309 p.eat(T![...])?;310 if p.at(SyntaxKind::IDENT) {311 Ok(jrsonnet_ir::DestructRest::Keep(ident(p)?))312 } else {313 Ok(jrsonnet_ir::DestructRest::Drop)314 }315}316317#[cfg(feature = "exp-destruct")]318fn destruct_array(p: &mut Parser<'_>) -> Result<Destruct> {319 p.eat(T!['['])?;320 let mut start = Vec::new();321 let mut rest = None;322 let mut end = Vec::new();323 if !p.at(T![']']) {324 loop {325 if p.at(T![...]) {326 rest = Some(destruct_rest(p)?);327 if p.try_eat(T![,]) {328 if !p.at(T![']']) {329 loop {330 end.push(destruct(p)?);331 if !p.try_eat(T![,]) {332 break;333 }334 if p.at(T![']']) {335 break;336 }337 }338 }339 }340 break;341 }342 start.push(destruct(p)?);343 if !p.try_eat(T![,]) {344 break;345 }346 if p.at(T![']']) {347 break;348 }349 }350 }351 p.eat(T![']'])?;352 Ok(Destruct::Array { start, rest, end })353}354355#[cfg(feature = "exp-destruct")]356fn destruct_object(p: &mut Parser<'_>) -> Result<Destruct> {357 p.eat(T!['{'])?;358 let mut fields = Vec::new();359 let mut rest = None;360 if !p.at(T!['}']) {361 loop {362 if p.at(T![...]) {363 rest = Some(destruct_rest(p)?);364 p.try_eat(T![,]);365 break;366 }367 let name = ident(p)?;368 let into = if p.try_eat(T![:]) {369 Some(destruct(p)?)370 } else {371 None372 };373 let default = if p.try_eat(T![=]) {374 Some(Rc::new(spanned(p, expr)?))375 } else {376 None377 };378 fields.push((name, into, default));379 if !p.try_eat(T![,]) {380 break;381 }382 if p.at(T!['}']) {383 break;384 }385 }386 }387 p.eat(T!['}'])?;388 Ok(Destruct::Object { fields, rest })389}390391fn params(p: &mut Parser<'_>) -> Result<ExprParams> {392 if p.at(T![')']) {393 return Ok(ExprParams::new(Vec::new()));394 }395 let mut result = Vec::new();396 loop {397 let d = destruct(p)?;398 let default = if p.try_eat(T![=]) {399 Some(Rc::new(expr(p)?))400 } else {401 None402 };403 result.push(ExprParam {404 destruct: d,405 default,406 });407 if !p.try_eat(T![,]) {408 break;409 }410 if p.at(T![')']) {411 break;412 }413 }414 Ok(ExprParams::new(result))415}416417fn args(p: &mut Parser<'_>) -> Result<ArgsDesc> {418 if p.at(T![')']) {419 return Ok(ArgsDesc::new(Vec::new(), Vec::new()));420 }421 let mut unnamed = Vec::new();422 let mut named = Vec::new();423 let mut named_started = false;424 loop {425 let is_named = p.at(SyntaxKind::IDENT) && {426 let next_offset = p.offset + 1;427 next_offset < p.lexemes.len() && p.lexemes[next_offset].kind == T![=]428 };429 if is_named {430 let name: IStr = ident(p)?;431 p.eat(T![=])?;432 let value = Rc::new(expr(p)?);433 named.push((name, value));434 named_started = true;435 } else {436 if named_started {437 return Err(p.error("positional argument after named argument".into()));438 }439 unnamed.push(Rc::new(expr(p)?));440 }441 if !p.try_eat(T![,]) {442 break;443 }444 if p.at(T![')']) {445 break;446 }447 }448 Ok(ArgsDesc::new(unnamed, named))449}450451fn bind(p: &mut Parser<'_>) -> Result<BindSpec> {452 #[cfg(feature = "exp-destruct")]453 {454 if !p.at(SyntaxKind::IDENT) {455 let d = destruct(p)?;456 p.eat(T![=])?;457 let value = Rc::new(expr(p)?);458 return Ok(BindSpec::Field { into: d, value });459 }460 }461 let name = ident(p)?;462 if p.try_eat(T!['(']) {463 let ps = params(p)?;464 p.eat(T![')'])?;465 p.eat(T![=])?;466 let value = Rc::new(expr(p)?);467 Ok(BindSpec::Function {468 name,469 params: ps,470 value,471 })472 } else {473 p.eat(T![=])?;474 let value = Rc::new(expr(p)?);475 Ok(BindSpec::Field {476 into: Destruct::Full(name),477 value,478 })479 }480}481482fn visibility(p: &mut Parser<'_>) -> Result<Visibility> {483 p.eat(T![:])?;484 if p.try_eat(T![:]) {485 if p.try_eat(T![:]) {486 Ok(Visibility::Unhide)487 } else {488 Ok(Visibility::Hidden)489 }490 } else {491 Ok(Visibility::Normal)492 }493}494495fn field_name(p: &mut Parser<'_>) -> Result<FieldName> {496 if p.at(SyntaxKind::IDENT) {497 Ok(FieldName::Fixed(ident(p)?))498 } else if is_string_token(p.peek()) {499 Ok(FieldName::Fixed(parse_string_content(p)?))500 } else if p.at(T!['[']) {501 p.eat(T!['['])?;502 let e = expr(p)?;503 p.eat(T![']'])?;504 Ok(FieldName::Dyn(e))505 } else {506 Err(p.error(format!("expected field name, got {}", p.current_desc())))507 }508}509510fn field(p: &mut Parser<'_>) -> Result<FieldMember> {511 let name = spanned(p, field_name)?;512513 if p.at(T!['(']) {514 p.eat(T!['('])?;515 let ps = params(p)?;516 p.eat(T![')'])?;517 let vis = visibility(p)?;518 let value = Rc::new(expr(p)?);519 Ok(FieldMember {520 name,521 plus: false,522 params: Some(ps),523 visibility: vis,524 value,525 })526 } else {527 let plus = p.try_eat(T![+]);528 let vis = visibility(p)?;529 let value = Rc::new(expr(p)?);530 Ok(FieldMember {531 name,532 plus,533 params: None,534 visibility: vis,535 value,536 })537 }538}539540fn member(p: &mut Parser<'_>) -> Result<Member> {541 if p.at(T![local]) {542 p.eat(T![local])?;543 Ok(Member::BindStmt(bind(p)?))544 } else if p.at(T![assert]) {545 Ok(Member::AssertStmt(assert_stmt(p)?))546 } else {547 Ok(Member::Field(field(p)?))548 }549}550551fn for_spec(p: &mut Parser<'_>) -> Result<ForSpecData> {552 p.eat(T![for])?;553 let d = destruct(p)?;554 p.eat(T![in])?;555 let over = expr(p)?;556 Ok(ForSpecData { destruct: d, over })557}558559fn compspecs(p: &mut Parser<'_>) -> Result<Vec<CompSpec>> {560 let mut specs = Vec::new();561 specs.push(CompSpec::ForSpec(for_spec(p)?));562 loop {563 if p.at(T![for]) {564 specs.push(CompSpec::ForSpec(for_spec(p)?));565 } else if p.at(T![if]) {566 let isd = if_spec_data(p)?;567 specs.push(CompSpec::IfSpec(isd));568 } else {569 break;570 }571 }572 Ok(specs)573}574575fn objinside(p: &mut Parser<'_>) -> Result<ObjBody> {576 if p.at(T!['}']) {577 return Ok(ObjBody::MemberList(ObjMembers {578 locals: Rc::new(Vec::new()),579 asserts: Rc::new(Vec::new()),580 fields: Vec::new(),581 }));582 }583584 let mut members = Vec::new();585 loop {586 members.push(member(p)?);587 if !p.try_eat(T![,]) {588 break;589 }590 if p.at(T!['}']) || p.at(T![for]) {591 break;592 }593 }594595 if p.at(T![for]) {596 let specs = compspecs(p)?;597 let mut locals = Vec::new();598 let mut field_member = None;599 for m in members {600 match m {601 Member::Field(f) => {602 if field_member.is_some() {603 return Err(604 p.error("object comprehension can only contain one field".into())605 );606 }607 field_member = Some(f);608 }609 Member::BindStmt(b) => locals.push(b),610 Member::AssertStmt(_) => {611 return Err(p.error("asserts are unsupported in object comprehension".into()));612 }613 }614 }615 Ok(ObjBody::ObjComp(ObjComp {616 locals: Rc::new(locals),617 field: Rc::new(618 field_member.ok_or_else(|| p.error("missing object comprehension field".into()))?,619 ),620 compspecs: specs,621 }))622 } else {623 let mut locals = Vec::new();624 let mut asserts = Vec::new();625 let mut fields = Vec::new();626 for m in members {627 match m {628 Member::Field(f) => fields.push(f),629 Member::BindStmt(b) => locals.push(b),630 Member::AssertStmt(a) => asserts.push(a),631 }632 }633 Ok(ObjBody::MemberList(ObjMembers {634 locals: Rc::new(locals),635 asserts: Rc::new(asserts),636 fields,637 }))638 }639}640641#[allow(clippy::too_many_lines)]642fn expr_basic(p: &mut Parser<'_>) -> Result<Expr> {643 if let Some(lit) = literal(p) {644 return Ok(Expr::Literal(lit));645 }646647 match p.peek() {648 SyntaxKind::STRING_DOUBLE649 | SyntaxKind::STRING_SINGLE650 | SyntaxKind::STRING_DOUBLE_VERBATIM651 | SyntaxKind::STRING_SINGLE_VERBATIM652 | SyntaxKind::STRING_BLOCK => Ok(Expr::Str(parse_string_content(p)?)),653654 SyntaxKind::FLOAT => Ok(Expr::Num(parse_number(p)?)),655656 T!['('] => {657 p.eat(T!['('])?;658 let e = expr(p)?;659 p.eat(T![')'])?;660 Ok(e)661 }662663 T!['['] => {664 p.eat(T!['['])?;665 if p.at(T![']']) {666 p.eat(T![']'])?;667 return Ok(Expr::Arr(Rc::new(Vec::new())));668 }669 let first = expr(p)?;670 if p.at(T![for]) {671 let specs = compspecs(p)?;672 p.eat(T![']'])?;673 Ok(Expr::ArrComp(Rc::new(first), specs))674 } else if p.at(T![,]) && {675 let next = p.offset + 1;676 next < p.lexemes.len() && p.lexemes[next].kind == T![for]677 } {678 p.eat(T![,])?;679 let specs = compspecs(p)?;680 p.eat(T![']'])?;681 Ok(Expr::ArrComp(Rc::new(first), specs))682 } else {683 let mut elems = vec![first];684 while p.try_eat(T![,]) {685 if p.at(T![']']) {686 break;687 }688 elems.push(expr(p)?);689 }690 p.eat(T![']'])?;691 Ok(Expr::Arr(Rc::new(elems)))692 }693 }694695 T!['{'] => {696 p.eat(T!['{'])?;697 let body = objinside(p)?;698 p.eat(T!['}'])?;699 Ok(Expr::Obj(body))700 }701702 T![local] => {703 p.eat(T![local])?;704 let mut binds = Vec::new();705 loop {706 binds.push(bind(p)?);707 if !p.try_eat(T![,]) {708 break;709 }710 }711 p.eat(T![;])?;712 let body = expr(p)?;713 Ok(Expr::LocalExpr(binds, Box::new(body)))714 }715716 T![if] => Ok(Expr::IfElse(Box::new(if_else(p)?))),717718 T![function] => {719 p.eat(T![function])?;720 p.eat(T!['('])?;721 let ps = params(p)?;722 p.eat(T![')'])?;723 let body = expr(p)?;724 Ok(Expr::Function(ps, Rc::new(body)))725 }726727 T![assert] => {728 let a = assert_stmt(p)?;729 p.eat(T![;])?;730 let rest = expr(p)?;731 Ok(Expr::AssertExpr(Rc::new(AssertExpr { assert: a, rest })))732 }733734 T![error] => {735 let span = spanned(p, |p| p.eat(T![error]))?;736 let e = expr(p)?;737 Ok(Expr::ErrorStmt(span.span, Box::new(e)))738 }739740 T![importstr] => {741 let kind = spanned(p, |p| {742 p.eat(T![importstr])?;743 Ok(ImportKind::Str)744 })?;745 let path = expr(p)?;746 Ok(Expr::Import(kind, Box::new(path)))747 }748749 T![importbin] => {750 let kind = spanned(p, |p| {751 p.eat(T![importbin])?;752 Ok(ImportKind::Bin)753 })?;754 let path = expr(p)?;755 Ok(Expr::Import(kind, Box::new(path)))756 }757758 T![import] => {759 let kind = spanned(p, |p| {760 p.eat(T![import])?;761 Ok(ImportKind::Normal)762 })?;763 let path = expr(p)?;764 Ok(Expr::Import(kind, Box::new(path)))765 }766767 SyntaxKind::IDENT => {768 let n = spanned(p, |p| {769 let s: IStr = p.text().into();770 p.eat_any();771 Ok(s)772 })?;773 Ok(Expr::Var(n))774 }775776 _ => Err(p.error(format!("unexpected {}", p.current_desc()))),777 }778}779780fn flush_index_parts(e: &mut Expr, parts: &mut Vec<IndexPart>) {781 if parts.is_empty() {782 return;783 }784 let old = std::mem::replace(e, Expr::Literal(LiteralType::Null));785 *e = Expr::Index {786 indexable: Box::new(old),787 parts: std::mem::take(parts),788 };789}790791fn expr_suffix(p: &mut Parser<'_>) -> Result<Expr> {792 let mut e = expr_basic(p)?;793 // Accumulate consecutive index parts (.field, [expr], ?.field, ?.[expr])794 // into a single Expr::Index. This is critical for null-coalesce semantics:795 // a?.b.c needs all parts in one Index so the evaluator can skip .c when .b is null.796 let mut parts: Vec<IndexPart> = Vec::new();797798 loop {799 #[cfg(feature = "exp-null-coaelse")]800 if p.at(T![?]) {801 p.eat_any();802 if p.try_eat(T![.]) {803 if p.at(T!['[']) {804 // ?.[expr]805 p.eat(T!['['])?;806 let idx = spanned(p, expr)?;807 p.eat(T![']'])?;808 parts.push(IndexPart {809 span: idx.span,810 value: idx.value,811 null_coaelse: true,812 });813 } else {814 // ?.field815 let id_spanned = spanned(p, |p| Ok(Expr::Str(ident(p)?)))?;816 parts.push(IndexPart {817 span: id_spanned.span,818 value: id_spanned.value,819 null_coaelse: true,820 });821 }822 } else {823 return Err(p.error("expected '.' after '?'".into()));824 }825 continue;826 }827828 if p.at(T![.]) {829 p.eat(T![.])?;830 let id_spanned = spanned(p, |p| Ok(Expr::Str(ident(p)?)))?;831 parts.push(IndexPart {832 span: id_spanned.span,833 value: id_spanned.value,834 #[cfg(feature = "exp-null-coaelse")]835 null_coaelse: false,836 });837 } else if p.at(T!['[']) {838 p.eat(T!['['])?;839840 if p.at(T![:]) {841 // Slice: flush index parts first, then handle slice842 flush_index_parts(&mut e, &mut parts);843 let slice = slice_desc(p, None)?;844 p.eat(T![']'])?;845 e = Expr::Slice(Box::new(Slice { value: e, slice }));846 } else {847 let idx = spanned(p, expr)?;848 if p.at(T![:]) {849 // Slice with start: flush index parts first850 flush_index_parts(&mut e, &mut parts);851 let slice = slice_desc(p, Some(idx))?;852 p.eat(T![']'])?;853 e = Expr::Slice(Box::new(Slice { value: e, slice }));854 } else {855 // Bracket index: add to parts856 p.eat(T![']'])?;857 parts.push(IndexPart {858 span: idx.span,859 value: idx.value,860 #[cfg(feature = "exp-null-coaelse")]861 null_coaelse: false,862 });863 }864 }865 } else if p.at(T!['(']) {866 flush_index_parts(&mut e, &mut parts);867 let args_spanned = spanned(p, |p| {868 p.eat(T!['('])?;869 let a = args(p)?;870 p.eat(T![')'])?;871 Ok(a)872 })?;873 let tailstrict = p.try_eat(T![tailstrict]);874 e = Expr::Apply(Box::new(e), args_spanned, tailstrict);875 } else if p.at(T!['{']) {876 flush_index_parts(&mut e, &mut parts);877 p.eat(T!['{'])?;878 let body = objinside(p)?;879 p.eat(T!['}'])?;880 e = Expr::ObjExtend(Rc::new(e), body);881 } else {882 break;883 }884 }885886 flush_index_parts(&mut e, &mut parts);887 Ok(e)888}889890fn prefix_binding_power(op: UnaryOpType) -> u8 {891 match op {892 UnaryOpType::Plus | UnaryOpType::Minus | UnaryOpType::Not | UnaryOpType::BitNot => 20,893 }894}895896fn infix_binding_power(op: BinaryOpType) -> (u8, u8) {897 match op {898 BinaryOpType::Or => (2, 3),899 #[cfg(feature = "exp-null-coaelse")]900 BinaryOpType::NullCoaelse => (2, 3),901 BinaryOpType::And => (4, 5),902 BinaryOpType::BitOr => (6, 7),903 BinaryOpType::BitXor => (8, 9),904 BinaryOpType::BitAnd => (10, 11),905 BinaryOpType::Eq | BinaryOpType::Neq => (12, 13),906 BinaryOpType::Lt907 | BinaryOpType::Gt908 | BinaryOpType::Lte909 | BinaryOpType::Gte910 | BinaryOpType::In => (14, 15),911 BinaryOpType::Lhs | BinaryOpType::Rhs => (16, 17),912 BinaryOpType::Add | BinaryOpType::Sub => (18, 19),913 BinaryOpType::Mul | BinaryOpType::Div | BinaryOpType::Mod => (20, 21),914 }915}916917fn unary_op(kind: SyntaxKind) -> Option<UnaryOpType> {918 match kind {919 T![+] => Some(UnaryOpType::Plus),920 T![-] => Some(UnaryOpType::Minus),921 T![!] => Some(UnaryOpType::Not),922 T![~] => Some(UnaryOpType::BitNot),923 _ => None,924 }925}926927fn binary_op(p: &Parser<'_>) -> Option<BinaryOpType> {928 match p.peek() {929 T![||] => Some(BinaryOpType::Or),930 T![&&] => Some(BinaryOpType::And),931 T![|] => Some(BinaryOpType::BitOr),932 T![^] => Some(BinaryOpType::BitXor),933 T![&] => Some(BinaryOpType::BitAnd),934 T![==] => Some(BinaryOpType::Eq),935 T![!=] => Some(BinaryOpType::Neq),936 T![<] => Some(BinaryOpType::Lt),937 T![>] => Some(BinaryOpType::Gt),938 T![<=] => Some(BinaryOpType::Lte),939 T![>=] => Some(BinaryOpType::Gte),940 T![<<] => Some(BinaryOpType::Lhs),941 T![>>] => Some(BinaryOpType::Rhs),942 T![+] => Some(BinaryOpType::Add),943 T![-] => Some(BinaryOpType::Sub),944 T![*] => Some(BinaryOpType::Mul),945 T![/] => Some(BinaryOpType::Div),946 T![%] => Some(BinaryOpType::Mod),947 T![in] => Some(BinaryOpType::In),948 #[cfg(feature = "exp-null-coaelse")]949 T![??] => Some(BinaryOpType::NullCoaelse),950 _ => None,951 }952}953954fn expr_bp(p: &mut Parser<'_>, min_bp: u8) -> Result<Expr> {955 let mut lhs = if let Some(op) = unary_op(p.peek()) {956 p.eat_any();957 let rbp = prefix_binding_power(op);958 let rhs = expr_bp(p, rbp)?;959 Expr::UnaryOp(op, Box::new(rhs))960 } else {961 expr_suffix(p)?962 };963964 loop {965 if p.at_eof() {966 break;967 }968969 let Some(op) = binary_op(p) else {970 break;971 };972973 let (lbp, rbp) = infix_binding_power(op);974 if lbp < min_bp {975 break;976 }977978 p.eat_any();979 let rhs = expr_bp(p, rbp)?;980 lhs = Expr::BinaryOp(Box::new(BinaryOp { lhs, op, rhs }));981 }982983 Ok(lhs)984}985986fn expr(p: &mut Parser<'_>) -> Result<Expr> {987 expr_bp(p, 0)988}989990pub fn parse(str: &str, settings: &ParserSettings) -> Result<Expr> {991 let mut p = Parser::new(str, settings.source.clone());992 for lexeme in &p.lexemes {993 if let Some(desc) = lexeme.kind.error_description() {994 return Err(ParseError {995 message: desc.to_owned(),996 location: lexeme.range,997 });998 }999 }1000 let e = expr(&mut p)?;1001 if !p.at_eof() {1002 return Err(p.error(format!("expected end of file, got {}", p.current_desc(),)));1003 }1004 Ok(e)1005}10061007pub fn string_to_expr(s: IStr, settings: &ParserSettings) -> Spanned<Expr> {1008 let len = u32::try_from(s.len()).expect("code size is limited by 4gb");10091010 Spanned::new(Expr::Str(s), Span(settings.source.clone(), 0, len))1011}10121013#[cfg(test)]1014mod tests {1015 use std::fs;10161017 use insta::{assert_snapshot, glob};1018 use jrsonnet_ir::{IStr, Source};10191020 use super::*;10211022 fn parse_str(input: &str) -> Expr {1023 let source = Source::new_virtual("<test>".into(), input.into());1024 let settings = ParserSettings { source };1025 parse(input, &settings).unwrap()1026 }10271028 #[test]1029 #[cfg(not(feature = "exp-null-coaelse"))]1030 fn basic_test() {1031 let v = parse_str("assert true[false] : false ; true");1032 assert_snapshot!(format!("{v:#?}"));1033 }10341035 #[test]1036 fn literals() {1037 let v = parse_str("[null, true, false, self, super, $]");1038 assert_snapshot!(format!("{v:#?}"));1039 }10401041 #[test]1042 fn basic_math() {1043 let v = parse_str("2+2*2");1044 assert_snapshot!(format!("{v:#?}"));1045 }10461047 #[test]1048 fn underscore_numbers() {1049 let v = parse_str("[1_000, 1_000.000_1, 1_0e1_0]");1050 assert_snapshot!(format!("{v:#?}"));1051 }10521053 #[test]1054 fn strings() {1055 let v = parse_str(r#"["hello", 'world', @"raw""str", @'raw''str']"#);1056 assert_snapshot!(format!("{v:#?}"));1057 }10581059 #[test]1060 fn object() {1061 let v = parse_str("{a: 1, b:: 2, c::: 3}");1062 assert_snapshot!(format!("{v:#?}"));1063 }10641065 #[test]1066 fn function_and_call() {1067 let v = parse_str("local f(x, y=1) = x + y; f(2, y=3)");1068 assert_snapshot!(format!("{v:#?}"));1069 }10701071 #[test]1072 fn if_then_else() {1073 let v = parse_str("if true then 1 else 2");1074 assert_snapshot!(format!("{v:#?}"));1075 }10761077 #[test]1078 fn imports() {1079 let v = parse_str(r#"[import "a", importstr "b", importbin "c"]"#);1080 assert_snapshot!(format!("{v:#?}"));1081 }10821083 #[test]1084 fn array_comp() {1085 let v = parse_str("[x for x in arr]");1086 assert_snapshot!(format!("{v:#?}"));1087 }10881089 #[test]1090 #[cfg(not(feature = "exp-null-coaelse"))]1091 fn index_and_suffix() {1092 let v = parse_str("std.test(2).field[0]");1093 assert_snapshot!(format!("{v:#?}"));1094 }10951096 #[test]1097 fn obj_extend() {1098 let v = parse_str("{} { x: 1 }");1099 assert_snapshot!(format!("{v:#?}"));1100 }11011102 #[test]1103 fn unary_ops() {1104 let v = parse_str("!a && !b");1105 assert_snapshot!(format!("{v:#?}"));1106 }11071108 #[test]1109 fn error_expr() {1110 let v = parse_str("error \"bad\"");1111 assert_snapshot!(format!("{v:#?}"));1112 }11131114 #[test]1115 fn slice() {1116 let v = parse_str("[a[1:], a[1::], a[:1:], a[::1]]");1117 assert_snapshot!(format!("{v:#?}"));1118 }11191120 #[test]1121 #[cfg(not(feature = "exp-null-coaelse"))]1122 fn peg_snapshots() {1123 glob!("../../jrsonnet-peg-parser/src", "tests/*.jsonnet", |path| {1124 let input = fs::read_to_string(path).expect("read test file");1125 let source = Source::new_virtual("<test>".into(), IStr::empty());1126 let settings = ParserSettings { source };1127 let v = parse(&input, &settings).unwrap();1128 let v = format!("{v:#?}");1129 assert_snapshot!(v);1130 });1131 }1132}1use std::rc::Rc;23use jrsonnet_gcmodule::Acyclic;4use jrsonnet_ir::{5 ArgsDesc, AssertExpr, AssertStmt, BinaryOp, BinaryOpType, BindSpec, CompSpec, Destruct, Expr,6 ExprParam, ExprParams, FieldMember, FieldName, ForSpecData, IStr, IfElse, IfSpecData,7 ImportKind, IndexPart, LiteralType, Member, ObjBody, ObjComp, ObjMembers, Slice, SliceDesc,8 Source, Span, Spanned, UnaryOpType, Visibility, unescape,9};10use jrsonnet_lexer::{Lexeme, Lexer, Span as LexSpan, SyntaxKind, T, collect_lexed_str_block};1112pub struct ParserSettings {13 pub source: Source,14}1516#[derive(Debug, Clone)]17pub struct ParseError {18 pub message: String,19 pub location: LexSpan,20}2122impl std::fmt::Display for ParseError {23 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {24 write!(f, "{}", self.message)25 }26}2728type Result<T> = std::result::Result<T, ParseError>;2930struct Parser<'a> {31 lexemes: Vec<Lexeme<'a>>,32 offset: usize,33 source: Source,34}3536impl<'a> Parser<'a> {37 fn new(code: &'a str, source: Source) -> Self {38 Self {39 lexemes: Lexer::new(code)40 .filter(|l| {41 !matches!(42 l.kind,43 SyntaxKind::WHITESPACE44 | SyntaxKind::SINGLE_LINE_SLASH_COMMENT45 | SyntaxKind::SINGLE_LINE_HASH_COMMENT46 | SyntaxKind::MULTI_LINE_COMMENT47 )48 })49 .collect(),50 offset: 0,51 source,52 }53 }5455 fn peek(&self) -> SyntaxKind {56 if self.at_eof() {57 SyntaxKind::EOF58 } else {59 self.lexemes[self.offset].kind60 }61 }6263 fn text(&self) -> &'a str {64 self.lexemes[self.offset].text65 }6667 fn at(&self, kind: SyntaxKind) -> bool {68 !self.at_eof() && self.peek() == kind69 }7071 fn eat_any(&mut self) {72 self.offset += 1;73 }7475 fn at_eof(&self) -> bool {76 self.offset >= self.lexemes.len()77 }7879 fn try_eat(&mut self, t: SyntaxKind) -> bool {80 if self.at(t) {81 self.eat_any();82 return true;83 }84 false85 }8687 fn current_desc(&self) -> String {88 if self.at_eof() {89 return "end of file".to_owned();90 }91 let kind = self.peek();92 let text = self.text();93 let name = kind.display_name();94 if matches!(kind, SyntaxKind::IDENT | SyntaxKind::FLOAT) {95 format!("{name} \"{text}\"")96 } else {97 name.to_owned()98 }99 }100101 fn eat(&mut self, t: SyntaxKind) -> Result<()> {102 if !self.at(t) {103 return Err(self.error(format!(104 "expected {}, got {}",105 t.display_name(),106 self.current_desc(),107 )));108 }109 self.eat_any();110 Ok(())111 }112113 fn span_start(&self) -> u32 {114 if self.at_eof() {115 if let Some(last) = self.lexemes.last() {116 return last.range.1;117 }118 return 0;119 }120 self.lexemes[self.offset].range.0121 }122123 fn span_end(&self) -> u32 {124 self.lexemes[self.offset - 1].range.1125 }126127 fn error(&self, message: String) -> ParseError {128 ParseError {129 location: self.lexemes[self.offset].range,130 message,131 }132 }133}134135fn spanned<T: Acyclic>(136 p: &mut Parser<'_>,137 cb: impl FnOnce(&mut Parser<'_>) -> Result<T>,138) -> Result<Spanned<T>> {139 let start = p.span_start();140 let v = cb(p)?;141 let end = p.span_end();142 Ok(Spanned::new(v, Span(p.source.clone(), start, end)))143}144145fn parse_string_content(p: &mut Parser<'_>) -> Result<IStr> {146 let kind = p.peek();147 let text = p.text();148 let s = match kind {149 SyntaxKind::STRING_DOUBLE => {150 let inner = &text[1..text.len() - 1];151 unescape::unescape(inner).ok_or_else(|| p.error("invalid string escape".into()))?152 }153 SyntaxKind::STRING_SINGLE => {154 let inner = &text[1..text.len() - 1];155 unescape::unescape(inner).ok_or_else(|| p.error("invalid string escape".into()))?156 }157 SyntaxKind::STRING_DOUBLE_VERBATIM => {158 let inner = &text[2..text.len() - 1];159 inner.replace("\"\"", "\"")160 }161 SyntaxKind::STRING_SINGLE_VERBATIM => {162 let inner = &text[2..text.len() - 1];163 inner.replace("''", "'")164 }165 SyntaxKind::STRING_BLOCK => {166 let inner = &text[3..];167 let collected = collect_lexed_str_block(inner)168 .map_err(|_| p.error("invalid string block".into()))?;169 let mut result = String::new();170 for (i, line) in collected.lines.iter().enumerate() {171 if i > 0 {172 result.push('\n');173 }174 result.push_str(line);175 }176 if !collected.truncate {177 result.push('\n');178 }179 result180 }181 _ => return Err(p.error(format!("expected string, got {}", p.current_desc()))),182 };183 p.eat_any();184 Ok(s.into())185}186187fn is_string_token(kind: SyntaxKind) -> bool {188 matches!(189 kind,190 SyntaxKind::STRING_DOUBLE191 | SyntaxKind::STRING_SINGLE192 | SyntaxKind::STRING_DOUBLE_VERBATIM193 | SyntaxKind::STRING_SINGLE_VERBATIM194 | SyntaxKind::STRING_BLOCK195 )196}197198fn parse_number(p: &mut Parser<'_>) -> Result<f64> {199 let text = p.text();200 let n: f64 = text201 .replace('_', "")202 .parse()203 .map_err(|_| p.error(format!("invalid number literal: {text}")))?;204 if !n.is_finite() {205 return Err(p.error("numbers are finite".into()));206 }207 p.eat_any();208 Ok(n)209}210211fn ident(p: &mut Parser<'_>) -> Result<IStr> {212 let text = p.text();213 p.eat(SyntaxKind::IDENT)?;214 Ok(IStr::from(text))215}216217fn literal(p: &mut Parser<'_>) -> Option<LiteralType> {218 let t = match p.peek() {219 T![self] => LiteralType::This,220 T![super] => LiteralType::Super,221 T!['$'] => LiteralType::Dollar,222 T![null] => LiteralType::Null,223 T![true] => LiteralType::True,224 T![false] => LiteralType::False,225 _ => return None,226 };227 p.eat_any();228 Some(t)229}230231fn assert_stmt(p: &mut Parser<'_>) -> Result<AssertStmt> {232 p.eat(T![assert])?;233 let cond = spanned(p, expr)?;234 let msg = if p.try_eat(T![:]) {235 Some(spanned(p, expr)?)236 } else {237 None238 };239 Ok(AssertStmt(cond, msg))240}241242fn if_spec_data(p: &mut Parser<'_>) -> Result<IfSpecData> {243 let v = spanned(p, |p| p.eat(T![if]))?;244 let cond = expr(p)?;245 Ok(IfSpecData { span: v.span, cond })246}247248fn if_else(p: &mut Parser<'_>) -> Result<IfElse> {249 let cond = if_spec_data(p)?;250 p.eat(T![then])?;251 let cond_then = expr(p)?;252 let cond_else = if p.try_eat(T![else]) {253 Some(expr(p)?)254 } else {255 None256 };257 Ok(IfElse {258 cond,259 cond_then,260 cond_else,261 })262}263264fn slice_desc(p: &mut Parser<'_>, start: Option<Spanned<Expr>>) -> Result<SliceDesc> {265 p.eat(T![:])?;266 let end = if !p.at(T![:]) && !p.at(T![']']) {267 Some(spanned(p, expr)?)268 } else {269 None270 };271 let step = if p.try_eat(T![:]) {272 if p.at(T![']']) {273 None274 } else {275 Some(spanned(p, expr)?)276 }277 } else {278 None279 };280 Ok(SliceDesc { start, end, step })281}282283fn destruct(p: &mut Parser<'_>) -> Result<Destruct> {284 if p.at(SyntaxKind::IDENT) {285 return Ok(Destruct::Full(ident(p)?));286 }287 #[cfg(not(feature = "exp-destruct"))]288 return Err(p.error(format!("expected identifier, got {}", p.current_desc())));289 #[cfg(feature = "exp-destruct")]290 {291 if p.try_eat(T![?]) {292 return Ok(Destruct::Skip);293 }294 if p.at(T!['[']) {295 return destruct_array(p);296 }297 if p.at(T!['{']) {298 return destruct_object(p);299 }300 Err(p.error(format!(301 "expected destructure pattern, got {}",302 p.current_desc()303 )))304 }305}306307#[cfg(feature = "exp-destruct")]308fn destruct_rest(p: &mut Parser<'_>) -> Result<jrsonnet_ir::DestructRest> {309 p.eat(T![...])?;310 if p.at(SyntaxKind::IDENT) {311 Ok(jrsonnet_ir::DestructRest::Keep(ident(p)?))312 } else {313 Ok(jrsonnet_ir::DestructRest::Drop)314 }315}316317#[cfg(feature = "exp-destruct")]318fn destruct_array(p: &mut Parser<'_>) -> Result<Destruct> {319 p.eat(T!['['])?;320 let mut start = Vec::new();321 let mut rest = None;322 let mut end = Vec::new();323 if !p.at(T![']']) {324 loop {325 if p.at(T![...]) {326 rest = Some(destruct_rest(p)?);327 if p.try_eat(T![,]) {328 if !p.at(T![']']) {329 loop {330 end.push(destruct(p)?);331 if !p.try_eat(T![,]) {332 break;333 }334 if p.at(T![']']) {335 break;336 }337 }338 }339 }340 break;341 }342 start.push(destruct(p)?);343 if !p.try_eat(T![,]) {344 break;345 }346 if p.at(T![']']) {347 break;348 }349 }350 }351 p.eat(T![']'])?;352 Ok(Destruct::Array { start, rest, end })353}354355#[cfg(feature = "exp-destruct")]356fn destruct_object(p: &mut Parser<'_>) -> Result<Destruct> {357 p.eat(T!['{'])?;358 let mut fields = Vec::new();359 let mut rest = None;360 if !p.at(T!['}']) {361 loop {362 if p.at(T![...]) {363 rest = Some(destruct_rest(p)?);364 p.try_eat(T![,]);365 break;366 }367 let name = ident(p)?;368 let into = if p.try_eat(T![:]) {369 Some(destruct(p)?)370 } else {371 None372 };373 let default = if p.try_eat(T![=]) {374 Some(Rc::new(spanned(p, expr)?))375 } else {376 None377 };378 fields.push((name, into, default));379 if !p.try_eat(T![,]) {380 break;381 }382 if p.at(T!['}']) {383 break;384 }385 }386 }387 p.eat(T!['}'])?;388 Ok(Destruct::Object { fields, rest })389}390391fn params(p: &mut Parser<'_>) -> Result<ExprParams> {392 if p.at(T![')']) {393 return Ok(ExprParams::new(Vec::new()));394 }395 let mut result = Vec::new();396 loop {397 let d = destruct(p)?;398 let default = if p.try_eat(T![=]) {399 Some(Rc::new(expr(p)?))400 } else {401 None402 };403 result.push(ExprParam {404 destruct: d,405 default,406 });407 if !p.try_eat(T![,]) {408 break;409 }410 if p.at(T![')']) {411 break;412 }413 }414 Ok(ExprParams::new(result))415}416417fn args(p: &mut Parser<'_>) -> Result<ArgsDesc> {418 if p.at(T![')']) {419 return Ok(ArgsDesc::new(Vec::new(), Vec::new(), Vec::new()));420 }421 let mut unnamed = Vec::new();422 let mut names = Vec::new();423 let mut values = Vec::new();424 let mut named_started = false;425 loop {426 let is_named = p.at(SyntaxKind::IDENT) && {427 let next_offset = p.offset + 1;428 next_offset < p.lexemes.len() && p.lexemes[next_offset].kind == T![=]429 };430 if is_named {431 let name: IStr = ident(p)?;432 p.eat(T![=])?;433 let value = Rc::new(expr(p)?);434435 names.push(name);436 values.push(value);437 named_started = true;438 } else {439 if named_started {440 return Err(p.error("positional argument after named argument".into()));441 }442 unnamed.push(Rc::new(expr(p)?));443 }444 if !p.try_eat(T![,]) {445 break;446 }447 if p.at(T![')']) {448 break;449 }450 }451 Ok(ArgsDesc::new(unnamed, names, values))452}453454fn bind(p: &mut Parser<'_>) -> Result<BindSpec> {455 #[cfg(feature = "exp-destruct")]456 {457 if !p.at(SyntaxKind::IDENT) {458 let d = destruct(p)?;459 p.eat(T![=])?;460 let value = Rc::new(expr(p)?);461 return Ok(BindSpec::Field { into: d, value });462 }463 }464 let name = ident(p)?;465 if p.try_eat(T!['(']) {466 let ps = params(p)?;467 p.eat(T![')'])?;468 p.eat(T![=])?;469 let value = Rc::new(expr(p)?);470 Ok(BindSpec::Function {471 name,472 params: ps,473 value,474 })475 } else {476 p.eat(T![=])?;477 let value = Rc::new(expr(p)?);478 Ok(BindSpec::Field {479 into: Destruct::Full(name),480 value,481 })482 }483}484485fn visibility(p: &mut Parser<'_>) -> Result<Visibility> {486 p.eat(T![:])?;487 if p.try_eat(T![:]) {488 if p.try_eat(T![:]) {489 Ok(Visibility::Unhide)490 } else {491 Ok(Visibility::Hidden)492 }493 } else {494 Ok(Visibility::Normal)495 }496}497498fn field_name(p: &mut Parser<'_>) -> Result<FieldName> {499 if p.at(SyntaxKind::IDENT) {500 Ok(FieldName::Fixed(ident(p)?))501 } else if is_string_token(p.peek()) {502 Ok(FieldName::Fixed(parse_string_content(p)?))503 } else if p.at(T!['[']) {504 p.eat(T!['['])?;505 let e = expr(p)?;506 p.eat(T![']'])?;507 Ok(FieldName::Dyn(e))508 } else {509 Err(p.error(format!("expected field name, got {}", p.current_desc())))510 }511}512513fn field(p: &mut Parser<'_>) -> Result<FieldMember> {514 let name = spanned(p, field_name)?;515516 if p.at(T!['(']) {517 p.eat(T!['('])?;518 let ps = params(p)?;519 p.eat(T![')'])?;520 let vis = visibility(p)?;521 let value = Rc::new(expr(p)?);522 Ok(FieldMember {523 name,524 plus: false,525 params: Some(ps),526 visibility: vis,527 value,528 })529 } else {530 let plus = p.try_eat(T![+]);531 let vis = visibility(p)?;532 let value = Rc::new(expr(p)?);533 Ok(FieldMember {534 name,535 plus,536 params: None,537 visibility: vis,538 value,539 })540 }541}542543fn member(p: &mut Parser<'_>) -> Result<Member> {544 if p.at(T![local]) {545 p.eat(T![local])?;546 Ok(Member::BindStmt(bind(p)?))547 } else if p.at(T![assert]) {548 Ok(Member::AssertStmt(assert_stmt(p)?))549 } else {550 Ok(Member::Field(field(p)?))551 }552}553554fn for_spec(p: &mut Parser<'_>) -> Result<ForSpecData> {555 p.eat(T![for])?;556 let d = destruct(p)?;557 p.eat(T![in])?;558 let over = expr(p)?;559 Ok(ForSpecData { destruct: d, over })560}561562fn compspecs(p: &mut Parser<'_>) -> Result<Vec<CompSpec>> {563 let mut specs = Vec::new();564 specs.push(CompSpec::ForSpec(for_spec(p)?));565 loop {566 if p.at(T![for]) {567 specs.push(CompSpec::ForSpec(for_spec(p)?));568 } else if p.at(T![if]) {569 let isd = if_spec_data(p)?;570 specs.push(CompSpec::IfSpec(isd));571 } else {572 break;573 }574 }575 Ok(specs)576}577578fn objinside(p: &mut Parser<'_>) -> Result<ObjBody> {579 if p.at(T!['}']) {580 return Ok(ObjBody::MemberList(ObjMembers {581 locals: Rc::new(Vec::new()),582 asserts: Rc::new(Vec::new()),583 fields: Vec::new(),584 }));585 }586587 let mut members = Vec::new();588 loop {589 members.push(member(p)?);590 if !p.try_eat(T![,]) {591 break;592 }593 if p.at(T!['}']) || p.at(T![for]) {594 break;595 }596 }597598 if p.at(T![for]) {599 let specs = compspecs(p)?;600 let mut locals = Vec::new();601 let mut field_member = None;602 for m in members {603 match m {604 Member::Field(f) => {605 if field_member.is_some() {606 return Err(607 p.error("object comprehension can only contain one field".into())608 );609 }610 field_member = Some(f);611 }612 Member::BindStmt(b) => locals.push(b),613 Member::AssertStmt(_) => {614 return Err(p.error("asserts are unsupported in object comprehension".into()));615 }616 }617 }618 Ok(ObjBody::ObjComp(ObjComp {619 locals: Rc::new(locals),620 field: Rc::new(621 field_member.ok_or_else(|| p.error("missing object comprehension field".into()))?,622 ),623 compspecs: specs,624 }))625 } else {626 let mut locals = Vec::new();627 let mut asserts = Vec::new();628 let mut fields = Vec::new();629 for m in members {630 match m {631 Member::Field(f) => fields.push(f),632 Member::BindStmt(b) => locals.push(b),633 Member::AssertStmt(a) => asserts.push(a),634 }635 }636 Ok(ObjBody::MemberList(ObjMembers {637 locals: Rc::new(locals),638 asserts: Rc::new(asserts),639 fields,640 }))641 }642}643644#[allow(clippy::too_many_lines)]645fn expr_basic(p: &mut Parser<'_>) -> Result<Expr> {646 if let Some(lit) = literal(p) {647 return Ok(Expr::Literal(lit));648 }649650 match p.peek() {651 SyntaxKind::STRING_DOUBLE652 | SyntaxKind::STRING_SINGLE653 | SyntaxKind::STRING_DOUBLE_VERBATIM654 | SyntaxKind::STRING_SINGLE_VERBATIM655 | SyntaxKind::STRING_BLOCK => Ok(Expr::Str(parse_string_content(p)?)),656657 SyntaxKind::FLOAT => Ok(Expr::Num(parse_number(p)?)),658659 T!['('] => {660 p.eat(T!['('])?;661 let e = expr(p)?;662 p.eat(T![')'])?;663 Ok(e)664 }665666 T!['['] => {667 p.eat(T!['['])?;668 if p.at(T![']']) {669 p.eat(T![']'])?;670 return Ok(Expr::Arr(Rc::new(Vec::new())));671 }672 let first = expr(p)?;673 if p.at(T![for]) {674 let specs = compspecs(p)?;675 p.eat(T![']'])?;676 Ok(Expr::ArrComp(Rc::new(first), specs))677 } else if p.at(T![,]) && {678 let next = p.offset + 1;679 next < p.lexemes.len() && p.lexemes[next].kind == T![for]680 } {681 p.eat(T![,])?;682 let specs = compspecs(p)?;683 p.eat(T![']'])?;684 Ok(Expr::ArrComp(Rc::new(first), specs))685 } else {686 let mut elems = vec![first];687 while p.try_eat(T![,]) {688 if p.at(T![']']) {689 break;690 }691 elems.push(expr(p)?);692 }693 p.eat(T![']'])?;694 Ok(Expr::Arr(Rc::new(elems)))695 }696 }697698 T!['{'] => {699 p.eat(T!['{'])?;700 let body = objinside(p)?;701 p.eat(T!['}'])?;702 Ok(Expr::Obj(body))703 }704705 T![local] => {706 p.eat(T![local])?;707 let mut binds = Vec::new();708 loop {709 binds.push(bind(p)?);710 if !p.try_eat(T![,]) {711 break;712 }713 }714 p.eat(T![;])?;715 let body = expr(p)?;716 Ok(Expr::LocalExpr(binds, Box::new(body)))717 }718719 T![if] => Ok(Expr::IfElse(Box::new(if_else(p)?))),720721 T![function] => {722 p.eat(T![function])?;723 p.eat(T!['('])?;724 let ps = params(p)?;725 p.eat(T![')'])?;726 let body = expr(p)?;727 Ok(Expr::Function(ps, Rc::new(body)))728 }729730 T![assert] => {731 let a = assert_stmt(p)?;732 p.eat(T![;])?;733 let rest = expr(p)?;734 Ok(Expr::AssertExpr(Rc::new(AssertExpr { assert: a, rest })))735 }736737 T![error] => {738 let span = spanned(p, |p| p.eat(T![error]))?;739 let e = expr(p)?;740 Ok(Expr::ErrorStmt(span.span, Box::new(e)))741 }742743 T![importstr] => {744 let kind = spanned(p, |p| {745 p.eat(T![importstr])?;746 Ok(ImportKind::Str)747 })?;748 let path = expr(p)?;749 Ok(Expr::Import(kind, Box::new(path)))750 }751752 T![importbin] => {753 let kind = spanned(p, |p| {754 p.eat(T![importbin])?;755 Ok(ImportKind::Bin)756 })?;757 let path = expr(p)?;758 Ok(Expr::Import(kind, Box::new(path)))759 }760761 T![import] => {762 let kind = spanned(p, |p| {763 p.eat(T![import])?;764 Ok(ImportKind::Normal)765 })?;766 let path = expr(p)?;767 Ok(Expr::Import(kind, Box::new(path)))768 }769770 SyntaxKind::IDENT => {771 let n = spanned(p, |p| {772 let s: IStr = p.text().into();773 p.eat_any();774 Ok(s)775 })?;776 Ok(Expr::Var(n))777 }778779 _ => Err(p.error(format!("unexpected {}", p.current_desc()))),780 }781}782783fn flush_index_parts(e: &mut Expr, parts: &mut Vec<IndexPart>) {784 if parts.is_empty() {785 return;786 }787 let old = std::mem::replace(e, Expr::Literal(LiteralType::Null));788 *e = Expr::Index {789 indexable: Box::new(old),790 parts: std::mem::take(parts),791 };792}793794fn expr_suffix(p: &mut Parser<'_>) -> Result<Expr> {795 let mut e = expr_basic(p)?;796 // Accumulate consecutive index parts (.field, [expr], ?.field, ?.[expr])797 // into a single Expr::Index. This is critical for null-coalesce semantics:798 // a?.b.c needs all parts in one Index so the evaluator can skip .c when .b is null.799 let mut parts: Vec<IndexPart> = Vec::new();800801 loop {802 #[cfg(feature = "exp-null-coaelse")]803 if p.at(T![?]) {804 p.eat_any();805 if p.try_eat(T![.]) {806 if p.at(T!['[']) {807 // ?.[expr]808 p.eat(T!['['])?;809 let idx = spanned(p, expr)?;810 p.eat(T![']'])?;811 parts.push(IndexPart {812 span: idx.span,813 value: idx.value,814 null_coaelse: true,815 });816 } else {817 // ?.field818 let id_spanned = spanned(p, |p| Ok(Expr::Str(ident(p)?)))?;819 parts.push(IndexPart {820 span: id_spanned.span,821 value: id_spanned.value,822 null_coaelse: true,823 });824 }825 } else {826 return Err(p.error("expected '.' after '?'".into()));827 }828 continue;829 }830831 if p.at(T![.]) {832 p.eat(T![.])?;833 let id_spanned = spanned(p, |p| Ok(Expr::Str(ident(p)?)))?;834 parts.push(IndexPart {835 span: id_spanned.span,836 value: id_spanned.value,837 #[cfg(feature = "exp-null-coaelse")]838 null_coaelse: false,839 });840 } else if p.at(T!['[']) {841 p.eat(T!['['])?;842843 if p.at(T![:]) {844 // Slice: flush index parts first, then handle slice845 flush_index_parts(&mut e, &mut parts);846 let slice = slice_desc(p, None)?;847 p.eat(T![']'])?;848 e = Expr::Slice(Box::new(Slice { value: e, slice }));849 } else {850 let idx = spanned(p, expr)?;851 if p.at(T![:]) {852 // Slice with start: flush index parts first853 flush_index_parts(&mut e, &mut parts);854 let slice = slice_desc(p, Some(idx))?;855 p.eat(T![']'])?;856 e = Expr::Slice(Box::new(Slice { value: e, slice }));857 } else {858 // Bracket index: add to parts859 p.eat(T![']'])?;860 parts.push(IndexPart {861 span: idx.span,862 value: idx.value,863 #[cfg(feature = "exp-null-coaelse")]864 null_coaelse: false,865 });866 }867 }868 } else if p.at(T!['(']) {869 flush_index_parts(&mut e, &mut parts);870 let args_spanned = spanned(p, |p| {871 p.eat(T!['('])?;872 let a = args(p)?;873 p.eat(T![')'])?;874 Ok(a)875 })?;876 let tailstrict = p.try_eat(T![tailstrict]);877 e = Expr::Apply(Box::new(e), args_spanned, tailstrict);878 } else if p.at(T!['{']) {879 flush_index_parts(&mut e, &mut parts);880 p.eat(T!['{'])?;881 let body = objinside(p)?;882 p.eat(T!['}'])?;883 e = Expr::ObjExtend(Rc::new(e), body);884 } else {885 break;886 }887 }888889 flush_index_parts(&mut e, &mut parts);890 Ok(e)891}892893fn prefix_binding_power(op: UnaryOpType) -> u8 {894 match op {895 UnaryOpType::Plus | UnaryOpType::Minus | UnaryOpType::Not | UnaryOpType::BitNot => 20,896 }897}898899fn infix_binding_power(op: BinaryOpType) -> (u8, u8) {900 match op {901 BinaryOpType::Or => (2, 3),902 #[cfg(feature = "exp-null-coaelse")]903 BinaryOpType::NullCoaelse => (2, 3),904 BinaryOpType::And => (4, 5),905 BinaryOpType::BitOr => (6, 7),906 BinaryOpType::BitXor => (8, 9),907 BinaryOpType::BitAnd => (10, 11),908 BinaryOpType::Eq | BinaryOpType::Neq => (12, 13),909 BinaryOpType::Lt910 | BinaryOpType::Gt911 | BinaryOpType::Lte912 | BinaryOpType::Gte913 | BinaryOpType::In => (14, 15),914 BinaryOpType::Lhs | BinaryOpType::Rhs => (16, 17),915 BinaryOpType::Add | BinaryOpType::Sub => (18, 19),916 BinaryOpType::Mul | BinaryOpType::Div | BinaryOpType::Mod => (20, 21),917 }918}919920fn unary_op(kind: SyntaxKind) -> Option<UnaryOpType> {921 match kind {922 T![+] => Some(UnaryOpType::Plus),923 T![-] => Some(UnaryOpType::Minus),924 T![!] => Some(UnaryOpType::Not),925 T![~] => Some(UnaryOpType::BitNot),926 _ => None,927 }928}929930fn binary_op(p: &Parser<'_>) -> Option<BinaryOpType> {931 match p.peek() {932 T![||] => Some(BinaryOpType::Or),933 T![&&] => Some(BinaryOpType::And),934 T![|] => Some(BinaryOpType::BitOr),935 T![^] => Some(BinaryOpType::BitXor),936 T![&] => Some(BinaryOpType::BitAnd),937 T![==] => Some(BinaryOpType::Eq),938 T![!=] => Some(BinaryOpType::Neq),939 T![<] => Some(BinaryOpType::Lt),940 T![>] => Some(BinaryOpType::Gt),941 T![<=] => Some(BinaryOpType::Lte),942 T![>=] => Some(BinaryOpType::Gte),943 T![<<] => Some(BinaryOpType::Lhs),944 T![>>] => Some(BinaryOpType::Rhs),945 T![+] => Some(BinaryOpType::Add),946 T![-] => Some(BinaryOpType::Sub),947 T![*] => Some(BinaryOpType::Mul),948 T![/] => Some(BinaryOpType::Div),949 T![%] => Some(BinaryOpType::Mod),950 T![in] => Some(BinaryOpType::In),951 #[cfg(feature = "exp-null-coaelse")]952 T![??] => Some(BinaryOpType::NullCoaelse),953 _ => None,954 }955}956957fn expr_bp(p: &mut Parser<'_>, min_bp: u8) -> Result<Expr> {958 let mut lhs = if let Some(op) = unary_op(p.peek()) {959 p.eat_any();960 let rbp = prefix_binding_power(op);961 let rhs = expr_bp(p, rbp)?;962 Expr::UnaryOp(op, Box::new(rhs))963 } else {964 expr_suffix(p)?965 };966967 loop {968 if p.at_eof() {969 break;970 }971972 let Some(op) = binary_op(p) else {973 break;974 };975976 let (lbp, rbp) = infix_binding_power(op);977 if lbp < min_bp {978 break;979 }980981 p.eat_any();982 let rhs = expr_bp(p, rbp)?;983 lhs = Expr::BinaryOp(Box::new(BinaryOp { lhs, op, rhs }));984 }985986 Ok(lhs)987}988989fn expr(p: &mut Parser<'_>) -> Result<Expr> {990 expr_bp(p, 0)991}992993pub fn parse(str: &str, settings: &ParserSettings) -> Result<Expr> {994 let mut p = Parser::new(str, settings.source.clone());995 for lexeme in &p.lexemes {996 if let Some(desc) = lexeme.kind.error_description() {997 return Err(ParseError {998 message: desc.to_owned(),999 location: lexeme.range,1000 });1001 }1002 }1003 let e = expr(&mut p)?;1004 if !p.at_eof() {1005 return Err(p.error(format!("expected end of file, got {}", p.current_desc(),)));1006 }1007 Ok(e)1008}10091010pub fn string_to_expr(s: IStr, settings: &ParserSettings) -> Spanned<Expr> {1011 let len = u32::try_from(s.len()).expect("code size is limited by 4gb");10121013 Spanned::new(Expr::Str(s), Span(settings.source.clone(), 0, len))1014}10151016#[cfg(test)]1017mod tests {1018 use std::fs;10191020 use insta::{assert_snapshot, glob};1021 use jrsonnet_ir::{IStr, Source};10221023 use super::*;10241025 fn parse_str(input: &str) -> Expr {1026 let source = Source::new_virtual("<test>".into(), input.into());1027 let settings = ParserSettings { source };1028 parse(input, &settings).unwrap()1029 }10301031 #[test]1032 #[cfg(not(feature = "exp-null-coaelse"))]1033 fn basic_test() {1034 let v = parse_str("assert true[false] : false ; true");1035 assert_snapshot!(format!("{v:#?}"));1036 }10371038 #[test]1039 fn literals() {1040 let v = parse_str("[null, true, false, self, super, $]");1041 assert_snapshot!(format!("{v:#?}"));1042 }10431044 #[test]1045 fn basic_math() {1046 let v = parse_str("2+2*2");1047 assert_snapshot!(format!("{v:#?}"));1048 }10491050 #[test]1051 fn underscore_numbers() {1052 let v = parse_str("[1_000, 1_000.000_1, 1_0e1_0]");1053 assert_snapshot!(format!("{v:#?}"));1054 }10551056 #[test]1057 fn strings() {1058 let v = parse_str(r#"["hello", 'world', @"raw""str", @'raw''str']"#);1059 assert_snapshot!(format!("{v:#?}"));1060 }10611062 #[test]1063 fn object() {1064 let v = parse_str("{a: 1, b:: 2, c::: 3}");1065 assert_snapshot!(format!("{v:#?}"));1066 }10671068 #[test]1069 fn function_and_call() {1070 let v = parse_str("local f(x, y=1) = x + y; f(2, y=3)");1071 assert_snapshot!(format!("{v:#?}"));1072 }10731074 #[test]1075 fn if_then_else() {1076 let v = parse_str("if true then 1 else 2");1077 assert_snapshot!(format!("{v:#?}"));1078 }10791080 #[test]1081 fn imports() {1082 let v = parse_str(r#"[import "a", importstr "b", importbin "c"]"#);1083 assert_snapshot!(format!("{v:#?}"));1084 }10851086 #[test]1087 fn array_comp() {1088 let v = parse_str("[x for x in arr]");1089 assert_snapshot!(format!("{v:#?}"));1090 }10911092 #[test]1093 #[cfg(not(feature = "exp-null-coaelse"))]1094 fn index_and_suffix() {1095 let v = parse_str("std.test(2).field[0]");1096 assert_snapshot!(format!("{v:#?}"));1097 }10981099 #[test]1100 fn obj_extend() {1101 let v = parse_str("{} { x: 1 }");1102 assert_snapshot!(format!("{v:#?}"));1103 }11041105 #[test]1106 fn unary_ops() {1107 let v = parse_str("!a && !b");1108 assert_snapshot!(format!("{v:#?}"));1109 }11101111 #[test]1112 fn error_expr() {1113 let v = parse_str("error \"bad\"");1114 assert_snapshot!(format!("{v:#?}"));1115 }11161117 #[test]1118 fn slice() {1119 let v = parse_str("[a[1:], a[1::], a[:1:], a[::1]]");1120 assert_snapshot!(format!("{v:#?}"));1121 }11221123 #[test]1124 #[cfg(not(feature = "exp-null-coaelse"))]1125 fn peg_snapshots() {1126 glob!("../../jrsonnet-peg-parser/src", "tests/*.jsonnet", |path| {1127 let input = fs::read_to_string(path).expect("read test file");1128 let source = Source::new_virtual("<test>".into(), IStr::empty());1129 let settings = ParserSettings { source };1130 let v = parse(&input, &settings).unwrap();1131 let v = format!("{v:#?}");1132 assert_snapshot!(v);1133 });1134 }1135}crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__function_and_call.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__function_and_call.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__function_and_call.snap
@@ -66,12 +66,12 @@
2.0,
),
],
- named: [
- (
- "y",
- Num(
- 3.0,
- ),
+ names: [
+ "y",
+ ],
+ values: [
+ Num(
+ 3.0,
),
],
} from virtual:<test>:26-34,
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__index_and_suffix.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__index_and_suffix.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__index_and_suffix.snap
@@ -23,7 +23,8 @@
2.0,
),
],
- named: [],
+ names: [],
+ values: [],
} from virtual:<test>:8-11,
false,
),
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@array_comp.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@array_comp.jsonnet.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@array_comp.jsonnet.snap
@@ -26,7 +26,8 @@
"x" from virtual:<test>:16-17,
),
],
- named: [],
+ names: [],
+ values: [],
} from virtual:<test>:15-18,
false,
),
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@reserved.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@reserved.jsonnet.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@reserved.jsonnet.snap
@@ -24,7 +24,8 @@
"null_fields" from virtual:<test>:20-31,
),
],
- named: [],
+ names: [],
+ values: [],
} from virtual:<test>:16-32,
false,
),
crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@suffix.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@suffix.jsonnet.snap
+++ b/crates/jrsonnet-ir-parser/src/snapshots/jrsonnet_ir_parser__tests__peg_snapshots@suffix.jsonnet.snap
@@ -28,7 +28,8 @@
2.0,
),
],
- named: [],
+ names: [],
+ values: [],
} from virtual:<test>:15-18,
false,
),
@@ -52,7 +53,8 @@
2.0,
),
],
- named: [],
+ names: [],
+ values: [],
} from virtual:<test>:28-31,
false,
),
crates/jrsonnet-ir/src/expr.rsdiffbeforeafterboth--- a/crates/jrsonnet-ir/src/expr.rs
+++ b/crates/jrsonnet-ir/src/expr.rs
@@ -195,11 +195,16 @@
#[derive(Debug, PartialEq, Acyclic)]
pub struct ArgsDesc {
pub unnamed: Vec<Rc<Expr>>,
- pub named: Vec<(IStr, Rc<Expr>)>,
+ pub names: Vec<IStr>,
+ pub values: Vec<Rc<Expr>>,
}
impl ArgsDesc {
- pub fn new(unnamed: Vec<Rc<Expr>>, named: Vec<(IStr, Rc<Expr>)>) -> Self {
- Self { unnamed, named }
+ pub fn new(unnamed: Vec<Rc<Expr>>, names: Vec<IStr>, values: Vec<Rc<Expr>>) -> Self {
+ Self {
+ unnamed,
+ names,
+ values,
+ }
}
}
crates/jrsonnet-ir/src/visit.rsdiffbeforeafterboth--- a/crates/jrsonnet-ir/src/visit.rs
+++ b/crates/jrsonnet-ir/src/visit.rs
@@ -216,11 +216,15 @@
}
Expr::Apply(expr, spanned, _) => {
v.visit_expr(expr);
- let ArgsDesc { unnamed, named } = &**spanned;
+ let ArgsDesc {
+ unnamed,
+ names: _,
+ values,
+ } = &**spanned;
for unnamed in unnamed {
v.visit_expr(unnamed);
}
- for (_name, named) in named {
+ for named in values {
v.visit_expr(named);
}
}
crates/jrsonnet-peg-parser/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-peg-parser/src/lib.rs
+++ b/crates/jrsonnet-peg-parser/src/lib.rs
@@ -73,12 +73,14 @@
= args:arg(s)**comma() comma()? {?
let unnamed_count = args.iter().take_while(|(n, _)| n.is_none()).count();
let mut unnamed = Vec::with_capacity(unnamed_count);
- let mut named = Vec::with_capacity(args.len() - unnamed_count);
+ let mut names = Vec::with_capacity(args.len() - unnamed_count);
+ let mut values = Vec::with_capacity(args.len() - unnamed_count);
let mut named_started = false;
for (name, value) in args {
if let Some(name) = name {
named_started = true;
- named.push((name, value));
+ names.push(name);
+ values.push(value);
} else {
if named_started {
return Err("<named argument>")
@@ -86,7 +88,7 @@
unnamed.push(value);
}
}
- Ok(ArgsDesc::new(unnamed, named))
+ Ok(ArgsDesc{unnamed, names, values})
}
pub rule destruct_rest() -> DestructRest
crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@array_comp.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@array_comp.jsonnet.snap
+++ b/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@array_comp.jsonnet.snap
@@ -26,7 +26,8 @@
"x" from virtual:<test>:16-17,
),
],
- named: [],
+ names: [],
+ values: [],
} from virtual:<test>:15-18,
false,
),
crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@reserved.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@reserved.jsonnet.snap
+++ b/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@reserved.jsonnet.snap
@@ -24,7 +24,8 @@
"null_fields" from virtual:<test>:20-31,
),
],
- named: [],
+ names: [],
+ values: [],
} from virtual:<test>:16-32,
false,
),
crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@suffix.jsonnet.snapdiffbeforeafterboth--- a/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@suffix.jsonnet.snap
+++ b/crates/jrsonnet-peg-parser/src/snapshots/jrsonnet_peg_parser__tests__snapshots@suffix.jsonnet.snap
@@ -28,7 +28,8 @@
2.0,
),
],
- named: [],
+ names: [],
+ values: [],
} from virtual:<test>:15-18,
false,
),
@@ -52,7 +53,8 @@
2.0,
),
],
- named: [],
+ names: [],
+ values: [],
} from virtual:<test>:28-31,
false,
),
crates/jrsonnet-stdlib/src/keyf.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/keyf.rs
+++ b/crates/jrsonnet-stdlib/src/keyf.rs
@@ -1,14 +1,16 @@
use jrsonnet_evaluator::{
Error, Result, Thunk, Val,
- function::{CallLocation, FuncVal, PreparedFuncVal},
+ function::{FuncVal, NativeFn},
typed::{ComplexValType, FromUntyped, Typed, ValType},
};
+type PreparedKeyF = NativeFn!((Thunk<Val>) -> Val);
+
#[derive(Default, Clone)]
pub enum KeyF {
#[default]
Identity,
- Prepared(PreparedFuncVal),
+ Prepared(PreparedKeyF),
PrepareFailure(Error),
}
impl KeyF {
@@ -19,13 +21,13 @@
if val.is_identity() {
Self::Identity
} else {
- PreparedFuncVal::new(val, 1, &[]).map_or_else(Self::PrepareFailure, Self::Prepared)
+ PreparedKeyF::try_from(val).map_or_else(Self::PrepareFailure, Self::Prepared)
}
}
pub fn eval(&self, val: impl Into<Thunk<Val>>) -> Result<Val> {
match self {
KeyF::Identity => val.into().evaluate(),
- KeyF::Prepared(p) => p.call(CallLocation::native(), &[val.into()], &[]),
+ KeyF::Prepared(p) => p.call(val.into()),
KeyF::PrepareFailure(e) => Err(e.clone()),
}
}