M-Labs/nac3
M-Labs/nac3
8
1
Fork 13
Code Issues 91 Pull Requests 5 Releases Wiki Activity

master #311

Closed
Aadityavardhan wants to merge 8 commits from (deleted):master into master
pull from: (deleted):master
merge into: M-Labs:master
Conversation 2 Commits 8 Files Changed 133 +1 -4
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 170a1b8641 - Show all commits

3
nac3core/src/toplevel/builtins.rs
View File

@ -74,7 +74,6 @@ pub fn get_exn_constructor(
constructor: Some(signature),
resolver: None,
loc: None,
// Make TopLevelDef::Class initlializer compatible
static_fields: Default::default(),
};
(fun_def, class_def, signature, exn_type)
@ -177,7 +176,6 @@ pub fn get_builtins(primitives: &mut (PrimitiveStore, Unifier)) -> BuiltinInfo {
type_vars: Default::default(),
fields: exception_fields,
methods: Default::default(),
// Make TopLevelDef::Class initlializer compatible
static_fields: Default::default(),
ancestors: vec![],
sb10q commented 2022-08-21 16:32:18 +08:00
Outdated
Review
Copy Link

Typo
What does that mean anyway?

Typo What does that mean anyway?
Aadityavardhan commented 2022-08-21 18:11:37 +08:00
Outdated
Review
Copy Link

To call out the newly introduced static_fields data member in the TopLevelDef::Class struct.

To call out the newly introduced static_fields data member in the TopLevelDef::Class struct.
constructor: None,
@ -204,7 +202,6 @@ pub fn get_builtins(primitives: &mut (PrimitiveStore, Unifier)) -> BuiltinInfo {
object_id: DefinitionId(10),
type_vars: vec![option_ty_var],
fields: vec![],
// Make TopLevelDef::Class initlializer compatible
static_fields: vec![],
methods: vec![
("is_some".into(), is_some_ty.0, DefinitionId(11)),

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

@ -513,7 +513,7 @@ impl Unifier {
fn unify_impl(&mut self, a: Type, b: Type, swapped: bool) -> Result<(), TypeError> {
use TypeEnum::*;
sb10q commented 2022-08-21 16:32:39 +08:00
Outdated
Review
Copy Link

Remove

Remove
if !swapped {
let rep_a = self.unification_table.get_representative(a);
let rep_b = self.unification_table.get_representative(b);