IdentifierEmitter: fixed issue where package or file members wouldn't have fully-qualified name
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/19140007 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/19140007 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/19140007 Branch: refs/heads/develop Commit: 19140007cb4cc3435f61a782b88ff1cd9264abb7 Parents: 7e412ea Author: Josh Tynjala <joshtynj...@apache.org> Authored: Mon Jan 11 16:03:45 2016 -0800 Committer: Josh Tynjala <joshtynj...@apache.org> Committed: Mon Jan 11 16:03:45 2016 -0800 ---------------------------------------------------------------------- .../codegen/js/jx/IdentifierEmitter.java | 36 +++++++++----------- 1 file changed, 16 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/19140007/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java index 33033c4..174ae61 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java @@ -130,10 +130,17 @@ public class IdentifierEmitter extends JSSubEmitter implements // us breakpoint on the node.getName() to make // sure it is ok to always use the short name in an MAE String qname = nodeDef.getQualifiedName(); - if (parentNodeId == ASTNodeID.MemberAccessExpressionID) - write(node.getName()); - else if (nodeDef instanceof TypeDefinitionBase) - write(getEmitter().formatQualifiedName(qname)); + if (nodeDef instanceof IVariableDefinition) + { + IVariableDefinition variable = (IVariableDefinition) nodeDef; + VariableClassification classification = variable.getVariableClassification(); + if (classification == VariableClassification.PACKAGE_MEMBER || + classification == VariableClassification.FILE_MEMBER) + { + write(getEmitter().formatQualifiedName(qname)); + return; + } + } else if (nodeDef instanceof IFunctionDefinition) { IFunctionDefinition func = (IFunctionDefinition) nodeDef; @@ -142,26 +149,15 @@ public class IdentifierEmitter extends JSSubEmitter implements classification == FunctionClassification.FILE_MEMBER) { write(getEmitter().formatQualifiedName(qname)); - } - else - { - write(qname); + return; } } - else if (nodeDef instanceof IVariableDefinition) + if (parentNodeId == ASTNodeID.MemberAccessExpressionID) { - IVariableDefinition variable = (IVariableDefinition) nodeDef; - VariableClassification classification = variable.getVariableClassification(); - if (classification == VariableClassification.PACKAGE_MEMBER || - classification == VariableClassification.FILE_MEMBER) - { - write(getEmitter().formatQualifiedName(qname)); - } - else - { - write(qname); - } + write(node.getName()); } + else if (nodeDef instanceof TypeDefinitionBase) + write(getEmitter().formatQualifiedName(qname)); else write(qname); }
