difftreelog
fix unify handling of field in obj and objcomp
in: master
3 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
@@ -113,6 +113,97 @@
UnboundLocals { fctx, locals }
}
+pub fn evaluate_field_member<B: Unbound<Bound = Context> + Clone>(
+ builder: &mut ObjValueBuilder,
+ ctx: Context,
+ uctx: B,
+ member: &FieldMember,
+) -> Result<()> {
+ match member {
+ FieldMember {
+ name,
+ plus,
+ params: None,
+ visibility,
+ value,
+ } => {
+ #[derive(Trace)]
+ struct UnboundValue<B: Trace> {
+ uctx: B,
+ value: LocExpr,
+ name: IStr,
+ }
+ impl<B: Unbound<Bound = Context>> Unbound for UnboundValue<B> {
+ type Bound = Val;
+ fn bind(&self, sup: Option<ObjValue>, this: Option<ObjValue>) -> Result<Val> {
+ Ok(evaluate_named(
+ self.uctx.bind(sup, this)?,
+ &self.value,
+ self.name.clone(),
+ )?)
+ }
+ }
+
+ let name = evaluate_field_name(ctx.clone(), name)?;
+ let Some(name) = name else {
+ return Ok(());
+ };
+
+ builder
+ .member(name.clone())
+ .with_add(*plus)
+ .with_visibility(*visibility)
+ .with_location(value.1.clone())
+ .bindable(tb!(UnboundValue {
+ uctx: uctx.clone(),
+ value: value.clone(),
+ name: name.clone()
+ }))?;
+ }
+ FieldMember {
+ name,
+ params: Some(params),
+ value,
+ ..
+ } => {
+ #[derive(Trace)]
+ struct UnboundMethod<B: Trace> {
+ uctx: B,
+ value: LocExpr,
+ params: ParamsDesc,
+ name: IStr,
+ }
+ impl<B: Unbound<Bound = Context>> Unbound for UnboundMethod<B> {
+ type Bound = Val;
+ fn bind(&self, sup: Option<ObjValue>, this: Option<ObjValue>) -> Result<Val> {
+ Ok(evaluate_method(
+ self.uctx.bind(sup, this)?,
+ self.name.clone(),
+ self.params.clone(),
+ self.value.clone(),
+ ))
+ }
+ }
+
+ let Some(name) = evaluate_field_name(ctx.clone(), name)? else {
+ return Ok(());
+ };
+
+ builder
+ .member(name.clone())
+ .hide()
+ .with_location(value.1.clone())
+ .bindable(tb!(UnboundMethod {
+ uctx: uctx.clone(),
+ value: value.clone(),
+ params: params.clone(),
+ name: name.clone()
+ }))?;
+ }
+ }
+ Ok(())
+}
+
#[allow(clippy::too_many_lines)]
pub fn evaluate_member_list_object(ctx: Context, members: &[Member]) -> Result<ObjValue> {
let mut builder = ObjValueBuilder::new();
@@ -133,87 +224,12 @@
for member in members.iter() {
match member {
- Member::Field(FieldMember {
- name,
- plus,
- params: None,
- visibility,
- value,
- }) => {
- #[derive(Trace)]
- struct UnboundValue<B: Trace> {
- uctx: B,
- value: LocExpr,
- name: IStr,
- }
- impl<B: Unbound<Bound = Context>> Unbound for UnboundValue<B> {
- type Bound = Val;
- fn bind(&self, sup: Option<ObjValue>, this: Option<ObjValue>) -> Result<Val> {
- Ok(evaluate_named(
- self.uctx.bind(sup, this)?,
- &self.value,
- self.name.clone(),
- )?)
- }
- }
-
- let name = evaluate_field_name(ctx.clone(), name)?;
- let Some(name) = name else {
- continue;
- };
-
- builder
- .member(name.clone())
- .with_add(*plus)
- .with_visibility(*visibility)
- .with_location(value.1.clone())
- .bindable(tb!(UnboundValue {
- uctx: uctx.clone(),
- value: value.clone(),
- name: name.clone()
- }))?;
+ Member::Field(field) => {
+ evaluate_field_member(&mut builder, ctx.clone(), uctx.clone(), &field)?
}
- Member::Field(FieldMember {
- name,
- params: Some(params),
- value,
- ..
- }) => {
- #[derive(Trace)]
- struct UnboundMethod<B: Trace> {
- uctx: B,
- value: LocExpr,
- params: ParamsDesc,
- name: IStr,
- }
- impl<B: Unbound<Bound = Context>> Unbound for UnboundMethod<B> {
- type Bound = Val;
- fn bind(&self, sup: Option<ObjValue>, this: Option<ObjValue>) -> Result<Val> {
- Ok(evaluate_method(
- self.uctx.bind(sup, this)?,
- self.name.clone(),
- self.params.clone(),
- self.value.clone(),
- ))
- }
- }
-
- let Some(name) = evaluate_field_name(ctx.clone(), name)? else {
- continue;
- };
-
- builder
- .member(name.clone())
- .hide()
- .with_location(value.1.clone())
- .bindable(tb!(UnboundMethod {
- uctx: uctx.clone(),
- value: value.clone(),
- params: params.clone(),
- name: name.clone()
- }))?;
+ Member::BindStmt(_) => {
+ // Already handled
}
- Member::BindStmt(_) => {}
Member::AssertStmt(stmt) => {
#[derive(Trace)]
struct ObjectAssert<B: Trace> {
@@ -252,50 +268,11 @@
);
let mut ctxs = vec![];
evaluate_comp(ctx, &obj.compspecs, &mut |ctx| {
- let key = evaluate(ctx.clone(), &obj.key)?;
let fctx = Context::new_future();
- ctxs.push((ctx, fctx.clone()));
+ ctxs.push((ctx.clone(), fctx.clone()));
let uctx = evaluate_object_locals(fctx, locals.clone());
- match key {
- Val::Null => {}
- Val::Str(n) => {
- #[derive(Trace)]
- struct UnboundValue<B: Trace> {
- uctx: B,
- value: LocExpr,
- }
- impl<B: Unbound<Bound = Context>> Unbound for UnboundValue<B> {
- type Bound = Val;
- fn bind(
- &self,
- sup: Option<ObjValue>,
- this: Option<ObjValue>,
- ) -> Result<Val> {
- Ok(evaluate(
- self.uctx.bind(sup, this.clone())?.extend(
- GcHashMap::new(),
- None,
- None,
- this,
- ),
- &self.value,
- )?)
- }
- }
- builder
- .member(n)
- .with_location(obj.value.1.clone())
- .with_add(obj.plus)
- .bindable(tb!(UnboundValue {
- uctx,
- value: obj.value.clone(),
- }))?;
- }
- v => throw!(FieldMustBeStringGot(v.value_type())),
- }
-
- Ok(())
+ evaluate_field_member(&mut builder, ctx, uctx, &obj.field)
})?;
let this = builder.build();
crates/jrsonnet-parser/src/expr.rsdiffbeforeafterboth--- a/crates/jrsonnet-parser/src/expr.rs
+++ b/crates/jrsonnet-parser/src/expr.rs
@@ -268,9 +268,7 @@
#[derive(Debug, PartialEq, Trace)]
pub struct ObjComp {
pub pre_locals: Vec<BindSpec>,
- pub key: LocExpr,
- pub plus: bool,
- pub value: LocExpr,
+ pub field: FieldMember,
pub post_locals: Vec<BindSpec>,
pub compspecs: Vec<CompSpec>,
}
crates/jrsonnet-parser/src/lib.rsdiffbeforeafterboth194 / assertion:assertion(s) {expr::Member::AssertStmt(assertion)}194 / assertion:assertion(s) {expr::Member::AssertStmt(assertion)}195 / field:field(s) {expr::Member::Field(field)}195 / field:field(s) {expr::Member::Field(field)}196 pub rule objinside(s: &ParserSettings) -> expr::ObjBody196 pub rule objinside(s: &ParserSettings) -> expr::ObjBody197 = pre_locals:(b: obj_local(s) comma() {b})* "[" _ key:expr(s) _ "]" _ plus:"+"? _ ":" _ value:expr(s) post_locals:(comma() b:obj_local(s) {b})* _ ("," _)? forspec:forspec(s) others:(_ rest:compspec(s) {rest})? {197 = pre_locals:(b: obj_local(s) comma() {b})* field:field(s) post_locals:(comma() b:obj_local(s) {b})* _ ("," _)? forspec:forspec(s) others:(_ rest:compspec(s) {rest})? {198 let mut compspecs = vec![CompSpec::ForSpec(forspec)];198 let mut compspecs = vec![CompSpec::ForSpec(forspec)];199 compspecs.extend(others.unwrap_or_default());199 compspecs.extend(others.unwrap_or_default());200 expr::ObjBody::ObjComp(expr::ObjComp{200 expr::ObjBody::ObjComp(expr::ObjComp{201 pre_locals,201 pre_locals,202 key,202 field,203 plus: plus.is_some(),204 value,205 post_locals,203 post_locals,206 compspecs,204 compspecs,207 })205 })