cstring

core/_preload.odin

@@ -41,15 +41,15 @@ Type_Info_Enum_Value :: union {
 };
 
 // Variant Types
-Type_Info_Named   :: struct {name: string, base: ^Type_Info};
-Type_Info_Integer :: struct {signed: bool};
-Type_Info_Rune    :: struct{};
-Type_Info_Float   :: struct{};
-Type_Info_Complex :: struct{};
-Type_Info_String  :: struct{};
-Type_Info_Boolean :: struct{};
-Type_Info_Any     :: struct{};
-Type_Info_Pointer :: struct {
+Type_Info_Named    :: struct {name: string, base: ^Type_Info};
+Type_Info_Integer  :: struct {signed: bool};
+Type_Info_Rune     :: struct {};
+Type_Info_Float    :: struct {};
+Type_Info_Complex  :: struct {};
+Type_Info_String   :: struct {is_cstring: bool};
+Type_Info_Boolean  :: struct {};
+Type_Info_Any      :: struct {};
+Type_Info_Pointer  :: struct {
 	elem: ^Type_Info // nil -> rawptr
 };
 Type_Info_Procedure :: struct {
@@ -863,6 +863,20 @@ __string_gt :: inline proc "contextless" (a, b: string) -> bool { return __strin
 __string_le :: inline proc "contextless" (a, b: string) -> bool { return __string_cmp(a, b) <= 0; }
 __string_ge :: inline proc "contextless" (a, b: string) -> bool { return __string_cmp(a, b) >= 0; }
 
+__cstring_len :: proc "contextless" (s: cstring) -> int {
+	n := 0;
+	for p := (^byte)(s); p != nil && p^ != 0; p += 1 {
+		n += 1;
+	}
+	return n;
+}
+
+__cstring_to_string :: proc "contextless" (s: cstring) -> string {
+	ptr := (^byte)(s);
+	n := __cstring_len(s);
+	return transmute(string)raw.String{ptr, n};
+}
+
 
 __complex64_eq :: inline proc "contextless"  (a, b: complex64)  -> bool { return real(a) == real(b) && imag(a) == imag(b); }
 __complex64_ne :: inline proc "contextless"  (a, b: complex64)  -> bool { return real(a) != real(b) || imag(a) != imag(b); }

core/fmt.odin

@@ -178,7 +178,11 @@ write_type :: proc(buf: ^String_Buffer, ti: ^Type_Info) {
 		write_string(buf, "complex");
 		write_i64(buf, i64(8*ti.size), 10);
 	case Type_Info_String:
-		write_string(buf, "string");
+		if info.is_cstring {
+			write_string(buf, "cstring");
+		} else {
+			write_string(buf, "string");
+		}
 	case Type_Info_Boolean:
 		a := any{type_info = ti};
 		switch _ in a {
@@ -599,6 +603,9 @@ fmt_string :: proc(fi: ^Fmt_Info, s: string, verb: rune) {
 		fmt_bad_verb(fi, verb);
 	}
 }
+fmt_cstring :: proc(fi: ^Fmt_Info, s: cstring, verb: rune) {
+	fmt_string(fi, string(s), verb);
+}
 
 fmt_pointer :: proc(fi: ^Fmt_Info, p: rawptr, verb: rune) {
 	switch verb {
@@ -974,6 +981,7 @@ fmt_arg :: proc(fi: ^Fmt_Info, arg: any, verb: rune) {
 	case uintptr: fmt_int(fi, u64(a), false, 8*size_of(uintptr), verb);
 
 	case string:  fmt_string(fi, a, verb);
+	case cstring: fmt_cstring(fi, a, verb);
 
 	case:         fmt_value(fi, arg, verb);
 	}