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

Merge pull request #6289 from wrathdoesthat/master

Browse Source 
Propagate allocator errors from certain unicode functions
This commit is contained in:
Jeroen van Rijn
2026-02-16 20:50:45 +01:00
committed by GitHub
parent 3adc529113 06b10f9ae8
commit bfe1f234ec
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/unicode/utf16/utf16.odin
View File

@@ -1,6 +1,7 @@
// Procedures and constants to support text-encoding in the `UTF-16` character encoding.
package utf16
@(require) import "base:runtime"
import "core:unicode/utf8"
REPLACEMENT_CHAR :: '\ufffd'
@@ -127,10 +128,10 @@ decode_rune_in_string :: proc "contextless" (s: string16) -> (r: rune, width: in
return
}
string_to_runes :: proc "odin" (s: string16, allocator := context.allocator) -> (runes: []rune) {
string_to_runes :: proc "odin" (s: string16, allocator := context.allocator) -> (runes: []rune, err: runtime.Allocator_Error) #optional_allocator_error {
n := rune_count(s)
runes = make([]rune, n, allocator)
runes = make([]rune, n, allocator) or_return
i := 0
for r in s {
runes[i] = r

13
core/unicode/utf8/utf8.odin
View File

@@ -1,6 +1,8 @@
// Procedures and constants to support text-encoding in the `UTF-8` character encoding.
package utf8
@(require) import "base:runtime"
RUNE_ERROR :: '\ufffd'
RUNE_SELF :: 0x80
RUNE_BOM :: 0xfeff
@@ -145,10 +147,10 @@ decode_rune_in_bytes :: proc "contextless" (s: []u8) -> (rune, int) {
}
@(require_results)
string_to_runes :: proc "odin" (s: string, allocator := context.allocator) -> (runes: []rune) {
string_to_runes :: proc "odin" (s: string, allocator := context.allocator) -> (runes: []rune, err: runtime.Allocator_Error) #optional_allocator_error {
n := rune_count_in_string(s)
runes = make([]rune, n, allocator)
runes = make([]rune, n, allocator) or_return
i := 0
for r in s {
runes[i] = r
@@ -158,14 +160,14 @@ string_to_runes :: proc "odin" (s: string, allocator := context.allocator) -> (r
}
@(require_results)
runes_to_string :: proc "odin" (runes: []rune, allocator := context.allocator) -> string {
runes_to_string :: proc "odin" (runes: []rune, allocator := context.allocator) -> (s: string, err: runtime.Allocator_Error) #optional_allocator_error {
byte_count := 0
for r in runes {
_, w := encode_rune(r)
byte_count += w
}
bytes := make([]byte, byte_count, allocator)
bytes := make([]byte, byte_count, allocator) or_return
offset := 0
for r in runes {
b, w := encode_rune(r)
@@ -173,7 +175,8 @@ runes_to_string :: proc "odin" (runes: []rune, allocator := context.allocator) -
offset += w
}
return string(bytes)
s = string(bytes)
return
}