refactor(eval): remove State::FinishObject, which is a duplicate of…

… `State::ObjectToValue`
eduardosm · Nov 4, 2024 · 45bfbe8 · 45bfbe8
1 parent e3ceda6
commit 45bfbe8
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/rsjsonnet-lang/src/program/eval/expr.rs b/rsjsonnet-lang/src/program/eval/expr.rs
@@ -49,7 +49,7 @@ impl<'p> Evaluator<'_, 'p> {
                     asserts_checked: Cell::new(false),
                 });
 
-                self.state_stack.push(State::FinishObject);
+                self.state_stack.push(State::ObjectToValue);
 
                 for field in ir_fields.iter().rev() {
                     match field.name {

diff --git a/rsjsonnet-lang/src/program/eval/mod.rs b/rsjsonnet-lang/src/program/eval/mod.rs
@@ -554,12 +554,6 @@ impl<'p, 'a> Evaluator<'a, 'p> {
                         }));
                     }
                 }
-                State::FinishObject => {
-                    let object = self.object_stack.pop().unwrap();
-                    let object = self.program.gc_alloc(object);
-
-                    self.value_stack.push(ValueData::Object(object));
-                }
                 State::InitCompSpec {
                     var_name,
                     value,

diff --git a/rsjsonnet-lang/src/program/eval/state.rs b/rsjsonnet-lang/src/program/eval/state.rs
@@ -101,7 +101,6 @@ pub(super) enum State<'a, 'p> {
         value: &'p ir::Expr<'p>,
         base_env: Option<Gc<ThunkEnv<'p>>>,
     },
-    FinishObject,
     Field {
         span: SpanId,
         field_name: InternedStr<'p>,