newell
/
nac3
forked from M-Labs/nac3
1
0
Fork 0
Code Pull Requests Activity

nac3core: use Python 3.9 list/tuple annotations in test 

Closes #85
This commit is contained in:
Sebastien Bourdeauducq 2021-11-11 20:05:03 +08:00
parent dba1a8b3d4
commit 96607432c1
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
nac3core/src/typecheck/typedef/test.rs
View File

@ -149,7 +149,7 @@ impl TestEnvironment {
// for testing only, so we can just panic when the input is malformed // for testing only, so we can just panic when the input is malformed
let end = typ.find(|c| ['[', ',', ']', '='].contains(&c)).unwrap_or_else(|| typ.len()); let end = typ.find(|c| ['[', ',', ']', '='].contains(&c)).unwrap_or_else(|| typ.len());
match &typ[..end] { match &typ[..end] {
"Tuple" => { "tuple" => {
let mut s = &typ[end..]; let mut s = &typ[end..];
assert!(&s[0..1] == "["); assert!(&s[0..1] == "[");
let mut ty = Vec::new(); let mut ty = Vec::new();
@ -160,7 +160,7 @@ impl TestEnvironment {
} }
(self.unifier.add_ty(TypeEnum::TTuple { ty }), &s[1..]) (self.unifier.add_ty(TypeEnum::TTuple { ty }), &s[1..])
} }
"List" => { "list" => {
assert!(&typ[end..end + 1] == "["); assert!(&typ[end..end + 1] == "[");
let (ty, s) = self.internal_parse(&typ[end + 1..], mapping); let (ty, s) = self.internal_parse(&typ[end + 1..], mapping);
assert!(&s[0..1] == "]"); assert!(&s[0..1] == "]");
@ -217,8 +217,8 @@ impl TestEnvironment {
; "simple variable" ; "simple variable"
)] )]
#[test_case(2, #[test_case(2,
&[("v1", "List[v2]"), ("v1", "List[float]")], &[("v1", "list[v2]"), ("v1", "list[float]")],
&[("v1", "List[float]"), ("v2", "float")] &[("v1", "list[float]"), ("v2", "float")]
; "list element" ; "list element"
)] )]
#[test_case(3, #[test_case(3,
@ -283,24 +283,24 @@ fn test_unify(
#[test_case(2, #[test_case(2,
&[ &[
("v1", "Tuple[int]"), ("v1", "tuple[int]"),
("v2", "List[int]"), ("v2", "list[int]"),
], ],
(("v1", "v2"), "Cannot unify list[0] with tuple[0]") (("v1", "v2"), "Cannot unify list[0] with tuple[0]")
; "type mismatch" ; "type mismatch"
)] )]
#[test_case(2, #[test_case(2,
&[ &[
("v1", "Tuple[int]"), ("v1", "tuple[int]"),
("v2", "Tuple[float]"), ("v2", "tuple[float]"),
], ],
(("v1", "v2"), "Cannot unify 0 with 1") (("v1", "v2"), "Cannot unify 0 with 1")
; "tuple parameter mismatch" ; "tuple parameter mismatch"
)] )]
#[test_case(2, #[test_case(2,
&[ &[
("v1", "Tuple[int,int]"), ("v1", "tuple[int,int]"),
("v2", "Tuple[int]"), ("v2", "tuple[int]"),
], ],
(("v1", "v2"), "Cannot unify tuples with length 2 and 1") (("v1", "v2"), "Cannot unify tuples with length 2 and 1")
; "tuple length mismatch" ; "tuple length mismatch"
@ -404,15 +404,15 @@ fn test_typevar_range() {
let int = env.parse("int", &HashMap::new()); let int = env.parse("int", &HashMap::new());
let boolean = env.parse("bool", &HashMap::new()); let boolean = env.parse("bool", &HashMap::new());
let float = env.parse("float", &HashMap::new()); let float = env.parse("float", &HashMap::new());
let int_list = env.parse("List[int]", &HashMap::new()); let int_list = env.parse("list[int]", &HashMap::new());
let float_list = env.parse("List[float]", &HashMap::new()); let float_list = env.parse("list[float]", &HashMap::new());
// unification between v and int // unification between v and int
// where v in (int, bool) // where v in (int, bool)
let v = env.unifier.get_fresh_var_with_range(&[int, boolean]).0; let v = env.unifier.get_fresh_var_with_range(&[int, boolean]).0;
env.unifier.unify(int, v).unwrap(); env.unifier.unify(int, v).unwrap();
// unification between v and List[int] // unification between v and list[int]
// where v in (int, bool) // where v in (int, bool)
let v = env.unifier.get_fresh_var_with_range(&[int, boolean]).0; let v = env.unifier.get_fresh_var_with_range(&[int, boolean]).0;
assert_eq!( assert_eq!(
@ -432,17 +432,17 @@ fn test_typevar_range() {
let v1_list = env.unifier.add_ty(TypeEnum::TList { ty: v1 }); let v1_list = env.unifier.add_ty(TypeEnum::TList { ty: v1 });
let v = env.unifier.get_fresh_var_with_range(&[int, v1_list]).0; let v = env.unifier.get_fresh_var_with_range(&[int, v1_list]).0;
// unification between v and int // unification between v and int
// where v in (int, List[v1]), v1 in (int, bool) // where v in (int, list[v1]), v1 in (int, bool)
env.unifier.unify(int, v).unwrap(); env.unifier.unify(int, v).unwrap();
let v = env.unifier.get_fresh_var_with_range(&[int, v1_list]).0; let v = env.unifier.get_fresh_var_with_range(&[int, v1_list]).0;
// unification between v and List[int] // unification between v and list[int]
// where v in (int, List[v1]), v1 in (int, bool) // where v in (int, list[v1]), v1 in (int, bool)
env.unifier.unify(int_list, v).unwrap(); env.unifier.unify(int_list, v).unwrap();
let v = env.unifier.get_fresh_var_with_range(&[int, v1_list]).0; let v = env.unifier.get_fresh_var_with_range(&[int, v1_list]).0;
// unification between v and List[float] // unification between v and list[float]
// where v in (int, List[v1]), v1 in (int, bool) // where v in (int, list[v1]), v1 in (int, bool)
assert_eq!( assert_eq!(
env.unifier.unify(float_list, v), env.unifier.unify(float_list, v),
Err("Cannot unify variable 8 with list[1] due to incompatible value range".to_string()) Err("Cannot unify variable 8 with list[1] due to incompatible value range".to_string())
@ -505,7 +505,7 @@ fn test_rigid_var() {
let list_a = env.unifier.add_ty(TypeEnum::TList { ty: a }); let list_a = env.unifier.add_ty(TypeEnum::TList { ty: a });
let list_x = env.unifier.add_ty(TypeEnum::TList { ty: x }); let list_x = env.unifier.add_ty(TypeEnum::TList { ty: x });
let int = env.parse("int", &HashMap::new()); let int = env.parse("int", &HashMap::new());
let list_int = env.parse("List[int]", &HashMap::new()); let list_int = env.parse("list[int]", &HashMap::new());
assert_eq!(env.unifier.unify(a, b), Err("Cannot unify var3 with var2".to_string())); assert_eq!(env.unifier.unify(a, b), Err("Cannot unify var3 with var2".to_string()));
env.unifier.unify(list_a, list_x).unwrap(); env.unifier.unify(list_a, list_x).unwrap();
@ -521,7 +521,7 @@ fn test_instantiation() {
let int = env.parse("int", &HashMap::new()); let int = env.parse("int", &HashMap::new());
let boolean = env.parse("bool", &HashMap::new()); let boolean = env.parse("bool", &HashMap::new());
let float = env.parse("float", &HashMap::new()); let float = env.parse("float", &HashMap::new());
let list_int = env.parse("List[int]", &HashMap::new()); let list_int = env.parse("list[int]", &HashMap::new());
let obj_map: HashMap<_, _> = let obj_map: HashMap<_, _> =
[(0usize, "int"), (1, "float"), (2, "bool")].iter().cloned().collect(); [(0usize, "int"), (1, "float"), (2, "bool")].iter().cloned().collect();