Merge pull request #1225 from RustPython/coolreader18/nested-boolops

coolreader18 · web-flow · commit 3364b746fd01 · 2019-08-11T09:17:02.000-05:00
Fix compilation of nested boolean operations
diff --git a/compiler/src/compile.rs b/compiler/src/compile.rs
@@ -1303,11 +1303,9 @@ impl<O: OutputStream> Compiler<O> {
                             self.emit(Instruction::Pop);
                         }
                         if let Some(false_label) = false_label {
-                            self.emit(Instruction::Duplicate);
                             self.emit(Instruction::JumpIfFalse {
                                 target: false_label,
                             });
-                            self.emit(Instruction::Pop);
                         }
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -1303,11 +1303,9 @@ impl<O: OutputStream> Compiler<O> {`
`1303`	`1303`	`self.emit(Instruction::Pop);`
`1304`	`1304`	`}`
`1305`	`1305`	`if let Some(false_label) = false_label {`
`1306`		`- self.emit(Instruction::Duplicate);`
`1307`	`1306`	`self.emit(Instruction::JumpIfFalse {`
`1308`	`1307`	`target: false_label,`
`1309`	`1308`	`});`
`1310`		`- self.emit(Instruction::Pop);`
`1311`	`1309`	`}`
`1312`	`1310`	`}`
`1313`	`1311`	`}`