@@ -1029,28 +1029,31 @@ def expected(count, w):
1029
1029
s = ['''\
1030
1030
1 %*d RESUME 0
1031
1031
1032
+ ''' % (w , 0 )]
1033
+ s += ['''\
1032
1034
2 %*d LOAD_FAST 0 (x)
1033
1035
%*d LOAD_CONST 1 (1)
1034
1036
%*d BINARY_OP 0 (+)
1035
- ''' % (w , 0 , w , 2 , w , 4 , w , 6 )]
1037
+ ''' % (w , 2 , w , 4 , w , 6 )]
1036
1038
s += ['''\
1037
- %*d STORE_FAST_LOAD_FAST 0 (x, x)
1039
+ %*d POP_TOP
1040
+ %*d LOAD_FAST 0 (x)
1038
1041
%*d LOAD_CONST 1 (1)
1039
1042
%*d BINARY_OP 0 (+)
1040
- ''' % (w , 8 * i + 10 , w , 8 * i + 12 , w , 8 * i + 14 )
1041
- for i in range (count - 1 )]
1043
+ ''' % (w , 10 * ( i + 1 ), w , 10 * ( i + 1 ) + 2 , w , 10 * ( i + 1 ) + 4 , w , 10 * ( i + 1 ) + 6 )
1044
+ for i in range (count - 1 )]
1042
1045
s += ['''\
1043
1046
%*d STORE_FAST 0 (x)
1044
1047
1045
1048
3 %*d LOAD_FAST 0 (x)
1046
1049
%*d RETURN_VALUE
1047
- ''' % (w , 8 * count + 2 , w , 8 * count + 4 , w , 8 * count + 6 )]
1050
+ ''' % (w , 10 * count , w , 10 * count + 2 , w , 10 * count + 4 )]
1048
1051
return '' .join (s )
1049
1052
1050
1053
for i in range (1 , 5 ):
1051
1054
self .do_disassembly_test (func (i ), expected (i , 4 ), True )
1052
- self .do_disassembly_test (func (1200 ), expected (1200 , 4 ), True )
1053
- self .do_disassembly_test (func (1300 ), expected (1300 , 5 ), True )
1055
+ self .do_disassembly_test (func (999 ), expected (999 , 4 ), True )
1056
+ self .do_disassembly_test (func (1000 ), expected (1000 , 5 ), True )
1054
1057
1055
1058
def test_disassemble_str (self ):
1056
1059
self .do_disassembly_test (expr_str , dis_expr_str )
0 commit comments