mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-04-20 05:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add assertf and panicf

Browse Source
This commit is contained in:
gingerBill
2018-08-30 11:46:57 +01:00
parent dda985f49d
commit 15dca449c9
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/fmt/fmt.odin
View File

@@ -462,7 +462,6 @@ int_from_arg :: proc(args: []any, arg_index: int) -> (int, int, bool) {
fmt_bad_verb :: proc(using fi: ^Fmt_Info, verb: rune) {
assert(verb != 'v');
write_string(buf, "%!");
write_rune(buf, verb);
write_byte(buf, '(');
@@ -1018,7 +1017,9 @@ fmt_value :: proc(fi: ^Fmt_Info, v: any, verb: rune) {
m := (^mem.Raw_Map)(v.data);
if m != nil {
assert(info.generated_struct != nil);
if info.generated_struct == nil {
return;
}
entries := &m.entries;
gs := runtime.type_info_base(info.generated_struct).variant.(runtime.Type_Info_Struct);
ed := runtime.type_info_base(gs.types[1]).variant.(runtime.Type_Info_Dynamic_Array);

27
core/runtime/core.odin
View File

@@ -5,6 +5,7 @@ package runtime
import "core:os"
import "core:mem"
import "core:fmt"
// Naming Conventions:
// In general, Ada_Case for types and snake_case for values
@@ -565,7 +566,7 @@ assert :: proc "contextless" (condition: bool, message := "", loc := #caller_loc
}
@(builtin)
panic :: proc "contextless" (message := "", loc := #caller_location) {
panic :: proc "contextless" (message: string, loc := #caller_location) {
p := context.assertion_failure_proc;
if p == nil {
p = default_assertion_failure_proc;
@@ -574,6 +575,30 @@ panic :: proc "contextless" (message := "", loc := #caller_location) {
}
@(builtin)
assertf :: proc "contextless" (condition: bool, format: string, args: ..any, loc := #caller_location) -> bool {
if !condition {
p := context.assertion_failure_proc;
if p == nil {
p = default_assertion_failure_proc;
}
message := fmt.tprintf(format, ..args);
p("Runtime assertion", message, loc);
}
return condition;
}
@(builtin)
panicf :: proc "contextless" (format: string, args: ..any, loc := #caller_location) {
p := context.assertion_failure_proc;
if p == nil {
p = default_assertion_failure_proc;
}
message := fmt.tprintf(format, ..args);
p("Panic", message, loc);
}
// Dynamic Array