From 020dd57b06c37e443d109022f01bc5dbcb3501e5 Mon Sep 17 00:00:00 2001 From: HeHHeyboi <157625347+HeHHeyboi@users.noreply.github.com> Date: Fri, 23 May 2025 15:29:08 +0700 Subject: [PATCH 1/3] Correct RWwrite signature --- vendor/sdl2/sdl_rwops.odin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/sdl2/sdl_rwops.odin b/vendor/sdl2/sdl_rwops.odin index ca7fa0bea..d3986f4b3 100644 --- a/vendor/sdl2/sdl_rwops.odin +++ b/vendor/sdl2/sdl_rwops.odin @@ -87,7 +87,7 @@ foreign lib { RWseek :: proc(ctx: ^RWops, offset: i64, whence: c.int) -> i64 --- RWtell :: proc(ctx: ^RWops) -> i64 --- RWread :: proc(ctx: ^RWops, ptr: rawptr, size: c.size_t, maxnum: c.size_t) -> c.size_t --- - RWwrite :: proc(ctx: ^RWops, size: c.size_t, num: c.size_t) -> c.size_t --- + RWwrite :: proc(ctx: ^RWops, ptr: rawptr, size: c.size_t, num: c.size_t) -> c.size_t --- RWclose :: proc(ctx: ^RWops) -> c.int --- LoadFile_RW :: proc(src: ^RWops, datasize: ^c.size_t, freesrc: bool) -> rawptr --- From 3d60b219c115d3792899d46b8baa9f760f5028cd Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Fri, 23 May 2025 14:02:49 +0200 Subject: [PATCH 2/3] Allow text/scanner to scan 0h hex floats --- core/text/scanner/scanner.odin | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/text/scanner/scanner.odin b/core/text/scanner/scanner.odin index 24dbcc8a4..f32233396 100644 --- a/core/text/scanner/scanner.odin +++ b/core/text/scanner/scanner.odin @@ -285,6 +285,7 @@ scan_number :: proc(s: ^Scanner, ch: rune, seen_dot: bool) -> (rune, rune) { case 'o': return "octal literal" case 'z': return "dozenal literal" case 'x': return "hexadecimal literal" + case 'h': return "hexadecimal literal" } return "decimal literal" } @@ -360,7 +361,8 @@ scan_number :: proc(s: ^Scanner, ch: rune, seen_dot: bool) -> (rune, rune) { base, prefix = 12, 'z' case 'h': tok = Float - fallthrough + ch = advance(s) + base, prefix = 16, 'h' case 'x': ch = advance(s) base, prefix = 16, 'x' From 8b657379f335a511f35bb5ef551f8b8af49ddd96 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Fri, 23 May 2025 17:07:08 +0200 Subject: [PATCH 3/3] Typo fix --- core/text/scanner/scanner.odin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/text/scanner/scanner.odin b/core/text/scanner/scanner.odin index f32233396..96109f614 100644 --- a/core/text/scanner/scanner.odin +++ b/core/text/scanner/scanner.odin @@ -449,7 +449,7 @@ scan_string :: proc(s: ^Scanner, quote: rune) -> (n: int) { ch := advance(s) for ch != quote { if ch == '\n' || ch < 0 { - error(s, "literal no terminated") + error(s, "literal not terminated") return } if ch == '\\' {