You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2016/01/05 07:29:35 UTC

[1/3] git commit: [flex-falcon] [refs/heads/develop] - updated test cases with labeled for-each loops

Repository: flex-falcon
Updated Branches:
  refs/heads/develop 5269b49c5 -> c9de796f9


updated test cases with labeled for-each loops

Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/a38e92b0
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/a38e92b0
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/a38e92b0

Branch: refs/heads/develop
Commit: a38e92b05c86fd79e929f85c53d3085941ad63e0
Parents: fa2f16f
Author: Andy Dufilie <an...@gmail.com>
Authored: Thu Dec 31 00:32:39 2015 -0500
Committer: Andy Dufilie <an...@iweave.com>
Committed: Thu Dec 31 02:20:02 2015 -0500

----------------------------------------------------------------------
 .../internal/codegen/js/flexjs/TestFlexJSStatements.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a38e92b0/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSStatements.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSStatements.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSStatements.java
index bbf5d16..b7b3158 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSStatements.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSStatements.java
@@ -415,7 +415,7 @@ public class TestFlexJSStatements extends TestGoogStatements
                 "foo: for each(var i:int in obj) { break foo; }",
                 LabeledStatementNode.class);
         asBlockWalker.visitLabeledStatement(node);
-        assertOut("foo : var foreachiter0_target = obj;\nfor (var foreachiter0 in foreachiter0_target) \n{\nvar i = foreachiter0_target[foreachiter0];\n{\n  break foo;\n}}\n");
+        assertOut("var foreachiter0_target = obj;\nfoo : for (var foreachiter0 in foreachiter0_target) \n{\nvar i = foreachiter0_target[foreachiter0];\n{\n  break foo;\n}}\n");
     }
 
     @Override
@@ -427,7 +427,7 @@ public class TestFlexJSStatements extends TestGoogStatements
                 "foo: for each(var i:int in obj) break foo;",
                 LabeledStatementNode.class);
         asBlockWalker.visitLabeledStatement(node);
-        assertOut("foo : var foreachiter0_target = obj;\nfor (var foreachiter0 in foreachiter0_target) \n{\nvar i = foreachiter0_target[foreachiter0];\n\n  break foo;}\n");
+        assertOut("var foreachiter0_target = obj;\nfoo : for (var foreachiter0 in foreachiter0_target) \n{\nvar i = foreachiter0_target[foreachiter0];\n\n  break foo;}\n");
     }
 
     //----------------------------------
@@ -537,8 +537,8 @@ public class TestFlexJSStatements extends TestGoogStatements
         		              "      eee.dd;\n" +
         		              "    }\n" +
         		              "  }\n" +
-        		              "  foo : var foreachiter0_target = obj;\n" +
-        		              "  for (var foreachiter0 in foreachiter0_target) \n" +
+        		              "  var foreachiter0_target = obj;\n" +
+        		              "  foo : for (var foreachiter0 in foreachiter0_target) \n" +
         		              "  {\n" +
         		              "  var i = foreachiter0_target[foreachiter0];\n" +
         		              "  \n" +


[3/3] git commit: [flex-falcon] [refs/heads/develop] - move label for foreach loops after the initializer. This closes #3

Posted by ah...@apache.org.
move label for foreach loops after the initializer.  This closes #3


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c9de796f
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c9de796f
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c9de796f

Branch: refs/heads/develop
Commit: c9de796f9f7b50946d10795ba7e1de5b5e10d4a4
Parents: 0407c54
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jan 4 22:29:25 2016 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jan 4 22:29:25 2016 -0800

----------------------------------------------------------------------
 .../internal/codegen/js/flexjs/JSFlexJSEmitter.java   | 14 ++++++++++++++
 .../internal/codegen/js/jx/ForEachEmitter.java        | 10 ++++++++++
 2 files changed, 24 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c9de796f/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
