ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 15:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename reflect.to_* to reflect.as_*

Browse Source
This commit is contained in:
gingerBill
2020-06-05 10:38:38 +01:00
parent 11dd971e13
commit f992e36f9a
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/fmt/fmt.odin
+3 -3
View File
@@ -515,7 +515,7 @@ int_from_arg :: proc(args: []any, arg_index: int) -> (int, int, bool) {
new_arg_index := arg_index; new_arg_index := arg_index;
ok := true; ok := true;
if arg_index < len(args) { if arg_index < len(args) {
num, ok = reflect.to_int(args[arg_index]); num, ok = reflect.as_int(args[arg_index]);
} }
if ok { if ok {
@@ -925,7 +925,7 @@ enum_value_to_string :: proc(val: any) -> (string, bool) {
case runtime.Type_Info_Enum: case runtime.Type_Info_Enum:
Enum_Value :: runtime.Type_Info_Enum_Value; Enum_Value :: runtime.Type_Info_Enum_Value;
ev_, ok := reflect.to_i64(val); ev_, ok := reflect.as_i64(val);
ev := Enum_Value(ev_); ev := Enum_Value(ev_);
if ok { if ok {
@@ -1709,7 +1709,7 @@ fmt_value :: proc(fi: ^Info, v: any, verb: rune) {
} else { } else {
len_ptr := uintptr(v.data) + uintptr(info.base_integer.size); len_ptr := uintptr(v.data) + uintptr(info.base_integer.size);
len_any := any{rawptr(len_ptr), info.base_integer.id}; 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); slice_type := reflect.type_info_base(info.slice).variant.(runtime.Type_Info_Slice);
strings.write_byte(fi.buf, '['); strings.write_byte(fi.buf, '[');
core/reflect/reflect.odin
+10 -10
View File
@@ -199,7 +199,7 @@ align_of_typeid :: proc(T: typeid) -> int {
return 1; return 1;
} }
to_bytes :: proc(v: any) -> []byte { as_bytes :: proc(v: any) -> []byte {
if v != nil { if v != nil {
sz := size_of_typeid(v.id); sz := size_of_typeid(v.id);
return mem.slice_ptr((^byte)(v.data), sz); return mem.slice_ptr((^byte)(v.data), sz);
@@ -215,7 +215,7 @@ is_nil :: proc(v: any) -> bool {
if v == nil { if v == nil {
return true; return true;
} }
data := to_bytes(v); data := as_bytes(v);
if data != nil { if data != nil {
return true; return true;
} }
@@ -502,7 +502,7 @@ enum_string :: proc(a: any) -> string {
if a == nil do return ""; if a == nil do return "";
ti := runtime.type_info_base(type_info_of(a.id)); ti := runtime.type_info_base(type_info_of(a.id));
if e, ok := ti.variant.(runtime.Type_Info_Enum); ok { if e, ok := ti.variant.(runtime.Type_Info_Enum); ok {
v, _ := to_i64(a); v, _ := as_i64(a);
for value, i in e.values { for value, i in e.values {
if value == runtime.Type_Info_Enum_Value(v) { if value == runtime.Type_Info_Enum_Value(v) {
return e.names[i]; 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: i64;
v, valid = to_i64(a); v, valid = as_i64(a);
value = int(v); value = int(v);
return; return;
} }
to_uint :: proc(a: any) -> (value: uint, valid: bool) { as_uint :: proc(a: any) -> (value: uint, valid: bool) {
v: u64; v: u64;
v, valid = to_u64(a); v, valid = as_u64(a);
value = uint(v); value = uint(v);
return; return;
} }
to_i64 :: proc(a: any) -> (value: i64, valid: bool) { as_i64 :: proc(a: any) -> (value: i64, valid: bool) {
if a == nil do return; if a == nil do return;
a := a; a := a;
ti := runtime.type_info_core(type_info_of(a.id)); ti := runtime.type_info_core(type_info_of(a.id));
@@ -687,7 +687,7 @@ to_i64 :: proc(a: any) -> (value: i64, valid: bool) {
return; return;
} }
to_u64 :: proc(a: any) -> (value: u64, valid: bool) { as_u64 :: proc(a: any) -> (value: u64, valid: bool) {
if a == nil do return; if a == nil do return;
a := a; a := a;
ti := runtime.type_info_core(type_info_of(a.id)); 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; if a == nil do return;
a := a; a := a;
ti := runtime.type_info_core(type_info_of(a.id)); ti := runtime.type_info_core(type_info_of(a.id));