github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-29 22:03:40 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core: CParser::UnicodeEscape - option to escape javascript's \u, used in JSON

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@4160 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2011-11-11 10:01:15 +00:00
parent e3034d31bd
commit 809cfe6d29
4 changed files with 70 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

29
uppsrc/Core/parser.cpp
View file

@ -263,15 +263,33 @@ String CParser::ReadOneString(int delim, bool chkend) throw(Error) {
hex = ctoi(*term);
if(IsXDigit(*++term)) {
hex = 16 * hex + (*term >= 'A' ? ToUpper(*term) - 'A' + 10 : *term - '0');
if(IsXDigit(*++term)) {
hex = 16 * hex + (*term >= 'A' ? ToUpper(*term) - 'A' + 10 : *term - '0');
term++;
}
term++;
}
}
result.Cat(hex);
break;
}
case 'u':
if(uescape) {
int hex = 0;
if(IsXDigit(*++term)) {
hex = ctoi(*term);
if(IsXDigit(*++term)) {
hex = 16 * hex + (*term >= 'A' ? ToUpper(*term) - 'A' + 10 : *term - '0');
if(IsXDigit(*++term)) {
hex = 16 * hex + (*term >= 'A' ? ToUpper(*term) - 'A' + 10 : *term - '0');
if(IsXDigit(*++term)) {
hex = 16 * hex + (*term >= 'A' ? ToUpper(*term) - 'A' + 10 : *term - '0');
term++;
}
}
}
}
result.Cat(WString(hex, 1).ToString());
}
else
result.Cat(*term++);
break;
default:
if(*term >= '0' && *term <= '7') {
int oct = *term++ - '0';
@ -390,6 +408,7 @@ CParser::CParser(const char *ptr)
{
line = 1;
skipspaces = true;
uescape = false;
Spaces();
}
@ -397,6 +416,7 @@ CParser::CParser(const char *ptr, const char *fn, int line)
: term(ptr), lineptr(ptr), line(line), fn(fn)
{
skipspaces = true;
uescape = false;
Spaces();
}
@ -405,6 +425,7 @@ CParser::CParser()
term = lineptr = NULL;
line = 0;
skipspaces = true;
uescape = false;
}
void CParser::Set(const char *_ptr, const char *_fn, int _line)