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

Only escape for interpolated strings

Browse source
This commit is contained in:
Kampfkarren 2022-08-22 21:55:26 -07:00
parent 0283d38cb4
commit 008952714e
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Analysis/src/Transpiler.cpp
View file

@ -519,7 +519,7 @@ struct Printer
for (const auto& string : a->strings) for (const auto& string : a->strings)
{ {
writer.write(escape(std::string_view(string.data, string.size))); writer.write(escape(std::string_view(string.data, string.size), /* escapeForInterpString = */ true));
if (index < a->expressions.size) if (index < a->expressions.size)
{ {

2
Ast/include/Luau/StringUtils.h
View file

@ -35,6 +35,6 @@ bool equalsLower(std::string_view lhs, std::string_view rhs);
size_t hashRange(const char* data, size_t size); size_t hashRange(const char* data, size_t size);
std::string escape(std::string_view s); std::string escape(std::string_view s, bool escapeForInterpString = false);
bool isIdentifier(std::string_view s); bool isIdentifier(std::string_view s);
} // namespace Luau } // namespace Luau

16
Ast/src/StringUtils.cpp
View file

@ -230,7 +230,7 @@ bool isIdentifier(std::string_view s)
return (s.find_first_not_of("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890_") == std::string::npos); return (s.find_first_not_of("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890_") == std::string::npos);
} }
std::string escape(std::string_view s) std::string escape(std::string_view s, bool escapeForInterpString)
{ {
std::string r; std::string r;
r.reserve(s.size() + 50); // arbitrary number to guess how many characters we'll be inserting r.reserve(s.size() + 50); // arbitrary number to guess how many characters we'll be inserting
@ -243,6 +243,12 @@ std::string escape(std::string_view s)
{ {
r += '\\'; r += '\\';
if (escapeForInterpString && (c == '`' || c == '{'))
{
r += c;
continue;
}
switch (c) switch (c)
{ {
case '\a': case '\a':
@ -272,14 +278,6 @@ std::string escape(std::string_view s)
case '\"': case '\"':
r += '\"'; r += '\"';
break; break;
// INTERP CODE REVIEW: This is going to apply it to all escaped strings, not just
// interpolated ones. Is that acceptable, or should this be split into two functions/a toggle?
case '`':
r += '`';
break;
case '{':
r += '{';
break;
case '\\': case '\\':
r += '\\'; r += '\\';
break; break;