tests: Fix cmd_showbc now that LOAD_CONST_ELLIPSIS bytecode is gone.

2 files changed, 111 insertions, 113 deletions

diff --git a/tests/cmdline/cmd_showbc.py b/tests/cmdline/cmd_showbc.py
index e86c002544..9989a7229a 100644
--- a/tests/cmdline/cmd_showbc.py
+++ b/tests/cmdline/cmd_showbc.py
@@ -3,7 +3,7 @@
 
 def f():
     # constants
-    a = None + False + True + ...
+    a = None + False + True
     a = 0
     a = 1000
     a = -1000
diff --git a/tests/cmdline/cmd_showbc.py.exp b/tests/cmdline/cmd_showbc.py.exp
index 48bf628aff..723a403a18 100644
--- a/tests/cmdline/cmd_showbc.py.exp
+++ b/tests/cmdline/cmd_showbc.py.exp
@@ -42,121 +42,119 @@ arg names:
 02 BINARY_OP 5 __add__
 03 LOAD_CONST_TRUE
 04 BINARY_OP 5 __add__
-05 LOAD_CONST_ELLIPSIS
-06 BINARY_OP 5 __add__
+05 STORE_FAST 0
+06 LOAD_CONST_SMALL_INT 0
 07 STORE_FAST 0
-08 LOAD_CONST_SMALL_INT 0
-09 STORE_FAST 0
-10 LOAD_CONST_SMALL_INT 1000
-13 STORE_FAST 0
-14 LOAD_CONST_SMALL_INT -1000
+08 LOAD_CONST_SMALL_INT 1000
+11 STORE_FAST 0
+12 LOAD_CONST_SMALL_INT -1000
+15 STORE_FAST 0
+16 LOAD_CONST_SMALL_INT 1
 17 STORE_FAST 0
 18 LOAD_CONST_SMALL_INT 1
