arkanalyzer 1.0.7 → 1.0.8

package/lib/core/common/CfgBuilder.js

@@ -39,6 +39,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CfgBuilder = void 0;
 const ts = __importStar(require("ohos-typescript"));
+const Local_1 = require("../base/Local");
 const Stmt_1 = require("../base/Stmt");
 const BasicBlock_1 = require("../graph/BasicBlock");
 const Cfg_1 = require("../graph/Cfg");
@@ -222,6 +223,11 @@ class CfgBuilder {
                 judgeLastType(s);
                 lastStatement = s;
             }
+            else if (!this.declaringMethod.isDefaultArkMethod() && ts.isFunctionDeclaration(c)) {
+                let s = new StatementBuilder('functionDeclarationStatement', c.getText(this.sourceFile), c, scope.id);
+                judgeLastType(s);
+                lastStatement = s;
+            }
             else if (ts.isReturnStatement(c)) {
                 let s = new StatementBuilder('returnStatement', c.getText(this.sourceFile), c, scope.id);
                 judgeLastType(s);
@@ -1027,7 +1033,31 @@ class CfgBuilder {
             blockBuilderToCfgBlock.set(this.blocks[i], blockInCfg);
         }
         let currBlockId = this.blocks.length;
-        // link blocks
+        this.linkBasicBlocks(blockBuilderToCfgBlock);
+        this.rebuildBlocksInLoop(blockBuilderToCfgBlock, blocksContainLoopCondition, cfg);
+        this.rebuildBlocksInConditionalOperator(cfg);
+        for (const blockBuilder of this.blocks) {
+            if (blockBuilder.id === -1) {
+                blockBuilder.id = currBlockId++;
+                const block = blockBuilderToCfgBlock.get(blockBuilder);
+                block.setId(blockBuilder.id);
+            }
+        }
+        for (const block of cfg.getBlocks()) {
+            if (block.getId() === -1) {
+                block.setId(currBlockId++);
+            }
+        }
+        for (const stmt of cfg.getStmts()) {
+            stmt.setCfg(cfg);
+        }
+        return {
+            cfg: cfg,
+            locals: arkIRTransformer.getLocals(),
+            aliasTypeMap: arkIRTransformer.getAliasTypeMap(),
+        };
+    }
+    linkBasicBlocks(blockBuilderToCfgBlock) {
         for (const [blockBuilder, cfgBlock] of blockBuilderToCfgBlock) {
             for (const successorBlockBuilder of blockBuilder.nexts) {
                 if (!blockBuilderToCfgBlock.get(successorBlockBuilder)) {
@@ -1044,7 +1074,204 @@ class CfgBuilder {
                 cfgBlock.addPredecessorBlock(predecessorBlock);
             }
         }
-        // put statements within loop in right position
+    }
+    rebuildBlocksInConditionalOperator(cfg) {
+        var _a;
+        for (const basicBlock of cfg.getBlocks()) {
+            const stmts = Array.from(basicBlock.getStmts());
+            const stmtCnt = stmts.length;
+            let endPos = -1;
+            for (let i = stmtCnt - 1; i >= 0; i--) {
+                const stmt = stmts[i];
+                if (stmt instanceof ArkIRTransformer_1.DummyStmt && ((_a = stmt.toString()) === null || _a === void 0 ? void 0 : _a.startsWith(ArkIRTransformer_1.ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_END_STMT))) {
+                    endPos = i;
+                    break;
+                }
+            }
+            if (endPos === -1) {
+                continue;
+            }
+            const { topBlock, bottomBlocks, allBlocks, } = this.traverseAndRebuildConditionalOperator(stmts, 0, endPos);
+            basicBlock.getStmts().splice(topBlock.getStmts().length);
+            const succBlocksOfIfBlock = topBlock.getSuccessors();
+            succBlocksOfIfBlock.forEach((block) => {
+                block.setPredecessorBlock(0, basicBlock);
+            });
+            const conditionalOperatorBlockSet = new Set(allBlocks);
+            this.adjustSuccessorOfConditionalOperator(basicBlock, succBlocksOfIfBlock, stmts, bottomBlocks, endPos, conditionalOperatorBlockSet);
+            conditionalOperatorBlockSet.forEach((block) => {
+                if (block !== topBlock) {
+                    cfg.addBlock(block);
+                }
+            });
+        }
+    }
+    traverseAndRebuildConditionalOperator(stmts, beginPos, endPos) {
+        const { ifTruePos, ifFalsePos, conditionalOperatorEndPos } = this.findConditionalOperator(stmts, beginPos, endPos);
+        if (ifTruePos === -1) {
+            const block = new BasicBlock_1.BasicBlock();
+            block.getStmts().push(...stmts.slice(beginPos, endPos + 1));
+            return { topBlock: block, bottomBlocks: [], allBlocks: [block] };
+        }
+        const allBlocks = [];
+        const topBlock = new BasicBlock_1.BasicBlock();
+        topBlock.getStmts().push(...stmts.slice(beginPos, ifTruePos));
+        allBlocks.push(topBlock);
+        const { topBlock: ifTrueTopBlock, bottomBlocks: ifTrueBottomBlocks, allBlocks: ifTrueAllBlocks, } = this.traverseAndRebuildConditionalOperator(stmts, ifTruePos + 1, ifFalsePos - 1);
+        allBlocks.push(...ifTrueAllBlocks);
+        const { topBlock: ifFalseTopBlock, bottomBlocks: ifFalseBottomBlocks, allBlocks: ifFalseAllBlocks, } = this.traverseAndRebuildConditionalOperator(stmts, ifFalsePos + 1, conditionalOperatorEndPos - 1);
+        allBlocks.push(...ifFalseAllBlocks);
+        topBlock.addSuccessorBlock(ifTrueTopBlock);
+        topBlock.addSuccessorBlock(ifFalseTopBlock);
+        ifTrueTopBlock.addPredecessorBlock(topBlock);
+        ifFalseTopBlock.addPredecessorBlock(topBlock);
+        let bottomBlocks = [];
+        bottomBlocks.push(...(ifTrueBottomBlocks.length > 0 ? ifTrueBottomBlocks : [ifTrueTopBlock]));
+        bottomBlocks.push(...(ifFalseBottomBlocks.length > 0 ? ifFalseBottomBlocks : [ifFalseTopBlock]));
+        if (conditionalOperatorEndPos !== endPos) {
+            const bottomBlock = new BasicBlock_1.BasicBlock();
+            bottomBlock.getStmts().push(...stmts.slice(conditionalOperatorEndPos + 1, endPos + 1));
+            bottomBlocks.forEach(block => {
+                block.addSuccessorBlock(bottomBlock);
+                bottomBlock.addPredecessorBlock(block);
+            });
+            bottomBlocks = [bottomBlock];
+            allBlocks.push(bottomBlock);
+        }
+        return { topBlock: topBlock, bottomBlocks: bottomBlocks, allBlocks: allBlocks };
+    }
+    findConditionalOperator(stmts, beginPos, endPos) {
+        let ifTruePos = -1;
+        let ifFalsePos = -1;
+        let conditionalOperatorEndPos = -1;
+        let currConditionalOperatorNo = '';
+        for (let i = beginPos; i <= endPos; i++) {
+            const stmt = stmts[i];
+            if (stmt instanceof ArkIRTransformer_1.DummyStmt) {
+                if (stmt.toString()
+                    .startsWith(ArkIRTransformer_1.ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_IF_TRUE_STMT) && ifTruePos === -1) {
+                    ifTruePos = i;
+                    currConditionalOperatorNo =
+                        stmt.toString().replace(ArkIRTransformer_1.ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_IF_TRUE_STMT, '');
+                }
+                else if (stmt.toString() === ArkIRTransformer_1.ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_IF_FALSE_STMT + currConditionalOperatorNo) {
+                    ifFalsePos = i;
+                }
+                else if (stmt.toString() === ArkIRTransformer_1.ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_END_STMT + currConditionalOperatorNo) {
+                    conditionalOperatorEndPos = i;
+                }
+            }
+        }
+        return { ifTruePos: ifTruePos, ifFalsePos: ifFalsePos, conditionalOperatorEndPos: conditionalOperatorEndPos };
+    }
+    adjustSuccessorOfConditionalOperator(currBasicBlock, succBlocksOfIfBlock, stmts, bottomBlocks, conditionalOperatorEndPos, conditionalOperatorBlockSet) {
+        const oldSuccBlocks = Array.from(currBasicBlock.getSuccessors());
+        currBasicBlock.getSuccessors().splice(0, oldSuccBlocks.length, ...succBlocksOfIfBlock);
+        oldSuccBlocks.forEach((succBlock) => {
+            const originalPreds = succBlock.getPredecessors();
+            for (let i = 0; i < originalPreds.length; i++) {
+                if (originalPreds[i] === currBasicBlock) {
+                    succBlock.getPredecessors().splice(i, 1);
+                    break;
+                }
+            }
+        });
+        if (conditionalOperatorEndPos === stmts.length - 1) {
+            oldSuccBlocks.forEach((oldSuccBlock) => {
+                bottomBlocks.forEach((bottomBlock) => {
+                    bottomBlock.addSuccessorBlock(oldSuccBlock);
+                    oldSuccBlock.addSuccessorBlock(bottomBlock);
+                });
+            });
+        }
+        else {
+            const insertSuccBlock = new BasicBlock_1.BasicBlock();
+            insertSuccBlock.getStmts().push(...stmts.slice(conditionalOperatorEndPos + 1, stmts.length));
+            oldSuccBlocks.forEach((oldSuccBlock) => {
+                insertSuccBlock.addSuccessorBlock(oldSuccBlock);
+                oldSuccBlock.addPredecessorBlock(insertSuccBlock);
+            });
+            bottomBlocks.forEach((bottomBlock) => {
+                bottomBlock.addSuccessorBlock(insertSuccBlock);
+                insertSuccBlock.addPredecessorBlock(bottomBlock);
+            });
+            conditionalOperatorBlockSet.add(insertSuccBlock);
+            this.removeUnnecessaryBlocksInConditionalOperator(insertSuccBlock, conditionalOperatorBlockSet);
+        }
+    }
+    removeUnnecessaryBlocksInConditionalOperator(bottomBlock, allBlocks) {
+        const firstStmtInBottom = bottomBlock.getStmts()[0];
+        if (!(firstStmtInBottom instanceof Stmt_1.ArkAssignStmt)) {
+            return;
+        }
+        const targetValue = firstStmtInBottom.getLeftOp();
+        const tempResultValue = firstStmtInBottom.getRightOp();
+        if (!(targetValue instanceof Local_1.Local && IRUtils_1.IRUtils.isTempLocal(tempResultValue))) {
+            return;
+        }
+        bottomBlock.remove(firstStmtInBottom);
+        const oldPredecessors = bottomBlock.getPredecessors();
+        const newPredecessors = [];
+        for (const predecessor of oldPredecessors) {
+            newPredecessors.push(...this.replaceTempResultcursively(predecessor, targetValue, tempResultValue, allBlocks));
+        }
+        bottomBlock.getPredecessors().splice(0, oldPredecessors.length, ...newPredecessors);
+        newPredecessors.forEach((newPredecessor) => {
+            newPredecessor.setSuccessorBlock(0, bottomBlock);
+        });
+    }
+    replaceTempResultcursively(currBottomBlock, targetLocal, tempResultLocal, allBlocks) {
+        const stmts = currBottomBlock.getStmts();
+        const stmtsCnt = stmts.length;
+        let tempResultReassignStmt = null;
+        for (let i = stmtsCnt - 1; i >= 0; i--) {
+            const stmt = stmts[i];
+            if (stmt instanceof Stmt_1.ArkAssignStmt && stmt.getLeftOp() === tempResultLocal) {
+                if (IRUtils_1.IRUtils.isTempLocal(stmt.getRightOp()) && this.isNewDefLocal(stmt.getRightOp(), stmts, i)) {
+                    tempResultReassignStmt = stmt;
+                }
+                else {
+                    stmt.setLeftOp(targetLocal);
+                }
+            }
+        }
+        let newBottomBlocks = [];
+        if (tempResultReassignStmt) {
+            const oldPredecessors = currBottomBlock.getPredecessors();
+            const newPredecessors = [];
+            const prevTempResultLocal = tempResultReassignStmt.getRightOp();
+            for (const predecessor of oldPredecessors) {
+                newPredecessors.push(...this.replaceTempResultcursively(predecessor, targetLocal, prevTempResultLocal, allBlocks));
+            }
+            currBottomBlock.remove(tempResultReassignStmt);
+            if (currBottomBlock.getStmts().length === 0) {
+                // remove this block
+                newBottomBlocks = newPredecessors;
+                allBlocks.delete(currBottomBlock);
+            }
+            else {
+                currBottomBlock.getPredecessors().splice(0, oldPredecessors.length, ...newPredecessors);
+                newPredecessors.forEach((newPredecessor) => {
+                    newPredecessor.setSuccessorBlock(0, currBottomBlock);
+                });
+                newBottomBlocks = [currBottomBlock];
+            }
+        }
+        else {
+            newBottomBlocks = [currBottomBlock];
+        }
+        return newBottomBlocks;
+    }
+    isNewDefLocal(local, stmts, pos) {
+        for (let i = pos - 1; i >= 0; i++) {
+            const stmt = stmts[i];
+            if (stmt instanceof Stmt_1.ArkAssignStmt && stmt.getLeftOp() === local) {
+                return false;
+            }
+        }
+        return true;
+    }
+    rebuildBlocksInLoop(blockBuilderToCfgBlock, blocksContainLoopCondition, cfg) {
         for (const blockBuilder of blocksContainLoopCondition) {
             if (!blockBuilderToCfgBlock.get(blockBuilder)) {
                 continue;
@@ -1053,38 +1280,11 @@ class CfgBuilder {
             const blockId = block.getId();
             const stmts = block.getStmts();
             const stmtsCnt = stmts.length;
-            let ifStmtIdx = -1;
-            let iteratorNextStmtIdx = -1;
-            let dummyInitializerStmtIdx = -1;
-            for (let i = 0; i < stmtsCnt; i++) {
-                const stmt = stmts[i];
-                if (stmt instanceof Stmt_1.ArkAssignStmt && stmt.getRightOp() instanceof Expr_1.AbstractInvokeExpr) {
-                    const invokeExpr = stmt.getRightOp();
-                    if (invokeExpr.getMethodSignature().getMethodSubSignature().getMethodName() === Builtin_1.Builtin.ITERATOR_NEXT) {
-                        iteratorNextStmtIdx = i;
-                        continue;
-                    }
-                }
-                if (stmt.toString() === ArkIRTransformer_1.DUMMY_INITIALIZER_STMT) {
-                    dummyInitializerStmtIdx = i;
-                    continue;
-                }
-                if (stmt instanceof Stmt_1.ArkIfStmt) {
-                    ifStmtIdx = i;
-                    break;
-                }
-            }
+            const { ifStmtIdx, iteratorNextStmtIdx, dummyInitializerStmtIdx } = this.findIteratorIdx(stmts);
             if (iteratorNextStmtIdx !== -1 || dummyInitializerStmtIdx !== -1) {
-                // put statements into block before condition
                 const lastStmtIdxBeforeCondition = iteratorNextStmtIdx !== -1 ? iteratorNextStmtIdx : dummyInitializerStmtIdx;
                 const stmtsInsertBeforeCondition = stmts.slice(0, lastStmtIdxBeforeCondition);
-                let prevBlockBuilderContainsLoop = false;
-                for (const prevBlockBuilder of blockBuilder.lasts) {
-                    if (prevBlockBuilder.id < blockId && blocksContainLoopCondition.has(prevBlockBuilder)) {
-                        prevBlockBuilderContainsLoop = true;
-                        break;
-                    }
-                }
+                let prevBlockBuilderContainsLoop = this.doesPrevBlockBuilderContainLoop(blockBuilder, blockId, blocksContainLoopCondition);
                 if (prevBlockBuilderContainsLoop) {
                     // should create an extra block when previous block contains loop condition
                     this.insertBeforeConditionBlockBuilder(blockBuilderToCfgBlock, blockBuilder, stmtsInsertBeforeCondition, false, cfg);
@@ -1096,23 +1296,7 @@ class CfgBuilder {
                 }
                 if (dummyInitializerStmtIdx !== -1 && ifStmtIdx !== stmtsCnt - 1) {
                     // put incrementor statements into block which reenters condition
-                    const stmtsReenterCondition = stmts.slice(ifStmtIdx + 1);
-                    const blockBuildersReenterCondition = [];
-                    for (const prevBlockBuilder of blockBuilder.lasts) {
-                        const prevBlock = blockBuilderToCfgBlock.get(prevBlockBuilder);
-                        if (prevBlock.getId() > blockId) {
-                            blockBuildersReenterCondition.push(prevBlockBuilder);
-                        }
-                    }
-                    if (blockBuildersReenterCondition.length > 1 || blocksContainLoopCondition.has(blockBuildersReenterCondition[0])) {
-                        // put incrementor statements into an extra block
-                        this.insertBeforeConditionBlockBuilder(blockBuilderToCfgBlock, blockBuilder, stmtsReenterCondition, true, cfg);
-                    }
-                    else {
-                        // put incrementor statements into prev reenter block
-                        const blockReenterCondition = blockBuilderToCfgBlock.get(blockBuildersReenterCondition[0]);
-                        blockReenterCondition === null || blockReenterCondition === void 0 ? void 0 : blockReenterCondition.getStmts().push(...stmtsReenterCondition);
-                    }
+                    this.adjustIncrementorStmts(stmts, ifStmtIdx, blockBuilder, blockId, blockBuilderToCfgBlock, blocksContainLoopCondition, cfg);
                 }
                 else if (iteratorNextStmtIdx !== -1) {
                     // put statements which get value of iterator into block after condition
@@ -1127,21 +1311,16 @@ class CfgBuilder {
                 stmts.splice(ifStmtIdx - firstStmtIdxInCondition + 1);
             }
         }
-        for (const blockBuilder of this.blocks) {
-            if (blockBuilder.id === -1) {
-                blockBuilder.id = currBlockId++;
-                const block = blockBuilderToCfgBlock.get(blockBuilder);
-                block.setId(blockBuilder.id);
+    }
+    doesPrevBlockBuilderContainLoop(currBlockBuilder, currBlockId, blocksContainLoopCondition) {
+        let prevBlockBuilderContainsLoop = false;
+        for (const prevBlockBuilder of currBlockBuilder.lasts) {
+            if (prevBlockBuilder.id < currBlockId && blocksContainLoopCondition.has(prevBlockBuilder)) {
+                prevBlockBuilderContainsLoop = true;
+                break;
             }
         }
-        for (const stmt of cfg.getStmts()) {
-            stmt.setCfg(cfg);
-        }
-        return {
-            cfg: cfg,
-            locals: arkIRTransformer.getLocals(),
-            aliasTypeMap: arkIRTransformer.getAliasTypeMap(),
-        };
+        return prevBlockBuilderContainsLoop;
     }
     insertBeforeConditionBlockBuilder(blockBuilderToCfgBlock, conditionBlockBuilder, stmtsInsertBeforeCondition, collectReenter, cfg) {
         const blockId = conditionBlockBuilder.id;
@@ -1205,5 +1384,54 @@ class CfgBuilder {
         cfg.addBlock(blockInsertBeforeCondition);
         blockBuilderToCfgBlock.set(blockBuilderInsertBeforeCondition, blockInsertBeforeCondition);
     }
+    findIteratorIdx(stmts) {
+        let ifStmtIdx = -1;
+        let iteratorNextStmtIdx = -1;
+        let dummyInitializerStmtIdx = -1;
+        const stmtsCnt = stmts.length;
+        for (let i = 0; i < stmtsCnt; i++) {
+            const stmt = stmts[i];
+            if (stmt instanceof Stmt_1.ArkAssignStmt && stmt.getRightOp() instanceof Expr_1.AbstractInvokeExpr) {
+                const invokeExpr = stmt.getRightOp();
+                if (invokeExpr.getMethodSignature().getMethodSubSignature()
+                    .getMethodName() === Builtin_1.Builtin.ITERATOR_NEXT) {
+                    iteratorNextStmtIdx = i;
+                    continue;
+                }
+            }
+            if (stmt.toString() === ArkIRTransformer_1.ArkIRTransformer.DUMMY_LOOP_INITIALIZER_STMT) {
+                dummyInitializerStmtIdx = i;
+                continue;
+            }
+            if (stmt instanceof Stmt_1.ArkIfStmt) {
+                ifStmtIdx = i;
+                break;
+            }
+        }
+        return {
+            ifStmtIdx: ifStmtIdx,
+            iteratorNextStmtIdx: iteratorNextStmtIdx,
+            dummyInitializerStmtIdx: dummyInitializerStmtIdx,
+        };
+    }
+    adjustIncrementorStmts(stmts, ifStmtIdx, currBlockBuilder, currBlockId, blockBuilderToCfgBlock, blocksContainLoopCondition, cfg) {
+        const stmtsReenterCondition = stmts.slice(ifStmtIdx + 1);
+        const blockBuildersReenterCondition = [];
+        for (const prevBlockBuilder of currBlockBuilder.lasts) {
+            const prevBlock = blockBuilderToCfgBlock.get(prevBlockBuilder);
+            if (prevBlock.getId() > currBlockId) {
+                blockBuildersReenterCondition.push(prevBlockBuilder);
+            }
+        }
+        if (blockBuildersReenterCondition.length > 1 || blocksContainLoopCondition.has(blockBuildersReenterCondition[0])) {
+            // put incrementor statements into an extra block
+            this.insertBeforeConditionBlockBuilder(blockBuilderToCfgBlock, currBlockBuilder, stmtsReenterCondition, true, cfg);
+        }
+        else {
+            // put incrementor statements into prev reenter block
+            const blockReenterCondition = blockBuilderToCfgBlock.get(blockBuildersReenterCondition[0]);
+            blockReenterCondition === null || blockReenterCondition === void 0 ? void 0 : blockReenterCondition.getStmts().push(...stmtsReenterCondition);
+        }
+    }
 }
 exports.CfgBuilder = CfgBuilder;

package/lib/core/common/Const.d.ts

@@ -1,15 +1,20 @@
-export declare const DEFAULT_ARK_CLASS_NAME = "_DEFAULT_ARK_CLASS";
-export declare const DEFAULT_ARK_METHOD_NAME = "_DEFAULT_ARK_METHOD";
-export declare const ANONYMOUS_CLASS_PREFIX = "AnonymousClass";
-export declare const ANONYMOUS_CLASS_DELIMITER = "-";
-export declare const INSTANCE_INIT_METHOD_NAME = "@instance_init";
-export declare const STATIC_INIT_METHOD_NAME = "@static_init";
-export declare const ANONYMOUS_METHOD_PREFIX = "AnonymousMethod-";
+export declare const NAME_DELIMITER = "$";
+export declare const NAME_PREFIX = "%";
+export declare const UNKNOWN_NAME = "unk";
+export declare const DEFAULT_NAME = "dflt";
+export declare const DEFAULT_ARK_CLASS_NAME: string;
+export declare const DEFAULT_ARK_METHOD_NAME: string;
+export declare const ANONYMOUS_CLASS_PREFIX: string;
+export declare const ANONYMOUS_CLASS_DELIMITER = "$";
+export declare const INSTANCE_INIT_METHOD_NAME: string;
+export declare const STATIC_INIT_METHOD_NAME: string;
+export declare const ANONYMOUS_METHOD_PREFIX: string;
 export declare const CALL_SIGNATURE_NAME = "create";
-export declare const UNKNOWN_PROJECT_NAME = "_UnknownProjectName";
-export declare const UNKNOWN_FILE_NAME = "_UnknownFileName";
-export declare const UNKNOWN_NAMESPACE_NAME = "_UnknownNamespaceName";
+export declare const UNKNOWN_PROJECT_NAME: string;
+export declare const UNKNOWN_FILE_NAME: string;
+export declare const UNKNOWN_NAMESPACE_NAME: string;
 export declare const UNKNOWN_CLASS_NAME = "";
 export declare const UNKNOWN_FIELD_NAME = "";
 export declare const UNKNOWN_METHOD_NAME = "";
+export declare const TEMP_LOCAL_PREFIX = "%";
 //# sourceMappingURL=Const.d.ts.map

package/lib/core/common/Const.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Const.d.ts","sourceRoot":"","sources":["../../../src/core/common/Const.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,sBAAsB,uBAAuB,CAAC;AAC3D,eAAO,MAAM,uBAAuB,wBAAwB,CAAC;AAC7D,eAAO,MAAM,sBAAsB,mBAAmB,CAAC;AACvD,eAAO,MAAM,yBAAyB,MAAM,CAAC;AAG7C,eAAO,MAAM,yBAAyB,mBAAmB,CAAC;AAC1D,eAAO,MAAM,uBAAuB,iBAAiB,CAAC;AACtD,eAAO,MAAM,uBAAuB,qBAAqB,CAAC;AAC1D,eAAO,MAAM,mBAAmB,WAAW,CAAC;AAG5C,eAAO,MAAM,oBAAoB,wBAAwB,CAAC;AAC1D,eAAO,MAAM,iBAAiB,qBAAqB,CAAC;AACpD,eAAO,MAAM,sBAAsB,0BAA0B,CAAC;AAC9D,eAAO,MAAM,kBAAkB,KAAK,CAAC;AACrC,eAAO,MAAM,kBAAkB,KAAK,CAAC;AACrC,eAAO,MAAM,mBAAmB,KAAK,CAAC"}
+{"version":3,"file":"Const.d.ts","sourceRoot":"","sources":["../../../src/core/common/Const.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,cAAc,MAAM,CAAC;AAClC,eAAO,MAAM,WAAW,MAAM,CAAC;AAC/B,eAAO,MAAM,YAAY,QAAQ,CAAC;AAClC,eAAO,MAAM,YAAY,SAAS,CAAC;AAGnC,eAAO,MAAM,sBAAsB,QAA6B,CAAC;AACjE,eAAO,MAAM,uBAAuB,QAA6B,CAAC;AAClE,eAAO,MAAM,sBAAsB,QAAqB,CAAC;AACzD,eAAO,MAAM,yBAAyB,MAAiB,CAAC;AAGxD,eAAO,MAAM,yBAAyB,QAA2B,CAAC;AAClE,eAAO,MAAM,uBAAuB,QAA2B,CAAC;AAChE,eAAO,MAAM,uBAAuB,QAAqB,CAAC;AAC1D,eAAO,MAAM,mBAAmB,WAAW,CAAC;AAG5C,eAAO,MAAM,oBAAoB,QAA6B,CAAC;AAC/D,eAAO,MAAM,iBAAiB,QAA6B,CAAC;AAC5D,eAAO,MAAM,sBAAsB,QAA6B,CAAC;AACjE,eAAO,MAAM,kBAAkB,KAAK,CAAC;AACrC,eAAO,MAAM,kBAAkB,KAAK,CAAC;AACrC,eAAO,MAAM,mBAAmB,KAAK,CAAC;AAGtC,eAAO,MAAM,iBAAiB,MAAc,CAAC"}

package/lib/core/common/Const.js

@@ -14,21 +14,28 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UNKNOWN_METHOD_NAME = exports.UNKNOWN_FIELD_NAME = exports.UNKNOWN_CLASS_NAME = exports.UNKNOWN_NAMESPACE_NAME = exports.UNKNOWN_FILE_NAME = exports.UNKNOWN_PROJECT_NAME = exports.CALL_SIGNATURE_NAME = exports.ANONYMOUS_METHOD_PREFIX = exports.STATIC_INIT_METHOD_NAME = exports.INSTANCE_INIT_METHOD_NAME = exports.ANONYMOUS_CLASS_DELIMITER = exports.ANONYMOUS_CLASS_PREFIX = exports.DEFAULT_ARK_METHOD_NAME = exports.DEFAULT_ARK_CLASS_NAME = void 0;
+exports.TEMP_LOCAL_PREFIX = exports.UNKNOWN_METHOD_NAME = exports.UNKNOWN_FIELD_NAME = exports.UNKNOWN_CLASS_NAME = exports.UNKNOWN_NAMESPACE_NAME = exports.UNKNOWN_FILE_NAME = exports.UNKNOWN_PROJECT_NAME = exports.CALL_SIGNATURE_NAME = exports.ANONYMOUS_METHOD_PREFIX = exports.STATIC_INIT_METHOD_NAME = exports.INSTANCE_INIT_METHOD_NAME = exports.ANONYMOUS_CLASS_DELIMITER = exports.ANONYMOUS_CLASS_PREFIX = exports.DEFAULT_ARK_METHOD_NAME = exports.DEFAULT_ARK_CLASS_NAME = exports.DEFAULT_NAME = exports.UNKNOWN_NAME = exports.NAME_PREFIX = exports.NAME_DELIMITER = void 0;
+// names
+exports.NAME_DELIMITER = '$';
+exports.NAME_PREFIX = '%';
+exports.UNKNOWN_NAME = 'unk';
+exports.DEFAULT_NAME = 'dflt';
 // ArkClass const
-exports.DEFAULT_ARK_CLASS_NAME = '_DEFAULT_ARK_CLASS';
-exports.DEFAULT_ARK_METHOD_NAME = '_DEFAULT_ARK_METHOD';
-exports.ANONYMOUS_CLASS_PREFIX = 'AnonymousClass';
-exports.ANONYMOUS_CLASS_DELIMITER = '-';
+exports.DEFAULT_ARK_CLASS_NAME = exports.NAME_PREFIX + exports.DEFAULT_NAME;
+exports.DEFAULT_ARK_METHOD_NAME = exports.NAME_PREFIX + exports.DEFAULT_NAME;
+exports.ANONYMOUS_CLASS_PREFIX = exports.NAME_PREFIX + 'AC';
+exports.ANONYMOUS_CLASS_DELIMITER = exports.NAME_DELIMITER;
 // ArkMethod const
-exports.INSTANCE_INIT_METHOD_NAME = '@instance_init';
-exports.STATIC_INIT_METHOD_NAME = '@static_init';
-exports.ANONYMOUS_METHOD_PREFIX = 'AnonymousMethod-';
+exports.INSTANCE_INIT_METHOD_NAME = exports.NAME_PREFIX + 'instInit';
+exports.STATIC_INIT_METHOD_NAME = exports.NAME_PREFIX + 'statInit';
+exports.ANONYMOUS_METHOD_PREFIX = exports.NAME_PREFIX + 'AM';
 exports.CALL_SIGNATURE_NAME = 'create';
 // ArkSignature const
-exports.UNKNOWN_PROJECT_NAME = '_UnknownProjectName';
-exports.UNKNOWN_FILE_NAME = '_UnknownFileName';
-exports.UNKNOWN_NAMESPACE_NAME = '_UnknownNamespaceName';
+exports.UNKNOWN_PROJECT_NAME = exports.NAME_PREFIX + exports.UNKNOWN_NAME;
+exports.UNKNOWN_FILE_NAME = exports.NAME_PREFIX + exports.UNKNOWN_NAME;
+exports.UNKNOWN_NAMESPACE_NAME = exports.NAME_PREFIX + exports.UNKNOWN_NAME;
 exports.UNKNOWN_CLASS_NAME = ''; // temp for being compatible with existing type inference
 exports.UNKNOWN_FIELD_NAME = ''; // temp for being compatible with existing type inference
 exports.UNKNOWN_METHOD_NAME = ''; // temp for being compatible with existing type inference
+// IR const
+exports.TEMP_LOCAL_PREFIX = exports.NAME_PREFIX;

package/lib/core/common/DummyMainCreater.d.ts

@@ -3,7 +3,7 @@ import { ArkClass } from '../model/ArkClass';
 import { ArkMethod } from '../model/ArkMethod';
 /**
 收集所有的onCreate，onStart等函数，构造一个虚拟函数，具体为：
-@static_init()
+%statInit()
 ...
 count = 0
 while (true) {
@@ -40,6 +40,7 @@ export declare class DummyMainCreater {
     private addCfg2Stmt;
     getDummyMain(): ArkMethod;
     private getEntryMethodsFromComponents;
+    private classInheritsAbility;
     getMethodsFromAllAbilities(): ArkMethod[];
     getEntryMethodsFromModuleJson5(): ArkMethod[];
     getAbilitiesByParseModuleJson(modulePath: string): ArkClass[];

package/lib/core/common/DummyMainCreater.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DummyMainCreater.d.ts","sourceRoot":"","sources":["../../../src/core/common/DummyMainCreater.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAiBpC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAW/C;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,YAAY,CAAmB;IACvC,OAAO,CAAC,aAAa,CAA2C;IAChE,OAAO,CAAC,SAAS,CAA8B;IAC/C,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,cAAc,CAAa;IACnC,OAAO,CAAC,YAAY,CAAkC;gBAE1C,KAAK,EAAE,KAAK;IAUxB,OAAO,CAAC,iBAAiB;IASlB,eAAe,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,IAAI;IAI3C,eAAe,IAAI,IAAI;IAgD9B,OAAO,CAAC,kBAAkB;IAgI1B,OAAO,CAAC,wBAAwB;IAsBhC,OAAO,CAAC,WAAW;IAYZ,YAAY,IAAI,SAAS;IAIhC,OAAO,CAAC,6BAA6B;IAmB9B,0BAA0B,IAAI,SAAS,EAAE;IAWzC,8BAA8B,IAAI,SAAS,EAAE;IAkD7C,6BAA6B,CAAC,UAAU,EAAE,MAAM,GAAG,QAAQ,EAAE;IA2B7D,kBAAkB,IAAI,SAAS,EAAE;CAiB3C"}
+{"version":3,"file":"DummyMainCreater.d.ts","sourceRoot":"","sources":["../../../src/core/common/DummyMainCreater.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAsBpC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAY/C;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,YAAY,CAAmB;IACvC,OAAO,CAAC,aAAa,CAA2C;IAChE,OAAO,CAAC,SAAS,CAA8B;IAC/C,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,cAAc,CAAa;IACnC,OAAO,CAAC,YAAY,CAAkC;gBAE1C,KAAK,EAAE,KAAK;IAUxB,OAAO,CAAC,iBAAiB;IASlB,eAAe,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,IAAI;IAI3C,eAAe,IAAI,IAAI;IAiD9B,OAAO,CAAC,kBAAkB;IAkI1B,OAAO,CAAC,wBAAwB;IAsBhC,OAAO,CAAC,WAAW;IAYZ,YAAY,IAAI,SAAS;IAIhC,OAAO,CAAC,6BAA6B;IAmBrC,OAAO,CAAC,oBAAoB;IAYrB,0BAA0B,IAAI,SAAS,EAAE;IAUzC,8BAA8B,IAAI,SAAS,EAAE;IAkD7C,6BAA6B,CAAC,UAAU,EAAE,MAAM,GAAG,QAAQ,EAAE;IA2B7D,kBAAkB,IAAI,SAAS,EAAE;CAiB3C"}

package/lib/core/common/DummyMainCreater.js

@@ -61,11 +61,12 @@ const ArkSignatureBuilder_1 = require("../model/builder/ArkSignatureBuilder");
 const TSConst_1 = require("./TSConst");
 const json5parser_1 = require("../../utils/json5parser");
 const logger_1 = __importStar(require("../../utils/logger"));
-const ArkClassBuilder_1 = require("../model/builder/ArkClassBuilder");
+const ArkMethodBuilder_1 = require("../model/builder/ArkMethodBuilder");
+const ValueUtil_1 = require("./ValueUtil");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'Scene');
 /**
 收集所有的onCreate，onStart等函数，构造一个虚拟函数，具体为：
-@static_init()
+%statInit()
 ...
 count = 0
 while (true) {
@@ -102,7 +103,7 @@ class DummyMainCreater {
         this.buildBuiltInClass();
     }
     buildBuiltInClass() {
-        for (const sdkFile of this.scene.getSdkArkFilesMap().values()) {
+        for (const sdkFile of this.scene.getSdkArkFiles()) {
             if (sdkFile.getName() === 'api\\@ohos.app.ability.Want.d.ts') {
                 const arkClass = sdkFile.getClassWithName('Want');
                 this.builtInClass.set('Want', arkClass);
@@ -118,7 +119,7 @@ class DummyMainCreater {
         dummyMainFile.setScene(this.scene);
         const dummyMainFileSignature = new ArkSignature_1.FileSignature(this.scene.getProjectName(), '@dummyFile');
         dummyMainFile.setFileSignature(dummyMainFileSignature);
-        this.scene.getFilesMap().set(dummyMainFile.getFileSignature().toString(), dummyMainFile);
+        this.scene.setFile(dummyMainFile);
         const dummyMainClass = new ArkClass_1.ArkClass();
         dummyMainClass.setDeclaringArkFile(dummyMainFile);
         const dummyMainClassSignature = new ArkSignature_1.ClassSignature('@dummyClass', dummyMainClass.getDeclaringArkFile().getFileSignature(), ((_a = dummyMainClass.getDeclaringArkNamespace()) === null || _a === void 0 ? void 0 : _a.getSignature()) || null);
@@ -128,8 +129,9 @@ class DummyMainCreater {
         this.dummyMain.setDeclaringArkClass(dummyMainClass);
         const methodSubSignature = ArkSignatureBuilder_1.ArkSignatureBuilder.buildMethodSubSignatureFromMethodName('@dummyMain');
         const methodSignature = new ArkSignature_1.MethodSignature(this.dummyMain.getDeclaringArkClass().getSignature(), methodSubSignature);
-        this.dummyMain.setSignature(methodSignature);
-        (0, ArkClassBuilder_1.checkAndUpdateMethod)(this.dummyMain, dummyMainClass);
+        this.dummyMain.setImplementationSignature(methodSignature);
+        this.dummyMain.setLineCol(0);
+        (0, ArkMethodBuilder_1.checkAndUpdateMethod)(this.dummyMain, dummyMainClass);
         dummyMainClass.addMethod(this.dummyMain);
         for (const method of this.entryMethods) {
             if (method.getDeclaringArkClass().isDefaultArkClass()) {
@@ -162,7 +164,6 @@ class DummyMainCreater {
         const dummyCfg = new Cfg_1.Cfg();
         dummyCfg.setDeclaringMethod(this.dummyMain);
         const firstBlock = new BasicBlock_1.BasicBlock();
-        dummyCfg.addBlock(firstBlock);
         let isStartingStmt = true;
         for (const method of this.scene.getStaticInitMethods()) {
             const staticInvokeExpr = new Expr_1.ArkStaticInvokeExpr(method.getSignature(), []);
@@ -193,15 +194,17 @@ class DummyMainCreater {
             }
         }
         const countLocal = new Local_1.Local('count', Type_1.NumberType.getInstance());
-        const zero = new Constant_1.Constant('0', Type_1.NumberType.getInstance());
+        const zero = ValueUtil_1.ValueUtil.getOrCreateNumberConst(0);
         const countAssignStmt = new Stmt_1.ArkAssignStmt(countLocal, zero);
-        const truE = new Constant_1.Constant('true', Type_1.BooleanType.getInstance());
+        const truE = ValueUtil_1.ValueUtil.getBooleanConstant(true);
         const conditionTrue = new Expr_1.ArkConditionExpr(truE, zero, Expr_1.RelationalBinaryOperator.Equality);
         const whileStmt = new Stmt_1.ArkIfStmt(conditionTrue);
         firstBlock.addStmt(countAssignStmt);
+        dummyCfg.addBlock(firstBlock);
+        dummyCfg.setStartingStmt(firstBlock.getStmts()[0]);
         const whileBlock = new BasicBlock_1.BasicBlock();
-        dummyCfg.addBlock(whileBlock);
         whileBlock.addStmt(whileStmt);
+        dummyCfg.addBlock(whileBlock);
         firstBlock.addSuccessorBlock(whileBlock);
         whileBlock.addPredecessorBlock(firstBlock);
         let lastBlocks = [whileBlock];
@@ -211,8 +214,8 @@ class DummyMainCreater {
             const condition = new Expr_1.ArkConditionExpr(countLocal, new Constant_1.Constant(count.toString(), Type_1.NumberType.getInstance()), Expr_1.RelationalBinaryOperator.Equality);
             const ifStmt = new Stmt_1.ArkIfStmt(condition);
             const ifBlock = new BasicBlock_1.BasicBlock();
-            dummyCfg.addBlock(ifBlock);
             ifBlock.addStmt(ifStmt);
+            dummyCfg.addBlock(ifBlock);
             for (const block of lastBlocks) {
                 ifBlock.addPredecessorBlock(block);
                 block.addSuccessorBlock(ifBlock);
@@ -260,8 +263,8 @@ class DummyMainCreater {
                 invokeExpr = new Expr_1.ArkStaticInvokeExpr(method.getSignature(), paramLocals);
             }
             const invokeStmt = new Stmt_1.ArkInvokeStmt(invokeExpr);
-            dummyCfg.addBlock(invokeBlock);
             invokeBlock.addStmt(invokeStmt);
+            dummyCfg.addBlock(invokeBlock);
             ifBlock.addSuccessorBlock(invokeBlock);
             invokeBlock.addPredecessorBlock(ifBlock);
             lastBlocks = [ifBlock, invokeBlock];
@@ -272,8 +275,8 @@ class DummyMainCreater {
         }
         const returnStmt = new Stmt_1.ArkReturnVoidStmt();
         const returnBlock = new BasicBlock_1.BasicBlock();
-        dummyCfg.addBlock(returnBlock);
         returnBlock.addStmt(returnStmt);
+        dummyCfg.addBlock(returnBlock);
         whileBlock.addSuccessorBlock(returnBlock);
         returnBlock.addPredecessorBlock(whileBlock);
         return dummyCfg;
@@ -333,11 +336,21 @@ class DummyMainCreater {
         });
         return methods;
     }
-    getMethodsFromAllAbilities() {
+    classInheritsAbility(arkClass) {
         const ABILITY_BASE_CLASSES = ['UIExtensionAbility', 'Ability', 'FormExtensionAbility', 'UIAbility', 'BackupExtensionAbility'];
+        let superClass = arkClass.getSuperClass();
+        while (superClass) {
+            if (ABILITY_BASE_CLASSES.includes(superClass.getName())) {
+                return true;
+            }
+            superClass = superClass.getSuperClass();
+        }
+        return false;
+    }
+    getMethodsFromAllAbilities() {
         let methods = [];
         this.scene.getClasses()
-            .filter(cls => ABILITY_BASE_CLASSES.includes(cls.getSuperClassName()))
+            .filter(cls => this.classInheritsAbility(cls))
             .forEach(cls => {
             methods.push(...cls.getMethods().filter(mtd => entryMethodUtils_1.LIFECYCLE_METHOD_NAME.includes(mtd.getName())));
         });

package/lib/core/common/EtsConst.d.ts

@@ -62,4 +62,5 @@ export declare const COMPONENT_COMMON: string;
 export declare const COMPONENT_INSTANCE: string;
 export declare const API_INTERNAL: string;
 export declare const COMPONENT_ATTRIBUTE: string;
+export declare const CALL_BACK: string;
 //# sourceMappingURL=EtsConst.d.ts.map

package/lib/core/common/EtsConst.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EtsConst.d.ts","sourceRoot":"","sources":["../../../src/core/common/EtsConst.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoyBhC,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,GAAG,CAAC,MAAM,CAAgD,CAAC;AAElG,eAAO,MAAM,wBAAwB,EAAE,GAAG,CAAC,MAAM,CAqD/C,CAAC;AAEH,eAAO,MAAM,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAqE,CAAC;AAClH,eAAO,MAAM,eAAe,EAAE,MAAgB,CAAC;AAC/C,eAAO,MAAM,iBAAiB,EAAE,MAAkB,CAAC;AACnD,eAAO,MAAM,uBAAuB,EAAE,MAAuB,CAAC;AAE9D,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED,eAAO,MAAM,yBAAyB,EAAE,MAAiB,CAAC;AAC1D,eAAO,MAAM,sBAAsB,EAAE,MAAc,CAAC;AACpD,eAAO,MAAM,oBAAoB,EAAE,MAAe,CAAC;AACnD,eAAO,MAAM,gBAAgB,EAAE,MAAiB,CAAC;AACjD,eAAO,MAAM,kBAAkB,EAAE,MAAkB,CAAC;AACpD,eAAO,MAAM,uBAAuB,EAAE,MAAsB,CAAC;AAE7D,eAAO,MAAM,YAAY,EAAE,MAAa,CAAC;AACzC,eAAO,MAAM,mBAAmB,EAAE,MAAmB,CAAC;AACtD,eAAO,MAAM,yBAAyB,EAAE,MAAiB,CAAC;AAC1D,eAAO,MAAM,wBAAwB,EAAE,MAAgB,CAAC;AAExD,eAAO,MAAM,2BAA2B,EAAE,GAAG,CAAC,MAAM,CAKlD,CAAC;AAEH,eAAO,MAAM,cAAc,EAAE,MAA0C,CAAC;AACxE,eAAO,MAAM,gBAAgB,EAAE,MAAiB,CAAC;AACjD,eAAO,MAAM,kBAAkB,EAAE,MAAmB,CAAC;AACrD,eAAO,MAAM,YAAY,EAAE,MAA0C,CAAC;AAEtE,eAAO,MAAM,mBAAmB,EAAE,MAAoB,CAAC"}
+{"version":3,"file":"EtsConst.d.ts","sourceRoot":"","sources":["../../../src/core/common/EtsConst.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoyBhC,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,GAAG,CAAC,MAAM,CAAgD,CAAC;AAElG,eAAO,MAAM,wBAAwB,EAAE,GAAG,CAAC,MAAM,CAqD/C,CAAC;AAEH,eAAO,MAAM,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAqE,CAAC;AAClH,eAAO,MAAM,eAAe,EAAE,MAAgB,CAAC;AAC/C,eAAO,MAAM,iBAAiB,EAAE,MAAkB,CAAC;AACnD,eAAO,MAAM,uBAAuB,EAAE,MAAuB,CAAC;AAE9D,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED,eAAO,MAAM,yBAAyB,EAAE,MAAiB,CAAC;AAC1D,eAAO,MAAM,sBAAsB,EAAE,MAAc,CAAC;AACpD,eAAO,MAAM,oBAAoB,EAAE,MAAe,CAAC;AACnD,eAAO,MAAM,gBAAgB,EAAE,MAAiB,CAAC;AACjD,eAAO,MAAM,kBAAkB,EAAE,MAAkB,CAAC;AACpD,eAAO,MAAM,uBAAuB,EAAE,MAAsB,CAAC;AAE7D,eAAO,MAAM,YAAY,EAAE,MAAa,CAAC;AACzC,eAAO,MAAM,mBAAmB,EAAE,MAAmB,CAAC;AACtD,eAAO,MAAM,yBAAyB,EAAE,MAAiB,CAAC;AAC1D,eAAO,MAAM,wBAAwB,EAAE,MAAgB,CAAC;AAExD,eAAO,MAAM,2BAA2B,EAAE,GAAG,CAAC,MAAM,CAKlD,CAAC;AAEH,eAAO,MAAM,cAAc,EAAE,MAA0C,CAAC;AACxE,eAAO,MAAM,gBAAgB,EAAE,MAAiB,CAAC;AACjD,eAAO,MAAM,kBAAkB,EAAE,MAAmB,CAAC;AACrD,eAAO,MAAM,YAAY,EAAE,MAA0C,CAAC;AAEtE,eAAO,MAAM,mBAAmB,EAAE,MAAoB,CAAC;AACvD,eAAO,MAAM,SAAS,EAAE,MAAmB,CAAC"}