mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Replace BufState with StringConsumer.

pull/13999/head
frosch 2025-03-27 20:21:42 +01:00 committed by frosch
parent 96eee0e8e4
commit 3964d053b5
1 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/3rdparty/squirrel/squirrel/sqapi.cpp vendored
View File

@ -18,6 +18,7 @@
#include "sqfuncstate.h"
#include "sqclass.h"
#include "../../../core/string_consumer.hpp"
#include "../../../string_func.h"
#include "../../../safeguards.h"
@ -1253,44 +1254,16 @@ SQRESULT sq_next(HSQUIRRELVM v,SQInteger idx)
return SQ_ERROR;
}
struct BufState{
const SQChar *buf;
SQInteger ptr;
SQInteger size;
};
char32_t buf_lexfeed(SQUserPointer file)
{
/* Convert an UTF-8 character into a char32_t */
BufState *buf = (BufState *)file;
const char *p = &buf->buf[buf->ptr];
if (buf->size < buf->ptr + 1) return 0;
/* Read the first character, and get the length based on UTF-8 specs. If invalid, bail out. */
uint len = Utf8EncodedCharLen(*p);
if (len == 0) {
buf->ptr++;
return -1;
}
/* Read the remaining bits. */
if (buf->size < buf->ptr + len) return 0;
buf->ptr += len;
/* Convert the character, and when definitely invalid, bail out as well. */
char32_t c;
if (Utf8Decode(&c, p) != len) return -1;
return c;
StringConsumer &consumer = *reinterpret_cast<StringConsumer *>(file);
return consumer.AnyBytesLeft() ? consumer.ReadUtf8(-1) : 0;
}
SQRESULT sq_compilebuffer(HSQUIRRELVM v,const SQChar *s,SQInteger size,const SQChar *sourcename,SQBool raiseerror) {
BufState buf;
buf.buf = s;
buf.size = size;
buf.ptr = 0;
return sq_compile(v, buf_lexfeed, &buf, sourcename, raiseerror);
StringConsumer consumer(s, size);
return sq_compile(v, buf_lexfeed, &consumer, sourcename, raiseerror);
}
void sq_move(HSQUIRRELVM dest,HSQUIRRELVM src,SQInteger idx)