arkanalyzer 1.0.87 → 1.0.88

package/lib/frontend/cppFrontend/common/IRInference.js

@@ -43,7 +43,7 @@ exports.IRInference = void 0;
  */
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importStar(require("path"));
-const const_1 = require("../ast/const");
+const ast_1 = require("../ast");
 const ArkMethod_1 = require("../../../core/model/ArkMethod");
 const Type_1 = require("../../../core/base/Type");
 const Local_1 = require("../../../core/base/Local");
@@ -962,7 +962,7 @@ class IRInference {
      */
     static getCxxHeaderFileRefMap(files, includeDirs) {
         const headerFileRefMap = new Map();
-        const cxxSuffixes = (0, const_1.getCxxImplementationFileExtensions)();
+        const cxxSuffixes = (0, ast_1.getCxxImplementationFileExtensions)();
         files.forEach(file => {
             const filePath = (0, path_1.normalize)(file.getFilePath());
             const extension = path_1.default.extname(filePath).toLowerCase();

package/lib/frontend/cppFrontend/common/IRUtils.d.ts

@@ -5,7 +5,7 @@ import { CommentsMetadata } from '../../../core/model/ArkMetadata';
 import { Stmt } from '../../../core/base/Stmt';
 import { ArkBaseModel } from '../../../core/model/ArkBaseModel';
 import { FullPosition } from '../../../core/base/Position';
-import { CxxAstNode } from '../ast/ArkCxxAstNode';
+import { CxxAstNode } from '../ast';
 import { CxxClosureCaptureType } from '../base/Ref';
 export declare class IRUtils {
     static moreThanOneAddress(value: Value): boolean;

package/lib/frontend/cppFrontend/common/IRUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IRUtils.d.ts","sourceRoot":"","sources":["../../../../src/frontend/cppFrontend/common/IRUtils.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAgC,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACjG,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAG3D,OAAO,EAAW,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEpD,qBAAa,OAAO;WACF,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;WAczC,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;WAWvC,WAAW,CAAC,QAAQ,EAAE,IAAI,GAAG,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI;WAYjH,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,GAAG,gBAAgB;WAS1H,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;WAIlC,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,GAAG,MAAM;WAYlD,8BAA8B,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,GAAG,IAAI;WAqClF,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY,EAAE;WAQvD,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;WAmB5C,2BAA2B,CAAC,WAAW,EAAE,MAAM,GAAG,qBAAqB,GAAG,IAAI;WAc9E,4BAA4B,CAAC,UAAU,EAAE,UAAU,GAAG,UAAU,EAAE;CAUnF"}
+{"version":3,"file":"IRUtils.d.ts","sourceRoot":"","sources":["../../../../src/frontend/cppFrontend/common/IRUtils.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAgC,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACjG,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAG3D,OAAO,EAAW,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEpD,qBAAa,OAAO;WACF,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;WAczC,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;WAWvC,WAAW,CAAC,QAAQ,EAAE,IAAI,GAAG,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI;WAYjH,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,GAAG,gBAAgB;WAS1H,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;WAIlC,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,GAAG,MAAM;WAYlD,8BAA8B,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,GAAG,IAAI;WAqClF,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY,EAAE;WAQvD,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;WAmB5C,2BAA2B,CAAC,WAAW,EAAE,MAAM,GAAG,qBAAqB,GAAG,IAAI;WAc9E,4BAA4B,CAAC,UAAU,EAAE,UAAU,GAAG,UAAU,EAAE;CAUnF"}

package/lib/frontend/cppFrontend/common/IRUtils.js

@@ -21,7 +21,7 @@ const ArkMetadata_1 = require("../../../core/model/ArkMetadata");
 const Position_1 = require("../../../core/base/Position");
 const Local_1 = require("../../../core/base/Local");
 const Const_1 = require("../../../core/common/Const");
-const ArkCxxAstNode_1 = require("../ast/ArkCxxAstNode");
+const ast_1 = require("../ast");
 const Ref_2 = require("../base/Ref");
 class IRUtils {
     static moreThanOneAddress(value) {
@@ -157,7 +157,7 @@ class IRUtils {
     static getLambdaExplicitCaptureVars(lambdaExpr) {
         const captureNodes = [];
         for (const child of lambdaExpr.inner) {
-            if (child.kind === ArkCxxAstNode_1.astKind.ParmVarDecl || child.kind === ArkCxxAstNode_1.astKind.CompoundStmt) {
+            if (child.kind === ast_1.astKind.ParmVarDecl || child.kind === ast_1.astKind.CompoundStmt) {
                 return captureNodes;
             }
             captureNodes.push(child);

package/lib/frontend/cppFrontend/graph/builder/CfgBuilder.d.ts

@@ -7,7 +7,7 @@ import { AliasType } from '../../../../core/base/Type';
 import { CxxTrap } from '../../base/Trap';
 import { GlobalRef } from '../../../../core/base/Ref';
 import { Catch, Variable, Scope } from '../../../../core/graph/builder/CfgBuilder';
-import { CxxAstNode } from '../../ast/ArkCxxAstNode';
+import { CxxAstNode } from '../../ast';
 export declare class BlockBuilder {
     id: number;
     stmts: StatementBuilder[];

package/lib/frontend/cppFrontend/graph/builder/CfgBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CfgBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/frontend/cppFrontend/graph/builder/CfgBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CfgBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/frontend/cppFrontend/graph/builder/CfgBuilder.ts"],"names":[],"mappings":"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"}

package/lib/frontend/cppFrontend/graph/builder/CfgBuilder.js

@@ -30,7 +30,7 @@ const ArkBaseModel_1 = require("../../../../core/model/ArkBaseModel");
 const CfgBuilder_1 = require("../../../../core/graph/builder/CfgBuilder");
 const ModelUtils_1 = require("../../../../core/common/ModelUtils");
 const TSConst_1 = require("../../../../core/common/TSConst");
-const ArkCxxAstNode_1 = require("../../ast/ArkCxxAstNode");
+const ast_1 = require("../../ast");
 const LoopBuilder_1 = require("./LoopBuilder");
 const IfBuilder_1 = require("./IfBuilder");
 class BlockBuilder {
@@ -197,7 +197,7 @@ class CfgBuilder {
         ifstm.condition = c.inner[0].code;
         ifstm.code = 'if (' + ifstm.condition + ')';
         if (c.inner.length >= 2) { // length >= 2 means there is a condition and a body
-            if (c.inner[1].kind === ArkCxxAstNode_1.astKind.CompoundStmt) {
+            if (c.inner[1].kind === ast_1.astKind.CompoundStmt) {
                 // Body is a braced block { ... }
                 this.walkAST(ifstm, ifexit, [...c.inner[1].inner]);
             }
@@ -211,7 +211,7 @@ class CfgBuilder {
             this.walkAST(ifstm, ifexit, [c.inner[0]]);
         }
         if (c.inner.length > 2) {
-            if (c.inner[2].kind === ArkCxxAstNode_1.astKind.CompoundStmt) {
+            if (c.inner[2].kind === ast_1.astKind.CompoundStmt) {
                 // Handle else here
                 this.walkAST(ifstm, ifexit, [...c.inner[2].inner]);
             }
@@ -242,14 +242,14 @@ class CfgBuilder {
         loopstm.condition = c.inner[0].code;
         loopstm.code = 'while (' + loopstm.condition + ')';
         if (c.inner.length >= 2) {
-            if (c.inner[1].kind === ArkCxxAstNode_1.astKind.CompoundStmt) {
+            if (c.inner[1].kind === ast_1.astKind.CompoundStmt) {
                 this.walkAST(loopstm, loopstm, [...c.inner[1].inner]);
             }
             else {
                 this.walkAST(loopstm, loopstm, [c.inner[1]]);
             }
         }
-        else if (c.inner.length === 1 && c.inner[0].kind.toString() === ArkCxxAstNode_1.astKind.CompoundStmt) {
+        else if (c.inner.length === 1 && c.inner[0].kind.toString() === ast_1.astKind.CompoundStmt) {
             this.walkAST(loopstm, loopstm, [c.inner[0]]);
         }
         if (!loopstm.nextF) {
@@ -280,7 +280,7 @@ class CfgBuilder {
         loopstm.nextF = loopExit;
         loopExit.lasts.add(loopstm);
         loopstm.code = this.getPrefix(c.code, ' {\r\n');
-        if (c.inner[c.inner.length - 1].kind === ArkCxxAstNode_1.astKind.CompoundStmt) {
+        if (c.inner[c.inner.length - 1].kind === ast_1.astKind.CompoundStmt) {
             this.walkAST(loopstm, loopstm, [...c.inner[c.inner.length - 1].inner]);
         }
         else {
@@ -341,7 +341,7 @@ class CfgBuilder {
     sliceCaseDefaultNode(node, clauses) {
         if (node.kind === 'CaseStmt') {
             for (let i = 0; i < node.inner.length; i++) {
-                let isCaseOrDefault = node.inner[i].kind === ArkCxxAstNode_1.astKind.CaseStmt || node.inner[i].kind === ArkCxxAstNode_1.astKind.DefaultStmt;
+                let isCaseOrDefault = node.inner[i].kind === ast_1.astKind.CaseStmt || node.inner[i].kind === ast_1.astKind.DefaultStmt;
                 if (isCaseOrDefault) {
                     clauses.push(node);
                     this.sliceCaseDefaultNode(node.inner[i], clauses);
@@ -372,7 +372,7 @@ class CfgBuilder {
             if (['CaseStmt', 'DefaultStmt'].includes(curr.kind)) {
                 curr.parent = switchNode.inner[length - 1];
                 // Reconstruct the syntax tree structure
-                while (idx + 1 < arr.length && ![ArkCxxAstNode_1.astKind.CaseStmt, ArkCxxAstNode_1.astKind.DefaultStmt].includes(arr[idx + 1].kind)) {
+                while (idx + 1 < arr.length && ![ast_1.astKind.CaseStmt, ast_1.astKind.DefaultStmt].includes(arr[idx + 1].kind)) {
                     arr[idx + 1].parent = curr;
                     curr.inner.push(arr[idx + 1]);
                     idx++;
@@ -451,12 +451,12 @@ class CfgBuilder {
             while (childInner.inner && childInner.inner.length > 0) {
                 const n0 = childInner.inner[0];
                 const innerKind = n0 === null || n0 === void 0 ? void 0 : n0.kind;
-                if (innerKind === ArkCxxAstNode_1.astKind.DeclRefExpr) {
+                if (innerKind === ast_1.astKind.DeclRefExpr) {
                     // 3) Safely read referencedDecl? .name； Use n0. name/n0. code/empty string at the bottom
                     caller = ((_b = n0.referencedDecl) === null || _b === void 0 ? void 0 : _b.name) || n0.name || n0.code || '';
                     break;
                 }
-                if (innerKind === ArkCxxAstNode_1.astKind.ImplicitCastExpr) {
+                if (innerKind === ast_1.astKind.ImplicitCastExpr) {
                     childInner = n0; // Continue to traverse downward
                     continue;
                 }
@@ -585,10 +585,10 @@ class CfgBuilder {
         let tryBlock = undefined;
         let catchBlockList = [];
         for (const node of c.inner) {
-            if (node.kind === ArkCxxAstNode_1.astKind.CompoundStmt) {
+            if (node.kind === ast_1.astKind.CompoundStmt) {
                 tryBlock = node;
             }
-            else if (node.kind === ArkCxxAstNode_1.astKind.CXXCatchStmt) {
+            else if (node.kind === ast_1.astKind.CXXCatchStmt) {
                 catchBlockList.push(node);
             }
         }
@@ -639,13 +639,13 @@ class CfgBuilder {
     hitsControlBoundaryBeforeRoot(node) {
         var _a, _b, _c;
         const CONTROL_BOUNDARY_KINDS = new Set([
-            ArkCxxAstNode_1.astKind.IfStmt,
-            ArkCxxAstNode_1.astKind.WhileStmt,
-            ArkCxxAstNode_1.astKind.DoStmt,
-            ArkCxxAstNode_1.astKind.ForStmt,
-            ArkCxxAstNode_1.astKind.CaseStmt,
-            ArkCxxAstNode_1.astKind.DefaultStmt,
-            ArkCxxAstNode_1.astKind.CXXTryStmt,
+            ast_1.astKind.IfStmt,
+            ast_1.astKind.WhileStmt,
+            ast_1.astKind.DoStmt,
+            ast_1.astKind.ForStmt,
+            ast_1.astKind.CaseStmt,
+            ast_1.astKind.DefaultStmt,
+            ast_1.astKind.CXXTryStmt,
         ]);
         let p = node;
         const rootId = this.astRoot.id;
@@ -668,17 +668,17 @@ class CfgBuilder {
             if (nodeKind === 'LabelStmt' && this.gotoStmtMap.get(innerNode.name) !== undefined) {
                 gotoLabel = false;
             }
-            if (gotoLabel && nodeKind !== ArkCxxAstNode_1.astKind.CompoundStmt) { // Skip the code between goto and label in the code block
+            if (gotoLabel && nodeKind !== ast_1.astKind.CompoundStmt) { // Skip the code between goto and label in the code block
                 continue;
             }
             lastStatement = this.handleASTStmtSuccession(innerNode, lastStatement, scope);
-            if (nodeKind === ArkCxxAstNode_1.astKind.ReturnStmt) {
+            if (nodeKind === ast_1.astKind.ReturnStmt) {
                 break;
             }
-            else if (nodeKind === ArkCxxAstNode_1.astKind.BreakStmt || nodeKind === ArkCxxAstNode_1.astKind.ContinueStmt) {
+            else if (nodeKind === ast_1.astKind.BreakStmt || nodeKind === ast_1.astKind.ContinueStmt) {
                 return;
             }
-            else if (nodeKind === ArkCxxAstNode_1.astKind.GotoStmt) {
+            else if (nodeKind === ast_1.astKind.GotoStmt) {
                 if (this.hitsControlBoundaryBeforeRoot(innerNode)) {
                     return;
                 }
@@ -693,85 +693,85 @@ class CfgBuilder {
         let s;
         // 直接使用 innerNode.kind 进行 switch
         switch (innerNode.kind) {
-            case ArkCxxAstNode_1.astKind.AtomicCallExpr:
-            case ArkCxxAstNode_1.astKind.BinaryOperator:
-            case ArkCxxAstNode_1.astKind.CallExpr:
-            case ArkCxxAstNode_1.astKind.CompoundAssignOperator:
-            case ArkCxxAstNode_1.astKind.CXXConstructExpr:
-            case ArkCxxAstNode_1.astKind.CXXCtorInitializer:
-            case ArkCxxAstNode_1.astKind.CXXDeleteExpr:
-            case ArkCxxAstNode_1.astKind.CXXOperatorCallExpr:
-            case ArkCxxAstNode_1.astKind.CXXThrowExpr:
-            case ArkCxxAstNode_1.astKind.DeclStmt:
-            case ArkCxxAstNode_1.astKind.RecoveryExpr:
-            case ArkCxxAstNode_1.astKind.TypedefDecl:
-            case ArkCxxAstNode_1.astKind.TypeAliasDecl:
-            case ArkCxxAstNode_1.astKind.TypeAliasTemplateDecl:
-            case ArkCxxAstNode_1.astKind.UnaryOperator:
-            case ArkCxxAstNode_1.astKind.VarDecl:
+            case ast_1.astKind.AtomicCallExpr:
+            case ast_1.astKind.BinaryOperator:
+            case ast_1.astKind.CallExpr:
+            case ast_1.astKind.CompoundAssignOperator:
+            case ast_1.astKind.CXXConstructExpr:
+            case ast_1.astKind.CXXCtorInitializer:
+            case ast_1.astKind.CXXDeleteExpr:
+            case ast_1.astKind.CXXOperatorCallExpr:
+            case ast_1.astKind.CXXThrowExpr:
+            case ast_1.astKind.DeclStmt:
+            case ast_1.astKind.RecoveryExpr:
+            case ast_1.astKind.TypedefDecl:
+            case ast_1.astKind.TypeAliasDecl:
+            case ast_1.astKind.TypeAliasTemplateDecl:
+            case ast_1.astKind.UnaryOperator:
+            case ast_1.astKind.VarDecl:
                 s = new StatementBuilder('statement', innerNode.code, innerNode, scope.id);
                 this.judgeLastType(s, lastStatement);
                 lastStatement = s;
                 break;
-            case ArkCxxAstNode_1.astKind.BreakStmt:
+            case ast_1.astKind.BreakStmt:
                 this.ASTNodeBreakStatement(innerNode, lastStatement);
                 break;
-            case ArkCxxAstNode_1.astKind.CompoundStmt:
+            case ast_1.astKind.CompoundStmt:
                 let blockExit = new StatementBuilder('blockExit', '', innerNode, scope.id);
                 this.exits.push(blockExit);
                 this.walkAST(lastStatement, blockExit, [...innerNode.inner]);
                 lastStatement = blockExit;
                 break;
-            case ArkCxxAstNode_1.astKind.ContinueStmt:
+            case ast_1.astKind.ContinueStmt:
                 const lastLoop = this.loopStack[this.loopStack.length - 1];
                 this.judgeLastType(lastLoop, lastStatement);
                 lastLoop.lasts.add(lastStatement);
                 break;
-            case ArkCxxAstNode_1.astKind.CXXMemberCallExpr:
+            case ast_1.astKind.CXXMemberCallExpr:
                 lastStatement = this.ASTNodeCXXMemberCallExpr(innerNode, lastStatement, scope.id);
                 break;
-            case ArkCxxAstNode_1.astKind.CXXForRangeStmt:
-            case ArkCxxAstNode_1.astKind.ForStmt:
+            case ast_1.astKind.CXXForRangeStmt:
+            case ast_1.astKind.ForStmt:
                 lastStatement = this.ASTNodeForStatement(innerNode, lastStatement, scope.id);
                 break;
-            case ArkCxxAstNode_1.astKind.CXXTryStmt:
+            case ast_1.astKind.CXXTryStmt:
                 lastStatement = this.ASTNodeTryStatement(innerNode, lastStatement, scope.id);
                 break;
-            case ArkCxxAstNode_1.astKind.DoStmt:
+            case ast_1.astKind.DoStmt:
                 lastStatement = this.ASTNodeDoStatement(innerNode, lastStatement, scope.id);
                 break;
-            case ArkCxxAstNode_1.astKind.ExprWithCleanups:
+            case ast_1.astKind.ExprWithCleanups:
                 lastStatement = this.ASTNodeImplicitCastExpr(innerNode, lastStatement, scope);
                 break;
-            case ArkCxxAstNode_1.astKind.GotoStmt:
-            case ArkCxxAstNode_1.astKind.IndirectGotoStmt:
+            case ast_1.astKind.GotoStmt:
+            case ast_1.astKind.IndirectGotoStmt:
                 this.ASTNodeGotoStatement(innerNode, lastStatement, scope.id);
                 break;
-            case ArkCxxAstNode_1.astKind.IfStmt:
+            case ast_1.astKind.IfStmt:
                 lastStatement = this.ASTNodeIfStatement(innerNode, lastStatement, scope.id);
                 break;
-            case ArkCxxAstNode_1.astKind.LabelStmt:
+            case ast_1.astKind.LabelStmt:
                 lastStatement = this.ASTNodeLabelStatement(innerNode, lastStatement, scope.id);
                 break;
-            case ArkCxxAstNode_1.astKind.ReturnStmt:
+            case ast_1.astKind.ReturnStmt:
                 s = new StatementBuilder('returnStatement', innerNode.code, innerNode, scope.id);
                 this.judgeLastType(s, lastStatement);
                 lastStatement = s;
                 break;
-            case ArkCxxAstNode_1.astKind.SwitchStmt:
+            case ast_1.astKind.SwitchStmt:
                 lastStatement = this.ASTNodeSwitchStatement(innerNode, lastStatement, scope.id);
                 break;
-            case ArkCxxAstNode_1.astKind.WhileStmt:
+            case ast_1.astKind.WhileStmt:
                 lastStatement = this.ASTNodeWhileStatement(innerNode, lastStatement, scope.id);
                 break;
-            case ArkCxxAstNode_1.astKind.NullStmt:
+            case ast_1.astKind.NullStmt:
                 break;
-            case ArkCxxAstNode_1.astKind.ParmVarDecl:
+            case ast_1.astKind.ParmVarDecl:
                 s = new StatementBuilder('statement', 'ParmVarDecl', innerNode, scope.id);
                 this.judgeLastType(s, lastStatement);
                 lastStatement = s;
                 break;
-            case ArkCxxAstNode_1.astKind.ImplicitCastExpr:
+            case ast_1.astKind.ImplicitCastExpr:
                 lastStatement = this.ASTNodeImplicitCastExpr(innerNode, lastStatement, scope);
                 break;
             default:
@@ -1035,7 +1035,7 @@ class CfgBuilder {
         if (notReturnStmts.length === 1 && notReturnStmts[0].block) {
             let p = notReturnStmts[0].astNode;
             while (p && p.id !== this.astRoot.id) {
-                if (p.kind === ArkCxxAstNode_1.astKind.CXXTryStmt || p.kind === ArkCxxAstNode_1.astKind.SwitchStmt) {
+                if (p.kind === ast_1.astKind.CXXTryStmt || p.kind === ast_1.astKind.SwitchStmt) {
                     TryOrSwitchExit = true;
                     break;
                 }
@@ -1137,19 +1137,19 @@ class CfgBuilder {
         if (this.astRoot.inner) {
             for (let i = 0; i < this.astRoot.inner.length; i++) {
                 const allowedInnerKinds = [
-                    ArkCxxAstNode_1.astKind.CXXConstructExpr,
-                    ArkCxxAstNode_1.astKind.CXXCtorInitializer
+                    ast_1.astKind.CXXConstructExpr,
+                    ast_1.astKind.CXXCtorInitializer
                 ];
-                if (this.astRoot.kind === ArkCxxAstNode_1.astKind.CXXConstructorDecl && allowedInnerKinds.includes(this.astRoot.inner[i].kind)) {
+                if (this.astRoot.kind === ast_1.astKind.CXXConstructorDecl && allowedInnerKinds.includes(this.astRoot.inner[i].kind)) {
                     stmts.push(this.astRoot.inner[i]);
                 }
                 const length = this.astRoot.inner[i].inner.length;
-                if (this.astRoot.inner[i].kind === ArkCxxAstNode_1.astKind.ParmVarDecl && length > 0 &&
-                    this.astRoot.inner[i].inner[length - 1].kind !== ArkCxxAstNode_1.astKind.TypeRef) {
+                if (this.astRoot.inner[i].kind === ast_1.astKind.ParmVarDecl && length > 0 &&
+                    this.astRoot.inner[i].inner[length - 1].kind !== ast_1.astKind.TypeRef) {
                     stmts.push(this.astRoot.inner[i]);
                     continue;
                 }
-                if (this.astRoot.inner[i].kind === ArkCxxAstNode_1.astKind.CompoundStmt) {
+                if (this.astRoot.inner[i].kind === ast_1.astKind.CompoundStmt) {
                     stmts.push(...this.astRoot.inner[i].inner);
                     break;
                 }
@@ -1160,16 +1160,16 @@ class CfgBuilder {
     buildCfgBuilder() {
         let stmts = [];
         const translationUnitKinds = [
-            ArkCxxAstNode_1.astKind.TranslationUnitDecl,
-            ArkCxxAstNode_1.astKind.NamespaceDecl
+            ast_1.astKind.TranslationUnitDecl,
+            ast_1.astKind.NamespaceDecl
         ];
         const functionKinds = [
-            ArkCxxAstNode_1.astKind.FunctionDecl,
-            ArkCxxAstNode_1.astKind.CXXMethodDecl,
-            ArkCxxAstNode_1.astKind.CXXConstructorDecl,
-            ArkCxxAstNode_1.astKind.LambdaExpr,
-            ArkCxxAstNode_1.astKind.FunctionTemplateDecl,
-            ArkCxxAstNode_1.astKind.CXXDestructorDecl
+            ast_1.astKind.FunctionDecl,
+            ast_1.astKind.CXXMethodDecl,
+            ast_1.astKind.CXXConstructorDecl,
+            ast_1.astKind.LambdaExpr,
+            ast_1.astKind.FunctionTemplateDecl,
+            ast_1.astKind.CXXDestructorDecl
         ];
         if (translationUnitKinds.includes(this.astRoot.kind)) {
             stmts = [...this.astRoot.inner];
@@ -1191,7 +1191,7 @@ class CfgBuilder {
         return this.emptyBody;
     }
     buildCfg() {
-        if (this.astRoot.kind === ArkCxxAstNode_1.astKind.LambdaExpr && this.astRoot.inner[this.astRoot.inner.length - 1].kind !== ArkCxxAstNode_1.astKind.CompoundStmt) {
+        if (this.astRoot.kind === ast_1.astKind.LambdaExpr && this.astRoot.inner[this.astRoot.inner.length - 1].kind !== ast_1.astKind.CompoundStmt) {
             return this.buildCfgForSimpleArrowFunction();
         }
         return this.buildNormalCfg();

package/lib/frontend/cppFrontend/model/builder/ArkClassBuilder.d.ts

@@ -2,7 +2,7 @@ import { ArkFile } from '../../../../core/model/ArkFile';
 import { ArkMethod } from '../../../../core/model/ArkMethod';
 import { ArkNamespace } from '../../../../core/model/ArkNamespace';
 import { ArkClass } from '../../../../core/model/ArkClass';
-import { CxxAstNode } from '../../ast/ArkCxxAstNode';
+import { CxxAstNode } from '../../ast';
 export declare function buildNormalArkClassFromArkMethod(clsNode: CxxAstNode, cls: ArkClass, sourceFile: CxxAstNode, declaring?: ArkMethod | ArkClass): void;
 export declare function buildNormalArkClassFromArkFile(clsNode: CxxAstNode, arkFile: ArkFile, cls: ArkClass, sourceFile: CxxAstNode, declaring?: ArkMethod | ArkClass): void;
 export declare function buildNormalArkClassFromArkNamespace(clsNode: CxxAstNode, arkNamespace: ArkNamespace, cls: ArkClass, sourceFile: CxxAstNode, declaring?: ArkMethod | ArkClass): void;

package/lib/frontend/cppFrontend/model/builder/ArkClassBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkClassBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/frontend/cppFrontend/model/builder/ArkClassBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAEnE,OAAO,EAAE,QAAQ,EAAwC,MAAM,iCAAiC,CAAC;AAUjG,OAAO,EAAE,UAAU,EAA8C,MAAM,yBAAyB,CAAC;AAcjG,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,IAAI,CAOnJ;AAED,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EACpD,UAAU,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,IAAI,CAQ7G;AAED,wBAAgB,mCAAmC,CAC/C,OAAO,EAAE,UAAU,EACnB,YAAY,EAAE,YAAY,EAC1B,GAAG,EAAE,QAAQ,EACb,UAAU,EAAE,UAAU,EACtB,SAAS,CAAC,EAAE,SAAS,GAAG,QAAQ,GACjC,IAAI,CASN;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,IAAI,CAwBtI;AA+PD,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI,CAInH"}
+{"version":3,"file":"ArkClassBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/frontend/cppFrontend/model/builder/ArkClassBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAEnE,OAAO,EAAE,QAAQ,EAAwC,MAAM,iCAAiC,CAAC;AAUjG,OAAO,EAAE,UAAU,EAA8C,MAAM,WAAW,CAAC;AAcnF,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,IAAI,CAOnJ;AAED,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EACpD,UAAU,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,IAAI,CAQ7G;AAED,wBAAgB,mCAAmC,CAC/C,OAAO,EAAE,UAAU,EACnB,YAAY,EAAE,YAAY,EAC1B,GAAG,EAAE,QAAQ,EACb,UAAU,EAAE,UAAU,EACtB,SAAS,CAAC,EAAE,SAAS,GAAG,QAAQ,GACjC,IAAI,CASN;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,IAAI,CAwBtI;AA+PD,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI,CAInH"}

package/lib/frontend/cppFrontend/model/builder/ArkClassBuilder.js

@@ -50,7 +50,7 @@ const IRUtils_1 = require("../../common/IRUtils");
 const ArkSignature_1 = require("../../../../core/model/ArkSignature");
 const ArkClassBuilder_1 = require("../../../../core/model/builder/ArkClassBuilder");
 const ArkIRTransformer_1 = require("../../common/ArkIRTransformer");
-const ArkCxxAstNode_1 = require("../../ast/ArkCxxAstNode");
+const ast_1 = require("../../ast");
 const ArkField_1 = require("../../../../core/model/ArkField");
 const Constant_1 = require("../../../../core/base/Constant");
 const ValueUtil_1 = require("../../../../core/common/ValueUtil");
@@ -74,7 +74,7 @@ exports.buildNormalArkClassFromArkMethod = buildNormalArkClassFromArkMethod;
 function buildNormalArkClassFromArkFile(clsNode, arkFile, cls, sourceFile, declaring) {
     cls.setDeclaringArkFile(arkFile);
     cls.setCode(clsNode.code);
-    const nodePos = (0, ArkCxxAstNode_1.getNodeStartLineAndCol)(clsNode);
+    const nodePos = (0, ast_1.getNodeStartLineAndCol)(clsNode);
     cls.setLine(nodePos.line);
     cls.setColumn(nodePos.col);
     buildNormalArkClass(clsNode, cls, sourceFile, declaring);
@@ -85,7 +85,7 @@ function buildNormalArkClassFromArkNamespace(clsNode, arkNamespace, cls, sourceF
     cls.setDeclaringArkNamespace(arkNamespace);
     cls.setDeclaringArkFile(arkNamespace.getDeclaringArkFile());
     cls.setCode(clsNode.code);
-    const nodePos = (0, ArkCxxAstNode_1.getNodeStartLineAndCol)(clsNode);
+    const nodePos = (0, ast_1.getNodeStartLineAndCol)(clsNode);
     cls.setLine(nodePos.line);
     cls.setColumn(nodePos.col);
     buildNormalArkClass(clsNode, cls, sourceFile, declaring);

package/lib/frontend/cppFrontend/model/builder/ArkFieldBuilder.d.ts

@@ -1,5 +1,5 @@
 import { ArkField } from '../../../../core/model/ArkField';
 import { ArkClass } from '../../../../core/model/ArkClass';
-import { CxxAstNode } from '../../ast/ArkCxxAstNode';
+import { CxxAstNode } from '../../ast';
 export declare function buildProperty2ArkField(member: CxxAstNode, sourceFile: CxxAstNode, cls: ArkClass): ArkField;
 //# sourceMappingURL=ArkFieldBuilder.d.ts.map

package/lib/frontend/cppFrontend/model/builder/ArkFieldBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkFieldBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/frontend/cppFrontend/model/builder/ArkFieldBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAiB,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAQ3D,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,GAAG,QAAQ,CAuB1G"}
+{"version":3,"file":"ArkFieldBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/frontend/cppFrontend/model/builder/ArkFieldBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAiB,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAQ3D,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,GAAG,QAAQ,CAuB1G"}

package/lib/frontend/cppFrontend/model/builder/ArkFileBuilder.d.ts

@@ -1,6 +1,6 @@
 import { ArkFile } from '../../../../core/model/ArkFile';
 import { ArkClass } from '../../../../core/model/ArkClass';
-import { CxxAstNode } from '../../ast/ArkCxxAstNode';
+import { CxxAstNode } from '../../ast';
 export declare const classMap: Map<string, ArkClass>;
 /**
  * Entry of building ArkFile instance

package/lib/frontend/cppFrontend/model/builder/ArkFileBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkFileBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/frontend/cppFrontend/model/builder/ArkFileBuilder.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAMzD,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAU3D,OAAO,EAAW,UAAU,EAAkB,MAAM,yBAAyB,CAAC;AAa9E,eAAO,MAAM,QAAQ,EAAG,GAAG,CAAC,MAAM,EAAE,QAAQ,CAA+B,CAAC;AAgD5E;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,gBAAgB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,GAAE,MAAM,EAAO,GAAG,IAAI,CAa1J;AAED,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI,CAU5G"}
+{"version":3,"file":"ArkFileBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/frontend/cppFrontend/model/builder/ArkFileBuilder.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAMzD,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAS3D,OAAO,EAAsB,UAAU,EAAkB,MAAM,WAAW,CAAC;AAa3E,eAAO,MAAM,QAAQ,EAAG,GAAG,CAAC,MAAM,EAAE,QAAQ,CAA+B,CAAC;AAgD5E;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,gBAAgB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,GAAE,MAAM,EAAO,GAAG,IAAI,CAa1J;AAED,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI,CAU5G"}

package/lib/frontend/cppFrontend/model/builder/ArkFileBuilder.js

@@ -51,14 +51,13 @@ const ArkNamespaceBuilder_1 = require("./ArkNamespaceBuilder");
 const ArkClass_1 = require("../../../../core/model/ArkClass");
 const ArkClassBuilder_2 = require("./ArkClassBuilder");
 const ArkMethod_1 = require("../../../../core/model/ArkMethod");
-const astUtils_1 = require("../../ast/astUtils");
 const ArkSignature_1 = require("../../../../core/model/ArkSignature");
 const Position_1 = require("../../../../core/base/Position");
 const ArkImportBuilder_1 = require("./ArkImportBuilder");
 const ModelUtils_1 = require("../../common/ModelUtils");
 const logger_1 = __importStar(require("../../../../utils/logger"));
 const ArkClassBuilder_3 = require("../../../../core/model/builder/ArkClassBuilder");
-const ArkCxxAstNode_1 = require("../../ast/ArkCxxAstNode");
+const ast_1 = require("../../ast");
 const ArkFieldBuilder_1 = require("./ArkFieldBuilder");
 const Const_1 = require("../../../../core/common/Const");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'ArkFileBuilder');
@@ -120,7 +119,7 @@ function buildArkFileFromFile(absoluteFilePath, projectDir, arkFile, projectName
     arkFile.setCode(fs_1.default.readFileSync(arkFile.getFilePath(), 'utf8'));
     let sdkPath = extractOhosSdkPath(arkFile.getScene().getProjectSdkMap());
     let llvmPath = findLLVMPath(sdkPath);
-    const jsonObject = astUtils_1.AstUtils.parse(absoluteFilePath, scene.getCcjsonPath(), includeDirs, llvmPath, scene.getCppAstPath());
+    const jsonObject = ast_1.AstParser.parse(absoluteFilePath, scene.getCcjsonPath(), includeDirs, llvmPath, scene.getCppAstPath());
     genDefaultArkClass(arkFile, jsonObject);
     buildArkFile(arkFile, jsonObject);
 }
@@ -216,44 +215,44 @@ function buildArkFile(arkFile, astRoot) {
         switch (childKind) {
             // 'RecordDecl' ---C Language (struct/class/union)
             // 'CXXRecordDecl' ---C++ Language (struct/class/union)
-            case ArkCxxAstNode_1.astKind.RecordDecl:
-            case ArkCxxAstNode_1.astKind.CXXRecordDecl:
-            case ArkCxxAstNode_1.astKind.ClassTemplateDecl:
+            case ast_1.astKind.RecordDecl:
+            case ast_1.astKind.CXXRecordDecl:
+            case ast_1.astKind.ClassTemplateDecl:
                 buildArkClassFromCxxClass(child, arkFile, astRoot);
                 break;
-            case ArkCxxAstNode_1.astKind.FunctionDecl:
-            case ArkCxxAstNode_1.astKind.FriendDecl:
-            case ArkCxxAstNode_1.astKind.FunctionTemplateDecl:
+            case ast_1.astKind.FunctionDecl:
+            case ast_1.astKind.FriendDecl:
+            case ast_1.astKind.FunctionTemplateDecl:
                 buildArkMethodFromCxxMethod(child, arkFile, astRoot);
                 break;
-            case ArkCxxAstNode_1.astKind.NamespaceDecl:
+            case ast_1.astKind.NamespaceDecl:
                 let ns = new ArkNamespace_1.ArkNamespace();
                 ns.setDeclaringArkFile(arkFile);
                 (0, ArkNamespaceBuilder_1.buildArkNamespace)(child, arkFile, ns, astRoot);
                 arkFile.addNamespace(ns);
                 addExportInfoOnCondition(child, ns, arkFile);
                 break;
-            case ArkCxxAstNode_1.astKind.CXXMethodDecl:
-            case ArkCxxAstNode_1.astKind.CXXConstructorDecl:
-            case ArkCxxAstNode_1.astKind.CXXDestructorDecl:
+            case ast_1.astKind.CXXMethodDecl:
+            case ast_1.astKind.CXXConstructorDecl:
+            case ast_1.astKind.CXXDestructorDecl:
                 // Member function, construction and destructor need to establish the function class first
                 const arkClass = getDeclaringArkClassOfMethod(child, arkFile);
                 buildArkMethodFromCxxMethod(child, arkFile, astRoot, arkClass);
                 break;
-            case ArkCxxAstNode_1.astKind.EnumDecl:
+            case ast_1.astKind.EnumDecl:
                 child = Object.assign(Object.assign({}, child), { tagUsed: 'enum' });
                 buildArkClassFromCxxClass(child, arkFile, astRoot);
                 break;
-            case ArkCxxAstNode_1.astKind.UsingDirectiveDecl:
+            case ast_1.astKind.UsingDirectiveDecl:
                 buildImportInfoFromUsing(child, astRoot, arkFile);
                 break;
-            case ArkCxxAstNode_1.astKind.VarDecl:
+            case ast_1.astKind.VarDecl:
                 // handle global variable
                 child.mangledName = Const_1.DEFAULT_ARK_CLASS_NAME;
                 const arkDefaultClass = getDeclaringArkClassOfMethod(child, arkFile);
                 (0, ArkFieldBuilder_1.buildProperty2ArkField)(child, astRoot, arkDefaultClass);
                 break;
-            case ArkCxxAstNode_1.astKind.LinkageSpecDecl:
+            case ast_1.astKind.LinkageSpecDecl:
                 buildArkFile(arkFile, child);
             default:
                 logger.trace('Child joined default method of arkFile: ', (_a = child.kind) !== null && _a !== void 0 ? _a : child.code);

package/lib/frontend/cppFrontend/model/builder/ArkImportBuilder.d.ts

@@ -1,6 +1,6 @@
 import { ImportInfo } from '../../../../core/model/ArkImport';
 import { ArkFile } from '../../../../core/model/ArkFile';
-import { CxxAstNode, CxxIncludeInfo } from '../../ast/ArkCxxAstNode';
+import { CxxAstNode, CxxIncludeInfo } from '../../ast';
 export declare function buildGenericImportInfo(includeInfo: CxxIncludeInfo, includeNode: CxxAstNode, sourceFile: CxxAstNode, arkFile: ArkFile): ImportInfo;
 export declare function buildUsingNamespaceImportInfo(node: CxxAstNode, sourceFile: CxxAstNode, arkFile: ArkFile): ImportInfo | null;
 //# sourceMappingURL=ArkImportBuilder.d.ts.map

package/lib/frontend/cppFrontend/model/builder/ArkImportBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkImportBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/frontend/cppFrontend/model/builder/ArkImportBuilder.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAE9D,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAGrE,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,CAWjJ;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,GAAG,IAAI,CAmB3H"}
+{"version":3,"file":"ArkImportBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/frontend/cppFrontend/model/builder/ArkImportBuilder.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAE9D,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAGvD,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,CAWjJ;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,GAAG,IAAI,CAmB3H"}

package/lib/frontend/cppFrontend/model/builder/ArkMethodBuilder.d.ts

@@ -2,7 +2,7 @@ import { ArkClass } from '../../../../core/model/ArkClass';
 import { ArkMethod } from '../../../../core/model/ArkMethod';
 import { Stmt } from '../../../../core/base/Stmt';
 import { Local } from '../../../../core/base/Local';
-import { CxxAstNode } from '../../ast/ArkCxxAstNode';
+import { CxxAstNode } from '../../ast';
 export declare function buildDefaultArkMethodFromArkClass(declaringClass: ArkClass, mtd: ArkMethod, sourceFile: CxxAstNode, node?: CxxAstNode): void;
 export declare function handleFunctionTemplateDecl(methodNode: CxxAstNode, mtd: ArkMethod, sourceFile: CxxAstNode): void;
 export declare function buildArkMethodFromArkClass(methodNode: CxxAstNode, declaringClass: ArkClass, mtd: ArkMethod, sourceFile: CxxAstNode, declaringMethod?: ArkMethod): void;