From 82e6ecc38c70bb07a100b42151320645404637fc Mon Sep 17 00:00:00 2001 From: gavin1012_hw Date: Wed, 12 Oct 2022 16:27:59 +0800 Subject: [PATCH] fixed 8faddea from https://gitee.com/gavin1012_hw/ark_ts2abc/pulls/583 Fix no-name for autoGenerated Identifier Related Issue: I5VBME Signed-off-by: gavin1012_hw Change-Id: I381a62f7e101d100fe715c948d178b2e25dcf532 --- ts2panda/src/base/lreference.ts | 7 ++++++- ts2panda/src/index.ts | 25 +++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/ts2panda/src/base/lreference.ts b/ts2panda/src/base/lreference.ts index e27363aee3b..b079b70bb89 100644 --- a/ts2panda/src/base/lreference.ts +++ b/ts2panda/src/base/lreference.ts @@ -139,7 +139,12 @@ export class LReference { let name = jshelpers.getTextOfIdentifierOrLiteral(realNode); let variable = compiler.getCurrentScope().find(name); if (!variable.v) { - variable.v = compiler.getCurrentScope().add(name, VarDeclarationKind.NONE); + // @ts-ignore + if (ts.isGeneratedIdentifier(realNode)) { + variable.v = compiler.getCurrentScope().add(name, VarDeclarationKind.VAR); + } else { + variable.v = compiler.getCurrentScope().add(name, VarDeclarationKind.NONE); + } } return new LReference(realNode, compiler, isDeclaration, ReferenceKind.LocalOrGlobal, variable); diff --git a/ts2panda/src/index.ts b/ts2panda/src/index.ts index bc87b8b9ce0..f5ceefb93c4 100644 --- a/ts2panda/src/index.ts +++ b/ts2panda/src/index.ts @@ -100,6 +100,8 @@ function main(fileNames: string[], options: ts.CompilerOptions) { // @ts-ignore (ctx: ts.TransformationContext) => { return (node: ts.SourceFile) => { + makeAutoGeneratedNodeName(node); + if (ts.getEmitHelpers(node)) { let newStatements = []; ts.getEmitHelpers(node)?.forEach( @@ -142,6 +144,29 @@ function main(fileNames: string[], options: ts.CompilerOptions) { }); } +function makeAutoGeneratedNodeName(node: ts.Node) { + node.forEachChild(childNode => { + switch (childNode.kind) { + case ts.SyntaxKind.Identifier: { + // @ts-ignore + if (ts.isGeneratedIdentifier(childNode)) { + // @ts-ignore + let generatedVarId = (childNode).autoGenerateId; + if (generatedVarId < 26) { // _a ~ _z + // @ts-ignore + (childNode).escapedText = "#" + String.fromCharCode(97 /* a */ + generatedVarId); + } else { + // @ts-ignore + (childNode).escapedText = "#" + (generatedVarId - 26); + } + } + break; + } + } + makeAutoGeneratedNodeName(childNode); + }); +} + function getOutputBinName(node: ts.SourceFile) { let outputBinName = CmdOptions.getOutputBinName(); let fileName = node.fileName.substring(0, node.fileName.lastIndexOf('.')); -- Gitee