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:37 UTC
[3/3] git commit: [flex-falcon] [refs/heads/develop] - move label for
foreach loops after the initializer. This closes #3
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);