diff --git a/vlib/v/checker/tests/add_op_wrong_type_err.out b/vlib/v/checker/tests/add_op_wrong_type_err.out index 1f8bff4a1c..1cc9c857e3 100644 --- a/vlib/v/checker/tests/add_op_wrong_type_err.out +++ b/vlib/v/checker/tests/add_op_wrong_type_err.out @@ -1,39 +1,39 @@ -vlib/v/checker/tests/add_op_wrong_type_err.vv:3:13: error: mismatched types `Aaa` and `any_int` +vlib/v/checker/tests/add_op_wrong_type_err.vv:3:13: error: mismatched types `Aaa` and `untyped 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` +vlib/v/checker/tests/add_op_wrong_type_err.vv:4:18: error: mismatched types `untyped 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` +vlib/v/checker/tests/add_op_wrong_type_err.vv:5:13: error: mismatched types `[]int` and `untyped 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` +vlib/v/checker/tests/add_op_wrong_type_err.vv:6:18: error: mismatched types `untyped 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` +vlib/v/checker/tests/add_op_wrong_type_err.vv:8:13: error: mismatched types `map[string]int` and `untyped 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` +vlib/v/checker/tests/add_op_wrong_type_err.vv:9:18: error: mismatched types `untyped int` and `map[string]int` 7 | a := map[string]int 8 | println(a + 10) 9 | println(10 + a) diff --git a/vlib/v/checker/tests/any_int_float_ban_err.out b/vlib/v/checker/tests/any_int_float_ban_err.out index 8225def4cd..b02cbead0e 100644 --- a/vlib/v/checker/tests/any_int_float_ban_err.out +++ b/vlib/v/checker/tests/any_int_float_ban_err.out @@ -1,15 +1,15 @@ -vlib/v/checker/tests/any_int_float_ban_err.vv:1:12: error: type `any_int` doesn't exist +vlib/v/checker/tests/any_int_float_ban_err.vv:1:12: error: type `untyped int` doesn't exist 1 | type Foo = any_int | any_float | ~~~~~~~ 2 | type Fo2 = any_int 3 | -vlib/v/checker/tests/any_int_float_ban_err.vv:2:1: error: type `any_int` doesn't exist +vlib/v/checker/tests/any_int_float_ban_err.vv:2:1: error: type `untyped int` doesn't exist 1 | type Foo = any_int | any_float 2 | type Fo2 = any_int | ~~~~~~~~ 3 | 4 | struct Int { -vlib/v/checker/tests/any_int_float_ban_err.vv:5:7: error: unknown type `any_int`. +vlib/v/checker/tests/any_int_float_ban_err.vv:5:7: error: unknown type `untyped int`. Did you mean `int`? 3 | 4 | struct Int { @@ -17,7 +17,7 @@ Did you mean `int`? | ~~~~~~~ 6 | f any_float 7 | } -vlib/v/checker/tests/any_int_float_ban_err.vv:6:7: error: unknown type `any_float`. +vlib/v/checker/tests/any_int_float_ban_err.vv:6:7: error: unknown type `untyped float`. Did you mean `f64`? 4 | struct Int { 5 | i any_int @@ -25,14 +25,14 @@ Did you mean `f64`? | ~~~~~~~~~ 7 | } 8 | -vlib/v/checker/tests/any_int_float_ban_err.vv:9:1: error: unknown type `any_int` +vlib/v/checker/tests/any_int_float_ban_err.vv:9:1: error: unknown type `untyped int` 7 | } 8 | 9 | fn foo(i any_int) any_int { | ~~~~~~~~~~~~~~~~~~~~~~~~~ 10 | return i 11 | } -vlib/v/checker/tests/any_int_float_ban_err.vv:13:1: error: unknown type `any_int` +vlib/v/checker/tests/any_int_float_ban_err.vv:13:1: error: unknown type `untyped int` 11 | } 12 | 13 | fn foo2() any_int { diff --git a/vlib/v/checker/tests/array_insert_type_mismatch.out b/vlib/v/checker/tests/array_insert_type_mismatch.out index edd33051af..59a694a33c 100644 --- a/vlib/v/checker/tests/array_insert_type_mismatch.out +++ b/vlib/v/checker/tests/array_insert_type_mismatch.out @@ -1,4 +1,4 @@ -vlib/v/checker/tests/array_insert_type_mismatch.vv:3:14: error: cannot insert `any_float` to `[]int` +vlib/v/checker/tests/array_insert_type_mismatch.vv:3:14: error: cannot insert `untyped float` to `[]int` 1 | fn main() { 2 | mut a := [1, 2] 3 | a.insert(1, 2.3) diff --git a/vlib/v/checker/tests/array_prepend_type_mismatch.out b/vlib/v/checker/tests/array_prepend_type_mismatch.out index 0c42699373..f711eaaa4e 100644 --- a/vlib/v/checker/tests/array_prepend_type_mismatch.out +++ b/vlib/v/checker/tests/array_prepend_type_mismatch.out @@ -1,4 +1,4 @@ -vlib/v/checker/tests/array_prepend_type_mismatch.vv:3:12: error: cannot prepend `any_float` to `[]int` +vlib/v/checker/tests/array_prepend_type_mismatch.vv:3:12: error: cannot prepend `untyped float` to `[]int` 1 | fn main() { 2 | mut a := [1, 2] 3 | a.prepend(2.3) diff --git a/vlib/v/checker/tests/cannot_cast_to_alias.out b/vlib/v/checker/tests/cannot_cast_to_alias.out index 9f4ccddf5f..82457910f9 100644 --- a/vlib/v/checker/tests/cannot_cast_to_alias.out +++ b/vlib/v/checker/tests/cannot_cast_to_alias.out @@ -1,4 +1,4 @@ -vlib/v/checker/tests/cannot_cast_to_alias.vv:6:7: error: cannot convert type `any_int` to `MyType` (alias to `string`) +vlib/v/checker/tests/cannot_cast_to_alias.vv:6:7: error: cannot convert type `untyped int` to `MyType` (alias to `string`) 4 | 5 | fn main() { 6 | _ := MyType(5) diff --git a/vlib/v/checker/tests/cannot_cast_to_struct.out b/vlib/v/checker/tests/cannot_cast_to_struct.out index 3acdc7a116..69a29eb95f 100644 --- a/vlib/v/checker/tests/cannot_cast_to_struct.out +++ b/vlib/v/checker/tests/cannot_cast_to_struct.out @@ -12,7 +12,7 @@ vlib/v/checker/tests/cannot_cast_to_struct.vv:12:6: error: cannot cast `Alphabet | ~~~~~~~~ 13 | _ = Xyz(5) 14 | s := Abc{} -vlib/v/checker/tests/cannot_cast_to_struct.vv:13:6: error: cannot cast `any_int` to struct +vlib/v/checker/tests/cannot_cast_to_struct.vv:13:6: error: cannot cast `untyped int` to struct 11 | sum := Alphabet(Xyz{}) 12 | _ = Xyz(sum) 13 | _ = Xyz(5) diff --git a/vlib/v/checker/tests/cast_string_err.out b/vlib/v/checker/tests/cast_string_err.out index da7902e0cc..3ae66dd5bd 100644 --- a/vlib/v/checker/tests/cast_string_err.out +++ b/vlib/v/checker/tests/cast_string_err.out @@ -1,4 +1,4 @@ -vlib/v/checker/tests/cast_string_err.vv:2:7: error: cannot cast type `any_int` to string, use `x.str()` instead +vlib/v/checker/tests/cast_string_err.vv:2:7: error: cannot cast type `untyped int` to string, use `x.str()` instead 1 | fn main() { 2 | a := string(1) | ~~~~~~~~~ diff --git a/vlib/v/checker/tests/div_op_wrong_type_err.out b/vlib/v/checker/tests/div_op_wrong_type_err.out index f50520e761..4e1356b916 100644 --- a/vlib/v/checker/tests/div_op_wrong_type_err.out +++ b/vlib/v/checker/tests/div_op_wrong_type_err.out @@ -1,39 +1,39 @@ -vlib/v/checker/tests/div_op_wrong_type_err.vv:3:13: error: mismatched types `Aaa` and `any_int` +vlib/v/checker/tests/div_op_wrong_type_err.vv:3:13: error: mismatched types `Aaa` and `untyped 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/div_op_wrong_type_err.vv:4:18: error: mismatched types `any_int` and `Aaa` +vlib/v/checker/tests/div_op_wrong_type_err.vv:4:18: error: mismatched types `untyped 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/div_op_wrong_type_err.vv:5:13: error: mismatched types `[]int` and `any_int` +vlib/v/checker/tests/div_op_wrong_type_err.vv:5:13: error: mismatched types `[]int` and `untyped 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/div_op_wrong_type_err.vv:6:18: error: mismatched types `any_int` and `[]int` +vlib/v/checker/tests/div_op_wrong_type_err.vv:6:18: error: mismatched types `untyped 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/div_op_wrong_type_err.vv:8:13: error: mismatched types `map[string]int` and `any_int` +vlib/v/checker/tests/div_op_wrong_type_err.vv:8:13: error: mismatched types `map[string]int` and `untyped 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/div_op_wrong_type_err.vv:9:18: error: mismatched types `any_int` and `map[string]int` +vlib/v/checker/tests/div_op_wrong_type_err.vv:9:18: error: mismatched types `untyped int` and `map[string]int` 7 | a := map[string]int 8 | println(a / 10) 9 | println(10 / a) diff --git a/vlib/v/checker/tests/fn_var.out b/vlib/v/checker/tests/fn_var.out index 6d244f9a4e..ef231cfaad 100644 --- a/vlib/v/checker/tests/fn_var.out +++ b/vlib/v/checker/tests/fn_var.out @@ -1,4 +1,4 @@ -vlib/v/checker/tests/fn_var.vv:2:5: error: cannot assign to `f`: expected `fn (int) byte`, not `any_int` +vlib/v/checker/tests/fn_var.vv:2:5: error: cannot assign to `f`: expected `fn (int) byte`, not `untyped int` 1 | mut f := fn(i int) byte {} 2 | f = 4 | ^ diff --git a/vlib/v/checker/tests/for_in_index_type.out b/vlib/v/checker/tests/for_in_index_type.out index 5c6990d818..d118ab4861 100644 --- a/vlib/v/checker/tests/for_in_index_type.out +++ b/vlib/v/checker/tests/for_in_index_type.out @@ -1,4 +1,4 @@ -vlib/v/checker/tests/for_in_index_type.vv:2:11: error: for in: cannot index `any_int` +vlib/v/checker/tests/for_in_index_type.vv:2:11: error: for in: cannot index `untyped int` 1 | fn main() { 2 | for a in 52 { | ~~ diff --git a/vlib/v/checker/tests/function_wrong_return_type.out b/vlib/v/checker/tests/function_wrong_return_type.out index e56dd83f21..e416357188 100644 --- a/vlib/v/checker/tests/function_wrong_return_type.out +++ b/vlib/v/checker/tests/function_wrong_return_type.out @@ -1,4 +1,4 @@ -vlib/v/checker/tests/function_wrong_return_type.vv:2:9: error: cannot use `any_float` as type `int` in return argument +vlib/v/checker/tests/function_wrong_return_type.vv:2:9: error: cannot use `untyped float` as type `int` in return argument 1 | fn h() int { 2 | return 3.14 | ~~~~ diff --git a/vlib/v/checker/tests/if_expr_mismatch.out b/vlib/v/checker/tests/if_expr_mismatch.out index 6d877bb873..926a740c13 100644 --- a/vlib/v/checker/tests/if_expr_mismatch.out +++ b/vlib/v/checker/tests/if_expr_mismatch.out @@ -1,4 +1,4 @@ -vlib/v/checker/tests/if_expr_mismatch.vv:2:7: error: mismatched types `string` and `any_int` +vlib/v/checker/tests/if_expr_mismatch.vv:2:7: error: mismatched types `string` and `untyped int` 1 | fn main() { 2 | s := if true { '12' } else { 12 } | ~~ diff --git a/vlib/v/checker/tests/in_mismatch_type.out b/vlib/v/checker/tests/in_mismatch_type.out index 8c02b4376c..651968a02e 100644 --- a/vlib/v/checker/tests/in_mismatch_type.out +++ b/vlib/v/checker/tests/in_mismatch_type.out @@ -1,18 +1,18 @@ -vlib/v/checker/tests/in_mismatch_type.vv:10:7: error: left operand to `in` does not match the array element type: expected `string`, not `any_int` +vlib/v/checker/tests/in_mismatch_type.vv:10:7: error: left operand to `in` does not match the array element type: expected `string`, not `untyped int` 8 | } 9 | s := 'abcd' 10 | if 1 in a_s { | ~~ 11 | println('ok') 12 | } -vlib/v/checker/tests/in_mismatch_type.vv:13:7: error: left operand to `in` does not match the map key type: expected `string`, not `any_int` +vlib/v/checker/tests/in_mismatch_type.vv:13:7: error: left operand to `in` does not match the map key type: expected `string`, not `untyped int` 11 | println('ok') 12 | } 13 | if 2 in m { | ~~ 14 | println('yeah') 15 | } -vlib/v/checker/tests/in_mismatch_type.vv:16:7: error: left operand to `in` does not match: expected `string`, not `any_int` +vlib/v/checker/tests/in_mismatch_type.vv:16:7: error: left operand to `in` does not match: expected `string`, not `untyped int` 14 | println('yeah') 15 | } 16 | if 3 in s { @@ -54,7 +54,7 @@ vlib/v/checker/tests/in_mismatch_type.vv:31:9: error: left operand to `in` does | ~~ 32 | println('all right') 33 | } -vlib/v/checker/tests/in_mismatch_type.vv:34:7: error: left operand to `!in` does not match the array element type: expected `string`, not `any_int` +vlib/v/checker/tests/in_mismatch_type.vv:34:7: error: left operand to `!in` does not match the array element type: expected `string`, not `untyped int` 32 | println('all right') 33 | } 34 | if 1 !in a_s { @@ -68,7 +68,7 @@ vlib/v/checker/tests/in_mismatch_type.vv:37:9: error: left operand to `!in` does | ~~~ 38 | println('good') 39 | } -vlib/v/checker/tests/in_mismatch_type.vv:41:7: error: left operand to `!in` does not match the map key type: expected `string`, not `any_int` +vlib/v/checker/tests/in_mismatch_type.vv:41:7: error: left operand to `!in` does not match the map key type: expected `string`, not `untyped int` 39 | } 40 | 41 | if 5 !in m { diff --git a/vlib/v/checker/tests/is_type_not_exist.out b/vlib/v/checker/tests/is_type_not_exist.out index e597f95c7a..7751f2e567 100644 --- a/vlib/v/checker/tests/is_type_not_exist.out +++ b/vlib/v/checker/tests/is_type_not_exist.out @@ -1,4 +1,4 @@ -vlib/v/checker/tests/is_type_not_exist.vv:4:25: error: cannot use `any_int` as `Integer` in argument 1 to `fn_with_sum_type_param` +vlib/v/checker/tests/is_type_not_exist.vv:4:25: error: cannot use `untyped int` as `Integer` in argument 1 to `fn_with_sum_type_param` 2 | 3 | fn main() { 4 | fn_with_sum_type_param(1) diff --git a/vlib/v/checker/tests/match_undefined_cond.out b/vlib/v/checker/tests/match_undefined_cond.out index 8fbaa176c8..016712684d 100644 --- a/vlib/v/checker/tests/match_undefined_cond.out +++ b/vlib/v/checker/tests/match_undefined_cond.out @@ -5,14 +5,14 @@ vlib/v/checker/tests/match_undefined_cond.vv:4:15: error: undefined ident: `Asd` | ~~~ 5 | 1 { 'foo' } 6 | 2 { 'test' } -vlib/v/checker/tests/match_undefined_cond.vv:5:3: error: cannot match `any_int` with `void` condition +vlib/v/checker/tests/match_undefined_cond.vv:5:3: error: cannot match `untyped int` with `void` condition 3 | fn main() { 4 | res := match Asd { 5 | 1 { 'foo' } | ^ 6 | 2 { 'test' } 7 | else { '' } -vlib/v/checker/tests/match_undefined_cond.vv:6:3: error: cannot match `any_int` with `void` condition +vlib/v/checker/tests/match_undefined_cond.vv:6:3: error: cannot match `untyped int` with `void` condition 4 | res := match Asd { 5 | 1 { 'foo' } 6 | 2 { 'test' } diff --git a/vlib/v/checker/tests/minus_op_wrong_type_err.out b/vlib/v/checker/tests/minus_op_wrong_type_err.out index 5bb8cb4ba4..b255d8d76d 100644 --- a/vlib/v/checker/tests/minus_op_wrong_type_err.out +++ b/vlib/v/checker/tests/minus_op_wrong_type_err.out @@ -1,39 +1,39 @@ -vlib/v/checker/tests/minus_op_wrong_type_err.vv:3:13: error: mismatched types `Aaa` and `any_int` +vlib/v/checker/tests/minus_op_wrong_type_err.vv:3:13: error: mismatched types `Aaa` and `untyped 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/minus_op_wrong_type_err.vv:4:18: error: mismatched types `any_int` and `Aaa` +vlib/v/checker/tests/minus_op_wrong_type_err.vv:4:18: error: mismatched types `untyped 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/minus_op_wrong_type_err.vv:5:13: error: mismatched types `[]int` and `any_int` +vlib/v/checker/tests/minus_op_wrong_type_err.vv:5:13: error: mismatched types `[]int` and `untyped 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/minus_op_wrong_type_err.vv:6:18: error: mismatched types `any_int` and `[]int` +vlib/v/checker/tests/minus_op_wrong_type_err.vv:6:18: error: mismatched types `untyped 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/minus_op_wrong_type_err.vv:8:13: error: mismatched types `map[string]int` and `any_int` +vlib/v/checker/tests/minus_op_wrong_type_err.vv:8:13: error: mismatched types `map[string]int` and `untyped 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/minus_op_wrong_type_err.vv:9:18: error: mismatched types `any_int` and `map[string]int` +vlib/v/checker/tests/minus_op_wrong_type_err.vv:9:18: error: mismatched types `untyped int` and `map[string]int` 7 | a := map[string]int 8 | println(a - 10) 9 | println(10 - a) diff --git a/vlib/v/checker/tests/mod_op_wrong_type_err.out b/vlib/v/checker/tests/mod_op_wrong_type_err.out index d11eb2800f..8c8d9ed630 100644 --- a/vlib/v/checker/tests/mod_op_wrong_type_err.out +++ b/vlib/v/checker/tests/mod_op_wrong_type_err.out @@ -12,42 +12,42 @@ vlib/v/checker/tests/mod_op_wrong_type_err.vv:4:14: error: float modulo not allo | ~~~ 5 | println([1,2,3] % 1) 6 | println(1 % [1,2,3]) -vlib/v/checker/tests/mod_op_wrong_type_err.vv:5:10: error: mismatched types `[]int` and `any_int` +vlib/v/checker/tests/mod_op_wrong_type_err.vv:5:10: error: mismatched types `[]int` and `untyped int` 3 | println(0.5 % 1) 4 | println(1 % 0.5) 5 | println([1,2,3] % 1) | ~~~~~~~ 6 | println(1 % [1,2,3]) 7 | a := Aaa{} -vlib/v/checker/tests/mod_op_wrong_type_err.vv:6:14: error: mismatched types `any_int` and `[]int` +vlib/v/checker/tests/mod_op_wrong_type_err.vv:6:14: error: mismatched types `untyped int` and `[]int` 4 | println(1 % 0.5) 5 | println([1,2,3] % 1) 6 | println(1 % [1,2,3]) | ~~~~~~~ 7 | a := Aaa{} 8 | println(a % 1) -vlib/v/checker/tests/mod_op_wrong_type_err.vv:8:10: error: mismatched types `Aaa` and `any_int` +vlib/v/checker/tests/mod_op_wrong_type_err.vv:8:10: error: mismatched types `Aaa` and `untyped int` 6 | println(1 % [1,2,3]) 7 | a := Aaa{} 8 | println(a % 1) | ^ 9 | println(1 % a) 10 | b := map[string]int -vlib/v/checker/tests/mod_op_wrong_type_err.vv:9:14: error: mismatched types `any_int` and `Aaa` +vlib/v/checker/tests/mod_op_wrong_type_err.vv:9:14: error: mismatched types `untyped int` and `Aaa` 7 | a := Aaa{} 8 | println(a % 1) 9 | println(1 % a) | ^ 10 | b := map[string]int 11 | println(b % 1) -vlib/v/checker/tests/mod_op_wrong_type_err.vv:11:10: error: mismatched types `map[string]int` and `any_int` +vlib/v/checker/tests/mod_op_wrong_type_err.vv:11:10: error: mismatched types `map[string]int` and `untyped int` 9 | println(1 % a) 10 | b := map[string]int 11 | println(b % 1) | ^ 12 | println(1 % b) 13 | } -vlib/v/checker/tests/mod_op_wrong_type_err.vv:12:14: error: mismatched types `any_int` and `map[string]int` +vlib/v/checker/tests/mod_op_wrong_type_err.vv:12:14: error: mismatched types `untyped int` and `map[string]int` 10 | b := map[string]int 11 | println(b % 1) 12 | println(1 % b) diff --git a/vlib/v/checker/tests/mul_op_wrong_type_err.out b/vlib/v/checker/tests/mul_op_wrong_type_err.out index ad99d1fae7..654e9e9bcc 100644 --- a/vlib/v/checker/tests/mul_op_wrong_type_err.out +++ b/vlib/v/checker/tests/mul_op_wrong_type_err.out @@ -1,53 +1,53 @@ -vlib/v/checker/tests/mul_op_wrong_type_err.vv:5:13: error: mismatched types `Aaa` and `any_int` +vlib/v/checker/tests/mul_op_wrong_type_err.vv:5:13: error: mismatched types `Aaa` and `untyped int` 3 | struct Aaa{} 4 | fn main() { 5 | println(Aaa{} * 10) | ~~~~~ 6 | println(10 * Aaa{}) 7 | println([1,2,3] * 10) -vlib/v/checker/tests/mul_op_wrong_type_err.vv:6:18: error: mismatched types `any_int` and `Aaa` +vlib/v/checker/tests/mul_op_wrong_type_err.vv:6:18: error: mismatched types `untyped int` and `Aaa` 4 | fn main() { 5 | println(Aaa{} * 10) 6 | println(10 * Aaa{}) | ~~~~~ 7 | println([1,2,3] * 10) 8 | println(10 * [1,2,3]) -vlib/v/checker/tests/mul_op_wrong_type_err.vv:7:13: error: mismatched types `[]int` and `any_int` +vlib/v/checker/tests/mul_op_wrong_type_err.vv:7:13: error: mismatched types `[]int` and `untyped int` 5 | println(Aaa{} * 10) 6 | println(10 * Aaa{}) 7 | println([1,2,3] * 10) | ~~~~~~~ 8 | println(10 * [1,2,3]) 9 | a := map[string]int -vlib/v/checker/tests/mul_op_wrong_type_err.vv:8:18: error: mismatched types `any_int` and `[]int` +vlib/v/checker/tests/mul_op_wrong_type_err.vv:8:18: error: mismatched types `untyped int` and `[]int` 6 | println(10 * Aaa{}) 7 | println([1,2,3] * 10) 8 | println(10 * [1,2,3]) | ~~~~~~~ 9 | a := map[string]int 10 | println(a * 10) -vlib/v/checker/tests/mul_op_wrong_type_err.vv:10:13: error: mismatched types `map[string]int` and `any_int` +vlib/v/checker/tests/mul_op_wrong_type_err.vv:10:13: error: mismatched types `map[string]int` and `untyped int` 8 | println(10 * [1,2,3]) 9 | a := map[string]int 10 | println(a * 10) | ^ 11 | println(10 * a) 12 | c1 := cmplx.complex(1,-2) -vlib/v/checker/tests/mul_op_wrong_type_err.vv:11:18: error: mismatched types `any_int` and `map[string]int` +vlib/v/checker/tests/mul_op_wrong_type_err.vv:11:18: error: mismatched types `untyped int` and `map[string]int` 9 | a := map[string]int 10 | println(a * 10) 11 | println(10 * a) | ^ 12 | c1 := cmplx.complex(1,-2) 13 | c2 := c1 * 2.0 -vlib/v/checker/tests/mul_op_wrong_type_err.vv:13:11: error: infix expr: cannot use `any_float` (right expression) as `math.complex.Complex` +vlib/v/checker/tests/mul_op_wrong_type_err.vv:13:11: error: infix expr: cannot use `untyped float` (right expression) as `math.complex.Complex` 11 | println(10 * a) 12 | c1 := cmplx.complex(1,-2) 13 | c2 := c1 * 2.0 | ^ 14 | println(c2) 15 | c3 := 2.0 * c1 -vlib/v/checker/tests/mul_op_wrong_type_err.vv:15:12: error: infix expr: cannot use `math.complex.Complex` (right expression) as `any_float` +vlib/v/checker/tests/mul_op_wrong_type_err.vv:15:12: error: infix expr: cannot use `math.complex.Complex` (right expression) as `untyped float` 13 | c2 := c1 * 2.0 14 | println(c2) 15 | c3 := 2.0 * c1 diff --git a/vlib/v/checker/tests/optional_or_block_returns_value_of_incompatible_type.out b/vlib/v/checker/tests/optional_or_block_returns_value_of_incompatible_type.out index c8ced1d94d..0c71a32091 100644 --- a/vlib/v/checker/tests/optional_or_block_returns_value_of_incompatible_type.out +++ b/vlib/v/checker/tests/optional_or_block_returns_value_of_incompatible_type.out @@ -1,4 +1,4 @@ -vlib/v/checker/tests/optional_or_block_returns_value_of_incompatible_type.vv:13:3: error: the default expression type in the `or` block should be `string`, instead you gave a value of type `any_int` +vlib/v/checker/tests/optional_or_block_returns_value_of_incompatible_type.vv:13:3: error: the default expression type in the `or` block should be `string`, instead you gave a value of type `untyped int` 11 | // must be of the same type of the return 12 | // type of the `test_optional` function 13 | 123 diff --git a/vlib/v/checker/tests/ptr_assign.out b/vlib/v/checker/tests/ptr_assign.out index a8675578c6..4f1a66c744 100644 --- a/vlib/v/checker/tests/ptr_assign.out +++ b/vlib/v/checker/tests/ptr_assign.out @@ -1,4 +1,4 @@ -vlib/v/checker/tests/ptr_assign.vv:3:5: error: cannot assign to `p`: expected `&int`, not `any_int` +vlib/v/checker/tests/ptr_assign.vv:3:5: error: cannot assign to `p`: expected `&int`, not `untyped int` 1 | mut v := 43 2 | mut p := &v 3 | p = 4 diff --git a/vlib/v/checker/tests/return_type.out b/vlib/v/checker/tests/return_type.out index 7af20bdd40..9f142478c1 100644 --- a/vlib/v/checker/tests/return_type.out +++ b/vlib/v/checker/tests/return_type.out @@ -1,4 +1,4 @@ -vlib/v/checker/tests/return_type.vv:2:9: error: cannot use `any_int` as type `bool` in return argument +vlib/v/checker/tests/return_type.vv:2:9: error: cannot use `untyped int` as type `bool` in return argument 1 | fn test() bool { 2 | return 100 | ~~~ diff --git a/vlib/v/checker/tests/rshift_op_wrong_left_type_err.out b/vlib/v/checker/tests/rshift_op_wrong_left_type_err.out index 1c79a3ccc3..ad860c209d 100644 --- a/vlib/v/checker/tests/rshift_op_wrong_left_type_err.out +++ b/vlib/v/checker/tests/rshift_op_wrong_left_type_err.out @@ -1,4 +1,4 @@ -vlib/v/checker/tests/rshift_op_wrong_left_type_err.vv:2:10: error: invalid operation: shift of type `any_float` +vlib/v/checker/tests/rshift_op_wrong_left_type_err.vv:2:10: error: invalid operation: shift of type `untyped float` 1 | fn main() { 2 | println(0.5 >> 1) | ~~~ diff --git a/vlib/v/checker/tests/shift_op_wrong_left_type_err.out b/vlib/v/checker/tests/shift_op_wrong_left_type_err.out index 572ca9b0ee..bee4383253 100644 --- a/vlib/v/checker/tests/shift_op_wrong_left_type_err.out +++ b/vlib/v/checker/tests/shift_op_wrong_left_type_err.out @@ -1,4 +1,4 @@ -vlib/v/checker/tests/shift_op_wrong_left_type_err.vv:2:10: error: invalid operation: shift of type `any_float` +vlib/v/checker/tests/shift_op_wrong_left_type_err.vv:2:10: error: invalid operation: shift of type `untyped float` 1 | fn main() { 2 | println(0.5 << 1) | ~~~ diff --git a/vlib/v/parser/parse_type.v b/vlib/v/parser/parse_type.v index c4e898ee3c..59e70684ff 100644 --- a/vlib/v/parser/parse_type.v +++ b/vlib/v/parser/parse_type.v @@ -336,6 +336,12 @@ pub fn (mut p Parser) parse_any_type(language table.Language, is_ptr bool, check 'bool' { return table.bool_type } + 'any_float' { + return table.any_flt_type + } + 'any_int' { + return table.any_int_type + } else { if name.len == 1 && name[0].is_capital() { return p.parse_generic_template_type(name) diff --git a/vlib/v/table/types.v b/vlib/v/table/types.v index 5ff7657902..39d321e341 100644 --- a/vlib/v/table/types.v +++ b/vlib/v/table/types.v @@ -517,8 +517,8 @@ pub fn (mut t Table) register_builtin_type_symbols() { t.register_type_symbol(kind: .chan, name: 'chan', cname: 'chan', mod: 'builtin') t.register_type_symbol(kind: .size_t, name: 'size_t', cname: 'size_t', mod: 'builtin') t.register_type_symbol(kind: .any, name: 'any', cname: 'any', mod: 'builtin') - t.register_type_symbol(kind: .any_float, name: 'any_float', cname: 'any_float', mod: 'builtin') - t.register_type_symbol(kind: .any_int, name: 'any_int', cname: 'any_int', mod: 'builtin') + t.register_type_symbol(kind: .any_float, name: 'untyped float', cname: 'any_float', mod: 'builtin') + t.register_type_symbol(kind: .any_int, name: 'untyped int', cname: 'any_int', mod: 'builtin') } [inline]