From 1c235b5208d3af85dd0646bc0ec6d6093b4faa16 Mon Sep 17 00:00:00 2001 From: ctw Date: Sat, 11 Jun 2022 11:09:02 +0800 Subject: [PATCH] fix incorrect column number of MemberAccessExpression in debug mode Signed-off-by: ctw Change-Id: I6543bd3ee6108ed4e74873b0a5ae9a6aab03981f --- ts2panda/src/expression/callExpression.ts | 6 +++++- ts2panda/src/expression/memberAccessExpression.ts | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ts2panda/src/expression/callExpression.ts b/ts2panda/src/expression/callExpression.ts index ef5336575c..837b1126a0 100644 --- a/ts2panda/src/expression/callExpression.ts +++ b/ts2panda/src/expression/callExpression.ts @@ -65,7 +65,11 @@ export function getHiddenParameters(expr: ts.Expression, compiler: Compiler) { if ((expr).expression.kind == ts.SyntaxKind.SuperKeyword) { compileSuperProperty(compiler, expr, thisReg, prop); } else { - pandaGen.loadObjProperty(expr, thisReg, prop); + pandaGen.loadObjProperty( + ts.isPropertyAccessExpression(expr) ? expr.name : (expr).argumentExpression, + thisReg, + prop + ); } pandaGen.storeAccumulator(expr, funcReg); args.push(...[funcReg, thisReg]); diff --git a/ts2panda/src/expression/memberAccessExpression.ts b/ts2panda/src/expression/memberAccessExpression.ts index b50bbfbc8c..1183bb7bef 100644 --- a/ts2panda/src/expression/memberAccessExpression.ts +++ b/ts2panda/src/expression/memberAccessExpression.ts @@ -34,7 +34,11 @@ export function compileMemberAccessExpression(node: ts.ElementAccessExpression | compileSuperProperty(compiler, node, thisReg, property); pandaGen.freeTemps(thisReg); } else { - pandaGen.loadObjProperty(node, obj, property); + pandaGen.loadObjProperty( + ts.isPropertyAccessExpression(node) ? node.name : node.argumentExpression, + obj, + property + ); } pandaGen.freeTemps(objReg, propReg); -- Gitee