From 52838110552c0d1b3cef5f24e5f8fcc2cb11bd30 Mon Sep 17 00:00:00 2001 From: yuyi Date: Wed, 23 Dec 2020 16:13:46 +0800 Subject: [PATCH] checker: merge add_op_wrong_type_err tests to just one (#7488) --- .../tests/add_op_wrong_left_type_err_a.out | 6 --- .../tests/add_op_wrong_left_type_err_a.vv | 4 -- .../tests/add_op_wrong_left_type_err_b.out | 5 --- .../tests/add_op_wrong_left_type_err_b.vv | 3 -- .../tests/add_op_wrong_left_type_err_c.out | 6 --- .../tests/add_op_wrong_left_type_err_c.vv | 4 -- .../tests/add_op_wrong_right_type_err_a.out | 6 --- .../tests/add_op_wrong_right_type_err_a.vv | 4 -- .../tests/add_op_wrong_right_type_err_b.out | 5 --- .../tests/add_op_wrong_right_type_err_b.vv | 3 -- .../tests/add_op_wrong_right_type_err_c.out | 6 --- .../tests/add_op_wrong_right_type_err_c.vv | 4 -- .../v/checker/tests/add_op_wrong_type_err.out | 41 +++++++++++++++++++ vlib/v/checker/tests/add_op_wrong_type_err.vv | 10 +++++ 14 files changed, 51 insertions(+), 56 deletions(-) delete mode 100644 vlib/v/checker/tests/add_op_wrong_left_type_err_a.out delete mode 100644 vlib/v/checker/tests/add_op_wrong_left_type_err_a.vv delete mode 100644 vlib/v/checker/tests/add_op_wrong_left_type_err_b.out delete mode 100644 vlib/v/checker/tests/add_op_wrong_left_type_err_b.vv delete mode 100644 vlib/v/checker/tests/add_op_wrong_left_type_err_c.out delete mode 100644 vlib/v/checker/tests/add_op_wrong_left_type_err_c.vv delete mode 100644 vlib/v/checker/tests/add_op_wrong_right_type_err_a.out delete mode 100644 vlib/v/checker/tests/add_op_wrong_right_type_err_a.vv delete mode 100644 vlib/v/checker/tests/add_op_wrong_right_type_err_b.out delete mode 100644 vlib/v/checker/tests/add_op_wrong_right_type_err_b.vv delete mode 100644 vlib/v/checker/tests/add_op_wrong_right_type_err_c.out delete mode 100644 vlib/v/checker/tests/add_op_wrong_right_type_err_c.vv create mode 100644 vlib/v/checker/tests/add_op_wrong_type_err.out create mode 100644 vlib/v/checker/tests/add_op_wrong_type_err.vv diff --git a/vlib/v/checker/tests/add_op_wrong_left_type_err_a.out b/vlib/v/checker/tests/add_op_wrong_left_type_err_a.out deleted file mode 100644 index f6ae0a8629..0000000000 --- a/vlib/v/checker/tests/add_op_wrong_left_type_err_a.out +++ /dev/null @@ -1,6 +0,0 @@ -vlib/v/checker/tests/add_op_wrong_left_type_err_a.vv:3:13: error: mismatched types `Aaa` and `any_int` - 1 | struct Aaa{} - 2 | fn main() { - 3 | println(Aaa{} + 10) - | ~~~~~ - 4 | } diff --git a/vlib/v/checker/tests/add_op_wrong_left_type_err_a.vv b/vlib/v/checker/tests/add_op_wrong_left_type_err_a.vv deleted file mode 100644 index 72c6319942..0000000000 --- a/vlib/v/checker/tests/add_op_wrong_left_type_err_a.vv +++ /dev/null @@ -1,4 +0,0 @@ -struct Aaa{} -fn main() { - println(Aaa{} + 10) -} diff --git a/vlib/v/checker/tests/add_op_wrong_left_type_err_b.out b/vlib/v/checker/tests/add_op_wrong_left_type_err_b.out deleted file mode 100644 index b152af8740..0000000000 --- a/vlib/v/checker/tests/add_op_wrong_left_type_err_b.out +++ /dev/null @@ -1,5 +0,0 @@ -vlib/v/checker/tests/add_op_wrong_left_type_err_b.vv:2:13: error: mismatched types `[]int` and `any_int` - 1 | fn main() { - 2 | println([1,2,3] + 10) - | ~~~~~~~ - 3 | } diff --git a/vlib/v/checker/tests/add_op_wrong_left_type_err_b.vv b/vlib/v/checker/tests/add_op_wrong_left_type_err_b.vv deleted file mode 100644 index c87da722a9..0000000000 --- a/vlib/v/checker/tests/add_op_wrong_left_type_err_b.vv +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - println([1,2,3] + 10) -} diff --git a/vlib/v/checker/tests/add_op_wrong_left_type_err_c.out b/vlib/v/checker/tests/add_op_wrong_left_type_err_c.out deleted file mode 100644 index be72fa4fbc..0000000000 --- a/vlib/v/checker/tests/add_op_wrong_left_type_err_c.out +++ /dev/null @@ -1,6 +0,0 @@ -vlib/v/checker/tests/add_op_wrong_left_type_err_c.vv:3:13: error: mismatched types `map[string]int` and `any_int` - 1 | fn main() { - 2 | a := map[string]int - 3 | println(a + 10) - | ^ - 4 | } diff --git a/vlib/v/checker/tests/add_op_wrong_left_type_err_c.vv b/vlib/v/checker/tests/add_op_wrong_left_type_err_c.vv deleted file mode 100644 index fba4f3a251..0000000000 --- a/vlib/v/checker/tests/add_op_wrong_left_type_err_c.vv +++ /dev/null @@ -1,4 +0,0 @@ -fn main() { - a := map[string]int - println(a + 10) -} diff --git a/vlib/v/checker/tests/add_op_wrong_right_type_err_a.out b/vlib/v/checker/tests/add_op_wrong_right_type_err_a.out deleted file mode 100644 index a4b73780dd..0000000000 --- a/vlib/v/checker/tests/add_op_wrong_right_type_err_a.out +++ /dev/null @@ -1,6 +0,0 @@ -vlib/v/checker/tests/add_op_wrong_right_type_err_a.vv:3:18: error: mismatched types `any_int` and `Aaa` - 1 | struct Aaa{} - 2 | fn main() { - 3 | println(10 + Aaa{}) - | ~~~~~ - 4 | } diff --git a/vlib/v/checker/tests/add_op_wrong_right_type_err_a.vv b/vlib/v/checker/tests/add_op_wrong_right_type_err_a.vv deleted file mode 100644 index 1be1ffb7ff..0000000000 --- a/vlib/v/checker/tests/add_op_wrong_right_type_err_a.vv +++ /dev/null @@ -1,4 +0,0 @@ -struct Aaa{} -fn main() { - println(10 + Aaa{}) -} diff --git a/vlib/v/checker/tests/add_op_wrong_right_type_err_b.out b/vlib/v/checker/tests/add_op_wrong_right_type_err_b.out deleted file mode 100644 index fc14ff4da5..0000000000 --- a/vlib/v/checker/tests/add_op_wrong_right_type_err_b.out +++ /dev/null @@ -1,5 +0,0 @@ -vlib/v/checker/tests/add_op_wrong_right_type_err_b.vv:2:18: error: mismatched types `any_int` and `[]int` - 1 | fn main() { - 2 | println(10 + [1,2,3]) - | ~~~~~~~ - 3 | } diff --git a/vlib/v/checker/tests/add_op_wrong_right_type_err_b.vv b/vlib/v/checker/tests/add_op_wrong_right_type_err_b.vv deleted file mode 100644 index 4987ddb2bc..0000000000 --- a/vlib/v/checker/tests/add_op_wrong_right_type_err_b.vv +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - println(10 + [1,2,3]) -} diff --git a/vlib/v/checker/tests/add_op_wrong_right_type_err_c.out b/vlib/v/checker/tests/add_op_wrong_right_type_err_c.out deleted file mode 100644 index 591c46a049..0000000000 --- a/vlib/v/checker/tests/add_op_wrong_right_type_err_c.out +++ /dev/null @@ -1,6 +0,0 @@ -vlib/v/checker/tests/add_op_wrong_right_type_err_c.vv:3:18: error: mismatched types `any_int` and `map[string]int` - 1 | fn main() { - 2 | a := map[string]int - 3 | println(10 + a) - | ^ - 4 | } diff --git a/vlib/v/checker/tests/add_op_wrong_right_type_err_c.vv b/vlib/v/checker/tests/add_op_wrong_right_type_err_c.vv deleted file mode 100644 index dd18d52375..0000000000 --- a/vlib/v/checker/tests/add_op_wrong_right_type_err_c.vv +++ /dev/null @@ -1,4 +0,0 @@ -fn main() { - a := map[string]int - println(10 + a) -} diff --git a/vlib/v/checker/tests/add_op_wrong_type_err.out b/vlib/v/checker/tests/add_op_wrong_type_err.out new file mode 100644 index 0000000000..1f8bff4a1c --- /dev/null +++ b/vlib/v/checker/tests/add_op_wrong_type_err.out @@ -0,0 +1,41 @@ +vlib/v/checker/tests/add_op_wrong_type_err.vv:3:13: error: mismatched types `Aaa` and `any_int` + 1 | struct Aaa{} + 2 | fn main() { + 3 | println(Aaa{} + 10) + | ~~~~~ + 4 | println(10 + Aaa{}) + 5 | println([1,2,3] + 10) +vlib/v/checker/tests/add_op_wrong_type_err.vv:4:18: error: mismatched types `any_int` and `Aaa` + 2 | fn main() { + 3 | println(Aaa{} + 10) + 4 | println(10 + Aaa{}) + | ~~~~~ + 5 | println([1,2,3] + 10) + 6 | println(10 + [1,2,3]) +vlib/v/checker/tests/add_op_wrong_type_err.vv:5:13: error: mismatched types `[]int` and `any_int` + 3 | println(Aaa{} + 10) + 4 | println(10 + Aaa{}) + 5 | println([1,2,3] + 10) + | ~~~~~~~ + 6 | println(10 + [1,2,3]) + 7 | a := map[string]int +vlib/v/checker/tests/add_op_wrong_type_err.vv:6:18: error: mismatched types `any_int` and `[]int` + 4 | println(10 + Aaa{}) + 5 | println([1,2,3] + 10) + 6 | println(10 + [1,2,3]) + | ~~~~~~~ + 7 | a := map[string]int + 8 | println(a + 10) +vlib/v/checker/tests/add_op_wrong_type_err.vv:8:13: error: mismatched types `map[string]int` and `any_int` + 6 | println(10 + [1,2,3]) + 7 | a := map[string]int + 8 | println(a + 10) + | ^ + 9 | println(10 + a) + 10 | } +vlib/v/checker/tests/add_op_wrong_type_err.vv:9:18: error: mismatched types `any_int` and `map[string]int` + 7 | a := map[string]int + 8 | println(a + 10) + 9 | println(10 + a) + | ^ + 10 | } diff --git a/vlib/v/checker/tests/add_op_wrong_type_err.vv b/vlib/v/checker/tests/add_op_wrong_type_err.vv new file mode 100644 index 0000000000..f02798b4ac --- /dev/null +++ b/vlib/v/checker/tests/add_op_wrong_type_err.vv @@ -0,0 +1,10 @@ +struct Aaa{} +fn main() { + println(Aaa{} + 10) + println(10 + Aaa{}) + println([1,2,3] + 10) + println(10 + [1,2,3]) + a := map[string]int + println(a + 10) + println(10 + a) +}