From a9b20c29b1ade46d82ab6c62dfcf9148d86daae0 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sat, 30 Mar 2019 10:17:31 +0000 Subject: [PATCH] Fix slicing issue; Change path of math/bits in package json #363 --- core/encoding/json/marshal.odin | 2 +- core/runtime/internal.odin | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/encoding/json/marshal.odin b/core/encoding/json/marshal.odin index d25758275..4f5ee6880 100644 --- a/core/encoding/json/marshal.odin +++ b/core/encoding/json/marshal.odin @@ -1,7 +1,7 @@ package json import "core:mem" -import "core:bits" +import "core:math/bits" import "core:runtime" import "core:strconv" import "core:strings" diff --git a/core/runtime/internal.odin b/core/runtime/internal.odin index 82cd4cb72..60110be15 100644 --- a/core/runtime/internal.odin +++ b/core/runtime/internal.odin @@ -303,7 +303,7 @@ slice_expr_error_hi :: proc "contextless" (file: string, line, column: int, hi: } slice_expr_error_lo_hi :: proc "contextless" (file: string, line, column: int, lo, hi: int, len: int) { - if 0 <= lo && lo < len && lo <= hi && hi <= len do return; + if 0 <= lo && lo <= len && lo <= hi && hi <= len do return; handle_error :: proc "contextless" (file: string, line, column: int, lo, hi: int, len: int) { fd := os.stderr; print_caller_location(fd, Source_Code_Location{file, line, column, "", 0});