add swap (sort of)

arihant2math · arihant2math · commit f64417954cc4 · 2025-01-21T13:50:51.000-08:00
Signed-off-by: Ashwin Naren &lt;arihant2math@gmail.com&gt;
diff --git a/compiler/codegen/src/compile.rs b/compiler/codegen/src/compile.rs
@@ -18,10 +18,8 @@ use itertools::Itertools;
 use num_complex::Complex64;
 use num_traits::ToPrimitive;
 use rustpython_ast::located::{self as located_ast, Located};
-use rustpython_ast::{
-    Pattern, PatternMatchAs, PatternMatchSingleton, PatternMatchStar, PatternMatchValue,
-};
-use rustpython_compiler_core::bytecode::ComparisonOperator;
+use rustpython_ast::{Pattern, PatternMatchAs, PatternMatchSingleton, PatternMatchStar, PatternMatchValue};
+use rustpython_compiler_core::bytecode::{Arg, ComparisonOperator};
 use rustpython_compiler_core::{
     bytecode::{self, Arg as OpArgMarker, CodeObject, ConstantData, Instruction, OpArg, OpArgType},
     Mode,
@@ -1826,18 +1824,9 @@ impl Compiler {
         Ok(())
     }
 
-    // static int
-    // jump_to_fail_pop(compiler *c, location loc,
-    // pattern_context *pc, int op)
-    // {
-    // // Pop any items on the top of the stack, plus any objects we were going to
-    // // capture on success:
-    // Py_ssize_t pops = pc->on_top + PyList_GET_SIZE(pc->stores);
-    // RETURN_IF_ERROR(ensure_fail_pop(c, pc, pops));
-    // ADDOP_JUMP(c, loc, op, pc->fail_pop[pops]);
-    // return SUCCESS;
-    // }
     fn jump_to_fail_pop(&mut self, pattern_context: &mut PatternContext) -> CompileResult<()> {
+        // Pop any items on the top of the stack, plus any objects we were going to
+        // capture on success:
         let pops = pattern_context.on_top + pattern_context.stores.len();
         self.ensure_fail_pop(pattern_context, pops)?;
         self.switch_to_block(pattern_context.fail_pop[pops]);
@@ -1908,9 +1897,9 @@ impl Compiler {
     ) -> CompileResult<()> {
         let mut count = count;
         while 1 < count {
-            todo!("below");
+            todo!();
             // ADDOP_I(c, loc, SWAP, count--);
-            // emit!(self, Instruction::Swap { count: count as u32 });
+            // emit!(self, Instruction::Swap(Arg::new(count as u32)));
             count -= 1;
         }
         Ok(())
@@ -2030,6 +2019,8 @@ impl Compiler {
         pattern_type: &Pattern<SourceRange>,
         pattern_context: &mut PatternContext,
     ) -> CompileResult<()> {
+        let block = self.new_block();
+        self.switch_to_block(block);
         match &pattern_type {
             Pattern::MatchValue(value) => self.compile_pattern_value(&value, pattern_context),
             Pattern::MatchSingleton(singleton) => {
@@ -2053,6 +2044,8 @@ impl Compiler {
         pattern_context: &mut PatternContext,
     ) -> CompileResult<()> {
         self.compile_expression(subject)?;
+        let block = self.new_block();
+        self.switch_to_block(block);
         // Block at the end of the switch statement that we jump to after finishing a branch
         let end_block = self.new_block();
 
@@ -3409,10 +3402,6 @@ impl Compiler {
             ir::BlockIdx::NULL,
             "switching {prev:?} -> {block:?} to completed block"
         );
-        println!("{}", prev.0);
-        for (count, b) in code.blocks.iter().enumerate() {
-            println!("{count}: {} {}", b.next.0, b.instructions.len());
-        }
         let prev_block = &mut code.blocks[prev.0 as usize];
         assert_eq!(
             prev_block.next.0,
