openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_ability_runtime synced 2024-12-12 02:25:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

huangshiwei4@huawei.com

Browse Source 
Signed-off-by: huangshiwei <huangshiwei4@huawei.com>
This commit is contained in:
huangshiwei 2022-11-22 15:06:38 +08:00
parent da24397678
commit 374713141b
5 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frameworks/js/napi/app/appMgr/native_module.cpp
View File

@ -44,7 +44,7 @@ static napi_module _module = {
.nm_filename = nullptr,
.nm_register_func = Init,
.nm_modname = "napi_app_mgr",
.nm_priv = ((void *)0),
.nm_priv = (static_cast<void *>(0)),
.reserved = {0},
};
/*

2
frameworks/js/napi/featureAbility/native_module.cpp
View File

@ -51,7 +51,7 @@ static napi_module _module = {
.nm_filename = nullptr,
.nm_register_func = Init,
.nm_modname = "ability.featureAbility",
.nm_priv = ((void *)0),
.nm_priv = (static_cast<void *>(0)),
.reserved = {0}
};

2
frameworks/js/napi/particleAbility/native_module.cpp
View File

@ -47,7 +47,7 @@ static napi_module _module = {
.nm_filename = nullptr,
.nm_register_func = ParticleInit,
.nm_modname = "ability.particleAbility",
.nm_priv = ((void *)0),
.nm_priv = (static_cast<void *>(0)),
.reserved = {0}
};

2
frameworks/js/napi/wantConstant/native_module.cpp
View File

@ -41,7 +41,7 @@ static napi_module _module = {
#else
.nm_modname = "ability.wantConstant",
#endif
.nm_priv = ((void *)0),
.nm_priv = (static_cast<void *>(0)),
.reserved = {0}
};

29
frameworks/native/runtime/source_map.cpp
View File

@ -40,6 +40,13 @@ const std::string REALPATH_FLAG = "/temprary/";
const std::string ABILITYPATH_FLAG = "/entry/ets/";
const std::string NOT_FOUNDMAP = "Cannot get SourceMap info, dump raw stack:\n";
constexpr int64_t ASSET_FILE_MAX_SIZE = 20 * (1 << 20);
constexpr int32_t INDEX_TWO = 2;
constexpr int32_t INDEX_THREE = 3;
constexpr int32_t INDEX_FOUR = 4;
constexpr int32_t ANS_MAP_SIZE = 5;
constexpr int32_t NUM_TWENTY = 20;
constexpr int32_t NUM_TWENTYSIX = 26;
constexpr int32_t DIGIT_NUM = 64;
bool ModSourceMap::ReadSourceMapData(const std::string& filePath, std::string& content)
{
@ -123,7 +130,7 @@ void ModSourceMap::ExtractKeyInfo(const std::string& sourceMap, std::vector<std:
if (sourceMap[i] == '"') {
cnt++;
}
if (cnt == 2) {
if (cnt == INDEX_TWO) {
sourceKeyInfo.push_back(tempStr);
tempStr = "";
cnt = 0;
@ -247,10 +254,10 @@ void ModSourceMap::Init(const std::string& sourceMap, SourceMapData& curMapData)
// after decode, assgin each value to the position
curMapData.nowPos_.afterColumn += ans[0];
curMapData.nowPos_.sourcesVal += ans[1];
curMapData.nowPos_.beforeRow += ans[2];
curMapData.nowPos_.beforeColumn += ans[3];
if (ans.size() == 5) {
curMapData.nowPos_.namesVal += ans[4];
curMapData.nowPos_.beforeRow += ans[INDEX_TWO];
curMapData.nowPos_.beforeColumn += ans[INDEX_THREE];
if (ans.size() == ANS_MAP_SIZE) {
curMapData.nowPos_.namesVal += ans[INDEX_FOUR];
}
curMapData.afterPos_.push_back({
curMapData.nowPos_.beforeRow,
@ -309,7 +316,7 @@ uint32_t ModSourceMap::Base64CharToInt(char charCode)
// 63: /
return 63;
}
return 64;
return DIGIT_NUM;
};
bool ModSourceMap::VlqRevCode(const std::string& vStr, std::vector<int32_t>& ans)
@ -326,7 +333,7 @@ bool ModSourceMap::VlqRevCode(const std::string& vStr, std::vector<int32_t>& ans
bool continuation = 0;
for (uint32_t i = 0; i < vStr.size(); i++) {
uint32_t digit = Base64CharToInt(vStr[i]);
if (digit == 64) {
if (digit == DIGIT_NUM) {
return false;
}
continuation = digit & VLQ_CONTINUATION_BIT;
@ -429,10 +436,10 @@ std::string ModSourceMap::TranslateBySourceMap(const std::string& stackStr, ModS
j = curSourceMap.find("},", s);
uint32_t q = s;
uint32_t jj = j;
value = curSourceMap.substr(q + 1, jj - q+2);
value = curSourceMap.substr(q + 1, jj - q + INDEX_TWO);
uint32_t sources = value.find("\"sources\": [");
uint32_t names = value.find("],");
key = value.substr(sources + 20, names - sources - 26);
key = value.substr(sources + NUM_TWENTY, names - sources - NUM_TWENTYSIX);
MapData.insert(std::pair<std::string, std::string>(key, value));
}
@ -519,14 +526,14 @@ std::string ModSourceMap::GetOriginalNames(std::shared_ptr<SourceMapData> target
return sourceCode;
}
std::vector<std::string> names = targetMapData->names_;
if (names.size() % 2 != 0) {
if (names.size() % INDEX_TWO != 0) {
HILOG_ERROR("Names in sourcemap is wrong.");
return sourceCode;
}
std::string jsCode = sourceCode;
int32_t posDiff = 0;
for (uint32_t i = 0; i < names.size(); i += 2) {
for (uint32_t i = 0; i < names.size(); i += INDEX_TWO) {
auto found = jsCode.find(names[i]);
while (found != std::string::npos) {
// names_[i + 1] is the original name of names_[i]