diff options
| author | Lysandros Nikolaou <lisandrosnik@gmail.com> | 2019-12-14 10:24:57 (GMT) |
|---|---|---|
| committer | Pablo Galindo <Pablogsal@gmail.com> | 2019-12-14 10:24:57 (GMT) |
| commit | 5936a4ce914d42af97b9238e5090dedc8d5b0bd2 (patch) | |
| tree | ca23be7cf3d6180aab701aeb2be24209865ca284 | |
| parent | 95826c773a9004fc5b3c89de55f800504685ab21 (diff) | |
| download | cpython-5936a4ce914d42af97b9238e5090dedc8d5b0bd2.zip cpython-5936a4ce914d42af97b9238e5090dedc8d5b0bd2.tar.gz cpython-5936a4ce914d42af97b9238e5090dedc8d5b0bd2.tar.bz2 | |
Fix elif start column offset when there is an else following (GH-17596)
| -rw-r--r-- | Lib/test/test_ast.py | 9 | ||||
| -rw-r--r-- | Python/ast.c | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py index 955bc0d..cd35f96 100644 --- a/Lib/test/test_ast.py +++ b/Lib/test/test_ast.py @@ -70,6 +70,8 @@ exec_tests = [ "if v:pass", # If-Elif "if a:\n pass\nelif b:\n pass", + # If-Elif-Else + "if a:\n pass\nelif b:\n pass\nelse:\n pass", # With "with x as y: pass", "with x as y, z as q: pass", @@ -869,6 +871,12 @@ Module( self.assertEqual(elif_stmt.lineno, 3) self.assertEqual(elif_stmt.col_offset, 0) + def test_elif_stmt_start_position_with_else(self): + node = ast.parse('if a:\n pass\nelif b:\n pass\nelse:\n pass\n') + elif_stmt = node.body[0].orelse[0] + self.assertEqual(elif_stmt.lineno, 3) + self.assertEqual(elif_stmt.col_offset, 0) + def test_literal_eval(self): self.assertEqual(ast.literal_eval('[1, 2, 3]'), [1, 2, 3]) self.assertEqual(ast.literal_eval('{"foo": 42}'), {"foo": 42}) @@ -1852,6 +1860,7 @@ exec_results = [ ('Module', [('While', (1, 0), ('Name', (1, 6), 'v', ('Load',)), [('Pass', (1, 8))], [])], []), ('Module', [('If', (1, 0), ('Name', (1, 3), 'v', ('Load',)), [('Pass', (1, 5))], [])], []), ('Module', [('If', (1, 0), ('Name', (1, 3), 'a', ('Load',)), [('Pass', (2, 2))], [('If', (3, 0), ('Name', (3, 5), 'b', ('Load',)), [('Pass', (4, 2))], [])])], []), +('Module', [('If', (1, 0), ('Name', (1, 3), 'a', ('Load',)), [('Pass', (2, 2))], [('If', (3, 0), ('Name', (3, 5), 'b', ('Load',)), [('Pass', (4, 2))], [('Pass', (6, 2))])])], []), ('Module', [('With', (1, 0), [('withitem', ('Name', (1, 5), 'x', ('Load',)), ('Name', (1, 10), 'y', ('Store',)))], [('Pass', (1, 13))], None)], []), ('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))], None)], []), ('Module', [('Raise', (1, 0), ('Call', (1, 6), ('Name', (1, 6), 'Exception', ('Load',)), [('Constant', (1, 16), 'string', None)], []), None)], []), diff --git a/Python/ast.c b/Python/ast.c index c450b87..55fe58c 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -4050,8 +4050,8 @@ ast_for_if_stmt(struct compiling *c, const node *n) asdl_seq_SET(orelse, 0, If(expression, suite_seq, suite_seq2, - LINENO(CHILD(n, NCH(n) - 6)), - CHILD(n, NCH(n) - 6)->n_col_offset, + LINENO(CHILD(n, NCH(n) - 7)), + CHILD(n, NCH(n) - 7)->n_col_offset, end_lineno, end_col_offset, c->c_arena)); /* the just-created orelse handled the last elif */ n_elif--; |