From f992e36f9a620c3512d28658ed9b2e4b6fd3a730 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Fri, 5 Jun 2020 10:38:38 +0100 Subject: [PATCH] Rename `reflect.to_*` to `reflect.as_*` --- core/fmt/fmt.odin | 6 +++--- core/reflect/reflect.odin | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/fmt/fmt.odin b/core/fmt/fmt.odin index 81495cd83..5fc26f898 100644 --- a/core/fmt/fmt.odin +++ b/core/fmt/fmt.odin @@ -515,7 +515,7 @@ int_from_arg :: proc(args: []any, arg_index: int) -> (int, int, bool) { new_arg_index := arg_index; ok := true; if arg_index < len(args) { - num, ok = reflect.to_int(args[arg_index]); + num, ok = reflect.as_int(args[arg_index]); } if ok { @@ -925,7 +925,7 @@ enum_value_to_string :: proc(val: any) -> (string, bool) { case runtime.Type_Info_Enum: Enum_Value :: runtime.Type_Info_Enum_Value; - ev_, ok := reflect.to_i64(val); + ev_, ok := reflect.as_i64(val); ev := Enum_Value(ev_); if ok { @@ -1709,7 +1709,7 @@ fmt_value :: proc(fi: ^Info, v: any, verb: rune) { } else { len_ptr := uintptr(v.data) + uintptr(info.base_integer.size); len_any := any{rawptr(len_ptr), info.base_integer.id}; - len, _ := reflect.to_int(len_any); + len, _ := reflect.as_int(len_any); slice_type := reflect.type_info_base(info.slice).variant.(runtime.Type_Info_Slice); strings.write_byte(fi.buf, '['); diff --git a/core/reflect/reflect.odin b/core/reflect/reflect.odin index 8ad63a9b6..9f2e1f6b6 100644 --- a/core/reflect/reflect.odin +++ b/core/reflect/reflect.odin @@ -199,7 +199,7 @@ align_of_typeid :: proc(T: typeid) -> int { return 1; } -to_bytes :: proc(v: any) -> []byte { +as_bytes :: proc(v: any) -> []byte { if v != nil { sz := size_of_typeid(v.id); return mem.slice_ptr((^byte)(v.data), sz); @@ -215,7 +215,7 @@ is_nil :: proc(v: any) -> bool { if v == nil { return true; } - data := to_bytes(v); + data := as_bytes(v); if data != nil { return true; } @@ -502,7 +502,7 @@ enum_string :: proc(a: any) -> string { if a == nil do return ""; ti := runtime.type_info_base(type_info_of(a.id)); if e, ok := ti.variant.(runtime.Type_Info_Enum); ok { - v, _ := to_i64(a); + v, _ := as_i64(a); for value, i in e.values { if value == runtime.Type_Info_Enum_Value(v) { return e.names[i]; @@ -569,21 +569,21 @@ union_variant_typeid :: proc(a: any) -> typeid { } -to_int :: proc(a: any) -> (value: int, valid: bool) { +as_int :: proc(a: any) -> (value: int, valid: bool) { v: i64; - v, valid = to_i64(a); + v, valid = as_i64(a); value = int(v); return; } -to_uint :: proc(a: any) -> (value: uint, valid: bool) { +as_uint :: proc(a: any) -> (value: uint, valid: bool) { v: u64; - v, valid = to_u64(a); + v, valid = as_u64(a); value = uint(v); return; } -to_i64 :: proc(a: any) -> (value: i64, valid: bool) { +as_i64 :: proc(a: any) -> (value: i64, valid: bool) { if a == nil do return; a := a; ti := runtime.type_info_core(type_info_of(a.id)); @@ -687,7 +687,7 @@ to_i64 :: proc(a: any) -> (value: i64, valid: bool) { return; } -to_u64 :: proc(a: any) -> (value: u64, valid: bool) { +as_u64 :: proc(a: any) -> (value: u64, valid: bool) { if a == nil do return; a := a; ti := runtime.type_info_core(type_info_of(a.id)); @@ -792,7 +792,7 @@ to_u64 :: proc(a: any) -> (value: u64, valid: bool) { } -to_f64 :: proc(a: any) -> (value: f64, valid: bool) { +as_f64 :: proc(a: any) -> (value: f64, valid: bool) { if a == nil do return; a := a; ti := runtime.type_info_core(type_info_of(a.id));