Clean up some formatting issues

zrax · Jun 23, 2024 · 93caf73 · 93caf73
1 parent e1ac2ad
commit 93caf73
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/ASTree.cpp b/ASTree.cpp
@@ -1883,8 +1883,8 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
         case Pyc::SET_LINENO_A:
             // Ignore
             break;
-        case::Pyc::WITH_EXCEPT_START:
         case Pyc::SETUP_WITH_A:
+        case Pyc::WITH_EXCEPT_START:
             {
                 PycRef<ASTBlock> withblock = new ASTWithBlock(pos+operand);
                 blocks.push(withblock);
@@ -2465,23 +2465,22 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
             stack.pop();
             break;
         case Pyc::SWAP_A:
-        {
-            unpack = operand;
-            ASTTuple::value_t values;
-            ASTTuple::value_t next_tuple;
-            values.resize(operand);
-            for (int i = 0; i < operand; i++)
             {
-                values[operand - i - 1] = stack.top();
-                stack.pop();
+                unpack = operand;
+                ASTTuple::value_t values;
+                ASTTuple::value_t next_tuple;
+                values.resize(operand);
+                for (int i = 0; i < operand; i++) {
+                    values[operand - i - 1] = stack.top();
+                    stack.pop();
+                }
+                auto tup = new ASTTuple(values);
+                tup->setRequireParens(false);
+                auto next_tup = new ASTTuple(next_tuple);
+                next_tup->setRequireParens(false);
+                stack.push(tup);
+                stack.push(next_tup);
             }
-            auto tup = new ASTTuple(values);
-            tup->setRequireParens(false);
-            auto next_tup = new ASTTuple(next_tuple);
-            next_tup->setRequireParens(false);
-            stack.push(tup);
-            stack.push(next_tup);
-        }
             break;
         default:
             fprintf(stderr, "Unsupported opcode: %s\n", Pyc::OpcodeName(opcode & 0xFF));

diff --git a/tests/input/swap.py b/tests/input/swap.py
@@ -9,4 +9,4 @@ def SWAP():
         8]
     i = 1
     j = 3
-    my_array[i], my_array[j], my_array[2] = my_array[j], my_array[i], my_array[4]
+    my_array[i], my_array[j], my_array[2] = my_array[j], my_array[i], my_array[4]
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,4 +9,4 @@ def SWAP(): @@
 ]
         i = 1
         j = 3
-        my_array[i], my_array[j], my_array[2] = my_array[j], my_array[i], my_array[4]
+        my_array[i], my_array[j], my_array[2] = my_array[j], my_array[i], my_array[4]