diff --git a/ts2panda/scripts/run_tests.py b/ts2panda/scripts/run_tests.py index 52899474369f1d258ad17092390426c723f93c6a..8e25749fadb862812ae3dfc5477b1afcb4061901 100755 --- a/ts2panda/scripts/run_tests.py +++ b/ts2panda/scripts/run_tests.py @@ -129,12 +129,18 @@ class Ts2abcTests(): tests_args = "tests/**/*.test.js" if plat_form == "linux": + cmd = ['cp', f'{self.src_dir}/src/jshelpers.js', f'build/src/' ] + run_command(cmd, self.dist_dir) cmd = [mocha, f'build/{tests_args}'] ret = run_command(cmd, self.dist_dir) elif plat_form == "win": + cmd = ['cp', f'{self.src_dir}/src/jshelpers.js', f'build-win/src/' ] + run_command(cmd, self.dist_dir) cmd = [mocha, f'build-win/{tests_args}'] ret = run_command(cmd, self.dist_dir) elif plat_form == 'mac': + cmd = ['cp', f'{self.src_dir}/src/jshelpers.js', f'build-mac/src/' ] + run_command(cmd, self.dist_dir) cmd = [mocha, f'build-mac/{tests_args}'] ret = run_command(cmd, self.dist_dir) if ret: diff --git a/ts2panda/src/index.ts b/ts2panda/src/index.ts index 93f4886b35b503e2307cc65323dc8c0790cee8c0..af110c62a6819a1c124dec164273a2ea0073a9e7 100644 --- a/ts2panda/src/index.ts +++ b/ts2panda/src/index.ts @@ -145,7 +145,7 @@ function getDtsFiles(libDir: string): string[] { if(stat.isDirectory() === true) { finDtsFile(fPath); } - if (stat.isFile() === true && item.endsWith(".d.ts") === true) { + if (stat.isFile() === true && item.endsWith(".d.ts") === true) { dtsFiles.push(fPath); } }); diff --git a/ts2panda/tests/expression/arguments.test.ts b/ts2panda/tests/expression/arguments.test.ts index 660e1b72b0f7c13b0d94e13c6d977f9c9d849239..3dd2fbd706b16156e10009d51262ed3e4564493e 100644 --- a/ts2panda/tests/expression/arguments.test.ts +++ b/ts2panda/tests/expression/arguments.test.ts @@ -40,7 +40,7 @@ describe("arguments Keyword", function () { new StaDyn(argumentsReg), new LdaDyn(argumentsReg), new StaDyn(temp1), - new EcmaLdobjbyindex(temp1, new Imm(ResultType.Int, 0)), + new EcmaLdobjbyindex(temp1, new Imm(0)), new EcmaReturnundefined() ]; let functionPg = snippetCompiler.getPandaGenByName("foo"); @@ -59,7 +59,7 @@ describe("arguments Keyword", function () { new StaDyn(new VReg()), new LdaDyn(parameterArguments), new StaDyn(temp1), - new EcmaLdobjbyindex(temp1, new Imm(ResultType.Int, 0)), + new EcmaLdobjbyindex(temp1, new Imm(0)), new EcmaReturnundefined() ]; let functionPg = snippetCompiler.getPandaGenByName("foo"); diff --git a/ts2panda/tests/expression/binary.test.ts b/ts2panda/tests/expression/binary.test.ts index f80ba94f38de91a66973ce481b84a9d183e7914a..c1765ac4251b2e6a1a374115f03796a78e7c32f1 100644 --- a/ts2panda/tests/expression/binary.test.ts +++ b/ts2panda/tests/expression/binary.test.ts @@ -57,9 +57,9 @@ describe("BinaryOperationsTest", function () { let insns = compileMainSnippet("2 + 3"); let lhs = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new EcmaAdd2dyn(lhs), new EcmaReturnundefined() ]; @@ -70,9 +70,9 @@ describe("BinaryOperationsTest", function () { let insns = compileMainSnippet("5 - 1"); let lhs = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaSub2dyn(lhs), new EcmaReturnundefined() ]; @@ -95,7 +95,7 @@ describe("BinaryOperationsTest", function () { new LdaDyn(new VReg()), new Jmp(endLabel), leftNullishLabel, - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), endLabel, new EcmaReturnundefined() ]; @@ -125,7 +125,7 @@ describe("BinaryOperationsTest", function () { new Jmp(endLabel), leftNullishLabel, - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), endLabel, new EcmaReturnundefined() ]; @@ -143,7 +143,7 @@ describe("BinaryOperationsTest", function () { let leftNullishLabel = new Label(); let endLabel = new Label(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new StaDyn(new VReg()), new EcmaStrictnoteqdyn(new VReg()), new Jeqz(leftNullishLabel), @@ -155,7 +155,7 @@ describe("BinaryOperationsTest", function () { new Jmp(endLabel), leftNullishLabel, - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), endLabel, new EcmaReturnundefined() ]; @@ -170,9 +170,9 @@ describe("BinaryOperationsTest", function () { let insns = compileMainSnippet("3 * 4"); let lhs = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 4)), + new LdaiDyn(new Imm(4)), new EcmaMul2dyn(lhs), new EcmaReturnundefined() ]; @@ -183,9 +183,9 @@ describe("BinaryOperationsTest", function () { let insns = compileMainSnippet("2 ** 3"); let lhs = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new EcmaExpdyn(lhs), new EcmaReturnundefined(), ]; @@ -196,9 +196,9 @@ describe("BinaryOperationsTest", function () { let insns = compileMainSnippet("7 / 1"); let lhs = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 7)), + new LdaiDyn(new Imm(7)), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaDiv2dyn(lhs), new EcmaReturnundefined() ]; @@ -209,9 +209,9 @@ describe("BinaryOperationsTest", function () { let insns = compileMainSnippet("8 % 2"); let lhs = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 8)), + new LdaiDyn(new Imm(8)), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new EcmaMod2dyn(lhs), new EcmaReturnundefined() ]; @@ -222,9 +222,9 @@ describe("BinaryOperationsTest", function () { let insns = compileMainSnippet("2 << 3"); let lhs = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new EcmaShl2dyn(lhs), new EcmaReturnundefined() ]; @@ -235,9 +235,9 @@ describe("BinaryOperationsTest", function () { let insns = compileMainSnippet("4 >> 1"); let lhs = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 4)), + new LdaiDyn(new Imm(4)), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaShr2dyn(lhs), new EcmaReturnundefined() ]; @@ -248,9 +248,9 @@ describe("BinaryOperationsTest", function () { let insns = compileMainSnippet("12 >>> 2"); let lhs = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 12)), + new LdaiDyn(new Imm(12)), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new EcmaAshr2dyn(lhs), new EcmaReturnundefined() ]; @@ -261,9 +261,9 @@ describe("BinaryOperationsTest", function () { let insns = compileMainSnippet("3 & 4"); let lhs = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 4)), + new LdaiDyn(new Imm(4)), new EcmaAnd2dyn(lhs), new EcmaReturnundefined() ]; @@ -274,9 +274,9 @@ describe("BinaryOperationsTest", function () { let insns = compileMainSnippet("2 | 5"); let lhs = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaOr2dyn(lhs), new EcmaReturnundefined() ]; @@ -287,9 +287,9 @@ describe("BinaryOperationsTest", function () { let insns = compileMainSnippet("7 ^ 3"); let lhs = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 7)), + new LdaiDyn(new Imm(7)), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new EcmaXor2dyn(lhs), new EcmaReturnundefined() ]; @@ -301,7 +301,7 @@ describe("BinaryOperationsTest", function () { let expected = [ new LdaDyn(new VReg()), new EcmaStlettoglobalrecord('i'), - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new EcmaTrystglobalbyname('i'), new EcmaReturnundefined() ]; @@ -315,7 +315,7 @@ describe("BinaryOperationsTest", function () { `); let expected = [ new LdaStr("use strict"), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaTrystglobalbyname("a"), new EcmaReturnundefined() ]; @@ -327,7 +327,7 @@ describe("BinaryOperationsTest", function () { let insns = compileMainSnippet("((x)) = 1;"); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaStglobalvar("x"), new EcmaReturnundefined() ]; @@ -349,7 +349,7 @@ describe("BinaryOperationsTest", function () { new EcmaTryldglobalbyname('a'), new StaDyn(tempObj), new MovDyn(objReg, tempObj), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaStobjbyname("b", objReg), new EcmaReturnundefined() diff --git a/ts2panda/tests/expression/call.test.ts b/ts2panda/tests/expression/call.test.ts index c19a8a45ac9abc0ae11891857304c14977294318..208d14ba6064436434797282ebd36d2ffa658b6a 100755 --- a/ts2panda/tests/expression/call.test.ts +++ b/ts2panda/tests/expression/call.test.ts @@ -64,7 +64,7 @@ describe("CallTest", function () { let arg0 = new VReg(); let arg2 = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaStlettoglobalrecord('i'), new EcmaTryldglobalbyname("foo"), new StaDyn(arg0), @@ -88,7 +88,7 @@ describe("CallTest", function () { new StaDyn(arg0), new EcmaLdobjbyname("method", arg0), new StaDyn(arg1), - new EcmaCallithisrangedyn(new Imm(ResultType.Int, 1), [arg1, obj]), + new EcmaCallithisrangedyn(new Imm(1), [arg1, obj]), new EcmaReturnundefined() ]; @@ -106,7 +106,7 @@ describe("CallTest", function () { let arrayInstance = new VReg(); let expected = [ - new EcmaCreatearraywithbuffer(new Imm(ResultType.Int, 0)), + new EcmaCreatearraywithbuffer(new Imm(0)), new StaDyn(arrayInstance), new LdaDyn(arrayInstance), new EcmaStconsttoglobalrecord('args'), @@ -116,7 +116,7 @@ describe("CallTest", function () { new EcmaCreateemptyarray(), new StaDyn(arrayInstance), - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new StaDyn(lengthReg), new EcmaTryldglobalbyname('args'), new EcmaStarrayspread(arrayInstance, lengthReg), @@ -144,7 +144,7 @@ describe("CallTest", function () { new StaDyn(prop), new EcmaLdobjbyvalue(arg0, prop), new StaDyn(arg1), - new EcmaCallithisrangedyn(new Imm(ResultType.Int, 1), [arg1, obj]), + new EcmaCallithisrangedyn(new Imm(1), [arg1, obj]), new EcmaReturnundefined() ]; diff --git a/ts2panda/tests/expression/cmpBinary.test.ts b/ts2panda/tests/expression/cmpBinary.test.ts index 2534c932ac403bf59170da7d0c5023c5542f3aca..55ad541245f8bf01c18086dab0ed541b8c0f5b3f 100644 --- a/ts2panda/tests/expression/cmpBinary.test.ts +++ b/ts2panda/tests/expression/cmpBinary.test.ts @@ -58,9 +58,9 @@ describe("CmpBinaryOperators", function () { let endLabel = new Label(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new EcmaLessdyn(lhs), new Jeqz(falseLabel), new LdaDyn(new VReg()), @@ -80,9 +80,9 @@ describe("CmpBinaryOperators", function () { let endLabel = new Label(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaGreaterdyn(lhs), new Jeqz(falseLabel), new LdaDyn(new VReg()), @@ -102,9 +102,9 @@ describe("CmpBinaryOperators", function () { let endLabel = new Label(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 4)), + new LdaiDyn(new Imm(4)), new EcmaLesseqdyn(lhs), new Jeqz(falseLabel), new LdaDyn(new VReg()), @@ -124,9 +124,9 @@ describe("CmpBinaryOperators", function () { let endLabel = new Label(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new EcmaGreatereqdyn(lhs), new Jeqz(falseLabel), new LdaDyn(new VReg()), @@ -146,9 +146,9 @@ describe("CmpBinaryOperators", function () { let endLabel = new Label(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new EcmaEqdyn(lhs), new Jeqz(falseLabel), new LdaDyn(new VReg()), @@ -168,9 +168,9 @@ describe("CmpBinaryOperators", function () { let endLabel = new Label(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new EcmaNoteqdyn(lhs), new Jeqz(falseLabel), new LdaDyn(new VReg()), @@ -190,9 +190,9 @@ describe("CmpBinaryOperators", function () { let endLabel = new Label(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new EcmaStricteqdyn(lhs), new Jeqz(falseLabel), new LdaDyn(new VReg()), @@ -212,9 +212,9 @@ describe("CmpBinaryOperators", function () { let endLabel = new Label(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new EcmaStrictnoteqdyn(lhs), new Jeqz(falseLabel), new LdaDyn(new VReg()), @@ -233,11 +233,11 @@ describe("CmpBinaryOperators", function () { let lhs = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaStlettoglobalrecord('a'), new EcmaTryldglobalbyname('a'), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new EcmaAnd2dyn(lhs), new EcmaTrystglobalbyname('a'), new EcmaReturnundefined() @@ -251,11 +251,11 @@ describe("CmpBinaryOperators", function () { let lhs = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaStlettoglobalrecord('a'), new EcmaTryldglobalbyname('a'), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new EcmaOr2dyn(lhs), new EcmaTrystglobalbyname('a'), new EcmaReturnundefined() @@ -269,11 +269,11 @@ describe("CmpBinaryOperators", function () { let lhs = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaStlettoglobalrecord('a'), new EcmaTryldglobalbyname('a'), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new EcmaXor2dyn(lhs), new EcmaTrystglobalbyname('a'), new EcmaReturnundefined() @@ -289,7 +289,7 @@ describe("CmpBinaryOperators", function () { let lhs = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaStlettoglobalrecord('x'), new EcmaTryldglobalbyname('x'), new StaDyn(lhs), diff --git a/ts2panda/tests/expression/conditions.test.ts b/ts2panda/tests/expression/conditions.test.ts index 8e15bd616b506d0b882c3f40469c50bb7a7033c8..49a060a7b7ff099f01546b5c2a4f36ea5a9dd2bb 100644 --- a/ts2panda/tests/expression/conditions.test.ts +++ b/ts2panda/tests/expression/conditions.test.ts @@ -142,10 +142,10 @@ describe("IfConditionTest", function () { new LdaDyn(new VReg()), new EcmaIstrue(), new Jeqz(expectedElseLabel), - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new Jmp(expectedEndLabel), expectedElseLabel, - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), expectedEndLabel, new EcmaStlettoglobalrecord('a'), ]; @@ -165,7 +165,7 @@ describe("IfConditionTest", function () { new LdaDyn(new VReg()), new EcmaIstrue(), new Jeqz(ifFalseLabel), - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaIstrue(), new Jeqz(ifFalseLabel), ifFalseLabel, @@ -182,7 +182,7 @@ describe("IfConditionTest", function () { new LdaDyn(new VReg()), new EcmaIsfalse(), new Jeqz(endLabel), - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaIstrue(), new Jeqz(ifFalseLabel), endLabel, diff --git a/ts2panda/tests/expression/delete.test.ts b/ts2panda/tests/expression/delete.test.ts index 8c7f3a1ace370a42f0163b37159686fa137a7e63..c6f318823b87bdcea5676195d3260b474a127a7b 100644 --- a/ts2panda/tests/expression/delete.test.ts +++ b/ts2panda/tests/expression/delete.test.ts @@ -46,7 +46,7 @@ describe("deleteExpressionTest", function () { new EcmaStlettoglobalrecord('arr'), new EcmaTryldglobalbyname('arr'), new StaDyn(objReg), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new StaDyn(propReg), new EcmaDelobjprop(objReg, propReg), new EcmaReturnundefined() diff --git a/ts2panda/tests/expression/elementAccess.test.ts b/ts2panda/tests/expression/elementAccess.test.ts index 3a466cfd114b46102ab56287f14aa22558ff1358..f83e34303a3d635c337c16ff282ff5d793dafc84 100644 --- a/ts2panda/tests/expression/elementAccess.test.ts +++ b/ts2panda/tests/expression/elementAccess.test.ts @@ -62,7 +62,7 @@ describe("ElementAccess", function () { new EcmaTryldglobalbyname('obj'), new StaDyn(tempObj), new MovDyn(objReg, tempObj), - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaStobjbyname("property", objReg), ]; @@ -81,9 +81,9 @@ describe("ElementAccess", function () { new EcmaStlettoglobalrecord('obj'), new EcmaTryldglobalbyname('obj'), new StaDyn(objReg), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new StaDyn(prop1Reg), - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new EcmaAdd2dyn(prop1Reg), new StaDyn(val), new EcmaLdobjbyvalue(objReg, val) diff --git a/ts2panda/tests/expression/functionExpression.test.ts b/ts2panda/tests/expression/functionExpression.test.ts index c7743c9a4ba48fc3660bf9b4f312dda258262303..09453513358f00bfe48aafb8114eb32c63af9b8d 100755 --- a/ts2panda/tests/expression/functionExpression.test.ts +++ b/ts2panda/tests/expression/functionExpression.test.ts @@ -235,14 +235,14 @@ describe("compileFunctionExpression", function () { new EcmaGetresumemode(new VReg()), new StaDyn(new VReg()), - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new EcmaEqdyn(new VReg()), new Jeqz(notRetLabel0), new LdaDyn(new VReg()), new ReturnDyn(), notRetLabel0, - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaEqdyn(new VReg()), new Jeqz(notThrowLabel0), new LdaDyn(new VReg()), @@ -250,7 +250,7 @@ describe("compileFunctionExpression", function () { notThrowLabel0, new LdaDyn(new VReg()), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new StaDyn(new VReg()), new EcmaCreateiterresultobj(new VReg(), new VReg()), new StaDyn(new VReg()), @@ -260,14 +260,14 @@ describe("compileFunctionExpression", function () { new EcmaGetresumemode(new VReg()), new StaDyn(new VReg()), - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new EcmaEqdyn(new VReg()), new Jeqz(notRetLabel1), new LdaDyn(new VReg()), new ReturnDyn(), notRetLabel1, - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaEqdyn(new VReg()), new Jeqz(notThrowLabel1), new LdaDyn(new VReg()), @@ -314,7 +314,7 @@ describe("compileFunctionExpression", function () { new EcmaAsyncfunctionenter(), new StaDyn(new VReg()), beginLabel, - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new StaDyn(new VReg()), new EcmaAsyncfunctionawaituncaught(new VReg(), new VReg()), new StaDyn(new VReg()), @@ -323,7 +323,7 @@ describe("compileFunctionExpression", function () { new StaDyn(new VReg()), new EcmaGetresumemode(new VReg()), new StaDyn(new VReg()), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaEqdyn(new VReg()), new Jeqz(nextLabel), new LdaDyn(new VReg()), diff --git a/ts2panda/tests/expression/literal.test.ts b/ts2panda/tests/expression/literal.test.ts index 7b4936bfb963ab8d8168a7662843abd750c74bc9..1bc73e39bb873d8863cfd8969d3c9eb18589e9a3 100644 --- a/ts2panda/tests/expression/literal.test.ts +++ b/ts2panda/tests/expression/literal.test.ts @@ -46,7 +46,7 @@ describe("LiteralTest", function () { it("5", function () { let insns = compileMainSnippet("5"); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaReturnundefined() ]; expect(checkInstructions(insns, expected)).to.be.true; @@ -93,7 +93,7 @@ describe("LiteralTest", function () { let arrayInstance = new VReg(); let expected = [ - new EcmaCreatearraywithbuffer(new Imm(ResultType.Int, 0)), + new EcmaCreatearraywithbuffer(new Imm(0)), new StaDyn(arrayInstance), new LdaDyn(arrayInstance), new EcmaStlettoglobalrecord('arr'), @@ -120,7 +120,7 @@ describe("LiteralTest", function () { let arrayInstance = new VReg(); let expected = [ - new EcmaCreatearraywithbuffer(new Imm(ResultType.Int, 0)), + new EcmaCreatearraywithbuffer(new Imm(0)), new StaDyn(arrayInstance), new LdaDyn(arrayInstance), new EcmaStlettoglobalrecord('arr'), @@ -137,8 +137,8 @@ describe("LiteralTest", function () { let expected = [ new EcmaCreateemptyarray(), new StaDyn(arrayInstance), - new LdaiDyn(new Imm(ResultType.Int, 1)), - new EcmaStownbyindex(arrayInstance, new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), + new EcmaStownbyindex(arrayInstance, new Imm(1)), new LdaDyn(arrayInstance), new EcmaStlettoglobalrecord('arr'), new EcmaReturnundefined() @@ -152,10 +152,10 @@ describe("LiteralTest", function () { let arrayInstance = new VReg(); let expected = [ - new EcmaCreatearraywithbuffer(new Imm(ResultType.Int, 0)), + new EcmaCreatearraywithbuffer(new Imm(0)), new StaDyn(arrayInstance), - new LdaiDyn(new Imm(ResultType.Int, 3)), - new EcmaStownbyindex(arrayInstance, new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(3)), + new EcmaStownbyindex(arrayInstance, new Imm(2)), new LdaDyn(arrayInstance), new EcmaStlettoglobalrecord('arr'), new EcmaReturnundefined() @@ -172,19 +172,19 @@ describe("LiteralTest", function () { let arrayInstance = new VReg(); let expected = [ - new EcmaCreatearraywithbuffer(new Imm(ResultType.Int, 0)), + new EcmaCreatearraywithbuffer(new Imm(0)), new StaDyn(arrayInstance), new LdaDyn(arrayInstance), new EcmaStlettoglobalrecord('arr1'), - new EcmaCreatearraywithbuffer(new Imm(ResultType.Int, 1)), + new EcmaCreatearraywithbuffer(new Imm(1)), new StaDyn(arrayInstance), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new StaDyn(elemIdxReg), new EcmaTryldglobalbyname('arr1'), new EcmaStarrayspread(arrayInstance, elemIdxReg), new StaDyn(elemIdxReg), - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new EcmaStownbyvalue(arrayInstance, elemIdxReg), new EcmaIncdyn(elemIdxReg), new StaDyn(elemIdxReg), @@ -213,7 +213,7 @@ describe("LiteralTest", function () { let insns = compileMainSnippet("let obj = {a: 1}"); let objInstance = new VReg(); let expected = [ - new EcmaCreateobjectwithbuffer(new Imm(ResultType.Int, 0)), + new EcmaCreateobjectwithbuffer(new Imm(0)), new StaDyn(objInstance), new LdaDyn(objInstance), new EcmaStlettoglobalrecord('obj'), @@ -228,13 +228,13 @@ describe("LiteralTest", function () { let lhs = new VReg(); let expected = [ - new EcmaCreateobjectwithbuffer(new Imm(ResultType.Int, 0)), + new EcmaCreateobjectwithbuffer(new Imm(0)), new StaDyn(objInstance), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new EcmaAdd2dyn(lhs), - new EcmaStownbyindex(objInstance, new Imm(ResultType.Int, 0)), + new EcmaStownbyindex(objInstance, new Imm(0)), new LdaDyn(objInstance), new EcmaStlettoglobalrecord('obj'), new EcmaReturnundefined() @@ -247,7 +247,7 @@ describe("LiteralTest", function () { let objInstance = new VReg(); let expected = [ - new EcmaCreateobjectwithbuffer(new Imm(ResultType.Int, 0)), + new EcmaCreateobjectwithbuffer(new Imm(0)), new StaDyn(objInstance), new LdaDyn(objInstance), new EcmaStlettoglobalrecord('obj'), @@ -261,7 +261,7 @@ describe("LiteralTest", function () { let objInstance = new VReg(); let expected = [ - new EcmaCreateobjectwithbuffer(new Imm(ResultType.Int, 0)), + new EcmaCreateobjectwithbuffer(new Imm(0)), new StaDyn(objInstance), new EcmaTryldglobalbyname('a'), new EcmaStownbyname("a", objInstance), diff --git a/ts2panda/tests/expression/logicBinary.test.ts b/ts2panda/tests/expression/logicBinary.test.ts index 54e54b96aebd3cbe3c0255090a54cede3a821be9..142641503f02a4f9b42d3b5e40c152d95b5c4c9a 100644 --- a/ts2panda/tests/expression/logicBinary.test.ts +++ b/ts2panda/tests/expression/logicBinary.test.ts @@ -41,7 +41,7 @@ describe("LogicBinaryOperators", function () { let postLabel = new Label(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 8)), + new LdaiDyn(new Imm(8)), new StaDyn(lhs), new EcmaIstrue(), new Jeqz(preLabel), @@ -62,7 +62,7 @@ describe("LogicBinaryOperators", function () { let preLabel = new Label(); let postLabel = new Label(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 8)), + new LdaiDyn(new Imm(8)), new StaDyn(lhs), new EcmaIsfalse(), new Jeqz(preLabel), diff --git a/ts2panda/tests/expression/new.test.ts b/ts2panda/tests/expression/new.test.ts index e2440dae8f625fdbedddb44c677902ffbd374fe7..1689f46ea7b7c768473aff673a99567b68852f0b 100755 --- a/ts2panda/tests/expression/new.test.ts +++ b/ts2panda/tests/expression/new.test.ts @@ -46,7 +46,7 @@ describe("NewTest", function () { new StaDyn(arg0), new MovDyn(targetReg, arg0), - new EcmaNewobjdynrange(new Imm(ResultType.Int, 2), [arg0, targetReg]), + new EcmaNewobjdynrange(new Imm(2), [arg0, targetReg]), new EcmaReturnundefined() ]; @@ -64,7 +64,7 @@ describe("NewTest", function () { new StaDyn(arg0), new MovDyn(targetReg, arg0), - new EcmaNewobjdynrange(new Imm(ResultType.Int, 2), [arg0, targetReg]), + new EcmaNewobjdynrange(new Imm(2), [arg0, targetReg]), new EcmaReturnundefined() ]; @@ -83,10 +83,10 @@ describe("NewTest", function () { new StaDyn(arg0), new MovDyn(targetReg, arg0), - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new StaDyn(arg1), - new EcmaNewobjdynrange(new Imm(ResultType.Int, 3), [arg0, targetReg, arg1]), + new EcmaNewobjdynrange(new Imm(3), [arg0, targetReg, arg1]), new EcmaReturnundefined() ]; @@ -109,7 +109,7 @@ describe("NewTest", function () { new StaDyn(arg0), new MovDyn(targetReg, arg0), - new EcmaNewobjdynrange(new Imm(ResultType.Int, 2), [arg0, targetReg]), + new EcmaNewobjdynrange(new Imm(2), [arg0, targetReg]), ]; insns = insns.slice(2, insns.length - 1); @@ -131,7 +131,7 @@ describe("NewTest", function () { new EcmaCreateemptyarray(), new StaDyn(arrayInstance), - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new StaDyn(elemIdxReg), new EcmaTryldglobalbyname("args"), diff --git a/ts2panda/tests/expression/numericLiteral.test.ts b/ts2panda/tests/expression/numericLiteral.test.ts index e8c3e842e31d3eab754ea7794cd90401bf32df9f..467721ea3fcdea847481f1d12a7edb8042ab1417 100755 --- a/ts2panda/tests/expression/numericLiteral.test.ts +++ b/ts2panda/tests/expression/numericLiteral.test.ts @@ -50,7 +50,7 @@ describe("compileNumericLiteral", function () { let node: ts.NumericLiteral = ts.createNumericLiteral("1"); compileNumericLiteral(pandaGen, node); let insns = pandaGen.getInsns(); - let expected = [new LdaiDyn(new Imm(ResultType.Int, 1))]; + let expected = [new LdaiDyn(new Imm(1))]; expect(checkInstructions(insns, expected)).to.be.true; }); it("Integer overflow", function () { @@ -58,7 +58,7 @@ describe("compileNumericLiteral", function () { let node: ts.NumericLiteral = ts.createNumericLiteral("2147483648"); compileNumericLiteral(pandaGen, node); let insns = pandaGen.getInsns(); - let expected = [new FldaiDyn(new Imm(ResultType.Float, 2147483648))]; + let expected = [new FldaiDyn(new Imm(2147483648))]; expect(checkInstructions(insns, expected)).to.be.true; }); it("double", function () { @@ -66,7 +66,7 @@ describe("compileNumericLiteral", function () { let node: ts.NumericLiteral = ts.createNumericLiteral("1.1"); compileNumericLiteral(pandaGen, node); let insns = pandaGen.getInsns(); - let expected = [new FldaiDyn(new Imm(ResultType.Float, 1.1))]; + let expected = [new FldaiDyn(new Imm(1.1))]; expect(checkInstructions(insns, expected)).to.be.true; }); }) \ No newline at end of file diff --git a/ts2panda/tests/expression/operationEqual.test.ts b/ts2panda/tests/expression/operationEqual.test.ts index 64dfb2fadf762dc5640a6532a3e4e4cdc9f92c92..ca5ef7b3e6dce20c9c44f131db45c722054b342e 100644 --- a/ts2panda/tests/expression/operationEqual.test.ts +++ b/ts2panda/tests/expression/operationEqual.test.ts @@ -46,11 +46,11 @@ describe("OperationEqualTest", function () { let lhs = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new EcmaStlettoglobalrecord('a'), new EcmaTryldglobalbyname('a'), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new EcmaAdd2dyn(lhs), new EcmaTrystglobalbyname('a'), new EcmaReturnundefined() @@ -64,11 +64,11 @@ describe("OperationEqualTest", function () { let lhs = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaStlettoglobalrecord('a'), new EcmaTryldglobalbyname('a'), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 7)), + new LdaiDyn(new Imm(7)), new EcmaSub2dyn(lhs), new EcmaTrystglobalbyname('a'), new EcmaReturnundefined() @@ -82,11 +82,11 @@ describe("OperationEqualTest", function () { let lhs = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new EcmaStlettoglobalrecord('a'), new EcmaTryldglobalbyname('a'), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 4)), + new LdaiDyn(new Imm(4)), new EcmaMul2dyn(lhs), new EcmaTrystglobalbyname('a'), new EcmaReturnundefined() @@ -100,11 +100,11 @@ describe("OperationEqualTest", function () { let lhs = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new EcmaStlettoglobalrecord('a'), new EcmaTryldglobalbyname('a'), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new EcmaExpdyn(lhs), new EcmaTrystglobalbyname('a'), new EcmaReturnundefined() @@ -118,11 +118,11 @@ describe("OperationEqualTest", function () { let lhs = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaStlettoglobalrecord('a'), new EcmaTryldglobalbyname('a'), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new EcmaDiv2dyn(lhs), new EcmaTrystglobalbyname('a'), new EcmaReturnundefined() @@ -136,11 +136,11 @@ describe("OperationEqualTest", function () { let lhs = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 15)), + new LdaiDyn(new Imm(15)), new EcmaStlettoglobalrecord('a'), new EcmaTryldglobalbyname('a'), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 7)), + new LdaiDyn(new Imm(7)), new EcmaMod2dyn(lhs), new EcmaTrystglobalbyname('a'), new EcmaReturnundefined() @@ -154,11 +154,11 @@ describe("OperationEqualTest", function () { let lhs = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 8)), + new LdaiDyn(new Imm(8)), new EcmaStlettoglobalrecord('a'), new EcmaTryldglobalbyname('a'), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new EcmaShl2dyn(lhs), new EcmaTrystglobalbyname('a'), new EcmaReturnundefined() @@ -172,11 +172,11 @@ describe("OperationEqualTest", function () { let lhs = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 4)), + new LdaiDyn(new Imm(4)), new EcmaStlettoglobalrecord('a'), new EcmaTryldglobalbyname('a'), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaShr2dyn(lhs), new EcmaTrystglobalbyname('a'), new EcmaReturnundefined() @@ -190,11 +190,11 @@ describe("OperationEqualTest", function () { let lhs = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 8)), + new LdaiDyn(new Imm(8)), new EcmaStlettoglobalrecord('a'), new EcmaTryldglobalbyname('a'), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new EcmaAshr2dyn(lhs), new EcmaTrystglobalbyname('a'), new EcmaReturnundefined() diff --git a/ts2panda/tests/expression/postfixOperations.test.ts b/ts2panda/tests/expression/postfixOperations.test.ts index df76e7bc4713a6aef7618ad2756d750e5500ebea..355649dc9c7d26a9db246a38ecbe9c54dead2e39 100644 --- a/ts2panda/tests/expression/postfixOperations.test.ts +++ b/ts2panda/tests/expression/postfixOperations.test.ts @@ -39,7 +39,7 @@ describe("PostfixOperationsTest", function () { let i = new VReg(); let temp = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaStlettoglobalrecord('i'), new EcmaTryldglobalbyname('i'), new StaDyn(temp), @@ -56,7 +56,7 @@ describe("PostfixOperationsTest", function () { let i = new VReg(); let temp = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaStlettoglobalrecord('i'), new EcmaTryldglobalbyname('i'), new StaDyn(temp), diff --git a/ts2panda/tests/expression/prefixOperations.test.ts b/ts2panda/tests/expression/prefixOperations.test.ts index 67f70a550c02fbf6b8dca64f5626341238864fc9..6cfada76be63979d10686e548890f89904659ca9 100644 --- a/ts2panda/tests/expression/prefixOperations.test.ts +++ b/ts2panda/tests/expression/prefixOperations.test.ts @@ -44,7 +44,7 @@ describe("PrefixOperationsTest", function () { let temp = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaStlettoglobalrecord('i'), new EcmaTryldglobalbyname('i'), new StaDyn(temp), @@ -63,7 +63,7 @@ describe("PrefixOperationsTest", function () { let temp = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaStlettoglobalrecord('i'), new EcmaTryldglobalbyname('i'), new StaDyn(temp), @@ -82,7 +82,7 @@ describe("PrefixOperationsTest", function () { let temp = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaStlettoglobalrecord('i'), new EcmaTryldglobalbyname('i'), new StaDyn(temp), @@ -100,7 +100,7 @@ describe("PrefixOperationsTest", function () { let temp = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaStlettoglobalrecord('i'), new EcmaTryldglobalbyname('i'), new StaDyn(temp), @@ -118,7 +118,7 @@ describe("PrefixOperationsTest", function () { let preLabel = new Label(); let postLabel = new Label(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaStlettoglobalrecord('i'), new EcmaTryldglobalbyname('i'), new StaDyn(new VReg()), @@ -141,7 +141,7 @@ describe("PrefixOperationsTest", function () { let temp_i = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaStlettoglobalrecord('i'), new EcmaTryldglobalbyname('i'), new StaDyn(temp_i), diff --git a/ts2panda/tests/expression/propertyAccess.test.ts b/ts2panda/tests/expression/propertyAccess.test.ts index f63f03003ca04eb641482c26644178d9c239fd3c..0fdaf9f488307146d0c5a66ea036d5ad86476f03 100644 --- a/ts2panda/tests/expression/propertyAccess.test.ts +++ b/ts2panda/tests/expression/propertyAccess.test.ts @@ -62,7 +62,7 @@ describe("PropertyAccess", function () { new EcmaTryldglobalbyname('obj'), new StaDyn(tempObj), new MovDyn(objReg, tempObj), - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new EcmaStobjbyname("property", objReg), ]; @@ -83,10 +83,10 @@ describe("PropertyAccess", function () { let propReg = new VReg(); let expected = [ - new EcmaCreateobjectwithbuffer(new Imm(ResultType.Int, 0)), + new EcmaCreateobjectwithbuffer(new Imm(0)), new StaDyn(objInstance), new LdaDyn(new VReg()), - new EcmaDefinemethod("myMethod", new Imm(ResultType.Int, 1), new VReg()), + new EcmaDefinemethod("myMethod", new Imm(1), new VReg()), new StaDyn(funcReg), new LdaStr("myMethod"), new StaDyn(propReg), @@ -120,10 +120,10 @@ describe("PropertyAccess", function () { let propReg = new VReg(); let expected = [ - new EcmaCreateobjectwithbuffer(new Imm(ResultType.Int, 0)), + new EcmaCreateobjectwithbuffer(new Imm(0)), new StaDyn(objInstance), new LdaDyn(new VReg()), - new EcmaDefinemethod("a", new Imm(ResultType.Int, 0), new VReg()), + new EcmaDefinemethod("a", new Imm(0), new VReg()), new StaDyn(funcReg), new LdaStr("a"), new StaDyn(propReg), @@ -153,13 +153,13 @@ describe("PropertyAccess", function () { let propReg = new VReg(); let expected = [ - new EcmaCreateobjectwithbuffer(new Imm(ResultType.Int, 0)), + new EcmaCreateobjectwithbuffer(new Imm(0)), new StaDyn(objInstance), new LdaDyn(new VReg()), - new EcmaDefinemethod("#1#a", new Imm(ResultType.Int, 0), new VReg()), + new EcmaDefinemethod("#1#a", new Imm(0), new VReg()), new StaDyn(getterReg), new LdaDyn(new VReg()), - new EcmaDefinemethod("#2#a", new Imm(ResultType.Int, 1), new VReg()), + new EcmaDefinemethod("#2#a", new Imm(1), new VReg()), new StaDyn(setterReg), new LdaStr("a"), new StaDyn(propReg), diff --git a/ts2panda/tests/expression/regular.test.js b/ts2panda/tests/expression/regular.test.js index 22a0dc7e28c91d217d5c36ab1f2d24d4d60677bc..c571350cb06bf7b9e10c38e109c8e5f2a7c3c6b3 100644 --- a/ts2panda/tests/expression/regular.test.js +++ b/ts2panda/tests/expression/regular.test.js @@ -31,7 +31,7 @@ describe("Regular Expression", function () { insns = insns.slice(0, insns.length - 1); let expected = [ - new EcmaCreateregexpwithliteral("abc", new Imm(ResultType.Int, 0)), + new EcmaCreateregexpwithliteral("abc", new Imm(0)), new EcmaStlettoglobalrecord('a') ]; expect(checkInstructions(insns, expected)).to.be.true; @@ -42,7 +42,7 @@ describe("Regular Expression", function () { insns = insns.slice(0, insns.length - 1); let expected = [ - new EcmaCreateregexpwithliteral("abc", new Imm(ResultType.Int, 2)), + new EcmaCreateregexpwithliteral("abc", new Imm(2)), new EcmaStlettoglobalrecord('a') ]; expect(checkInstructions(insns, expected)).to.be.true; diff --git a/ts2panda/tests/expression/templateExpression.test.ts b/ts2panda/tests/expression/templateExpression.test.ts index 5654375b5f4b6f3b550ac4878bc8f21d5dc7fadb..c05f3de3c59a7c6755c431da74e7aec75ebb0012 100755 --- a/ts2panda/tests/expression/templateExpression.test.ts +++ b/ts2panda/tests/expression/templateExpression.test.ts @@ -42,9 +42,9 @@ function MicroCreateAddInsns(leftVal: number, rightVal: number): IRNode[] { let insns = []; let lhs = new VReg(); - insns.push(new LdaiDyn(new Imm(ResultType.Int, leftVal))); + insns.push(new LdaiDyn(new Imm(leftVal))); insns.push(new StaDyn(lhs)); - insns.push(new LdaiDyn(new Imm(ResultType.Int, rightVal))); + insns.push(new LdaiDyn(new Imm(rightVal))); insns.push(new EcmaAdd2dyn(lhs)); return insns; @@ -71,11 +71,11 @@ function MicroGetTemplateObject(rawArr: VReg, cookedArr: VReg): IRNode[] { insns.push(new EcmaCreateemptyarray()); insns.push(new StaDyn(objReg)); - insns.push(new LdaiDyn(new Imm(ResultType.Int, 0))); + insns.push(new LdaiDyn(new Imm(0))); insns.push(new StaDyn(indexReg)); insns.push(new LdaDyn(rawArr)); insns.push(new EcmaStobjbyvalue(objReg, indexReg)); - insns.push(new LdaiDyn(new Imm(ResultType.Int, 1))); + insns.push(new LdaiDyn(new Imm(1))); insns.push(new StaDyn(indexReg)); insns.push(new LdaDyn(cookedArr)); insns.push(new EcmaStobjbyvalue(objReg, indexReg)); @@ -127,7 +127,7 @@ describe("templateExpressionTest", function () { new EcmaCreateemptyarray(), new StaDyn(cookedArr), - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new StaDyn(elemIdxReg), new LdaStr("string text line 1"), new EcmaStobjbyvalue(rawArr, elemIdxReg), @@ -141,7 +141,7 @@ describe("templateExpressionTest", function () { new StaDyn(templateObj), // structure call - new EcmaCallithisrangedyn(new Imm(ResultType.Int, 2), [prop, obj, templateObj]), + new EcmaCallithisrangedyn(new Imm(2), [prop, obj, templateObj]), new EcmaReturnundefined() ]; @@ -168,7 +168,7 @@ describe("templateExpressionTest", function () { new EcmaCreateemptyarray(), new StaDyn(cookedArr), - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new StaDyn(elemIdxReg), new LdaStr("string text line 1\\nstring text line 2"), new EcmaStobjbyvalue(rawArr, elemIdxReg), @@ -182,7 +182,7 @@ describe("templateExpressionTest", function () { new StaDyn(templateObj), // structure call - new EcmaCallithisrangedyn(new Imm(ResultType.Int, 2), [prop, obj, templateObj]), + new EcmaCallithisrangedyn(new Imm(2), [prop, obj, templateObj]), new EcmaReturnundefined() ]; @@ -210,13 +210,13 @@ describe("templateExpressionTest", function () { new EcmaCreateemptyarray(), new StaDyn(cookedArr), - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new StaDyn(elemIdxReg), new LdaStr("Fifteen is "), new EcmaStobjbyvalue(rawArr, elemIdxReg), new LdaStr("Fifteen is "), new EcmaStobjbyvalue(cookedArr, elemIdxReg), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new StaDyn(elemIdxReg), new LdaStr(" !!"), new EcmaStobjbyvalue(rawArr, elemIdxReg), @@ -232,7 +232,7 @@ describe("templateExpressionTest", function () { new StaDyn(addRet), // structure call - new EcmaCallithisrangedyn(new Imm(ResultType.Int, 3), [prop, obj, rawArr, templateObj]), + new EcmaCallithisrangedyn(new Imm(3), [prop, obj, rawArr, templateObj]), new EcmaReturnundefined() ]; expect(checkInstructions(insns, expected)).to.be.true; @@ -260,19 +260,19 @@ describe("templateExpressionTest", function () { new EcmaCreateemptyarray(), new StaDyn(cookedArr), - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new StaDyn(elemIdxReg), new LdaStr("Fifteen is "), new EcmaStobjbyvalue(rawArr, elemIdxReg), new LdaStr("Fifteen is "), new EcmaStobjbyvalue(cookedArr, elemIdxReg), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new StaDyn(elemIdxReg), new LdaStr(" !!\\n Is not "), new EcmaStobjbyvalue(rawArr, elemIdxReg), new LdaStr(" !!\n Is not "), new EcmaStobjbyvalue(cookedArr, elemIdxReg), - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new StaDyn(elemIdxReg), new LdaStr(" !!!\\n"), new EcmaStobjbyvalue(rawArr, elemIdxReg), @@ -290,7 +290,7 @@ describe("templateExpressionTest", function () { new StaDyn(addRet2), // structure call - new EcmaCallithisrangedyn(new Imm(ResultType.Int, 4), [prop, obj, rawArr, cookedArr, templateObj]), + new EcmaCallithisrangedyn(new Imm(4), [prop, obj, rawArr, cookedArr, templateObj]), new EcmaReturnundefined() ]; expect(checkInstructions(insns, expected)).to.be.true; diff --git a/ts2panda/tests/expression/typeOf.test.ts b/ts2panda/tests/expression/typeOf.test.ts index d504d517216e767050184b872da86058b5cac613..e3735dfb5b654167aacef5804e733e56b7e37945 100644 --- a/ts2panda/tests/expression/typeOf.test.ts +++ b/ts2panda/tests/expression/typeOf.test.ts @@ -36,7 +36,7 @@ describe("TypeOfTest", function () { it("typeof 12", function () { let insns = compileMainSnippet("typeof 5"); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaTypeofdyn(), new EcmaReturnundefined() ]; diff --git a/ts2panda/tests/hoist.test.ts b/ts2panda/tests/hoist.test.ts index 1cb0b35c6eb70e3f037e55cf52a22b064dff9f64..efd59729f87f5fcc40d4b512428ece4fab99d931 100644 --- a/ts2panda/tests/hoist.test.ts +++ b/ts2panda/tests/hoist.test.ts @@ -43,7 +43,7 @@ describe("HoistTest", function () { let expected = [ new LdaDyn(new VReg()), new EcmaStglobalvar("a"), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaStglobalvar("a"), new EcmaReturnundefined() ] @@ -64,7 +64,7 @@ describe("HoistTest", function () { new LdaDyn(new VReg()), new EcmaIstrue(), new Jeqz(endLabel), - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new EcmaStglobalvar("a"), endLabel, new EcmaReturnundefined() @@ -79,7 +79,7 @@ describe("HoistTest", function () { let insns = snippetCompiler.getGlobalInsns(); let expected = [ - new EcmaDefinefuncdyn("a", new Imm(ResultType.Int, 0), new VReg()), + new EcmaDefinefuncdyn("a", new Imm(0), new VReg()), new EcmaStglobalvar("a"), new EcmaReturnundefined() ] @@ -93,7 +93,7 @@ describe("HoistTest", function () { let insns = snippetCompiler.getGlobalInsns(); let expected = [ - new EcmaDefinefuncdyn("#2#a", new Imm(ResultType.Int, 0), new VReg()), + new EcmaDefinefuncdyn("#2#a", new Imm(0), new VReg()), new EcmaStglobalvar("a"), new EcmaReturnundefined() ] @@ -107,9 +107,9 @@ describe("HoistTest", function () { snippetCompiler.compile(`var a = 1; function a() {}`); let insns = snippetCompiler.getGlobalInsns(); let expected = [ - new EcmaDefinefuncdyn("a", new Imm(ResultType.Int, 0), new VReg()), + new EcmaDefinefuncdyn("a", new Imm(0), new VReg()), new EcmaStglobalvar("a"), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaStglobalvar("a"), new EcmaReturnundefined() ] @@ -128,7 +128,7 @@ describe("HoistTest", function () { let expected = [ new LdaDyn(a), new StaDyn(new VReg()), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new StaDyn(a), new EcmaReturnundefined() @@ -144,7 +144,7 @@ describe("HoistTest", function () { let insns = funcPg!.getInsns(); let a = new VReg(); let expected = [ - new EcmaDefinefuncdyn("b", new Imm(ResultType.Int, 0), new VReg()), + new EcmaDefinefuncdyn("b", new Imm(0), new VReg()), new StaDyn(a), new EcmaReturnundefined() diff --git a/ts2panda/tests/intrinsicExpander.test.ts b/ts2panda/tests/intrinsicExpander.test.ts deleted file mode 100644 index 8016811d793d8d4a8b5fd2fa75cec4b643400470..0000000000000000000000000000000000000000 --- a/ts2panda/tests/intrinsicExpander.test.ts +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { - expect -} from 'chai'; -import 'mocha'; -import { IntrinsicExpanderInternal } from "../src/intrinsicExpander"; -import { - CallShort, - EcmaAnd2dyn, - EcmaShl2dyn, - FormatItem, - Intrinsic, - IRNodeKind, - OperandKind, - ResultDst, - ResultType, - VReg -} from "../src/irnodes"; -import { checkInstructions } from "./utils/base"; - -describe("InstructionExpanderTest", function () { - it("test expander saves acc", function () { - let expander = new IntrinsicExpanderInternal(); - let lhs = new VReg(); - let insns = expander.expandInstruction(new EcmaShl2dyn(lhs))[0]; - let expected = [ - new CallShort("Ecmascript.Intrinsics.ecma.shl2dyn", lhs) - ]; - expect(checkInstructions(insns, expected)).to.be.true; - }); - - it("test expander restores acc", function () { - class FakeDyn extends Intrinsic { - constructor(vs: VReg) { - super( - IRNodeKind.VREG, - "fakeDyn", - [vs], - [ - [new FormatItem(OperandKind.SrcVReg, 8)] - ] - ); - } - - usesAcc(): boolean { - return false; - } - - resultType(): ResultType { - return ResultType.None; - } - - resultIn(): ResultDst { - return ResultDst.None; - } - }; - - let expander = new IntrinsicExpanderInternal(); - let vs = new VReg(); - let insns = expander.expandInstruction(new FakeDyn(vs))[0]; - let funcReg = new VReg(); - let expected = [ - new CallShort("Ecmascript.Intrinsics.fakeDyn", funcReg), - ]; - expect(checkInstructions(insns, expected)).to.be.true; - }); - - it("test expander for EcmaAnd2dyn", function () { - let expander = new IntrinsicExpanderInternal(); - let v1 = new VReg(); - let insns = expander.expandInstruction(new EcmaAnd2dyn(v1))[0]; - let lhs = new VReg(); - let expected = [ - new CallShort("Ecmascript.Intrinsics.ecma.and2dyn", lhs) - ]; - expect(checkInstructions(insns, expected)).to.be.true; - }) -}); - diff --git a/ts2panda/tests/lexenv.test.ts b/ts2panda/tests/lexenv.test.ts index 64bd73f9d4065c49f6ce477b14ae48779665b5af..c63e6435a39f64441262ad569fcba5a972513e4d 100644 --- a/ts2panda/tests/lexenv.test.ts +++ b/ts2panda/tests/lexenv.test.ts @@ -68,7 +68,7 @@ function MicroCreateLexEnv(numVars: number, hasLexEnv: boolean): IRNode[] { let insns = []; if (hasLexEnv) { - insns.push(new EcmaNewlexenvdyn(new Imm(ResultType.Int, numVars))); + insns.push(new EcmaNewlexenvdyn(new Imm(numVars))); } else { insns.push(new EcmaLdlexenvdyn()); } @@ -81,7 +81,7 @@ function MicroStoreLexVar(level: number, slot: number, kind?: VarDeclarationKind let insns = []; if (kind && name) { - insns.push(new EcmaLdlexvardyn(new Imm(ResultType.Int, level), new Imm(ResultType.Int, slot))); + insns.push(new EcmaLdlexvardyn(new Imm(level), new Imm(slot))); insns.push(new StaDyn(new VReg())); insns.push(new LdaStr(name)); insns.push(new StaDyn(new VReg())); @@ -90,7 +90,7 @@ function MicroStoreLexVar(level: number, slot: number, kind?: VarDeclarationKind insns.push(new EcmaThrowconstassignment(new VReg())); } } - insns.push(new EcmaStlexvardyn(new Imm(ResultType.Int, level), new Imm(ResultType.Int, slot), new VReg())); + insns.push(new EcmaStlexvardyn(new Imm(level), new Imm(slot), new VReg())); insns.push(new LdaDyn(new VReg())); return insns; @@ -99,7 +99,7 @@ function MicroStoreLexVar(level: number, slot: number, kind?: VarDeclarationKind function MicroLoadLexVar(level: number, slot: number, kind?: VarDeclarationKind, name?: string): IRNode[] { let insns = []; - insns.push(new EcmaLdlexvardyn(new Imm(ResultType.Int, level), new Imm(ResultType.Int, slot))); + insns.push(new EcmaLdlexvardyn(new Imm(level), new Imm(slot))); if (kind && name) { insns.push(new StaDyn(new VReg())); insns.push(new LdaStr(name)); @@ -325,7 +325,7 @@ describe("lexenv-compile-testcase in lexenv.test.ts", function () { let tempReg = new VReg(); let nameReg = new VReg(); let expected = [ - new EcmaLdlexvardyn(new Imm(ResultType.Int, 0), new Imm(ResultType.Int, 0)), + new EcmaLdlexvardyn(new Imm(0), new Imm(0)), new StaDyn(tempReg), new LdaStr("var1"), new StaDyn(nameReg), @@ -371,7 +371,7 @@ describe("lexenv-compile-testcase in lexenv.test.ts", function () { let valueReg = new VReg(); let expected = [ new StaDyn(valueReg), - new EcmaStlexvardyn(new Imm(ResultType.Int, 0), new Imm(ResultType.Int, 0), valueReg), + new EcmaStlexvardyn(new Imm(0), new Imm(0), valueReg), new LdaDyn(new VReg()) ]; expect(checkInstructions(outInsns, expected)).to.be.true; @@ -393,7 +393,7 @@ describe("lexenv-compile-testcase in lexenv.test.ts", function () { let valueReg = new VReg(); let expected = [ new StaDyn(valueReg), - new EcmaStlexvardyn(new Imm(ResultType.Int, 0), new Imm(ResultType.Int, 0), valueReg), + new EcmaStlexvardyn(new Imm(0), new Imm(0), valueReg), new LdaDyn(valueReg) ]; expect(checkInstructions(outInsns, expected)).to.be.true; @@ -412,14 +412,14 @@ describe("lexenv-compile-testcase in lexenv.test.ts", function () { let expected_main = [ new LdaDyn(new VReg()), new EcmaStglobalvar("outer"), - new EcmaDefinefuncdyn("func", new Imm(ResultType.Int, 0), new VReg()), + new EcmaDefinefuncdyn("func", new Imm(0), new VReg()), new EcmaStglobalvar("func"), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaStglobalvar("outer"), new EcmaReturnundefined() ]; let expected_func = [ - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new EcmaStglobalvar("outer"), new EcmaReturnundefined() ]; @@ -447,9 +447,9 @@ describe("lexenv-compile-testcase in lexenv.test.ts", function () { let pandaGens = compileAllSnippet(source, passes); let expected_main = [ ...insnsCreateLexEnv_main, - new EcmaDefinefuncdyn("func", new Imm(ResultType.Int, 0), new VReg()), + new EcmaDefinefuncdyn("func", new Imm(0), new VReg()), new EcmaStglobalvar("func"), // global.func = func_func_1 - new LdaiDyn(new Imm(ResultType.Int, 1)), // value = 1 + new LdaiDyn(new Imm(1)), // value = 1 // ...insnsStoreLexVar_main, new EcmaStlettoglobalrecord("outer"), new EcmaReturnundefined() @@ -457,7 +457,7 @@ describe("lexenv-compile-testcase in lexenv.test.ts", function () { let insnsCreateLexEnv_func = MicroCreateLexEnv(0, false); let expected_func = [ ...insnsCreateLexEnv_func, - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), // ...insnsStoreLexVar_func, new EcmaTrystglobalbyname("outer"), new EcmaReturnundefined() @@ -505,7 +505,7 @@ describe("lexenv-compile-testcase in lexenv.test.ts", function () { new LdaDyn(new VReg()), new StaDyn(new VReg()), ...insnsStoreLexVar_outer_2, - new EcmaDefinefuncdyn("#1#", new Imm(ResultType.Int, 0), new VReg()), + new EcmaDefinefuncdyn("#1#", new Imm(0), new VReg()), // returnStatement new StaDyn(new VReg()), new LdaDyn(new VReg()), diff --git a/ts2panda/tests/regAllocator.test.ts b/ts2panda/tests/regAllocator.test.ts index 93e4c6892f92706a3f3e0b402001c50878928801..483cc43ccf3308ff023af54d645dcd1301b15d9d 100644 --- a/ts2panda/tests/regAllocator.test.ts +++ b/ts2panda/tests/regAllocator.test.ts @@ -67,13 +67,13 @@ describe("RegAllocator", function () { let insns = pgs[0].getInsns(); let expected: IRNode[] = [ - new LdaiDyn(new Imm(ResultType.Int, 252)), + new LdaiDyn(new Imm(252)), new EcmaStlettoglobalrecord('a252'), - new LdaiDyn(new Imm(ResultType.Int, 253)), + new LdaiDyn(new Imm(253)), new EcmaStlettoglobalrecord('a253'), - new LdaiDyn(new Imm(ResultType.Int, 254)), + new LdaiDyn(new Imm(254)), new EcmaStlettoglobalrecord('a254'), - new LdaiDyn(new Imm(ResultType.Int, 255)), + new LdaiDyn(new Imm(255)), new EcmaStlettoglobalrecord('a255'), new EcmaTryldglobalbyname('a255'), new EcmaReturnundefined() @@ -107,13 +107,13 @@ describe("RegAllocator", function () { v[i].num = i; } let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 252)), + new LdaiDyn(new Imm(252)), new EcmaStlettoglobalrecord('a252'), - new LdaiDyn(new Imm(ResultType.Int, 253)), + new LdaiDyn(new Imm(253)), new EcmaStlettoglobalrecord('a253'), - new LdaiDyn(new Imm(ResultType.Int, 254)), + new LdaiDyn(new Imm(254)), new EcmaStlettoglobalrecord('a254'), - new LdaiDyn(new Imm(ResultType.Int, 255)), + new LdaiDyn(new Imm(255)), new EcmaStlettoglobalrecord('a255'), new EcmaTryldglobalbyname('call'), new StaDyn(v[3]), @@ -125,7 +125,7 @@ describe("RegAllocator", function () { new StaDyn(v[6]), new EcmaTryldglobalbyname('a255'), new StaDyn(v[7]), - new EcmaCallirangedyn(new Imm(ResultType.Int, 4), [v[3],v[4],v[5],v[6],v[7]]), + new EcmaCallirangedyn(new Imm(4), [v[3],v[4],v[5],v[6],v[7]]), new EcmaReturnundefined(), ]; expect(checkInstructions(insns.slice(insns.length - 20), expected, checkRegisterNumber)).to.be.true; diff --git a/ts2panda/tests/statements/doWhile.test.ts b/ts2panda/tests/statements/doWhile.test.ts index ca308a2d4ab500aa1747f7b725feeb08395abb59..ee7d6722fa805fbf9a18846bef814e81347ce11f 100644 --- a/ts2panda/tests/statements/doWhile.test.ts +++ b/ts2panda/tests/statements/doWhile.test.ts @@ -74,18 +74,18 @@ describe("DoWhileLoopTest", function () { let labelCond = new Label(); let labelPost = new Label(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaStlettoglobalrecord('a'), // body labelPre, - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaTrystglobalbyname('a'), new Jmp(labelCond), // continue // condition labelCond, new EcmaTryldglobalbyname('a'), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaLessdyn(lhs), new Jeqz(labelPost), new Jmp(labelPre), @@ -110,18 +110,18 @@ describe("DoWhileLoopTest", function () { let labelPost = new Label(); let labelCond = new Label(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaStlettoglobalrecord('a'), //body labelPre, - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaTrystglobalbyname('a'), new Jmp(labelPost), // break // condition labelCond, new EcmaTryldglobalbyname('a'), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaLessdyn(lhs), new Jeqz(labelPost), new Jmp(labelPre), diff --git a/ts2panda/tests/statements/for.test.ts b/ts2panda/tests/statements/for.test.ts index 6b52e9cfd53a7efd329d6433983a9a7427b86b30..de8617947f7084aafdefbd1defb8b9dc550d820d 100644 --- a/ts2panda/tests/statements/for.test.ts +++ b/ts2panda/tests/statements/for.test.ts @@ -111,13 +111,13 @@ describe("ForLoopTest", function () { let labelIncr = new Label(); let expected = [ // initializer - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new StaDyn(i), labelPre, // condition new LdaDyn(i), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaLessdyn(lhs), new Jeqz(labelPost), // body @@ -151,13 +151,13 @@ describe("ForLoopTest", function () { let labelIncr = new Label(); let expected = [ // initializer - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new StaDyn(i), labelPre, // condition new LdaDyn(i), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaLessdyn(lhs), new Jeqz(labelPost), // body @@ -201,24 +201,24 @@ describe("LoopWithLabelTests", function () { let labelIncr1 = new Label(); let expected = [ // initializer - new LdaiDyn(new Imm(ResultType.Int, 0.0)), + new LdaiDyn(new Imm(0.0)), new StaDyn(i), labelPre, // condition new LdaDyn(i), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 5.0)), + new LdaiDyn(new Imm(5.0)), new EcmaLessdyn(lhs), new Jeqz(labelPost), // second for - new LdaiDyn(new Imm(ResultType.Int, 0.0)), + new LdaiDyn(new Imm(0.0)), new StaDyn(j), labelPre1, // condition new LdaDyn(j), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 6.0)), + new LdaiDyn(new Imm(6.0)), new EcmaLessdyn(lhs), new Jeqz(labelPost1), new Jmp(labelPost), @@ -272,24 +272,24 @@ describe("LoopWithLabelTests", function () { let labelIncr1 = new Label(); let expected = [ // initializer - new LdaiDyn(new Imm(ResultType.Int, 0.0)), + new LdaiDyn(new Imm(0.0)), new StaDyn(i), labelPre, // condition new LdaDyn(i), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 5.0)), + new LdaiDyn(new Imm(5.0)), new EcmaLessdyn(lhs), new Jeqz(labelPost), // second for - new LdaiDyn(new Imm(ResultType.Int, 0.0)), + new LdaiDyn(new Imm(0.0)), new StaDyn(j), labelPre1, // condition new LdaDyn(j), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 6.0)), + new LdaiDyn(new Imm(6.0)), new EcmaLessdyn(lhs), new Jeqz(labelPost1), new Jmp(labelIncr), diff --git a/ts2panda/tests/statements/forOf.test.ts b/ts2panda/tests/statements/forOf.test.ts index bf2963edfe391d4f5de107272aa84d17aac06955..1895fd2f4db2b5d2c23a3b921ffc8ecbb74e1c93 100644 --- a/ts2panda/tests/statements/forOf.test.ts +++ b/ts2panda/tests/statements/forOf.test.ts @@ -73,7 +73,7 @@ describe("ForOfLoopTest", function () { new LdaDyn(trueReg), new StaDyn(done), loopStartLabel, - new EcmaCallithisrangedyn(new Imm(ResultType.Int, 1), [nextMethodReg, iterReg]), + new EcmaCallithisrangedyn(new Imm(1), [nextMethodReg, iterReg]), new StaDyn(resultObj), new EcmaThrowifnotobject(resultObj), new EcmaLdobjbyname("done", resultObj), @@ -100,7 +100,7 @@ describe("ForOfLoopTest", function () { new StaDyn(nextMethodReg), new EcmaStrictnoteqdyn(new VReg()), new Jeqz(isDone), - new EcmaCallithisrangedyn(new Imm(ResultType.Int, 1), [nextMethodReg, iterReg]), + new EcmaCallithisrangedyn(new Imm(1), [nextMethodReg, iterReg]), isDone, new LdaDyn(exceptionVreg), new EcmaThrowdyn(), @@ -151,7 +151,7 @@ describe("ForOfLoopTest", function () { new LdaDyn(trueReg), new StaDyn(done), loopStartLabel, - new EcmaCallithisrangedyn(new Imm(ResultType.Int, 1), [nextMethodReg, iterReg]), + new EcmaCallithisrangedyn(new Imm(1), [nextMethodReg, iterReg]), new StaDyn(resultObj), new EcmaThrowifnotobject(resultObj), new EcmaLdobjbyname("done", resultObj), @@ -183,7 +183,7 @@ describe("ForOfLoopTest", function () { new StaDyn(nextMethodReg), new EcmaStrictnoteqdyn(new VReg()), new Jeqz(isDone), - new EcmaCallithisrangedyn(new Imm(ResultType.Int, 1), [nextMethodReg, iterReg]), + new EcmaCallithisrangedyn(new Imm(1), [nextMethodReg, iterReg]), isDone, new LdaDyn(exceptionVreg), new EcmaThrowdyn(), @@ -234,7 +234,7 @@ describe("ForOfLoopTest", function () { new LdaDyn(trueReg), new StaDyn(done), loopStartLabel, - new EcmaCallithisrangedyn(new Imm(ResultType.Int, 1), [nextMethodReg, iterReg]), + new EcmaCallithisrangedyn(new Imm(1), [nextMethodReg, iterReg]), new StaDyn(resultObj), new EcmaThrowifnotobject(resultObj), new EcmaLdobjbyname("done", resultObj), @@ -254,7 +254,7 @@ describe("ForOfLoopTest", function () { new StaDyn(nextMethodReg), new EcmaStrictnoteqdyn(new VReg()), // undefined new Jeqz(noReturn), - new EcmaCallithisrangedyn(new Imm(ResultType.Int, 1), [nextMethodReg, iterReg]), + new EcmaCallithisrangedyn(new Imm(1), [nextMethodReg, iterReg]), new StaDyn(new VReg()), new EcmaThrowifnotobject(new VReg()), noReturn, @@ -274,7 +274,7 @@ describe("ForOfLoopTest", function () { new StaDyn(nextMethodReg), new EcmaStrictnoteqdyn(new VReg()), new Jeqz(isDone), - new EcmaCallithisrangedyn(new Imm(ResultType.Int, 1), [nextMethodReg, iterReg]), + new EcmaCallithisrangedyn(new Imm(1), [nextMethodReg, iterReg]), isDone, new LdaDyn(exceptionVreg), new EcmaThrowdyn(), diff --git a/ts2panda/tests/statements/functionDeclaration.test.ts b/ts2panda/tests/statements/functionDeclaration.test.ts index a62f826d80b0d40d2bcd1dff7772cb402702141e..3c9b990385ec31f6ff1adf5ed9a18856fb5ea513 100644 --- a/ts2panda/tests/statements/functionDeclaration.test.ts +++ b/ts2panda/tests/statements/functionDeclaration.test.ts @@ -45,7 +45,7 @@ describe("FunctionDeclarationTest", function () { snippetCompiler.compile("function foo() {}"); let funcName = "foo"; let expected = [ - new EcmaDefinefuncdyn(funcName, new Imm(ResultType.Int, 0), new VReg()), + new EcmaDefinefuncdyn(funcName, new Imm(0), new VReg()), new EcmaStglobalvar(funcName), new EcmaReturnundefined() ]; @@ -64,7 +64,7 @@ describe("FunctionDeclarationTest", function () { function foo() {} `); let expected = [ - new EcmaDefinefuncdyn("#2#foo", new Imm(ResultType.Int, 0), new VReg()), + new EcmaDefinefuncdyn("#2#foo", new Imm(0), new VReg()), new EcmaStglobalvar("foo"), new EcmaReturnundefined() ]; @@ -81,7 +81,7 @@ describe("FunctionDeclarationTest", function () { snippetCompiler.compile(`function out() {function foo() {}}`); let funcReg = new VReg(); let expected = [ - new EcmaDefinefuncdyn("foo", new Imm(ResultType.Int, 0), new VReg()), + new EcmaDefinefuncdyn("foo", new Imm(0), new VReg()), new StaDyn(funcReg), new EcmaReturnundefined() @@ -103,7 +103,7 @@ describe("FunctionDeclarationTest", function () { snippetCompiler.compile("let foo = function() {}"); let insns = snippetCompiler.getGlobalInsns(); let expected = [ - new EcmaDefinefuncdyn("foo", new Imm(ResultType.Int, 0), new VReg()), + new EcmaDefinefuncdyn("foo", new Imm(0), new VReg()), new EcmaStlettoglobalrecord("foo"), new EcmaReturnundefined() ]; @@ -117,7 +117,7 @@ describe("FunctionDeclarationTest", function () { let endLabel = new Label(); let expected_main = [ - new EcmaDefinefuncdyn("test", new Imm(ResultType.Int, 1), new VReg()), + new EcmaDefinefuncdyn("test", new Imm(1), new VReg()), new EcmaStglobalvar("test"), new EcmaReturnundefined() ]; @@ -126,7 +126,7 @@ describe("FunctionDeclarationTest", function () { new LdaDyn(new VReg()), new EcmaStricteqdyn(undefinedVReg), new Jeqz(endLabel), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new StaDyn(value), endLabel, new EcmaReturnundefined(), @@ -149,7 +149,7 @@ describe("FunctionDeclarationTest", function () { let snippetCompiler = new SnippetCompiler(); snippetCompiler.compile(`function test(a, ...b) {}`); - let idx = new Imm(ResultType.Int, 1); + let idx = new Imm(1); let lastParam = new VReg(); let expected_func = [ // func_test_0 diff --git a/ts2panda/tests/statements/switch.test.ts b/ts2panda/tests/statements/switch.test.ts index 91cb0a12552ddbeb8bc9f6d36a41d59179eb884e..858b4f5028f412069499a4b3b454f550b1a008cf 100755 --- a/ts2panda/tests/statements/switch.test.ts +++ b/ts2panda/tests/statements/switch.test.ts @@ -41,12 +41,12 @@ describe("switchTest", function () { let caseLabel = new Label(); let switchEndLabel = new Label(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new EcmaStlettoglobalrecord('a'), // switch body new EcmaTryldglobalbyname('a'), new StaDyn(rhs), - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new EcmaStrictnoteqdyn(rhs), new Jeqz(caseLabel), new Jmp(switchEndLabel), @@ -73,15 +73,15 @@ describe("switchTest", function () { let defaultLabel = new Label(); let switchEndLabel = new Label(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new EcmaStlettoglobalrecord('a'), // switch body new EcmaTryldglobalbyname('a'), new StaDyn(rhs), - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new EcmaStrictnoteqdyn(rhs), new Jeqz(caseLabel_0), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaStrictnoteqdyn(rhs), new Jeqz(caseLabel_1), new Jmp(defaultLabel), @@ -109,15 +109,15 @@ describe("switchTest", function () { let defaultLabel = new Label(); let switchEndLabel = new Label(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new EcmaStlettoglobalrecord('a'), // switch body new EcmaTryldglobalbyname('a'), new StaDyn(rhs), - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new EcmaStrictnoteqdyn(rhs), new Jeqz(caseLabel_0), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaStrictnoteqdyn(rhs), new Jeqz(caseLabel_1), new Jmp(defaultLabel), @@ -144,15 +144,15 @@ describe("switchTest", function () { let caseLabel_1 = new Label(); let switchEndLabel = new Label(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new EcmaStlettoglobalrecord('a'), // switch body new EcmaTryldglobalbyname('a'), new StaDyn(rhs), - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new EcmaStrictnoteqdyn(rhs), new Jeqz(caseLabel_0), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaStrictnoteqdyn(rhs), new Jeqz(caseLabel_1), new Jmp(switchEndLabel), @@ -180,15 +180,15 @@ describe("switchTest", function () { let defaultLabel = new Label(); let switchEndLabel = new Label(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new EcmaStlettoglobalrecord('a'), // switch body new EcmaTryldglobalbyname('a'), new StaDyn(rhs), - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new EcmaStrictnoteqdyn(rhs), new Jeqz(caseLabel_0), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaStrictnoteqdyn(rhs), new Jeqz(caseLabel_1), new Jmp(defaultLabel), diff --git a/ts2panda/tests/statements/tryCatch.test.ts b/ts2panda/tests/statements/tryCatch.test.ts index 7114b171ca7a779986ec16873710ca41846004b8..3fd1d5199c04da034e472901ea6b932f67e7d886 100644 --- a/ts2panda/tests/statements/tryCatch.test.ts +++ b/ts2panda/tests/statements/tryCatch.test.ts @@ -45,15 +45,15 @@ describe("TryCatch", function () { let catchEndLabel = new Label(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new EcmaStlettoglobalrecord('a'), tryBeginLabel, - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaTrystglobalbyname('a'), tryEndLabel, new Jmp(catchEndLabel), catchBeginLabel, - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new EcmaTrystglobalbyname('a'), catchEndLabel, new EcmaReturnundefined() @@ -74,16 +74,16 @@ describe("TryCatch", function () { let err = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new EcmaStlettoglobalrecord('a'), tryBeginLabel, - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaTrystglobalbyname('a'), tryEndLabel, new Jmp(catchEndLabel), catchBeginLabel, new StaDyn(err), - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new EcmaTrystglobalbyname('a'), catchEndLabel, new EcmaReturnundefined() @@ -104,18 +104,18 @@ describe("TryCatch", function () { let exceptionVreg = new VReg(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new EcmaStlettoglobalrecord('a'), tryBeginLabel, - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaTrystglobalbyname('a'), tryEndLabel, - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new EcmaTrystglobalbyname('a'), new Jmp(catchEndLabel), catchBeginLabel, new StaDyn(exceptionVreg), - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new EcmaTrystglobalbyname('a'), new LdaDyn(exceptionVreg), new EcmaThrowdyn(), @@ -143,25 +143,25 @@ describe("TryCatch", function () { let catchEndLabel = new Label(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new EcmaStlettoglobalrecord('a'), tryBeginLabel, nestedTryBeginLabel, - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaTrystglobalbyname('a'), nestedTryEndLabel, new Jmp(tryEndLabel), nestedCatchBeginLabel, - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new EcmaTrystglobalbyname('a'), nestedCatchEndLabel, tryEndLabel, - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new EcmaTrystglobalbyname('a'), new Jmp(catchEndLabel), catchBeginLabel, new StaDyn(exceptionVreg), - new LdaiDyn(new Imm(ResultType.Int, 3)), + new LdaiDyn(new Imm(3)), new EcmaTrystglobalbyname('a'), new LdaDyn(exceptionVreg), new EcmaThrowdyn(), diff --git a/ts2panda/tests/statements/variableDeclaration.test.ts b/ts2panda/tests/statements/variableDeclaration.test.ts index 51f1082baf5d164c6d3aa6c89c2c0e367ba30fc3..1ce753c2d0ea1ca9bec4aeab8046ad6fecf61a43 100644 --- a/ts2panda/tests/statements/variableDeclaration.test.ts +++ b/ts2panda/tests/statements/variableDeclaration.test.ts @@ -80,7 +80,7 @@ describe("VariableDeclarationTest", function () { let globalScope = snippetCompiler.getGlobalScope(); let insns = snippetCompiler.getGlobalInsns(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaStconsttoglobalrecord('i'), new EcmaReturnundefined() ]; @@ -97,7 +97,7 @@ describe("VariableDeclarationTest", function () { let expected = [ new LdaDyn(new VReg()), new EcmaStglobalvar("i"), - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaStglobalvar("i"), new EcmaReturnundefined() ]; @@ -112,7 +112,7 @@ describe("VariableDeclarationTest", function () { let globalScope = snippetCompiler.getGlobalScope(); let insns = snippetCompiler.getGlobalInsns(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaStlettoglobalrecord('i'), new EcmaReturnundefined() ]; @@ -192,7 +192,7 @@ describe("VariableDeclarationTest", function () { let functionScope = funcPg!.getScope(); let insns = funcPg!.getInsns(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new StaDyn(new VReg()), new EcmaReturnundefined() ]; @@ -237,7 +237,7 @@ describe("VariableDeclarationTest", function () { let insns = snippetCompiler.getGlobalInsns(); let scope = snippetCompiler.getGlobalScope(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new StaDyn(new VReg()), new EcmaReturnundefined() ]; diff --git a/ts2panda/tests/statements/while.test.ts b/ts2panda/tests/statements/while.test.ts index 6e40c78dc991a3e256015c192268641805cc84d0..468e568977a46d578647be2a1ddba19830e7374c 100644 --- a/ts2panda/tests/statements/while.test.ts +++ b/ts2panda/tests/statements/while.test.ts @@ -95,12 +95,12 @@ describe("WhileLoopTest", function () { new EcmaTryldglobalbyname('a'), new StaDyn(lhs), // compute rhs - new LdaiDyn(new Imm(ResultType.Int, 0)), + new LdaiDyn(new Imm(0)), new EcmaLessdyn(lhs), new Jeqz(loopEnd), // body - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaTrystglobalbyname('a'), new Jmp(loopBegin), @@ -120,17 +120,17 @@ describe("WhileLoopTest", function () { let labelPre = new Label(); let labelPost = new Label(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaStlettoglobalrecord('a'), labelPre, // condition new EcmaTryldglobalbyname('a'), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaLessdyn(lhs), new Jeqz(labelPost), //body - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new EcmaTrystglobalbyname('a'), new Jmp(labelPre), // continue new Jmp(labelPre), @@ -152,17 +152,17 @@ describe("WhileLoopTest", function () { let labelPre = new Label(); let labelPost = new Label(); let expected = [ - new LdaiDyn(new Imm(ResultType.Int, 5)), + new LdaiDyn(new Imm(5)), new EcmaStlettoglobalrecord('a'), labelPre, // condition new EcmaTryldglobalbyname('a'), new StaDyn(lhs), - new LdaiDyn(new Imm(ResultType.Int, 1)), + new LdaiDyn(new Imm(1)), new EcmaLessdyn(lhs), new Jeqz(labelPost), //body - new LdaiDyn(new Imm(ResultType.Int, 2)), + new LdaiDyn(new Imm(2)), new EcmaTrystglobalbyname('a'), new Jmp(labelPost), //break new Jmp(labelPre), diff --git a/ts2panda/tests/strictmode/strictmode.test.ts b/ts2panda/tests/strictmode/strictmode.test.ts index 19c0922233e51ecea0abe2d6a12139c5897529a8..e6430b32f47db9925d51439cdb1c81841eff8b23 100755 --- a/ts2panda/tests/strictmode/strictmode.test.ts +++ b/ts2panda/tests/strictmode/strictmode.test.ts @@ -19,7 +19,7 @@ import * as ts from "typescript"; import { isStrictMode, setGlobalStrict } from '../../src/strictMode'; import { isFunctionLikeDeclaration } from '../../src/syntaxCheckHelper'; import { getCompileOptions } from '../utils/base'; -import jshelpers = require('../../src/jshelpers'); +import * as jshelpers from '../../src/jshelpers'; function createSourceFile(filename: string): ts.SourceFile { let sourceFile = ts.createSourceFile( diff --git a/ts2panda/tests/types/typeUtils.ts b/ts2panda/tests/types/typeUtils.ts index ad23c89b314bbb3823cf4913b68be1830641b86a..1734a53682d7be9424f3cc4bfe83ec6a16e73943 100644 --- a/ts2panda/tests/types/typeUtils.ts +++ b/ts2panda/tests/types/typeUtils.ts @@ -20,7 +20,6 @@ import { SnippetCompiler } from "../utils/base"; import { Pass } from "../../src/pass"; -import { ICPass } from "../../src/pass/ICPass"; import { RegAlloc } from "../../src/regAllocator"; import { TypeChecker } from "../../src/typeChecker"; import { CmdOptions } from "../../src/cmdOptions"; @@ -52,7 +51,6 @@ export function compileTsWithType(fileName: string) { typeChecker.setTypeChecker(program.getTypeChecker()); let passes: Pass[] = [ new CacheExpander(), - new ICPass(), new RegAlloc() ]; let snippetCompiler = new SnippetCompiler(); diff --git a/ts2panda/tsconfig.json b/ts2panda/tsconfig.json index 2437eb9c16d95b39edbc051c58b42e2cb081bcd1..51fc155338f39434eded22c7c02cd9c5f75ffd99 100644 --- a/ts2panda/tsconfig.json +++ b/ts2panda/tsconfig.json @@ -1,34 +1,31 @@ { "compileOnSave": false, "compilerOptions": { - "outDir": "./dist/", - "sourceMap": true, - "noImplicitAny": false, - "noUnusedLocals": true, - "esModuleInterop": true, - "noUnusedParameters": true, - "declaration": true, - "declarationDir": "./dist/types/", - "declarationMap": true, - "moduleResolution": "node", - "module": "ES2015", - "target": "ES2015", - "baseUrl": "./", - "types": [ - "node" - ], - "typeRoots": [ - "./node_modules/@types", - "./node_modules/typescript/lib" - ], - "allowJs": true + "outDir": "./dist/", + "sourceMap": true, + "noImplicitAny": false, + "esModuleInterop": true, + "declaration": true, + "declarationDir": "./dist/types/", + "declarationMap": true, + "moduleResolution": "node", + "module": "commonjs", + "target": "ES2015", + "skipLibCheck": true, + "allowSyntheticDefaultImports": true, + "baseUrl": "./", + "types": [ + "node" + ], + "rootDir": "./", + "allowJs": true }, - "lib": ["esnext"], "include": [ - "src/**/*.ts" + "src/**/*.ts", + "tests/**/*.ts" ], "exclude": [ - "node_modules", - "*.test.ts" + "node_modules", + "*.test.ts" ] - } \ No newline at end of file +} \ No newline at end of file diff --git a/ts2panda/webpack.config.js b/ts2panda/webpack.config.js index ae7cfd54e6edc5e6b5b49848a51a3caeb1f20ce5..fb1f01af299e360a04b3935633f762776328758e 100644 --- a/ts2panda/webpack.config.js +++ b/ts2panda/webpack.config.js @@ -1,3 +1,18 @@ +/* + * Copyright (c) 2022 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. + */ + const path = require('path'); const CleanWebpackPlugin = require('clean-webpack-plugin');