openharmony/arkcompiler_ets_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkcompiler_ets_runtime synced 2024-10-07 16:13:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

optimize json parse

Browse Source 
Issue: https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/I7VTNV

Signed-off-by: xwcai98 <xwcai98@gmail.com>
Change-Id: Id258fb7a4577ac97798945939eb3c129b0ac493d
This commit is contained in:
xwcai98 2023-08-25 10:29:05 +08:00
parent c2c8ffeea3
commit c0eb461323
1 changed files with 35 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
ecmascript/base/json_parser.h
View File

@ -192,7 +192,7 @@ private:
return IsFastParseString(isFastString, isAscii);
}
bool ParseBackslash(CString &res)
bool ParseBackslash(std::string &res)
{
if (current_ == end_) {
return false;
@ -200,36 +200,34 @@ private:
current_++;
switch (*current_) {
case '\"':
res += "\"";
res += '\"';
break;
case '\\':
res += "\\";
res += '\\';
break;
case '/':
res += "/";
res += '/';
break;
case 'b':
res += "\b";
res += '\b';
break;
case 'f':
res += "\f";
res += '\f';
break;
case 'n':
res += "\n";
res += '\n';
break;
case 'r':
res += "\r";
res += '\r';
break;
case 't':
res += "\t";
res += '\t';
break;
case 'u': {
CVector<uint16_t> vec;
if (UNLIKELY(!ConvertStringUnicode(vec))) {
std::u16string u16Str;
if (UNLIKELY(!ConvertStringUnicode(u16Str))) {
return false;
}
std::u16string u16Str;
u16Str.assign(vec.begin(), vec.end());
res += base::StringHelper::U16stringToString(u16Str);
break;
}
@ -242,7 +240,7 @@ private:
JSTaggedValue SlowParseString()
{
end_--;
CString res;
std::string res;
while (current_ <= end_) {
if (*current_ == '\\') {
bool isLegalChar = ParseBackslash(res);
@ -254,12 +252,12 @@ private:
if (UNLIKELY(*current_ >= utf_helper::DECODE_LEAD_LOW && *current_ <= utf_helper::DECODE_LEAD_HIGH &&
*(current_ + 1) >= utf_helper::DECODE_TRAIL_LOW &&
*(current_ + 1) <= utf_helper::DECODE_TRAIL_HIGH)) {
std::u16string str(current_, current_ + 2); // 2 means twice as many bytes as normal u16string
res += ConvertToString(StringHelper::U16stringToString(str));
std::u16string_view sv(reinterpret_cast<const char16_t *>(current_), 2);
res += StringHelper::U16stringToString(sv.data());
current_ += 2; // 2 means twice as many bytes as normal u16string
} else {
std::u16string str(current_, current_ + 1);
res += ConvertToString(StringHelper::U16stringToString(str));
std::u16string_view sv(reinterpret_cast<const char16_t *>(current_), 1);
res += StringHelper::U16stringToString(sv.data());
current_++;
}
} else {
@ -285,17 +283,17 @@ private:
}
if (isFastString) {
if (isAscii) {
CString value(current_, end_);
std::string value(current_, end_);
current_ = end_;
ASSERT(value.length() <= static_cast<size_t>(UINT32_MAX));
return factory_->NewFromUtf8LiteralCompress(
reinterpret_cast<const uint8_t *>(value.c_str()), value.length()).GetTaggedValue();
}
std::u16string value(current_, end_);
std::u16string_view value(reinterpret_cast<const char16_t *>(current_), end_ - current_);
current_ = end_;
ASSERT(value.length() <= static_cast<size_t>(UINT32_MAX));
return factory_->NewFromUtf16LiteralNotCompress(
reinterpret_cast<const uint16_t *>(value.c_str()), value.length()).GetTaggedValue();
reinterpret_cast<const uint16_t *>(value.data()), value.length()).GetTaggedValue();
}
} else {
if (*end_ != '"' || current_ == end_) {
@ -307,15 +305,15 @@ private:
}
if (LIKELY(isFastString)) {
if (isAscii) {
CString value(current_, end_);
std::string value(current_, end_);
ASSERT(value.length() <= static_cast<size_t>(UINT32_MAX));
return factory_->NewFromUtf8LiteralCompress(
reinterpret_cast<const uint8_t *>(value.c_str()), value.length()).GetTaggedValue();
}
std::u16string value(current_, end_);
std::u16string_view value(reinterpret_cast<const char16_t *>(current_), end_ - current_);
ASSERT(value.length() <= static_cast<size_t>(UINT32_MAX));
return factory_->NewFromUtf16LiteralNotCompress(
reinterpret_cast<const uint16_t *>(value.c_str()), value.length()).GetTaggedValue();
reinterpret_cast<const uint16_t *>(value.data()), value.length()).GetTaggedValue();
}
}
return SlowParseString();
@ -473,7 +471,7 @@ private:
}
}
JSTaggedValue ParseLiteral(CString str, Tokens literalToken)
JSTaggedValue ParseLiteral(const std::string &str, Tokens literalToken)
{
ASSERT((str.size() - 1) <= static_cast<size_t>(UINT32_MAX));
uint32_t strLen = str.size() - 1;
@ -499,15 +497,12 @@ private:
THROW_SYNTAX_ERROR_AND_RETURN(thread_, "Unexpected Text in JSON", JSTaggedValue::Exception());
}
bool MatchText(CString str, uint32_t matchLen)
bool MatchText(const std::string &str, uint32_t matchLen)
{
const char *text = str.c_str();
uint32_t pos = 1;
while (pos <= matchLen) {
if (current_[pos] != text[pos]) {
for (uint32_t pos = 1; pos <= matchLen; ++pos) {
if (current_[pos] != str[pos]) {
return false;
}
pos++;
}
current_ += matchLen;
return true;
@ -702,33 +697,34 @@ private:
return true;
}
bool ConvertStringUnicode(CVector<uint16_t> &vec)
bool ConvertStringUnicode(std::u16string &u16Str)
{
uint32_t remainingLength = end_ - current_;
if (remainingLength < UNICODE_DIGIT_LENGTH) {
return false;
}
uint16_t res = 0;
uint32_t exponent = UNICODE_DIGIT_LENGTH;
for (uint32_t pos = 0; pos < UNICODE_DIGIT_LENGTH; pos++) {
current_++;
exponent--;
if (*current_ >= '0' && *current_ <= '9') {
res += (*current_ - '0') * pow(NUMBER_SIXTEEN, exponent);
res *= NUMBER_SIXTEEN;
res += (*current_ - '0');
} else if (*current_ >= 'a' && *current_ <= 'f') {
res += (*current_ - 'a' + NUMBER_TEN) * pow(NUMBER_SIXTEEN, exponent);
res *= NUMBER_SIXTEEN;
res += (*current_ - 'a' + NUMBER_TEN);
} else if (*current_ >= 'A' && *current_ <= 'F') {
res += (*current_ - 'A' + NUMBER_TEN) * pow(NUMBER_SIXTEEN, exponent);
res *= NUMBER_SIXTEEN;
res += (*current_ - 'A' + NUMBER_TEN);
} else {
return false;
}
}
vec.emplace_back(res);
u16Str.push_back(res);
if (*(current_ + 1) == '\\' && *(current_ + 2) == 'u') { // 2: next two chars
current_ += 2; // 2: point moves backwards by two digits
return ConvertStringUnicode(vec);
return ConvertStringUnicode(u16Str);
}
return true;
}