-19 STORE_FAST 0
-20 LOAD_CONST_SMALL_INT 1
-21 LOAD_CONST_SMALL_INT 2
-22 BUILD_TUPLE 2
-24 STORE_DEREF 14
-26 LOAD_CONST_SMALL_INT 1
-27 LOAD_CONST_SMALL_INT 2
-28 BUILD_LIST 2
-30 STORE_FAST 1
-31 LOAD_CONST_SMALL_INT 1
-32 LOAD_CONST_SMALL_INT 2
-33 BUILD_SET 2
-35 STORE_FAST 2
-36 BUILD_MAP 0
-38 STORE_DEREF 15
-40 BUILD_MAP 1
-42 LOAD_CONST_SMALL_INT 2
-43 LOAD_CONST_SMALL_INT 1
-44 STORE_MAP
-45 STORE_FAST 3
-46 LOAD_CONST_STRING 'a'
-49 STORE_FAST 4
-50 LOAD_CONST_BYTES a
-53 STORE_FAST 5
-54 LOAD_CONST_SMALL_INT 1
-55 STORE_FAST 6
-56 LOAD_CONST_SMALL_INT 2
-57 STORE_FAST 7
-58 LOAD_FAST 0
-59 LOAD_DEREF 14
-61 BINARY_OP 5 __add__
-62 STORE_FAST 8
-63 LOAD_FAST 0
-64 UNARY_OP 3
-65 STORE_FAST 9
-66 LOAD_FAST 0
-67 UNARY_OP 0
-68 NOT
-69 STORE_FAST 10
-70 LOAD_FAST 0
-71 LOAD_DEREF 14
-73 DUP_TOP
-74 ROT_THREE
-75 BINARY_OP 26 __eq__
-76 JUMP_IF_FALSE_OR_POP 84
-79 LOAD_FAST 1
-80 BINARY_OP 26 __eq__
-81 JUMP 86
-84 ROT_TWO
-85 POP_TOP
-86 STORE_FAST 10
-87 LOAD_FAST 0
-88 LOAD_DEREF 14
-90 BINARY_OP 26 __eq__
-91 JUMP_IF_FALSE_OR_POP 98
-94 LOAD_DEREF 14
-96 LOAD_FAST 1
-97 BINARY_OP 26 __eq__
-98 UNARY_OP 0
-99 NOT
-100 STORE_FAST 10
-101 LOAD_DEREF 14
-103 LOAD_ATTR c (cache=0)
-107 STORE_FAST 11
-108 LOAD_FAST 11
-109 LOAD_DEREF 14
-111 STORE_ATTR c (cache=0)
-115 LOAD_DEREF 14
-117 LOAD_CONST_SMALL_INT 0
-118 LOAD_SUBSCR
-119 STORE_FAST 12
-120 LOAD_FAST 12
-121 LOAD_DEREF 14
-123 LOAD_CONST_SMALL_INT 0
-124 STORE_SUBSCR
-125 LOAD_DEREF 14
-127 LOAD_CONST_NONE
-128 LOAD_CONST_NONE
-129 BUILD_SLICE 2
-131 LOAD_SUBSCR
-132 STORE_FAST 0
-133 LOAD_FAST 1
-134 UNPACK_SEQUENCE 2
-136 STORE_FAST 0
-137 STORE_DEREF 14
-139 LOAD_DEREF 14
-141 LOAD_FAST 0
-142 ROT_TWO
-143 STORE_FAST 0
-144 STORE_DEREF 14
-146 LOAD_FAST 1
-147 LOAD_DEREF 14
-149 LOAD_FAST 0
-150 ROT_THREE
-151 ROT_TWO
-152 STORE_FAST 0
-153 STORE_DEREF 14
-155 STORE_FAST 1
-156 DELETE_FAST 0
-158 LOAD_FAST 0
-159 STORE_GLOBAL gl
-162 DELETE_GLOBAL gl
-165 LOAD_FAST 14
-166 LOAD_FAST 15
-167 MAKE_CLOSURE \.\+ 2
+19 LOAD_CONST_SMALL_INT 2
+20 BUILD_TUPLE 2
+22 STORE_DEREF 14
+24 LOAD_CONST_SMALL_INT 1
+25 LOAD_CONST_SMALL_INT 2
+26 BUILD_LIST 2
+28 STORE_FAST 1
+29 LOAD_CONST_SMALL_INT 1
+30 LOAD_CONST_SMALL_INT 2
+31 BUILD_SET 2
+33 STORE_FAST 2
+34 BUILD_MAP 0
+36 STORE_DEREF 15
+38 BUILD_MAP 1
+40 LOAD_CONST_SMALL_INT 2
+41 LOAD_CONST_SMALL_INT 1
+42 STORE_MAP
+43 STORE_FAST 3
+44 LOAD_CONST_STRING 'a'
+47 STORE_FAST 4
+48 LOAD_CONST_BYTES a
+51 STORE_FAST 5
+52 LOAD_CONST_SMALL_INT 1
+53 STORE_FAST 6
+54 LOAD_CONST_SMALL_INT 2
+55 STORE_FAST 7
+56 LOAD_FAST 0
+57 LOAD_DEREF 14
+59 BINARY_OP 5 __add__
+60 STORE_FAST 8
+61 LOAD_FAST 0
+62 UNARY_OP 3
+63 STORE_FAST 9
+64 LOAD_FAST 0
+65 UNARY_OP 0
+66 NOT
+67 STORE_FAST 10
+68 LOAD_FAST 0
+69 LOAD_DEREF 14
+71 DUP_TOP
+72 ROT_THREE
+73 BINARY_OP 26 __eq__
+74 JUMP_IF_FALSE_OR_POP 82
+77 LOAD_FAST 1
+78 BINARY_OP 26 __eq__
+79 JUMP 84
+82 ROT_TWO
+83 POP_TOP
+84 STORE_FAST 10
+85 LOAD_FAST 0
+86 LOAD_DEREF 14
+88 BINARY_OP 26 __eq__
+89 JUMP_IF_FALSE_OR_POP 96
+92 LOAD_DEREF 14
+94 LOAD_FAST 1
+95 BINARY_OP 26 __eq__
+96 UNARY_OP 0
+97 NOT
+98 STORE_FAST 10
+99 LOAD_DEREF 14
+101 LOAD_ATTR c (cache=0)
+105 STORE_FAST 11
+106 LOAD_FAST 11
+107 LOAD_DEREF 14
+109 STORE_ATTR c (cache=0)
+113 LOAD_DEREF 14
+115 LOAD_CONST_SMALL_INT 0
+116 LOAD_SUBSCR
+117 STORE_FAST 12
+118 LOAD_FAST 12
+119 LOAD_DEREF 14
+121 LOAD_CONST_SMALL_INT 0
+122 STORE_SUBSCR
+123 LOAD_DEREF 14
+125 LOAD_CONST_NONE
+126 LOAD_CONST_NONE
+127 BUILD_SLICE 2
+129 LOAD_SUBSCR
+130 STORE_FAST 0
+131 LOAD_FAST 1
+132 UNPACK_SEQUENCE 2
+134 STORE_FAST 0
+135 STORE_DEREF 14
+137 LOAD_DEREF 14
+139 LOAD_FAST 0
+140 ROT_TWO
+141 STORE_FAST 0
+142 STORE_DEREF 14
+144 LOAD_FAST 1
+145 LOAD_DEREF 14
+147 LOAD_FAST 0
+148 ROT_THREE
+149 ROT_TWO
+150 STORE_FAST 0
+151 STORE_DEREF 14
+153 STORE_FAST 1
+154 DELETE_FAST 0
+156 LOAD_FAST 0
+157 STORE_GLOBAL gl
+160 DELETE_GLOBAL gl
+163 LOAD_FAST 14
+164 LOAD_FAST 15
+165 MAKE_CLOSURE \.\+ 2
 \\d\+ LOAD_FAST 2
 \\d\+ GET_ITER
 \\d\+ CALL_FUNCTION n=1 nkw=0