mirror of
https://github.com/Ed94/Odin.git
synced 2026-07-31 11:50:07 +00:00
Fix missing type_info with manual linear search
This commit is contained in:
+14
-42
@@ -63,8 +63,8 @@ print_nl_to_buffer :: proc(buf: ^[]byte) { print_rune_to_buffer(buf, #rune "\
|
||||
print_int_to_buffer :: proc(buf: ^[]byte, i: int) {
|
||||
print_int_base_to_buffer(buf, i, 10);
|
||||
}
|
||||
PRINT__NUM_TO_CHAR_TABLE :: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz@$"
|
||||
print_int_base_to_buffer :: proc(buffer: ^[]byte, i, base: int) {
|
||||
NUM_TO_CHAR_TABLE :: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz@$"
|
||||
|
||||
buf: [65]byte
|
||||
len := 0
|
||||
@@ -78,7 +78,7 @@ print_int_base_to_buffer :: proc(buffer: ^[]byte, i, base: int) {
|
||||
len++
|
||||
}
|
||||
for i > 0 {
|
||||
buf[len] = NUM_TO_CHAR_TABLE[i % base]
|
||||
buf[len] = PRINT__NUM_TO_CHAR_TABLE[i % base]
|
||||
len++;
|
||||
i /= base
|
||||
}
|
||||
@@ -96,8 +96,6 @@ print_uint_to_buffer :: proc(buffer: ^[]byte, i: uint) {
|
||||
print_uint_base_to_buffer(buffer, i, 10, 0, #rune " ")
|
||||
}
|
||||
print_uint_base_to_buffer :: proc(buffer: ^[]byte, i, base: uint, min_width: int, pad_char: byte) {
|
||||
NUM_TO_CHAR_TABLE :: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz@$"
|
||||
|
||||
buf: [65]byte
|
||||
len := 0
|
||||
if i == 0 {
|
||||
@@ -105,7 +103,7 @@ print_uint_base_to_buffer :: proc(buffer: ^[]byte, i, base: uint, min_width: int
|
||||
len++
|
||||
}
|
||||
for i > 0 {
|
||||
buf[len] = NUM_TO_CHAR_TABLE[i % base]
|
||||
buf[len] = PRINT__NUM_TO_CHAR_TABLE[i % base]
|
||||
len++
|
||||
i /= base
|
||||
}
|
||||
@@ -139,8 +137,6 @@ print__f64 :: proc(buffer: ^[]byte, f: f64, decimal_places: int) {
|
||||
}
|
||||
|
||||
print_u64_to_buffer :: proc(buffer: ^[]byte, i: u64) {
|
||||
NUM_TO_CHAR_TABLE :: "0123456789"
|
||||
|
||||
buf: [22]byte
|
||||
len := 0
|
||||
if i == 0 {
|
||||
@@ -148,7 +144,7 @@ print__f64 :: proc(buffer: ^[]byte, f: f64, decimal_places: int) {
|
||||
len++
|
||||
}
|
||||
for i > 0 {
|
||||
buf[len] = NUM_TO_CHAR_TABLE[i % 10]
|
||||
buf[len] = PRINT__NUM_TO_CHAR_TABLE[i % 10]
|
||||
len++
|
||||
i /= 10
|
||||
}
|
||||
@@ -173,13 +169,14 @@ print__f64 :: proc(buffer: ^[]byte, f: f64, decimal_places: int) {
|
||||
|
||||
|
||||
|
||||
print_any_to_buffer :: proc(buf: ^[]byte ,arg: any) {
|
||||
print_any_to_buffer :: proc(buf: ^[]byte, arg: any) {
|
||||
using Type_Info
|
||||
match type arg.type_info -> info {
|
||||
case Named:
|
||||
print_string_to_buffer(buf, "(")
|
||||
print_string_to_buffer(buf, info.name)
|
||||
print_string_to_buffer(buf, ")")
|
||||
a: any
|
||||
a.type_info = info.base
|
||||
a.data = arg.data
|
||||
print_any_to_buffer(buf, a)
|
||||
|
||||
case Integer:
|
||||
if info.signed {
|
||||
@@ -250,7 +247,6 @@ print_any_to_buffer :: proc(buf: ^[]byte ,arg: any) {
|
||||
case Slice: print_string_to_buffer(buf, "(slice)")
|
||||
case Vector: print_string_to_buffer(buf, "(vector)")
|
||||
|
||||
|
||||
case Struct: print_string_to_buffer(buf, "(struct)")
|
||||
case Union: print_string_to_buffer(buf, "(union)")
|
||||
case Raw_Union: print_string_to_buffer(buf, "(raw_union)")
|
||||
@@ -265,38 +261,22 @@ print_any_to_buffer :: proc(buf: ^[]byte ,arg: any) {
|
||||
|
||||
print_to_buffer :: proc(buf: ^[]byte, args: ..any) {
|
||||
for i := 0; i < len(args); i++ {
|
||||
arg := args[i]
|
||||
|
||||
if i > 0 {
|
||||
print_space_to_buffer(buf)
|
||||
}
|
||||
print_any_to_buffer(buf, arg)
|
||||
print_any_to_buffer(buf, args[i])
|
||||
}
|
||||
print_nl_to_buffer(buf)
|
||||
}
|
||||
|
||||
println_to_buffer :: proc(buf: ^[]byte, args: ..any) {
|
||||
for i := 0; i < len(args); i++ {
|
||||
arg := args[i]
|
||||
|
||||
if i > 0 {
|
||||
print_space_to_buffer(buf)
|
||||
}
|
||||
print_any_to_buffer(buf, arg)
|
||||
}
|
||||
print_to_buffer(buf, ..args)
|
||||
print_nl_to_buffer(buf)
|
||||
}
|
||||
|
||||
print :: proc(args: ..any) {
|
||||
data: [4096]byte
|
||||
buf := data[:0]
|
||||
for i := 0; i < len(args); i++ {
|
||||
arg := args[i]
|
||||
|
||||
if i > 0 {
|
||||
print_space_to_buffer(^buf)
|
||||
}
|
||||
print_any_to_buffer(^buf, arg)
|
||||
}
|
||||
print_to_buffer(^buf, ..args)
|
||||
file_write(file_get_standard(File_Standard.OUTPUT), buf)
|
||||
}
|
||||
|
||||
@@ -304,14 +284,6 @@ print :: proc(args: ..any) {
|
||||
println :: proc(args: ..any) {
|
||||
data: [4096]byte
|
||||
buf := data[:0]
|
||||
for i := 0; i < len(args); i++ {
|
||||
arg := args[i]
|
||||
|
||||
if i > 0 {
|
||||
print_space_to_buffer(^buf)
|
||||
}
|
||||
print_any_to_buffer(^buf, arg)
|
||||
}
|
||||
print_nl_to_buffer(^buf)
|
||||
println_to_buffer(^buf, ..args)
|
||||
file_write(file_get_standard(File_Standard.OUTPUT), buf)
|
||||
}
|
||||
|
||||
+1
-8
@@ -2,13 +2,6 @@
|
||||
#load "math.odin"
|
||||
|
||||
main :: proc() {
|
||||
i: int
|
||||
s: struct {
|
||||
x, y, z: f32
|
||||
}
|
||||
p := ^s
|
||||
|
||||
a: any = i
|
||||
|
||||
a: any = 1
|
||||
println(137, "Hello", 1.25, true)
|
||||
}
|
||||
|
||||
+3
-3
@@ -95,9 +95,9 @@ cross :: proc(x, y: Vec3) -> Vec3 {
|
||||
}
|
||||
|
||||
|
||||
vec2_mag :: proc(v: Vec2) -> f32 { return fsqrt(v ''dot2 v) }
|
||||
vec3_mag :: proc(v: Vec3) -> f32 { return fsqrt(v ''dot3 v) }
|
||||
vec4_mag :: proc(v: Vec4) -> f32 { return fsqrt(v ''dot4 v) }
|
||||
vec2_mag :: proc(v: Vec2) -> f32 { return fsqrt(dot2(v, v)) }
|
||||
vec3_mag :: proc(v: Vec3) -> f32 { return fsqrt(dot3(v, v)) }
|
||||
vec4_mag :: proc(v: Vec4) -> f32 { return fsqrt(dot4(v, v)) }
|
||||
|
||||
vec2_norm :: proc(v: Vec2) -> Vec2 { return v / Vec2{vec2_mag(v)} }
|
||||
vec3_norm :: proc(v: Vec3) -> Vec3 { return v / Vec3{vec3_mag(v)} }
|
||||
|
||||
@@ -9,7 +9,7 @@ Type_Info :: union {
|
||||
offset: int
|
||||
}
|
||||
Record :: struct {
|
||||
fields: []Member
|
||||
fields: []Member // NOTE(bill): This will need to be allocated on the heap
|
||||
}
|
||||
|
||||
|
||||
@@ -50,6 +50,7 @@ Type_Info :: union {
|
||||
}
|
||||
|
||||
|
||||
|
||||
assume :: proc(cond: bool) #foreign "llvm.assume"
|
||||
|
||||
__debug_trap :: proc() #foreign "llvm.debugtrap"
|
||||
@@ -276,7 +277,5 @@ __default_allocator :: proc() -> Allocator {
|
||||
|
||||
__assert :: proc(msg: string) {
|
||||
file_write(file_get_standard(File_Standard.ERROR), msg as []byte)
|
||||
// TODO(bill): Which is better?
|
||||
// __trap()
|
||||
__debug_trap()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user