mirror of
https://github.com/luau-lang/luau.git
synced 2024-11-15 22:35:43 +08:00
d47b2f1dfe
- Type mismatch errors now show detailed information for compound types, highlighting the mismatching component - Fix string.pack bug on ARM when packing negative numbers using unsigned formats - Implement bit32.countlz/countrz (RFC RFC: bit32.countlz/countrz #89) - Minor compiler throughput optimization (~2% faster compilation) - Improve transpiler behavior for edge cases and better test coverage (not exposed through CLI at the moment) - Improve error recovery when parsing invalid assignments - Build fixes for fuzzing targets
118 lines
2.9 KiB
C++
118 lines
2.9 KiB
C++
// This file is part of the Luau programming language and is licensed under MIT License; see LICENSE.txt for details
|
|
#include "Luau/TypeInfer.h"
|
|
|
|
#include "Fixture.h"
|
|
#include "ScopedFlags.h"
|
|
|
|
#include "doctest.h"
|
|
|
|
using namespace Luau;
|
|
|
|
static void merge(TypeArena& arena, RefinementMap& l, const RefinementMap& r)
|
|
{
|
|
Luau::merge(l, r, [&arena](TypeId a, TypeId b) -> TypeId {
|
|
// TODO: normalize here also.
|
|
std::unordered_set<TypeId> s;
|
|
|
|
if (auto utv = get<UnionTypeVar>(follow(a)))
|
|
s.insert(begin(utv), end(utv));
|
|
else
|
|
s.insert(a);
|
|
|
|
if (auto utv = get<UnionTypeVar>(follow(b)))
|
|
s.insert(begin(utv), end(utv));
|
|
else
|
|
s.insert(b);
|
|
|
|
std::vector<TypeId> options(s.begin(), s.end());
|
|
return options.size() == 1 ? options[0] : arena.addType(UnionTypeVar{std::move(options)});
|
|
});
|
|
}
|
|
|
|
TEST_SUITE_BEGIN("Predicate");
|
|
|
|
TEST_CASE_FIXTURE(Fixture, "Luau_merge_hashmap_order")
|
|
{
|
|
RefinementMap m{
|
|
{"b", typeChecker.stringType},
|
|
{"c", typeChecker.numberType},
|
|
};
|
|
|
|
RefinementMap other{
|
|
{"a", typeChecker.stringType},
|
|
{"b", typeChecker.stringType},
|
|
{"c", typeChecker.booleanType},
|
|
};
|
|
|
|
TypeArena arena;
|
|
merge(arena, m, other);
|
|
|
|
REQUIRE_EQ(3, m.size());
|
|
REQUIRE(m.count("a"));
|
|
REQUIRE(m.count("b"));
|
|
REQUIRE(m.count("c"));
|
|
|
|
CHECK_EQ("string", toString(m["a"]));
|
|
CHECK_EQ("string", toString(m["b"]));
|
|
CHECK_EQ("boolean | number", toString(m["c"]));
|
|
}
|
|
|
|
TEST_CASE_FIXTURE(Fixture, "Luau_merge_hashmap_order2")
|
|
{
|
|
RefinementMap m{
|
|
{"a", typeChecker.stringType},
|
|
{"b", typeChecker.stringType},
|
|
{"c", typeChecker.numberType},
|
|
};
|
|
|
|
RefinementMap other{
|
|
{"b", typeChecker.stringType},
|
|
{"c", typeChecker.booleanType},
|
|
};
|
|
|
|
TypeArena arena;
|
|
merge(arena, m, other);
|
|
|
|
REQUIRE_EQ(3, m.size());
|
|
REQUIRE(m.count("a"));
|
|
REQUIRE(m.count("b"));
|
|
REQUIRE(m.count("c"));
|
|
|
|
CHECK_EQ("string", toString(m["a"]));
|
|
CHECK_EQ("string", toString(m["b"]));
|
|
CHECK_EQ("boolean | number", toString(m["c"]));
|
|
}
|
|
|
|
TEST_CASE_FIXTURE(Fixture, "one_map_has_overlap_at_end_whereas_other_has_it_in_start")
|
|
{
|
|
RefinementMap m{
|
|
{"a", typeChecker.stringType},
|
|
{"b", typeChecker.numberType},
|
|
{"c", typeChecker.booleanType},
|
|
};
|
|
|
|
RefinementMap other{
|
|
{"c", typeChecker.stringType},
|
|
{"d", typeChecker.numberType},
|
|
{"e", typeChecker.booleanType},
|
|
};
|
|
|
|
TypeArena arena;
|
|
merge(arena, m, other);
|
|
|
|
REQUIRE_EQ(5, m.size());
|
|
REQUIRE(m.count("a"));
|
|
REQUIRE(m.count("b"));
|
|
REQUIRE(m.count("c"));
|
|
REQUIRE(m.count("d"));
|
|
REQUIRE(m.count("e"));
|
|
|
|
CHECK_EQ("string", toString(m["a"]));
|
|
CHECK_EQ("number", toString(m["b"]));
|
|
CHECK_EQ("boolean | string", toString(m["c"]));
|
|
CHECK_EQ("number", toString(m["d"]));
|
|
CHECK_EQ("boolean", toString(m["e"]));
|
|
}
|
|
|
|
TEST_SUITE_END();
|