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

Fix format specifiers for %s and %q

Browse source
This commit is contained in:
TFilteredC 2023-01-22 22:17:55 +00:00
parent 4a2e8013c7
commit 262d40d164
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Analysis/src/Type.cpp
View file

@ -6,6 +6,7 @@
#include "Luau/ConstraintSolver.h" #include "Luau/ConstraintSolver.h"
#include "Luau/DenseHash.h" #include "Luau/DenseHash.h"
#include "Luau/Error.h" #include "Luau/Error.h"
#include "Luau/Normalize.h"
#include "Luau/RecursionCounter.h" #include "Luau/RecursionCounter.h"
#include "Luau/StringUtils.h" #include "Luau/StringUtils.h"
#include "Luau/ToString.h" #include "Luau/ToString.h"
@ -1076,11 +1077,11 @@ IntersectionTypeIterator end(const IntersectionType* itv)
return IntersectionTypeIterator{}; return IntersectionTypeIterator{};
} }
static std::vector<TypeId> parseFormatString(NotNull<BuiltinTypes> builtinTypes, const char* data, size_t size) static std::vector<UnionType> parseFormatString(NotNull<BuiltinTypes> builtinTypes, const char* data, size_t size)
{ {
const char* options = "cdiouxXeEfgGqs*"; const char* options = "cdiouxXeEfgGqs*";
std::vector<TypeId> result; std::vector<UnionType> result;
for (size_t i = 0; i < size; ++i) for (size_t i = 0; i < size; ++i)
{ {
@ -1099,13 +1100,13 @@ static std::vector<TypeId> parseFormatString(NotNull<BuiltinTypes> builtinTypes,
break; break;
if (data[i] == 'q' || data[i] == 's') if (data[i] == 'q' || data[i] == 's')
result.push_back(builtinTypes->stringType); result.push_back(UnionType {{builtinTypes->stringType, builtinTypes->numberType}});
else if (data[i] == '*') else if (data[i] == '*')
result.push_back(builtinTypes->unknownType); result.push_back(UnionType {{builtinTypes->unknownType}});
else if (strchr(options, data[i])) else if (strchr(options, data[i]))
result.push_back(builtinTypes->numberType); result.push_back(UnionType {{builtinTypes->numberType}});
else else
result.push_back(builtinTypes->errorRecoveryType(builtinTypes->anyType)); result.push_back(UnionType {{builtinTypes->errorRecoveryType(builtinTypes->anyType)}});
} }
} }
@ -1134,7 +1135,7 @@ std::optional<WithPredicate<TypePackId>> magicFunctionFormat(
if (!fmt) if (!fmt)
return std::nullopt; return std::nullopt;
std::vector<TypeId> expected = parseFormatString(typechecker.builtinTypes, fmt->value.data, fmt->value.size); std::vector<UnionType> expected = parseFormatString(typechecker.builtinTypes, fmt->value.data, fmt->value.size);
const auto& [params, tail] = flatten(paramPack); const auto& [params, tail] = flatten(paramPack);
size_t paramOffset = 1; size_t paramOffset = 1;
@ -1145,7 +1146,9 @@ std::optional<WithPredicate<TypePackId>> magicFunctionFormat(
{ {
Location location = expr.args.data[std::min(i + dataOffset, expr.args.size - 1)]->location; Location location = expr.args.data[std::min(i + dataOffset, expr.args.size - 1)]->location;
typechecker.unify(params[i + paramOffset], expected[i], scope, location); // use arena to flatten union type
const TypeId formatTypes = arena.addType(expected[i]);
typechecker.unify(params[i + paramOffset], formatTypes, scope, location);
} }
// if we know the argument count or if we have too many arguments for sure, we can issue an error // if we know the argument count or if we have too many arguments for sure, we can issue an error
@ -1177,7 +1180,7 @@ static bool dcrMagicFunctionFormat(MagicFunctionCallContext context)
if (!fmt) if (!fmt)
return false; return false;
std::vector<TypeId> expected = parseFormatString(context.solver->builtinTypes, fmt->value.data, fmt->value.size); std::vector<UnionType> expected = parseFormatString(context.solver->builtinTypes, fmt->value.data, fmt->value.size);
const auto& [params, tail] = flatten(context.arguments); const auto& [params, tail] = flatten(context.arguments);
size_t paramOffset = 1; size_t paramOffset = 1;
@ -1185,7 +1188,8 @@ static bool dcrMagicFunctionFormat(MagicFunctionCallContext context)
// unify the prefix one argument at a time // unify the prefix one argument at a time
for (size_t i = 0; i < expected.size() && i + paramOffset < params.size(); ++i) for (size_t i = 0; i < expected.size() && i + paramOffset < params.size(); ++i)
{ {
context.solver->unify(params[i + paramOffset], expected[i], context.solver->rootScope); const TypeId formatTypes = arena->addType(expected[i]);
context.solver->unify(params[i + paramOffset], formatTypes, context.solver->rootScope);
} }
// if we know the argument count or if we have too many arguments for sure, we can issue an error // if we know the argument count or if we have too many arguments for sure, we can issue an error