LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-12-27 21:21:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

JSSpecCompiler: Parse optional arguments groups

Browse Source
This commit is contained in:
Dan Klishch 2024-01-21 14:46:33 -05:00 committed by Andrew Kaster
parent 3e6a07154b
commit a35a751f9e
Notes: sideshowbarker 2024-07-17 03:05:16 +09:00 
Author: https://github.com/DanShaders
Commit: https://github.com/SerenityOS/serenity/commit/a35a751f9e
Pull-request: https://github.com/SerenityOS/serenity/pull/23123
Reviewed-by: https://github.com/ADKaster ✅
8 changed files with 72 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Meta/Lagom/Tools/CodeGenerators/JSSpecCompiler/Function.h
View File

@ -43,6 +43,7 @@ private:
struct FunctionArgument {
StringView name;
size_t optional_arguments_group;
};
class FunctionDeclaration : public RefCounted<FunctionDeclaration> {

2
Meta/Lagom/Tools/CodeGenerators/JSSpecCompiler/Parser/Lexer.cpp
View File

@ -74,6 +74,8 @@ void tokenize_string(SpecificationParsingContext& ctx, XML::Node const* node, St
{ "("sv, TokenType::ParenOpen },
{ "+"sv, TokenType::Plus },
{ "?"sv, TokenType::QuestionMark },
{ "]"sv, TokenType::SquareBracketClose },
{ "["sv, TokenType::SquareBracketOpen },
};
LineTrackingLexer lexer(view, node->offset);

48
Meta/Lagom/Tools/CodeGenerators/JSSpecCompiler/Parser/TextParser.cpp
View File

@ -13,6 +13,8 @@ namespace JSSpecCompiler {
void TextParser::save_error(Variant<TokenType, StringView, CustomMessage>&& expected)
{
if (expected.has<TokenType>() && expected.get<TokenType>() == TokenType::Invalid)
return;
if (m_max_parsed_tokens > m_next_token_index)
return;
if (m_max_parsed_tokens < m_next_token_index)
@ -650,21 +652,45 @@ TextParseErrorOr<Vector<StringView>> TextParser::parse_qualified_name()
// <function_arguments> :== '(' (<word> (, <word>)*)? ')'
TextParseErrorOr<Vector<FunctionArgument>> TextParser::parse_function_arguments_in_declaration()
{
Vector<FunctionArgument> arguments;
TRY(consume_token_with_type(TokenType::ParenOpen));
Vector<FunctionArgument> arguments;
size_t optional_arguments_group = 0;
while (true) {
if (arguments.is_empty()) {
auto argument = TRY(consume_token_with_one_of_types({ TokenType::ParenClose, TokenType::Identifier }));
if (argument.type == TokenType::ParenClose)
break;
arguments.append({ argument.data });
} else {
arguments.append({ TRY(consume_token_with_type(TokenType::Identifier)).data });
}
auto next_token = TRY(consume_token_with_one_of_types({ TokenType::ParenClose, TokenType::Comma }));
if (next_token.type == TokenType::ParenClose)
Token token = TRY(consume_token_with_one_of_types({
TokenType::SquareBracketOpen,
arguments.is_empty() ? TokenType::Identifier : TokenType::Comma,
!optional_arguments_group ? TokenType::ParenClose : TokenType::Invalid,
optional_arguments_group ? TokenType::SquareBracketClose : TokenType::Invalid,
}));
StringView identifier;
if (token.type == TokenType::SquareBracketClose) {
VERIFY(optional_arguments_group != 0);
for (size_t i = 1; i < optional_arguments_group; ++i)
TRY(consume_token_with_type(TokenType::SquareBracketClose));
TRY(consume_token_with_type(TokenType::ParenClose));
break;
} else if (token.type == TokenType::ParenClose) {
VERIFY(optional_arguments_group == 0);
break;
} else if (token.type == TokenType::SquareBracketOpen) {
++optional_arguments_group;
if (!arguments.is_empty())
TRY(consume_token_with_type(TokenType::Comma));
identifier = TRY(consume_token_with_type(TokenType::Identifier)).data;
} else if (token.type == TokenType::Comma) {
identifier = TRY(consume_token_with_type(TokenType::Identifier)).data;
} else {
VERIFY(token.type == TokenType::Identifier);
identifier = token.data;
}
arguments.append({ identifier, optional_arguments_group });
}
return arguments;
}

2
Meta/Lagom/Tools/CodeGenerators/JSSpecCompiler/Parser/Token.h
View File

@ -48,6 +48,8 @@ constexpr i32 closing_bracket_precedence = 18;
F(Plus, 6, Invalid, Plus, Invalid, "plus") \
F(QuestionMark, 3, ReturnIfAbrubt, Invalid, Invalid, "question mark") \
F(SectionNumber, -1, Invalid, Invalid, Invalid, "section number") \
F(SquareBracketClose, -1, Invalid, Invalid, Invalid, "']'") \
F(SquareBracketOpen, -1, Invalid, Invalid, Invalid, "'['") \
F(String, -1, Invalid, Invalid, Invalid, "string literal") \
F(Superscript, 4, Invalid, Power, Invalid, "subscript") \
F(UnaryMinus, 3, Minus, Invalid, Invalid, "unary minus") \

12
Meta/Lagom/Tools/CodeGenerators/JSSpecCompiler/Tests/spec-optional-arguments.xml Normal file
View File

@ -0,0 +1,12 @@
<!DOCTYPE inline_dtd[<!ENTITY nbsp " ">]>
<specification>
<emu-clause id="1" aoid="TestOptionalArgumentsGroups1">
<h1><span class="secnum">1</span> TestOptionalArgumentsGroups1 ( [<var>a</var>, <var>b</var>[, <var>c</var>]] )</h1>
<emu-alg><ol><li>Return <emu-const>unused</emu-const>.</li></ol></emu-alg>
</emu-clause>
<emu-clause id="2" aoid="TestOptionalArgumentsGroups2">
<h1><span class="secnum">2</span> TestOptionalArgumentsGroups2 ( <var>a</var>, <var>b</var>[, <var>c</var>, <var>d</var>] )</h1>
<emu-alg><ol><li>Return <emu-const>unused</emu-const>.</li></ol></emu-alg>
</emu-clause>
</specification>

11
Meta/Lagom/Tools/CodeGenerators/JSSpecCompiler/Tests/spec-optional-arguments.xml.expectation Normal file
View File

@ -0,0 +1,11 @@
===== AST after reference-resolving =====
TestOptionalArgumentsGroups1([a, b, [c]]):
TreeList
ReturnNode
Enumerator unused
TestOptionalArgumentsGroups2(a, b, [c, d]):
TreeList
ReturnNode
Enumerator unused

6
Meta/Lagom/Tools/CodeGenerators/JSSpecCompiler/main.cpp
View File

@ -74,11 +74,17 @@ template<>
struct AK::Formatter<Vector<FunctionArgument>> : AK::Formatter<StringView> {
ErrorOr<void> format(FormatBuilder& builder, Vector<FunctionArgument> const& arguments)
{
size_t previous_optional_group = 0;
for (size_t i = 0; i < arguments.size(); ++i) {
if (previous_optional_group != arguments[i].optional_arguments_group) {
previous_optional_group = arguments[i].optional_arguments_group;
TRY(builder.put_string("["sv));
}
TRY(builder.put_string(arguments[i].name));
if (i + 1 != arguments.size())
TRY(builder.put_literal(", "sv));
}
TRY(builder.put_string(TRY(String::repeated(']', previous_optional_group))));
return {};
}
};

1
Tests/JSSpecCompiler/test-runner.cpp
View File

@ -50,6 +50,7 @@ const Array regression_tests = {
TestDescription {
.sources = {
"spec-no-new-line-after-dot.xml"sv,
"spec-optional-arguments.xml"sv,
"spec-parsing.xml"sv,
"spec-single-function-simple.xml"sv,
},