ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 23:28:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/odin-lang/Odin

Browse Source
This commit is contained in:
gingerBill
2025-05-24 14:18:22 +01:00
parent 594f1b30b4 8b657379f3
commit 7b0b5d9adf
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/text/scanner/scanner.odin
+4 -2
View File
@@ -285,6 +285,7 @@ scan_number :: proc(s: ^Scanner, ch: rune, seen_dot: bool) -> (rune, rune) {
case 'o': return "octal literal" case 'o': return "octal literal"
case 'z': return "dozenal literal" case 'z': return "dozenal literal"
case 'x': return "hexadecimal literal" case 'x': return "hexadecimal literal"
case 'h': return "hexadecimal literal"
} }
return "decimal literal" return "decimal literal"
} }
@@ -360,7 +361,8 @@ scan_number :: proc(s: ^Scanner, ch: rune, seen_dot: bool) -> (rune, rune) {
base, prefix = 12, 'z' base, prefix = 12, 'z'
case 'h': case 'h':
tok = Float tok = Float
fallthrough ch = advance(s)
base, prefix = 16, 'h'
case 'x': case 'x':
ch = advance(s) ch = advance(s)
base, prefix = 16, 'x' base, prefix = 16, 'x'
@@ -447,7 +449,7 @@ scan_string :: proc(s: ^Scanner, quote: rune) -> (n: int) {
ch := advance(s) ch := advance(s)
for ch != quote { for ch != quote {
if ch == '\n' || ch < 0 { if ch == '\n' || ch < 0 {
error(s, "literal no terminated") error(s, "literal not terminated")
return return
} }
if ch == '\\' { if ch == '\\' {
vendor/sdl2/sdl_rwops.odin
Vendored
+1 -1
View File
@@ -87,7 +87,7 @@ foreign lib {
RWseek :: proc(ctx: ^RWops, offset: i64, whence: c.int) -> i64 --- RWseek :: proc(ctx: ^RWops, offset: i64, whence: c.int) -> i64 ---
RWtell :: proc(ctx: ^RWops) -> i64 --- RWtell :: proc(ctx: ^RWops) -> i64 ---
RWread :: proc(ctx: ^RWops, ptr: rawptr, size: c.size_t, maxnum: c.size_t) -> c.size_t --- 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 --- RWclose :: proc(ctx: ^RWops) -> c.int ---
LoadFile_RW :: proc(src: ^RWops, datasize: ^c.size_t, freesrc: bool) -> rawptr --- LoadFile_RW :: proc(src: ^RWops, datasize: ^c.size_t, freesrc: bool) -> rawptr ---