RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 10:22:45 +00:00
Code Issues Activity Actions

JSSpecCompiler: Allow storing NullableTrees in nodes

Browse source 
And use this in ElseIfBranch node.
This commit is contained in:
Dan Klishch 2023-08-18 16:23:29 -04:00 • committed by Andrew Kaster
parent 4eede5282c
commit 092ed1cc8a
7 changed files with 56 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Meta/Lagom/Tools/CodeGenerators/JSSpecCompiler/Parser/TextParser.cpp
View file

@ -382,7 +382,7 @@ ParseErrorOr<TextParser::IfConditionParseResult> TextParser::parse_if_beginning(
auto rollback = rollback_point();
bool is_if_branch = !consume_word("if"sv).is_error();
Optional<Tree> condition;
NullableTree condition = nullptr;
if (is_if_branch) {
condition = TRY(parse_condition());
} else {
@ -406,9 +406,8 @@ ParseErrorOr<Tree> TextParser::parse_inline_if_else()
rollback.disarm();
if (is_if_branch)
return make_ref_counted<IfBranch>(*condition, then_branch);
else
return make_ref_counted<ElseIfBranch>(condition, then_branch);
return make_ref_counted<IfBranch>(condition.release_nonnull(), then_branch);
return make_ref_counted<ElseIfBranch>(condition, then_branch);
}
// <if> :== <if_condition> then$ <substeps>
@ -437,7 +436,7 @@ ParseErrorOr<Tree> TextParser::parse_else(Tree else_branch)
TRY(expect_eof());
rollback.disarm();
return make_ref_counted<ElseIfBranch>(Optional<Tree> {}, else_branch);
return make_ref_counted<ElseIfBranch>(nullptr, else_branch);
}
// <simple_step> | <inline_if>

2
Meta/Lagom/Tools/CodeGenerators/JSSpecCompiler/Parser/TextParser.h
View file

@ -33,7 +33,7 @@ public:
private:
struct IfConditionParseResult {
bool is_if_branch;
Optional<Tree> condition;
NullableTree condition;
};
void retreat();