From af7aac70df01de8fe1ee96d04134863ae92577f2 Mon Sep 17 00:00:00 2001 From: harupy Date: Sun, 18 Dec 2022 20:53:30 +0900 Subject: [PATCH] Fix locations of parethesized expressions --- parser/python.lalrpop | 2 +- ...ser__context__tests__assign_attribute.snap | 4 +-- ...on_parser__context__tests__assign_for.snap | 4 +-- ...n_parser__context__tests__assign_list.snap | 4 +-- ...ser__context__tests__assign_list_comp.snap | 4 +-- ...n_parser__context__tests__assign_name.snap | 4 +-- ...rser__context__tests__assign_set_comp.snap | 4 +-- ...arser__context__tests__assign_starred.snap | 8 +++--- ...ser__context__tests__assign_subscript.snap | 4 +-- ..._parser__context__tests__assign_tuple.snap | 8 +++--- ..._context__tests__aug_assign_attribute.snap | 4 +-- ..._context__tests__aug_assign_subscript.snap | 4 +-- ...n_parser__with__tests__with_statement.snap | 28 +++++++++---------- 13 files changed, 41 insertions(+), 41 deletions(-) diff --git a/parser/python.lalrpop b/parser/python.lalrpop index cca2a46..f3fa3e9 100644 --- a/parser/python.lalrpop +++ b/parser/python.lalrpop @@ -1090,7 +1090,7 @@ AtomAs: Goal = { node: ast::ExprKind::ListComp { elt: Box::new(elt), generators } }.into() }, - "(" > ")" =>? { + "(" > ")" =>? { if items.len() == 1 && items[0].1.is_none() && trailing_comma.is_none() { match items[0].0.node { ast::ExprKind::Starred { .. } => { diff --git a/parser/src/snapshots/rustpython_parser__context__tests__assign_attribute.snap b/parser/src/snapshots/rustpython_parser__context__tests__assign_attribute.snap index a247b56..984cb7a 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_attribute.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_attribute.snap @@ -55,12 +55,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 7, + column: 6, }, end_location: Some( Location { row: 1, - column: 14, + column: 15, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__context__tests__assign_for.snap b/parser/src/snapshots/rustpython_parser__context__tests__assign_for.snap index bbacec7..9dd2802 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_for.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_for.snap @@ -36,12 +36,12 @@ expression: parse_ast iter: Located { location: Location { row: 1, - column: 10, + column: 9, }, end_location: Some( Location { row: 1, - column: 17, + column: 18, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__context__tests__assign_list.snap b/parser/src/snapshots/rustpython_parser__context__tests__assign_list.snap index c90e5a3..ea59293 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_list.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_list.snap @@ -73,12 +73,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 10, + column: 9, }, end_location: Some( Location { row: 1, - column: 17, + column: 18, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__context__tests__assign_list_comp.snap b/parser/src/snapshots/rustpython_parser__context__tests__assign_list_comp.snap index 9b6d6ac..367f09a 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_list_comp.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_list_comp.snap @@ -87,12 +87,12 @@ expression: parse_ast iter: Located { location: Location { row: 1, - column: 17, + column: 16, }, end_location: Some( Location { row: 1, - column: 24, + column: 25, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__context__tests__assign_name.snap b/parser/src/snapshots/rustpython_parser__context__tests__assign_name.snap index e0cdb85..55d4e70 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_name.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_name.snap @@ -38,12 +38,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 5, + column: 4, }, end_location: Some( Location { row: 1, - column: 12, + column: 13, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__context__tests__assign_set_comp.snap b/parser/src/snapshots/rustpython_parser__context__tests__assign_set_comp.snap index 84dba82..97ecaa0 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_set_comp.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_set_comp.snap @@ -87,12 +87,12 @@ expression: parse_ast iter: Located { location: Location { row: 1, - column: 17, + column: 16, }, end_location: Some( Location { row: 1, - column: 24, + column: 25, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__context__tests__assign_starred.snap b/parser/src/snapshots/rustpython_parser__context__tests__assign_starred.snap index 2e4256e..015f9bd 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_starred.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_starred.snap @@ -20,12 +20,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 6, + column: 7, }, ), custom: (), @@ -89,12 +89,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 11, + column: 10, }, end_location: Some( Location { row: 1, - column: 18, + column: 19, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__context__tests__assign_subscript.snap b/parser/src/snapshots/rustpython_parser__context__tests__assign_subscript.snap index 28420eb..756867c 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_subscript.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_subscript.snap @@ -71,12 +71,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 8, + column: 7, }, end_location: Some( Location { row: 1, - column: 15, + column: 16, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__context__tests__assign_tuple.snap b/parser/src/snapshots/rustpython_parser__context__tests__assign_tuple.snap index 30a51df..c520427 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__assign_tuple.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__assign_tuple.snap @@ -20,12 +20,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 5, + column: 6, }, ), custom: (), @@ -73,12 +73,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 10, + column: 9, }, end_location: Some( Location { row: 1, - column: 17, + column: 18, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__context__tests__aug_assign_attribute.snap b/parser/src/snapshots/rustpython_parser__context__tests__aug_assign_attribute.snap index 3ba9d04..3e6e4b7 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__aug_assign_attribute.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__aug_assign_attribute.snap @@ -54,12 +54,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 8, + column: 7, }, end_location: Some( Location { row: 1, - column: 15, + column: 16, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__context__tests__aug_assign_subscript.snap b/parser/src/snapshots/rustpython_parser__context__tests__aug_assign_subscript.snap index ebb262a..72fe61d 100644 --- a/parser/src/snapshots/rustpython_parser__context__tests__aug_assign_subscript.snap +++ b/parser/src/snapshots/rustpython_parser__context__tests__aug_assign_subscript.snap @@ -70,12 +70,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 9, + column: 8, }, end_location: Some( Location { row: 1, - column: 16, + column: 17, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__with__tests__with_statement.snap b/parser/src/snapshots/rustpython_parser__with__tests__with_statement.snap index ce0c20e..031d6d8 100644 --- a/parser/src/snapshots/rustpython_parser__with__tests__with_statement.snap +++ b/parser/src/snapshots/rustpython_parser__with__tests__with_statement.snap @@ -891,12 +891,12 @@ expression: "parse_program(source, \"\").unwrap()" context_expr: Located { location: Location { row: 12, - column: 6, + column: 5, }, end_location: Some( Location { row: 12, - column: 8, + column: 9, }, ), custom: (), @@ -1061,12 +1061,12 @@ expression: "parse_program(source, \"\").unwrap()" context_expr: Located { location: Location { row: 14, - column: 6, + column: 5, }, end_location: Some( Location { row: 14, - column: 10, + column: 11, }, ), custom: (), @@ -1172,12 +1172,12 @@ expression: "parse_program(source, \"\").unwrap()" context_expr: Located { location: Location { row: 15, - column: 6, + column: 5, }, end_location: Some( Location { row: 15, - column: 9, + column: 10, }, ), custom: (), @@ -1260,12 +1260,12 @@ expression: "parse_program(source, \"\").unwrap()" context_expr: Located { location: Location { row: 16, - column: 6, + column: 5, }, end_location: Some( Location { row: 16, - column: 9, + column: 10, }, ), custom: (), @@ -1366,12 +1366,12 @@ expression: "parse_program(source, \"\").unwrap()" context_expr: Located { location: Location { row: 17, - column: 6, + column: 5, }, end_location: Some( Location { row: 17, - column: 11, + column: 12, }, ), custom: (), @@ -1473,12 +1473,12 @@ expression: "parse_program(source, \"\").unwrap()" context_expr: Located { location: Location { row: 18, - column: 6, + column: 5, }, end_location: Some( Location { row: 18, - column: 11, + column: 12, }, ), custom: (), @@ -1934,12 +1934,12 @@ expression: "parse_program(source, \"\").unwrap()" context_expr: Located { location: Location { row: 22, - column: 6, + column: 5, }, end_location: Some( Location { row: 22, - column: 20, + column: 21, }, ), custom: (),