diff --git a/ts2panda/src/base/lreference.ts b/ts2panda/src/base/lreference.ts index e27363aee3be3827527764c52f8feb4640fce0c0..b079b70bb89e2d0538d4bdff16aa07780845c735 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 bc87b8b9ce0beb85cd9602828bf3177c83fce4fc..b4e2a982de62f2272d6a483ef8218eb3797e3e6b 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,30 @@ function main(fileNames: string[], options: ts.CompilerOptions) { }); } +let generatedVarId = 0; + +function makeAutoGeneratedNodeName(node: ts.Node) { + node.forEachChild(childNode => { + switch (childNode.kind) { + case ts.SyntaxKind.Identifier: { + // @ts-ignore + if (ts.isGeneratedIdentifier(childNode) && (childNode).escapedText == "") { + if (generatedVarId < 26) { // #a ~ #z + // @ts-ignore + (childNode).escapedText = "#" + String.fromCharCode(97 /* a */ + generatedVarId); + } else { + // @ts-ignore + (childNode).escapedText = "#" + (generatedVarId - 26); + } + generatedVarId++; + } + break; + } + } + makeAutoGeneratedNodeName(childNode); + }); +} + function getOutputBinName(node: ts.SourceFile) { let outputBinName = CmdOptions.getOutputBinName(); let fileName = node.fileName.substring(0, node.fileName.lastIndexOf('.'));