From fd9ee4322a284ac416b0f4c4cb3011eb648dcdab Mon Sep 17 00:00:00 2001 From: chernishevvictor Date: Thu, 23 Jan 2025 15:33:55 +0300 Subject: [PATCH 1/4] first steps, integrated IdentifierName --- arkoala-arkts/libarkts/native/src/bridges.cc | 14 +-- arkoala-arkts/libarkts/src/arkts-api/index.ts | 2 +- .../libarkts/src/arkts-api/static/global.ts | 2 +- .../src/generated/Es2pandaNativeModule.ts | 98 +++++++++++++++++++ .../{enums.ts => Es2pandaEnums.ts} | 0 .../{ => handwritten}/Es2pandaNativeModule.ts | 2 +- arkoala-arkts/libarkts/test/test-util.ts | 2 +- 7 files changed, 110 insertions(+), 10 deletions(-) create mode 100644 arkoala-arkts/libarkts/src/generated/Es2pandaNativeModule.ts rename arkoala-arkts/libarkts/src/handwritten/{enums.ts => Es2pandaEnums.ts} (100%) rename arkoala-arkts/libarkts/src/{ => handwritten}/Es2pandaNativeModule.ts (99%) diff --git a/arkoala-arkts/libarkts/native/src/bridges.cc b/arkoala-arkts/libarkts/native/src/bridges.cc index 2b994c0d7..44dbc64c3 100644 --- a/arkoala-arkts/libarkts/native/src/bridges.cc +++ b/arkoala-arkts/libarkts/native/src/bridges.cc @@ -1334,12 +1334,14 @@ KBoolean impl_IsIdentifier(KNativePointer nodePtr) { } KOALA_INTEROP_1(IsIdentifier, KBoolean, KNativePointer) -KNativePointer impl_IdentifierName(KNativePointer contextPtr, KNativePointer nodePtr) { - auto context = reinterpret_cast(contextPtr); - auto node = reinterpret_cast(nodePtr); - return new string(GetImpl()->IdentifierName(context, node)); -} -KOALA_INTEROP_2(IdentifierName, KNativePointer, KNativePointer, KNativePointer) +KNativePointer impl_IdentifierName(KNativePointer context, KNativePointer receiver) +{ + const auto _context = reinterpret_cast(context); + const auto _receiver = reinterpret_cast(receiver); + const auto result = GetImpl()->IdentifierName(_context, _receiver); + return new std::string(result); +} +KOALA_INTEROP_2(IdentifierName, KNativePointer, KNativePointer, KNativePointer); KNativePointer impl_CreateIdentifier1(KNativePointer contextPtr, KStringPtr& namePtr) { auto context = reinterpret_cast(contextPtr); diff --git a/arkoala-arkts/libarkts/src/arkts-api/index.ts b/arkoala-arkts/libarkts/src/arkts-api/index.ts index 479f63dcf..34254affb 100644 --- a/arkoala-arkts/libarkts/src/arkts-api/index.ts +++ b/arkoala-arkts/libarkts/src/arkts-api/index.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -export * from "../handwritten/enums" +export * from "../handwritten/Es2pandaEnums" export * from "../generated/Es2pandaEnums" export * from "./types" diff --git a/arkoala-arkts/libarkts/src/arkts-api/static/global.ts b/arkoala-arkts/libarkts/src/arkts-api/static/global.ts index b8179537f..3b581fd75 100644 --- a/arkoala-arkts/libarkts/src/arkts-api/static/global.ts +++ b/arkoala-arkts/libarkts/src/arkts-api/static/global.ts @@ -15,7 +15,7 @@ import { throwError } from "../../utils" import { KNativePointer } from "@koalaui/interop" -import { initEs2panda, Es2pandaNativeModule } from "../../Es2pandaNativeModule" +import { initEs2panda, Es2pandaNativeModule } from "../../handwritten/Es2pandaNativeModule" import { initInterop, InteropNativeModule } from "../../InteropNativeModule" export default class global { diff --git a/arkoala-arkts/libarkts/src/generated/Es2pandaNativeModule.ts b/arkoala-arkts/libarkts/src/generated/Es2pandaNativeModule.ts new file mode 100644 index 000000000..7cf668ad5 --- /dev/null +++ b/arkoala-arkts/libarkts/src/generated/Es2pandaNativeModule.ts @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// import { +// KNativePointer, +// KInt, +// KBoolean, +// KNativePointer, +// registerNativeModule, +// registerLoadedLibrary +// } from "@koalaui/interop" + +// // TODO: this type should be in interop +// export type KNativePointerArray = BigUint64Array + +// export interface Es2pandaNativeModule { +// _StatementSetReturnType(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer): KNativePointer +// _FunctionDeclarationCreateFunctionDeclaration(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer, arg4: KNativePointer, arg5: KUInt, arg6: KBoolean): KNativePointer +// _FunctionDeclarationUpdateFunctionDeclaration(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer, arg4: KNativePointer, arg5: KNativePointer, arg6: KUInt, arg7: KBoolean): KNativePointer +// _FunctionDeclarationCreateFunctionDeclaration1(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer, arg4: KBoolean): KNativePointer +// _FunctionDeclarationUpdateFunctionDeclaration1(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer, arg4: KNativePointer, arg5: KBoolean): KNativePointer +// _FunctionDeclarationFunction(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer +// _FunctionDeclarationIsAnonymousConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _FunctionDeclarationFunctionConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer +// _ScriptFunctionCreateScriptFunction(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer, arg4: KNativePointer, arg5: KInt, arg6: KInt): KNativePointer +// _ScriptFunctionUpdateScriptFunction(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer, arg4: KNativePointer, arg5: KNativePointer, arg6: KInt, arg7: KInt): KNativePointer +// _ScriptFunctionIdConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer +// _ScriptFunctionId(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer +// _ScriptFunctionSignatureConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer +// _ScriptFunctionSignature(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer +// _ScriptFunctionIrSignature(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer +// _ScriptFunctionParamsConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KUInt, arg4: KInt): KNativePointer +// _ScriptFunctionParams(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KUInt, arg4: KInt): KNativePointer +// _ScriptFunctionDefaultParamIndexConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KUInt +// _ScriptFunctionReturnStatementsConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KUInt, arg4: KInt): KNativePointer +// _ScriptFunctionReturnStatements(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KUInt, arg4: KInt): KNativePointer +// _ScriptFunctionTypeParamsConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer +// _ScriptFunctionTypeParams(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer +// _ScriptFunctionBodyConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer +// _ScriptFunctionBody(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer +// _ScriptFunctionAddReturnStatement(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer): KNativePointer +// _ScriptFunctionSetBody(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer): KNativePointer +// _ScriptFunctionReturnTypeAnnotationConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer +// _ScriptFunctionReturnTypeAnnotation(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer +// _ScriptFunctionSetReturnTypeAnnotation(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer): KNativePointer +// _ScriptFunctionIsEntryPointConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _ScriptFunctionIsGeneratorConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _ScriptFunctionIsAsyncFuncConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _ScriptFunctionIsAsyncImplFuncConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _ScriptFunctionIsArrowConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _ScriptFunctionIsOverloadConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _ScriptFunctionIsExternalOverloadConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _ScriptFunctionIsConstructorConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _ScriptFunctionIsGetterConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _ScriptFunctionIsSetterConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _ScriptFunctionIsMethodConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _ScriptFunctionIsProxyConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _ScriptFunctionIsStaticBlockConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _ScriptFunctionIsEnumConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _ScriptFunctionIsHiddenConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _ScriptFunctionIsExternalConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _ScriptFunctionIsImplicitSuperCallNeededConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _ScriptFunctionHasBodyConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _ScriptFunctionHasRestParameterConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _ScriptFunctionHasReturnStatementConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _ScriptFunctionHasThrowStatementConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _ScriptFunctionIsThrowingConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _ScriptFunctionIsRethrowingConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _ScriptFunctionIsDynamicConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _ScriptFunctionIsExtensionMethodConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean +// _ScriptFunctionFlagsConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KInt +// _ScriptFunctionSetIdent(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer): KNativePointer +// _ScriptFunctionSetSignature(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer): KNativePointer +// _ScriptFunctionAddFlag(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KInt): KNativePointer +// _ScriptFunctionAddModifier(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KInt): KNativePointer +// _ScriptFunctionFormalParamsLengthConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KUInt +// _ScriptFunctionSetScope(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer): KNativePointer +// } + +// export function initEs2panda(): Es2pandaNativeModule { +// registerLoadedLibrary(require("../native/build/es2panda.node")) +// const instance = new Es2pandaNativeModule() +// // registerNativeModule("InteropNativeModule", NativeModule) +// registerNativeModule("NativeModule", instance) +// return instance +// } diff --git a/arkoala-arkts/libarkts/src/handwritten/enums.ts b/arkoala-arkts/libarkts/src/handwritten/Es2pandaEnums.ts similarity index 100% rename from arkoala-arkts/libarkts/src/handwritten/enums.ts rename to arkoala-arkts/libarkts/src/handwritten/Es2pandaEnums.ts diff --git a/arkoala-arkts/libarkts/src/Es2pandaNativeModule.ts b/arkoala-arkts/libarkts/src/handwritten/Es2pandaNativeModule.ts similarity index 99% rename from arkoala-arkts/libarkts/src/Es2pandaNativeModule.ts rename to arkoala-arkts/libarkts/src/handwritten/Es2pandaNativeModule.ts index f81a62c54..504b2dd56 100644 --- a/arkoala-arkts/libarkts/src/Es2pandaNativeModule.ts +++ b/arkoala-arkts/libarkts/src/handwritten/Es2pandaNativeModule.ts @@ -539,7 +539,7 @@ export class Es2pandaNativeModule { } export function initEs2panda(): Es2pandaNativeModule { - registerLoadedLibrary(require("../native/build/es2panda.node")) + registerLoadedLibrary(require("../../native/build/es2panda.node")) const instance = new Es2pandaNativeModule() // registerNativeModule("InteropNativeModule", NativeModule) registerNativeModule("NativeModule", instance) diff --git a/arkoala-arkts/libarkts/test/test-util.ts b/arkoala-arkts/libarkts/test/test-util.ts index 1cc2e55d4..10b12ed93 100644 --- a/arkoala-arkts/libarkts/test/test-util.ts +++ b/arkoala-arkts/libarkts/test/test-util.ts @@ -21,7 +21,7 @@ import * as pth from "path" import { assert } from "chai" import { exec, execSync } from "child_process" -export { Es2pandaNativeModule } from "../src/Es2pandaNativeModule" +export { Es2pandaNativeModule } from "../src/handwritten/Es2pandaNativeModule" export { assert } from "chai" class defaultTransformationContext implements ts.TransformationContext { -- Gitee From 52d0af2fc430ed797362334bcadc56247d336696 Mon Sep 17 00:00:00 2001 From: chernishevvictor Date: Thu, 23 Jan 2025 16:43:26 +0300 Subject: [PATCH 2/4] some fixes Signed-off-by: chernishevvictor --- arkoala-arkts/libarkts/native/src/bridges.cc | 9 -- .../libarkts/native/src/generated/bridges.cc | 9 ++ .../src/generated/Es2pandaNativeModule.ts | 84 +------------------ 3 files changed, 10 insertions(+), 92 deletions(-) diff --git a/arkoala-arkts/libarkts/native/src/bridges.cc b/arkoala-arkts/libarkts/native/src/bridges.cc index 44dbc64c3..3d8bdacf1 100644 --- a/arkoala-arkts/libarkts/native/src/bridges.cc +++ b/arkoala-arkts/libarkts/native/src/bridges.cc @@ -1334,15 +1334,6 @@ KBoolean impl_IsIdentifier(KNativePointer nodePtr) { } KOALA_INTEROP_1(IsIdentifier, KBoolean, KNativePointer) -KNativePointer impl_IdentifierName(KNativePointer context, KNativePointer receiver) -{ - const auto _context = reinterpret_cast(context); - const auto _receiver = reinterpret_cast(receiver); - const auto result = GetImpl()->IdentifierName(_context, _receiver); - return new std::string(result); -} -KOALA_INTEROP_2(IdentifierName, KNativePointer, KNativePointer, KNativePointer); - KNativePointer impl_CreateIdentifier1(KNativePointer contextPtr, KStringPtr& namePtr) { auto context = reinterpret_cast(contextPtr); return GetImpl()->CreateIdentifier1(context, getStringCopy(namePtr)); diff --git a/arkoala-arkts/libarkts/native/src/generated/bridges.cc b/arkoala-arkts/libarkts/native/src/generated/bridges.cc index 8fe9429f2..372f1c462 100644 --- a/arkoala-arkts/libarkts/native/src/generated/bridges.cc +++ b/arkoala-arkts/libarkts/native/src/generated/bridges.cc @@ -24,3 +24,12 @@ KNativePointer impl_FunctionSignatureParamsConst(KNativePointer context, KNative return new std::vector(result, result + length); } KOALA_INTEROP_2(FunctionSignatureParamsConst, KNativePointer, KNativePointer, KNativePointer); + +KNativePointer impl_IdentifierName(KNativePointer context, KNativePointer receiver) +{ + const auto _context = reinterpret_cast(context); + const auto _receiver = reinterpret_cast(receiver); + const auto result = GetImpl()->IdentifierName(_context, _receiver); + return new std::string(result); +} +KOALA_INTEROP_2(IdentifierName, KNativePointer, KNativePointer, KNativePointer); diff --git a/arkoala-arkts/libarkts/src/generated/Es2pandaNativeModule.ts b/arkoala-arkts/libarkts/src/generated/Es2pandaNativeModule.ts index 7cf668ad5..fdea83152 100644 --- a/arkoala-arkts/libarkts/src/generated/Es2pandaNativeModule.ts +++ b/arkoala-arkts/libarkts/src/generated/Es2pandaNativeModule.ts @@ -13,86 +13,4 @@ * limitations under the License. */ -// import { -// KNativePointer, -// KInt, -// KBoolean, -// KNativePointer, -// registerNativeModule, -// registerLoadedLibrary -// } from "@koalaui/interop" - -// // TODO: this type should be in interop -// export type KNativePointerArray = BigUint64Array - -// export interface Es2pandaNativeModule { -// _StatementSetReturnType(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer): KNativePointer -// _FunctionDeclarationCreateFunctionDeclaration(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer, arg4: KNativePointer, arg5: KUInt, arg6: KBoolean): KNativePointer -// _FunctionDeclarationUpdateFunctionDeclaration(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer, arg4: KNativePointer, arg5: KNativePointer, arg6: KUInt, arg7: KBoolean): KNativePointer -// _FunctionDeclarationCreateFunctionDeclaration1(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer, arg4: KBoolean): KNativePointer -// _FunctionDeclarationUpdateFunctionDeclaration1(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer, arg4: KNativePointer, arg5: KBoolean): KNativePointer -// _FunctionDeclarationFunction(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer -// _FunctionDeclarationIsAnonymousConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _FunctionDeclarationFunctionConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer -// _ScriptFunctionCreateScriptFunction(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer, arg4: KNativePointer, arg5: KInt, arg6: KInt): KNativePointer -// _ScriptFunctionUpdateScriptFunction(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer, arg4: KNativePointer, arg5: KNativePointer, arg6: KInt, arg7: KInt): KNativePointer -// _ScriptFunctionIdConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer -// _ScriptFunctionId(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer -// _ScriptFunctionSignatureConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer -// _ScriptFunctionSignature(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer -// _ScriptFunctionIrSignature(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer -// _ScriptFunctionParamsConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KUInt, arg4: KInt): KNativePointer -// _ScriptFunctionParams(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KUInt, arg4: KInt): KNativePointer -// _ScriptFunctionDefaultParamIndexConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KUInt -// _ScriptFunctionReturnStatementsConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KUInt, arg4: KInt): KNativePointer -// _ScriptFunctionReturnStatements(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KUInt, arg4: KInt): KNativePointer -// _ScriptFunctionTypeParamsConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer -// _ScriptFunctionTypeParams(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer -// _ScriptFunctionBodyConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer -// _ScriptFunctionBody(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer -// _ScriptFunctionAddReturnStatement(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer): KNativePointer -// _ScriptFunctionSetBody(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer): KNativePointer -// _ScriptFunctionReturnTypeAnnotationConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer -// _ScriptFunctionReturnTypeAnnotation(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KNativePointer -// _ScriptFunctionSetReturnTypeAnnotation(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer): KNativePointer -// _ScriptFunctionIsEntryPointConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _ScriptFunctionIsGeneratorConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _ScriptFunctionIsAsyncFuncConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _ScriptFunctionIsAsyncImplFuncConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _ScriptFunctionIsArrowConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _ScriptFunctionIsOverloadConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _ScriptFunctionIsExternalOverloadConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _ScriptFunctionIsConstructorConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _ScriptFunctionIsGetterConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _ScriptFunctionIsSetterConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _ScriptFunctionIsMethodConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _ScriptFunctionIsProxyConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _ScriptFunctionIsStaticBlockConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _ScriptFunctionIsEnumConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _ScriptFunctionIsHiddenConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _ScriptFunctionIsExternalConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _ScriptFunctionIsImplicitSuperCallNeededConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _ScriptFunctionHasBodyConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _ScriptFunctionHasRestParameterConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _ScriptFunctionHasReturnStatementConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _ScriptFunctionHasThrowStatementConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _ScriptFunctionIsThrowingConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _ScriptFunctionIsRethrowingConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _ScriptFunctionIsDynamicConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _ScriptFunctionIsExtensionMethodConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KBoolean -// _ScriptFunctionFlagsConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KInt -// _ScriptFunctionSetIdent(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer): KNativePointer -// _ScriptFunctionSetSignature(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer): KNativePointer -// _ScriptFunctionAddFlag(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KInt): KNativePointer -// _ScriptFunctionAddModifier(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KInt): KNativePointer -// _ScriptFunctionFormalParamsLengthConst(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer): KUInt -// _ScriptFunctionSetScope(arg0: KNativePointer, arg1: KNativePointer, arg2: KNativePointer, arg3: KNativePointer): KNativePointer -// } - -// export function initEs2panda(): Es2pandaNativeModule { -// registerLoadedLibrary(require("../native/build/es2panda.node")) -// const instance = new Es2pandaNativeModule() -// // registerNativeModule("InteropNativeModule", NativeModule) -// registerNativeModule("NativeModule", instance) -// return instance -// } +// TODO: -- Gitee From f109d536f857ba924aaae8fcf3b5669eaa115775 Mon Sep 17 00:00:00 2001 From: chernishevvictor Date: Thu, 23 Jan 2025 17:01:05 +0300 Subject: [PATCH 3/4] integrate more functions --- arkoala-arkts/libarkts/native/src/common.cc | 18 ----------------- .../libarkts/native/src/generated/bridges.cc | 20 +++++++++++++++++++ 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/arkoala-arkts/libarkts/native/src/common.cc b/arkoala-arkts/libarkts/native/src/common.cc index 1760cc5a6..cbf46c2a7 100644 --- a/arkoala-arkts/libarkts/native/src/common.cc +++ b/arkoala-arkts/libarkts/native/src/common.cc @@ -122,15 +122,6 @@ KNativePointer impl_IdentifierSetName(KNativePointer contextPtr, KNativePointer } KOALA_INTEROP_3(IdentifierSetName, KNativePointer, KNativePointer, KNativePointer, KStringPtr) -KNativePointer impl_BlockStatementStatements(KNativePointer contextPtr, KNativePointer nodePtr) { - auto context = reinterpret_cast(contextPtr); - auto node = reinterpret_cast(nodePtr); - size_t n; - auto statements = GetImpl()->BlockStatementStatements(context, node, &n); - return new vector(statements, statements + n); -} -KOALA_INTEROP_2(BlockStatementStatements, KNativePointer, KNativePointer, KNativePointer) - KNativePointer impl_VariableDeclarationDeclaratorsConst(KNativePointer contextPtr, KNativePointer nodePtr) { auto context = reinterpret_cast(contextPtr); auto node = reinterpret_cast(nodePtr); @@ -140,15 +131,6 @@ KNativePointer impl_VariableDeclarationDeclaratorsConst(KNativePointer contextPt } KOALA_INTEROP_2(VariableDeclarationDeclaratorsConst, KNativePointer, KNativePointer, KNativePointer) -KNativePointer impl_ClassDefinitionBody(KNativePointer contextPtr, KNativePointer nodePtr) { - auto context = reinterpret_cast(contextPtr); - auto node = reinterpret_cast(nodePtr); - size_t n; - auto body = GetImpl()->ClassDefinitionBody(context, node, &n); - return new std::vector(body, body + n); -} -KOALA_INTEROP_2(ClassDefinitionBody, KNativePointer, KNativePointer, KNativePointer) - KNativePointer impl_ScriptFunctionParams(KNativePointer contextPtr, KNativePointer nodePtr) { auto context = reinterpret_cast(contextPtr); auto node = reinterpret_cast(nodePtr); diff --git a/arkoala-arkts/libarkts/native/src/generated/bridges.cc b/arkoala-arkts/libarkts/native/src/generated/bridges.cc index 372f1c462..e80fe0520 100644 --- a/arkoala-arkts/libarkts/native/src/generated/bridges.cc +++ b/arkoala-arkts/libarkts/native/src/generated/bridges.cc @@ -33,3 +33,23 @@ KNativePointer impl_IdentifierName(KNativePointer context, KNativePointer receiv return new std::string(result); } KOALA_INTEROP_2(IdentifierName, KNativePointer, KNativePointer, KNativePointer); + +KNativePointer impl_BlockStatementStatements(KNativePointer context, KNativePointer receiver) +{ + const auto _context = reinterpret_cast(context); + const auto _receiver = reinterpret_cast(receiver); + std::size_t length; + const auto result = GetImpl()->BlockStatementStatements(_context, _receiver, &length); + return new std::vector(result, result + length); +} +KOALA_INTEROP_2(BlockStatementStatements, KNativePointer, KNativePointer, KNativePointer); + +KNativePointer impl_ClassDefinitionBody(KNativePointer context, KNativePointer receiver) +{ + const auto _context = reinterpret_cast(context); + const auto _receiver = reinterpret_cast(receiver); + std::size_t length; + const auto result = GetImpl()->ClassDefinitionBody(_context, _receiver, &length); + return new std::vector(result, result + length); +} +KOALA_INTEROP_2(ClassDefinitionBody, KNativePointer, KNativePointer, KNativePointer); -- Gitee From 5badc7ed7add544c8b4b9bbebaea8a3896b04b0b Mon Sep 17 00:00:00 2001 From: chernishevvictor Date: Thu, 23 Jan 2025 18:53:35 +0300 Subject: [PATCH 4/4] integrated more functions Signed-off-by: chernishevvictor --- arkoala-arkts/libarkts/native/src/bridges.cc | 38 ------------------- .../libarkts/native/src/generated/bridges.cc | 38 +++++++++++++++++++ 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/arkoala-arkts/libarkts/native/src/bridges.cc b/arkoala-arkts/libarkts/native/src/bridges.cc index 3d8bdacf1..1900f8137 100644 --- a/arkoala-arkts/libarkts/native/src/bridges.cc +++ b/arkoala-arkts/libarkts/native/src/bridges.cc @@ -43,29 +43,6 @@ KNativePointer impl_CreateTSTypeParameterInstantiation( } KOALA_INTEROP_3(CreateTSTypeParameterInstantiation, KNativePointer, KNativePointer, KNativePointerArray, KInt) -KNativePointer impl_ClassElementKey(KNativePointer contextPtr, KNativePointer nodePtr) { - auto context = reinterpret_cast(contextPtr); - auto node = reinterpret_cast(nodePtr); - return GetImpl()->ClassElementKey(context, node); -} -KOALA_INTEROP_2(ClassElementKey, KNativePointer, KNativePointer, KNativePointer) - -KNativePointer impl_ClassElementValue(KNativePointer contextPtr, KNativePointer nodePtr) { - auto context = reinterpret_cast(contextPtr); - auto node = reinterpret_cast(nodePtr); - return GetImpl()->ClassElementValue(context, node); -} -KOALA_INTEROP_2(ClassElementValue, KNativePointer, KNativePointer, KNativePointer) - -KNativePointer impl_CallExpressionArguments(KNativePointer contextPtr, KNativePointer nodePtr, KNativePointer returnLen) { - auto context = reinterpret_cast(contextPtr); - auto node = reinterpret_cast(nodePtr); - std::size_t params_len = 0; - auto params = GetImpl()->CallExpressionArguments(context, node, ¶ms_len); - return new std::vector(params, params + params_len); -} -KOALA_INTEROP_3(CallExpressionArguments, KNativePointer, KNativePointer, KNativePointer, KNativePointer) - KNativePointer impl_AstNodeRecheck(KNativePointer contextPtr, KNativePointer nodePtr) { auto context = reinterpret_cast(contextPtr); auto node = reinterpret_cast(nodePtr); @@ -169,21 +146,6 @@ KNativePointer impl_ScopeSetParent(KNativePointer contextPtr, KNativePointer nod } KOALA_INTEROP_3(ScopeSetParent, KNativePointer, KNativePointer, KNativePointer, KNativePointer) -KNativePointer impl_BlockStatementSetStatements( - KNativePointer contextPtr, - KNativePointer nodePtr, - KNativePointerArray statementsPtr, - KInt statementsLen -) { - auto context = reinterpret_cast(contextPtr); - auto node = reinterpret_cast(nodePtr); - auto statements = reinterpret_cast(statementsPtr); - - GetImpl()->BlockStatementSetStatements(context, node, statements, statementsLen); - return node; -} -KOALA_INTEROP_4(BlockStatementSetStatements, KNativePointer, KNativePointer, KNativePointer, KNativePointerArray, KInt) - KNativePointer impl_CreateClassDeclaration(KNativePointer contextPtr, KNativePointer defPtr) { auto context = reinterpret_cast(contextPtr); auto def = reinterpret_cast(defPtr); diff --git a/arkoala-arkts/libarkts/native/src/generated/bridges.cc b/arkoala-arkts/libarkts/native/src/generated/bridges.cc index e80fe0520..3f7fa2304 100644 --- a/arkoala-arkts/libarkts/native/src/generated/bridges.cc +++ b/arkoala-arkts/libarkts/native/src/generated/bridges.cc @@ -53,3 +53,41 @@ KNativePointer impl_ClassDefinitionBody(KNativePointer context, KNativePointer r return new std::vector(result, result + length); } KOALA_INTEROP_2(ClassDefinitionBody, KNativePointer, KNativePointer, KNativePointer); + +KNativePointer impl_ClassElementKey(KNativePointer context, KNativePointer receiver) +{ + const auto _context = reinterpret_cast(context); + const auto _receiver = reinterpret_cast(receiver); + const auto result = GetImpl()->ClassElementKey(_context, _receiver); + return result; +} +KOALA_INTEROP_2(ClassElementKey, KNativePointer, KNativePointer, KNativePointer); + +KNativePointer impl_ClassElementValue(KNativePointer context, KNativePointer receiver) +{ + const auto _context = reinterpret_cast(context); + const auto _receiver = reinterpret_cast(receiver); + const auto result = GetImpl()->ClassElementValue(_context, _receiver); + return result; +} +KOALA_INTEROP_2(ClassElementValue, KNativePointer, KNativePointer, KNativePointer); + +KNativePointer impl_CallExpressionArguments(KNativePointer context, KNativePointer receiver) +{ + const auto _context = reinterpret_cast(context); + const auto _receiver = reinterpret_cast(receiver); + std::size_t length; + const auto result = GetImpl()->CallExpressionArguments(_context, _receiver, &length); + return new std::vector(result, result + length); +} +KOALA_INTEROP_2(CallExpressionArguments, KNativePointer, KNativePointer, KNativePointer); + +void impl_BlockStatementSetStatements(KNativePointer context, KNativePointer receiver, KNativePointerArray statementList, KUInt statementListLen) +{ + const auto _context = reinterpret_cast(context); + const auto _receiver = reinterpret_cast(receiver); + const auto _statementList = reinterpret_cast(statementList); + const auto _statementListLen = static_cast(statementListLen); + GetImpl()->BlockStatementSetStatements(_context, _receiver, _statementList, _statementListLen); +} +KOALA_INTEROP_V4(BlockStatementSetStatements, KNativePointer, KNativePointer, KNativePointerArray, KUInt); -- Gitee