diff --git a/OAT.xml b/OAT.xml index 21f1fb39202d9ceeaeaf95c6e48a6ad61c6b13c5..bee0fc311c9267b4430f66b38bfba80a1c92da66 100644 --- a/OAT.xml +++ b/OAT.xml @@ -65,7 +65,9 @@ Note:If the text contains special characters, please escape them according to th - + + + diff --git a/examples/akitutorials/README.md b/examples/akitutorials/README.md index 75d4424fc2ea943cec79901550ba1eb3c9febcf9..edaacf29d2875628b2bb6a88ef634a447c3e365e 100644 --- a/examples/akitutorials/README.md +++ b/examples/akitutorials/README.md @@ -417,7 +417,7 @@ class FunctionDefiner { public: ...... // 注册方法 - Binding::RegisterFunction(name, Binder::AddInvoker(func), &Binder::GetInstance()); + Binding::RegisterFunction(name, Bind#er::AddInvoker(func), &Bind#er::GetInstance()); }; } ``` diff --git a/examples/napitutorials/entry/src/main/cpp/ncpp/ffmpegcase/render/egl_core.cpp b/examples/napitutorials/entry/src/main/cpp/ncpp/ffmpegcase/render/egl_core.cpp index 737eb311a9a8f917af2abf3495e016beb0550b68..d5ebbc7dcdcf327cf3721dfebd73db8907318c47 100644 --- a/examples/napitutorials/entry/src/main/cpp/ncpp/ffmpegcase/render/egl_core.cpp +++ b/examples/napitutorials/entry/src/main/cpp/ncpp/ffmpegcase/render/egl_core.cpp @@ -281,6 +281,25 @@ bool EGLCore::EglContextInit(void* window, int width, int height) return CreateEnvironment(); } +bool EGLCore::doCreateEnvironment() +{ + if (!eglMakeCurrent(eglDisplay_, eglSurface_, eglSurface_, eglContext_)) { + OH_LOG_Print(LOG_APP, LOG_ERROR, LOG_PRINT_DOMAIN, "EGLCore", "eglMakeCurrent failed"); + eglDestroyContext(eglDisplay_, eglContext_); + eglDestroySurface(eglDisplay_, eglSurface_); + eglTerminate(eglDisplay_); + return false; + } + // Create program. + program_ = TRCreateProgram(EGLTR_VERTEX_SHADER, EGLTR_FRAGMENT_SHADER); + if (program_ == PROGRAM_ERROR) { + OH_LOG_Print(LOG_APP, LOG_ERROR, LOG_PRINT_DOMAIN, "EGLCore", "CreateProgram: unable to create program"); + return false; + } + OH_LOG_Print(LOG_APP, LOG_INFO, LOG_PRINT_DOMAIN, "EGLCore", "CreateProgram: success!"); + return true; +} + bool EGLCore::CreateEnvironment() { // Create surface. @@ -288,7 +307,7 @@ bool EGLCore::CreateEnvironment() OH_LOG_Print(LOG_APP, LOG_ERROR, LOG_PRINT_DOMAIN, "EGLCore", "eglWindow_ is null"); return false; } - eglSurface_ = eglCreateWindowSurface(eglDisplay_, eglConfig_, eglWindow_, NULL); + eglSurface_ = eglCreateWindowSurface(eglDisplay_, eglConfig_, eglWindow_, nullptr); if (eglSurface_ == nullptr) { OH_LOG_Print( LOG_APP, LOG_ERROR, LOG_PRINT_DOMAIN, "EGLCore", "eglCreateWindowSurface: unable to create"); @@ -305,21 +324,7 @@ bool EGLCore::CreateEnvironment() return false; } - if (!eglMakeCurrent(eglDisplay_, eglSurface_, eglSurface_, eglContext_)) { - OH_LOG_Print(LOG_APP, LOG_ERROR, LOG_PRINT_DOMAIN, "EGLCore", "eglMakeCurrent failed"); - eglDestroyContext(eglDisplay_, eglContext_); - eglDestroySurface(eglDisplay_, eglSurface_); - eglTerminate(eglDisplay_); - return false; - } - // Create program. - program_ = TRCreateProgram(EGLTR_VERTEX_SHADER, EGLTR_FRAGMENT_SHADER); - if (program_ == PROGRAM_ERROR) { - OH_LOG_Print(LOG_APP, LOG_ERROR, LOG_PRINT_DOMAIN, "EGLCore", "CreateProgram: unable to create program"); - return false; - } - OH_LOG_Print(LOG_APP, LOG_INFO, LOG_PRINT_DOMAIN, "EGLCore", "CreateProgram: success!"); - return true; + return doCreateEnvironment(); } void EGLCore::TRBackground() @@ -417,7 +422,7 @@ GLuint EGLCore::loadTexture() //------------------------------------------------------------ // 读文件 FILE *file = fdopen(fd_, "r"); - if (file == NULL) { + if (file == nullptr) { OH_LOG_Print(LOG_APP, LOG_INFO, LOG_PRINT_DOMAIN, "EGLCore", "ResfdExecuteCB fdopen failed!"); return false; } @@ -447,7 +452,7 @@ GLuint EGLCore::loadTexture() bmpSize = flen_ - NUM_54; unsigned char *bmpData = (unsigned char *)malloc(bmpSize); - if (bmpData == NULL) { + if (bmpData == nullptr) { OH_LOG_Print(LOG_APP, LOG_ERROR, LOG_PRINT_DOMAIN, "EGLCore", "ResfdExecuteCB malloc failed!"); fclose(file); return false; @@ -515,7 +520,7 @@ void EGLCore::DrawBmp(uint32_t fd, uint32_t foff, uint32_t flen, int& hasDraw) OH_LOG_Print(LOG_APP, LOG_INFO, LOG_PRINT_DOMAIN, "EGLCore", "Drawbmp"); FILE *file = fdopen(fd, "r"); - if (file == NULL) { + if (file == nullptr) { OH_LOG_Print(LOG_APP, LOG_INFO, LOG_PRINT_DOMAIN, "EGLCore", "ResfdExecuteCB fdopen failed!"); return; } @@ -532,7 +537,7 @@ void EGLCore::DrawBmp(uint32_t fd, uint32_t foff, uint32_t flen, int& hasDraw) return; } unsigned char *mediaData = new unsigned char[flen]; - if (mediaData == NULL) { + if (mediaData == nullptr) { OH_LOG_Print(LOG_APP, LOG_INFO, LOG_PRINT_DOMAIN, "EGLCore", "new buffer failed!"); fclose(file); return; @@ -545,11 +550,13 @@ void EGLCore::DrawBmp(uint32_t fd, uint32_t foff, uint32_t flen, int& hasDraw) int width = 0; int height = 0; unsigned char *pdata = mediaData + NUM_18; - OH_LOG_Print(LOG_APP, LOG_INFO, LOG_PRINT_DOMAIN, "EGLCore", "width: %{public}d", *((uint32_t *)pdata)); - width = *((uint32_t *)pdata); + OH_LOG_Print(LOG_APP, LOG_INFO, LOG_PRINT_DOMAIN, + "EGLCore", "width: %{public}d", *(static_case(pdata))); + width = *(static_case(pdata)); pdata = mediaData + NUM_18 + NUM_4; - OH_LOG_Print(LOG_APP, LOG_INFO, LOG_PRINT_DOMAIN, "EGLCore", "height: %{public}d", *((uint32_t *)pdata)); - height = *((uint32_t *)pdata); + OH_LOG_Print(LOG_APP, LOG_INFO, LOG_PRINT_DOMAIN, + "EGLCore", "height: %{public}d", *(static_case(pdata))); + height = *(static_case(pdata)); float vertices[] = { // positions // colors // texture coords @@ -866,14 +873,14 @@ void EGLCore::checkCompileErrors(unsigned int shader, std::string type) if (type != "PROGRAM") { glGetShaderiv(shader, GL_COMPILE_STATUS, &success); if (!success) { - glGetShaderInfoLog(shader, NUM_1024, NULL, infoLog); + glGetShaderInfoLog(shader, NUM_1024, nullptr, infoLog); OH_LOG_Print(LOG_APP, LOG_ERROR, LOG_PRINT_DOMAIN, "EGLCore", "ERROR::SHADER_COMPILATION_ERROR of type: %{public}s", type.c_str()); } } else { glGetProgramiv(shader, GL_LINK_STATUS, &success); if (!success) { - glGetProgramInfoLog(shader, NUM_1024, NULL, infoLog); + glGetProgramInfoLog(shader, NUM_1024, nullptr, infoLog); OH_LOG_Print(LOG_APP, LOG_ERROR, LOG_PRINT_DOMAIN, "EGLCore", "ERROR::PROGRAM_LINKING_ERROR of type: %{public}s", type.c_str()); } @@ -892,12 +899,12 @@ GLuint EGLCore::TRCreateProgram(const char *vertexShader, const char *fragShader unsigned int fragment = 0; // vertex shader vertex = glCreateShader(GL_VERTEX_SHADER); - glShaderSource(vertex, 1, &vertexShader, NULL); + glShaderSource(vertex, 1, &vertexShader, nullptr); glCompileShader(vertex); checkCompileErrors(vertex, "VERTEX"); // fragment Shader fragment = glCreateShader(GL_FRAGMENT_SHADER); - glShaderSource(fragment, 1, &fragShader, NULL); + glShaderSource(fragment, 1, &fragShader, nullptr); glCompileShader(fragment); checkCompileErrors(fragment, "FRAGMENT"); diff --git a/examples/napitutorials/entry/src/main/cpp/ncpp/ffmpegcase/render/plugin_render.cpp b/examples/napitutorials/entry/src/main/cpp/ncpp/ffmpegcase/render/plugin_render.cpp index a9472c9283ce9a0904716da6f55918efc10ac238..1e3b54145cb56118e63eb00597ba011a801d1485 100644 --- a/examples/napitutorials/entry/src/main/cpp/ncpp/ffmpegcase/render/plugin_render.cpp +++ b/examples/napitutorials/entry/src/main/cpp/ncpp/ffmpegcase/render/plugin_render.cpp @@ -56,7 +56,7 @@ extern "C" { } OH_LOG_Print(LOG_APP, LOG_INFO, 0xFF00, "PluginRender", "read_packet bytes[%{public}zu],bufsize[%{public}d]", bytesRead, bufSize); - return (int)bytesRead; + return static_cast(bytesRead); } int open_codec_context(int *streamIdx, AVCodecContext **decCtx, AVFormatContext *fmtCtx, @@ -65,9 +65,9 @@ extern "C" { int ret = 0; int streamIndex = 0; AVStream *st; - const AVCodec *dec = NULL; + const AVCodec *dec = nullptr; - ret = av_find_best_stream(fmtCtx, type, -1, -1, NULL, 0); + ret = av_find_best_stream(fmtCtx, type, -1, -1, nullptr, 0); if (ret < 0) { fprintf(stderr, "Could not find %s stream in input file '%s'\n", av_get_media_type_string(type), "srcfile"); @@ -98,7 +98,7 @@ extern "C" { } /* Init the decoders */ - if ((ret = avcodec_open2(*decCtx, dec, NULL)) < 0) { + if ((ret = avcodec_open2(*decCtx, dec, nullptr)) < 0) { fprintf(stderr, "Failed to open %s codec\n", av_get_media_type_string(type)); return ret; } @@ -540,19 +540,19 @@ static void RescontExecuteCB(napi_env env, void *data) int ret = 0; uint32_t fbufLen = 8192; - unsigned char *fbuf = (unsigned char *)av_malloc(fbufLen); + unsigned char *fbuf = static_cast(av_malloc(fbufLen)); char dumpBuf[256]; uint32_t fd = callbackData->fd; uint32_t foff = callbackData->foff; uint32_t flen = callbackData->flen; - AVFormatContext *formatContext = NULL; + AVFormatContext *formatContext = nullptr; AVIOContext *avioContext = nullptr; - AVCodecContext *videoDecCtx = NULL; - AVCodecContext *audioDecCtx = NULL; - AVFrame *frame = NULL; - AVPacket *pkt = NULL; + AVCodecContext *videoDecCtx = nullptr; + AVCodecContext *audioDecCtx = nullptr; + AVFrame *frame = nullptr; + AVPacket *pkt = nullptr; int videoFrameCount = 0; int audioFrameCount = 0; @@ -560,7 +560,7 @@ static void RescontExecuteCB(napi_env env, void *data) int audioStreamIdx = -1; FILE *file = fdopen(fd, "r"); - if (file == NULL) { + if (file == nullptr) { OH_LOG_Print(LOG_APP, LOG_INFO, LOG_PRINT_DOMAIN, "PluginRender", "NapiGetInfo fdopen failed!"); free(fbuf); return; @@ -574,7 +574,7 @@ static void RescontExecuteCB(napi_env env, void *data) return; } OH_LOG_Print(LOG_APP, LOG_INFO, LOG_PRINT_DOMAIN, "PluginRender", "fseek %{public}ld", foff); - avioContext = avio_alloc_context(fbuf, fbufLen, 0, (void *)file, &custom_avio_read_packet, NULL, NULL); + avioContext = avio_alloc_context(fbuf, fbufLen, 0, (void *)file, &custom_avio_read_packet, nullptr, nullptr); OH_LOG_Print(LOG_APP, LOG_INFO, LOG_PRINT_DOMAIN, "PluginRender", "avio_alloc_context"); if (!avioContext) { OH_LOG_Print(LOG_APP, LOG_INFO, LOG_PRINT_DOMAIN, "PluginRender", "avio_alloc_context failed"); @@ -594,7 +594,7 @@ static void RescontExecuteCB(napi_env env, void *data) } OH_LOG_Print(LOG_APP, LOG_INFO, LOG_PRINT_DOMAIN, "PluginRender", "avformat_alloc_context"); formatContext->pb = avioContext; - ret = avformat_open_input(&formatContext, NULL, NULL, NULL); + ret = avformat_open_input(&formatContext, nullptr, nullptr, nullptr); if (ret < 0) { OH_LOG_Print(LOG_APP, LOG_INFO, LOG_PRINT_DOMAIN, "PluginRender", "avformat_open_input err %{public}d", ret); avformat_free_context(formatContext); @@ -605,7 +605,7 @@ static void RescontExecuteCB(napi_env env, void *data) } OH_LOG_Print(LOG_APP, LOG_INFO, LOG_PRINT_DOMAIN, "PluginRender", "avformat_open_input"); // 获取流信息 - ret = avformat_find_stream_info(formatContext, NULL); + ret = avformat_find_stream_info(formatContext, nullptr); if (ret < 0) { OH_LOG_Print(LOG_APP, LOG_INFO, LOG_PRINT_DOMAIN, "PluginRender", "avformat_find_stream_info err %{public}d", ret); @@ -640,7 +640,7 @@ static void RescontExecuteCB(napi_env env, void *data) mins %= PARAM60; int ssecs = 0; int sus = 0; - av_log(NULL, AV_LOG_INFO, ", start: "); + av_log(nullptr, AV_LOG_INFO, ", start: "); ssecs = llabs(formatContext->start_time / AV_TIME_BASE); sus = llabs(formatContext->start_time % AV_TIME_BASE); diff --git a/src/cli/cmake2gn/docs/guide/FAQ.md b/src/cli/cmake2gn/docs/guide/FAQ.md index 314e089c05cf9f8b0ac20e6d809a9924b97424ca..9b32fa887d9de1a447d54414f4dcfec6c1a01c4a 100644 --- a/src/cli/cmake2gn/docs/guide/FAQ.md +++ b/src/cli/cmake2gn/docs/guide/FAQ.md @@ -46,7 +46,7 @@ ![](./../figures/curl_generate.png) -3、根据步骤2后再次发现新的错误，具体报错日志为：“clang未解析参数 /home/harmony/OpenHarmony/third_party/boringssl/src/include”，具体日志信息如下： +3、根据步骤2后再次发现新的错误，具体报错日志为：“未解析参数 /home/harmony/OpenHarmony/third_party/boringssl/src/include”，具体日志信息如下： ![](./../figures/curl_generate_log.png) @@ -98,7 +98,7 @@ harmony@Ubuntu-64:~/linshi/napi_generator_2/hdc/gn/gn-gen$./gn-gen-linux -o out/khdvk_rk3568_a -p /home/harmony/OpenHarmony -f third_party/libcoap/CMakeLists.txt -a "(-DM_LIBRARY=,-DMBEDTLS_INCLUDE_DIRS=/home/harmony/OpenHarmony/third_party/mbedtls,-DMBEDTLS_LIBRARY=/home/harmony/OpenHarmony/out/khdvk_rk3568_a/common/dsoftbus_standard/libmbedtls.z.so)" -2、根据步骤1后发现新的错误，根据日志信息显示为“clang未解析参数 -g”。 +2、根据步骤1后发现新的错误，根据日志信息显示为“未解析参数 -g”。 ![](./../figures/libcoap_not_analysis_g.png) @@ -111,7 +111,7 @@ "compileflag": "--target=, -march=，-g" } -3、根据步骤2后发现新的错误，根据日志信息显示为“clang未解析参数 -lMBEDX509_LIBRARY-NOTFOUND”。 +3、根据步骤2后发现新的错误，根据日志信息显示为“未解析参数 -lMBEDX509_LIBRARY-NOTFOUND”。 ![](./../figures/libcoap_not_analysis_mbedx509.png) @@ -124,7 +124,7 @@ "compileflag": "--target=, -march=，-g,-lMBEDX509_LIBRARY-NOTFOUND" } -4、根据步骤2后发现新的错误，根据日志信息显示为“clang未解析参数 -lMBEDCRYPTO_LIBRARY-NOTFOUND”。 +4、根据步骤2后发现新的错误，根据日志信息显示为“未解析参数 -lMBEDCRYPTO_LIBRARY-NOTFOUND”。 ![](./../figures/libcoap_not_analysis_mbedcrypto.png) diff --git a/src/cli/cmake2gn/src/src/tool.js b/src/cli/cmake2gn/src/src/tool.js index 930a7b2ac0bc5ea968aaf917a87f7866ebe7b1c4..08fab4c4fb27ddd395a2d1b4e17028314711d4f2 100644 --- a/src/cli/cmake2gn/src/src/tool.js +++ b/src/cli/cmake2gn/src/src/tool.js @@ -206,7 +206,7 @@ class Tool { } String.prototype.format = function (...args) { - var result = this; + let result = this; let reg = new RegExp('%[sd]{1}'); for (let i = 0; i < args.length; i++) { let p = result.search(reg); diff --git a/src/cli/dts2cpp/src/gen/cmd_gen.js b/src/cli/dts2cpp/src/gen/cmd_gen.js index c8b4c4ca47e082f791e40846cdc182cfe3b60998..b593b8acdb9294978c9f44e20b2267ceda436634 100644 --- a/src/cli/dts2cpp/src/gen/cmd_gen.js +++ b/src/cli/dts2cpp/src/gen/cmd_gen.js @@ -18,7 +18,7 @@ const { checkFileError } = require('./tools/common'); const { NapiLog } = require('./tools/NapiLog'); const path = require('path'); const stdio = require('stdio'); -var fs = require('fs'); +let fs = require('fs'); const { print } = require('./tools/tool'); let ops = stdio.getopt({ @@ -43,8 +43,8 @@ let ops = stdio.getopt({ NapiLog.init(ops.loglevel, path.join('' + ops.out, 'napi_gen.log')); let fileNames = ops.filename; -var pathDir = ops.directory; -var imports = ops.imports; +let pathDir = ops.directory; +let imports = ops.imports; if (fileNames === null && pathDir === null) { NapiLog.logInfo('fileNames and pathDir both cannot be empty at the same time'); } else if (pathDir !== '') { diff --git a/src/cli/dts2cpp/src/gen/generate.js b/src/cli/dts2cpp/src/gen/generate.js index 7ec8f3aa655a572e696d9bf92f2597654d89ff5e..598bd62e0b8e691fb51fce4cd200874efadaf713 100644 --- a/src/cli/dts2cpp/src/gen/generate.js +++ b/src/cli/dts2cpp/src/gen/generate.js @@ -25,7 +25,7 @@ const { NumberIncrease, jsonCfgList } = require('./tools/common'); const os = require('os'); const path = require('path'); const { NapiLog } = require('./tools/NapiLog'); -var fs = require('fs'); +let fs = require('fs'); let moduleHTemplete = `\ #ifndef IMPL_[impl_name_upper]_H @@ -154,7 +154,7 @@ let implCppTemplete = `\ [include_configure_hCode] [implCpp_detail] `; -var genFileList = []; +let genFileList = []; function deleteFolder(folderPath) { if (fs.existsSync(folderPath)) { @@ -255,7 +255,7 @@ function generateAll(structOfTs, destDir, moduleName, numberType, jsonCfg) { jsonCfgList.pop(); let numberUsing = ''; - var numbertype = 'uint32_t'; + let numbertype = 'uint32_t'; if (numberType !== '' && (numberType !== undefined && numberType !== null)) { numbertype = numberType; } diff --git a/src/cli/dts2cpp/src/gen/generate/function_async.js b/src/cli/dts2cpp/src/gen/generate/function_async.js index 7d62227349ea10ba7fa0c0c496318d0467b8e395..58795c4b33e3219906a032baa9a0ee02bbf4f90a 100644 --- a/src/cli/dts2cpp/src/gen/generate/function_async.js +++ b/src/cli/dts2cpp/src/gen/generate/function_async.js @@ -89,7 +89,7 @@ void %s%sSetCbValue(%s) `; function removeEndlineEnter(value) { - for (var i = value.length; i > 0; i--) { + for (let i = value.length; i > 0; i--) { let len = value.length; if (value.substring(len - 1, len) === '\n' || value.substring(len - 1, len) === ' ') { value = value.substring(0, len - 1); diff --git a/src/cli/dts2cpp/src/gen/generate/function_direct.js b/src/cli/dts2cpp/src/gen/generate/function_direct.js index 816595eb02ce5aeddfec63715a5caddfc712c970..700d3c08922c03ca07828dfe18c7814d2077ac31 100644 --- a/src/cli/dts2cpp/src/gen/generate/function_direct.js +++ b/src/cli/dts2cpp/src/gen/generate/function_direct.js @@ -59,7 +59,7 @@ bool %s%s(%s) `; function removeEndlineEnter(value) { - for (var i = value.length; i > 0; i--) { + for (let i = value.length; i > 0; i--) { let len = value.length; if (value.substring(len - 1, len) === '\n' || value.substring(len - 1, len) === ' ') { value = value.substring(0, len - 1); diff --git a/src/cli/dts2cpp/src/gen/generate/function_onoff.js b/src/cli/dts2cpp/src/gen/generate/function_onoff.js index 9585fb0cb8073ec340325deb8741508498ce7893..c8766e9b6dff3eb4647c56abcfbfb618a4648135 100644 --- a/src/cli/dts2cpp/src/gen/generate/function_onoff.js +++ b/src/cli/dts2cpp/src/gen/generate/function_onoff.js @@ -111,7 +111,7 @@ function isOnTypeExist(onTypeList, newType) { return false; } - for (var i in onTypeList) { + for (let i in onTypeList) { if (onTypeList[i] === newType) { return true; } diff --git a/src/cli/dts2cpp/src/gen/generate/function_sync.js b/src/cli/dts2cpp/src/gen/generate/function_sync.js index 42bbc9f2806fb636d0b57616ca851daec98ced4d..acf2a1baf1f0482c68e3b04b7d07ac31139fa487 100644 --- a/src/cli/dts2cpp/src/gen/generate/function_sync.js +++ b/src/cli/dts2cpp/src/gen/generate/function_sync.js @@ -83,7 +83,7 @@ bool %s%sReturn(%s) `; function removeEndlineEnter(value) { - for (var i = value.length; i > 0; i--) { + for (let i = value.length; i > 0; i--) { let len = value.length; if (value.substring(len - 1, len) === '\n' || value.substring(len - 1, len) === ' ') { value = value.substring(0, len - 1); diff --git a/src/cli/dts2cpp/src/gen/generate/return_generate.js b/src/cli/dts2cpp/src/gen/generate/return_generate.js index b50f0650d874b4b8209d2c5a1caf39e850afaad2..04f007ef1bf5defddd6dc1ea31a07ff6dfff9db7 100644 --- a/src/cli/dts2cpp/src/gen/generate/return_generate.js +++ b/src/cli/dts2cpp/src/gen/generate/return_generate.js @@ -134,7 +134,7 @@ function c2JsForEnum(deep, type, value, dest, propertyName) { } function cToJs(value, type, dest, deep = 1, optional, enumType = 0) { - var propertyName = delPrefix(value); + let propertyName = delPrefix(value); if (checkRetIsUndefined(type)) { NapiLog.logError('type is invalid!'); return undefined; diff --git a/src/cli/dts2cpp/src/gen/main.js b/src/cli/dts2cpp/src/gen/main.js index 5fcd479ba4dc530a6d7c3ed69591e96b70a633a7..18fda5458027fdf2b428aca03c6bf91f2a222f4e 100644 --- a/src/cli/dts2cpp/src/gen/main.js +++ b/src/cli/dts2cpp/src/gen/main.js @@ -17,7 +17,7 @@ const { analyzeFileRaw } = require('./analyzeRaw'); const { generateAll } = require('./generate'); const { NapiLog } = require('./tools/NapiLog'); const re = require('./tools/re'); -var fs = require('fs'); +let fs = require('fs'); function doGenerate(ifname, destdir, imports, numberType, jsonCfg) { // step1: analyze file diff --git a/src/cli/dts2cpp/src/gen/tools/FileRW.js b/src/cli/dts2cpp/src/gen/tools/FileRW.js index 823228e7d70a338cbef2640e25fe339394958d20..3ce42bf00f5d59537529540dc1ff98a5e763146b 100644 --- a/src/cli/dts2cpp/src/gen/tools/FileRW.js +++ b/src/cli/dts2cpp/src/gen/tools/FileRW.js @@ -15,8 +15,8 @@ const fs = require('fs'); function utf8ArrayToStr(array) { - var out, i, len, c; - var char2, char3; + let out, i, len, c; + let char2, char3; out = ''; len = array.length; diff --git a/src/cli/dts2cpp/src/gen/tools/NapiLog.js b/src/cli/dts2cpp/src/gen/tools/NapiLog.js index 188f24040a729a383685402e63de831704990a45..dc732dd40469c2666566294f42d261700ee95eb0 100644 --- a/src/cli/dts2cpp/src/gen/tools/NapiLog.js +++ b/src/cli/dts2cpp/src/gen/tools/NapiLog.js @@ -32,9 +32,9 @@ NapiLog.LEV_DEBUG = 2; NapiLog.LEV_INFO = 3; const LEV_STR = ['[NON]', '[ERR]', '[DBG]', '[INF]']; -var logLevel = NapiLog.LEV_ERROR; -var logFileName = null; -var logResultMessage = [true, '']; +let logLevel = NapiLog.LEV_ERROR; +let logFileName = null; +let logResultMessage = [true, '']; function getDateString() { let nowDate = new Date(); diff --git a/src/cli/dts2cpp/src/gen/tools/common.js b/src/cli/dts2cpp/src/gen/tools/common.js index e1dcb7f7fd16760d005176300f63c65d2befd73f..a782e1f6a3c3e3aa7df3998cd44bb079065dc30a 100644 --- a/src/cli/dts2cpp/src/gen/tools/common.js +++ b/src/cli/dts2cpp/src/gen/tools/common.js @@ -80,7 +80,7 @@ InterfaceList.getValue = function (name) { for (let i in ifs) { let vv = ifs[i]; if (ifs[i].name === name) { - var hasProperty = Object.prototype.hasOwnProperty.call(ifs[i].body, 'allProperties'); + let hasProperty = Object.prototype.hasOwnProperty.call(ifs[i].body, 'allProperties'); if (hasProperty) { return ifs[i].body.allProperties.values; } else { @@ -151,7 +151,7 @@ TypeList.getValue = function (name) { let ifs = TypeList.types[TypeList.types.length - 1]; for (let i in ifs) { if (ifs[i].name === name) { - var hasProperty = Object.prototype.hasOwnProperty.call(ifs[i].body, 'allProperties'); + let hasProperty = Object.prototype.hasOwnProperty.call(ifs[i].body, 'allProperties'); if (hasProperty) { return ifs[i].body.allProperties.values; } else { @@ -335,7 +335,7 @@ function getMapType(type) { function getUnionType(type) { type = type.replace(/\s*/g, ''); - var typeArr = new Array(); + let typeArr = new Array(); typeArr = type.split('|'); return typeArr; } diff --git a/src/cli/dts2cpp/src/gen/tools/tool.js b/src/cli/dts2cpp/src/gen/tools/tool.js index ca51073fd17d2e4acb70adffabe71f4f92292202..adf019e02706c2401d50cc69348d8b427f0abb02 100644 --- a/src/cli/dts2cpp/src/gen/tools/tool.js +++ b/src/cli/dts2cpp/src/gen/tools/tool.js @@ -35,7 +35,7 @@ function print(...args) { } String.prototype.format = function (...args) { - var result = this; + let result = this; let reg = new RegExp('%[sd]{1}'); for (let i = 0; i < args.length; i++) { let p = result.search(reg); diff --git a/src/cli/dts2ets/appCodeGen/src/app_code_gen.js b/src/cli/dts2ets/appCodeGen/src/app_code_gen.js index bf5f2995892655cb9df585cc8e7ffeb159c5dd42..4c53a65824bcb9023abf671bd8ce9fbb309ea9d5 100644 --- a/src/cli/dts2ets/appCodeGen/src/app_code_gen.js +++ b/src/cli/dts2ets/appCodeGen/src/app_code_gen.js @@ -19,7 +19,7 @@ const { checkFileError } = require('./tools/common'); const { NapiLog } = require('./tools/NapiLog'); const path = require('path'); const stdio = require('stdio'); -var fs = require('fs'); +let fs = require('fs'); const { print } = require('./tools/tool'); let ops = stdio.getopt({ diff --git a/src/cli/dts2ets/appCodeGen/src/generate.js b/src/cli/dts2ets/appCodeGen/src/generate.js index a61414e418e42c746598a749c52e0cea29eb8ad0..f0743a7bbe062272952db96d2358c0dc2cb0f81f 100644 --- a/src/cli/dts2ets/appCodeGen/src/generate.js +++ b/src/cli/dts2ets/appCodeGen/src/generate.js @@ -31,7 +31,7 @@ const MAXINT = 100; const SUBSTREND = 11; const LENGTH = 5; const MODTWO = 2; -var fs = require('fs'); +let fs = require('fs'); let indexEtsTemplete = `\ import napitest from '@ohos.[import_module_name]'; @@ -93,11 +93,11 @@ function analyzeJsonCfg(jsonCfg) { // 随机生成字符串 function generateRandomString(length) { - var result = ''; - var characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; - var charactersLength = characters.length; + let result = ''; + let characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; + let charactersLength = characters.length; - for (var i = 0; i < length; i++) { + for (let i = 0; i < length; i++) { result += characters.charAt(Math.floor(Math.random() * charactersLength)); } diff --git a/src/cli/dts2ets/appCodeGen/src/main.js b/src/cli/dts2ets/appCodeGen/src/main.js index 46b44811ebec76f8438c9b34235c285f8dab3128..61a0654359323db8f60a3576a4d93a9c0eab9da6 100644 --- a/src/cli/dts2ets/appCodeGen/src/main.js +++ b/src/cli/dts2ets/appCodeGen/src/main.js @@ -16,7 +16,7 @@ const { analyzeFile } = require('./analyze'); const { generateAppCode } = require('./generate'); const { NapiLog } = require('./tools/NapiLog'); const re = require('./tools/re'); -var fs = require('fs'); +let fs = require('fs'); function doGenerate(ifname, destdir, jsonCfg) { // step1: analyze file diff --git a/src/cli/dts2ets/appCodeGen/src/tools/FileRW.js b/src/cli/dts2ets/appCodeGen/src/tools/FileRW.js index 823228e7d70a338cbef2640e25fe339394958d20..3ce42bf00f5d59537529540dc1ff98a5e763146b 100644 --- a/src/cli/dts2ets/appCodeGen/src/tools/FileRW.js +++ b/src/cli/dts2ets/appCodeGen/src/tools/FileRW.js @@ -15,8 +15,8 @@ const fs = require('fs'); function utf8ArrayToStr(array) { - var out, i, len, c; - var char2, char3; + let out, i, len, c; + let char2, char3; out = ''; len = array.length; diff --git a/src/cli/dts2ets/appCodeGen/src/tools/NapiLog.js b/src/cli/dts2ets/appCodeGen/src/tools/NapiLog.js index 3b8496d410333e4e629924a4011c1a6b8e4549cc..4814e6ebff3749a10dfe472ac7033f1eeb487167 100644 --- a/src/cli/dts2ets/appCodeGen/src/tools/NapiLog.js +++ b/src/cli/dts2ets/appCodeGen/src/tools/NapiLog.js @@ -32,9 +32,9 @@ NapiLog.LEV_DEBUG = 2; NapiLog.LEV_INFO = 3; const LEV_STR = ['[NON]', '[ERR]', '[DBG]', '[INF]']; -var logLevel = NapiLog.LEV_ERROR; -var logFileName = null; -var logResultMessage = [true, '']; +let logLevel = NapiLog.LEV_ERROR; +let logFileName = null; +let logResultMessage = [true, '']; function getDateString() { let nowDate = new Date(); diff --git a/src/cli/dts2ets/appCodeGen/src/tools/common.js b/src/cli/dts2ets/appCodeGen/src/tools/common.js index 5f2634c53f21e23aa4657bc42275f79e37326f24..46739bddc5f7d11361d952b2eb928b5b5d3c98ac 100644 --- a/src/cli/dts2ets/appCodeGen/src/tools/common.js +++ b/src/cli/dts2ets/appCodeGen/src/tools/common.js @@ -79,7 +79,7 @@ InterfaceList.getValue = function (name) { for (let i in ifs) { let vv = ifs[i]; if (ifs[i].name === name) { - var hasProperty = Object.prototype.hasOwnProperty.call(ifs[i].body, 'allProperties'); + let hasProperty = Object.prototype.hasOwnProperty.call(ifs[i].body, 'allProperties'); if (hasProperty) { return ifs[i].body.allProperties.values; } else { @@ -150,7 +150,7 @@ TypeList.getValue = function (name) { let ifs = TypeList.types[TypeList.types.length - 1]; for (let i in ifs) { if (ifs[i].name === name) { - var hasProperty = Object.prototype.hasOwnProperty.call(ifs[i].body, 'allProperties'); + let hasProperty = Object.prototype.hasOwnProperty.call(ifs[i].body, 'allProperties'); if (hasProperty) { return ifs[i].body.allProperties.values; } else { @@ -334,7 +334,7 @@ function getMapType(type) { function getUnionType(type) { type = type.replace(/\s*/g, ''); - var typeArr = new Array(); + let typeArr = new Array(); typeArr = type.split('|'); return typeArr; } diff --git a/src/cli/dts2ets/appCodeGen/src/tools/tool.js b/src/cli/dts2ets/appCodeGen/src/tools/tool.js index 1894512b6a7dc2c515dd75b90a4582a1467011d7..47a5443ffeb3403a0d29b50f5a5c2616c37b9409 100644 --- a/src/cli/dts2ets/appCodeGen/src/tools/tool.js +++ b/src/cli/dts2ets/appCodeGen/src/tools/tool.js @@ -35,7 +35,7 @@ function print(...args) { } String.prototype.format = function (...args) { - var result = this; + let result = this; let reg = new RegExp('%[sd]{1}'); for (let i = 0; i < args.length; i++) { let p = result.search(reg); diff --git a/src/cli/h2dts/src/tsGen/cmd_gen.js b/src/cli/h2dts/src/tsGen/cmd_gen.js index 88422f137c1bed1064165bbfcf8c9b133dadba5a..cfc415acc8cd8ffa983229800411180832dfb420 100644 --- a/src/cli/h2dts/src/tsGen/cmd_gen.js +++ b/src/cli/h2dts/src/tsGen/cmd_gen.js @@ -17,7 +17,7 @@ const tsMain = require('./tsMain'); const { NapiLog } = require('./tools/NapiLog'); const path = require('path'); const stdio = require('stdio'); -var fs = require('fs'); +let fs = require('fs'); const util = require('util'); let ops = stdio.getopt({ @@ -39,7 +39,7 @@ catch (err) { NapiLog.init(ops.loglevel, path.join('' + ops.out, 'napi_gen.log')); let fileNames = ops.filename; -var pathDir = ops.directory; +let pathDir = ops.directory; if (fileNames == null && pathDir == null) { NapiLog.logInfo('fileNames and pathDir both cannot be empty at the same time'); } else if (pathDir !== '') { diff --git a/src/cli/h2dts/src/tsGen/tools/FileRW.js b/src/cli/h2dts/src/tsGen/tools/FileRW.js index 648b691862145ba6bcf482baf2eec86e177c928d..96be7954e1aeefad7b4b22951d65f8c1d5ea9390 100644 --- a/src/cli/h2dts/src/tsGen/tools/FileRW.js +++ b/src/cli/h2dts/src/tsGen/tools/FileRW.js @@ -15,8 +15,8 @@ const fs = require('fs'); function utf8ArrayToStr(array) { - var out, i, len, c; - var char2, char3; + let out, i, len, c; + let char2, char3; out = ''; len = array.length; diff --git a/src/cli/h2dts/src/tsGen/tools/NapiLog.js b/src/cli/h2dts/src/tsGen/tools/NapiLog.js index 135741d304574a765f57b2982ea14e24a6b87caf..66e076b746914b18661ac67f5eb34e8fe6fdb461 100644 --- a/src/cli/h2dts/src/tsGen/tools/NapiLog.js +++ b/src/cli/h2dts/src/tsGen/tools/NapiLog.js @@ -34,9 +34,9 @@ NapiLog.LEV_DEBUG = 2; NapiLog.LEV_INFO = 3; const LEV_STR = ['[NON]', '[ERR]', '[DBG]', '[INF]']; -var logLevel = NapiLog.LEV_ERROR; -var logFileName = null; -var logResultMessage = [true, '']; +let logLevel = NapiLog.LEV_ERROR; +let logFileName = null; +let logResultMessage = [true, '']; function getDateString() { let nowDate = new Date(); diff --git a/src/cli/h2dts/src/tsGen/tsMain.js b/src/cli/h2dts/src/tsGen/tsMain.js index af01f2c034f5be488deae243da6da76b094d5bdb..a4a60461cb8abc552e95ae5438ce3c814e74327c 100644 --- a/src/cli/h2dts/src/tsGen/tsMain.js +++ b/src/cli/h2dts/src/tsGen/tsMain.js @@ -53,7 +53,7 @@ function createNameSpaceInfo(parseNameSpaceInfo) { function analyzeNameSpace(rootInfo, parseResult) { let parseNameSpaces = parseResult.namespaces; - for (var i = 0; i < parseNameSpaces.length; ++i) { + for (let i = 0; i < parseNameSpaces.length; ++i) { let nameSpaceInfo = createNameSpaceInfo(parseNameSpaces[i]); rootInfo.namespaces.push(nameSpaceInfo); } @@ -167,7 +167,7 @@ function createFuncInfo(parseFuncInfo, isClassFunc) { } let parseParams = parseFuncInfo.parameters; - for (var i = 0; i < parseParams.length; ++i) { + for (let i = 0; i < parseParams.length; ++i) { let param = createParam(parseParams[i]); funcInfo.params.push(param); } @@ -183,7 +183,7 @@ function createFuncInfo(parseFuncInfo, isClassFunc) { } function putFuncIntoNamespace(funcInfo, namespaces) { - for (var i = 0; i < namespaces.length; ++i) { + for (let i = 0; i < namespaces.length; ++i) { if (namespaces[i].name === funcInfo.namespace) { namespaces[i].functions.push(funcInfo); return; @@ -194,7 +194,7 @@ function putFuncIntoNamespace(funcInfo, namespaces) { function analyzeRootFunction(rootInfo, parseResult) { let parseFunctions = parseResult.functions; - for (var i = 0; i < parseFunctions.length; ++i) { + for (let i = 0; i < parseFunctions.length; ++i) { let funcInfo = createFuncInfo(parseFunctions[i], false); if (parseFunctions[i].namespace !== '') { // function in namespace @@ -208,7 +208,7 @@ function analyzeRootFunction(rootInfo, parseResult) { function createProperties(parseProperties) { let propertyList = []; - for (var i = 0; i < parseProperties.length; ++i) { + for (let i = 0; i < parseProperties.length; ++i) { let property = {}; property.name = parseProperties[i].name; property.type = getJsTypeFromC(parseProperties[i].raw_type, parseProperties[i]); @@ -219,7 +219,7 @@ function createProperties(parseProperties) { function createClassFunctions(parseFuncs) { let funcList = []; - for (var i = 0; i < parseFuncs.length; ++i) { + for (let i = 0; i < parseFuncs.length; ++i) { let funcInfo = createFuncInfo(parseFuncs[i], true); funcList.push(funcInfo); } @@ -243,7 +243,7 @@ function createClassInfo(parseClassInfo) { } function putClassIntoNamespace(classInfo, namespaces) { - for (var i = 0; i < namespaces.length; ++i) { + for (let i = 0; i < namespaces.length; ++i) { if (namespaces[i].name === classInfo.namespace) { namespaces[i].classes.push(classInfo); return; @@ -255,7 +255,7 @@ function putClassIntoNamespace(classInfo, namespaces) { function analyzeClasses(rootInfo, parseResult) { let parseClasses = parseResult.classes; - for (var className in parseClasses) { + for (let className in parseClasses) { let classInfo = createClassInfo(parseClasses[className]); if (classInfo.namespace !== '') { // class in namespace @@ -269,7 +269,7 @@ function analyzeClasses(rootInfo, parseResult) { function getTab(tabLv) { let tab = ''; - for (var i = 0; i < tabLv; ++i) { + for (let i = 0; i < tabLv; ++i) { tab += ' '; } return tab; @@ -279,7 +279,7 @@ function genFunction(func, tabLv, needDeclare = false) { let tab = getTab(tabLv); let funcPrefix = func.isClassFunc ? '' : 'function '; let funcParams = ''; - for (var i = 0; i < func.params.length; ++i) { + for (let i = 0; i < func.params.length; ++i) { funcParams += i > 0 ? ', ' : ''; funcParams += func.params[i].name + ': ' + func.params[i].type; } @@ -292,10 +292,10 @@ function genClass(classInfo, tabLv, needDeclare = false) { let declareStr = needDeclare ? 'declare ' : ''; let tsClass = tab + declareStr + 'class ' + classInfo.name + ' {\n'; let tab1 = getTab(tabLv + 1); - for (var i = 0; i < classInfo.properties.length; ++i) { + for (let i = 0; i < classInfo.properties.length; ++i) { tsClass += util.format('%s%s: %s;\n', tab1, classInfo.properties[i].name, classInfo.properties[i].type); } - for (var i = 0; i < classInfo.functions.length; ++i) { + for (let i = 0; i < classInfo.functions.length; ++i) { tsClass += genFunction(classInfo.functions[i], tabLv + 1); } tsClass += tab + '}\n'; @@ -305,10 +305,10 @@ function genClass(classInfo, tabLv, needDeclare = false) { function genNamespace(namespace, tabLv) { let tab = getTab(tabLv); let tsNamespace = tab + util.format('declare namespace %s {\n', namespace.name); - for (var i = 0; i < namespace.functions.length; ++i) { + for (let i = 0; i < namespace.functions.length; ++i) { tsNamespace += genFunction(namespace.functions[i], tabLv + 1); } - for (var i = 0; i < namespace.classes.length; ++i) { + for (let i = 0; i < namespace.classes.length; ++i) { tsNamespace += genClass(namespace.classes[i], tabLv + 1); } tsNamespace += tab + '}\n'; @@ -318,15 +318,15 @@ function genNamespace(namespace, tabLv) { function genTsContent(rootInfo) { let tsContent = rootInfo.needCallback ? 'import { AsyncCallback, Callback } from \'./../basic\';\n\n' : ''; - for (var i = 0; i < rootInfo.classes.length; ++i) { + for (let i = 0; i < rootInfo.classes.length; ++i) { tsContent += genClass(rootInfo.classes[i], 0, true); } - for (var i = 0; i < rootInfo.namespaces.length; ++i) { + for (let i = 0; i < rootInfo.namespaces.length; ++i) { tsContent += genNamespace(rootInfo.namespaces[i], 0); } - for (var i = 0; i < rootInfo.functions.length; ++i) { + for (let i = 0; i < rootInfo.functions.length; ++i) { tsContent += genFunction(rootInfo.functions[i], 0, true); } diff --git a/src/cli/h2dtscpp/src/src/tools/NapiLog.js b/src/cli/h2dtscpp/src/src/tools/NapiLog.js index d4a5cb8456cf70a219f2b7383bcd3a62bac7e488..dfe93b719ea239774d695f3818e6a98804f36efb 100644 --- a/src/cli/h2dtscpp/src/src/tools/NapiLog.js +++ b/src/cli/h2dtscpp/src/src/tools/NapiLog.js @@ -32,9 +32,9 @@ NapiLog.LEV_DEBUG = 2; NapiLog.LEV_INFO = 3; const LEV_STR = ['[NON]', '[ERR]', '[DBG]', '[INF]']; -var logLevel = NapiLog.LEV_ERROR; -var logFileName = null; -var logResultMessage = [true, '']; +let logLevel = NapiLog.LEV_ERROR; +let logFileName = null; +let logResultMessage = [true, '']; function getDateString() { let nowDate = new Date(); diff --git a/src/cli/h2dtscpp/src/src/tools/common.js b/src/cli/h2dtscpp/src/src/tools/common.js index daa18ce23a956add162c075ccf7b0efb544fb7b0..dc6a47eb907070579897821cbecbfe6be71083da 100644 --- a/src/cli/h2dtscpp/src/src/tools/common.js +++ b/src/cli/h2dtscpp/src/src/tools/common.js @@ -25,7 +25,7 @@ InterfaceList.getValue = function (name) { let ifs = InterfaceList.interfacess_; for (let i in ifs) { if (ifs[i].name === name) { - var hasProperty = Object.prototype.hasOwnProperty.call(ifs[i].body, 'allProperties'); + let hasProperty = Object.prototype.hasOwnProperty.call(ifs[i].body, 'allProperties'); if (hasProperty) { return ifs[i].body.allProperties.values; } else { @@ -59,7 +59,7 @@ TypeList.getValue = function (name) { let ifs = TypeList.types; for (let i in ifs) { if (ifs[i].name === name) { - var hasProperty = Object.prototype.hasOwnProperty.call(ifs[i].body, 'allProperties'); + let hasProperty = Object.prototype.hasOwnProperty.call(ifs[i].body, 'allProperties'); if (hasProperty) { return ifs[i].body.allProperties.values; } else { diff --git a/src/cli/h2dtscpp/src/src/tsGen/tsMain.js b/src/cli/h2dtscpp/src/src/tsGen/tsMain.js index 5050b81b41e865933e5d25310ded3f9f1315214f..d02bc7ee039fcb8ba275fb72ce9b9b605d566024 100644 --- a/src/cli/h2dtscpp/src/src/tsGen/tsMain.js +++ b/src/cli/h2dtscpp/src/src/tsGen/tsMain.js @@ -62,7 +62,7 @@ function createNameSpaceInfo(parseNameSpaceInfo) { function analyzeNameSpace(rootInfo, parseResult) { let parseNameSpaces = parseResult.namespaces; - for (var i = 0; i < parseNameSpaces.length; ++i) { + for (let i = 0; i < parseNameSpaces.length; ++i) { let nameSpaceInfo = createNameSpaceInfo(parseNameSpaces[i]); rootInfo.namespaces.push(nameSpaceInfo); } @@ -190,7 +190,7 @@ function createFuncInfo(parseFuncInfo, isClassFunc) { } let parseParams = parseFuncInfo.parameters; - for (var i = 0; i < parseParams.length; ++i) { + for (let i = 0; i < parseParams.length; ++i) { let param = createParam(parseParams[i]); funcInfo.params.push(param); } @@ -206,7 +206,7 @@ function createFuncInfo(parseFuncInfo, isClassFunc) { } function putFuncIntoNamespace(funcInfo, namespaces) { - for (var i = 0; i < namespaces.length; ++i) { + for (let i = 0; i < namespaces.length; ++i) { if (namespaces[i].name === funcInfo.namespace) { namespaces[i].functions.push(funcInfo); return; @@ -226,7 +226,7 @@ function analyzeRootTypeDef(rootInfo, parseResult) { function analyzeRootFunction(rootInfo, parseResult) { let parseFunctions = parseResult.functions; - for (var i = 0; i < parseFunctions.length; ++i) { + for (let i = 0; i < parseFunctions.length; ++i) { // 普通方法生成模板 let funcInfo = createFuncInfo(parseFunctions[i], false); if (parseFunctions[i].namespace !== '') { @@ -241,7 +241,7 @@ function analyzeRootFunction(rootInfo, parseResult) { function createProperties(parseProperties) { let propertyList = []; - for (var i = 0; i < parseProperties.length; ++i) { + for (let i = 0; i < parseProperties.length; ++i) { let property = {}; property.name = parseProperties[i].name; property.type = getJsTypeFromC(parseProperties[i].type, parseProperties[i]); @@ -252,7 +252,7 @@ function createProperties(parseProperties) { function createClassFunctions(parseFuncs) { let funcList = []; - for (var i = 0; i < parseFuncs.length; ++i) { + for (let i = 0; i < parseFuncs.length; ++i) { let funcInfo = createFuncInfo(parseFuncs[i], true); funcList.push(funcInfo); } @@ -276,7 +276,7 @@ function createClassInfo(parseClassInfo) { } function putClassIntoNamespace(classInfo, namespaces) { - for (var i = 0; i < namespaces.length; ++i) { + for (let i = 0; i < namespaces.length; ++i) { if (namespaces[i].name === classInfo.namespace) { namespaces[i].classes.push(classInfo); return; @@ -287,7 +287,7 @@ function putClassIntoNamespace(classInfo, namespaces) { function analyzeClasses(rootInfo, parseResult) { let parseClasses = parseResult.classes; - for (var className in parseClasses) { + for (let className in parseClasses) { let classInfo = createClassInfo(parseClasses[className]); if (classInfo.namespace !== '') { // class in namespace @@ -301,7 +301,7 @@ function analyzeClasses(rootInfo, parseResult) { function getTab(tabLv) { let tab = ''; - for (var i = 0; i < tabLv; ++i) { + for (let i = 0; i < tabLv; ++i) { tab += ' '; } return tab; @@ -311,7 +311,7 @@ function genFunction(func, tabLv, dtsDeclare) { let tab = getTab(tabLv); let funcPrefix = func.isClassFunc ? '' : 'export const '; let funcParams = ''; - for (var i = 0; i < func.params.length; ++i) { + for (let i = 0; i < func.params.length; ++i) { funcParams += i > 0 ? ', ' : ''; funcParams += func.params[i].name + ': ' + func.params[i].type; } @@ -352,7 +352,7 @@ function genClass(classInfo, tabLv, dtsDeclare, needDeclare = false) { let tsClass = tab + 'export ' + 'interface ' + classInfo.name + ' {\n'; let tab1 = getTab(tabLv + 1); let interfaceBody = []; - for (var i = 0; i < classInfo.properties.length; ++i) { + for (let i = 0; i < classInfo.properties.length; ++i) { let myType = classInfo.properties[i].type; if (!isJsBasicType(myType)) { myType += ' | null'; @@ -387,10 +387,10 @@ function genClass(classInfo, tabLv, dtsDeclare, needDeclare = false) { function genNamespace(namespace, tabLv, dtsDeclare) { let tab = getTab(tabLv); let tsNamespace = tab + util.format('declare namespace %s {\n', namespace.name); - for (var i = 0; i < namespace.functions.length; ++i) { + for (let i = 0; i < namespace.functions.length; ++i) { tsNamespace += genFunction(namespace.functions[i], tabLv + 1, dtsDeclare)[0]; } - for (var i = 0; i < namespace.classes.length; ++i) { + for (let i = 0; i < namespace.classes.length; ++i) { tsNamespace += genClass(namespace.classes[i], tabLv + 1, dtsDeclare); } tsNamespace += tab + '}\n'; @@ -433,15 +433,15 @@ function genTsContent(rootInfo, dtsDeclare) { // gen typedefs tsContent += genType(rootInfo.typedefs, 0); - for (var i = 0; i < rootInfo.classes.length; ++i) { + for (let i = 0; i < rootInfo.classes.length; ++i) { tsContent += genClass(rootInfo.classes[i], 0, dtsDeclare, true); } - for (var i = 0; i < rootInfo.namespaces.length; ++i) { + for (let i = 0; i < rootInfo.namespaces.length; ++i) { tsContent += genNamespace(rootInfo.namespaces[i], 0, dtsDeclare); } - for (var i = 0; i < rootInfo.functions.length; ++i) { + for (let i = 0; i < rootInfo.functions.length; ++i) { tsContent += genFunction(rootInfo.functions[i], 0, dtsDeclare)[0]; } diff --git a/src/cli/h2sa/src/gen/analyze.js b/src/cli/h2sa/src/gen/analyze.js index d8c415573131202a4927f699f9b508db60fa7b63..89af5dbb6d9639dfc6d4d80ba99e266ee41a99d1 100644 --- a/src/cli/h2sa/src/gen/analyze.js +++ b/src/cli/h2sa/src/gen/analyze.js @@ -70,7 +70,7 @@ function createFuncInfo(parseFuncInfo) { funcInfo.name = parseFuncInfo.name; let parseParams = parseFuncInfo.parameters; - for (var i = 0; i < parseParams.length; ++i) { + for (let i = 0; i < parseParams.length; ++i) { let param = createParam(parseParams[i]); funcInfo.params.push(param); } @@ -82,7 +82,7 @@ function createFuncInfo(parseFuncInfo) { function createClassFunctions(parseFuncs) { let funcList = []; - for (var i = 0; i < parseFuncs.length; ++i) { + for (let i = 0; i < parseFuncs.length; ++i) { if (!(parseFuncs[i].constructor || parseFuncs[i].destructor)) { // 构造和析构方法不需要生成remote接口代码 let funcInfo = createFuncInfo(parseFuncs[i]); funcList.push(funcInfo); @@ -115,7 +115,7 @@ function analyzeClasses(rootInfo, parseClasses) { let firstClassName = null; // JSON集合中第一个class名称 let serviceClassName = null;// JSON集合中带“@ServiceClass”注解的class名称 let i = 0; - for (var className in parseClasses) { + for (let className in parseClasses) { if (++i === 1) { firstClassName = className; } diff --git a/src/cli/h2sa/src/gen/generate.js b/src/cli/h2sa/src/gen/generate.js index 01d6240582b7370878514db24898aa887eafc3fb..ea60a738623ea9a598defdc5c470f2a378a3b377 100644 --- a/src/cli/h2sa/src/gen/generate.js +++ b/src/cli/h2sa/src/gen/generate.js @@ -85,7 +85,7 @@ function getClientFuncParamStr(params) { function genClientMsgFunc(funcList) { let initParavalue = ''; let initParamessage = ''; - for (var n = 0; n < funcList.params.length; ++n) { + for (let n = 0; n < funcList.params.length; ++n) { if (numericTypes.includes(funcList.params[n].type)) { // 数值类型初始化为0 initParavalue = '1'; @@ -568,7 +568,7 @@ function genServiceFunc(funcInfo, className, paramStr) { initRetvalue = 'nullptr'; // 假设是指针类型或其他复杂类型 } - for (var n = 0; n < funcInfo.params.length; ++n) { + for (let n = 0; n < funcInfo.params.length; ++n) { if (numericTypes.includes(funcInfo.params[n].type)) { // 数值添加 paramsName += (n === 0) ? '' : '+ '; @@ -717,7 +717,7 @@ function genFunctionCode(classInfo) { genResult.clientFuncLogMessage = ''; //client.cpp 中的打印信息 let enumTab = getTab(2); let funcTab = getTab(1); - for (var i = 0; i < funcList.length; ++i) { + for (let i = 0; i < funcList.length; ++i) { funcList[i].funcEnum = funcList[i].name.toUpperCase(); // remote方法的枚举值 genResult.funcEnumStr += (i === 0) ? '' : ',\n' + enumTab; genResult.funcEnumStr += funcList[i].funcEnum; diff --git a/src/cli/h2sa/src/gen/main.js b/src/cli/h2sa/src/gen/main.js index 2e2c20fd2ace7554818111e80155d8d62622a4ba..74c9eb17ae8727145bcbb5ba28ecfc63bc8fbd40 100644 --- a/src/cli/h2sa/src/gen/main.js +++ b/src/cli/h2sa/src/gen/main.js @@ -34,7 +34,7 @@ let ops = stdio.getopt({ NapiLog.init(ops.loglevel, path.join('' + ops.out, 'napi_gen.log')); let fileNames = ops.filename; -var pathDir = ops.directory; +let pathDir = ops.directory; if ((fileNames === null || fileNames === undefined) && (pathDir === null || pathDir === undefined)) { NapiLog.logInfo('fileNames and pathDir both cannot be empty at the same time'); } else if (pathDir && pathDir !== '') { diff --git a/src/tool/api/api_scan_vs_plugin/src/gen/tools/VsPluginLog.js b/src/tool/api/api_scan_vs_plugin/src/gen/tools/VsPluginLog.js index a2d236bc722344f5901322a3dba68d70bf232b87..ed1078b95055e2e772b09e03c0486199565db161 100644 --- a/src/tool/api/api_scan_vs_plugin/src/gen/tools/VsPluginLog.js +++ b/src/tool/api/api_scan_vs_plugin/src/gen/tools/VsPluginLog.js @@ -24,9 +24,9 @@ VsPluginLog.LEV_DEBUG = 2; VsPluginLog.LEV_INFO = 3; const LEV_STR = ['[NON]', '[ERR]', '[DBG]', '[INF]']; -var logLevel = VsPluginLog.LEV_ERROR; -var logFileName = null; -var logResultMessage = [true, '']; +let logLevel = VsPluginLog.LEV_ERROR; +let logFileName = null; +let logResultMessage = [true, '']; function getDateString() { let nowDate = new Date(); diff --git a/src/tool/api/api_scan_vs_plugin/src/gen/tools/VsPluginTool.js b/src/tool/api/api_scan_vs_plugin/src/gen/tools/VsPluginTool.js index e19bc6feef64bb9ff8da5eebb117f4e150219ae6..89fd22b3c14113696371ec6d7f7e57544e3b20a2 100644 --- a/src/tool/api/api_scan_vs_plugin/src/gen/tools/VsPluginTool.js +++ b/src/tool/api/api_scan_vs_plugin/src/gen/tools/VsPluginTool.js @@ -65,8 +65,8 @@ function checkFileError(ifname) { } function utf8ArrayToStr(array) { - var out, i, len, c; - var char2, char3; + let out, i, len, c; + let char2, char3; out = ''; len = array.length; diff --git a/src/tool/api/api_scan_vs_plugin/src/vs_plugin_view.html b/src/tool/api/api_scan_vs_plugin/src/vs_plugin_view.html index 04561120db6873deee109c62e4d462b63dc79d4f..dd18bb70a463fdad076f9341a57e05bb7ab92318 100644 --- a/src/tool/api/api_scan_vs_plugin/src/vs_plugin_view.html +++ b/src/tool/api/api_scan_vs_plugin/src/vs_plugin_view.html @@ -108,13 +108,13 @@ }