mirrors
/
codon
mirror of https://github.com/exaloop/codon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

clang-format

pull/335/head
A. R. Shajii 2023-02-16 23:03:54 -05:00
parent 2ead2590aa
commit 9f08ecd2e4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
codon/parser/ast/types/class.cpp
View File

@ -129,11 +129,13 @@ std::string ClassType::realizedTypeName() const {
}
RecordType::RecordType(Cache *cache, std::string name, std::string niceName,
std::vector<Generic> generics, std::vector<TypePtr> args, bool isInternal)
std::vector<Generic> generics, std::vector<TypePtr> args,
bool isInternal)
: ClassType(cache, std::move(name), std::move(niceName), std::move(generics)),
args(std::move(args)), isInternal(false) {}
RecordType::RecordType(const ClassTypePtr &base, std::vector<TypePtr> args, bool isInternal)
RecordType::RecordType(const ClassTypePtr &base, std::vector<TypePtr> args,
bool isInternal)
: ClassType(base), args(std::move(args)), isInternal(isInternal) {}
int RecordType::unify(Type *typ, Unification *us) {
@ -157,7 +159,8 @@ int RecordType::unify(Type *typ, Unification *us) {
}
// Handle Tuple<->@tuple: when unifying tuples, only record members matter.
if (startswith(name, TYPE_TUPLE) || startswith(tr->name, TYPE_TUPLE)) {
if (!args.empty() || (!isInternal && !tr->isInternal)) // prevent int<->() unification
if (!args.empty() ||
(!isInternal && !tr->isInternal)) // prevent int<->() unification
return s1 + int(name == tr->name);
else
return -1;

3
codon/parser/ast/types/class.h
View File

@ -83,7 +83,8 @@ struct RecordType : public ClassType {
Cache *cache, std::string name, std::string niceName,
std::vector<ClassType::Generic> generics = std::vector<ClassType::Generic>(),
std::vector<TypePtr> args = std::vector<TypePtr>(), bool isInternal = false);
RecordType(const ClassTypePtr &base, std::vector<TypePtr> args, bool isInternal = false);
RecordType(const ClassTypePtr &base, std::vector<TypePtr> args,
bool isInternal = false);
public:
int unify(Type *typ, Unification *undo) override;