M-Labs/nac3
M-Labs
/
nac3
8
0
Fork 10
Code Issues 98 Pull Requests 18 Releases Wiki Activity

Polymorphism Fixes #104

Merged
sb10q merged 1 commits from polymorphism_fixes into master 2024-08-17 17:37:19 +08:00
Conversation 1 Commits 1 Files Changed 2 +6 -4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 49476d06e1 - Show all commits

5
nac3core/src/codegen/concrete_type.rs
View File

@ -148,8 +148,9 @@ impl ConcreteTypeStore {
.borrow() .borrow()
.iter() .iter()
.filter_map(|(name, ty)| { .filter_map(|(name, ty)| {
// filter out functions as they can have type vars and // here we should not have type vars, but some partial instantiated
// will not affect codegen // class methods can still have uninstantiated type vars, so
sb10q commented 2021-11-22 13:03:49 +08:00
Outdated
Review
Copy Link

What does this comment mean? Did you mean "cannot have type vars..."?

What does this comment mean? Did you mean "cannot have type vars..."?
ychenfo commented 2021-11-22 14:42:49 +08:00
Outdated
Review
Copy Link

Yes, here since we are concretizing types, all class fields should not have type vars. But due to partial instantiation of class methods, there might still be some methods whose signature contains type vars. So I filter out all the functions here since class methods here does not affect codegen.

I will put clearer comments here in a later commit.

Yes, here since we are concretizing types, all class fields should not have type vars. But due to partial instantiation of class methods, there might still be some methods whose signature contains type vars. So I filter out all the functions here since class methods here does not affect codegen. I will put clearer comments here in a later commit.
// filter out all the methods, as this will not affect codegen
if let TypeEnum::TFunc( .. ) = &*unifier.get_ty(ty.0) { if let TypeEnum::TFunc( .. ) = &*unifier.get_ty(ty.0) {
None None
} else { } else {

5
nac3core/src/typecheck/typedef/mod.rs
View File

@ -725,8 +725,9 @@ impl Unifier {
if let TypeEnum::TVar { id, range, .. } = if let TypeEnum::TVar { id, range, .. } =
self.unification_table.probe_value(*v).as_ref() self.unification_table.probe_value(*v).as_ref()
{ {
// need to do this for partial instantiated function // for class methods that contain type vars not in class declaration,
sb10q commented 2021-11-22 13:04:23 +08:00
Outdated
Review
Copy Link

to do what?

to do what?
ychenfo commented 2021-11-22 14:46:01 +08:00
Outdated
Review
Copy Link

To change the way to check whether a function is instantiated (e.g., as long as there exits one uninstantiated type var, the function is not instantiated)

Thanks for pointing it out, I will also put clearer comments here in a later commit.

To change the way to check whether a function is instantiated (e.g., as long as there exits one uninstantiated type var, the function is not instantiated) Thanks for pointing it out, I will also put clearer comments here in a later commit.
// (in class methods that contains type vars not in class) // as long as there exits one uninstantiated type var, the function is not instantiated,
// and need to do substitution on those type vars
if k == id { if k == id {
instantiated = false; instantiated = false;
vars.push((*k, range.clone())); vars.push((*k, range.clone()));