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/15 18:09:50 UTC

[royale-compiler] branch develop updated: fix codegen for objects (and arrays). Fixes #53

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


The following commit(s) were added to refs/heads/develop by this push:
     new d8a8e60  fix codegen for objects (and arrays). Fixes #53
d8a8e60 is described below

commit d8a8e60be54d8d50e8a9cdac4ab1b1122fc03681
Author: Alex Harui <ah...@apache.org>
AuthorDate: Mon Oct 15 11:09:19 2018 -0700

    fix codegen for objects (and arrays). Fixes #53
---
 .../compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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 0634768..50cd2a2 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
@@ -2506,11 +2506,11 @@ public class MXMLRoyaleEmitter extends MXMLEmitter implements
         currentPropertySpecifier.hasArray = valueIsArray;
         currentPropertySpecifier.hasObject = valueIsObject;
 
-        moveDown(valueIsArray || valueIsObject, null, currentPropertySpecifier);
+        moveDown(false, null, currentPropertySpecifier);
 
         getMXMLWalker().walk(cnode); // Array or Instance
 
-        moveUp(valueIsArray || valueIsObject, false);
+        moveUp(false, false);
         
         inMXMLContent = oldInMXMLContent;
     }
@@ -2574,7 +2574,6 @@ public class MXMLRoyaleEmitter extends MXMLEmitter implements
     		primitiveDeclarationNodes.add(node);
     		return;
     	}
-        moveDown(false, null, null);
 
         boolean isSimple = true;
         final int len = node.getChildCount();
@@ -2607,7 +2606,6 @@ public class MXMLRoyaleEmitter extends MXMLEmitter implements
         }
         makingSimpleArray = oldMakingSimpleArray;
 
-        moveUp(false, false);
     }
 
     @Override