Basic variadic print procedure

2026-07-13 14:51:26 -07:00 · 2016-09-07 19:23:00 +01:00
parent 2c4193a242
commit 7ba13a18a3
8 changed files with 216 additions and 102 deletions
@@ -2,8 +2,13 @@
 #load "win32.odin"
 #load "file.odin"

-print_string :: proc(s: string) {
-	file_write(file_get_standard(File_Standard.OUTPUT), s as []byte)
+print_string_to_buffer :: proc(buf: ^[]byte, s: string) {
+	for i := 0; i < len(s); i++ {
+		if !append(buf, s[i]) {
+			// Buffer is full
+			return
+		}
+	}
 }

 byte_reverse :: proc(b: []byte) {
@@ -47,19 +52,18 @@ encode_rune :: proc(r: rune) -> ([4]byte, int) {
 	return buf, 4
 }

-print_rune :: proc(r: rune) {
-	buf, n := encode_rune(r)
-	str := buf[:n] as string
-	print_string(str)
+print_rune_to_buffer :: proc(buf: ^[]byte, r: rune) {
+	b, n := encode_rune(r)
+	print_string_to_buffer(buf, b[:n] as string)
 }

-print_space :: proc() { print_rune(#rune " ") }
-print_nl    :: proc() { print_rune(#rune "\n") }
+print_space_to_buffer :: proc(buf: ^[]byte) { print_rune_to_buffer(buf, #rune " ") }
+print_nl_to_buffer    :: proc(buf: ^[]byte) { print_rune_to_buffer(buf, #rune "\n") }

-print_int :: proc(i: int) {
-	print_int_base(i, 10);
+print_int_to_buffer :: proc(buf: ^[]byte, i: int) {
+	print_int_base_to_buffer(buf, i, 10);
 }
-print_int_base :: proc(i, base: int) {
+print_int_base_to_buffer :: proc(buffer: ^[]byte, i, base: int) {
 	NUM_TO_CHAR_TABLE :: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz@$"

 	buf: [65]byte
@@ -85,13 +89,13 @@ print_int_base :: proc(i, base: int) {
 	}

 	byte_reverse(buf[:len])
-	print_string(buf[:len] as string)
+	print_string_to_buffer(buffer, buf[:len] as string)
 }

-print_uint :: proc(i: uint) {
-	print__uint(i, 10, 0, #rune " ")
+print_uint_to_buffer :: proc(buffer: ^[]byte, i: uint) {
+	print_uint_base_to_buffer(buffer, i, 10, 0, #rune " ")
 }
-print__uint :: proc(i, base: uint, min_width: int, pad_char: byte) {
+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
@@ -111,30 +115,30 @@ print__uint :: proc(i, base: uint, min_width: int, pad_char: byte) {
 	}

 	byte_reverse(buf[:len])
-	print_string(buf[:len] as string)
+	print_string_to_buffer(buffer, buf[:len] as string)
 }

-print_bool :: proc(b : bool) {
-	if b { print_string("true") }
-	else { print_string("false") }
+print_bool_to_buffer :: proc(buffer: ^[]byte, b : bool) {
+	if b { print_string_to_buffer(buffer, "true") }
+	else { print_string_to_buffer(buffer, "false") }
 }

-print_pointer :: proc(p: rawptr) #inline { print__uint(p as uint, 16, 0, #rune " ") }
+print_pointer_to_buffer :: proc(buffer: ^[]byte, p: rawptr) #inline { print_uint_base_to_buffer(buffer, p as uint, 16, 0, #rune " ") }

-print_f32     :: proc(f: f32) #inline { print__f64(f as f64, 7) }
-print_f64     :: proc(f: f64) #inline { print__f64(f, 10) }
+print_f32_to_buffer :: proc(buffer: ^[]byte, f: f32) #inline { print__f64(buffer, f as f64, 7) }
+print_f64_to_buffer :: proc(buffer: ^[]byte, f: f64) #inline { print__f64(buffer, f, 10) }

-print__f64 :: proc(f: f64, decimal_places: int) {
+print__f64 :: proc(buffer: ^[]byte, f: f64, decimal_places: int) {
 	if f == 0 {
-		print_rune(#rune "0")
+		print_rune_to_buffer(buffer, #rune "0")
 		return
 	}
 	if f < 0 {
-		print_rune(#rune "-")
+		print_rune_to_buffer(buffer, #rune "-")
 		f = -f
 	}

-	print_u64 :: proc(i: u64) {
+	print_u64_to_buffer :: proc(buffer: ^[]byte, i: u64) {
 		NUM_TO_CHAR_TABLE :: "0123456789"

 		buf: [22]byte
@@ -149,20 +153,165 @@ print__f64 :: proc(f: f64, decimal_places: int) {
 			i /= 10
 		}
 		byte_reverse(buf[:len])
-		print_string(buf[:len] as string)
+		print_string_to_buffer(buffer, buf[:len] as string)
 	}

 	i := f as u64
-	print_u64(i)
+	print_u64_to_buffer(buffer, i)
 	f -= i as f64

-	print_rune(#rune ".")
+	print_rune_to_buffer(buffer, #rune ".")

 	mult := 10.0
 	for decimal_places := 6; decimal_places >= 0; decimal_places-- {
 		i = (f * mult) as u64
-		print_u64(i as u64)
+		print_u64_to_buffer(buffer, i as u64)
 		f -= i as f64 / mult
 		mult *= 10
 	}
 }
+
+
+
+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, ")")
+
+	case Integer:
+		if info.signed {
+			u: uint = 0;
+			if arg.data != null {
+				match info.size {
+				case 1:  u = (arg.data as ^u8)^ as uint
+				case 2:  u = (arg.data as ^u16)^ as uint
+				case 4:  u = (arg.data as ^u32)^ as uint
+				case 8:  u = (arg.data as ^u64)^ as uint
+				case 16: u = (arg.data as ^u128)^ as uint
+				}
+			}
+			print_uint_to_buffer(buf, u)
+		} else {
+			v: int = 0;
+			if arg.data != null {
+				match info.size {
+				case 1:  v = (arg.data as ^i8)^ as int
+				case 2:  v = (arg.data as ^i16)^ as int
+				case 4:  v = (arg.data as ^i32)^ as int
+				case 8:  v = (arg.data as ^i64)^ as int
+				case 16: v = (arg.data as ^i128)^ as int
+				}
+			}
+			print_int_to_buffer(buf, v)
+		}
+
+	case Float:
+		f: f64 = 0
+		if arg.data != null {
+			match info.size {
+			case 4: f = (arg.data as ^f32)^ as f64
+			case 8: f = (arg.data as ^f64)^ as f64
+			}
+		}
+		print_f64_to_buffer(buf, f)
+
+	case String:
+		s := ""
+		if arg.data != null {
+			s = (arg.data as ^string)^
+		}
+		print_string_to_buffer(buf, s)
+
+	case Boolean:
+		v := false;
+		if arg.data != null {
+			v = (arg.data as ^bool)^
+		}
+		print_bool_to_buffer(buf, v)
+
+	case Pointer:
+		v := null;
+		if arg.data != null {
+			v = (arg.data as ^rawptr)^
+		}
+		print_pointer_to_buffer(buf, v)
+
+	case Enum:
+		v: any
+		v.data = arg.data
+		v.type_info = info.base
+		print_any_to_buffer(buf, v)
+
+
+	case Array:     print_string_to_buffer(buf, "(array)")
+	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)")
+	case Procedure:
+		print_string_to_buffer(buf, "(procedure 0x")
+		print_pointer_to_buffer(buf, (arg.data as ^rawptr)^)
+		print_string_to_buffer(buf, ")")
+	default:
+		print_string_to_buffer(buf, "")
+	}
+}
+
+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_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 :: 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)
+	}
+	file_write(file_get_standard(File_Standard.OUTPUT), buf)
+}
+
+
+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)
+	file_write(file_get_standard(File_Standard.OUTPUT), buf)
+}
@@ -1,59 +1,6 @@
 #load "basic.odin"
 #load "math.odin"

-
-print_type_info_kind :: proc(info: ^Type_Info) {
-	using Type_Info
-	match type info -> i {
-	case Named:     print_string("Named\n")
-	case Integer:   print_string("Integer\n")
-	case Float:     print_string("Float\n")
-	case String:    print_string("String\n")
-	case Boolean:   print_string("Boolean\n")
-	case Pointer:   print_string("Pointer\n")
-	case Procedure: print_string("Procedure\n")
-	case Array:     print_string("Array\n")
-	case Slice:     print_string("Slice\n")
-	case Vector:    print_string("Vector\n")
-	case Struct:    print_string("Struct\n")
-	case Union:     print_string("Union\n")
-	case Raw_Union: print_string("RawUnion\n")
-	case Enum:      print_string("Enum\n")
-	default:        print_string("void\n")
-	}
-}
-
-println :: proc(args: ..any) {
-	for i := 0; i < len(args); i++ {
-		arg := args[i]
-
-		if i > 0 {
-			print_string(" ")
-		}
-
-		using Type_Info
-		match type arg.type_info -> i {
-		case Named:     print_string("Named")
-		case Integer:   print_string("Integer")
-		case Float:     print_string("Float")
-		case String:    print_string("String")
-		case Boolean:   print_string("Boolean")
-		case Pointer:   print_string("Pointer")
-		case Procedure: print_string("Procedure")
-		case Array:     print_string("Array")
-		case Slice:     print_string("Slice")
-		case Vector:    print_string("Vector")
-		case Struct:    print_string("Struct")
-		case Union:     print_string("Union")
-		case Raw_Union: print_string("RawUnion")
-		case Enum:      print_string("Enum")
-		default:        print_string("void")
-		}
-	}
-
-	print_nl()
-}
-
 main :: proc() {
 	i: int
 	s: struct {
@@ -63,9 +10,5 @@ main :: proc() {

 	a: any = i

-	println(137, "Hello", 1.23)
-
-	// print_type_info_kind(a.type_info)
-	// print_type_info_kind(type_info(s))
-	// print_type_info_kind(type_info(p))
+	println(137, "Hello", 1.25, true)
 }