diff -r 927afb7bca2a -r ad606e4c8726 Include/Python-ast.h --- a/Include/Python-ast.h Sat Jan 05 21:20:29 2013 +0100 +++ b/Include/Python-ast.h Sun Jan 06 21:28:18 2013 +0100 @@ -371,11 +371,17 @@ expr_ty kwargannotation; asdl_seq *defaults; asdl_seq *kw_defaults; + int vararg_lineno; + int vararg_col_offset; + int kwarg_lineno; + int kwarg_col_offset; }; struct _arg { identifier arg; expr_ty annotation; + int lineno; + int col_offset; }; struct _keyword { @@ -550,13 +556,16 @@ excepthandler_ty _Py_ExceptHandler(expr_ty type, identifier name, asdl_seq * body, int lineno, int col_offset, PyArena *arena); -#define arguments(a0, a1, a2, a3, a4, a5, a6, a7, a8) _Py_arguments(a0, a1, a2, a3, a4, a5, a6, a7, a8) +#define arguments(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12) _Py_arguments(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12) arguments_ty _Py_arguments(asdl_seq * args, identifier vararg, expr_ty varargannotation, asdl_seq * kwonlyargs, identifier kwarg, expr_ty kwargannotation, asdl_seq * defaults, - asdl_seq * kw_defaults, PyArena *arena); -#define arg(a0, a1, a2) _Py_arg(a0, a1, a2) -arg_ty _Py_arg(identifier arg, expr_ty annotation, PyArena *arena); + asdl_seq * kw_defaults, int vararg_lineno, int + vararg_col_offset, int kwarg_lineno, int + kwarg_col_offset, PyArena *arena); +#define arg(a0, a1, a2, a3, a4) _Py_arg(a0, a1, a2, a3, a4) +arg_ty _Py_arg(identifier arg, expr_ty annotation, int lineno, int col_offset, + PyArena *arena); #define keyword(a0, a1, a2) _Py_keyword(a0, a1, a2) keyword_ty _Py_keyword(identifier arg, expr_ty value, PyArena *arena); #define alias(a0, a1, a2) _Py_alias(a0, a1, a2) diff -r 927afb7bca2a -r ad606e4c8726 Lib/test/test_ast.py --- a/Lib/test/test_ast.py Sat Jan 05 21:20:29 2013 +0100 +++ b/Lib/test/test_ast.py Sun Jan 06 21:28:18 2013 +0100 @@ -264,12 +264,14 @@ x = ast.arguments() self.assertEqual(x._fields, ('args', 'vararg', 'varargannotation', 'kwonlyargs', 'kwarg', 'kwargannotation', - 'defaults', 'kw_defaults')) + 'defaults', 'kw_defaults', 'vararg_lineno', + 'vararg_col_offset', 'kwarg_lineno', + 'kwarg_col_offset')) with self.assertRaises(AttributeError): x.vararg - x = ast.arguments(*range(1, 9)) + x = ast.arguments(*range(1, 13)) self.assertEqual(x.vararg, 2) def test_field_attr_writable(self): @@ -439,7 +441,7 @@ "lineno=1, col_offset=0), args=[Name(id='eggs', ctx=Load(), " "lineno=1, col_offset=5), Str(s='and cheese', lineno=1, " "col_offset=11)], keywords=[], starargs=None, kwargs=None, " - "lineno=1, col_offset=0), lineno=1, col_offset=0)])" + "lineno=1, col_offset=4), lineno=1, col_offset=0)])" ) def test_copy_location(self): @@ -452,6 +454,7 @@ ) def test_fix_missing_locations(self): + self.maxDiff = None src = ast.parse('write("spam")') src.body.append(ast.Expr(ast.Call(ast.Name('spam', ast.Load()), [ast.Str('eggs')], [], None, None))) @@ -460,7 +463,7 @@ "Module(body=[Expr(value=Call(func=Name(id='write', ctx=Load(), " "lineno=1, col_offset=0), args=[Str(s='spam', lineno=1, " "col_offset=6)], keywords=[], starargs=None, kwargs=None, " - "lineno=1, col_offset=0), lineno=1, col_offset=0), " + "lineno=1, col_offset=5), lineno=1, col_offset=0), " "Expr(value=Call(func=Name(id='spam', ctx=Load(), lineno=1, " "col_offset=0), args=[Str(s='eggs', lineno=1, col_offset=0)], " "keywords=[], starargs=None, kwargs=None, lineno=1, " @@ -572,9 +575,10 @@ if kw_defaults is None: kw_defaults = [] args = ast.arguments(args, vararg, varargannotation, kwonlyargs, - kwarg, kwargannotation, defaults, kw_defaults) + kwarg, kwargannotation, defaults, kw_defaults, + 0, 0, 0, 0) return fac(args) - args = [ast.arg("x", ast.Name("x", ast.Store()))] + args = [ast.arg("x", ast.Name("x", ast.Store()), 0, 0)] check(arguments(args=args), "must have Load context") check(arguments(varargannotation=ast.Num(3)), "varargannotation but no vararg") @@ -589,17 +593,17 @@ "more positional defaults than args") check(arguments(kw_defaults=[ast.Num(4)]), "length of kwonlyargs is not the same as kw_defaults") - args = [ast.arg("x", ast.Name("x", ast.Load()))] + args = [ast.arg("x", ast.Name("x", ast.Load()), 0, 0)] check(arguments(args=args, defaults=[ast.Name("x", ast.Store())]), "must have Load context") - args = [ast.arg("a", ast.Name("x", ast.Load())), - ast.arg("b", ast.Name("y", ast.Load()))] + args = [ast.arg("a", ast.Name("x", ast.Load()), 0, 0), + ast.arg("b", ast.Name("y", ast.Load()), 0, 0)] check(arguments(kwonlyargs=args, kw_defaults=[None, ast.Name("x", ast.Store())]), "must have Load context") def test_funcdef(self): - a = ast.arguments([], None, None, [], None, None, [], []) + a = ast.arguments([], None, None, [], None, None, [], [], 0, 0, 0, 0) f = ast.FunctionDef("x", a, [], [], None) self.stmt(f, "empty body on FunctionDef") f = ast.FunctionDef("x", a, [ast.Pass()], [ast.Name("x", ast.Store())], @@ -770,7 +774,7 @@ self.expr(u, "must have Load context") def test_lambda(self): - a = ast.arguments([], None, None, [], None, None, [], []) + a = ast.arguments([], None, None, [], None, None, [], [], 0, 0, 0, 0) self.expr(ast.Lambda(a, ast.Name("x", ast.Store())), "must have Load context") def fac(args): @@ -963,15 +967,15 @@ #### EVERYTHING BELOW IS GENERATED ##### exec_results = [ ('Module', [('Expr', (1, 0), ('NameConstant', (1, 0), None))]), -('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [], None, None, [], None, None, [], []), [('Pass', (1, 9))], [], None)]), -('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [('arg', 'a', None)], None, None, [], None, None, [], []), [('Pass', (1, 10))], [], None)]), -('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [('arg', 'a', None)], None, None, [], None, None, [('Num', (1, 8), 0)], []), [('Pass', (1, 12))], [], None)]), -('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [], 'args', None, [], None, None, [], []), [('Pass', (1, 14))], [], None)]), -('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [], None, None, [], 'kwargs', None, [], []), [('Pass', (1, 17))], [], None)]), -('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [('arg', 'a', None), ('arg', 'b', None), ('arg', 'c', None), ('arg', 'd', None), ('arg', 'e', None)], 'args', None, [], 'kwargs', None, [('Num', (1, 11), 1), ('NameConstant', (1, 16), None), ('List', (1, 24), [], ('Load',)), ('Dict', (1, 30), [], [])], []), [('Pass', (1, 52))], [], None)]), +('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [], None, None, [], None, None, [], [], 0, 0, 0, 0), [('Pass', (1, 9))], [], None)]), +('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [('arg', (1, 6), 'a', None, 1, 6)], None, None, [], None, None, [], [], 0, 0, 0, 0), [('Pass', (1, 10))], [], None)]), +('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [('arg', (1, 6), 'a', None, 1, 6)], None, None, [], None, None, [('Num', (1, 8), 0)], [], 0, 0, 0, 0), [('Pass', (1, 12))], [], None)]), +('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [], 'args', None, [], None, None, [], [], 1, 7, 0, 0), [('Pass', (1, 14))], [], None)]), +('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [], None, None, [], 'kwargs', None, [], [], 0, 0, 1, 8), [('Pass', (1, 17))], [], None)]), +('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [('arg', (1, 6), 'a', None, 1, 6), ('arg', (1, 9), 'b', None, 1, 9), ('arg', (1, 14), 'c', None, 1, 14), ('arg', (1, 22), 'd', None, 1, 22), ('arg', (1, 28), 'e', None, 1, 28)], 'args', None, [], 'kwargs', None, [('Num', (1, 11), 1), ('NameConstant', (1, 16), None), ('List', (1, 24), [], ('Load',)), ('Dict', (1, 30), [], [])], [], 1, 35, 1, 43), [('Pass', (1, 52))], [], None)]), ('Module', [('ClassDef', (1, 0), 'C', [], [], None, None, [('Pass', (1, 8))], [])]), ('Module', [('ClassDef', (1, 0), 'C', [('Name', (1, 8), 'object', ('Load',))], [], None, None, [('Pass', (1, 17))], [])]), -('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [], None, None, [], None, None, [], []), [('Return', (1, 8), ('Num', (1, 15), 1))], [], None)]), +('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [], None, None, [], None, None, [], [], 0, 0, 0, 0), [('Return', (1, 8), ('Num', (1, 15), 1))], [], None)]), ('Module', [('Delete', (1, 0), [('Name', (1, 4), 'v', ('Del',))])]), ('Module', [('Assign', (1, 0), [('Name', (1, 0), 'v', ('Store',))], ('Num', (1, 4), 1))]), ('Module', [('AugAssign', (1, 0), ('Name', (1, 0), 'v', ('Store',)), ('Add',), ('Num', (1, 5), 1))]), @@ -980,7 +984,7 @@ ('Module', [('If', (1, 0), ('Name', (1, 3), 'v', ('Load',)), [('Pass', (1, 5))], [])]), ('Module', [('With', (1, 0), [('withitem', ('Name', (1, 5), 'x', ('Load',)), ('Name', (1, 10), 'y', ('Store',)))], [('Pass', (1, 13))])]), ('Module', [('With', (1, 0), [('withitem', ('Name', (1, 5), 'x', ('Load',)), ('Name', (1, 10), 'y', ('Store',))), ('withitem', ('Name', (1, 13), 'z', ('Load',)), ('Name', (1, 18), 'q', ('Store',)))], [('Pass', (1, 21))])]), -('Module', [('Raise', (1, 0), ('Call', (1, 6), ('Name', (1, 6), 'Exception', ('Load',)), [('Str', (1, 16), 'string')], [], None, None), None)]), +('Module', [('Raise', (1, 0), ('Call', (1, 15), ('Name', (1, 6), 'Exception', ('Load',)), [('Str', (1, 16), 'string')], [], None, None), None)]), ('Module', [('Try', (1, 0), [('Pass', (2, 2))], [('ExceptHandler', (3, 0), ('Name', (3, 7), 'Exception', ('Load',)), None, [('Pass', (4, 2))])], [], [])]), ('Module', [('Try', (1, 0), [('Pass', (2, 2))], [], [], [('Pass', (4, 2))])]), ('Module', [('Assert', (1, 0), ('Name', (1, 7), 'v', ('Load',)), None)]), @@ -1009,7 +1013,7 @@ ('Expression', ('BoolOp', (1, 0), ('And',), [('Name', (1, 0), 'a', ('Load',)), ('Name', (1, 6), 'b', ('Load',))])), ('Expression', ('BinOp', (1, 0), ('Name', (1, 0), 'a', ('Load',)), ('Add',), ('Name', (1, 4), 'b', ('Load',)))), ('Expression', ('UnaryOp', (1, 0), ('Not',), ('Name', (1, 4), 'v', ('Load',)))), -('Expression', ('Lambda', (1, 0), ('arguments', [], None, None, [], None, None, [], []), ('NameConstant', (1, 7), None))), +('Expression', ('Lambda', (1, 0), ('arguments', [], None, None, [], None, None, [], [], 0, 0, 0, 0), ('NameConstant', (1, 7), None))), ('Expression', ('Dict', (1, 0), [('Num', (1, 2), 1)], [('Num', (1, 4), 2)])), ('Expression', ('Dict', (1, 0), [], [])), ('Expression', ('Set', (1, 0), [('NameConstant', (1, 1), None)])), @@ -1017,17 +1021,17 @@ ('Expression', ('ListComp', (1, 1), ('Name', (1, 1), 'a', ('Load',)), [('comprehension', ('Name', (1, 7), 'b', ('Store',)), ('Name', (1, 12), 'c', ('Load',)), [('Name', (1, 17), 'd', ('Load',))])])), ('Expression', ('GeneratorExp', (1, 1), ('Name', (1, 1), 'a', ('Load',)), [('comprehension', ('Name', (1, 7), 'b', ('Store',)), ('Name', (1, 12), 'c', ('Load',)), [('Name', (1, 17), 'd', ('Load',))])])), ('Expression', ('Compare', (1, 0), ('Num', (1, 0), 1), [('Lt',), ('Lt',)], [('Num', (1, 4), 2), ('Num', (1, 8), 3)])), -('Expression', ('Call', (1, 0), ('Name', (1, 0), 'f', ('Load',)), [('Num', (1, 2), 1), ('Num', (1, 4), 2)], [('keyword', 'c', ('Num', (1, 8), 3))], ('Name', (1, 11), 'd', ('Load',)), ('Name', (1, 15), 'e', ('Load',)))), +('Expression', ('Call', (1, 1), ('Name', (1, 0), 'f', ('Load',)), [('Num', (1, 2), 1), ('Num', (1, 4), 2)], [('keyword', 'c', ('Num', (1, 8), 3))], ('Name', (1, 11), 'd', ('Load',)), ('Name', (1, 15), 'e', ('Load',)))), ('Expression', ('Num', (1, 0), 10)), ('Expression', ('Str', (1, 0), 'string')), -('Expression', ('Attribute', (1, 0), ('Name', (1, 0), 'a', ('Load',)), 'b', ('Load',))), -('Expression', ('Subscript', (1, 0), ('Name', (1, 0), 'a', ('Load',)), ('Slice', ('Name', (1, 2), 'b', ('Load',)), ('Name', (1, 4), 'c', ('Load',)), None), ('Load',))), +('Expression', ('Attribute', (1, 2), ('Name', (1, 0), 'a', ('Load',)), 'b', ('Load',))), +('Expression', ('Subscript', (1, 2), ('Name', (1, 0), 'a', ('Load',)), ('Slice', ('Name', (1, 2), 'b', ('Load',)), ('Name', (1, 4), 'c', ('Load',)), None), ('Load',))), ('Expression', ('Name', (1, 0), 'v', ('Load',))), ('Expression', ('List', (1, 0), [('Num', (1, 1), 1), ('Num', (1, 3), 2), ('Num', (1, 5), 3)], ('Load',))), ('Expression', ('List', (1, 0), [], ('Load',))), ('Expression', ('Tuple', (1, 0), [('Num', (1, 0), 1), ('Num', (1, 2), 2), ('Num', (1, 4), 3)], ('Load',))), ('Expression', ('Tuple', (1, 1), [('Num', (1, 1), 1), ('Num', (1, 3), 2), ('Num', (1, 5), 3)], ('Load',))), ('Expression', ('Tuple', (1, 0), [], ('Load',))), -('Expression', ('Call', (1, 0), ('Attribute', (1, 0), ('Attribute', (1, 0), ('Attribute', (1, 0), ('Name', (1, 0), 'a', ('Load',)), 'b', ('Load',)), 'c', ('Load',)), 'd', ('Load',)), [('Subscript', (1, 8), ('Attribute', (1, 8), ('Name', (1, 8), 'a', ('Load',)), 'b', ('Load',)), ('Slice', ('Num', (1, 12), 1), ('Num', (1, 14), 2), None), ('Load',))], [], None, None)), +('Expression', ('Call', (1, 7), ('Attribute', (1, 6), ('Attribute', (1, 4), ('Attribute', (1, 2), ('Name', (1, 0), 'a', ('Load',)), 'b', ('Load',)), 'c', ('Load',)), 'd', ('Load',)), [('Subscript', (1, 12), ('Attribute', (1, 10), ('Name', (1, 8), 'a', ('Load',)), 'b', ('Load',)), ('Slice', ('Num', (1, 12), 1), ('Num', (1, 14), 2), None), ('Load',))], [], None, None)), ] main() diff -r 927afb7bca2a -r ad606e4c8726 Parser/Python.asdl --- a/Parser/Python.asdl Sat Jan 05 21:20:29 2013 +0100 +++ b/Parser/Python.asdl Sun Jan 06 21:28:18 2013 +0100 @@ -106,8 +106,11 @@ arguments = (arg* args, identifier? vararg, expr? varargannotation, arg* kwonlyargs, identifier? kwarg, expr? kwargannotation, expr* defaults, - expr* kw_defaults) - arg = (identifier arg, expr? annotation) + expr* kw_defaults, + int? vararg_lineno, int? vararg_col_offset, + int? kwarg_lineno, int? kwarg_col_offset) + arg = (identifier arg, expr? annotation, + int? lineno, int? col_offset) -- keyword arguments supplied to call keyword = (identifier arg, expr value) diff -r 927afb7bca2a -r ad606e4c8726 Python/Python-ast.c --- a/Python/Python-ast.c Sat Jan 05 21:20:29 2013 +0100 +++ b/Python/Python-ast.c Sun Jan 06 21:28:18 2013 +0100 @@ -418,6 +418,10 @@ _Py_IDENTIFIER(kwargannotation); _Py_IDENTIFIER(defaults); _Py_IDENTIFIER(kw_defaults); +_Py_IDENTIFIER(vararg_lineno); +_Py_IDENTIFIER(vararg_col_offset); +_Py_IDENTIFIER(kwarg_lineno); +_Py_IDENTIFIER(kwarg_col_offset); static char *arguments_fields[]={ "args", "vararg", @@ -427,6 +431,10 @@ "kwargannotation", "defaults", "kw_defaults", + "vararg_lineno", + "vararg_col_offset", + "kwarg_lineno", + "kwarg_col_offset", }; static PyTypeObject *arg_type; static PyObject* ast2obj_arg(void*); @@ -435,6 +443,8 @@ static char *arg_fields[]={ "arg", "annotation", + "lineno", + "col_offset", }; static PyTypeObject *keyword_type; static PyObject* ast2obj_keyword(void*); @@ -1063,9 +1073,10 @@ ExceptHandler_type = make_type("ExceptHandler", excepthandler_type, ExceptHandler_fields, 3); if (!ExceptHandler_type) return 0; - arguments_type = make_type("arguments", &AST_type, arguments_fields, 8); + arguments_type = make_type("arguments", &AST_type, arguments_fields, + 12); if (!arguments_type) return 0; - arg_type = make_type("arg", &AST_type, arg_fields, 2); + arg_type = make_type("arg", &AST_type, arg_fields, 4); if (!arg_type) return 0; keyword_type = make_type("keyword", &AST_type, keyword_fields, 2); if (!keyword_type) return 0; @@ -2215,7 +2226,9 @@ arguments_ty arguments(asdl_seq * args, identifier vararg, expr_ty varargannotation, asdl_seq * kwonlyargs, identifier kwarg, expr_ty kwargannotation, - asdl_seq * defaults, asdl_seq * kw_defaults, PyArena *arena) + asdl_seq * defaults, asdl_seq * kw_defaults, int vararg_lineno, int + vararg_col_offset, int kwarg_lineno, int kwarg_col_offset, PyArena + *arena) { arguments_ty p; p = (arguments_ty)PyArena_Malloc(arena, sizeof(*p)); @@ -2229,11 +2242,16 @@ p->kwargannotation = kwargannotation; p->defaults = defaults; p->kw_defaults = kw_defaults; + p->vararg_lineno = vararg_lineno; + p->vararg_col_offset = vararg_col_offset; + p->kwarg_lineno = kwarg_lineno; + p->kwarg_col_offset = kwarg_col_offset; return p; } arg_ty -arg(identifier arg, expr_ty annotation, PyArena *arena) +arg(identifier arg, expr_ty annotation, int lineno, int col_offset, PyArena + *arena) { arg_ty p; if (!arg) { @@ -2246,6 +2264,8 @@ return NULL; p->arg = arg; p->annotation = annotation; + p->lineno = lineno; + p->col_offset = col_offset; return p; } @@ -3448,6 +3468,26 @@ if (_PyObject_SetAttrId(result, &PyId_kw_defaults, value) == -1) goto failed; Py_DECREF(value); + value = ast2obj_int(o->vararg_lineno); + if (!value) goto failed; + if (_PyObject_SetAttrId(result, &PyId_vararg_lineno, value) == -1) + goto failed; + Py_DECREF(value); + value = ast2obj_int(o->vararg_col_offset); + if (!value) goto failed; + if (_PyObject_SetAttrId(result, &PyId_vararg_col_offset, value) == -1) + goto failed; + Py_DECREF(value); + value = ast2obj_int(o->kwarg_lineno); + if (!value) goto failed; + if (_PyObject_SetAttrId(result, &PyId_kwarg_lineno, value) == -1) + goto failed; + Py_DECREF(value); + value = ast2obj_int(o->kwarg_col_offset); + if (!value) goto failed; + if (_PyObject_SetAttrId(result, &PyId_kwarg_col_offset, value) == -1) + goto failed; + Py_DECREF(value); return result; failed: Py_XDECREF(value); @@ -3477,6 +3517,16 @@ if (_PyObject_SetAttrId(result, &PyId_annotation, value) == -1) goto failed; Py_DECREF(value); + value = ast2obj_int(o->lineno); + if (!value) goto failed; + if (_PyObject_SetAttrId(result, &PyId_lineno, value) == -1) + goto failed; + Py_DECREF(value); + value = ast2obj_int(o->col_offset); + if (!value) goto failed; + if (_PyObject_SetAttrId(result, &PyId_col_offset, value) == -1) + goto failed; + Py_DECREF(value); return result; failed: Py_XDECREF(value); @@ -6669,6 +6719,10 @@ expr_ty kwargannotation; asdl_seq* defaults; asdl_seq* kw_defaults; + int vararg_lineno; + int vararg_col_offset; + int kwarg_lineno; + int kwarg_col_offset; if (_PyObject_HasAttrId(obj, &PyId_args)) { int res; @@ -6814,8 +6868,54 @@ PyErr_SetString(PyExc_TypeError, "required field \"kw_defaults\" missing from arguments"); return 1; } + if (_PyObject_HasAttrId(obj, &PyId_vararg_lineno)) { + int res; + tmp = _PyObject_GetAttrId(obj, &PyId_vararg_lineno); + if (tmp == NULL) goto failed; + res = obj2ast_int(tmp, &vararg_lineno, arena); + if (res != 0) goto failed; + Py_XDECREF(tmp); + tmp = NULL; + } else { + vararg_lineno = 0; + } + if (_PyObject_HasAttrId(obj, &PyId_vararg_col_offset)) { + int res; + tmp = _PyObject_GetAttrId(obj, &PyId_vararg_col_offset); + if (tmp == NULL) goto failed; + res = obj2ast_int(tmp, &vararg_col_offset, arena); + if (res != 0) goto failed; + Py_XDECREF(tmp); + tmp = NULL; + } else { + vararg_col_offset = 0; + } + if (_PyObject_HasAttrId(obj, &PyId_kwarg_lineno)) { + int res; + tmp = _PyObject_GetAttrId(obj, &PyId_kwarg_lineno); + if (tmp == NULL) goto failed; + res = obj2ast_int(tmp, &kwarg_lineno, arena); + if (res != 0) goto failed; + Py_XDECREF(tmp); + tmp = NULL; + } else { + kwarg_lineno = 0; + } + if (_PyObject_HasAttrId(obj, &PyId_kwarg_col_offset)) { + int res; + tmp = _PyObject_GetAttrId(obj, &PyId_kwarg_col_offset); + if (tmp == NULL) goto failed; + res = obj2ast_int(tmp, &kwarg_col_offset, arena); + if (res != 0) goto failed; + Py_XDECREF(tmp); + tmp = NULL; + } else { + kwarg_col_offset = 0; + } *out = arguments(args, vararg, varargannotation, kwonlyargs, kwarg, - kwargannotation, defaults, kw_defaults, arena); + kwargannotation, defaults, kw_defaults, vararg_lineno, + vararg_col_offset, kwarg_lineno, kwarg_col_offset, + arena); return 0; failed: Py_XDECREF(tmp); @@ -6828,6 +6928,8 @@ PyObject* tmp = NULL; identifier arg; expr_ty annotation; + int lineno; + int col_offset; if (_PyObject_HasAttrId(obj, &PyId_arg)) { int res; @@ -6852,7 +6954,29 @@ } else { annotation = NULL; } - *out = arg(arg, annotation, arena); + if (_PyObject_HasAttrId(obj, &PyId_lineno)) { + int res; + tmp = _PyObject_GetAttrId(obj, &PyId_lineno); + if (tmp == NULL) goto failed; + res = obj2ast_int(tmp, &lineno, arena); + if (res != 0) goto failed; + Py_XDECREF(tmp); + tmp = NULL; + } else { + lineno = 0; + } + if (_PyObject_HasAttrId(obj, &PyId_col_offset)) { + int res; + tmp = _PyObject_GetAttrId(obj, &PyId_col_offset); + if (tmp == NULL) goto failed; + res = obj2ast_int(tmp, &col_offset, arena); + if (res != 0) goto failed; + Py_XDECREF(tmp); + tmp = NULL; + } else { + col_offset = 0; + } + *out = arg(arg, annotation, lineno, col_offset, arena); return 0; failed: Py_XDECREF(tmp); diff -r 927afb7bca2a -r ad606e4c8726 Python/ast.c --- a/Python/ast.c Sat Jan 05 21:20:29 2013 +0100 +++ b/Python/ast.c Sun Jan 06 21:28:18 2013 +0100 @@ -1138,7 +1138,7 @@ return NULL; } - return arg(name, annotation, c->c_arena); + return arg(name, annotation, n->n_lineno, n->n_col_offset, c->c_arena); } /* returns -1 if failed to handle keyword only arguments @@ -1193,7 +1193,7 @@ goto error; if (forbidden_name(c, argname, ch, 0)) goto error; - arg = arg(argname, annotation, c->c_arena); + arg = arg(argname, annotation, ch->n_lineno, ch->n_col_offset, c->c_arena); if (!arg) goto error; asdl_seq_SET(kwonlyargs, j++, arg); @@ -1232,6 +1232,7 @@ vfpdef: NAME */ int i, j, k, nposargs = 0, nkwonlyargs = 0; + int vararg_lineno = 0, vararg_col_offset = 0, kwarg_lineno = 0, kwarg_col_offset = 0; int nposdefaults = 0, found_default = 0; asdl_seq *posargs, *posdefaults, *kwonlyargs, *kwdefaults; identifier vararg = NULL, kwarg = NULL; @@ -1242,7 +1243,8 @@ if (TYPE(n) == parameters) { if (NCH(n) == 2) /* () as argument list */ return arguments(NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, c->c_arena); + NULL, vararg_lineno, vararg_col_offset, + kwarg_lineno, kwarg_col_offset, c->c_arena); n = CHILD(n, 1); } assert(TYPE(n) == typedargslist || TYPE(n) == varargslist); @@ -1351,6 +1353,8 @@ vararg = NEW_IDENTIFIER(CHILD(ch, 0)); if (!vararg) return NULL; + vararg_lineno = CHILD(ch, 0)->n_lineno; + vararg_col_offset = CHILD(ch, 0)->n_col_offset; if (forbidden_name(c, vararg, CHILD(ch, 0), 0)) return NULL; if (NCH(ch) > 1) { @@ -1376,6 +1380,8 @@ kwarg = NEW_IDENTIFIER(CHILD(ch, 0)); if (!kwarg) return NULL; + kwarg_lineno = CHILD(ch, 0)->n_lineno; + kwarg_col_offset = CHILD(ch, 0)->n_col_offset; if (NCH(ch) > 1) { /* there is an annotation on the kwarg */ kwargannotation = ast_for_expr(c, CHILD(ch, 2)); @@ -1394,7 +1400,9 @@ } } return arguments(posargs, vararg, varargannotation, kwonlyargs, kwarg, - kwargannotation, posdefaults, kwdefaults, c->c_arena); + kwargannotation, posdefaults, kwdefaults, + vararg_lineno, vararg_col_offset, + kwarg_lineno, kwarg_col_offset, c->c_arena); } static expr_ty @@ -1560,7 +1568,7 @@ if (NCH(n) == 3) { args = arguments(NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, c->c_arena); + NULL, 0, 0, 0, 0, c->c_arena); if (!args) return NULL; expression = ast_for_expr(c, CHILD(n, 2)); @@ -2103,15 +2111,19 @@ if (NCH(n) == 2) return Call(left_expr, NULL, NULL, NULL, NULL, LINENO(n), n->n_col_offset, c->c_arena); - else - return ast_for_call(c, CHILD(n, 1), left_expr); + else { + expr_ty tmp = ast_for_call(c, CHILD(n, 1), left_expr); + tmp->lineno = LINENO(n); + tmp->col_offset = n->n_col_offset; + return tmp; + } } else if (TYPE(CHILD(n, 0)) == DOT ) { PyObject *attr_id = NEW_IDENTIFIER(CHILD(n, 1)); if (!attr_id) return NULL; return Attribute(left_expr, attr_id, Load, - LINENO(n), n->n_col_offset, c->c_arena); + LINENO(CHILD(n, 1)), CHILD(n, 1)->n_col_offset, c->c_arena); } else { REQ(CHILD(n, 0), LSQB); @@ -2212,8 +2224,6 @@ tmp = ast_for_trailer(c, ch, e); if (!tmp) return NULL; - tmp->lineno = e->lineno; - tmp->col_offset = e->col_offset; e = tmp; } if (TYPE(CHILD(n, NCH(n) - 1)) == factor) {