mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r26770) -Fix [Squirrel]: in case SQChar is a char (previously everything non-Windows or non-Unicode, now everything), the lexer throws away the higher bytes of characters

This commit is contained in:
rubidium 2014-09-06 17:22:06 +00:00
parent 7a00d2e849
commit 3f9525ff0e
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/3rdparty/squirrel/squirrel/sqlexer.cpp vendored
View File

@ -9,13 +9,13 @@
#include "sqcompiler.h" #include "sqcompiler.h"
#include "sqlexer.h" #include "sqlexer.h"
#include "../../../stdafx.h"
#include "../../../string_func.h"
#define CUR_CHAR (_currdata) #define CUR_CHAR (_currdata)
#define RETURN_TOKEN(t) { _prevtoken = _curtoken; _curtoken = t; return t;} #define RETURN_TOKEN(t) { _prevtoken = _curtoken; _curtoken = t; return t;}
#define IS_EOB() (CUR_CHAR <= SQUIRREL_EOB) #define IS_EOB() (CUR_CHAR <= SQUIRREL_EOB)
#define NEXT() {Next();_currentcolumn++;} #define NEXT() {Next();_currentcolumn++;}
#define INIT_TEMP_STRING() { _longstr.resize(0);}
#define APPEND_CHAR(c) { _longstr.push_back(c);}
#define TERMINATE_BUFFER() {_longstr.push_back(_SC('\0'));}
#define ADD_KEYWORD(key,id) _keywords->NewSlot( SQString::Create(ss, _SC(#key)) ,SQInteger(id)) #define ADD_KEYWORD(key,id) _keywords->NewSlot( SQString::Create(ss, _SC(#key)) ,SQInteger(id))
SQLexer::SQLexer(){} SQLexer::SQLexer(){}
@ -24,6 +24,15 @@ SQLexer::~SQLexer()
_keywords->Release(); _keywords->Release();
} }
void SQLexer::APPEND_CHAR(LexChar c)
{
char buf[4];
int chars = Utf8Encode(buf, c);
for (int i = 0; i < chars; i++) {
_longstr.push_back(buf[i]);
}
}
void SQLexer::Init(SQSharedState *ss, SQLEXREADFUNC rg, SQUserPointer up,CompilerErrorFunc efunc,void *ed) void SQLexer::Init(SQSharedState *ss, SQLEXREADFUNC rg, SQUserPointer up,CompilerErrorFunc efunc,void *ed)
{ {
_errfunc = efunc; _errfunc = efunc;
@ -273,7 +282,7 @@ SQInteger SQLexer::GetIDType(SQChar *s)
} }
SQInteger SQLexer::ReadString(SQChar ndelim,bool verbatim) SQInteger SQLexer::ReadString(LexChar ndelim,bool verbatim)
{ {
INIT_TEMP_STRING(); INIT_TEMP_STRING();
NEXT(); NEXT();

6
src/3rdparty/squirrel/squirrel/sqlexer.h vendored
View File

@ -14,13 +14,17 @@ struct SQLexer
const SQChar *Tok2Str(SQInteger tok); const SQChar *Tok2Str(SQInteger tok);
private: private:
SQInteger GetIDType(SQChar *s); SQInteger GetIDType(SQChar *s);
SQInteger ReadString(SQChar ndelim,bool verbatim); SQInteger ReadString(LexChar ndelim,bool verbatim);
SQInteger ReadNumber(); SQInteger ReadNumber();
void LexBlockComment(); void LexBlockComment();
SQInteger ReadID(); SQInteger ReadID();
void Next(); void Next();
SQInteger _curtoken; SQInteger _curtoken;
SQTable *_keywords; SQTable *_keywords;
void INIT_TEMP_STRING() { _longstr.resize(0); }
void APPEND_CHAR(LexChar c);
void TERMINATE_BUFFER() { _longstr.push_back(_SC('\0')); }
public: public:
SQInteger _prevtoken; SQInteger _prevtoken;
SQInteger _currentline; SQInteger _currentline;