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/10 19:33:50 UTC
[royale-compiler] 04/08: add support for RemoteObject
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 39d58aa7bdadb7766227cce4d9ed918a290f8cf1
Author: Alex Harui <ah...@apache.org>
AuthorDate: Tue Oct 9 15:35:53 2018 -0700
add support for RemoteObject
---
.../royale/compiler/codegen/mxml/IMXMLEmitter.java | 8 ++
.../internal/codegen/mxml/MXMLBlockWalker.java | 20 ++++
.../internal/codegen/mxml/MXMLEmitter.java | 14 +++
.../codegen/mxml/royale/MXMLRoyaleEmitter.java | 120 +++++++++++++++++++++
.../internal/visitor/mxml/MXMLNodeSwitch.java | 10 +-
.../compiler/visitor/mxml/IMXMLBlockVisitor.java | 8 ++
6 files changed, 178 insertions(+), 2 deletions(-)
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/mxml/IMXMLEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/mxml/IMXMLEmitter.java
index 38b5082..956384c 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/mxml/IMXMLEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/mxml/IMXMLEmitter.java
@@ -40,6 +40,8 @@ import org.apache.royale.compiler.tree.mxml.IMXMLMetadataNode;
import org.apache.royale.compiler.tree.mxml.IMXMLNumberNode;
import org.apache.royale.compiler.tree.mxml.IMXMLObjectNode;
import org.apache.royale.compiler.tree.mxml.IMXMLPropertySpecifierNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLRemoteObjectMethodNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLRemoteObjectNode;
import org.apache.royale.compiler.tree.mxml.IMXMLScriptNode;
import org.apache.royale.compiler.tree.mxml.IMXMLStringNode;
import org.apache.royale.compiler.tree.mxml.IMXMLStyleSpecifierNode;
@@ -137,4 +139,10 @@ public interface IMXMLEmitter extends IEmitter
void emitDatabinding(IMXMLDataBindingNode node);
+ //--------------------------------------------------------------------------
+
+ void emitRemoteObjectMethod(IMXMLRemoteObjectMethodNode node);
+
+ void emitRemoteObject(IMXMLRemoteObjectNode node);
+
}
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/MXMLBlockWalker.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/MXMLBlockWalker.java
index b6d9af0..8a1dbab 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/MXMLBlockWalker.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/MXMLBlockWalker.java
@@ -50,6 +50,8 @@ import org.apache.royale.compiler.tree.mxml.IMXMLNode;
import org.apache.royale.compiler.tree.mxml.IMXMLNumberNode;
import org.apache.royale.compiler.tree.mxml.IMXMLObjectNode;
import org.apache.royale.compiler.tree.mxml.IMXMLPropertySpecifierNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLRemoteObjectMethodNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLRemoteObjectNode;
import org.apache.royale.compiler.tree.mxml.IMXMLScriptNode;
import org.apache.royale.compiler.tree.mxml.IMXMLStringNode;
import org.apache.royale.compiler.tree.mxml.IMXMLStyleNode;
@@ -441,10 +443,28 @@ public class MXMLBlockWalker implements IMXMLBlockVisitor, IMXMLBlockWalker
}
//--------------------------------------------------------------------------
+
+ @Override
+ public void visitRemoteObjectMethod(IMXMLRemoteObjectMethodNode node)
+ {
+ debug("visitRemoteObjectMethod()");
+
+ mxmlEmitter.emitRemoteObjectMethod(node);
+ }
+
+ @Override
+ public void visitRemoteObject(IMXMLRemoteObjectNode node) {
+ debug("visitRemoteObjectMethod()");
+
+ mxmlEmitter.emitRemoteObject(node);
+ }
+
+ //--------------------------------------------------------------------------
protected void debug(String message)
{
//System.out.println(message);
}
+
}
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/MXMLEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/MXMLEmitter.java
index 22c73be..2027827 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/MXMLEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/MXMLEmitter.java
@@ -48,6 +48,8 @@ import org.apache.royale.compiler.tree.mxml.IMXMLNode;
import org.apache.royale.compiler.tree.mxml.IMXMLNumberNode;
import org.apache.royale.compiler.tree.mxml.IMXMLObjectNode;
import org.apache.royale.compiler.tree.mxml.IMXMLPropertySpecifierNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLRemoteObjectMethodNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLRemoteObjectNode;
import org.apache.royale.compiler.tree.mxml.IMXMLScriptNode;
import org.apache.royale.compiler.tree.mxml.IMXMLStringNode;
import org.apache.royale.compiler.tree.mxml.IMXMLStyleSpecifierNode;
@@ -421,5 +423,17 @@ public class MXMLEmitter extends Emitter implements IMXMLEmitter
{
// ToDo (erikdebruin): implement databinding output
}
+
+ @Override
+ public void emitRemoteObjectMethod(IMXMLRemoteObjectMethodNode node) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void emitRemoteObject(IMXMLRemoteObjectNode node) {
+ // TODO Auto-generated method stub
+
+ }
}
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 fcf3194..5506a11 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
@@ -20,6 +20,10 @@
package org.apache.royale.compiler.internal.codegen.mxml.royale;
+import static org.apache.royale.abc.ABCConstants.OP_newarray;
+import static org.apache.royale.abc.ABCConstants.OP_pushstring;
+import static org.apache.royale.abc.ABCConstants.OP_pushtrue;
+
import java.io.File;
import java.io.FilterWriter;
import java.util.ArrayList;
@@ -3116,4 +3120,120 @@ public class MXMLRoyaleEmitter extends MXMLEmitter implements
return ((RoyaleJSProject)project).isExternalLinkage(cu);
}
+ @Override
+ public void emitRemoteObjectMethod(IMXMLRemoteObjectMethodNode node) {
+ MXMLDescriptorSpecifier currentInstance = getCurrentDescriptor("i");
+ String propName = null;
+ int l = node.getChildCount();
+ for (int k = 0; k < l; k++)
+ {
+ IASNode child = node.getChild(k);
+ if (child.getNodeID() == ASTNodeID.MXMLPropertySpecifierID)
+ {
+ IMXMLPropertySpecifierNode propNode = (IMXMLPropertySpecifierNode)child;
+ if (propNode.getName().equals("name"))
+ {
+ // assume StringNode with LiteralNode
+ IMXMLStringNode literalNode = (IMXMLStringNode)propNode.getChild(0);
+ propName = literalNode.getValue();
+ break;
+ }
+ }
+ }
+ MXMLDescriptorSpecifier propertySpecifier = new MXMLDescriptorSpecifier();
+ propertySpecifier.isProperty = true;
+ propertySpecifier.name = propName;
+ propertySpecifier.parent = currentInstance;
+ currentInstance.propertySpecifiers.add(propertySpecifier);
+ moveDown(false, null, propertySpecifier);
+
+ emitInstance(node);
+
+ moveUp(false, false);
+ // build out the argument list if any
+ int n = node.getChildCount();
+ for (int i = 0; i < n; i++)
+ {
+ IASNode childNode = node.getChild(i);
+ if (childNode.getNodeID() == ASTNodeID.MXMLPropertySpecifierID)
+ {
+ IMXMLPropertySpecifierNode propNode = (IMXMLPropertySpecifierNode)childNode;
+ if (propNode.getName().equals("arguments"))
+ {
+ ArrayList<String> argList = new ArrayList<String>();
+ childNode = propNode.getChild(0); // this is an MXMLObjectNode
+ n = childNode.getChildCount();
+ for (i = 0; i < n; i++)
+ {
+ IASNode argNode = childNode.getChild(i);
+ propNode = (IMXMLPropertySpecifierNode)argNode;
+ argList.add(propNode.getName());
+ }
+ if (argList.size() > 0)
+ {
+ StringBuilder list = new StringBuilder();
+ list.append("[");
+ int m = argList.size();
+ for (int j = 0; j < m; j++)
+ {
+ if (j > 0)
+ list.append(",");
+ list.append("'" + argList.get(j) + "'");
+ }
+ list.append("]");
+
+ MXMLDescriptorSpecifier operationInstance = propertySpecifier.propertySpecifiers.get(0);
+
+ MXMLDescriptorSpecifier argListSpecifier = new MXMLDescriptorSpecifier();
+ argListSpecifier.isProperty = true;
+ argListSpecifier.name = "argumentList";
+ argListSpecifier.parent = operationInstance;
+ argListSpecifier.value = list.toString();
+ if (operationInstance != null)
+ operationInstance.propertySpecifiers.add(argListSpecifier);
+ }
+ break;
+ }
+ }
+ }
+ }
+
+ @Override
+ public void emitRemoteObject(IMXMLRemoteObjectNode node) {
+ emitInstance(node);
+ // now search for Operations, and add an Object that contains them
+ int n = node.getChildCount();
+ MXMLDescriptorSpecifier objectSpecifier = null;
+ MXMLDescriptorSpecifier propertySpecifier = null;
+ for (int i = 0; i < n; i++)
+ {
+ IASNode child = node.getChild(i);
+ if (child.getNodeID() == ASTNodeID.MXMLRemoteObjectMethodID)
+ {
+ MXMLDescriptorSpecifier currentPropertySpecifier = getCurrentDescriptor("ps");
+ MXMLDescriptorSpecifier currentInstance =
+ currentPropertySpecifier.propertySpecifiers.get(currentPropertySpecifier.propertySpecifiers.size() - 1);
+
+ if (objectSpecifier == null)
+ {
+ propertySpecifier = new MXMLDescriptorSpecifier();
+ propertySpecifier.isProperty = true;
+ propertySpecifier.name = "operations";
+ propertySpecifier.parent = currentInstance;
+
+ if (currentInstance != null)
+ currentInstance.propertySpecifiers.add(propertySpecifier);
+ objectSpecifier = new MXMLDescriptorSpecifier();
+ objectSpecifier.isProperty = false;
+ objectSpecifier.name = formatQualifiedName(IASLanguageConstants.Object);
+ objectSpecifier.parent = propertySpecifier;
+ propertySpecifier.propertySpecifiers.add(objectSpecifier);
+ instances.add(objectSpecifier);
+ }
+ moveDown(false, objectSpecifier, null);
+ getMXMLWalker().walk(child); // RemoteObjectMethod
+ moveUp(false, true);
+ }
+ }
+ }
}
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/visitor/mxml/MXMLNodeSwitch.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/visitor/mxml/MXMLNodeSwitch.java
index 24b317e..5caf3ef 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/visitor/mxml/MXMLNodeSwitch.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/visitor/mxml/MXMLNodeSwitch.java
@@ -40,6 +40,8 @@ import org.apache.royale.compiler.tree.mxml.IMXMLMetadataNode;
import org.apache.royale.compiler.tree.mxml.IMXMLNumberNode;
import org.apache.royale.compiler.tree.mxml.IMXMLObjectNode;
import org.apache.royale.compiler.tree.mxml.IMXMLPropertySpecifierNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLRemoteObjectMethodNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLRemoteObjectNode;
import org.apache.royale.compiler.tree.mxml.IMXMLScriptNode;
import org.apache.royale.compiler.tree.mxml.IMXMLStringNode;
import org.apache.royale.compiler.tree.mxml.IMXMLStyleNode;
@@ -156,6 +158,12 @@ public class MXMLNodeSwitch implements IASNodeStrategy
case MXMLFunctionID:
visitor.visitInstance((IMXMLInstanceNode) node);
break;
+ case MXMLRemoteObjectID:
+ visitor.visitRemoteObject((IMXMLRemoteObjectNode) node);
+ break;
+ case MXMLRemoteObjectMethodID:
+ visitor.visitRemoteObjectMethod((IMXMLRemoteObjectMethodNode) node);
+ break;
case MXMLApplicationID:
case MXMLBindingAttributeID:
case MXMLClassID:
@@ -172,8 +180,6 @@ public class MXMLNodeSwitch implements IASNodeStrategy
case MXMLModelRootID:
case MXMLPrivateID:
case MXMLRegExpID:
- case MXMLRemoteObjectID:
- case MXMLRemoteObjectMethodID:
case MXMLReparentID:
//case MXMLRepeaterID:
case MXMLResourceID:
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/mxml/IMXMLBlockVisitor.java b/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/mxml/IMXMLBlockVisitor.java
index 756bc12..4507a9c 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/mxml/IMXMLBlockVisitor.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/mxml/IMXMLBlockVisitor.java
@@ -40,6 +40,8 @@ import org.apache.royale.compiler.tree.mxml.IMXMLMetadataNode;
import org.apache.royale.compiler.tree.mxml.IMXMLNumberNode;
import org.apache.royale.compiler.tree.mxml.IMXMLObjectNode;
import org.apache.royale.compiler.tree.mxml.IMXMLPropertySpecifierNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLRemoteObjectMethodNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLRemoteObjectNode;
import org.apache.royale.compiler.tree.mxml.IMXMLScriptNode;
import org.apache.royale.compiler.tree.mxml.IMXMLStringNode;
import org.apache.royale.compiler.tree.mxml.IMXMLStyleNode;
@@ -135,4 +137,10 @@ public interface IMXMLBlockVisitor extends IBlockVisitor
//--------------------------------------------------------------------------
void visitObject(IMXMLObjectNode node);
+
+ //--------------------------------------------------------------------------
+
+ void visitRemoteObjectMethod(IMXMLRemoteObjectMethodNode node);
+
+ void visitRemoteObject(IMXMLRemoteObjectNode node);
}