luau-lang/luau
1
0
Fork 0
mirror of https://github.com/luau-lang/luau.git synced 2025-04-04 10:50:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

implement leading bar and ampersand in types

Browse source
This commit is contained in:
jackdotink 2024-06-04 15:15:24 -05:00
parent daf79328fc
commit 4f05a860cb
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Ast/src/Parser.cpp
View file

@ -1523,7 +1523,11 @@ AstType* Parser::parseFunctionTypeTail(const Lexeme& begin, AstArray<AstGenericT
AstType* Parser::parseTypeSuffix(AstType* type, const Location& begin)
{
TempVector<AstType*> parts(scratchType);
parts.push_back(type);
if (type != nullptr)
{
parts.push_back(type);
}
incrementRecursionCounter("type annotation");
@ -1622,11 +1626,17 @@ AstTypeOrPack Parser::parseTypeOrPack()
AstType* Parser::parseType(bool inDeclarationContext)
{
Location begin = lexer.current().location;
Lexeme::Type c = lexer.current().type;
if (c == '|' || c == '&')
{
return parseTypeSuffix(nullptr, begin);
}
unsigned int oldRecursionCount = recursionCounter;
// recursion counter is incremented in parseSimpleType
Location begin = lexer.current().location;
AstType* type = parseSimpleType(/* allowPack= */ false, /* in declaration context */ inDeclarationContext).type;
recursionCounter = oldRecursionCount;

10
tests/Parser.test.cpp
View file

@ -3167,4 +3167,14 @@ TEST_CASE_FIXTURE(Fixture, "read_write_table_properties")
LUAU_ASSERT(pr.errors.size() == 0);
}
TEST_CASE_FIXTURE(Fixture, "can_parse_leading_bar_unions_successfully")
{
parse(R"(type A = | "Hello" | "World")");
}
TEST_CASE_FIXTURE(Fixture, "can_parse_leading_ampersand_intersections_successfully")
{
parse(R"(type A = & { string } & { number })");
}
TEST_SUITE_END();