Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-09 03:52:19 +02:00
Code Activity

Fixed UTF8 error

Browse source
This commit is contained in:
Brian Fiete 2020-06-05 10:25:22 -07:00
parent 2eac63e31c
commit b0cc8bee08
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
BeefLibs/corlib/src/Text/UTF8.bf
View file

@ -62,28 +62,34 @@ namespace System.Text
return (c, trailingBytes + 1); return (c, trailingBytes + 1);
} }
public static Result<(char32, int32)> TryDecode(char8* buf, int bufSize) public enum DecodeError
{
case BufferTooSmall(int neededSize);
case InvalidData;
}
public static Result<(char32, int32), DecodeError> TryDecode(char8* buf, int bufSize)
{ {
char32 c = *buf; char32 c = *buf;
int8 trailingBytes = UTF8.sTrailingBytesForUTF8[c]; int8 trailingBytes = UTF8.sTrailingBytesForUTF8[c];
if (trailingBytes > bufSize) if (trailingBytes > bufSize)
return .Ok(((char32)-1, trailingBytes + 1)); return .Err(.BufferTooSmall(trailingBytes + 1));
switch (trailingBytes) switch (trailingBytes)
{ {
case 1: case 1:
char8 c2 = buf[1]; char8 c2 = buf[1];
if (((uint8)c2 & 0xC0) != 0x80) if (((uint8)c2 & 0xC0) != 0x80)
return .Err; return .Err(.InvalidData);
c <<= 6; c <<= 6;
c += (int32)c2; c += (int32)c2;
case 2: case 2:
char8 c2 = buf[1]; char8 c2 = buf[1];
if (((uint8)c2 & 0xC0) != 0x80) if (((uint8)c2 & 0xC0) != 0x80)
return .Err; return .Err(.InvalidData);
char8 c3 = buf[2]; char8 c3 = buf[2];
if (((uint8)c3 & 0xC0) != 0x80) if (((uint8)c3 & 0xC0) != 0x80)
return .Err; return .Err(.InvalidData);
c <<= 6; c <<= 6;
c += (int32)c2; c += (int32)c2;
c <<= 6; c <<= 6;
@ -91,13 +97,13 @@ namespace System.Text
case 3: case 3:
char8 c2 = buf[1]; char8 c2 = buf[1];
if (((uint8)c2 & 0xC0) != 0x80) if (((uint8)c2 & 0xC0) != 0x80)
return .Err; return .Err(.InvalidData);
char8 c3 = buf[2]; char8 c3 = buf[2];
if (((uint8)c3 & 0xC0) != 0x80) if (((uint8)c3 & 0xC0) != 0x80)
return .Err; return .Err(.InvalidData);
char8 c4 = buf[3]; char8 c4 = buf[3];
if (((uint8)c4 & 0xC0) != 0x80) if (((uint8)c4 & 0xC0) != 0x80)
return .Err; return .Err(.InvalidData);
c <<= 6; c <<= 6;
c += (int32)c2; c += (int32)c2;
c <<= 6; c <<= 6;