Aadityavardhan
/
nac3_sca
forked from M-Labs/nac3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

format typevars consistently

no_init
Sebastien Bourdeauducq 2022-04-12 09:28:17 +08:00
parent 93e9a6a38a
commit ca07cb66cd
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nac3core/src/symbol_resolver.rs
View File

@ -367,7 +367,7 @@ impl dyn SymbolResolver + Send + Sync {
unreachable!("expected class definition") unreachable!("expected class definition")
} }
}, },
&mut |id| format!("var{}", id), &mut |id| format!("typevar{}", id),
&mut None, &mut None,
) )
} }

2
nac3core/src/toplevel/composer.rs
View File

@ -1906,7 +1906,7 @@ impl TopLevelComposer {
unreachable!("must be class id here") unreachable!("must be class id here")
} }
}, },
&mut |id| format!("tvar{}", id), &mut |id| format!("typevar{}", id),
&mut None, &mut None,
); );
return Err(format!( return Err(format!(

4
nac3core/src/toplevel/test.rs
View File

@ -763,7 +763,7 @@ fn make_internal_resolver_with_tvar(
(name, { (name, {
let (ty, id) = unifier.get_fresh_var_with_range(range.as_slice(), None, None); let (ty, id) = unifier.get_fresh_var_with_range(range.as_slice(), None, None);
if print { if print {
println!("{}: {:?}, tvar{}", name, ty, id); println!("{}: {:?}, typevar{}", name, ty, id);
} }
ty ty
}) })
@ -791,7 +791,7 @@ impl<'a> Fold<Option<Type>> for TypeToStringFolder<'a> {
self.unifier.internal_stringify( self.unifier.internal_stringify(
ty, ty,
&mut |id| format!("class{}", id.to_string()), &mut |id| format!("class{}", id.to_string()),
&mut |id| format!("tvar{}", id.to_string()), &mut |id| format!("typevar{}", id.to_string()),
&mut None, &mut None,
) )
} else { } else {

2
nac3core/src/toplevel/type_annotation.rs
View File

@ -356,7 +356,7 @@ pub fn get_type_from_type_annotation_kinds(
unifier.internal_stringify( unifier.internal_stringify(
p, p,
&mut |id| format!("class{}", id), &mut |id| format!("class{}", id),
&mut |id| format!("tvar{}", id), &mut |id| format!("typevar{}", id),
&mut None &mut None
), ),
*id *id

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

@ -830,7 +830,7 @@ impl Unifier {
}, },
) )
}, },
&mut |id| format!("var{}", id), &mut |id| format!("typevar{}", id),
notes, notes,
) )
} }