core: refactor to use TypeVarId and TypeVar #414

lyken · 2024-06-13T13:35:21+08:00

lyken commented

2024-06-13 13:35:21 +08:00

Main changes are in nac3core/src/typecheck/typedef/mod.rs.

Type variable IDs are now carried by struct TypeVarId(u32) instead of simply u32.
Added struct TypeVar { id: TypeVarId, ty: Type }.
1. unifier.add_ty and others now return TypeVar instead of (Type, u32).

Other notes:

Some insta snapshots are updated. This is because type variable ID u32 values are now wrapped within TypeVarId. The output from Debug becomes different.

Main changes are in `nac3core/src/typecheck/typedef/mod.rs`. 1. Type variable IDs are now carried by `struct TypeVarId(u32)` instead of simply `u32`. 2. Added `struct TypeVar { id: TypeVarId, ty: Type }`. 1. `unifier.add_ty` and others now return `TypeVar` instead of `(Type, u32)`. Other notes: 1. Some `insta` snapshots are updated. This is because type variable ID `u32` values are now wrapped within `TypeVarId`. The output from `Debug` becomes different.

lyken added 1 commit 2024-06-13 13:35:21 +08:00

1da1bdacab core: refactor to use `TypeVarId` and `TypeVar`

lyken requested review from derppening 2024-06-13 13:35:45 +08:00

derppening requested changes 2024-06-13 15:32:50 +08:00

derppening left a comment

The rest of the PR looks good. Do remove the *.bc and *.o file, or otherwise add those to the Gitignore.

The rest of the PR looks good. Do remove the `*.bc` and `*.o` file, or otherwise add those to the Gitignore.

nac3core/src/typecheck/typedef/mod.rs Outdated

						
				@ -32,1 +31,3 @@

				pub type VarMap = IndexMapping<u32>;

				/// ID of a Python type variable. Specific to `nac3core`.

				#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]

				pub struct TypeVarId(pub u32);

derppening commented

2024-06-13 15:20:58 +08:00

I don't think it's necessary to pub the value of the TypeVarId. Maybe add a From<TypeVarId> for u32 if we want to be able to convert back to a u32 value.

I don't think it's necessary to `pub` the value of the `TypeVarId`. Maybe add a `From<TypeVarId> for u32` if we want to be able to convert back to a `u32` value.

nac3core/src/typecheck/typedef/mod.rs Outdated

						
				@ -33,0 +33,4 @@

				pub struct TypeVarId(pub u32);

				impl fmt::Display for TypeVarId {

				    // NOTE: Must output the string fo the ID value. Certain unit tests rely on string comparisons.

derppening commented

2024-06-13 15:21:18 +08:00

Typo: fo -> of

nac3core/src/typecheck/typedef/mod.rs Outdated

						
				@ -33,0 +55,4 @@

				/// Build a [`VarMap`] from an iterator of [`TypeVar`]

				///

				/// The resulting [`VarMap`] wil have the same order as the input iterator.

				pub fn to_var_map<I>(vars: I) -> VarMap