commit c7be35c2abd598f02a633879133caec356593241
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Mon Jul 08 14:41:34 2019 -0700
committer GitHub <noreply@github.com> Mon Jul 08 14:41:34 2019 -0700
tree 4a1e5b6a7de8e105ef4d2295e63e83b68f167f28
parent 54348f46f8c8c023b7e78f9cebe8e54818227b92

bpo-18374: fix wrong col_offset of some ast.BinOp instances (GH-14607)


Nested BinOp instances (e.g. a+b+c) had a wrong col_offset for the
second BinOp (e.g. 2 instead of 0 in the example). Fix it by using the
correct st node to copy the line and col_offset from in ast.c.
(cherry picked from commit 110a47c4f42cf4db88edc1876899fff8f05190fb)

Co-authored-by: Carl Friedrich Bolz-Tereick <cfbolz@gmx.de>

Python/ast.c

diff --git a/Python/ast.c b/Python/ast.c
index 2a59415..317a42b 100644
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -2645,7 +2645,7 @@
             return NULL;
 
         tmp_result = BinOp(result, newoperator, tmp,
-                           LINENO(next_oper), next_oper->n_col_offset,
+                           LINENO(n), n->n_col_offset,
                            CHILD(n, i * 2 + 2)->n_end_lineno,
                            CHILD(n, i * 2 + 2)->n_end_col_offset,
                            c->c_arena);