arkanalyzer 1.0.85 → 1.0.87

package/lib/cli/commands/index.js

@@ -0,0 +1,64 @@
+"use strict";
+/*
+ * Copyright (c) 2026 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.
+ */
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerCommands = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+function isCommandFile(file) {
+    if (file === 'index.ts' || file === 'index.js') {
+        return false;
+    }
+    if (!/\.(ts|js)$/.test(file)) {
+        return false;
+    }
+    if (file.endsWith('.d.ts')) {
+        return false;
+    }
+    return true;
+}
+function registerCommands(program) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const commandsDir = __dirname;
+        const files = fs_1.default.readdirSync(commandsDir).sort();
+        for (const file of files) {
+            if (!isCommandFile(file)) {
+                continue;
+            }
+            const abs = path_1.default.join(commandsDir, file);
+            // eslint-disable-next-line @typescript-eslint/no-require-imports
+            const commandModule = require(abs);
+            if (typeof commandModule.register === 'function') {
+                commandModule.register(program);
+            }
+            else {
+                console.warn(`Command file ${file} does not export register`);
+            }
+        }
+    });
+}
+exports.registerCommands = registerCommands;

package/lib/cli/commands/ir.d.ts

@@ -0,0 +1,26 @@
+import { Command } from 'commander';
+export interface IrCommandOptions {
+    project: string;
+    output: string;
+    format?: 'json' | 'text' | 'dot';
+    inferTypes: boolean;
+    ohosSdkHome?: string;
+}
+export declare function dumpProjectToReadableIR(options: IrCommandOptions): {
+    output: string;
+    fileCount: number;
+    formatUsed: string;
+};
+/**
+ * Register IR export command.
+ *
+ * Usage:
+ *   arkanalyzer ir <input> [options]
+ *
+ * Examples:
+ *   arkanalyzer ir ./my_project -f text
+ *   arkanalyzer ir ./my_project -f json -o ./out/ir
+ *   arkanalyzer ir ./my_project -f dot --ohos-sdk-home /path/to/sdk
+ */
+export declare function register(program: Command): void;
+//# sourceMappingURL=ir.d.ts.map

package/lib/cli/commands/ir.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ir.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/ir.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,MAAM,WAAW,gBAAgB;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC;IACjC,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,gBAAgB,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CA2B5H;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA+B/C"}

package/lib/cli/commands/ir.js

@@ -0,0 +1,94 @@
+"use strict";
+/*
+ * Copyright (c) 2026 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.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.register = exports.dumpProjectToReadableIR = void 0;
+const Scene_1 = require("../../Scene");
+const Config_1 = require("../../Config");
+const PrinterBuilder_1 = require("../../save/PrinterBuilder");
+const ArkError_1 = require("../../core/common/ArkError");
+function dumpProjectToReadableIR(options) {
+    var _a;
+    const config = (0, Config_1.buildSceneConfigFromProject)(options.project, options.ohosSdkHome);
+    const scene = new Scene_1.Scene();
+    scene.buildSceneFromProjectDir(config);
+    if (options.inferTypes) {
+        scene.inferTypes();
+    }
+    const fileCount = scene.getFiles().length;
+    const printer = new PrinterBuilder_1.ScenePrinter(scene, options.output);
+    const rawFormat = (_a = options.format) !== null && _a !== void 0 ? _a : 'text';
+    let formatUsed = rawFormat;
+    switch (rawFormat) {
+        case 'json':
+            printer.dumpToJson();
+            break;
+        case 'dot':
+            printer.dumpToDot();
+            break;
+        case 'text':
+        default:
+            formatUsed = 'text';
+            printer.dumpToIR();
+            break;
+    }
+    return { output: options.output, fileCount, formatUsed };
+}
+exports.dumpProjectToReadableIR = dumpProjectToReadableIR;
+/**
+ * Register IR export command.
+ *
+ * Usage:
+ *   arkanalyzer ir <input> [options]
+ *
+ * Examples:
+ *   arkanalyzer ir ./my_project -f text
+ *   arkanalyzer ir ./my_project -f json -o ./out/ir
+ *   arkanalyzer ir ./my_project -f dot --ohos-sdk-home /path/to/sdk
+ */
+function register(program) {
+    program
+        .command('ir <input>')
+        .description('Export project IR-related artifacts')
+        .option('-o, --output <dir>', 'Output directory for generated artifacts', 'out')
+        .option('-f, --format <type>', 'Output format: json | text | dot', 'text')
+        .option('--ohos-sdk-home <path>', 'OHOS SDK home. Fallback to env OHOS_SDK_HOME')
+        .option('--no-infer-types', 'Skip Scene.inferTypes() for speed')
+        .action((input, opts) => {
+        var _a;
+        const requestedFormat = ((_a = opts.format) !== null && _a !== void 0 ? _a : 'json').toLowerCase();
+        if (!['json', 'text', 'dot'].includes(requestedFormat)) {
+            throw new ArkError_1.ArkAnalyzerError({
+                errCode: ArkError_1.ArkErrorCode.CLI_INVALID_OPTION,
+                errMsg: `Unsupported ir format: ${opts.format}. Expected one of: json, text, dot`,
+            });
+        }
+        const result = dumpProjectToReadableIR({
+            project: input,
+            output: opts.output,
+            format: requestedFormat,
+            inferTypes: opts.inferTypes !== false,
+            ohosSdkHome: opts.ohosSdkHome,
+        });
+        const output = {
+            input,
+            format: result.formatUsed,
+            outputDir: result.output,
+            fileCount: result.fileCount,
+        };
+        process.stdout.write(`${JSON.stringify(output)}\n`);
+    });
+}
+exports.register = register;

