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

Use TempVector

Browse source
This commit is contained in:
Kampfkarren 2022-07-27 23:36:45 -07:00
parent e1a229aa80
commit 54734826e7
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -365,6 +365,7 @@ private:
std::vector<unsigned int> matchRecoveryStopOnToken;
std::vector<AstStat*> scratchStat;
std::vector<AstArray<char>> scratchString;
std::vector<AstExpr*> scratchExpr;
std::vector<AstExpr*> scratchExprAux;
std::vector<AstName> scratchName;

13
Ast/src/Parser.cpp
View file

@ -2642,8 +2642,8 @@ AstExpr* Parser::parseString()
AstExpr* Parser::parseInterpString()
{
std::vector<AstArray<char>> strings;
std::vector<AstExpr*> expressions;
TempVector<AstArray<char>> strings(scratchString);
TempVector<AstExpr*> expressions(scratchExpr);
Location startLocation = lexer.current().location;
@ -2671,13 +2671,8 @@ AstExpr* Parser::parseInterpString()
if (currentLexeme.type == Lexeme::InterpStringEnd)
{
// INTERP CODE REVIEW: I figure this isn't the right way to do this.
// From what I could gather, I'm expected to have strings and expressions be TempVector from the beginning.
// Everything that does that uses a scratch value.
// But I would think I would also be expected to use an existing scratch, like `scratchExpr`, in which case
// my assumption is that a nested expression would clash the scratches?
AstArray<AstArray<char>> stringsArray = copy(strings.data(), strings.size());
AstArray<AstExpr*> expressionsArray = copy(expressions.data(), expressions.size());
AstArray<AstArray<char>> stringsArray = copy(strings);
AstArray<AstExpr*> expressionsArray = copy(expressions);
return allocator.alloc<AstExprInterpString>(startLocation, stringsArray, expressionsArray);
}