gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-24 20:12:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor readUTF8Char into charmap_ConvertNext

Browse Source
This commit is contained in:
Rangi42
2025-01-28 00:04:49 -05:00
parent 34a9c8e083
commit e49291b7cf
4 changed files with 23 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/asm/parser.y
View File

@@ -2527,10 +2527,10 @@ static size_t strlenUTF8(std::string const &str) {
size_t len = 0;
uint32_t state = 0;
for (uint32_t codep = 0; *ptr; ptr++) {
for (uint32_t codepoint = 0; *ptr; ptr++) {
uint8_t byte = *ptr;
switch (decode(&state, &codep, byte)) {
switch (decode(&state, &codepoint, byte)) {
case 1:
errorInvalidUTF8Byte(byte, "STRLEN");
state = 0;
@@ -2553,12 +2553,12 @@ static std::string strsubUTF8(std::string const &str, uint32_t pos, uint32_t len
char const *ptr = str.c_str();
size_t index = 0;
uint32_t state = 0;
uint32_t codep = 0;
uint32_t codepoint = 0;
uint32_t curPos = 1; // RGBASM strings are 1-indexed!
// Advance to starting position in source string.
while (ptr[index] && curPos < pos) {
switch (decode(&state, &codep, ptr[index])) {
switch (decode(&state, &codepoint, ptr[index])) {
case 1:
errorInvalidUTF8Byte(ptr[index], "STRSUB");
state = 0;
@@ -2583,7 +2583,7 @@ static std::string strsubUTF8(std::string const &str, uint32_t pos, uint32_t len
// Compute the result length in bytes.
while (ptr[index] && curLen < len) {
switch (decode(&state, &codep, ptr[index])) {
switch (decode(&state, &codepoint, ptr[index])) {
case 1:
errorInvalidUTF8Byte(ptr[index], "STRSUB");
state = 0;