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

fix parsing string union indexers

Browse source
This commit is contained in:
jackdotink 2025-03-25 14:37:48 -05:00
parent 2621488abe
commit d0d6d47924
No known key found for this signature in database
3 changed files with 114 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Ast/include/Luau/Parser.h
View file

@ -228,9 +228,9 @@ private:
Position colonPosition; Position colonPosition;
}; };
TableIndexerResult parseTableIndexer(AstTableAccess access, std::optional<Location> accessLocation); TableIndexerResult parseTableIndexer(AstTableAccess access, std::optional<Location> accessLocation, Lexeme begin);
// Remove with FFlagLuauStoreCSTData // Remove with FFlagLuauStoreCSTData
AstTableIndexer* parseTableIndexer_DEPRECATED(AstTableAccess access, std::optional<Location> accessLocation); AstTableIndexer* parseTableIndexer_DEPRECATED(AstTableAccess access, std::optional<Location> accessLocation, Lexeme begin);
AstTypeOrPack parseFunctionType(bool allowPack, const AstArray<AstAttr*>& attributes); AstTypeOrPack parseFunctionType(bool allowPack, const AstArray<AstAttr*>& attributes);
AstType* parseFunctionTypeTail( AstType* parseFunctionTypeTail(

40
Ast/src/Parser.cpp
View file

@ -1265,11 +1265,13 @@ AstStat* Parser::parseDeclaration(const Location& start, const AstArray<AstAttr*
{ {
props.push_back(parseDeclaredClassMethod()); props.push_back(parseDeclaredClassMethod());
} }
else if (lexer.current().type == '[' && (lexer.lookahead().type == Lexeme::RawString || lexer.lookahead().type == Lexeme::QuotedString)) else if (lexer.current().type == '[')
{ {
const Lexeme begin = lexer.current(); const Lexeme begin = lexer.current();
nextLexeme(); // [ nextLexeme(); // [
if ((lexer.current().type == Lexeme::RawString || lexer.current().type == Lexeme::QuotedString) && lexer.lookahead().type == ']')
{
const Location nameBegin = lexer.current().location; const Location nameBegin = lexer.current().location;
std::optional<AstArray<char>> chars = parseCharArray(); std::optional<AstArray<char>> chars = parseCharArray();
@ -1293,7 +1295,7 @@ AstStat* Parser::parseDeclaration(const Location& start, const AstArray<AstAttr*
report(begin.location, "String literal contains malformed escape sequence or \\0"); report(begin.location, "String literal contains malformed escape sequence or \\0");
} }
} }
else if (lexer.current().type == '[') else
{ {
if (indexer) if (indexer)
{ {
@ -1301,9 +1303,9 @@ AstStat* Parser::parseDeclaration(const Location& start, const AstArray<AstAttr*
// however, we either have { or [ to lint, not the entire table type or the bad indexer. // however, we either have { or [ to lint, not the entire table type or the bad indexer.
AstTableIndexer* badIndexer; AstTableIndexer* badIndexer;
if (FFlag::LuauStoreCSTData) if (FFlag::LuauStoreCSTData)
badIndexer = parseTableIndexer(AstTableAccess::ReadWrite, std::nullopt).node; badIndexer = parseTableIndexer(AstTableAccess::ReadWrite, std::nullopt, begin).node;
else else
badIndexer = parseTableIndexer_DEPRECATED(AstTableAccess::ReadWrite, std::nullopt); badIndexer = parseTableIndexer_DEPRECATED(AstTableAccess::ReadWrite, std::nullopt, begin);
// we lose all additional indexer expressions from the AST after error recovery here // we lose all additional indexer expressions from the AST after error recovery here
report(badIndexer->location, "Cannot have more than one class indexer"); report(badIndexer->location, "Cannot have more than one class indexer");
@ -1311,9 +1313,10 @@ AstStat* Parser::parseDeclaration(const Location& start, const AstArray<AstAttr*
else else
{ {
if (FFlag::LuauStoreCSTData) if (FFlag::LuauStoreCSTData)
indexer = parseTableIndexer(AstTableAccess::ReadWrite, std::nullopt).node; indexer = parseTableIndexer(AstTableAccess::ReadWrite, std::nullopt, begin).node;
else else
indexer = parseTableIndexer_DEPRECATED(AstTableAccess::ReadWrite, std::nullopt); indexer = parseTableIndexer_DEPRECATED(AstTableAccess::ReadWrite, std::nullopt, begin);
}
} }
} }
else else
@ -1861,11 +1864,8 @@ std::pair<CstExprConstantString::QuoteStyle, unsigned int> Parser::extractString
} }
// TableIndexer ::= `[' Type `]' `:' Type // TableIndexer ::= `[' Type `]' `:' Type
Parser::TableIndexerResult Parser::parseTableIndexer(AstTableAccess access, std::optional<Location> accessLocation) Parser::TableIndexerResult Parser::parseTableIndexer(AstTableAccess access, std::optional<Location> accessLocation, Lexeme begin)
{ {
const Lexeme begin = lexer.current();
nextLexeme(); // [
AstType* index = parseType(); AstType* index = parseType();
Position indexerClosePosition = lexer.current().location.begin; Position indexerClosePosition = lexer.current().location.begin;
@ -1885,11 +1885,8 @@ Parser::TableIndexerResult Parser::parseTableIndexer(AstTableAccess access, std:
} }
// Remove with FFlagLuauStoreCSTData // Remove with FFlagLuauStoreCSTData
AstTableIndexer* Parser::parseTableIndexer_DEPRECATED(AstTableAccess access, std::optional<Location> accessLocation) AstTableIndexer* Parser::parseTableIndexer_DEPRECATED(AstTableAccess access, std::optional<Location> accessLocation, Lexeme begin)
{ {
const Lexeme begin = lexer.current();
nextLexeme(); // [
AstType* index = parseType(); AstType* index = parseType();
expectMatchAndConsume(']', begin); expectMatchAndConsume(']', begin);
@ -1941,11 +1938,11 @@ AstType* Parser::parseTableType(bool inDeclarationContext)
} }
} }
if (lexer.current().type == '[' && (lexer.lookahead().type == Lexeme::RawString || lexer.lookahead().type == Lexeme::QuotedString)) if (lexer.current().type == '[') {
{
const Lexeme begin = lexer.current(); const Lexeme begin = lexer.current();
nextLexeme(); // [ nextLexeme(); // [
if ((lexer.current().type == Lexeme::RawString || lexer.current().type == Lexeme::QuotedString) && lexer.lookahead().type == ']') {
CstExprConstantString::QuoteStyle style; CstExprConstantString::QuoteStyle style;
unsigned int blockDepth = 0; unsigned int blockDepth = 0;
if (FFlag::LuauStoreCSTData && options.storeCstData) if (FFlag::LuauStoreCSTData && options.storeCstData)
@ -1981,7 +1978,7 @@ AstType* Parser::parseTableType(bool inDeclarationContext)
else else
report(begin.location, "String literal contains malformed escape sequence or \\0"); report(begin.location, "String literal contains malformed escape sequence or \\0");
} }
else if (lexer.current().type == '[') else
{ {
if (indexer) if (indexer)
{ {
@ -1989,9 +1986,9 @@ AstType* Parser::parseTableType(bool inDeclarationContext)
// however, we either have { or [ to lint, not the entire table type or the bad indexer. // however, we either have { or [ to lint, not the entire table type or the bad indexer.
AstTableIndexer* badIndexer; AstTableIndexer* badIndexer;
if (FFlag::LuauStoreCSTData) if (FFlag::LuauStoreCSTData)
badIndexer = parseTableIndexer(access, accessLocation).node; badIndexer = parseTableIndexer(access, accessLocation, begin).node;
else else
badIndexer = parseTableIndexer_DEPRECATED(access, accessLocation); badIndexer = parseTableIndexer_DEPRECATED(access, accessLocation, begin);
// we lose all additional indexer expressions from the AST after error recovery here // we lose all additional indexer expressions from the AST after error recovery here
report(badIndexer->location, "Cannot have more than one table indexer"); report(badIndexer->location, "Cannot have more than one table indexer");
@ -2000,7 +1997,7 @@ AstType* Parser::parseTableType(bool inDeclarationContext)
{ {
if (FFlag::LuauStoreCSTData) if (FFlag::LuauStoreCSTData)
{ {
auto tableIndexerResult = parseTableIndexer(access, accessLocation); auto tableIndexerResult = parseTableIndexer(access, accessLocation, begin);
indexer = tableIndexerResult.node; indexer = tableIndexerResult.node;
if (options.storeCstData) if (options.storeCstData)
cstItems.push_back(CstTypeTable::Item{ cstItems.push_back(CstTypeTable::Item{
@ -2014,7 +2011,8 @@ AstType* Parser::parseTableType(bool inDeclarationContext)
} }
else else
{ {
indexer = parseTableIndexer_DEPRECATED(access, accessLocation); indexer = parseTableIndexer_DEPRECATED(access, accessLocation, begin);
}
} }
} }
} }

4
tests/Parser.test.cpp
View file

@ -3938,5 +3938,9 @@ TEST_CASE_FIXTURE(Fixture, "parsing_type_suffix_for_return_type_with_variadic")
CHECK(result.errors.size() == 0); CHECK(result.errors.size() == 0);
} }
TEST_CASE_FIXTURE(Fixture, "parsing_string_union_indexers")
{
parse(R"(type foo = { ["bar" | "baz"]: number })");
}
TEST_SUITE_END(); TEST_SUITE_END();