mirrors/RustPython-Parser
1
0
Fork 0
mirror of https://github.com/RustPython/Parser.git synced 2025-07-08 05:35:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4552 from charliermarsh/charlie/loc

Browse source 
Limit match range to end of last statement
This commit is contained in:
Jeong YunWon 2023-02-23 02:11:42 +09:00 • committed by GitHub
commit 1404660364
4 changed files with 109 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

30
parser/python.lalrpop
View file

@ -358,7 +358,15 @@ CompoundStatement: ast::Stmt = {
};
MatchStatement: ast::Stmt = {
<location:@L> "match" <subject:TestOrStarNamedExpr> ":" "\n" Indent <cases:MatchCase+> Dedent <end_location:@R> => {
<location:@L> "match" <subject:TestOrStarNamedExpr> ":" "\n" Indent <cases:MatchCase+> Dedent => {
let end_location = cases
.last()
.unwrap()
.body
.last()
.unwrap()
.end_location
.unwrap();
ast::Stmt {
location,
end_location: Some(end_location),
@ -369,7 +377,15 @@ MatchStatement: ast::Stmt = {
}
}
},
<location:@L> "match" <subject:TestOrStarNamedExpr> "," ":" "\n" Indent <cases:MatchCase+> Dedent <end_location:@R> => {
<location:@L> "match" <subject:TestOrStarNamedExpr> "," ":" "\n" Indent <cases:MatchCase+> Dedent => {
let end_location = cases
.last()
.unwrap()
.body
.last()
.unwrap()
.end_location
.unwrap();
ast::Stmt {
location,
end_location: Some(end_location),
@ -380,7 +396,15 @@ MatchStatement: ast::Stmt = {
}
}
},
<location:@L> "match" <subject:TestOrStarNamedExpr> "," <subjects:OneOrMore<TestOrStarNamedExpr>> ","? ":" "\n" Indent <cases:MatchCase+> Dedent <end_location:@R> => {
<location:@L> "match" <subject:TestOrStarNamedExpr> "," <subjects:OneOrMore<TestOrStarNamedExpr>> ","? ":" "\n" Indent <cases:MatchCase+> Dedent => {
let end_location = cases
.last()
.unwrap()
.body
.last()
.unwrap()
.end_location
.unwrap();
let mut subjects = subjects;
subjects.insert(0, subject);
ast::Stmt {

20
parser/src/snapshots/rustpython_parser__parser__tests__match.snap
View file

@ -10,8 +10,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 7,
column: 0,
row: 6,
column: 19,
},
),
custom: (),
@ -178,8 +178,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 12,
column: 0,
row: 11,
column: 20,
},
),
custom: (),
@ -453,8 +453,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 15,
column: 0,
row: 14,
column: 13,
},
),
custom: (),
@ -631,8 +631,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 18,
column: 0,
row: 17,
column: 13,
},
),
custom: (),
@ -809,8 +809,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 21,
column: 0,
row: 20,
column: 13,
},
),
custom: (),

4
parser/src/snapshots/rustpython_parser__parser__tests__match_as_identifier.snap
View file

@ -1538,8 +1538,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 21,
column: 0,
row: 20,
column: 12,
},
),
custom: (),

140
parser/src/snapshots/rustpython_parser__parser__tests__patma.snap
View file

@ -10,8 +10,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 8,
column: 0,
row: 6,
column: 13,
},
),
custom: (),
@ -154,8 +154,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 12,
column: 0,
row: 10,
column: 13,
},
),
custom: (),
@ -302,8 +302,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 18,
column: 0,
row: 16,
column: 13,
},
),
custom: (),
@ -562,8 +562,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 22,
column: 0,
row: 20,
column: 16,
},
),
custom: (),
@ -810,8 +810,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 26,
column: 0,
row: 24,
column: 13,
},
),
custom: (),
@ -1090,8 +1090,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 32,
column: 0,
row: 30,
column: 20,
},
),
custom: (),
@ -1257,8 +1257,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 40,
column: 0,
row: 38,
column: 13,
},
),
custom: (),
@ -2102,8 +2102,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 44,
column: 0,
row: 42,
column: 13,
},
),
custom: (),
@ -2265,8 +2265,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 48,
column: 0,
row: 46,
column: 13,
},
),
custom: (),
@ -2409,8 +2409,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 52,
column: 0,
row: 50,
column: 16,
},
),
custom: (),
@ -2657,8 +2657,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 56,
column: 0,
row: 54,
column: 13,
},
),
custom: (),
@ -2802,8 +2802,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 64,
column: 0,
row: 62,
column: 13,
},
),
custom: (),
@ -3179,8 +3179,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 68,
column: 0,
row: 66,
column: 13,
},
),
custom: (),
@ -3322,8 +3322,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 74,
column: 0,
row: 72,
column: 13,
},
),
custom: (),
@ -3542,8 +3542,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 78,
column: 0,
row: 76,
column: 15,
},
),
custom: (),
@ -3691,8 +3691,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 82,
column: 0,
row: 80,
column: 13,
},
),
custom: (),
@ -3979,8 +3979,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 90,
column: 0,
row: 88,
column: 13,
},
),
custom: (),
@ -4515,8 +4515,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 94,
column: 0,
row: 92,
column: 13,
},
),
custom: (),
@ -4679,8 +4679,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 98,
column: 0,
row: 96,
column: 13,
},
),
custom: (),
@ -4858,8 +4858,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 102,
column: 0,
row: 100,
column: 13,
},
),
custom: (),
@ -5005,8 +5005,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 106,
column: 0,
row: 104,
column: 13,
},
),
custom: (),
@ -5181,8 +5181,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 110,
column: 0,
row: 108,
column: 13,
},
),
custom: (),
@ -5290,8 +5290,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 114,
column: 0,
row: 112,
column: 13,
},
),
custom: (),
@ -5417,8 +5417,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 118,
column: 0,
row: 116,
column: 13,
},
),
custom: (),
@ -5528,8 +5528,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 126,
column: 0,
row: 124,
column: 13,
},
),
custom: (),
@ -5840,8 +5840,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 130,
column: 0,
row: 128,
column: 13,
},
),
custom: (),
@ -5952,8 +5952,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 134,
column: 0,
row: 132,
column: 13,
},
),
custom: (),
@ -6118,8 +6118,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 138,
column: 0,
row: 136,
column: 13,
},
),
custom: (),
@ -6480,8 +6480,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 146,
column: 0,
row: 144,
column: 13,
},
),
custom: (),
@ -7325,8 +7325,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 150,
column: 0,
row: 148,
column: 13,
},
),
custom: (),
@ -7545,8 +7545,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 154,
column: 0,
row: 152,
column: 13,
},
),
custom: (),
@ -7765,8 +7765,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 158,
column: 0,
row: 156,
column: 13,
},
),
custom: (),
@ -7894,8 +7894,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 162,
column: 0,
row: 160,
column: 13,
},
),
custom: (),
@ -7907,8 +7907,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 162,
column: 0,
row: 160,
column: 13,
},
),
custom: (),
@ -8077,8 +8077,8 @@ expression: parse_ast
},
end_location: Some(
Location {
row: 165,
column: 0,
row: 164,
column: 13,
},
),
custom: (),