[Python-checkins] r84931 - in python/branches/py3k: Include/symtable.h Misc/NEWS Python/ast.c Python/compile.c Python/future.c Python/symtable.c

Tue Sep 21 01:02:11 CEST 2010

Author: benjamin.peterson
Date: Tue Sep 21 01:02:10 2010
New Revision: 84931
Log:
add column offset to all syntax errors
Modified:
 python/branches/py3k/Include/symtable.h
 python/branches/py3k/Misc/NEWS
 python/branches/py3k/Python/ast.c
 python/branches/py3k/Python/compile.c
 python/branches/py3k/Python/future.c
 python/branches/py3k/Python/symtable.c
Modified: python/branches/py3k/Include/symtable.h
==============================================================================

--- python/branches/py3k/Include/symtable.h	(original)
+++ python/branches/py3k/Include/symtable.h	Tue Sep 21 01:02:10 2010
@@ -46,7 +46,9 @@
 unsigned ste_returns_value : 1; /* true if namespace uses return with
 an argument */
 int ste_lineno; /* first line of block */
+ int ste_col_offset; /* offset of first line of block */
 int ste_opt_lineno; /* lineno of last exec or import * */
+ int ste_opt_col_offset; /* offset of last exec or import * */
 int ste_tmpname; /* counter for listcomp temp vars */
 struct symtable *ste_table;
 } PySTEntryObject;
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Tue Sep 21 01:02:10 2010
@@ -10,9 +10,8 @@
 Core and Builtins
 -----------------
 
-- Issue #9901: Destroying the GIL in Py_Finalize() can fail if some other
- threads are still running. Instead, reinitialize the GIL on a second
- call to Py_Initialize().
+- All SyntaxErrors now have a column offset and therefore a caret when the error
+ is printed.
 
 - Issue #9252: PyImport_Import no longer uses a fromlist hack to return the
 module that was imported, but instead gets the module from sys.modules.
@@ -59,10 +58,6 @@
 Library
 -------
 
-- Issue #9877: Expose sysconfig.get_makefile_filename()
-
-- logging: Added hasHandlers() method to Logger and LoggerAdapter.
-
 - Issue #1686: Fix string.Template when overriding the pattern attribute.
 
 - Issue #9854: SocketIO objects now observe the RawIOBase interface in
Modified: python/branches/py3k/Python/ast.c
==============================================================================
--- python/branches/py3k/Python/ast.c	(original)
+++ python/branches/py3k/Python/ast.c	Tue Sep 21 01:02:10 2010
@@ -90,7 +90,7 @@
 static int
 ast_error(const node *n, const char *errstr)
 {
- PyObject *u = Py_BuildValue("zi", errstr, LINENO(n));
+ PyObject *u = Py_BuildValue("zii", errstr, LINENO(n), n->n_col_offset);
 if (!u)
 return 0;
 PyErr_SetObject(PyExc_SyntaxError, u);
@@ -101,7 +101,7 @@
 static void
 ast_error_finish(const char *filename)
 {
- PyObject *type, *value, *tback, *errstr, *loc, *tmp;
+ PyObject *type, *value, *tback, *errstr, *offset, *loc, *tmp;
 long lineno;
 
 assert(PyErr_Occurred());
@@ -118,6 +118,11 @@
 Py_DECREF(errstr);
 return;
 }
+ offset = PyTuple_GetItem(value, 2);
+ if (!offset) {
+ Py_DECREF(errstr);
+ return;
+ }
 Py_DECREF(value);
 
 loc = PyErr_ProgramText(filename, lineno);
@@ -125,7 +130,7 @@
 Py_INCREF(Py_None);
 loc = Py_None;
 }
- tmp = Py_BuildValue("(zlOO)", filename, lineno, Py_None, loc);
+ tmp = Py_BuildValue("(zlOO)", filename, lineno, offset, loc);
 Py_DECREF(loc);
 if (!tmp) {
 Py_DECREF(errstr);
Modified: python/branches/py3k/Python/compile.c
==============================================================================
--- python/branches/py3k/Python/compile.c	(original)
+++ python/branches/py3k/Python/compile.c	Tue Sep 21 01:02:10 2010
@@ -123,6 +123,7 @@
 
 int u_firstlineno; /* the first lineno of the block */
 int u_lineno; /* the lineno for the current stmt */
+ int u_col_offset; /* the offset of the current stmt */
 int u_lineno_set; /* boolean to indicate whether instr
 has been generated with current lineno */
 };
