Skip to content

Commit 861b001

Browse files
committed
tests/cmdline: Update tests to pass with latest changes to bytecode.
1 parent cb63006 commit 861b001

2 files changed

Lines changed: 45 additions & 40 deletions

File tree

tests/cmdline/cmd_parsetree.py.exp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
3131
########
3232
\.\+5b
3333
arg names:
34-
(N_STATE 2)
34+
(N_STATE 5)
3535
(N_EXC_STACK 0)
3636
bc=-1 line=1
3737
bc=0 line=4
@@ -43,7 +43,7 @@ arg names:
4343
bc=32 line=10
4444
bc=37 line=11
4545
00 BUILD_TUPLE 0
46-
02 GET_ITER
46+
02 GET_ITER_STACK
4747
03 FOR_ITER 12
4848
06 STORE_NAME i
4949
09 JUMP 3

tests/cmdline/cmd_showbc.py.exp

Lines changed: 43 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ byt
3131
Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
3232
########
3333
\.\+rg names:
34-
(N_STATE 23)
34+
(N_STATE 22)
3535
(N_EXC_STACK 2)
3636
(INIT_CELL 14)
3737
(INIT_CELL 15)
@@ -251,10 +251,6 @@ Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
251251
\\d\+ LOAD_FAST 1
252252
\\d\+ POP_TOP
253253
\\d\+ JUMP \\d\+
254-
\\d\+ POP_TOP
255-
\\d\+ POP_TOP
256-
\\d\+ POP_TOP
257-
\\d\+ POP_TOP
258254
\\d\+ SETUP_FINALLY \\d\+
259255
\\d\+ SETUP_EXCEPT \\d\+
260256
\\d\+ JUMP \\d\+
@@ -439,58 +435,67 @@ Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
439435
########
440436
\.\+5b
441437
arg names: * * *
442-
(N_STATE 6)
438+
(N_STATE 9)
443439
(N_EXC_STACK 0)
444440
bc=-\\d\+ line=1
445-
00 LOAD_FAST 2
446-
01 FOR_ITER 17
447-
04 STORE_FAST 3
448-
05 LOAD_DEREF 1
449-
07 POP_JUMP_IF_FALSE 1
450-
10 LOAD_DEREF 0
451-
12 YIELD_VALUE
452-
13 POP_TOP
453-
14 JUMP 1
454-
17 LOAD_CONST_NONE
455-
18 RETURN_VALUE
441+
00 LOAD_NULL
442+
01 LOAD_FAST 2
443+
02 LOAD_NULL
444+
03 LOAD_NULL
445+
04 FOR_ITER 20
446+
07 STORE_FAST 3
447+
08 LOAD_DEREF 1
448+
10 POP_JUMP_IF_FALSE 4
449+
13 LOAD_DEREF 0
450+
15 YIELD_VALUE
451+
16 POP_TOP
452+
17 JUMP 4
453+
20 LOAD_CONST_NONE
454+
21 RETURN_VALUE
456455
File cmdline/cmd_showbc.py, code block '<listcomp>' (descriptor: \.\+, bytecode @\.\+ bytes)
457456
Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
458457
########
459458
\.\+5b
460459
arg names: * * *
461-
(N_STATE 7)
460+
(N_STATE 10)
462461
(N_EXC_STACK 0)
463462
bc=-\\d\+ line=1
464463
00 BUILD_LIST 0
465-
02 LOAD_FAST 2
466-
03 FOR_ITER 19
467-
06 STORE_FAST 3
468-
07 LOAD_DEREF 1
469-
09 POP_JUMP_IF_FALSE 3
470-
12 LOAD_DEREF 0
471-
14 STORE_COMP 8
472-
16 JUMP 3
473-
19 RETURN_VALUE
464+
02 LOAD_NULL
465+
03 LOAD_FAST 2
466+
04 LOAD_NULL
467+
05 LOAD_NULL
468+
06 FOR_ITER 22
469+
09 STORE_FAST 3
470+
10 LOAD_DEREF 1
471+
12 POP_JUMP_IF_FALSE 6
472+
15 LOAD_DEREF 0
473+
17 STORE_COMP 20
474+
19 JUMP 6
475+
22 RETURN_VALUE
474476
File cmdline/cmd_showbc.py, code block '<dictcomp>' (descriptor: \.\+, bytecode @\.\+ bytes)
475477
Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
476478
########
477479
\.\+5b
478480
arg names: * * *
479-
(N_STATE 8)
481+
(N_STATE 11)
480482
(N_EXC_STACK 0)
481483
bc=-\\d\+ line=1
482484
########
483485
00 BUILD_MAP 0
484-
02 LOAD_FAST 2
485-
03 FOR_ITER 21
486-
06 STORE_FAST 3
487-
07 LOAD_DEREF 1
488-
09 POP_JUMP_IF_FALSE 3
489-
12 LOAD_DEREF 0
490-
14 LOAD_DEREF 0
491-
16 STORE_COMP 13
492-
18 JUMP 3
493-
21 RETURN_VALUE
486+
02 LOAD_NULL
487+
03 LOAD_FAST 2
488+
04 LOAD_NULL
489+
05 LOAD_NULL
490+
06 FOR_ITER 24
491+
09 STORE_FAST 3
492+
10 LOAD_DEREF 1
493+
12 POP_JUMP_IF_FALSE 6
494+
15 LOAD_DEREF 0
495+
17 LOAD_DEREF 0
496+
19 STORE_COMP 25
497+
21 JUMP 6
498+
24 RETURN_VALUE
494499
File cmdline/cmd_showbc.py, code block 'closure' (descriptor: \.\+, bytecode @\.\+ bytes)
495500
Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
496501
########

0 commit comments

Comments
 (0)