waalge
/
aiken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(machine): fix Value::Constr fields order 

cc @MicroProofs
This commit is contained in:
rvcas 2024-02-19 20:52:38 -05:00 committed by Lucas
parent 028528899c
commit 20917bbd5b
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/uplc/src/machine.rs
View File

@ -163,8 +163,10 @@ impl Machine {
Term::Constr { tag, mut fields } => { Term::Constr { tag, mut fields } => {
self.step_and_maybe_spend(StepKind::Constr)?; self.step_and_maybe_spend(StepKind::Constr)?;
fields.reverse();
if !fields.is_empty() { if !fields.is_empty() {
let popped_field = fields.remove(0); let popped_field = fields.pop().unwrap();
Ok(MachineState::Compute( Ok(MachineState::Compute(
Context::FrameConstr(env.clone(), tag, fields, vec![], context.into()), Context::FrameConstr(env.clone(), tag, fields, vec![], context.into()),
@ -213,10 +215,10 @@ impl Machine {
Context::FrameAwaitArg(fun, ctx) => self.apply_evaluate(*ctx, fun, value), Context::FrameAwaitArg(fun, ctx) => self.apply_evaluate(*ctx, fun, value),
Context::FrameAwaitFunValue(arg, ctx) => self.apply_evaluate(*ctx, value, arg), Context::FrameAwaitFunValue(arg, ctx) => self.apply_evaluate(*ctx, value, arg),
Context::FrameConstr(env, tag, mut fields, mut resolved_fields, ctx) => { Context::FrameConstr(env, tag, mut fields, mut resolved_fields, ctx) => {
resolved_fields.insert(0, value); resolved_fields.push(value);
if !fields.is_empty() { if !fields.is_empty() {
let popped_field = fields.remove(0); let popped_field = fields.pop().unwrap();
Ok(MachineState::Compute( Ok(MachineState::Compute(
Context::FrameConstr(env.clone(), tag, fields, resolved_fields, ctx), Context::FrameConstr(env.clone(), tag, fields, resolved_fields, ctx),
@ -376,7 +378,7 @@ fn transfer_arg_stack(mut args: Vec<Value>, ctx: Context) -> Context {
if args.is_empty() { if args.is_empty() {
ctx ctx
} else { } else {
let popped_field = args.remove(0); let popped_field = args.pop().unwrap();
transfer_arg_stack(args, Context::FrameAwaitFunValue(popped_field, ctx.into())) transfer_arg_stack(args, Context::FrameAwaitFunValue(popped_field, ctx.into()))
} }

4
crates/uplc/test_data/conformance/evaluation/term/constr/constr-3/constr-3.uplc Normal file
View File

@ -0,0 +1,4 @@
-- constr can have arbitrary terms in it
(program 1.1.0
(constr 1 (con integer 1) (lam x x) (constr 0 (con integer 1)))
)

2
crates/uplc/test_data/conformance/evaluation/term/constr/constr-3/constr-3.uplc.budget.expected Normal file
View File

@ -0,0 +1,2 @@
({cpu: 115100
| mem: 600})

1
crates/uplc/test_data/conformance/evaluation/term/constr/constr-3/constr-3.uplc.expected Normal file
View File

@ -0,0 +1 @@
(program 1.1.0 (constr 1 (con integer 1) (lam x x) (constr 0 (con integer 1))))