index db485c3..a101a4c 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
@@ -52,10 +52,12 @@ import org.apache.flex.compiler.internal.codegen.js.jx.SuperCallEmitter;
 import org.apache.flex.compiler.internal.codegen.js.jx.VarDeclarationEmitter;
 import org.apache.flex.compiler.internal.projects.FlexJSProject;
 import org.apache.flex.compiler.internal.tree.as.BinaryOperatorAsNode;
+import org.apache.flex.compiler.internal.tree.as.BlockNode;
 import org.apache.flex.compiler.internal.tree.as.DynamicAccessNode;
 import org.apache.flex.compiler.internal.tree.as.FunctionCallNode;
 import org.apache.flex.compiler.internal.tree.as.FunctionNode;
 import org.apache.flex.compiler.internal.tree.as.IdentifierNode;
+import org.apache.flex.compiler.internal.tree.as.LabeledStatementNode;
 import org.apache.flex.compiler.internal.tree.as.MemberAccessExpressionNode;
 import org.apache.flex.compiler.internal.tree.as.TernaryOperatorNode;
 import org.apache.flex.compiler.projects.ICompilerProject;
@@ -715,4 +717,16 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter
     		node = (MemberAccessExpressionNode)node.getRightOperandNode();
     	return node;
     }
+    
+    @Override
+    public void emitLabelStatement(LabeledStatementNode node)
+    {
+    	BlockNode innerBlock = node.getLabeledStatement();
+    	if (innerBlock.getChildCount() == 1 && innerBlock.getChild(0).getNodeID() == ASTNodeID.ForEachLoopID)
+    	{        
+    		getWalker().walk(node.getLabeledStatement());
+    		return; // for each emitter will emit label in the right spot
+    	}
+    	super.emitLabelStatement(node);
+    }
 }

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c9de796f/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/ForEachEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/ForEachEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/ForEachEmitter.java
index 7cc335b..62382fe 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/ForEachEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/ForEachEmitter.java
@@ -25,6 +25,7 @@ import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
 import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
 import org.apache.flex.compiler.internal.codegen.js.flexjs.JSFlexJSEmitter;
 import org.apache.flex.compiler.internal.tree.as.IdentifierNode;
+import org.apache.flex.compiler.internal.tree.as.LabeledStatementNode;
 import org.apache.flex.compiler.internal.tree.as.MemberAccessExpressionNode;
 import org.apache.flex.compiler.tree.ASTNodeID;
 import org.apache.flex.compiler.tree.as.IASNode;
@@ -65,6 +66,15 @@ public class ForEachEmitter extends JSSubEmitter implements
         write(ASEmitterTokens.SEMICOLON);
         writeNewline();
 
+        if (node.getParent().getNodeID() == ASTNodeID.BlockID &&
+        		node.getParent().getParent().getNodeID() == ASTNodeID.LabledStatementID)
+        {
+        	// emit label here
+        	LabeledStatementNode labelNode = (LabeledStatementNode)node.getParent().getParent();
+            writeToken(labelNode.getLabel());
+            writeToken(ASEmitterTokens.COLON);
+
+        }
         write(ASEmitterTokens.FOR);
         write(ASEmitterTokens.SPACE);
         write(ASEmitterTokens.PAREN_OPEN);


[2/3] git commit: [flex-falcon] [refs/heads/develop] - Merge branch 'patch-2' of https://github.com/adufilie/flex-falcon into develop

Posted by ah...@apache.org.
Merge branch 'patch-2' of https://github.com/adufilie/flex-falcon into develop


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/0407c549
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/0407c549
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/0407c549

Branch: refs/heads/develop
Commit: 0407c54946192569596bb09f09a82baef41407e1
Parents: 5269b49 a38e92b
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jan 4 16:10:56 2016 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jan 4 16:10:56 2016 -0800

----------------------------------------------------------------------
 .../internal/codegen/js/flexjs/TestFlexJSStatements.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------