New Instruction ToBool,PopJumpIfFalse

youknowone · youknowone · commit 847482e46ba0 · 2025-08-26T15:16:01.000+09:00
diff --git a/compiler/core/src/bytecode.rs b/compiler/core/src/bytecode.rs
@@ -525,7 +525,7 @@ pub enum Instruction {
     Swap {
         index: Arg<u32>,
     },
-    // ToBool,
+    ToBool,
     Rotate2,
     Rotate3,
     Duplicate,
@@ -555,6 +555,10 @@ pub enum Instruction {
     JumpIfFalse {
         target: Arg<Label>,
     },
+    /// Pop the top of the stack, then pop the next value and jump if it is false.
+    PopJumpIfFalse {
+        target: Arg<Label>,
+    },
     /// Peek at the top of the stack, and jump if this value is true.
     /// Otherwise, pop top of stack.
     JumpIfTrueOrPop {
@@ -1257,6 +1261,7 @@ impl Instruction {
             Jump { target: l }
             | JumpIfTrue { target: l }
             | JumpIfFalse { target: l }
+            | PopJumpIfFalse { target: l }
             | JumpIfTrueOrPop { target: l }
             | JumpIfFalseOrPop { target: l }
             | ForIter { target: l }
@@ -1330,7 +1335,7 @@ impl Instruction {
             CopyItem { .. } => 1,
             Pop => -1,
             Swap { .. } => 0,
-            // ToBool => 0,
+            ToBool => 0,
             Rotate2 | Rotate3 => 0,
             Duplicate => 1,
             Duplicate2 => 2,
@@ -1341,7 +1346,7 @@ impl Instruction {
             Continue { .. } => 0,
             Break { .. } => 0,
             Jump { .. } => 0,
-            JumpIfTrue { .. } | JumpIfFalse { .. } => -1,
+            JumpIfTrue { .. } | JumpIfFalse { .. } | PopJumpIfFalse { .. } => -1,
             JumpIfTrueOrPop { .. } | JumpIfFalseOrPop { .. } => {
                 if jump {
                     0
@@ -1533,7 +1538,7 @@ impl Instruction {
             CopyItem { index } => w!(CopyItem, index),
             Pop => w!(Pop),
             Swap { index } => w!(Swap, index),
-            // ToBool => w!(ToBool),
+            ToBool => w!(ToBool),
             Rotate2 => w!(Rotate2),
             Rotate3 => w!(Rotate3),
             Duplicate => w!(Duplicate),
@@ -1548,6 +1553,7 @@ impl Instruction {
             Jump { target } => w!(Jump, target),
             JumpIfTrue { target } => w!(JumpIfTrue, target),
             JumpIfFalse { target } => w!(JumpIfFalse, target),
+            PopJumpIfFalse { target } => w!(PopJumpIfFalse, target),
             JumpIfTrueOrPop { target } => w!(JumpIfTrueOrPop, target),
             JumpIfFalseOrPop { target } => w!(JumpIfFalseOrPop, target),
             MakeFunction => w!(MakeFunction),
diff --git a/vm/src/frame.rs b/vm/src/frame.rs
@@ -1083,6 +1083,12 @@ impl ExecutingFrame<'_> {
                 self.push_value(vm.ctx.new_int(len).into());
                 Ok(None)
             }
+            bytecode::Instruction::ToBool => {
+                let obj = self.pop_value();
+                let bool_val = obj.try_to_bool(vm)?;
+                self.push_value(vm.ctx.new_bool(bool_val).into());
+                Ok(None)
+            }
             bytecode::Instruction::CallIntrinsic1 { func } => {
                 let value = self.pop_value();
                 let result = self.call_intrinsic_1(func.get(arg), value, vm)?;
@@ -1231,6 +1237,9 @@ impl ExecutingFrame<'_> {
             bytecode::Instruction::JumpIfFalse { target } => {
                 self.jump_if(vm, target.get(arg), false)
             }
+            bytecode::Instruction::PopJumpIfFalse { target } => {
+                self.pop_jump_if(vm, target.get(arg), false)
+            }
             bytecode::Instruction::JumpIfTrueOrPop { target } => {
                 self.jump_if_or_pop(vm, target.get(arg), true)
             }
@@ -1865,6 +1874,24 @@ impl ExecutingFrame<'_> {
         Ok(None)
     }
 
+    #[inline]
+    fn pop_jump_if(
+        &mut self,
+        vm: &VirtualMachine,
+        target: bytecode::Label,
+        flag: bool,
+    ) -> FrameResult {
+        // PopJumpIf{True,False}
+        // Pop TOS, convert to bool, jump if matches flag
+        let obj = self.pop_value();
+        let value = obj.try_to_bool(vm)?;
+        if value == flag {
+            self.jump(target);
+        }
+        // If not jumping, the value is already popped
+        Ok(None)
+    }
+
     /// The top of stack contains the iterator, lets push it forward
     fn execute_for_iter(&mut self, vm: &VirtualMachine, target: bytecode::Label) -> FrameResult {
         let top_of_stack = PyIter::new(self.top_value());
