Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #8930: Remaining indentation fixes after the Grand Unified Indenting.

This commit is contained in:
Stefan Krah 2010-06-23 18:17:18 +00:00
parent e6c4244b06
commit 27db0d20de
1 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
Python/ceval.c
View File

@ -87,7 +87,7 @@ void dump_tsc(int opcode, int ticked, uint64 inst0, uint64 inst1,
inst = inst1 - inst0 - intr; inst = inst1 - inst0 - intr;
loop = loop1 - loop0 - intr; loop = loop1 - loop0 - intr;
fprintf(stderr, "opcode=%03d t=%d inst=%06lld loop=%06lld\n", fprintf(stderr, "opcode=%03d t=%d inst=%06lld loop=%06lld\n",
opcode, ticked, inst, loop); opcode, ticked, inst, loop);
} }
#endif #endif
@ -126,10 +126,10 @@ static int prtrace(PyObject *, char *);
static int call_trace(Py_tracefunc, PyObject *, PyFrameObject *, static int call_trace(Py_tracefunc, PyObject *, PyFrameObject *,
int, PyObject *); int, PyObject *);
static int call_trace_protected(Py_tracefunc, PyObject *, static int call_trace_protected(Py_tracefunc, PyObject *,
PyFrameObject *, int, PyObject *); PyFrameObject *, int, PyObject *);
static void call_exc_trace(Py_tracefunc, PyObject *, PyFrameObject *); static void call_exc_trace(Py_tracefunc, PyObject *, PyFrameObject *);
static int maybe_call_line_trace(Py_tracefunc, PyObject *, static int maybe_call_line_trace(Py_tracefunc, PyObject *,
PyFrameObject *, int *, int *, int *); PyFrameObject *, int *, int *, int *);
static PyObject * apply_slice(PyObject *, PyObject *, PyObject *); static PyObject * apply_slice(PyObject *, PyObject *, PyObject *);
static int assign_slice(PyObject *, PyObject *, static int assign_slice(PyObject *, PyObject *,
@ -144,7 +144,7 @@ static void set_exc_info(PyThreadState *, PyObject *, PyObject *, PyObject *);
static void reset_exc_info(PyThreadState *); static void reset_exc_info(PyThreadState *);
static void format_exc_check_arg(PyObject *, char *, PyObject *); static void format_exc_check_arg(PyObject *, char *, PyObject *);
static PyObject * string_concatenate(PyObject *, PyObject *, static PyObject * string_concatenate(PyObject *, PyObject *,
PyFrameObject *, unsigned char *); PyFrameObject *, unsigned char *);
static PyObject * kwd_as_string(PyObject *); static PyObject * kwd_as_string(PyObject *);
#define NAME_ERROR_MSG \ #define NAME_ERROR_MSG \
@ -511,13 +511,13 @@ _Py_CheckRecursiveCall(char *where)
/* Status code for main loop (reason for stack unwind) */ /* Status code for main loop (reason for stack unwind) */
enum why_code { enum why_code {
WHY_NOT = 0x0001, /* No error */ WHY_NOT = 0x0001, /* No error */
WHY_EXCEPTION = 0x0002, /* Exception occurred */ WHY_EXCEPTION = 0x0002, /* Exception occurred */
WHY_RERAISE = 0x0004, /* Exception re-raised by 'finally' */ WHY_RERAISE = 0x0004, /* Exception re-raised by 'finally' */
WHY_RETURN = 0x0008, /* 'return' statement */ WHY_RETURN = 0x0008, /* 'return' statement */
WHY_BREAK = 0x0010, /* 'break' statement */ WHY_BREAK = 0x0010, /* 'break' statement */
WHY_CONTINUE = 0x0020, /* 'continue' statement */ WHY_CONTINUE = 0x0020, /* 'continue' statement */
WHY_YIELD = 0x0040 /* 'yield' operator */ WHY_YIELD = 0x0040 /* 'yield' operator */
}; };
static enum why_code do_raise(PyObject *, PyObject *, PyObject *); static enum why_code do_raise(PyObject *, PyObject *, PyObject *);
@ -690,36 +690,36 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
/* The stack can grow at most MAXINT deep, as co_nlocals and /* The stack can grow at most MAXINT deep, as co_nlocals and
co_stacksize are ints. */ co_stacksize are ints. */
#define STACK_LEVEL() ((int)(stack_pointer - f->f_valuestack)) #define STACK_LEVEL() ((int)(stack_pointer - f->f_valuestack))
#define EMPTY() (STACK_LEVEL() == 0) #define EMPTY() (STACK_LEVEL() == 0)
#define TOP() (stack_pointer[-1]) #define TOP() (stack_pointer[-1])
#define SECOND() (stack_pointer[-2]) #define SECOND() (stack_pointer[-2])
#define THIRD() (stack_pointer[-3]) #define THIRD() (stack_pointer[-3])
#define FOURTH() (stack_pointer[-4]) #define FOURTH() (stack_pointer[-4])
#define SET_TOP(v) (stack_pointer[-1] = (v)) #define SET_TOP(v) (stack_pointer[-1] = (v))
#define SET_SECOND(v) (stack_pointer[-2] = (v)) #define SET_SECOND(v) (stack_pointer[-2] = (v))
#define SET_THIRD(v) (stack_pointer[-3] = (v)) #define SET_THIRD(v) (stack_pointer[-3] = (v))
#define SET_FOURTH(v) (stack_pointer[-4] = (v)) #define SET_FOURTH(v) (stack_pointer[-4] = (v))
#define BASIC_STACKADJ(n) (stack_pointer += n) #define BASIC_STACKADJ(n) (stack_pointer += n)
#define BASIC_PUSH(v) (*stack_pointer++ = (v)) #define BASIC_PUSH(v) (*stack_pointer++ = (v))
#define BASIC_POP() (*--stack_pointer) #define BASIC_POP() (*--stack_pointer)
#ifdef LLTRACE #ifdef LLTRACE
#define PUSH(v) { (void)(BASIC_PUSH(v), \ #define PUSH(v) { (void)(BASIC_PUSH(v), \
lltrace && prtrace(TOP(), "push")); \ lltrace && prtrace(TOP(), "push")); \
assert(STACK_LEVEL() <= co->co_stacksize); } assert(STACK_LEVEL() <= co->co_stacksize); }
#define POP() ((void)(lltrace && prtrace(TOP(), "pop")), \ #define POP() ((void)(lltrace && prtrace(TOP(), "pop")), \
BASIC_POP()) BASIC_POP())
#define STACKADJ(n) { (void)(BASIC_STACKADJ(n), \ #define STACKADJ(n) { (void)(BASIC_STACKADJ(n), \
lltrace && prtrace(TOP(), "stackadj")); \ lltrace && prtrace(TOP(), "stackadj")); \
assert(STACK_LEVEL() <= co->co_stacksize); } assert(STACK_LEVEL() <= co->co_stacksize); }
#define EXT_POP(STACK_POINTER) ((void)(lltrace && \ #define EXT_POP(STACK_POINTER) ((void)(lltrace && \
prtrace((STACK_POINTER)[-1], "ext_pop")), \ prtrace((STACK_POINTER)[-1], "ext_pop")), \
*--(STACK_POINTER)) *--(STACK_POINTER))
#else #else
#define PUSH(v) BASIC_PUSH(v) #define PUSH(v) BASIC_PUSH(v)
#define POP() BASIC_POP() #define POP() BASIC_POP()
#define STACKADJ(n) BASIC_STACKADJ(n) #define STACKADJ(n) BASIC_STACKADJ(n)
#define EXT_POP(STACK_POINTER) (*--(STACK_POINTER)) #define EXT_POP(STACK_POINTER) (*--(STACK_POINTER))
#endif #endif
@ -734,8 +734,8 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
accessed by other code (e.g. a __del__ method or gc.collect()) and the accessed by other code (e.g. a __del__ method or gc.collect()) and the
variable would be pointing to already-freed memory. */ variable would be pointing to already-freed memory. */
#define SETLOCAL(i, value) do { PyObject *tmp = GETLOCAL(i); \ #define SETLOCAL(i, value) do { PyObject *tmp = GETLOCAL(i); \
GETLOCAL(i) = value; \ GETLOCAL(i) = value; \
Py_XDECREF(tmp); } while (0) Py_XDECREF(tmp); } while (0)
/* Start of code */ /* Start of code */
@ -941,7 +941,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
it doesn't have to be remembered across a full loop */ it doesn't have to be remembered across a full loop */
if (HAS_ARG(opcode)) if (HAS_ARG(opcode))
oparg = NEXTARG(); oparg = NEXTARG();
dispatch_opcode: dispatch_opcode:
#ifdef DYNAMIC_EXECUTION_PROFILE #ifdef DYNAMIC_EXECUTION_PROFILE
#ifdef DXPAIRS #ifdef DXPAIRS
dxpairs[lastopcode][opcode]++; dxpairs[lastopcode][opcode]++;
@ -1152,7 +1152,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
if (x != NULL) continue; if (x != NULL) continue;
break; break;
} }
/* -Qnew is in effect: fall through to /* -Qnew is in effect: fall through to
BINARY_TRUE_DIVIDE */ BINARY_TRUE_DIVIDE */
case BINARY_TRUE_DIVIDE: case BINARY_TRUE_DIVIDE:
w = POP(); w = POP();
@ -1358,7 +1358,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
if (x != NULL) continue; if (x != NULL) continue;
break; break;
} }
/* -Qnew is in effect: fall through to /* -Qnew is in effect: fall through to
INPLACE_TRUE_DIVIDE */ INPLACE_TRUE_DIVIDE */
case INPLACE_TRUE_DIVIDE: case INPLACE_TRUE_DIVIDE:
w = POP(); w = POP();
@ -1631,25 +1631,25 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
if (err == 0) { if (err == 0) {
/* XXX move into writeobject() ? */ /* XXX move into writeobject() ? */
if (PyString_Check(v)) { if (PyString_Check(v)) {
char *s = PyString_AS_STRING(v); char *s = PyString_AS_STRING(v);
Py_ssize_t len = PyString_GET_SIZE(v); Py_ssize_t len = PyString_GET_SIZE(v);
if (len == 0 || if (len == 0 ||
!isspace(Py_CHARMASK(s[len-1])) || !isspace(Py_CHARMASK(s[len-1])) ||
s[len-1] == ' ') s[len-1] == ' ')
PyFile_SoftSpace(w, 1); PyFile_SoftSpace(w, 1);
} }
#ifdef Py_USING_UNICODE #ifdef Py_USING_UNICODE
else if (PyUnicode_Check(v)) { else if (PyUnicode_Check(v)) {
Py_UNICODE *s = PyUnicode_AS_UNICODE(v); Py_UNICODE *s = PyUnicode_AS_UNICODE(v);
Py_ssize_t len = PyUnicode_GET_SIZE(v); Py_ssize_t len = PyUnicode_GET_SIZE(v);
if (len == 0 || if (len == 0 ||
!Py_UNICODE_ISSPACE(s[len-1]) || !Py_UNICODE_ISSPACE(s[len-1]) ||
s[len-1] == ' ') s[len-1] == ' ')
PyFile_SoftSpace(w, 1); PyFile_SoftSpace(w, 1);
} }
#endif #endif
else else
PyFile_SoftSpace(w, 1); PyFile_SoftSpace(w, 1);
} }
Py_XDECREF(w); Py_XDECREF(w);
Py_DECREF(v); Py_DECREF(v);
@ -2014,8 +2014,8 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
break; break;
if (oparg < PyTuple_GET_SIZE(co->co_cellvars)) { if (oparg < PyTuple_GET_SIZE(co->co_cellvars)) {
v = PyTuple_GET_ITEM(co->co_cellvars, v = PyTuple_GET_ITEM(co->co_cellvars,
oparg); oparg);
format_exc_check_arg( format_exc_check_arg(
PyExc_UnboundLocalError, PyExc_UnboundLocalError,
UNBOUNDLOCAL_ERROR_MSG, UNBOUNDLOCAL_ERROR_MSG,
v); v);
@ -2436,7 +2436,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
func = *pfunc; func = *pfunc;
if (PyMethod_Check(func) if (PyMethod_Check(func)
&& PyMethod_GET_SELF(func) != NULL) { && PyMethod_GET_SELF(func) != NULL) {
PyObject *self = PyMethod_GET_SELF(func); PyObject *self = PyMethod_GET_SELF(func);
Py_INCREF(self); Py_INCREF(self);
func = PyMethod_GET_FUNCTION(func); func = PyMethod_GET_FUNCTION(func);