mirror of
https://github.com/luau-lang/luau.git
synced 2024-11-15 14:25:44 +08:00
b23d43496b
### What's new * Light update this week, mostly fast flag cleanups. ### New Solver * Rename flag to enable new solver from `DebugLuauDeferredConstraintResolution` to `LuauSolverV2` * Added support for magic functions for the new type checker (as opposed to the type inference component) * Improved handling of `string.format` with magic function improvements * Cleaning up some of the reported errors by the new type checker * Minor refactoring of `TypeChecker2.cpp` that happens to make the diff very hard to read. --- ### Internal Contributors Co-authored-by: Aaron Weiss <aaronweiss@roblox.com> Co-authored-by: Andy Friesen <afriesen@roblox.com> Co-authored-by: Vighnesh Vijay <vvijay@roblox.com> Co-authored-by: Vyacheslav Egorov <vegorov@roblox.com> --------- Co-authored-by: Alexander McCord <amccord@roblox.com> Co-authored-by: Andy Friesen <afriesen@roblox.com> Co-authored-by: Vighnesh <vvijay@roblox.com> Co-authored-by: Aviral Goel <agoel@roblox.com> Co-authored-by: David Cope <dcope@roblox.com> Co-authored-by: Lily Brown <lbrown@roblox.com> Co-authored-by: Vyacheslav Egorov <vegorov@roblox.com> Co-authored-by: Junseo Yoo <jyoo@roblox.com>
136 lines
3.8 KiB
C++
136 lines
3.8 KiB
C++
// This file is part of the Luau programming language and is licensed under MIT License; see LICENSE.txt for details
|
|
|
|
#include "Luau/Scope.h"
|
|
#include "Luau/ToString.h"
|
|
#include "Luau/TypeArena.h"
|
|
#include "Luau/Unifier2.h"
|
|
#include "Luau/Error.h"
|
|
|
|
#include "ScopedFlags.h"
|
|
|
|
#include "doctest.h"
|
|
|
|
using namespace Luau;
|
|
|
|
LUAU_FASTFLAG(LuauSolverV2)
|
|
|
|
struct Unifier2Fixture
|
|
{
|
|
TypeArena arena;
|
|
BuiltinTypes builtinTypes;
|
|
Scope scope{builtinTypes.anyTypePack};
|
|
InternalErrorReporter iceReporter;
|
|
Unifier2 u2{NotNull{&arena}, NotNull{&builtinTypes}, NotNull{&scope}, NotNull{&iceReporter}};
|
|
ToStringOptions opts;
|
|
|
|
ScopedFastFlag sff{FFlag::LuauSolverV2, true};
|
|
|
|
std::pair<TypeId, FreeType*> freshType()
|
|
{
|
|
FreeType ft{&scope, builtinTypes.neverType, builtinTypes.unknownType};
|
|
|
|
TypeId ty = arena.addType(ft);
|
|
FreeType* ftv = getMutable<FreeType>(ty);
|
|
REQUIRE(ftv != nullptr);
|
|
|
|
return {ty, ftv};
|
|
}
|
|
|
|
std::string toString(TypeId ty)
|
|
{
|
|
return ::Luau::toString(ty, opts);
|
|
}
|
|
|
|
std::string toString(TypePackId ty)
|
|
{
|
|
return ::Luau::toString(ty, opts);
|
|
}
|
|
};
|
|
|
|
TEST_SUITE_BEGIN("Unifier2");
|
|
|
|
TEST_CASE_FIXTURE(Unifier2Fixture, "T <: number")
|
|
{
|
|
auto [left, freeLeft] = freshType();
|
|
|
|
CHECK(u2.unify(left, builtinTypes.numberType));
|
|
|
|
CHECK("never" == toString(freeLeft->lowerBound));
|
|
CHECK("number" == toString(freeLeft->upperBound));
|
|
}
|
|
|
|
TEST_CASE_FIXTURE(Unifier2Fixture, "number <: T")
|
|
{
|
|
auto [right, freeRight] = freshType();
|
|
|
|
CHECK(u2.unify(builtinTypes.numberType, right));
|
|
|
|
CHECK("number" == toString(freeRight->lowerBound));
|
|
CHECK("unknown" == toString(freeRight->upperBound));
|
|
}
|
|
|
|
TEST_CASE_FIXTURE(Unifier2Fixture, "T <: U")
|
|
{
|
|
auto [left, freeLeft] = freshType();
|
|
auto [right, freeRight] = freshType();
|
|
|
|
CHECK(u2.unify(left, right));
|
|
|
|
CHECK("t1 where t1 = ('a <: (t1 <: 'b))" == toString(left));
|
|
CHECK("t1 where t1 = (('a <: t1) <: 'b)" == toString(right));
|
|
|
|
CHECK("never" == toString(freeLeft->lowerBound));
|
|
CHECK("t1 where t1 = (('a <: t1) <: 'b)" == toString(freeLeft->upperBound));
|
|
|
|
CHECK("t1 where t1 = ('a <: (t1 <: 'b))" == toString(freeRight->lowerBound));
|
|
CHECK("unknown" == toString(freeRight->upperBound));
|
|
}
|
|
|
|
TEST_CASE_FIXTURE(Unifier2Fixture, "(string) -> () <: (X) -> Y...")
|
|
{
|
|
TypeId stringToUnit = arena.addType(FunctionType{arena.addTypePack({builtinTypes.stringType}), arena.addTypePack({})});
|
|
|
|
auto [x, xFree] = freshType();
|
|
TypePackId y = arena.freshTypePack(&scope);
|
|
|
|
TypeId xToY = arena.addType(FunctionType{arena.addTypePack({x}), y});
|
|
|
|
u2.unify(stringToUnit, xToY);
|
|
|
|
CHECK("string" == toString(xFree->upperBound));
|
|
|
|
const TypePack* yPack = get<TypePack>(follow(y));
|
|
REQUIRE(yPack != nullptr);
|
|
|
|
CHECK(0 == yPack->head.size());
|
|
CHECK(!yPack->tail);
|
|
}
|
|
|
|
TEST_CASE_FIXTURE(Unifier2Fixture, "unify_binds_free_subtype_tail_pack")
|
|
{
|
|
TypePackId numberPack = arena.addTypePack({builtinTypes.numberType});
|
|
|
|
TypePackId freeTail = arena.freshTypePack(&scope);
|
|
TypeId freeHead = arena.addType(FreeType{&scope, builtinTypes.neverType, builtinTypes.unknownType});
|
|
TypePackId freeAndFree = arena.addTypePack({freeHead}, freeTail);
|
|
|
|
u2.unify(freeAndFree, numberPack);
|
|
|
|
CHECK("('a <: number)" == toString(freeAndFree));
|
|
}
|
|
|
|
TEST_CASE_FIXTURE(Unifier2Fixture, "unify_binds_free_supertype_tail_pack")
|
|
{
|
|
TypePackId numberPack = arena.addTypePack({builtinTypes.numberType});
|
|
|
|
TypePackId freeTail = arena.freshTypePack(&scope);
|
|
TypeId freeHead = arena.addType(FreeType{&scope, builtinTypes.neverType, builtinTypes.unknownType});
|
|
TypePackId freeAndFree = arena.addTypePack({freeHead}, freeTail);
|
|
|
|
u2.unify(numberPack, freeAndFree);
|
|
|
|
CHECK("(number <: 'a)" == toString(freeAndFree));
|
|
}
|
|
|
|
TEST_SUITE_END();
|