@@ -179,7 +179,7 @@ struct compiler {
179179static int compiler_enter_scope (struct compiler * , identifier , int , void * , int );
180180static void compiler_free (struct compiler * );
181181static basicblock * compiler_new_block (struct compiler * );
182- static int compiler_next_instr (struct compiler * , basicblock * );
182+ static int compiler_next_instr (basicblock * );
183183static int compiler_addop (struct compiler * , int );
184184static int compiler_addop_i (struct compiler * , int , Py_ssize_t );
185185static int compiler_addop_j (struct compiler * , int , basicblock * , int );
@@ -196,7 +196,7 @@ static int compiler_annassign(struct compiler *, stmt_ty);
196196static int compiler_subscript (struct compiler * , expr_ty );
197197static int compiler_slice (struct compiler * , expr_ty );
198198
199- static int inplace_binop (struct compiler * , operator_ty );
199+ static int inplace_binop (operator_ty );
200200static int are_all_items_const (asdl_seq * , Py_ssize_t , Py_ssize_t );
201201static int expr_constant (expr_ty );
202202
@@ -803,7 +803,7 @@ compiler_use_next_block(struct compiler *c, basicblock *block)
803803*/
804804
805805static int
806- compiler_next_instr (struct compiler * c , basicblock * b )
806+ compiler_next_instr (basicblock * b )
807807{
808808 assert (b != NULL );
809809 if (b -> b_instr == NULL ) {
@@ -1159,7 +1159,7 @@ compiler_addop(struct compiler *c, int opcode)
11591159 if (c -> c_do_not_emit_bytecode ) {
11601160 return 1 ;
11611161 }
1162- off = compiler_next_instr (c , c -> u -> u_curblock );
1162+ off = compiler_next_instr (c -> u -> u_curblock );
11631163 if (off < 0 )
11641164 return 0 ;
11651165 b = c -> u -> u_curblock ;
@@ -1173,7 +1173,7 @@ compiler_addop(struct compiler *c, int opcode)
11731173}
11741174
11751175static Py_ssize_t
1176- compiler_add_o (struct compiler * c , PyObject * dict , PyObject * o )
1176+ compiler_add_o (PyObject * dict , PyObject * o )
11771177{
11781178 PyObject * v ;
11791179 Py_ssize_t arg ;
@@ -1321,7 +1321,7 @@ compiler_add_const(struct compiler *c, PyObject *o)
13211321 return -1 ;
13221322 }
13231323
1324- Py_ssize_t arg = compiler_add_o (c , c -> u -> u_consts , key );
1324+ Py_ssize_t arg = compiler_add_o (c -> u -> u_consts , key );
13251325 Py_DECREF (key );
13261326 return arg ;
13271327}
@@ -1347,7 +1347,7 @@ compiler_addop_o(struct compiler *c, int opcode, PyObject *dict,
13471347 return 1 ;
13481348 }
13491349
1350- Py_ssize_t arg = compiler_add_o (c , dict , o );
1350+ Py_ssize_t arg = compiler_add_o (dict , o );
13511351 if (arg < 0 )
13521352 return 0 ;
13531353 return compiler_addop_i (c , opcode , arg );
@@ -1366,7 +1366,7 @@ compiler_addop_name(struct compiler *c, int opcode, PyObject *dict,
13661366 PyObject * mangled = _Py_Mangle (c -> u -> u_private , o );
13671367 if (!mangled )
13681368 return 0 ;
1369- arg = compiler_add_o (c , dict , mangled );
1369+ arg = compiler_add_o (dict , mangled );
13701370 Py_DECREF (mangled );
13711371 if (arg < 0 )
13721372 return 0 ;
@@ -1397,7 +1397,7 @@ compiler_addop_i(struct compiler *c, int opcode, Py_ssize_t oparg)
13971397 assert (HAS_ARG (opcode ));
13981398 assert (0 <= oparg && oparg <= 2147483647 );
13991399
1400- off = compiler_next_instr (c , c -> u -> u_curblock );
1400+ off = compiler_next_instr (c -> u -> u_curblock );
14011401 if (off < 0 )
14021402 return 0 ;
14031403 i = & c -> u -> u_curblock -> b_instr [off ];
@@ -1419,7 +1419,7 @@ compiler_addop_j(struct compiler *c, int opcode, basicblock *b, int absolute)
14191419
14201420 assert (HAS_ARG (opcode ));
14211421 assert (b != NULL );
1422- off = compiler_next_instr (c , c -> u -> u_curblock );
1422+ off = compiler_next_instr (c -> u -> u_curblock );
14231423 if (off < 0 )
14241424 return 0 ;
14251425 i = & c -> u -> u_curblock -> b_instr [off ];
@@ -3439,7 +3439,7 @@ unaryop(unaryop_ty op)
34393439}
34403440
34413441static int
3442- binop (struct compiler * c , operator_ty op )
3442+ binop (operator_ty op )
34433443{
34443444 switch (op ) {
34453445 case Add :
@@ -3476,7 +3476,7 @@ binop(struct compiler *c, operator_ty op)
34763476}
34773477
34783478static int
3479- inplace_binop (struct compiler * c , operator_ty op )
3479+ inplace_binop (operator_ty op )
34803480{
34813481 switch (op ) {
34823482 case Add :
@@ -3637,7 +3637,7 @@ compiler_nameop(struct compiler *c, identifier name, expr_context_ty ctx)
36373637 }
36383638
36393639 assert (op );
3640- arg = compiler_add_o (c , dict , mangled );
3640+ arg = compiler_add_o (dict , mangled );
36413641 Py_DECREF (mangled );
36423642 if (arg < 0 )
36433643 return 0 ;
@@ -4961,7 +4961,7 @@ compiler_visit_expr1(struct compiler *c, expr_ty e)
49614961 case BinOp_kind :
49624962 VISIT (c , expr , e -> v .BinOp .left );
49634963 VISIT (c , expr , e -> v .BinOp .right );
4964- ADDOP (c , binop (c , e -> v .BinOp .op ));
4964+ ADDOP (c , binop (e -> v .BinOp .op ));
49654965 break ;
49664966 case UnaryOp_kind :
49674967 VISIT (c , expr , e -> v .UnaryOp .operand );
@@ -5130,7 +5130,7 @@ compiler_augassign(struct compiler *c, stmt_ty s)
51305130 return 0 ;
51315131 VISIT (c , expr , auge );
51325132 VISIT (c , expr , s -> v .AugAssign .value );
5133- ADDOP (c , inplace_binop (c , s -> v .AugAssign .op ));
5133+ ADDOP (c , inplace_binop (s -> v .AugAssign .op ));
51345134 auge -> v .Attribute .ctx = AugStore ;
51355135 VISIT (c , expr , auge );
51365136 break ;
@@ -5142,15 +5142,15 @@ compiler_augassign(struct compiler *c, stmt_ty s)
51425142 return 0 ;
51435143 VISIT (c , expr , auge );
51445144 VISIT (c , expr , s -> v .AugAssign .value );
5145- ADDOP (c , inplace_binop (c , s -> v .AugAssign .op ));
5145+ ADDOP (c , inplace_binop (s -> v .AugAssign .op ));
51465146 auge -> v .Subscript .ctx = AugStore ;
51475147 VISIT (c , expr , auge );
51485148 break ;
51495149 case Name_kind :
51505150 if (!compiler_nameop (c , e -> v .Name .id , Load ))
51515151 return 0 ;
51525152 VISIT (c , expr , s -> v .AugAssign .value );
5153- ADDOP (c , inplace_binop (c , s -> v .AugAssign .op ));
5153+ ADDOP (c , inplace_binop (s -> v .AugAssign .op ));
51545154 return compiler_nameop (c , e -> v .Name .id , Store );
51555155 default :
51565156 PyErr_Format (PyExc_SystemError ,
0 commit comments