[3.7] bpo-39031: Include elif keyword when producing lineno/col-offse…

[3.7] bpo-39031: Include elif keyword when producing lineno/col-offse… · python/cpython@0ed45d0

@@ -64,6 +64,8 @@ def to_tuple(t):

6464"while v:pass",6565# If6666"if v:pass",67+# If-Elif68+"if a:\n pass\nelif b:\n pass",6769# With6870"with x as y: pass",6971"with x as y, z as q: pass",

@@ -598,6 +600,12 @@ def test_get_docstring_none(self):

598600node = ast.parse('async def foo():\n x = "not docstring"')599601self.assertIsNone(ast.get_docstring(node.body[0]))600602603+def test_elif_stmt_start_position(self):604+node = ast.parse('if a:\n pass\nelif b:\n pass\n')605+elif_stmt = node.body[0].orelse[0]606+self.assertEqual(elif_stmt.lineno, 3)607+self.assertEqual(elif_stmt.col_offset, 0)608+601609def test_literal_eval(self):602610self.assertEqual(ast.literal_eval('[1, 2, 3]'), [1, 2, 3])603611self.assertEqual(ast.literal_eval('{"foo": 42}'), {"foo": 42})

@@ -1235,6 +1243,7 @@ def main():

12351243

('Module', [('For', (1, 0), ('Name', (1, 4), 'v', ('Store',)), ('Name', (1, 9), 'v', ('Load',)), [('Pass', (1, 11))], [])]),

12361244('Module', [('While', (1, 0), ('Name', (1, 6), 'v', ('Load',)), [('Pass', (1, 8))], [])]),12371245('Module', [('If', (1, 0), ('Name', (1, 3), 'v', ('Load',)), [('Pass', (1, 5))], [])]),1246

+('Module', [('If', (1, 0), ('Name', (1, 3), 'a', ('Load',)), [('Pass', (2, 2))], [('If', (3, 0), ('Name', (3, 5), 'b', ('Load',)), [('Pass', (4, 2))], [])])]),

12381247

('Module', [('With', (1, 0), [('withitem', ('Name', (1, 5), 'x', ('Load',)), ('Name', (1, 10), 'y', ('Store',)))], [('Pass', (1, 13))])]),

12391248

('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))])]),

12401249

('Module', [('Raise', (1, 0), ('Call', (1, 6), ('Name', (1, 6), 'Exception', ('Load',)), [('Str', (1, 16), 'string')], []), None)]),