You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by gr...@apache.org on 2019/10/06 20:55:42 UTC
[royale-compiler] branch develop updated: Fix one more scenario for
e4x when using identifiers that happen to match XML-ish method names
This is an automated email from the ASF dual-hosted git repository.
gregdove 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 acbb079 Fix one more scenario for e4x when using identifiers that happen to match XML-ish method names
new 0ee2909 Merge branch 'develop' of https://github.com/apache/royale-compiler into develop
acbb079 is described below
commit acbb0793eeb4ad8bceb66e062941b87805e5601b
Author: greg-dove <gr...@gmail.com>
AuthorDate: Sun Oct 6 12:48:28 2019 +1300
Fix one more scenario for e4x when using identifiers that happen to match XML-ish method names
---
.../codegen/js/jx/MemberAccessEmitter.java | 41 +++++++----
.../codegen/js/royale/JSRoyaleEmitter.java | 80 +---------------------
.../internal/codegen/js/utils/EmitterUtils.java | 2 +-
3 files changed, 32 insertions(+), 91 deletions(-)
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/MemberAccessEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/MemberAccessEmitter.java
index 8d7dd16..ebbae21 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/MemberAccessEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/MemberAccessEmitter.java
@@ -25,10 +25,7 @@ import org.apache.royale.compiler.common.DependencyType;
import org.apache.royale.compiler.constants.IASKeywordConstants;
import org.apache.royale.compiler.constants.IASLanguageConstants;
import org.apache.royale.compiler.constants.INamespaceConstants;
-import org.apache.royale.compiler.definitions.IDefinition;
-import org.apache.royale.compiler.definitions.INamespaceDefinition;
-import org.apache.royale.compiler.definitions.IPackageDefinition;
-import org.apache.royale.compiler.definitions.IVariableDefinition;
+import org.apache.royale.compiler.definitions.*;
import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
import org.apache.royale.compiler.internal.codegen.js.JSEmitterTokens;
import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
@@ -42,6 +39,7 @@ import org.apache.royale.compiler.internal.definitions.FunctionDefinition;
import org.apache.royale.compiler.internal.definitions.NamespaceDefinition;
import org.apache.royale.compiler.internal.projects.RoyaleJSProject;
import org.apache.royale.compiler.internal.scopes.FunctionScope;
+import org.apache.royale.compiler.internal.semantics.SemanticUtils;
import org.apache.royale.compiler.internal.tree.as.*;
import org.apache.royale.compiler.projects.ICompilerProject;
import org.apache.royale.compiler.tree.ASTNodeID;
@@ -66,7 +64,7 @@ public class MemberAccessEmitter extends JSSubEmitter implements
if (ASNodeUtils.hasParenOpen(node))
write(ASEmitterTokens.PAREN_OPEN);
- IASNode leftNode = node.getLeftOperandNode();
+ IExpressionNode leftNode = node.getLeftOperandNode();
IASNode rightNode = node.getRightOperandNode();
JSRoyaleEmitter fjs = (JSRoyaleEmitter)getEmitter();
@@ -82,20 +80,37 @@ public class MemberAccessEmitter extends JSSubEmitter implements
return;
}
IDefinition def = node.resolve(getProject());
- if (def == null)
+ //extra check to cope with e4x member access identifier nodes that resolve
+ //to instance member function definitions
+ //but should not be interpreted as such. e.g. xml.child.descendant
+ //should be output as xml.child('child').child('descendant')
+ //we also need to check we are not currently compiling the XML or XMLList class to avoid any
+ //possible internal references being treated incorrectly
+ boolean forceXmlCheck =(def != null
+ && node.getRightOperandNode().getNodeID() == ASTNodeID.IdentifierID
+ && SemanticUtils.isXMLish(def.getParent(), getProject())
+ && def instanceof IFunctionDefinition
+ && !def.isStatic()
+ && !(getModel().getCurrentClass() != null && (getModel().getCurrentClass().getQualifiedName().equals("XML") || getModel().getCurrentClass().getQualifiedName().equals("XMLList")))
+ );
+ if (def == null || forceXmlCheck)
{
IASNode parentNode = node.getParent();
// could be XML
boolean isXML = false;
boolean isProxy = false;
if (leftNode instanceof MemberAccessExpressionNode)
- isXML = fjs.isLeftNodeXMLish((MemberAccessExpressionNode)leftNode);
- else if (leftNode instanceof IExpressionNode)
- isXML = fjs.isXML((IExpressionNode)leftNode);
- if (leftNode instanceof MemberAccessExpressionNode)
- isProxy = fjs.isProxy((MemberAccessExpressionNode)leftNode);
- else if (leftNode instanceof IExpressionNode)
- isProxy = fjs.isProxy((IExpressionNode)leftNode);
+ isXML = fjs.isLeftNodeXMLish(leftNode);
+ else if (leftNode != null)
+ isXML = fjs.isXML(leftNode);
+
+ if (!isXML) {
+ if (leftNode instanceof MemberAccessExpressionNode)
+ isProxy = fjs.isProxy(leftNode);
+ else if (leftNode instanceof IExpressionNode)
+ isProxy = fjs.isProxy((IExpressionNode)leftNode);
+ }
+
if (isXML)
{
boolean descendant = (node.getOperator() == OperatorType.DESCENDANT_ACCESS);
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 daaa3b0..f67fe53 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
@@ -1351,77 +1351,12 @@ public class JSRoyaleEmitter extends JSGoogEmitter implements IJSRoyaleEmitter
*/
public boolean isXMLList(MemberAccessExpressionNode obj)
{
- IExpressionNode leftNode = obj.getLeftOperandNode();
- IExpressionNode rightNode = obj.getRightOperandNode();
- ASTNodeID rightID = rightNode.getNodeID();
- if (rightID == ASTNodeID.IdentifierID)
- {
- IDefinition rightDef = rightNode.resolveType(getWalker().getProject());
- if (rightDef != null)
- {
- if (SemanticUtils.isXMLish(rightDef, getWalker().getProject()))
- {
- return isLeftNodeXMLish(leftNode);
- }
- return false;
- }
- return isLeftNodeXMLish(leftNode);
- }
- else if (rightID == ASTNodeID.Op_AtID)
- return true;
- return false;
+ return EmitterUtils.isXMLList(obj, getWalker().getProject());
}
public boolean isLeftNodeXMLish(IExpressionNode leftNode)
{
- ASTNodeID leftID = leftNode.getNodeID();
- if (leftID == ASTNodeID.IdentifierID)
- {
- IDefinition leftDef = leftNode.resolveType(getWalker().getProject());
- if (leftDef != null)
- return SemanticUtils.isXMLish(leftDef, getWalker().getProject());
- }
- else if (leftID == ASTNodeID.MemberAccessExpressionID || leftID == ASTNodeID.Op_DescendantsID)
- {
- MemberAccessExpressionNode maen = (MemberAccessExpressionNode)leftNode;
- IExpressionNode rightNode = maen.getRightOperandNode();
- ASTNodeID rightID = rightNode.getNodeID();
- if (rightID == ASTNodeID.IdentifierID)
- {
- IDefinition rightDef = rightNode.resolveType(getWalker().getProject());
- if (rightDef != null)
- {
- return SemanticUtils.isXMLish(rightDef, getWalker().getProject());
- }
- }
- leftNode = maen.getLeftOperandNode();
- return isLeftNodeXMLish(leftNode);
- }
- else if (leftID == ASTNodeID.FunctionCallID)
- {
- FunctionCallNode fcn = (FunctionCallNode)leftNode;
- String fname = fcn.getFunctionName();
- if (fname.equals("XML") || fname.equals("XMLList"))
- return true;
- }
- else if (leftID == ASTNodeID.Op_AsID)
- {
- BinaryOperatorAsNode boan = (BinaryOperatorAsNode)leftNode;
- String fname = ((IdentifierNode)boan.getChild(1)).getName();
- if (fname.equals("XML") || fname.equals("XMLList"))
- return true;
- }
- else if (leftID == ASTNodeID.ArrayIndexExpressionID)
- {
- leftNode = (IExpressionNode)(leftNode.getChild(0));
- IDefinition leftDef = leftNode.resolveType(getWalker().getProject());
- if (leftDef != null)
- return SemanticUtils.isXMLish(leftDef, getWalker().getProject());
-
- }
- else if (leftID == ASTNodeID.E4XFilterID)
- return true;
- return false;
+ return EmitterUtils.isLeftNodeXMLish(leftNode, getWalker().getProject());
}
/**
@@ -1511,16 +1446,7 @@ public class JSRoyaleEmitter extends JSGoogEmitter implements IJSRoyaleEmitter
*/
public boolean isXML(IExpressionNode obj)
{
- // See if the left side is XML or XMLList
- IDefinition leftDef = obj.resolveType(getWalker().getProject());
- if (leftDef == null && obj.getNodeID() == ASTNodeID.MemberAccessExpressionID)
- {
- return isXML(((MemberAccessExpressionNode)obj).getLeftOperandNode());
- }
- else if (leftDef != null && leftDef.getBaseName().equals("*") && obj instanceof DynamicAccessNode) {
- return isXML(((DynamicAccessNode)obj).getLeftOperandNode());
- }
- return SemanticUtils.isXMLish(leftDef, getWalker().getProject());
+ return EmitterUtils.isXML(obj, getWalker().getProject());
}
public MemberAccessExpressionNode getLastMAEInChain(MemberAccessExpressionNode node)
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/utils/EmitterUtils.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/utils/EmitterUtils.java
index 5f9ad14..4e282ed 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/utils/EmitterUtils.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/utils/EmitterUtils.java
@@ -805,7 +805,7 @@ public class EmitterUtils
if (rightID == ASTNodeID.IdentifierID)
{
IDefinition rightDef = rightNode.resolveType(project);
- if (rightDef != null)
+ if (rightDef != null && rightDef != project.getBuiltinType(BuiltinType.ANY_TYPE))
{
return SemanticUtils.isXMLish(rightDef, project);
}