Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Raise syntax error for mixing except and except* #14895

Merged
merged 6 commits into from
Dec 10, 2024
Merged

Raise syntax error for mixing except and except* #14895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ba7e4fc
add parser error if different except kinds are used
dylwil3 Dec 10, 2024
6e5ca26
generate inline test
dylwil3 Dec 10, 2024
ffcae17
update error message
dylwil3 Dec 10, 2024
1c0dca0
update snapshot
dylwil3 Dec 10, 2024
4ecae55
raise for each block disagreeing with first kind seen
dylwil3 Dec 10, 2024
2fda6fe
simplify comparison
dylwil3 Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions crates/ruff_python_parser/resources/inline/err/try_stmt_mixed_except_kind.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
try:
pass
except:
pass
except* ExceptionGroup:
pass
try:
pass
except* ExceptionGroup:
pass
except:
pass
try:
pass
except:
pass
except:
pass
except* ExceptionGroup:
pass
except* ExceptionGroup:
pass
31 changes: 27 additions & 4 deletions crates/ruff_python_parser/src/parser/statement.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1332,14 +1332,12 @@ impl<'src> Parser<'src> {
self.bump(TokenKind::Try);
self.expect(TokenKind::Colon);

let mut is_star = false;
let mut is_star: Option<bool> = None;

let try_body = self.parse_body(Clause::Try);

let has_except = self.at(TokenKind::Except);

// TODO(dhruvmanila): Raise syntax error if there are both 'except' and 'except*'
// on the same 'try'
// test_err try_stmt_mixed_except_kind
// try:
// pass
Expand All @@ -1353,11 +1351,36 @@ impl<'src> Parser<'src> {
// pass
// except:
// pass
// try:
// pass
// except:
// pass
// except:
// pass
// except* ExceptionGroup:
// pass
// except* ExceptionGroup:
// pass
let mut mixed_except_ranges = Vec::new();
let handlers = self.parse_clauses(Clause::Except, |p| {
let (handler, kind) = p.parse_except_clause();
is_star |= kind.is_star();
if is_star.is_none() {
is_star = Some(kind.is_star());
} else if is_star != Some(kind.is_star()) {
mixed_except_ranges.push(handler.range());
}
handler
});
// Empty handler has `is_star` false.
let is_star = is_star.unwrap_or_default();
for handler_err_range in mixed_except_ranges {
self.add_error(
ParseErrorType::OtherError(
"Cannot have both 'except' and 'except*' on the same 'try'".to_string(),
),
handler_err_range,
);
}

// test_err try_stmt_misspelled_except
// try:
Expand Down
252 changes: 252 additions & 0 deletions crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_mixed_except_kind.py.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,252 @@
---
source: crates/ruff_python_parser/tests/fixtures.rs
input_file: crates/ruff_python_parser/resources/inline/err/try_stmt_mixed_except_kind.py
---
## AST

```
Module(
ModModule {
range: 0..242,
body: [
Try(
StmtTry {
range: 0..63,
body: [
Pass(
StmtPass {
range: 9..13,
},
),
],
handlers: [
ExceptHandler(
ExceptHandlerExceptHandler {
range: 14..30,
type_: None,
name: None,
body: [
Pass(
StmtPass {
range: 26..30,
},
),
],
},
),
ExceptHandler(
ExceptHandlerExceptHandler {
range: 31..63,
type_: Some(
Name(
ExprName {
range: 39..53,
id: Name("ExceptionGroup"),
ctx: Load,
},
),
),
name: None,
body: [
Pass(
StmtPass {
range: 59..63,
},
),
],
},
),
],
orelse: [],
finalbody: [],
is_star: false,
},
),
Try(
StmtTry {
range: 64..127,
body: [
Pass(
StmtPass {
range: 73..77,
},
),
],
handlers: [
ExceptHandler(
ExceptHandlerExceptHandler {
range: 78..110,
type_: Some(
Name(
ExprName {
range: 86..100,
id: Name("ExceptionGroup"),
ctx: Load,
},
),
),
name: None,
body: [
Pass(
StmtPass {
range: 106..110,
},
),
],
},
),
ExceptHandler(
ExceptHandlerExceptHandler {
range: 111..127,
type_: None,
name: None,
body: [
Pass(
StmtPass {
range: 123..127,
},
),
],
},
),
],
orelse: [],
finalbody: [],
is_star: true,
},
),
Try(
StmtTry {
range: 128..241,
body: [
Pass(
StmtPass {
range: 137..141,
},
),
],
handlers: [
ExceptHandler(
ExceptHandlerExceptHandler {
range: 142..158,
type_: None,
name: None,
body: [
Pass(
StmtPass {
range: 154..158,
},
),
],
},
),
ExceptHandler(
ExceptHandlerExceptHandler {
range: 159..175,
type_: None,
name: None,
body: [
Pass(
StmtPass {
range: 171..175,
},
),
],
},
),
ExceptHandler(
ExceptHandlerExceptHandler {
range: 176..208,
type_: Some(
Name(
ExprName {
range: 184..198,
id: Name("ExceptionGroup"),
ctx: Load,
},
),
),
name: None,
body: [
Pass(
StmtPass {
range: 204..208,
},
),
],
},
),
ExceptHandler(
ExceptHandlerExceptHandler {
range: 209..241,
type_: Some(
Name(
ExprName {
range: 217..231,
id: Name("ExceptionGroup"),
ctx: Load,
},
),
),
name: None,
body: [
Pass(
StmtPass {
range: 237..241,
},
),
],
},
),
],
orelse: [],
finalbody: [],
is_star: false,
},
),
],
},
)
```
## Errors

|
3 | except:
4 | pass
5 | / except* ExceptionGroup:
6 | | pass
| |________^ Syntax Error: Cannot have both 'except' and 'except*' on the same 'try'
7 | try:
8 | pass
|


|
9 | except* ExceptionGroup:
10 | pass
11 | / except:
12 | | pass
| |________^ Syntax Error: Cannot have both 'except' and 'except*' on the same 'try'
13 | try:
14 | pass
|


|
17 | except:
18 | pass
19 | / except* ExceptionGroup:
20 | | pass
| |________^ Syntax Error: Cannot have both 'except' and 'except*' on the same 'try'
21 | except* ExceptionGroup:
22 | pass
|


|
19 | except* ExceptionGroup:
20 | pass
21 | / except* ExceptionGroup:
22 | | pass
| |________^ Syntax Error: Cannot have both 'except' and 'except*' on the same 'try'
|
Loading