From 861b00178370d507516273ea95dd48acd31f36ff Mon Sep 17 00:00:00 2001 From: Damien George Date: Wed, 18 Jan 2017 16:53:15 +1100 Subject: [PATCH] tests/cmdline: Update tests to pass with latest changes to bytecode. --- tests/cmdline/cmd_parsetree.py.exp | 4 +- tests/cmdline/cmd_showbc.py.exp | 81 ++++++++++++++++-------------- 2 files changed, 45 insertions(+), 40 deletions(-) diff --git a/tests/cmdline/cmd_parsetree.py.exp b/tests/cmdline/cmd_parsetree.py.exp index 06fbeadfc8..5510d11cd0 100644 --- a/tests/cmdline/cmd_parsetree.py.exp +++ b/tests/cmdline/cmd_parsetree.py.exp @@ -31,7 +31,7 @@ Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+): ######## \.\+5b arg names: -(N_STATE 2) +(N_STATE 5) (N_EXC_STACK 0) bc=-1 line=1 bc=0 line=4 @@ -43,7 +43,7 @@ arg names: bc=32 line=10 bc=37 line=11 00 BUILD_TUPLE 0 -02 GET_ITER +02 GET_ITER_STACK 03 FOR_ITER 12 06 STORE_NAME i 09 JUMP 3 diff --git a/tests/cmdline/cmd_showbc.py.exp b/tests/cmdline/cmd_showbc.py.exp index 8ee47eab66..68e2fe51a1 100644 --- a/tests/cmdline/cmd_showbc.py.exp +++ b/tests/cmdline/cmd_showbc.py.exp @@ -31,7 +31,7 @@ File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ byt Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+): ######## \.\+rg names: -(N_STATE 23) +(N_STATE 22) (N_EXC_STACK 2) (INIT_CELL 14) (INIT_CELL 15) @@ -251,10 +251,6 @@ Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+): \\d\+ LOAD_FAST 1 \\d\+ POP_TOP \\d\+ JUMP \\d\+ -\\d\+ POP_TOP -\\d\+ POP_TOP -\\d\+ POP_TOP -\\d\+ POP_TOP \\d\+ SETUP_FINALLY \\d\+ \\d\+ SETUP_EXCEPT \\d\+ \\d\+ JUMP \\d\+ @@ -439,58 +435,67 @@ Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+): ######## \.\+5b arg names: * * * -(N_STATE 6) +(N_STATE 9) (N_EXC_STACK 0) bc=-\\d\+ line=1 -00 LOAD_FAST 2 -01 FOR_ITER 17 -04 STORE_FAST 3 -05 LOAD_DEREF 1 -07 POP_JUMP_IF_FALSE 1 -10 LOAD_DEREF 0 -12 YIELD_VALUE -13 POP_TOP -14 JUMP 1 -17 LOAD_CONST_NONE -18 RETURN_VALUE +00 LOAD_NULL +01 LOAD_FAST 2 +02 LOAD_NULL +03 LOAD_NULL +04 FOR_ITER 20 +07 STORE_FAST 3 +08 LOAD_DEREF 1 +10 POP_JUMP_IF_FALSE 4 +13 LOAD_DEREF 0 +15 YIELD_VALUE +16 POP_TOP +17 JUMP 4 +20 LOAD_CONST_NONE +21 RETURN_VALUE File cmdline/cmd_showbc.py, code block '' (descriptor: \.\+, bytecode @\.\+ bytes) Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+): ######## \.\+5b arg names: * * * -(N_STATE 7) +(N_STATE 10) (N_EXC_STACK 0) bc=-\\d\+ line=1 00 BUILD_LIST 0 -02 LOAD_FAST 2 -03 FOR_ITER 19 -06 STORE_FAST 3 -07 LOAD_DEREF 1 -09 POP_JUMP_IF_FALSE 3 -12 LOAD_DEREF 0 -14 STORE_COMP 8 -16 JUMP 3 -19 RETURN_VALUE +02 LOAD_NULL +03 LOAD_FAST 2 +04 LOAD_NULL +05 LOAD_NULL +06 FOR_ITER 22 +09 STORE_FAST 3 +10 LOAD_DEREF 1 +12 POP_JUMP_IF_FALSE 6 +15 LOAD_DEREF 0 +17 STORE_COMP 20 +19 JUMP 6 +22 RETURN_VALUE File cmdline/cmd_showbc.py, code block '' (descriptor: \.\+, bytecode @\.\+ bytes) Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+): ######## \.\+5b arg names: * * * -(N_STATE 8) +(N_STATE 11) (N_EXC_STACK 0) bc=-\\d\+ line=1 ######## 00 BUILD_MAP 0 -02 LOAD_FAST 2 -03 FOR_ITER 21 -06 STORE_FAST 3 -07 LOAD_DEREF 1 -09 POP_JUMP_IF_FALSE 3 -12 LOAD_DEREF 0 -14 LOAD_DEREF 0 -16 STORE_COMP 13 -18 JUMP 3 -21 RETURN_VALUE +02 LOAD_NULL +03 LOAD_FAST 2 +04 LOAD_NULL +05 LOAD_NULL +06 FOR_ITER 24 +09 STORE_FAST 3 +10 LOAD_DEREF 1 +12 POP_JUMP_IF_FALSE 6 +15 LOAD_DEREF 0 +17 LOAD_DEREF 0 +19 STORE_COMP 25 +21 JUMP 6 +24 RETURN_VALUE File cmdline/cmd_showbc.py, code block 'closure' (descriptor: \.\+, bytecode @\.\+ bytes) Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+): ########