beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 07:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibJS: Allow try statement with only finally clause

Browse source 
This was a regression introduced by 9ffe45b - a TryStatement without
'catch' clause *is* allowed, if it has a 'finally' clause. It is now
checked properly that at least one of both is present.
This commit is contained in:
Linus Groh 2020-10-23 20:54:00 +01:00 committed by Andreas Kling
parent aa115fe27b
commit d6f8c52245
Notes: sideshowbarker 2024-07-19 01:46:37 +09:00 
Author: https://github.com/linusg
Commit: https://github.com/SerenityOS/serenity/commit/d6f8c52245a
Pull-request: https://github.com/SerenityOS/serenity/pull/3834
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Libraries/LibJS/Parser.cpp
View file

@ -1443,7 +1443,10 @@ NonnullRefPtr<TryStatement> Parser::parse_try_statement()
consume(TokenType::Try);
auto block = parse_block_statement();
auto handler = parse_catch_clause();
RefPtr<CatchClause> handler;
if (match(TokenType::Catch))
handler = parse_catch_clause();
RefPtr<BlockStatement> finalizer;
if (match(TokenType::Finally)) {
@ -1451,6 +1454,9 @@ NonnullRefPtr<TryStatement> Parser::parse_try_statement()
finalizer = parse_block_statement();
}
if (!handler && !finalizer)
syntax_error("try statement must have a 'catch' or 'finally' clause");
return create_ast_node<TryStatement>(move(block), move(handler), move(finalizer));
}

9
Libraries/LibJS/Tests/try-catch-finally.js
View file

@ -161,3 +161,12 @@ test("try/catch/finally with exception in try, catch and finally", () => {
expect(catchHasBeenExecuted).toBeTrue();
expect(finallyHasBeenExecuted).toBeTrue();
});
test("try statement must have either 'catch' or 'finally' clause", () => {
expect("try {} catch {}").toEval();
expect("try {} catch (e) {}").toEval();
expect("try {} finally {}").toEval();
expect("try {} catch {} finally {}").toEval();
expect("try {} catch (e) {} finally {}").toEval();
expect("try {}").not.toEval();
});