Named arguments are better.

progval · progval · commit e5dc9e38a03e · 2017-10-28T21:41:05.000+02:00
diff --git a/src/processor/instructions.rs b/src/processor/instructions.rs
@@ -71,7 +71,7 @@ pub enum Instruction {
     LoadGlobal(usize),
     CallFunction(usize, usize), // nb_args, nb_kwargs
     RaiseVarargs(u16),
-    MakeFunction(bool, bool, bool, bool), // has_defaults, has_kwdefaults, has_annotations, has_closure
+    MakeFunction { has_defaults: bool, has_kwdefaults: bool, has_annotations: bool, has_closure: bool },
     BuildConstKeyMap(usize),
 }
 
@@ -158,7 +158,12 @@ impl<'a, I> Iterator for InstructionDecoder<I> where I: Iterator<Item=&'a u8> {
                 125 => Instruction::StoreFast(oparg as usize),
                 130 => Instruction::RaiseVarargs(self.read_argument() as u16),
                 131 => Instruction::CallFunction(oparg as usize, 0),
-                132 => Instruction::MakeFunction(oparg & 0x01 != 0, oparg & 0x02 != 0, oparg & 0x04 != 0, oparg & 0x08 != 0),
+                132 => Instruction::MakeFunction {
+                    has_defaults: oparg & 0x01 != 0,
+                    has_kwdefaults: oparg & 0x02 != 0,
+                    has_annotations: oparg & 0x04 != 0,
+                    has_closure: oparg & 0x08 != 0,
+                },
                 156 => Instruction::BuildConstKeyMap(oparg as usize),
                 144 => { self.arg_prefix = Some(self.read_argument()); Instruction::Nop },
                 _ => panic!(format!("Opcode not supported: {:?}", (opcode, oparg))),
diff --git a/src/processor/mod.rs b/src/processor/mod.rs
@@ -523,7 +523,7 @@ fn run_code<EP: EnvProxy>(state: &mut State<EP>, call_stack: &mut Vec<Frame>) ->
                 }
                 call_function(state, call_stack, &func, args, kwargs)
             },
-            Instruction::MakeFunction(false, has_kwdefaults, false, false) => {
+            Instruction::MakeFunction { has_defaults: false, has_kwdefaults, has_annotations: false, has_closure: false } => {
                 // TODO: consume default arguments and annotations
                 let obj = {
                     let frame = call_stack.last_mut().unwrap();

Original file line number	Diff line number	Diff line change
`@@ -523,7 +523,7 @@ fn run_code<EP: EnvProxy>(state: &mut State<EP>, call_stack: &mut Vec<Frame>) ->`
`523`	`523`	`}`
`524`	`524`	`call_function(state, call_stack, &func, args, kwargs)`
`525`	`525`	`},`
`526`		`- Instruction::MakeFunction(false, has_kwdefaults, false, false) => {`
	`526`	`+ Instruction::MakeFunction { has_defaults: false, has_kwdefaults, has_annotations: false, has_closure: false } => {`
`527`	`527`	`// TODO: consume default arguments and annotations`
`528`	`528`	`let obj = {`
`529`	`529`	`let frame = call_stack.last_mut().unwrap();`