You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2018/12/18 17:30:53 UTC
[royale-compiler] branch develop updated: Don’t qualify static members
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
The following commit(s) were added to refs/heads/develop by this push:
new 766894f Don’t qualify static members
766894f is described below
commit 766894f68efad6f72d67c7e4c1fd8c5d01500f7c
Author: Harbs <ha...@in-tools.com>
AuthorDate: Tue Dec 18 19:30:42 2018 +0200
Don’t qualify static members
---
.../internal/codegen/js/jx/AccessorEmitter.java | 8 ++---
.../internal/codegen/js/jx/BindableEmitter.java | 2 +-
.../internal/codegen/js/jx/ClassEmitter.java | 4 +--
.../internal/codegen/js/jx/FieldEmitter.java | 4 +--
.../internal/codegen/js/jx/IdentifierEmitter.java | 6 ++--
.../codegen/js/royale/JSRoyaleEmitter.java | 34 +++++++++++-----------
.../codegen/mxml/royale/MXMLRoyaleEmitter.java | 7 +++--
7 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/AccessorEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/AccessorEmitter.java
index ce3fd25..8f5bdce 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/AccessorEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/AccessorEmitter.java
@@ -675,8 +675,8 @@ public class AccessorEmitter extends JSSubEmitter implements
HashMap<String, PropertyNodes> map = isStatic ? getModel()
.getStaticPropertyMap() : getModel().getPropertyMap();
String name = node.getName();
- if (!isStatic && def != null && def.isPrivate() && getProject().getAllowPrivateNameConflicts())
- name = fjs.formatPrivateName(def.getParent().getQualifiedName(), name);
+ if (!isStatic && def != null && def.isPrivate() && getProject().getAllowPrivateNameConflicts())
+ name = fjs.formatPrivateName(def.getParent().getQualifiedName(), name);
PropertyNodes p = map.get(name);
if (p == null)
{
@@ -704,8 +704,8 @@ public class AccessorEmitter extends JSSubEmitter implements
HashMap<String, PropertyNodes> map = isStatic ? getModel()
.getStaticPropertyMap() : getModel().getPropertyMap();
String name = node.getName();
- if (!isStatic && def != null && def.isPrivate() && getProject().getAllowPrivateNameConflicts())
- name = fjs.formatPrivateName(def.getParent().getQualifiedName(), name);
+ if (!isStatic && def != null && def.isPrivate() && getProject().getAllowPrivateNameConflicts())
+ name = fjs.formatPrivateName(def.getParent().getQualifiedName(), name);
PropertyNodes p = map.get(name);
if (p == null)
{
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/BindableEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/BindableEmitter.java
index 1549a68..b1c1527 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/BindableEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/BindableEmitter.java
@@ -447,7 +447,7 @@ public class BindableEmitter extends JSSubEmitter implements
{
// TODO (mschmalle) will remove this cast as more things get abstracted
JSRoyaleEmitter fjs = (JSRoyaleEmitter) getEmitter();
- String qname = (info.namespace.equals("private") && getProject().getAllowPrivateNameConflicts()) ? fjs.formatPrivateName(cdef.getQualifiedName(), name) : name;
+ String qname = (info.namespace.equals("private") && getProject().getAllowPrivateNameConflicts()) ? fjs.formatPrivateName(cdef.getQualifiedName(), name) : name;
if (info.namespace != "public") {
writeNewline("/** @export");
writeNewline(" * @private");
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ClassEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ClassEmitter.java
index 6c3ddda..01f4d70 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ClassEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ClassEmitter.java
@@ -246,8 +246,8 @@ public class ClassEmitter extends JSSubEmitter implements
write(ASEmitterTokens.MEMBER_ACCESS);
String dname = dnode.getName();
IDefinition dDef = dnode.getDefinition();
- if (dDef != null && dDef.isPrivate() && getProject().getAllowPrivateNameConflicts())
- dname = getEmitter().formatPrivateName(dDef.getParent().getQualifiedName(), dname);
+ if (dDef != null && dDef.isPrivate() && getProject().getAllowPrivateNameConflicts())
+ dname = getEmitter().formatPrivateName(dDef.getParent().getQualifiedName(), dname);
write(dname);
if (dnode.getNodeID() == ASTNodeID.BindableVariableID)
{
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/FieldEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/FieldEmitter.java
index c9dddc4..efb7c9f 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/FieldEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/FieldEmitter.java
@@ -103,8 +103,8 @@ public class FieldEmitter extends JSSubEmitter implements
+ ASEmitterTokens.MEMBER_ACCESS.getToken() + root);
String qname = node.getName();
IDefinition nodeDef = node.getDefinition();
- if (nodeDef != null && nodeDef.isPrivate() && getProject().getAllowPrivateNameConflicts())
- qname = getEmitter().formatPrivateName(nodeDef.getParent().getQualifiedName(), qname);
+ if (nodeDef != null && !nodeDef.isStatic() && nodeDef.isPrivate() && getProject().getAllowPrivateNameConflicts())
+ qname = getEmitter().formatPrivateName(nodeDef.getParent().getQualifiedName(), qname);
write(qname);
endMapping(node.getNameExpressionNode());
}
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 3874676..f058c17 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
@@ -245,7 +245,7 @@ public class IdentifierEmitter extends JSSubEmitter implements
else
{
String qname = node.getName();
- if (nodeDef != null && (!(nodeDef instanceof IParameterDefinition)) && nodeDef.isPrivate() && getProject().getAllowPrivateNameConflicts())
+ if (nodeDef != null && !isStatic && (!(nodeDef instanceof IParameterDefinition)) && nodeDef.isPrivate() && getProject().getAllowPrivateNameConflicts())
qname = getEmitter().formatPrivateName(nodeDef.getParent().getQualifiedName(), qname);
write(qname);
}
@@ -319,7 +319,7 @@ public class IdentifierEmitter extends JSSubEmitter implements
else
{
qname = node.getName();
- if (nodeDef != null && (!(nodeDef instanceof IParameterDefinition)) && nodeDef.isPrivate() && getProject().getAllowPrivateNameConflicts())
+ if (nodeDef != null && !isStatic && (!(nodeDef instanceof IParameterDefinition)) && nodeDef.isPrivate() && getProject().getAllowPrivateNameConflicts())
qname = getEmitter().formatPrivateName(nodeDef.getParent().getQualifiedName(), qname);
write(qname);
}
@@ -339,7 +339,7 @@ public class IdentifierEmitter extends JSSubEmitter implements
}
else
{
- if (nodeDef != null && (!(nodeDef instanceof IParameterDefinition)) && nodeDef.isPrivate() && getProject().getAllowPrivateNameConflicts())
+ if (nodeDef != null && !isStatic && (!(nodeDef instanceof IParameterDefinition)) && nodeDef.isPrivate() && getProject().getAllowPrivateNameConflicts())
qname = getEmitter().formatPrivateName(nodeDef.getParent().getQualifiedName(), qname);
write(qname);
}
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleEmitter.java
index 72a3a52..86e99f1 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleEmitter.java
@@ -524,23 +524,23 @@ public class JSRoyaleEmitter extends JSGoogEmitter implements IJSRoyaleEmitter
public void emitMemberName(IDefinitionNode node)
{
ICompilerProject project = getWalker().getProject();
- if (node.getNodeID() == ASTNodeID.FunctionID)
- {
- FunctionNode fn = (FunctionNode)node;
- if (isCustomNamespace(fn))
- {
- INamespaceDecorationNode ns = ((FunctionNode)node).getActualNamespaceNode();
- INamespaceDefinition nsDef = (INamespaceDefinition)ns.resolve(project);
- formatQualifiedName(nsDef.getQualifiedName()); // register with used names
- String s = nsDef.getURI();
- write("[\"" + s + "::" + node.getName() + "\"]");
- return;
- }
- }
- String qname = node.getName();
- IDefinition nodeDef = node.getDefinition();
- if (nodeDef != null && nodeDef.isPrivate() && project.getAllowPrivateNameConflicts())
- qname = formatPrivateName(nodeDef.getParent().getQualifiedName(), qname);
+ if (node.getNodeID() == ASTNodeID.FunctionID)
+ {
+ FunctionNode fn = (FunctionNode)node;
+ if (isCustomNamespace(fn))
+ {
+ INamespaceDecorationNode ns = ((FunctionNode)node).getActualNamespaceNode();
+ INamespaceDefinition nsDef = (INamespaceDefinition)ns.resolve(project);
+ formatQualifiedName(nsDef.getQualifiedName()); // register with used names
+ String s = nsDef.getURI();
+ write("[\"" + s + "::" + node.getName() + "\"]");
+ return;
+ }
+ }
+ String qname = node.getName();
+ IDefinition nodeDef = node.getDefinition();
+ if (nodeDef != null && !nodeDef.isStatic() && nodeDef.isPrivate() && project.getAllowPrivateNameConflicts())
+ qname = formatPrivateName(nodeDef.getParent().getQualifiedName(), qname);
write(qname);
}
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java
index 1de916e..44d05f8 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java
@@ -3049,10 +3049,11 @@ public class MXMLRoyaleEmitter extends MXMLEmitter implements
write(ASEmitterTokens.MEMBER_ACCESS);
JSRoyaleEmitter fjs = (JSRoyaleEmitter) ((IMXMLBlockWalker) getMXMLWalker())
.getASEmitter();
- ICompilerProject project = getMXMLWalker().getProject();
+
+ ICompilerProject project = getMXMLWalker().getProject();
String qname = varnode.getName();
- if (varDef != null && varDef.isPrivate() && project.getAllowPrivateNameConflicts())
- qname = fjs.formatPrivateName(varDef.getParent().getQualifiedName(), qname);
+ if (varDef != null && varDef.isPrivate() && project.getAllowPrivateNameConflicts())
+ qname = fjs.formatPrivateName(varDef.getParent().getQualifiedName(), qname);
write(qname);
if (schildID == ASTNodeID.BindableVariableID && !varnode.isConst())
write("_"); // use backing variable