Fix order of evaluation of assignment statements

See #111
colesbury · Apr 28, 2023 · 3162ce0 · 3162ce0
1 parent 570409c
commit 3162ce0
Show file tree

Hide file tree

Showing 17 changed files with 3,721 additions and 3,670 deletions.
diff --git a/Include/opcode.h b/Include/opcode.h
diff --git a/Lib/dis.py b/Lib/dis.py
@@ -355,8 +355,12 @@ def get_repr(bytecode, *imm):
             argrepr = f"{argreprs[0]}.{argreprs[1]}"
         elif bytecode.name == 'STORE_ATTR':
             argrepr = f"{argreprs[0]}.{argreprs[1]}=acc"
+        elif bytecode.name == 'STORE_ATTR_REG':
+            argrepr = f"acc.{argreprs[1]}={argreprs[0]}"
         elif bytecode.name == 'STORE_SUBSCR':
             argrepr = f"{argreprs[0]}[{argreprs[1]}]=acc"
+        elif bytecode.name == 'STORE_SUBSCR_REG':
+            argrepr = f"{argreprs[1]}[acc]={argreprs[0]}"
         elif bytecode.name == 'BINARY_SUBSCR':
             argrepr = f"{argreprs[0]}[acc]"
         elif bytecode.name == 'MOVE' or bytecode.name == 'COPY':

diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
@@ -347,7 +347,7 @@ def _write_atomic(path, data, mode=0o666):
 # Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array
 # in PC/launcher.c must also be updated.
 
-MAGIC_NUMBER = (9001).to_bytes(2, 'little') + b'\r\n'
+MAGIC_NUMBER = (9002).to_bytes(2, 'little') + b'\r\n'
 _RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little')  # For import.c
 
 _PYCACHE = '__pycache__'