[royale-compiler] 08/10: the parent isn't always a class and we only need to decorate the name if it is a class

[aharui]

This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git

commit 7a65fbb0f5484e3ddff144955c5b0431c6714591
Author: Alex Harui <aha...@apache.org>
AuthorDate: Thu Jan 10 22:11:09 2019 -0800

    the parent isn't always a class and we only need to decorate the name if it 
is a class
---
 .../royale/compiler/internal/codegen/js/jx/IdentifierEmitter.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/IdentifierEmitter.java
 
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/IdentifierEmitter.java
index b7dbe46..26d8649 100644
--- 
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/IdentifierEmitter.java
+++ 
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/IdentifierEmitter.java
@@ -36,6 +36,7 @@ import 
org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
 import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.utils.EmitterUtils;
 import org.apache.royale.compiler.internal.definitions.AccessorDefinition;
+import org.apache.royale.compiler.internal.definitions.ClassDefinition;
 import org.apache.royale.compiler.internal.definitions.FunctionDefinition;
 import org.apache.royale.compiler.internal.definitions.TypeDefinitionBase;
 import org.apache.royale.compiler.internal.tree.as.NonResolvingIdentifierNode;
@@ -319,7 +320,7 @@ public class IdentifierEmitter extends JSSubEmitter 
implements
                        else
                        {
                                qname = node.getName();
-                       if (nodeDef != null && !isStatic && (!(nodeDef 
instanceof IParameterDefinition)) && nodeDef.isPrivate() && 
getProject().getAllowPrivateNameConflicts())
+                       if (nodeDef != null && !isStatic && 
(nodeDef.getParent() instanceof ClassDefinition) && (!(nodeDef instanceof 
IParameterDefinition)) && nodeDef.isPrivate() && 
getProject().getAllowPrivateNameConflicts())
                                qname = 
getEmitter().formatPrivateName(nodeDef.getParent().getQualifiedName(), qname);
                                write(qname);
                        }
@@ -339,7 +340,7 @@ public class IdentifierEmitter extends JSSubEmitter 
implements
                 }
                 else 
                 {
-                       if (nodeDef != null && !isStatic && (!(nodeDef 
instanceof IParameterDefinition)) && nodeDef.isPrivate() && 
getProject().getAllowPrivateNameConflicts())
+                       if (nodeDef != null && !isStatic && 
(nodeDef.getParent() instanceof ClassDefinition) && (!(nodeDef instanceof 
IParameterDefinition)) && nodeDef.isPrivate() && 
getProject().getAllowPrivateNameConflicts())
                                qname = 
getEmitter().formatPrivateName(nodeDef.getParent().getQualifiedName(), qname);
                     write(qname);
                 }