You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2018/10/29 17:41:26 UTC
[royale-compiler] 02/02: a few more places where we need to
decorate private names
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 5348b4f9653ff504fa2a9cdf3ad1b5a3ec0c90d0
Author: Alex Harui <ah...@apache.org>
AuthorDate: Mon Oct 29 10:34:33 2018 -0700
a few more places where we need to decorate private names
---
.../compiler/internal/codegen/js/jx/IdentifierEmitter.java | 12 ++++++++++--
1 file changed, 10 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 49fcc0c..1cdd74f 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
@@ -242,7 +242,12 @@ public class IdentifierEmitter extends JSSubEmitter implements
write("[\"" + nsName + "::" + node.getName() + "\"]");
}
else
- write(node.getName());
+ {
+ String qname = node.getName();
+ if (nodeDef != null && nodeDef.isPrivate() && getProject().getAllowPrivateNameConflicts())
+ qname = getEmitter().formatPrivateName(nodeDef.getParent().getQualifiedName(), qname);
+ write(qname);
+ }
writeToken(ASEmitterTokens.COMMA);
if (wroteSelf)
@@ -312,7 +317,10 @@ public class IdentifierEmitter extends JSSubEmitter implements
}
else
{
- write(node.getName());
+ qname = node.getName();
+ if (nodeDef != null && nodeDef.isPrivate() && getProject().getAllowPrivateNameConflicts())
+ qname = getEmitter().formatPrivateName(nodeDef.getParent().getQualifiedName(), qname);
+ write(qname);
}
}
else if (isPackageOrFileMember)