@@ -486,6 +487,7 @@
 u->u_nfblocks = 0;
 u->u_firstlineno = lineno;
 u->u_lineno = 0;
+ u->u_col_offset = 0;
 u->u_lineno_set = 0;
 u->u_consts = PyDict_New();
 if (!u->u_consts) {
@@ -1965,6 +1967,7 @@
 return compiler_error(c, "default 'except:' must be last");
 c->u->u_lineno_set = 0;
 c->u->u_lineno = handler->lineno;
+ c->u->u_col_offset = handler->col_offset;
 except = compiler_new_block(c);
 if (except == NULL)
 return 0;
@@ -2247,6 +2250,7 @@
 
 /* Always assign a lineno to the next instruction for a stmt. */
 c->u->u_lineno = s->lineno;
+ c->u->u_col_offset = s->col_offset;
 c->u->u_lineno_set = 0;
 
 switch (s->kind) {
@@ -3122,6 +3126,8 @@
 c->u->u_lineno = e->lineno;
 c->u->u_lineno_set = 0;
 }
+ /* Updating the column offset is always harmless. */
+ c->u->u_col_offset = e->col_offset;
 switch (e->kind) {
 case BoolOp_kind:
 return compiler_boolop(c, e);
@@ -3363,8 +3369,8 @@
 Py_INCREF(Py_None);
 loc = Py_None;
 }
- u = Py_BuildValue("(ziOO)", c->c_filename, c->u->u_lineno,
- Py_None, loc);
+ u = Py_BuildValue("(ziiO)", c->c_filename, c->u->u_lineno,
+ c->u->u_col_offset, loc);
 if (!u)
 goto exit;
 v = Py_BuildValue("(zO)", errstr, u);
Modified: python/branches/py3k/Python/future.c
==============================================================================
--- python/branches/py3k/Python/future.c	(original)
+++ python/branches/py3k/Python/future.c	Tue Sep 21 01:02:10 2010
@@ -44,12 +44,12 @@
 } else if (strcmp(feature, "braces") == 0) {
 PyErr_SetString(PyExc_SyntaxError,
 "not a chance");
- PyErr_SyntaxLocation(filename, s->lineno);
+ PyErr_SyntaxLocationEx(filename, s->lineno, s->col_offset);
 return 0;
 } else {
 PyErr_Format(PyExc_SyntaxError,
 UNDEFINED_FUTURE_FEATURE, feature);
- PyErr_SyntaxLocation(filename, s->lineno);
+ PyErr_SyntaxLocationEx(filename, s->lineno, s->col_offset);
 return 0;
 }
 }
@@ -98,8 +98,7 @@
 if (done) {
 PyErr_SetString(PyExc_SyntaxError,
 ERR_LATE_FUTURE);
- PyErr_SyntaxLocation(filename,
- s->lineno);
+ PyErr_SyntaxLocationEx(filename, s->lineno, s->col_offset);
 return 0;
 }
 if (!future_check_features(ff, s, filename))