package/lib/core/base/Constant.d.ts

@@ -28,7 +28,7 @@ export declare class BooleanConstant extends Constant {
     private static readonly FALSE;
     private static readonly TRUE;
     constructor(value: boolean);
-    static getInstance(value: boolean): NullConstant;
+    static getInstance(value: boolean): BooleanConstant;
 }
 export declare class NumberConstant extends Constant {
     constructor(value: string);

package/lib/core/base/Constant.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Constant.d.ts","sourceRoot":"","sources":["../../../src/core/base/Constant.ts"],"names":[],"mappings":"AAeA,OAAO,EAA6D,IAAI,EAAiB,MAAM,QAAQ,CAAC;AACxG,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAGhC;;GAEG;AACH,qBAAa,QAAS,YAAW,KAAK;IAClC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAO;gBAEhB,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI;IAKrC;;;OAGG;IACI,QAAQ,IAAI,MAAM;IAIlB,OAAO,IAAI,KAAK,EAAE;IAIzB;;;OAGG;IACI,OAAO,IAAI,IAAI;IAItB;;;OAGG;IACI,QAAQ,IAAI,MAAM;CAS5B;AAED,qBAAa,eAAgB,SAAQ,QAAQ;IACzC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAA8B;IAC3D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAA6B;gBAE7C,KAAK,EAAE,OAAO;WAIZ,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY;CAG1D;AAED,qBAAa,cAAe,SAAQ,QAAQ;gBAC5B,KAAK,EAAE,MAAM;CAG5B;AAED,qBAAa,cAAe,SAAQ,QAAQ;gBAC5B,KAAK,EAAE,MAAM;CAG5B;AAED,qBAAa,cAAe,SAAQ,QAAQ;gBAC5B,KAAK,EAAE,MAAM;CAG5B;AAED,qBAAa,YAAa,SAAQ,QAAQ;IACtC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAsB;;WAMxC,WAAW,IAAI,YAAY;CAG5C;AAED,qBAAa,iBAAkB,SAAQ,QAAQ;IAC3C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAA2B;;WAM7C,WAAW,IAAI,iBAAiB;CAGjD"}
+{"version":3,"file":"Constant.d.ts","sourceRoot":"","sources":["../../../src/core/base/Constant.ts"],"names":[],"mappings":"AAeA,OAAO,EAA6D,IAAI,EAAiB,MAAM,QAAQ,CAAC;AACxG,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAGhC;;GAEG;AACH,qBAAa,QAAS,YAAW,KAAK;IAClC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAO;gBAEhB,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI;IAKrC;;;OAGG;IACI,QAAQ,IAAI,MAAM;IAIlB,OAAO,IAAI,KAAK,EAAE;IAIzB;;;OAGG;IACI,OAAO,IAAI,IAAI;IAItB;;;OAGG;IACI,QAAQ,IAAI,MAAM;CAS5B;AAED,qBAAa,eAAgB,SAAQ,QAAQ;IACzC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAA8B;IAC3D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAA6B;gBAE7C,KAAK,EAAE,OAAO;WAIZ,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,eAAe;CAG7D;AAED,qBAAa,cAAe,SAAQ,QAAQ;gBAC5B,KAAK,EAAE,MAAM;CAG5B;AAED,qBAAa,cAAe,SAAQ,QAAQ;gBAC5B,KAAK,EAAE,MAAM;CAG5B;AAED,qBAAa,cAAe,SAAQ,QAAQ;gBAC5B,KAAK,EAAE,MAAM;CAG5B;AAED,qBAAa,YAAa,SAAQ,QAAQ;IACtC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAsB;;WAMxC,WAAW,IAAI,YAAY;CAG5C;AAED,qBAAa,iBAAkB,SAAQ,QAAQ;IAC3C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAA2B;;WAM7C,WAAW,IAAI,iBAAiB;CAGjD"}

package/lib/core/base/Constant.js

@@ -77,7 +77,7 @@ class NumberConstant extends Constant {
 exports.NumberConstant = NumberConstant;
 class BigIntConstant extends Constant {
     constructor(value) {
-        super(value.toString(), Type_1.BigIntType.getInstance());
+        super(value.toString() + 'n', Type_1.BigIntType.getInstance());
     }
 }
 exports.BigIntConstant = BigIntConstant;

package/lib/core/base/Expr.d.ts

@@ -74,6 +74,10 @@ export declare abstract class AbstractInvokeExpr extends AbstractExpr {
     setRealGenericTypes(realTypes: Type[] | undefined): void;
     getSpreadFlags(): boolean[] | undefined;
     getUses(): Value[];
+    /**
+     *Convert parameter list to string representation
+     *@ returns the formatted parameter string, including parentheses and parameter list
+     */
     protected argsToString(): string;
 }
 export declare class ArkInstanceInvokeExpr extends AbstractInvokeExpr {
@@ -87,7 +91,7 @@ export declare class ArkInstanceInvokeExpr extends AbstractInvokeExpr {
     setBase(newBase: Local): void;
     /**
      * Returns an **array** of values used in this invoke expression,
-     * including all arguments and values each arguments used.
+     * including all arguments and values each argument used.
      * For {@link ArkInstanceInvokeExpr}, the return also contains the caller base and uses of base.
      * @returns An **array** of arguments used in the invoke expression.
      */
@@ -123,6 +127,11 @@ export declare class ArkPtrInvokeExpr extends AbstractInvokeExpr {
     constructor(methodSignature: MethodSignature, ptr: Local | AbstractFieldRef, args: Value[], realGenericTypes?: Type[], spreadFlags?: boolean[]);
     setFunPtrLocal(ptr: Local | AbstractFieldRef): void;
     getFuncPtrLocal(): Local | AbstractFieldRef;
+    /**
+     *Infer the type of function call expression
+     *@ param arkMethod - Ark method object currently analyzed
+     *@ returns The abstract calling expression after inference
+     */
     inferType(arkMethod: ArkMethod): AbstractInvokeExpr;
     toString(): string;
     getUses(): Value[];
@@ -134,6 +143,11 @@ export declare class ArkNewExpr extends AbstractExpr {
     getUses(): Value[];
     getType(): Type;
     toString(): string;
+    /**
+     *Inference type method
+     *@ param arkMethod - Ark method object, the context used for type inference
+     *@ returns the ArkNewExpr instance of the current object
+     */
     inferType(arkMethod: ArkMethod): ArkNewExpr;
     private constructorSignature;
 }
@@ -152,11 +166,16 @@ export declare class ArkNewArrayExpr extends AbstractExpr {
     getUses(): Value[];
     toString(): string;
 }
+/**
+ * delete expression in TS/ArkTS/C++
+ *  1. TS/ArkTS: delete a.b
+ *  2. c++: delete a / delete a.b / delete a->b
+ */
 export declare class ArkDeleteExpr extends AbstractExpr {
     private field;
-    constructor(field: AbstractFieldRef);
-    getField(): AbstractFieldRef;
-    setField(newField: AbstractFieldRef): void;
+    constructor(field: AbstractFieldRef | Value);
+    getField(): AbstractFieldRef | Value;
+    setField(newField: AbstractFieldRef | Value): void;
     getType(): Type;
     getUses(): Value[];
     toString(): string;
@@ -251,12 +270,15 @@ export declare abstract class AbstractBinopExpr extends AbstractExpr {
     protected inferOpType(op: Value, arkMethod: ArkMethod): void;
     private parseType;
     setType(): void;
+    setOperator(operator: BinaryOperator): void;
     inferType(arkMethod: ArkMethod): AbstractBinopExpr;
 }
 export declare class ArkConditionExpr extends AbstractBinopExpr {
     constructor(op1: Value, op2: Value, operator: RelationalBinaryOperator);
     inferType(arkMethod: ArkMethod): ArkConditionExpr;
     fillType(): void;
+    private isValueAssignWithLogicalNotExpr;
+    private isClassTypeUnionNullUndefined;
 }
 export declare class ArkNormalBinopExpr extends AbstractBinopExpr {
     constructor(op1: Value, op2: Value, operator: NormalBinaryOperator);
@@ -311,7 +333,9 @@ export declare class ArkPhiExpr extends AbstractExpr {
 export declare enum UnaryOperator {
     Neg = "-",
     BitwiseNot = "~",
-    LogicalNot = "!"
+    LogicalNot = "!",
+    Addr = "&",
+    Deref = "*"
 }
 export declare class ArkUnopExpr extends AbstractExpr {
     private op;

package/lib/core/base/Expr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Expr.d.ts","sourceRoot":"","sources":["../../../src/core/base/Expr.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Expr.d.ts","sourceRoot":"","sources":["../../../src/core/base/Expr.ts"],"names":[],"mappings":"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"}

package/lib/core/base/Expr.js

@@ -27,6 +27,19 @@ const ArkImport_1 = require("../model/ArkImport");
 const ArkClass_1 = require("../model/ArkClass");
 const ArkField_1 = require("../model/ArkField");
 const ModelUtils_1 = require("../common/ModelUtils");
+const Type_2 = require("../../frontend/cppFrontend/base/Type");
+const const_1 = require("../../frontend/cppFrontend/ast/const");
+const Stmt_1 = require("./Stmt");
+const CXX_SOURCE_EXTENSION_SET = (0, const_1.getCxxSourceFileExtensionSet)();
+function isCxxLikeFileName(fileName) {
+    const normalized = fileName.toLowerCase();
+    for (const extension of CXX_SOURCE_EXTENSION_SET) {
+        if (normalized.endsWith(extension)) {
+            return true;
+        }
+    }
+    return false;
+}
 /**
  * @category core/base/expr
  */
@@ -102,8 +115,7 @@ class AbstractInvokeExpr extends AbstractExpr {
     }
     getType() {
         const type = this.methodSignature.getType();
-        if (TypeInference_1.TypeInference.checkType(type, t => t instanceof Type_1.GenericType || t instanceof Type_1.AnyType) &&
-            this.realGenericTypes) {
+        if (TypeInference_1.TypeInference.checkType(type, t => t instanceof Type_1.GenericType || t instanceof Type_1.AnyType) && this.realGenericTypes) {
             return TypeInference_1.TypeInference.replaceTypeWithReal(type, this.realGenericTypes);
         }
         return type;
@@ -127,6 +139,10 @@ class AbstractInvokeExpr extends AbstractExpr {
         }
         return uses;
     }
+    /**
+     *Convert parameter list to string representation
+     *@ returns the formatted parameter string, including parentheses and parameter list
+     */
     argsToString() {
         const strs = [];
         strs.push('(');
@@ -162,7 +178,7 @@ class ArkInstanceInvokeExpr extends AbstractInvokeExpr {
     }
     /**
      * Returns an **array** of values used in this invoke expression,
-     * including all arguments and values each arguments used.
+     * including all arguments and values each argument used.
      * For {@link ArkInstanceInvokeExpr}, the return also contains the caller base and uses of base.
      * @returns An **array** of arguments used in the invoke expression.
      */
@@ -237,18 +253,51 @@ class ArkPtrInvokeExpr extends AbstractInvokeExpr {
     getFuncPtrLocal() {
         return this.funPtr;
     }
+    /**
+     *Infer the type of function call expression
+     *@ param arkMethod - Ark method object currently analyzed
+     *@ returns The abstract calling expression after inference
+     */
     inferType(arkMethod) {
         this.getArgs().forEach(arg => TypeInference_1.TypeInference.inferValueType(arg, arkMethod));
-        const ptrType = this.funPtr.getType();
-        if (ptrType instanceof Type_1.FunctionType) {
-            this.setMethodSignature(ptrType.getMethodSignature());
+        // CXX: If it is a Cxx function pointer, it is necessary to obtain its baseType to get method signature.
+        let typeWithoutPtr = this.funPtr.getType();
+        if (typeWithoutPtr instanceof Type_2.PointerType) {
+            typeWithoutPtr = typeWithoutPtr.getBaseType();
+        }
+        if (typeWithoutPtr instanceof Type_1.FunctionType) {
+            this.setMethodSignature(typeWithoutPtr.getMethodSignature());
         }
         IRInference_1.IRInference.inferArgs(this, arkMethod);
         return IRInference_1.IRInference.inferStaticInvokeExpr(this, arkMethod);
     }
     toString() {
+        var _a, _b, _c, _d;
         let strs = [];
         strs.push('ptrinvoke ');
+        let sig = this.getMethodSignature();
+        const sigFileName = sig.getDeclaringClassSignature().getDeclaringFileSignature().getFileName();
+        if (sigFileName === Const_1.UNKNOWN_FILE_NAME) {
+            let ptrType = this.funPtr.getType();
+            if (ptrType instanceof Type_2.PointerType) {
+                ptrType = ptrType.getBaseType();
+            }
+            if (ptrType instanceof Type_1.FunctionType) {
+                const ptrSig = ptrType.getMethodSignature();
+                const ptrFileName = ptrSig.getDeclaringClassSignature().getDeclaringFileSignature().getFileName().toLowerCase();
+                const isCxxPtrSig = isCxxLikeFileName(ptrFileName);
+                if (isCxxPtrSig) {
+                    sig = ptrSig;
+                }
+            }
+        }
+        const fileName = sig.getDeclaringClassSignature().getDeclaringFileSignature().getFileName().toLowerCase();
+        const isCxxFile = isCxxLikeFileName(fileName);
+        const ptrDeclFileName = this.funPtr instanceof Local_1.Local ?
+            (_d = (_c = (_b = (_a = this.funPtr.getDeclaringStmt()) === null || _a === void 0 ? void 0 : _a.getCfg()) === null || _b === void 0 ? void 0 : _b.getDeclaringMethod()) === null || _c === void 0 ? void 0 : _c.getDeclaringArkFile().getName().toLowerCase()) !== null && _d !== void 0 ? _d : '' :
+            '';
+        const isCxxPtrDecl = isCxxLikeFileName(ptrDeclFileName);
+        const isUnknownCxxLike = sigFileName === Const_1.UNKNOWN_FILE_NAME && isCxxPtrDecl;
         let ptrName = '';
         if (this.funPtr instanceof Local_1.Local) {
             ptrName = this.funPtr.getName();
@@ -259,9 +308,19 @@ class ArkPtrInvokeExpr extends AbstractInvokeExpr {
         else if (this.funPtr instanceof Ref_1.ArkStaticFieldRef) {
             ptrName = this.funPtr.getFieldName();
         }
-        strs.push(ptrName);
+        if (!isCxxFile && !isUnknownCxxLike) {
+            strs.push(ptrName);
+        }
         strs.push('<');
-        strs.push(this.getMethodSignature().toString());
+        // C++ function-pointer calls should render the dynamic callee variable/member name (ptrName),
+        // because the static method signature name is often generic or unknown at this point.
+        // TS/ArkTS keeps the declared signature name directly and does not need this pointer-name rewrite.
+        if ((isCxxFile || isUnknownCxxLike) && ptrName) {
+            strs.push(sig.toString().replace(/\.([^.()]+)\(/, `.${ptrName}(`));
+        }
+        else {
+            strs.push(sig.toString());
+        }
         strs.push('>');
         strs.push(super.argsToString());
         return strs.join('');
@@ -294,6 +353,11 @@ class ArkNewExpr extends AbstractExpr {
     toString() {
         return 'new ' + this.classType;
     }
+    /**
+     *Inference type method
+     *@ param arkMethod - Ark method object, the context used for type inference
+     *@ returns the ArkNewExpr instance of the current object
+     */
     inferType(arkMethod) {
         var _a, _b;
         const classSignature = this.classType.getClassSignature();
@@ -303,6 +367,7 @@ class ArkNewExpr extends AbstractExpr {
             if (TypeInference_1.TypeInference.isUnclearType(type)) {
                 type = TypeInference_1.TypeInference.inferUnclearRefName(className, arkMethod.getDeclaringArkClass());
             }
+            // If the type is an alias type, replace with the original type
             if (type instanceof Type_1.AliasType) {
                 const originalType = TypeInference_1.TypeInference.replaceAliasType(type);
                 if (originalType instanceof Type_1.FunctionType) {
@@ -376,6 +441,11 @@ class ArkNewArrayExpr extends AbstractExpr {
     }
 }
 exports.ArkNewArrayExpr = ArkNewArrayExpr;
+/**
+ * delete expression in TS/ArkTS/C++
+ *  1. TS/ArkTS: delete a.b
+ *  2. c++: delete a / delete a.b / delete a->b
+ */
 class ArkDeleteExpr extends AbstractExpr {
     constructor(field) {
         super();
@@ -500,7 +570,7 @@ var RelationalBinaryOperator;
     RelationalBinaryOperator["StrictInequality"] = "!==";
     RelationalBinaryOperator["isPropertyOf"] = "in";
 })(RelationalBinaryOperator = exports.RelationalBinaryOperator || (exports.RelationalBinaryOperator = {}));
-// 二元运算表达式
+// Binary operation expression
 class AbstractBinopExpr extends AbstractExpr {
     constructor(op1, op2, operator) {
         super();
@@ -648,6 +718,9 @@ class AbstractBinopExpr extends AbstractExpr {
         }
         this.type = type;
     }
+    setOperator(operator) {
+        this.operator = operator;
+    }
     inferType(arkMethod) {
         this.inferOpType(this.op1, arkMethod);
         this.inferOpType(this.op2, arkMethod);
@@ -663,26 +736,72 @@ class ArkConditionExpr extends AbstractBinopExpr {
     inferType(arkMethod) {
         this.inferOpType(this.op1, arkMethod);
         const op1Type = this.op1.getType();
-        if (this.operator === RelationalBinaryOperator.InEquality && this.op2 === ValueUtil_1.ValueUtil.getOrCreateNumberConst(0)) {
-            if (op1Type instanceof Type_1.StringType) {
-                this.op2 = ValueUtil_1.ValueUtil.createStringConst(ValueUtil_1.EMPTY_STRING);
-            }
-            else if (op1Type instanceof Type_1.BooleanType) {
-                this.op2 = ValueUtil_1.ValueUtil.getBooleanConstant(false);
+        this.type = Type_1.BooleanType.getInstance();
+        if (this.operator !== RelationalBinaryOperator.InEquality || this.op2 !== ValueUtil_1.ValueUtil.getOrCreateNumberConst(0)) {
+            this.inferOpType(this.getOp2(), arkMethod);
+            return this;
+        }
+        if (op1Type instanceof Type_1.StringType) {
+            this.op2 = ValueUtil_1.ValueUtil.createStringConst(ValueUtil_1.EMPTY_STRING);
+        }
+        else if (op1Type instanceof Type_1.BooleanType) {
+            this.op2 = ValueUtil_1.ValueUtil.getBooleanConstant(false);
+        }
+        else if (op1Type instanceof Type_1.ClassType || op1Type instanceof Type_1.UnknownType || op1Type instanceof Type_1.UnclearReferenceType) {
+            const newOp1 = this.isValueAssignWithLogicalNotExpr(this.op1);
+            if (newOp1) {
+                this.op1 = newOp1;
+                this.operator = RelationalBinaryOperator.Equality;
             }
-            else if (op1Type instanceof Type_1.ClassType) {
+            this.op2 = ValueUtil_1.ValueUtil.getUndefinedConst();
+        }
+        else if (op1Type instanceof Type_1.UnionType) {
+            if (this.isClassTypeUnionNullUndefined(op1Type)) {
+                const newOp1 = this.isValueAssignWithLogicalNotExpr(this.op1);
+                if (newOp1) {
+                    this.op1 = newOp1;
+                    this.operator = RelationalBinaryOperator.Equality;
+                }
                 this.op2 = ValueUtil_1.ValueUtil.getUndefinedConst();
             }
         }
-        else {
-            this.inferOpType(this.getOp2(), arkMethod);
-        }
-        this.type = Type_1.BooleanType.getInstance();
         return this;
     }
     fillType() {
         this.type = Type_1.BooleanType.getInstance();
     }
+    isValueAssignWithLogicalNotExpr(op) {
+        if (!(op instanceof Local_1.Local)) {
+            return null;
+        }
+        const declaringStmt = op.getDeclaringStmt();
+        if (!declaringStmt || !(declaringStmt instanceof Stmt_1.ArkAssignStmt)) {
+            return null;
+        }
+        const rightOp = declaringStmt.getRightOp();
+        if (rightOp instanceof ArkUnopExpr && rightOp.getOperator() === UnaryOperator.LogicalNot) {
+            return rightOp.getOp();
+        }
+        return null;
+    }
+    isClassTypeUnionNullUndefined(unionType) {
+        const types = unionType.getTypes();
+        let findClassType = false;
+        for (const t of types) {
+            if (t instanceof Type_1.NullType || t instanceof Type_1.UndefinedType) {
+                continue;
+            }
+            if (t instanceof Type_1.ClassType) {
+                if (findClassType) {
+                    return false;
+                }
+                findClassType = true;
+                continue;
+            }
+            return false;
+        }
+        return findClassType;
+    }
 }
 exports.ArkConditionExpr = ArkConditionExpr;
 class ArkNormalBinopExpr extends AbstractBinopExpr {
@@ -764,7 +883,7 @@ class ArkInstanceOfExpr extends AbstractExpr {
     }
 }
 exports.ArkInstanceOfExpr = ArkInstanceOfExpr;
-// 类型转换
+// Type conversion
 class ArkCastExpr extends AbstractExpr {
     constructor(op, type) {
         super();
@@ -851,6 +970,9 @@ var UnaryOperator;
     UnaryOperator["Neg"] = "-";
     UnaryOperator["BitwiseNot"] = "~";
     UnaryOperator["LogicalNot"] = "!";
+    // The following are C++ specific unary operator.
+    UnaryOperator["Addr"] = "&";
+    UnaryOperator["Deref"] = "*";
 })(UnaryOperator = exports.UnaryOperator || (exports.UnaryOperator = {}));
 // unary operation expression
 class ArkUnopExpr extends AbstractExpr {
@@ -997,7 +1119,7 @@ class AliasTypeExpr extends AbstractExpr {
             return `${typeOf}${typeObject.getSignature().toString()}<${this.getRealGenericTypes().join(',')}>`;
         }
         if (typeObject instanceof Type_1.Type) {
-            return `${typeOf}${typeObject.getTypeString()}`;
+            return `${typeOf}${typeObject.toString()}`;
         }
         if (typeObject instanceof ArkImport_1.ImportInfo) {
             let res = `${typeOf}import('${typeObject.getFrom()}')`;

package/lib/core/base/Position.d.ts

@@ -1,4 +1,5 @@
 import ts from 'ohos-typescript';
+import { CxxAstNode } from '../../frontend/cppFrontend/ast/ArkCxxAstNode';
 export type LineCol = number;
 export declare function setLine(lineCol: LineCol, lineNo: number): LineCol;
 export declare function setCol(lineCol: LineCol, colNo: number): LineCol;
@@ -15,6 +16,12 @@ export declare class LineColPosition {
     getLineNo(): number;
     getColNo(): number;
     static buildFromNode(node: ts.Node, sourceFile: ts.SourceFile): LineColPosition;
+    /**
+     * Builds a LineColPosition object from a CxxAstNode.
+     * @param node - The C++ AST node.
+     * @returns A LineColPosition object containing the line and character information. Default LineColPosition is (0, 0).
+     */
+    static cxxBuildFromNode(node: CxxAstNode): LineColPosition;
 }
 export declare class FullPosition {
     private readonly first;
@@ -26,6 +33,13 @@ export declare class FullPosition {
     getFirstCol(): number;
     getLastCol(): number;
     static buildFromNode(node: ts.Node, sourceFile: ts.SourceFile): FullPosition;
+    /**
+     *Building a FullPosition object from a C++AST node
+     *@ param node C++AST node, possibly undefined
+     *@ param_sourceFile source file node (not used)
+     *@ returns The FullPosition object containing location information
+     */
+    static cxxBuildFromNode(node: CxxAstNode | undefined, _sourceFile: CxxAstNode): FullPosition;
     static merge(leftMostPosition: FullPosition, rightMostPosition: FullPosition): FullPosition;
 }
 //# sourceMappingURL=Position.d.ts.map