arkanalyzer 1.0.64 → 1.0.65
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoopBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/graph/builder/LoopBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAK3C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C;;GAEG;AACH,qBAAa,WAAW;IACb,mBAAmB,CACtB,sBAAsB,EAAE,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,EACrD,0BAA0B,EAAE,GAAG,CAAC,YAAY,CAAC,EAC7C,aAAa,EAAE,GAAG,CAAC,UAAU,CAAC,EAC9B,aAAa,EAAE,YAAY,EAAE,GAC9B,IAAI;IAoEP,OAAO,CAAC,+BAA+B;IAWvC,OAAO,CAAC,iCAAiC;IAuDzC,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,6BAA6B;IAgCrC,OAAO,CAAC,kBAAkB;IAmB1B,OAAO,CAAC,mBAAmB;IAoB3B,OAAO,CAAC,kBAAkB;IAmB1B,OAAO,CAAC,gBAAgB;IA2BxB,OAAO,CAAC,2BAA2B;IAWnC,OAAO,CAAC,iBAAiB;IAYzB,OAAO,CAAC,eAAe;IAkCvB,OAAO,CAAC,sBAAsB;
|
|
1
|
+
{"version":3,"file":"LoopBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/graph/builder/LoopBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAK3C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C;;GAEG;AACH,qBAAa,WAAW;IACb,mBAAmB,CACtB,sBAAsB,EAAE,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,EACrD,0BAA0B,EAAE,GAAG,CAAC,YAAY,CAAC,EAC7C,aAAa,EAAE,GAAG,CAAC,UAAU,CAAC,EAC9B,aAAa,EAAE,YAAY,EAAE,GAC9B,IAAI;IAoEP,OAAO,CAAC,+BAA+B;IAWvC,OAAO,CAAC,iCAAiC;IAuDzC,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,6BAA6B;IAgCrC,OAAO,CAAC,kBAAkB;IAmB1B,OAAO,CAAC,mBAAmB;IAoB3B,OAAO,CAAC,kBAAkB;IAmB1B,OAAO,CAAC,gBAAgB;IA2BxB,OAAO,CAAC,2BAA2B;IAWnC,OAAO,CAAC,iBAAiB;IAYzB,OAAO,CAAC,eAAe;IAkCvB,OAAO,CAAC,sBAAsB;CAoDjC"}
|
|
@@ -240,7 +240,9 @@ class LoopBuilder {
|
|
|
240
240
|
blockBuildersReenterCondition.push(prevBlockBuilder);
|
|
241
241
|
}
|
|
242
242
|
}
|
|
243
|
-
if (blockBuildersReenterCondition.length > 1 ||
|
|
243
|
+
if (blockBuildersReenterCondition.length > 1 ||
|
|
244
|
+
blockBuildersReenterCondition[0].nexts.length > 1 ||
|
|
245
|
+
blocksContainLoopCondition.has(blockBuildersReenterCondition[0])) {
|
|
244
246
|
// put incrementor statements into an extra block
|
|
245
247
|
this.insertBeforeConditionBlockBuilder(blockBuilderToCfgBlock, currBlockBuilder, stmtsReenterCondition, true, basicBlockSet, blockBuilders);
|
|
246
248
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArkClassBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkClassBuilder.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAmE,MAAM,iBAAiB,CAAC;AAClG,OAAO,EAAE,QAAQ,EAAiB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"ArkClassBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkClassBuilder.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAmE,MAAM,iBAAiB,CAAC;AAClG,OAAO,EAAE,QAAQ,EAAiB,MAAM,aAAa,CAAC;AA0BtD,MAAM,MAAM,aAAa,GACnB,EAAE,CAAC,gBAAgB,GACnB,EAAE,CAAC,oBAAoB,GACvB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,iBAAiB,GACpB,EAAE,CAAC,uBAAuB,CAAC;AAUjC,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,UAAU,GAAG,IAAI,CAItH;AAED,wBAAgB,oCAAoC,CAChD,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,QAAQ,EACtB,MAAM,EAAE,EAAE,CAAC,iBAAiB,EAC5B,UAAU,EAAE,EAAE,CAAC,UAAU,GAC1B,IAAI,CAIN;AAED,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,GAAG,IAAI,CAOpJ;AAED,wBAAgB,8BAA8B,CAC1C,OAAO,EAAE,aAAa,EACtB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,QAAQ,EACb,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,eAAe,CAAC,EAAE,SAAS,GAC5B,IAAI,CASN;AAED,wBAAgB,mCAAmC,CAC/C,OAAO,EAAE,aAAa,EACtB,YAAY,EAAE,YAAY,EAC1B,GAAG,EAAE,QAAQ,EACb,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,eAAe,CAAC,EAAE,SAAS,GAC5B,IAAI,CAUN;AAmBD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,GAAG,IAAI,CA0BvI"}
|
|
@@ -60,6 +60,7 @@ const Position_1 = require("../../base/Position");
|
|
|
60
60
|
const Type_1 = require("../../base/Type");
|
|
61
61
|
const BodyBuilder_1 = require("./BodyBuilder");
|
|
62
62
|
const Expr_1 = require("../../base/Expr");
|
|
63
|
+
const ArkBaseModel_1 = require("../ArkBaseModel");
|
|
63
64
|
const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'ArkClassBuilder');
|
|
64
65
|
function buildDefaultArkClassFromArkFile(arkFile, defaultClass, astRoot) {
|
|
65
66
|
defaultClass.setDeclaringArkFile(arkFile);
|
|
@@ -160,6 +161,7 @@ function init4StaticInitMethod(cls) {
|
|
|
160
161
|
const staticInit = new ArkMethod_1.ArkMethod();
|
|
161
162
|
staticInit.setDeclaringArkClass(cls);
|
|
162
163
|
staticInit.setIsGeneratedFlag(true);
|
|
164
|
+
staticInit.setModifiers(ArkBaseModel_1.ModifierType.STATIC);
|
|
163
165
|
const methodSubSignature = ArkSignatureBuilder_1.ArkSignatureBuilder.buildMethodSubSignatureFromMethodName(Const_1.STATIC_INIT_METHOD_NAME);
|
|
164
166
|
methodSubSignature.setReturnType(Type_1.VoidType.getInstance());
|
|
165
167
|
const methodSignature = new ArkSignature_1.MethodSignature(staticInit.getDeclaringArkClass().getSignature(), methodSubSignature);
|
|
@@ -161,7 +161,8 @@ class SourceClass extends SourceBase_1.SourceBase {
|
|
|
161
161
|
return items;
|
|
162
162
|
}
|
|
163
163
|
parseFieldInitMethod(name) {
|
|
164
|
-
|
|
164
|
+
var _a;
|
|
165
|
+
let method = (_a = this.cls.getMethodWithName(name)) !== null && _a !== void 0 ? _a : this.cls.getStaticMethodWithName(name);
|
|
165
166
|
if (!method || (method === null || method === void 0 ? void 0 : method.getBody()) === undefined) {
|
|
166
167
|
return new Map();
|
|
167
168
|
}
|