Modified: python/branches/py3k/Python/symtable.c
==============================================================================
--- python/branches/py3k/Python/symtable.c	(original)
+++ python/branches/py3k/Python/symtable.c	Tue Sep 21 01:02:10 2010
@@ -25,7 +25,7 @@
 
 static PySTEntryObject *
 ste_new(struct symtable *st, identifier name, _Py_block_ty block,
- void *key, int lineno)
+ void *key, int lineno, int col_offset)
 {
 PySTEntryObject *ste = NULL;
 PyObject *k;
@@ -65,7 +65,9 @@
 ste->ste_varargs = 0;
 ste->ste_varkeywords = 0;
 ste->ste_opt_lineno = 0;
+ ste->ste_opt_col_offset = 0;
 ste->ste_lineno = lineno;
+ ste->ste_col_offset = col_offset;
 
 if (st->st_cur != NULL &&
 (st->st_cur->ste_nested ||
@@ -163,7 +165,8 @@
 static int symtable_analyze(struct symtable *st);
 static int symtable_warn(struct symtable *st, char *msg, int lineno);
 static int symtable_enter_block(struct symtable *st, identifier name,
- _Py_block_ty block, void *ast, int lineno);
+ _Py_block_ty block, void *ast, int lineno,
+ int col_offset);
 static int symtable_exit_block(struct symtable *st, void *ast);
 static int symtable_visit_stmt(struct symtable *st, stmt_ty s);
 static int symtable_visit_expr(struct symtable *st, expr_ty s);
@@ -230,7 +233,7 @@
 st->st_future = future;
 /* Make the initial symbol information gathering pass */
 if (!GET_IDENTIFIER(top) ||
- !symtable_enter_block(st, top, ModuleBlock, (void *)mod, 0)) {
+ !symtable_enter_block(st, top, ModuleBlock, (void *)mod, 0, 0)) {
 PySymtable_Free(st);
 return NULL;
 }
@@ -390,8 +393,8 @@
 PyErr_Format(PyExc_SyntaxError,
 "name '%U' is parameter and global",
 name);
- PyErr_SyntaxLocation(ste->ste_table->st_filename,
- ste->ste_lineno);
+ PyErr_SyntaxLocationEx(ste->ste_table->st_filename,
+ ste->ste_lineno, ste->ste_col_offset);
 
 return 0;
 }
@@ -534,8 +537,8 @@
 break;
 }
 
- PyErr_SyntaxLocation(ste->ste_table->st_filename,
- ste->ste_opt_lineno);
+ PyErr_SyntaxLocationEx(ste->ste_table->st_filename, ste->ste_opt_lineno,
+ ste->ste_opt_col_offset);
 return 0;
 }
 
@@ -873,8 +876,8 @@
 lineno, NULL, NULL) < 0) {
 if (PyErr_ExceptionMatches(PyExc_SyntaxWarning)) {
 PyErr_SetString(PyExc_SyntaxError, msg);
- PyErr_SyntaxLocation(st->st_filename,
- st->st_cur->ste_lineno);
+ PyErr_SyntaxLocationEx(st->st_filename, st->st_cur->ste_lineno,
+ st->st_cur->ste_col_offset);
 }
 return 0;
 }
@@ -907,7 +910,7 @@
 
 static int
 symtable_enter_block(struct symtable *st, identifier name, _Py_block_ty block,
- void *ast, int lineno)
+ void *ast, int lineno, int col_offset)
 {
 PySTEntryObject *prev = NULL;
 
@@ -918,7 +921,7 @@
 }
 Py_DECREF(st->st_cur);
 }
- st->st_cur = ste_new(st, name, block, ast, lineno);
+ st->st_cur = ste_new(st, name, block, ast, lineno, col_offset);
 if (st->st_cur == NULL)
 return 0;
 if (name == GET_IDENTIFIER(top))
@@ -963,8 +966,9 @@
 if ((flag & DEF_PARAM) && (val & DEF_PARAM)) {
 /* Is it better to use 'mangled' or 'name' here? */
 PyErr_Format(PyExc_SyntaxError, DUPLICATE_ARGUMENT, name);
- PyErr_SyntaxLocation(st->st_filename,
- st->st_cur->ste_lineno);
+ PyErr_SyntaxLocationEx(st->st_filename,
+ st->st_cur->ste_lineno,
+ st->st_cur->ste_col_offset);
 goto error;
 }
 val |= flag;
@@ -1114,7 +1118,8 @@
 if (s->v.FunctionDef.decorator_list)
 VISIT_SEQ(st, expr, s->v.FunctionDef.decorator_list);
 if (!symtable_enter_block(st, s->v.FunctionDef.name,
- FunctionBlock, (void *)s, s->lineno))
+ FunctionBlock, (void *)s, s->lineno,
+ s->col_offset))
 return 0;
 VISIT_IN_BLOCK(st, arguments, s->v.FunctionDef.args, s);
 VISIT_SEQ_IN_BLOCK(st, stmt, s->v.FunctionDef.body, s);
