@@ -87,7 +87,7 @@ void dump_tsc(int opcode, int ticked, uint64 inst0, uint64 inst1,
8787 inst = inst1 - inst0 - intr ;
8888 loop = loop1 - loop0 - intr ;
8989 fprintf (stderr , "opcode=%03d t=%d inst=%06lld loop=%06lld\n" ,
90- opcode , ticked , inst , loop );
90+ opcode , ticked , inst , loop );
9191}
9292
9393#endif
@@ -126,10 +126,10 @@ static int prtrace(PyObject *, char *);
126126static int call_trace (Py_tracefunc , PyObject * , PyFrameObject * ,
127127 int , PyObject * );
128128static int call_trace_protected (Py_tracefunc , PyObject * ,
129- PyFrameObject * , int , PyObject * );
129+ PyFrameObject * , int , PyObject * );
130130static void call_exc_trace (Py_tracefunc , PyObject * , PyFrameObject * );
131131static int maybe_call_line_trace (Py_tracefunc , PyObject * ,
132- PyFrameObject * , int * , int * , int * );
132+ PyFrameObject * , int * , int * , int * );
133133
134134static PyObject * cmp_outcome (int , PyObject * , PyObject * );
135135static PyObject * import_from (PyObject * , PyObject * );
@@ -718,14 +718,14 @@ _Py_CheckRecursiveCall(char *where)
718718
719719/* Status code for main loop (reason for stack unwind) */
720720enum why_code {
721- WHY_NOT = 0x0001 , /* No error */
722- WHY_EXCEPTION = 0x0002 , /* Exception occurred */
723- WHY_RERAISE = 0x0004 , /* Exception re-raised by 'finally' */
724- WHY_RETURN = 0x0008 , /* 'return' statement */
725- WHY_BREAK = 0x0010 , /* 'break' statement */
726- WHY_CONTINUE = 0x0020 , /* 'continue' statement */
727- WHY_YIELD = 0x0040 , /* 'yield' operator */
728- WHY_SILENCED = 0x0080 /* Exception silenced by 'with' */
721+ WHY_NOT = 0x0001 , /* No error */
722+ WHY_EXCEPTION = 0x0002 , /* Exception occurred */
723+ WHY_RERAISE = 0x0004 , /* Exception re-raised by 'finally' */
724+ WHY_RETURN = 0x0008 , /* 'return' statement */
725+ WHY_BREAK = 0x0010 , /* 'break' statement */
726+ WHY_CONTINUE = 0x0020 , /* 'continue' statement */
727+ WHY_YIELD = 0x0040 , /* 'yield' operator */
728+ WHY_SILENCED = 0x0080 /* Exception silenced by 'with' */
729729};
730730
731731static enum why_code do_raise (PyObject * , PyObject * );
@@ -1005,38 +1005,38 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
10051005
10061006/* The stack can grow at most MAXINT deep, as co_nlocals and
10071007 co_stacksize are ints. */
1008- #define STACK_LEVEL () ((int)(stack_pointer - f->f_valuestack))
1009- #define EMPTY () (STACK_LEVEL() == 0)
1010- #define TOP () (stack_pointer[-1])
1011- #define SECOND () (stack_pointer[-2])
1012- #define THIRD () (stack_pointer[-3])
1013- #define FOURTH () (stack_pointer[-4])
1014- #define PEEK (n ) (stack_pointer[-(n)])
1015- #define SET_TOP (v ) (stack_pointer[-1] = (v))
1016- #define SET_SECOND (v ) (stack_pointer[-2] = (v))
1017- #define SET_THIRD (v ) (stack_pointer[-3] = (v))
1018- #define SET_FOURTH (v ) (stack_pointer[-4] = (v))
1019- #define SET_VALUE (n , v ) (stack_pointer[-(n)] = (v))
1020- #define BASIC_STACKADJ (n ) (stack_pointer += n)
1021- #define BASIC_PUSH (v ) (*stack_pointer++ = (v))
1022- #define BASIC_POP () (*--stack_pointer)
1008+ #define STACK_LEVEL () ((int)(stack_pointer - f->f_valuestack))
1009+ #define EMPTY () (STACK_LEVEL() == 0)
1010+ #define TOP () (stack_pointer[-1])
1011+ #define SECOND () (stack_pointer[-2])
1012+ #define THIRD () (stack_pointer[-3])
1013+ #define FOURTH () (stack_pointer[-4])
1014+ #define PEEK (n ) (stack_pointer[-(n)])
1015+ #define SET_TOP (v ) (stack_pointer[-1] = (v))
1016+ #define SET_SECOND (v ) (stack_pointer[-2] = (v))
1017+ #define SET_THIRD (v ) (stack_pointer[-3] = (v))
1018+ #define SET_FOURTH (v ) (stack_pointer[-4] = (v))
1019+ #define SET_VALUE (n , v ) (stack_pointer[-(n)] = (v))
1020+ #define BASIC_STACKADJ (n ) (stack_pointer += n)
1021+ #define BASIC_PUSH (v ) (*stack_pointer++ = (v))
1022+ #define BASIC_POP () (*--stack_pointer)
10231023
10241024#ifdef LLTRACE
10251025#define PUSH (v ) { (void)(BASIC_PUSH(v), \
1026- lltrace && prtrace(TOP(), "push")); \
1027- assert(STACK_LEVEL() <= co->co_stacksize); }
1026+ lltrace && prtrace(TOP(), "push")); \
1027+ assert(STACK_LEVEL() <= co->co_stacksize); }
10281028#define POP () ((void)(lltrace && prtrace(TOP(), "pop")), \
1029- BASIC_POP())
1029+ BASIC_POP())
10301030#define STACKADJ (n ) { (void)(BASIC_STACKADJ(n), \
1031- lltrace && prtrace(TOP(), "stackadj")); \
1032- assert(STACK_LEVEL() <= co->co_stacksize); }
1031+ lltrace && prtrace(TOP(), "stackadj")); \
1032+ assert(STACK_LEVEL() <= co->co_stacksize); }
10331033#define EXT_POP (STACK_POINTER ) ((void)(lltrace && \
1034- prtrace((STACK_POINTER)[-1], "ext_pop")), \
1035- *--(STACK_POINTER))
1034+ prtrace((STACK_POINTER)[-1], "ext_pop")), \
1035+ *--(STACK_POINTER))
10361036#else
1037- #define PUSH (v ) BASIC_PUSH(v)
1038- #define POP () BASIC_POP()
1039- #define STACKADJ (n ) BASIC_STACKADJ(n)
1037+ #define PUSH (v ) BASIC_PUSH(v)
1038+ #define POP () BASIC_POP()
1039+ #define STACKADJ (n ) BASIC_STACKADJ(n)
10401040#define EXT_POP (STACK_POINTER ) (*--(STACK_POINTER))
10411041#endif
10421042
@@ -1051,8 +1051,8 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
10511051 accessed by other code (e.g. a __del__ method or gc.collect()) and the
10521052 variable would be pointing to already-freed memory. */
10531053#define SETLOCAL (i , value ) do { PyObject *tmp = GETLOCAL(i); \
1054- GETLOCAL(i) = value; \
1055- Py_XDECREF(tmp); } while (0)
1054+ GETLOCAL(i) = value; \
1055+ Py_XDECREF(tmp); } while (0)
10561056
10571057
10581058#define UNWIND_BLOCK (b ) \
@@ -1318,7 +1318,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
13181318 it doesn't have to be remembered across a full loop */
13191319 if (HAS_ARG (opcode ))
13201320 oparg = NEXTARG ();
1321- dispatch_opcode :
1321+ dispatch_opcode :
13221322#ifdef DYNAMIC_EXECUTION_PROFILE
13231323#ifdef DXPAIRS
13241324 dxpairs [lastopcode ][opcode ]++ ;
@@ -2174,8 +2174,8 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
21742174 break ;
21752175 if (oparg < PyTuple_GET_SIZE (co -> co_cellvars )) {
21762176 v = PyTuple_GET_ITEM (co -> co_cellvars ,
2177- oparg );
2178- format_exc_check_arg (
2177+ oparg );
2178+ format_exc_check_arg (
21792179 PyExc_UnboundLocalError ,
21802180 UNBOUNDLOCAL_ERROR_MSG ,
21812181 v );
@@ -2695,7 +2695,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
26952695 func = * pfunc ;
26962696
26972697 if (PyMethod_Check (func )
2698- && PyMethod_GET_SELF (func ) != NULL ) {
2698+ && PyMethod_GET_SELF (func ) != NULL ) {
26992699 PyObject * self = PyMethod_GET_SELF (func );
27002700 Py_INCREF (self );
27012701 func = PyMethod_GET_FUNCTION (func );
0 commit comments