From 3dfbfb3bb514b8954f13f963a97cbeb849f0d359 Mon Sep 17 00:00:00 2001 From: hufeng Date: Mon, 14 Mar 2022 15:53:38 +0800 Subject: [PATCH] fix UT Signed-off-by: hufeng Change-Id: I3c946719d490ee3e520391c967e2123bb1e2d6e7 --- ts2panda/src/compilerDriver.ts | 1 + ts2panda/src/debuginfo.ts | 1 - ts2panda/templates/irnodes.ts.erb | 10 ++++++---- ts2panda/tests/expression/functionExpression.test.ts | 4 ---- ts2panda/ts2abc/ts2abc.cpp | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ts2panda/src/compilerDriver.ts b/ts2panda/src/compilerDriver.ts index fc4f34063f..b71d158a8c 100644 --- a/ts2panda/src/compilerDriver.ts +++ b/ts2panda/src/compilerDriver.ts @@ -244,6 +244,7 @@ export class CompilerDriver { } compileUnitTest(node: ts.SourceFile, literalBufferArray?: Array): void { + CompilerDriver.isTsFile = CompilerDriver.isTypeScriptSourceFile(node); let recorder = this.compilePrologue(node, true); for (let i = 0; i < this.pendingCompilationUnits.length; i++) { diff --git a/ts2panda/src/debuginfo.ts b/ts2panda/src/debuginfo.ts index b5f5007684..89ee18c4cb 100644 --- a/ts2panda/src/debuginfo.ts +++ b/ts2panda/src/debuginfo.ts @@ -354,7 +354,6 @@ export class DebugInfo { } } - public static copyDebugInfo(insn: IRNode, expansion: IRNode[]) { expansion.forEach(irNode => irNode.debugPosInfo = insn.debugPosInfo); } diff --git a/ts2panda/templates/irnodes.ts.erb b/ts2panda/templates/irnodes.ts.erb index 40cbc33f37..5054cf37a8 100755 --- a/ts2panda/templates/irnodes.ts.erb +++ b/ts2panda/templates/irnodes.ts.erb @@ -345,6 +345,8 @@ export abstract class Intrinsic extends IRNode { } export class VReg { + private typeIndex: number | undefined; + private variableName: string | undefined; num: number = -1; toString(): string { @@ -355,19 +357,19 @@ export class VReg { } getTypeIndex() { - return 0; + return this.typeIndex; } - // @ts-ignore setTypeIndex(typeIndex: number) { + this.typeIndex = typeIndex; } getVariableName() { - return ''; + return this.variableName; } - // @ts-ignore setVariableName(variableName: string) { + this.variableName = variableName; } } diff --git a/ts2panda/tests/expression/functionExpression.test.ts b/ts2panda/tests/expression/functionExpression.test.ts index 0945351335..001d58cee1 100755 --- a/ts2panda/tests/expression/functionExpression.test.ts +++ b/ts2panda/tests/expression/functionExpression.test.ts @@ -30,7 +30,6 @@ import { EcmaEqdyn, EcmaGetresumemode, EcmaLdlexenvdyn, - EcmaLdfunction, EcmaResumegenerator, EcmaReturnundefined, EcmaSuspendgenerator, @@ -40,7 +39,6 @@ import { Label, LdaDyn, LdaiDyn, - ResultType, ReturnDyn, StaDyn, VReg @@ -61,8 +59,6 @@ describe("compileFunctionExpression", function () { let expected_func = [ new EcmaLdlexenvdyn(), new StaDyn(new VReg()), - new EcmaLdfunction(), - new StaDyn(new VReg()), new LdaDyn(new VReg()), new StaDyn(new VReg()), new EcmaCallarg0dyn(new VReg()), diff --git a/ts2panda/ts2abc/ts2abc.cpp b/ts2panda/ts2abc/ts2abc.cpp index 8fe7847262..8eecc72a3d 100644 --- a/ts2panda/ts2abc/ts2abc.cpp +++ b/ts2panda/ts2abc/ts2abc.cpp @@ -605,7 +605,7 @@ static void ParseFunctionCallType(const Json::Value &function, panda::pandasm::F funcName = function["n"].asString(); } if (funcName == "func_main_0") { - return ; + return; } uint32_t callType = 0; -- Gitee