@@ -1134,7 +1139,7 @@
 if (s->v.ClassDef.decorator_list)
 VISIT_SEQ(st, expr, s->v.ClassDef.decorator_list);
 if (!symtable_enter_block(st, s->v.ClassDef.name, ClassBlock,
- (void *)s, s->lineno))
+ (void *)s, s->lineno, s->col_offset))
 return 0;
 if (!GET_IDENTIFIER(__class__) ||
 !symtable_add_def(st, __class__, DEF_LOCAL) ||
@@ -1158,8 +1163,9 @@
 if (st->st_cur->ste_generator) {
 PyErr_SetString(PyExc_SyntaxError,
 RETURN_VAL_IN_GENERATOR);
- PyErr_SyntaxLocation(st->st_filename,
- s->lineno);
+ PyErr_SyntaxLocationEx(st->st_filename,
+ s->lineno,
+ s->col_offset);
 return 0;
 }
 }
@@ -1221,15 +1227,19 @@
 VISIT_SEQ(st, alias, s->v.Import.names);
 /* XXX Don't have the lineno available inside
 visit_alias */
- if (st->st_cur->ste_unoptimized && !st->st_cur->ste_opt_lineno)
+ if (st->st_cur->ste_unoptimized && !st->st_cur->ste_opt_lineno) {
 st->st_cur->ste_opt_lineno = s->lineno;
+ st->st_cur->ste_opt_col_offset = s->col_offset;
+ }
 break;
 case ImportFrom_kind:
 VISIT_SEQ(st, alias, s->v.ImportFrom.names);
 /* XXX Don't have the lineno available inside
 visit_alias */
- if (st->st_cur->ste_unoptimized && !st->st_cur->ste_opt_lineno)
+ if (st->st_cur->ste_unoptimized && !st->st_cur->ste_opt_lineno) {
 st->st_cur->ste_opt_lineno = s->lineno;
+ st->st_cur->ste_opt_col_offset = s->col_offset;
+ }
 break;
 case Global_kind: {
 int i;
@@ -1324,7 +1334,8 @@
 if (e->v.Lambda.args->defaults)
 VISIT_SEQ(st, expr, e->v.Lambda.args->defaults);
 if (!symtable_enter_block(st, lambda,
- FunctionBlock, (void *)e, e->lineno))
+ FunctionBlock, (void *)e, e->lineno,
+ e->col_offset))
 return 0;
 VISIT_IN_BLOCK(st, arguments, e->v.Lambda.args, (void*)e);
 VISIT_IN_BLOCK(st, expr, e->v.Lambda.body, (void*)e);
@@ -1367,8 +1378,8 @@
 if (st->st_cur->ste_returns_value) {
 PyErr_SetString(PyExc_SyntaxError,
 RETURN_VAL_IN_GENERATOR);
- PyErr_SyntaxLocation(st->st_filename,
- e->lineno);
+ PyErr_SyntaxLocationEx(st->st_filename,
+ e->lineno, e->col_offset);
 return 0;
 }
 break;
@@ -1557,8 +1568,9 @@
 else {
 if (st->st_cur->ste_type != ModuleBlock) {
 int lineno = st->st_cur->ste_lineno;
+ int col_offset = st->st_cur->ste_col_offset;
 PyErr_SetString(PyExc_SyntaxError, IMPORT_STAR_WARNING);
- PyErr_SyntaxLocation(st->st_filename, lineno);
+ PyErr_SyntaxLocationEx(st->st_filename, lineno, col_offset);
 Py_DECREF(store_name);
 return 0;
 }
@@ -1622,7 +1634,8 @@
 VISIT(st, expr, outermost->iter);
 /* Create comprehension scope for the rest */
 if (!scope_name ||
- !symtable_enter_block(st, scope_name, FunctionBlock, (void *)e, e->lineno)) {
+ !symtable_enter_block(st, scope_name, FunctionBlock, (void *)e,
+ e->lineno, e->col_offset)) {
 return 0;
 }
 st->st_cur->ste_generator = is_generator;
