You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by er...@apache.org on 2013/04/19 17:33:54 UTC
[01/19] git commit: [flex-falcon] - [FalconJX] implemented
INamespaceAccessExpressionNode
Updated Branches:
refs/heads/develop 31bfbd295 -> 6fd38b4ad
[FalconJX] implemented INamespaceAccessExpressionNode
A bunch of TODOs called for an 'INamespaceAccessExpressionNode'. Created the interface, implemented it and removed the TODO items.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/6e057093
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/6e057093
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/6e057093
Branch: refs/heads/develop
Commit: 6e05709308cff8f58797fa8aff5a920f0124130e
Parents: 31bfbd2
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Apr 19 16:25:57 2013 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Apr 19 16:25:57 2013 +0200
----------------------------------------------------------------------
.../internal/codegen/as/TestExpressions.java | 13 +++----
.../codegen/js/goog/TestGoogExpressions.java | 12 +++----
.../flex/compiler/codegen/as/IASEmitter.java | 4 +-
.../internal/codegen/as/ASBlockWalker.java | 4 +-
.../compiler/internal/codegen/as/ASEmitter.java | 4 +-
.../internal/codegen/js/goog/JSGoogEmitter.java | 4 +-
.../compiler/internal/visitor/as/ASNodeSwitch.java | 5 ++-
.../flex/compiler/visitor/as/IASBlockVisitor.java | 4 +-
.../tree/as/INamespaceAccessExpressionNode.java | 27 +++++++++++++++
9 files changed, 50 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6e057093/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestExpressions.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestExpressions.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestExpressions.java
index 01f1794..9168359 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestExpressions.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestExpressions.java
@@ -21,14 +21,13 @@ package org.apache.flex.compiler.internal.codegen.as;
import org.apache.flex.compiler.internal.test.ASTestBase;
import org.apache.flex.compiler.internal.tree.as.ArrayLiteralNode;
-import org.apache.flex.compiler.internal.tree.as.NamespaceAccessExpressionNode;
import org.apache.flex.compiler.internal.tree.as.ObjectLiteralNode;
import org.apache.flex.compiler.tree.as.IBinaryOperatorNode;
import org.apache.flex.compiler.tree.as.IDynamicAccessNode;
import org.apache.flex.compiler.tree.as.IFunctionCallNode;
-import org.apache.flex.compiler.tree.as.IIfNode;
import org.apache.flex.compiler.tree.as.IIterationFlowNode;
import org.apache.flex.compiler.tree.as.IMemberAccessExpressionNode;
+import org.apache.flex.compiler.tree.as.INamespaceAccessExpressionNode;
import org.apache.flex.compiler.tree.as.IReturnNode;
import org.apache.flex.compiler.tree.as.ITernaryOperatorNode;
import org.apache.flex.compiler.tree.as.IUnaryOperatorNode;
@@ -614,9 +613,8 @@ public class TestExpressions extends ASTestBase
@Test
public void testVisitBinaryOperator_NamespaceAccess_1()
{
- // TODO this needs INamespaceAccessExpressionNode interface
- NamespaceAccessExpressionNode node = (NamespaceAccessExpressionNode) getExpressionNode(
- "a::b", NamespaceAccessExpressionNode.class);
+ INamespaceAccessExpressionNode node = (INamespaceAccessExpressionNode) getExpressionNode(
+ "a::b", INamespaceAccessExpressionNode.class);
asBlockWalker.visitNamespaceAccessExpression(node);
assertOut("a::b");
}
@@ -624,9 +622,8 @@ public class TestExpressions extends ASTestBase
@Test
public void testVisitBinaryOperator_NamespaceAccess_2()
{
- // TODO this needs INamespaceAccessExpressionNode interface
- NamespaceAccessExpressionNode node = (NamespaceAccessExpressionNode) getExpressionNode(
- "a::b::c", NamespaceAccessExpressionNode.class);
+ INamespaceAccessExpressionNode node = (INamespaceAccessExpressionNode) getExpressionNode(
+ "a::b::c", INamespaceAccessExpressionNode.class);
asBlockWalker.visitNamespaceAccessExpression(node);
assertOut("a::b::c");
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6e057093/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogExpressions.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogExpressions.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogExpressions.java
index 3938737..47f419f 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogExpressions.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogExpressions.java
@@ -22,10 +22,10 @@ package org.apache.flex.compiler.internal.codegen.js.goog;
import org.apache.flex.compiler.driver.IBackend;
import org.apache.flex.compiler.internal.codegen.as.TestExpressions;
import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend;
-import org.apache.flex.compiler.internal.tree.as.NamespaceAccessExpressionNode;
import org.apache.flex.compiler.tree.as.IBinaryOperatorNode;
import org.apache.flex.compiler.tree.as.IFunctionNode;
import org.apache.flex.compiler.tree.as.IIfNode;
+import org.apache.flex.compiler.tree.as.INamespaceAccessExpressionNode;
import org.apache.flex.compiler.tree.as.IVariableNode;
import org.junit.Test;
@@ -174,10 +174,9 @@ public class TestGoogExpressions extends TestExpressions
@Test
public void testVisitBinaryOperator_NamespaceAccess_1()
{
- // TODO (mschmalle) this needs INamespaceAccessExpressionNode interface
// TODO (erikdebruin) we need a 'goog.require("a")' in the header
- NamespaceAccessExpressionNode node = (NamespaceAccessExpressionNode) getExpressionNode(
- "a::b", NamespaceAccessExpressionNode.class);
+ INamespaceAccessExpressionNode node = (INamespaceAccessExpressionNode) getExpressionNode(
+ "a::b", INamespaceAccessExpressionNode.class);
asBlockWalker.visitNamespaceAccessExpression(node);
assertOut("a.b");
}
@@ -186,10 +185,9 @@ public class TestGoogExpressions extends TestExpressions
@Test
public void testVisitBinaryOperator_NamespaceAccess_2()
{
- // TODO (mschmalle) this needs INamespaceAccessExpressionNode interface
// TODO (erikdebruin) we need a 'goog.require("a.b")' in the header
- NamespaceAccessExpressionNode node = (NamespaceAccessExpressionNode) getExpressionNode(
- "a::b::c", NamespaceAccessExpressionNode.class);
+ INamespaceAccessExpressionNode node = (INamespaceAccessExpressionNode) getExpressionNode(
+ "a::b::c", INamespaceAccessExpressionNode.class);
asBlockWalker.visitNamespaceAccessExpression(node);
assertOut("a.b.c");
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6e057093/compiler.jx/src/org/apache/flex/compiler/codegen/as/IASEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/codegen/as/IASEmitter.java b/compiler.jx/src/org/apache/flex/compiler/codegen/as/IASEmitter.java
index 4a084c7..9bf4aa5 100644
--- a/compiler.jx/src/org/apache/flex/compiler/codegen/as/IASEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/codegen/as/IASEmitter.java
@@ -25,7 +25,6 @@ import org.apache.flex.compiler.codegen.IDocEmitter;
import org.apache.flex.compiler.codegen.IEmitter;
import org.apache.flex.compiler.definitions.IPackageDefinition;
import org.apache.flex.compiler.internal.tree.as.LabeledStatementNode;
-import org.apache.flex.compiler.internal.tree.as.NamespaceAccessExpressionNode;
import org.apache.flex.compiler.tree.as.IASNode;
import org.apache.flex.compiler.tree.as.IBinaryOperatorNode;
import org.apache.flex.compiler.tree.as.IBlockNode;
@@ -47,6 +46,7 @@ import org.apache.flex.compiler.tree.as.ILanguageIdentifierNode;
import org.apache.flex.compiler.tree.as.ILiteralContainerNode;
import org.apache.flex.compiler.tree.as.ILiteralNode;
import org.apache.flex.compiler.tree.as.IMemberAccessExpressionNode;
+import org.apache.flex.compiler.tree.as.INamespaceAccessExpressionNode;
import org.apache.flex.compiler.tree.as.INamespaceNode;
import org.apache.flex.compiler.tree.as.INumericLiteralNode;
import org.apache.flex.compiler.tree.as.IObjectLiteralValuePairNode;
@@ -305,7 +305,7 @@ public interface IASEmitter extends IEmitter
void emitIterationFlow(IIterationFlowNode node);
- void emitNamespaceAccessExpression(NamespaceAccessExpressionNode node);
+ void emitNamespaceAccessExpression(INamespaceAccessExpressionNode node);
void emitMemberAccessExpression(IMemberAccessExpressionNode node);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6e057093/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASBlockWalker.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASBlockWalker.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASBlockWalker.java
index 2650aaf..ec94c86 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASBlockWalker.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASBlockWalker.java
@@ -25,7 +25,6 @@ import org.apache.flex.compiler.codegen.as.IASEmitter;
import org.apache.flex.compiler.definitions.IPackageDefinition;
import org.apache.flex.compiler.internal.semantics.SemanticUtils;
import org.apache.flex.compiler.internal.tree.as.LabeledStatementNode;
-import org.apache.flex.compiler.internal.tree.as.NamespaceAccessExpressionNode;
import org.apache.flex.compiler.problems.ICompilerProblem;
import org.apache.flex.compiler.projects.IASProject;
import org.apache.flex.compiler.tree.ASTNodeID;
@@ -56,6 +55,7 @@ import org.apache.flex.compiler.tree.as.ILiteralContainerNode;
import org.apache.flex.compiler.tree.as.ILiteralNode;
import org.apache.flex.compiler.tree.as.ILiteralNode.LiteralType;
import org.apache.flex.compiler.tree.as.IMemberAccessExpressionNode;
+import org.apache.flex.compiler.tree.as.INamespaceAccessExpressionNode;
import org.apache.flex.compiler.tree.as.INamespaceNode;
import org.apache.flex.compiler.tree.as.INumericLiteralNode;
import org.apache.flex.compiler.tree.as.IObjectLiteralValuePairNode;
@@ -447,7 +447,7 @@ public class ASBlockWalker implements IASBlockVisitor, IASBlockWalker
@Override
public void visitNamespaceAccessExpression(
- NamespaceAccessExpressionNode node)
+ INamespaceAccessExpressionNode node)
{
debug("visitNamespaceAccessExpression()");
emitter.emitNamespaceAccessExpression(node);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6e057093/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASEmitter.java
index 1e6a5ec..19955e3 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASEmitter.java
@@ -42,7 +42,6 @@ import org.apache.flex.compiler.internal.tree.as.ChainedVariableNode;
import org.apache.flex.compiler.internal.tree.as.ContainerNode;
import org.apache.flex.compiler.internal.tree.as.FunctionNode;
import org.apache.flex.compiler.internal.tree.as.LabeledStatementNode;
-import org.apache.flex.compiler.internal.tree.as.NamespaceAccessExpressionNode;
import org.apache.flex.compiler.problems.ICompilerProblem;
import org.apache.flex.compiler.tree.ASTNodeID;
import org.apache.flex.compiler.tree.as.IASNode;
@@ -71,6 +70,7 @@ import org.apache.flex.compiler.tree.as.ILanguageIdentifierNode;
import org.apache.flex.compiler.tree.as.ILiteralContainerNode;
import org.apache.flex.compiler.tree.as.ILiteralNode;
import org.apache.flex.compiler.tree.as.IMemberAccessExpressionNode;
+import org.apache.flex.compiler.tree.as.INamespaceAccessExpressionNode;
import org.apache.flex.compiler.tree.as.INamespaceNode;
import org.apache.flex.compiler.tree.as.INumericLiteralNode;
import org.apache.flex.compiler.tree.as.IObjectLiteralValuePairNode;
@@ -1361,7 +1361,7 @@ public class ASEmitter implements IASEmitter, IEmitter
}
@Override
- public void emitNamespaceAccessExpression(NamespaceAccessExpressionNode node)
+ public void emitNamespaceAccessExpression(INamespaceAccessExpressionNode node)
{
getWalker().walk(node.getLeftOperandNode());
write(node.getOperator().getOperatorText());
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6e057093/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java
index 4f0ab6b..613b81a 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java
@@ -45,7 +45,6 @@ import org.apache.flex.compiler.internal.scopes.PackageScope;
import org.apache.flex.compiler.internal.tree.as.ChainedVariableNode;
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.NamespaceAccessExpressionNode;
import org.apache.flex.compiler.problems.ICompilerProblem;
import org.apache.flex.compiler.projects.ICompilerProject;
import org.apache.flex.compiler.scopes.IASScope;
@@ -63,6 +62,7 @@ import org.apache.flex.compiler.tree.as.IFunctionNode;
import org.apache.flex.compiler.tree.as.IGetterNode;
import org.apache.flex.compiler.tree.as.IIdentifierNode;
import org.apache.flex.compiler.tree.as.IInterfaceNode;
+import org.apache.flex.compiler.tree.as.INamespaceAccessExpressionNode;
import org.apache.flex.compiler.tree.as.IParameterNode;
import org.apache.flex.compiler.tree.as.IScopedNode;
import org.apache.flex.compiler.tree.as.ISetterNode;
@@ -1025,7 +1025,7 @@ public class JSGoogEmitter extends JSEmitter implements IJSGoogEmitter
//--------------------------------------------------------------------------
@Override
- public void emitNamespaceAccessExpression(NamespaceAccessExpressionNode node)
+ public void emitNamespaceAccessExpression(INamespaceAccessExpressionNode node)
{
getWalker().walk(node.getLeftOperandNode());
write(ASEmitterTokens.MEMBER_ACCESS);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6e057093/compiler.jx/src/org/apache/flex/compiler/internal/visitor/as/ASNodeSwitch.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/visitor/as/ASNodeSwitch.java b/compiler.jx/src/org/apache/flex/compiler/internal/visitor/as/ASNodeSwitch.java
index 934ea0d..8f95453 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/visitor/as/ASNodeSwitch.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/visitor/as/ASNodeSwitch.java
@@ -48,6 +48,7 @@ import org.apache.flex.compiler.tree.as.IKeywordNode;
import org.apache.flex.compiler.tree.as.ILanguageIdentifierNode;
import org.apache.flex.compiler.tree.as.ILiteralNode;
import org.apache.flex.compiler.tree.as.IMemberAccessExpressionNode;
+import org.apache.flex.compiler.tree.as.INamespaceAccessExpressionNode;
import org.apache.flex.compiler.tree.as.INamespaceNode;
import org.apache.flex.compiler.tree.as.INumericLiteralNode;
import org.apache.flex.compiler.tree.as.IObjectLiteralValuePairNode;
@@ -68,8 +69,8 @@ import org.apache.flex.compiler.tree.as.IWhileLoopNode;
import org.apache.flex.compiler.tree.as.IWithNode;
import org.apache.flex.compiler.tree.metadata.IMetaTagNode;
import org.apache.flex.compiler.tree.metadata.IMetaTagsNode;
-import org.apache.flex.compiler.visitor.IBlockVisitor;
import org.apache.flex.compiler.visitor.IASNodeStrategy;
+import org.apache.flex.compiler.visitor.IBlockVisitor;
import org.apache.flex.compiler.visitor.as.IASBlockVisitor;
/**
@@ -307,7 +308,7 @@ public class ASNodeSwitch implements IASNodeStrategy
}
else if (node instanceof NamespaceAccessExpressionNode)
{
- visitor.visitNamespaceAccessExpression((NamespaceAccessExpressionNode) node);
+ visitor.visitNamespaceAccessExpression((INamespaceAccessExpressionNode) node);
}
else if (node instanceof IMemberAccessExpressionNode)
{
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6e057093/compiler.jx/src/org/apache/flex/compiler/visitor/as/IASBlockVisitor.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/visitor/as/IASBlockVisitor.java b/compiler.jx/src/org/apache/flex/compiler/visitor/as/IASBlockVisitor.java
index 4cf5c92..9510ef8 100644
--- a/compiler.jx/src/org/apache/flex/compiler/visitor/as/IASBlockVisitor.java
+++ b/compiler.jx/src/org/apache/flex/compiler/visitor/as/IASBlockVisitor.java
@@ -21,7 +21,6 @@ package org.apache.flex.compiler.visitor.as;
import org.apache.flex.compiler.internal.codegen.as.ASBlockWalker;
import org.apache.flex.compiler.internal.tree.as.LabeledStatementNode;
-import org.apache.flex.compiler.internal.tree.as.NamespaceAccessExpressionNode;
import org.apache.flex.compiler.tree.as.IASNode;
import org.apache.flex.compiler.tree.as.IBinaryOperatorNode;
import org.apache.flex.compiler.tree.as.IBlockNode;
@@ -46,6 +45,7 @@ import org.apache.flex.compiler.tree.as.IKeywordNode;
import org.apache.flex.compiler.tree.as.ILanguageIdentifierNode;
import org.apache.flex.compiler.tree.as.ILiteralNode;
import org.apache.flex.compiler.tree.as.IMemberAccessExpressionNode;
+import org.apache.flex.compiler.tree.as.INamespaceAccessExpressionNode;
import org.apache.flex.compiler.tree.as.INamespaceNode;
import org.apache.flex.compiler.tree.as.INumericLiteralNode;
import org.apache.flex.compiler.tree.as.IObjectLiteralValuePairNode;
@@ -151,7 +151,7 @@ public interface IASBlockVisitor extends IBlockVisitor
void visitMemberAccessExpression(IMemberAccessExpressionNode node);
- void visitNamespaceAccessExpression(NamespaceAccessExpressionNode node);
+ void visitNamespaceAccessExpression(INamespaceAccessExpressionNode node);
void visitVariableExpression(IVariableExpressionNode node);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6e057093/compiler/src/org/apache/flex/compiler/tree/as/INamespaceAccessExpressionNode.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/tree/as/INamespaceAccessExpressionNode.java b/compiler/src/org/apache/flex/compiler/tree/as/INamespaceAccessExpressionNode.java
new file mode 100644
index 0000000..485c5a6
--- /dev/null
+++ b/compiler/src/org/apache/flex/compiler/tree/as/INamespaceAccessExpressionNode.java
@@ -0,0 +1,27 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.flex.compiler.tree.as;
+
+/**
+ * @author Erik de Bruin
+ */
+public interface INamespaceAccessExpressionNode extends IBinaryOperatorNode
+{
+}
[12/19] git commit: [flex-falcon] - [FalconJX] removed XXX
Posted by er...@apache.org.
[FalconJX] removed XXX
These were copy-paste artefacts, and obsolete anyway.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/3c78c3e5
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/3c78c3e5
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/3c78c3e5
Branch: refs/heads/develop
Commit: 3c78c3e5231090f6b967a4b24fe11527ced7e52f
Parents: c8357e6
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Apr 19 17:08:33 2013 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Apr 19 17:08:33 2013 +0200
----------------------------------------------------------------------
.../internal/codegen/js/goog/TestGoogEmiter.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3c78c3e5/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogEmiter.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogEmiter.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogEmiter.java
index 5ee17cd..422f85e 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogEmiter.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogEmiter.java
@@ -36,7 +36,7 @@ import org.junit.Test;
*/
public class TestGoogEmiter extends ASTestBase
{
- // XXX (mschmalle) () get back to this when more work is done
+
@Test
public void testSimple()
{
@@ -108,7 +108,6 @@ public class TestGoogEmiter extends ASTestBase
+ "foo.bar.FalconTest_A.prototype.method1 = function(bar, baz, goo) {\n}");
}
- // XXX (mschmalle) () get back to this when more work is done
@Test
public void testDefaultParameter()
{
[19/19] git commit: [flex-falcon] - [FalconJS] resolved TODO
Posted by er...@apache.org.
[FalconJS] resolved TODO
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/6fd38b4a
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/6fd38b4a
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/6fd38b4a
Branch: refs/heads/develop
Commit: 6fd38b4ad9ed7d03844bd985f2902c762a737492
Parents: 28fc6a5
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Apr 19 17:28:46 2013 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Apr 19 17:28:46 2013 +0200
----------------------------------------------------------------------
.../compiler/internal/codegen/mxml/MXMLWriter.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6fd38b4a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLWriter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLWriter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLWriter.java
index 925d70d..1d97ea5 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLWriter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLWriter.java
@@ -71,7 +71,6 @@ public class MXMLWriter extends JSWriter
}
catch (IOException e)
{
- // TODO Auto-generated catch block
e.printStackTrace();
}
}
[03/19] git commit: [flex-falcon] - [FalconJX] resolved TODO
Posted by er...@apache.org.
[FalconJX] resolved TODO
Used IFunctionCallNode instead of IIfNode.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/98cf58a7
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/98cf58a7
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/98cf58a7
Branch: refs/heads/develop
Commit: 98cf58a7f0abf66774c0432418fa97edb7e40dcb
Parents: fd4dbd9
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Apr 19 16:29:38 2013 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Apr 19 16:29:38 2013 +0200
----------------------------------------------------------------------
.../internal/codegen/as/TestExpressions.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/98cf58a7/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestExpressions.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestExpressions.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestExpressions.java
index 9168359..12a39b8 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestExpressions.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestExpressions.java
@@ -511,12 +511,11 @@ public class TestExpressions extends ASTestBase
@Test
public void testAnonymousFunctionAsArgument()
{
- // TODO (mschmalle) using IIfNode in expressions test, any other way to do this without statement?
- IIfNode node = (IIfNode) getNode(
- "if (a) {addListener('foo', function(event:Object):void{doit();});}",
- IIfNode.class);
- asBlockWalker.visitIf(node);
- assertOut("if (a) {\n\taddListener('foo', function(event:Object):void {\n\t\tdoit();\n\t});\n}");
+ IFunctionCallNode node = (IFunctionCallNode) getNode(
+ "addListener('foo', function(event:Object):void{doit();});",
+ IFunctionCallNode.class);
+ asBlockWalker.visitFunctionCall(node);
+ assertOut("addListener('foo', function(event:Object):void {\n\tdoit();\n})");
}
@Test
[17/19] git commit: [flex-falcon] - [FalconJX] resolved TODO
Posted by er...@apache.org.
[FalconJX] resolved TODO
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/35850f27
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/35850f27
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/35850f27
Branch: refs/heads/develop
Commit: 35850f271feb24339a69565d169fb4cc9fba37a5
Parents: e00b5af
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Apr 19 17:25:07 2013 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Apr 19 17:25:07 2013 +0200
----------------------------------------------------------------------
.../codegen/js/flexjs/JSFlexJSDocEmitter.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/35850f27/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java
index b052593..66dab8b 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java
@@ -16,6 +16,7 @@
* limitations under the License.
*
*/
+
package org.apache.flex.compiler.internal.codegen.js.flexjs;
import org.apache.flex.compiler.codegen.js.IJSEmitter;
@@ -41,7 +42,6 @@ public class JSFlexJSDocEmitter extends JSGoogDocEmitter
public JSFlexJSDocEmitter(IJSEmitter emitter)
{
super(emitter);
- // TODO Auto-generated constructor stub
}
@Override
[07/19] git commit: [flex-falcon] - [FalconJX] resolved TODO
Posted by er...@apache.org.
[FalconJX] resolved TODO
The new 'require' parser in FlexJS will include all namespaces that are actually used in a class.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/ce60cb7d
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/ce60cb7d
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/ce60cb7d
Branch: refs/heads/develop
Commit: ce60cb7dcf8a997c5dbe2dff266c65d0f19504a1
Parents: 4939e44
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Apr 19 16:35:42 2013 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Apr 19 16:35:42 2013 +0200
----------------------------------------------------------------------
.../codegen/js/goog/TestGoogExpressions.java | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ce60cb7d/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogExpressions.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogExpressions.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogExpressions.java
index 47f419f..8938da9 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogExpressions.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogExpressions.java
@@ -174,7 +174,6 @@ public class TestGoogExpressions extends TestExpressions
@Test
public void testVisitBinaryOperator_NamespaceAccess_1()
{
- // TODO (erikdebruin) we need a 'goog.require("a")' in the header
INamespaceAccessExpressionNode node = (INamespaceAccessExpressionNode) getExpressionNode(
"a::b", INamespaceAccessExpressionNode.class);
asBlockWalker.visitNamespaceAccessExpression(node);
@@ -185,7 +184,6 @@ public class TestGoogExpressions extends TestExpressions
@Test
public void testVisitBinaryOperator_NamespaceAccess_2()
{
- // TODO (erikdebruin) we need a 'goog.require("a.b")' in the header
INamespaceAccessExpressionNode node = (INamespaceAccessExpressionNode) getExpressionNode(
"a::b::c", INamespaceAccessExpressionNode.class);
asBlockWalker.visitNamespaceAccessExpression(node);
[18/19] git commit: [flex-falcon] - [FalconJX] resolved TODO
Posted by er...@apache.org.
[FalconJX] resolved TODO
Removed comment, the 'important' implementation is in FlexJS, which has it's own 'emitIdentifier'. The JSGoog implementation can remain 'as is'.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/28fc6a51
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/28fc6a51
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/28fc6a51
Branch: refs/heads/develop
Commit: 28fc6a51261643b6b233e36cd23907904947b387
Parents: 35850f2
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Apr 19 17:28:04 2013 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Apr 19 17:28:04 2013 +0200
----------------------------------------------------------------------
.../internal/codegen/js/goog/JSGoogEmitter.java | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/28fc6a51/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java
index 613b81a..49d23c6 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java
@@ -572,9 +572,6 @@ public class JSGoogEmitter extends JSEmitter implements IJSGoogEmitter
}
}
- // XXX (erikdebruin) I desperately needed a way to bypass the addition
- // of the 'self' prefix when running the tests... Or
- // I'd have to put the prefix in ~150 asserts!
boolean isRunningInTestMode = cnode != null
&& cnode.getQualifiedName().equalsIgnoreCase("FalconTest_A");
if (writeSelf && !isRunningInTestMode)
[14/19] git commit: [flex-falcon] - [FalconJX] resolved TODO
Posted by er...@apache.org.
[FalconJX] resolved TODO
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/896a10fc
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/896a10fc
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/896a10fc
Branch: refs/heads/develop
Commit: 896a10fc8da1fa04409af63afde455998894f78e
Parents: 374b72b
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Apr 19 17:22:29 2013 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Apr 19 17:22:29 2013 +0200
----------------------------------------------------------------------
.../compiler/internal/codegen/as/ASWriter.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/896a10fc/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASWriter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASWriter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASWriter.java
index a7aa651..32e1671 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASWriter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASWriter.java
@@ -84,7 +84,6 @@ public class ASWriter implements IJSWriter
}
catch (IOException e)
{
- // TODO Auto-generated catch block
e.printStackTrace();
}
}
[16/19] git commit: [flex-falcon] - [FalconJX] resolved TODO
Posted by er...@apache.org.
[FalconJX] resolved TODO
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/e00b5af3
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/e00b5af3
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/e00b5af3
Branch: refs/heads/develop
Commit: e00b5af3f4392a520e0a83a94eac1f031aad0adc
Parents: a8c50e0
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Apr 19 17:24:09 2013 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Apr 19 17:24:09 2013 +0200
----------------------------------------------------------------------
.../internal/codegen/js/amd/JSAMDDocEmitter.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e00b5af3/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/amd/JSAMDDocEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/amd/JSAMDDocEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/amd/JSAMDDocEmitter.java
index d7fe88b..c79dd3d 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/amd/JSAMDDocEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/amd/JSAMDDocEmitter.java
@@ -32,7 +32,6 @@ public class JSAMDDocEmitter extends JSDocEmitter implements IJSAMDDocEmitter
public JSAMDDocEmitter(IJSEmitter emitter)
{
super(emitter);
- // TODO Auto-generated constructor stub
}
}
[10/19] git commit: [flex-falcon] - [FalconJX] resolved TODO
Posted by er...@apache.org.
[FalconJX] resolved TODO
Fixed 'goog' test for multiple case statements; added 'type cast'.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/ee46707f
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/ee46707f
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/ee46707f
Branch: refs/heads/develop
Commit: ee46707f24dca5d07fb5b63ecf6ff7e1c65a49fa
Parents: 9a6d011
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Apr 19 17:03:21 2013 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Apr 19 17:03:21 2013 +0200
----------------------------------------------------------------------
.../codegen/js/goog/TestGoogStatements.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ee46707f/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogStatements.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogStatements.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogStatements.java
index aca660f..4cf86e7 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogStatements.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogStatements.java
@@ -25,6 +25,7 @@ import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend;
import org.apache.flex.compiler.internal.tree.as.LabeledStatementNode;
import org.apache.flex.compiler.tree.as.IFileNode;
import org.apache.flex.compiler.tree.as.IForLoopNode;
+import org.apache.flex.compiler.tree.as.ISwitchNode;
import org.apache.flex.compiler.tree.as.ITryNode;
import org.apache.flex.compiler.tree.as.IVariableNode;
import org.junit.Test;
@@ -238,6 +239,19 @@ public class TestGoogStatements extends TestStatements
}
//----------------------------------
+ // switch {}
+ //----------------------------------
+
+ @Test
+ public void testVisitSwitch_3()
+ {
+ ISwitchNode node = (ISwitchNode) getNode(
+ "switch(i){case 1: { var x:int = 42; break; }; case 2: { var y:int = 66; break; }}", ISwitchNode.class);
+ asBlockWalker.visitSwitch(node);
+ assertOut("switch (i) {\n\tcase 1:\n\t\tvar /** @type {number} */ x = 42;\n\t\tbreak;\n\tcase 2:\n\t\tvar /** @type {number} */ y = 66;\n\t\tbreak;\n}");
+ }
+
+ //----------------------------------
// label : for () {}
//----------------------------------
[06/19] git commit: [flex-falcon] - [FalconJX] resolved TODO
Posted by er...@apache.org.
[FalconJX] resolved TODO
This TODO was very unclear. Replaced it with comments for the old TODO text and a request for clarification.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/4939e44f
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/4939e44f
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/4939e44f
Branch: refs/heads/develop
Commit: 4939e44f085c76016a4745960258a1be3038d68a
Parents: 72f5bcd
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Apr 19 16:32:33 2013 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Apr 19 16:32:33 2013 +0200
----------------------------------------------------------------------
.../internal/codegen/as/TestStatements.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/4939e44f/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestStatements.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestStatements.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestStatements.java
index 6c90f98..00bfece 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestStatements.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestStatements.java
@@ -416,7 +416,11 @@ public class TestStatements extends ASTestBase
@Test
public void testVisitLabel_1a()
{
- // TODO LabelStatement messes up in finally{} block, something is wrong there
+ // ([unknown]) LabelStatement messes up in finally{} block, something is wrong there
+
+ // (erikdebruin) I don't see a finally block in the test code and the
+ // test passes... What's wrong?
+
LabeledStatementNode node = (LabeledStatementNode) getNode(
"foo: for each(var i:int in obj) break foo;",
LabeledStatementNode.class);
[05/19] git commit: [flex-falcon] - [FalconJX] resolved TODO
Posted by er...@apache.org.
[FalconJX] resolved TODO
Removed TODO, not relevant anymore, 'for each' is not handled by 'goog.array' anymore.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/72f5bcdb
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/72f5bcdb
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/72f5bcdb
Branch: refs/heads/develop
Commit: 72f5bcdb984db1b6ac1dfc15fbaee08a4b789f29
Parents: e13382e
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Apr 19 16:30:58 2013 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Apr 19 16:30:58 2013 +0200
----------------------------------------------------------------------
.../codegen/js/flexjs/TestFlexJSStatements.java | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/72f5bcdb/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 c1a568a..c78fa77 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
@@ -44,8 +44,6 @@ public class TestFlexJSStatements extends TestGoogStatements
@Test
public void testVisitForEach_1()
{
- // TODO (erikdebruin) we need to insert a "goog.require('goog.array')"
- // into the header
IForLoopNode node = (IForLoopNode) getNode(
"for each(var i:int in obj) { break; }", IForLoopNode.class);
asBlockWalker.visitForLoop(node);
[08/19] git commit: [flex-falcon] - [FalconJX] resolved TODO
Posted by er...@apache.org.
[FalconJX] resolved TODO
This TODO was copy-pasted from the super class, no need for a duplicate here.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/452e4ab8
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/452e4ab8
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/452e4ab8
Branch: refs/heads/develop
Commit: 452e4ab878db6888a5846a72efae207b92cbd987
Parents: ce60cb7
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Apr 19 16:37:38 2013 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Apr 19 16:37:38 2013 +0200
----------------------------------------------------------------------
.../codegen/js/goog/TestGoogStatements.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/452e4ab8/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogStatements.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogStatements.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogStatements.java
index b879741..aca660f 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogStatements.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogStatements.java
@@ -256,7 +256,6 @@ public class TestGoogStatements extends TestStatements
@Test
public void testVisitLabel_1a()
{
- // TODO (mschmalle) LabelStatement messes up in finally{} block, something is wrong there
LabeledStatementNode node = (LabeledStatementNode) getNode(
"foo: for each(var i:int in obj) break foo;",
LabeledStatementNode.class);
[04/19] git commit: [flex-falcon] - [FalconJX] resolved TODO
Posted by er...@apache.org.
[FalconJX] resolved TODO
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/e13382ec
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/e13382ec
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/e13382ec
Branch: refs/heads/develop
Commit: e13382eceb2b83a01376dccc93d41010ec2d96b8
Parents: 98cf58a
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Apr 19 16:30:02 2013 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Apr 19 16:30:02 2013 +0200
----------------------------------------------------------------------
.../internal/codegen/as/TestFieldMembers.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e13382ec/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestFieldMembers.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestFieldMembers.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestFieldMembers.java
index ba082bd..0de9f0e 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestFieldMembers.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestFieldMembers.java
@@ -130,7 +130,6 @@ public class TestFieldMembers extends ASTestBase
{
IVariableNode node = getField("static const foo;");
asBlockWalker.visitVariable(node);
- // TODO (mschmalle) is * type even possible for a constant?
assertOut("static const foo:*");
}
[02/19] git commit: [flex-falcon] - [FalconJX] resolved TODO
Posted by er...@apache.org.
[FalconJX] resolved TODO
TODO calls for braces in switch case blocks, but since the code functions fine without them, I've removed the TODO and added one extra test just to be sure.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/fd4dbd9c
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/fd4dbd9c
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/fd4dbd9c
Branch: refs/heads/develop
Commit: fd4dbd9c51b85bc79cb28610e361515d05acb832
Parents: 6e05709
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Apr 19 16:28:03 2013 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Apr 19 16:28:03 2013 +0200
----------------------------------------------------------------------
.../internal/codegen/as/TestStatements.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/fd4dbd9c/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestStatements.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestStatements.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestStatements.java
index d2b6333..6c90f98 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestStatements.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestStatements.java
@@ -376,8 +376,8 @@ public class TestStatements extends ASTestBase
ISwitchNode node = (ISwitchNode) getNode(
"switch(i){case 1: { break; }}", ISwitchNode.class);
asBlockWalker.visitSwitch(node);
- // TODO case BLOCK statements are SYNTHESIZED so they will never show BRACES
- // without extra help from us
+ // (erikdebruin) the code is valid without the extra braces,
+ // i.e. we're good, we "don't care"
assertOut("switch (i) {\n\tcase 1:\n\t\tbreak;\n}");
}
@@ -390,6 +390,15 @@ public class TestStatements extends ASTestBase
assertOut("switch (i) {\n\tcase 1:\n\t\tbreak;\n\tdefault:\n\t\treturn;\n}");
}
+ @Test
+ public void testVisitSwitch_3()
+ {
+ ISwitchNode node = (ISwitchNode) getNode(
+ "switch(i){case 1: { var x:int = 42; break; }; case 2: { var y:int = 66; break; }}", ISwitchNode.class);
+ asBlockWalker.visitSwitch(node);
+ assertOut("switch (i) {\n\tcase 1:\n\t\tvar x:int = 42;\n\t\tbreak;\n\tcase 2:\n\t\tvar y:int = 66;\n\t\tbreak;\n}");
+ }
+
//----------------------------------
// label : for () {}
//----------------------------------
[11/19] git commit: [flex-falcon] - [FalconJX] fixed
'INamespaceAccessExpressionNode' interface and tests
Posted by er...@apache.org.
[FalconJX] fixed 'INamespaceAccessExpressionNode' interface and tests
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c8357e61
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c8357e61
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c8357e61
Branch: refs/heads/develop
Commit: c8357e61a77f73b53b3cfcac46f6ed60639e2456
Parents: ee46707
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Apr 19 17:04:40 2013 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Apr 19 17:04:40 2013 +0200
----------------------------------------------------------------------
.../internal/codegen/as/TestExpressions.java | 6 ++----
.../codegen/js/goog/TestGoogExpressions.java | 8 +++-----
.../flex/compiler/internal/test/ASTestBase.java | 8 ++++++++
.../tree/as/NamespaceAccessExpressionNode.java | 4 ++--
4 files changed, 15 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c8357e61/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestExpressions.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestExpressions.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestExpressions.java
index 12a39b8..16ec842 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestExpressions.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestExpressions.java
@@ -612,8 +612,7 @@ public class TestExpressions extends ASTestBase
@Test
public void testVisitBinaryOperator_NamespaceAccess_1()
{
- INamespaceAccessExpressionNode node = (INamespaceAccessExpressionNode) getExpressionNode(
- "a::b", INamespaceAccessExpressionNode.class);
+ INamespaceAccessExpressionNode node = (INamespaceAccessExpressionNode) getNamespaceAccessExpressionNode("a::b");
asBlockWalker.visitNamespaceAccessExpression(node);
assertOut("a::b");
}
@@ -621,8 +620,7 @@ public class TestExpressions extends ASTestBase
@Test
public void testVisitBinaryOperator_NamespaceAccess_2()
{
- INamespaceAccessExpressionNode node = (INamespaceAccessExpressionNode) getExpressionNode(
- "a::b::c", INamespaceAccessExpressionNode.class);
+ INamespaceAccessExpressionNode node = (INamespaceAccessExpressionNode) getNamespaceAccessExpressionNode("a::b::c");
asBlockWalker.visitNamespaceAccessExpression(node);
assertOut("a::b::c");
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c8357e61/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogExpressions.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogExpressions.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogExpressions.java
index 997b46a..d984058 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogExpressions.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogExpressions.java
@@ -23,8 +23,8 @@ import org.apache.flex.compiler.driver.IBackend;
import org.apache.flex.compiler.internal.codegen.as.TestExpressions;
import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend;
import org.apache.flex.compiler.tree.as.IBinaryOperatorNode;
+import org.apache.flex.compiler.tree.as.IFunctionCallNode;
import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IIfNode;
import org.apache.flex.compiler.tree.as.INamespaceAccessExpressionNode;
import org.apache.flex.compiler.tree.as.IVariableNode;
import org.junit.Test;
@@ -173,8 +173,7 @@ public class TestGoogExpressions extends TestExpressions
@Test
public void testVisitBinaryOperator_NamespaceAccess_1()
{
- INamespaceAccessExpressionNode node = (INamespaceAccessExpressionNode) getExpressionNode(
- "a::b", INamespaceAccessExpressionNode.class);
+ INamespaceAccessExpressionNode node = (INamespaceAccessExpressionNode) getNamespaceAccessExpressionNode("a::b");
asBlockWalker.visitNamespaceAccessExpression(node);
assertOut("a.b");
}
@@ -183,8 +182,7 @@ public class TestGoogExpressions extends TestExpressions
@Test
public void testVisitBinaryOperator_NamespaceAccess_2()
{
- INamespaceAccessExpressionNode node = (INamespaceAccessExpressionNode) getExpressionNode(
- "a::b::c", INamespaceAccessExpressionNode.class);
+ INamespaceAccessExpressionNode node = (INamespaceAccessExpressionNode) getNamespaceAccessExpressionNode("a::b::c");
asBlockWalker.visitNamespaceAccessExpression(node);
assertOut("a.b.c");
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c8357e61/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ASTestBase.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ASTestBase.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ASTestBase.java
index f8fb1c9..f471fcc 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ASTestBase.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ASTestBase.java
@@ -13,6 +13,7 @@ import org.apache.flex.compiler.tree.as.IExpressionNode;
import org.apache.flex.compiler.tree.as.IFileNode;
import org.apache.flex.compiler.tree.as.IFunctionNode;
import org.apache.flex.compiler.tree.as.IInterfaceNode;
+import org.apache.flex.compiler.tree.as.INamespaceAccessExpressionNode;
import org.apache.flex.compiler.tree.as.IUnaryOperatorNode;
import org.apache.flex.compiler.tree.as.IVariableNode;
import org.apache.flex.utils.FilenameNormalization;
@@ -131,6 +132,13 @@ public class ASTestBase extends TestBase
return (IBinaryOperatorNode) getNode(code, IBinaryOperatorNode.class);
}
+ protected INamespaceAccessExpressionNode getNamespaceAccessExpressionNode(
+ String code)
+ {
+ return (INamespaceAccessExpressionNode) getNode(code,
+ INamespaceAccessExpressionNode.class);
+ }
+
protected IDynamicAccessNode getDynamicAccessNode(String code)
{
return (IDynamicAccessNode) getNode(code, IDynamicAccessNode.class);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c8357e61/compiler/src/org/apache/flex/compiler/internal/tree/as/NamespaceAccessExpressionNode.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/tree/as/NamespaceAccessExpressionNode.java b/compiler/src/org/apache/flex/compiler/internal/tree/as/NamespaceAccessExpressionNode.java
index c968216..5fc8230 100644
--- a/compiler/src/org/apache/flex/compiler/internal/tree/as/NamespaceAccessExpressionNode.java
+++ b/compiler/src/org/apache/flex/compiler/internal/tree/as/NamespaceAccessExpressionNode.java
@@ -25,9 +25,9 @@ import org.apache.flex.compiler.definitions.references.INamespaceReference;
import org.apache.flex.compiler.parsing.IASToken;
import org.apache.flex.compiler.projects.ICompilerProject;
import org.apache.flex.compiler.tree.ASTNodeID;
+import org.apache.flex.compiler.tree.as.INamespaceAccessExpressionNode;
-// TODO Add interface for this class
-public class NamespaceAccessExpressionNode extends BinaryOperatorNodeBase
+public class NamespaceAccessExpressionNode extends BinaryOperatorNodeBase implements INamespaceAccessExpressionNode
{
/**
* Constructor.
[13/19] git commit: [flex-falcon] - [FalconJX] cleanup
Posted by er...@apache.org.
[FalconJX] cleanup
Removed obsolete comments and redundant code.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/374b72b4
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/374b72b4
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/374b72b4
Branch: refs/heads/develop
Commit: 374b72b43915e953a717ff732cac009538bba7a1
Parents: 3c78c3e
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Apr 19 17:16:44 2013 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Apr 19 17:16:44 2013 +0200
----------------------------------------------------------------------
.../org/apache/flex/compiler/clients/MXMLJSC.java | 122 +--------------
1 files changed, 5 insertions(+), 117 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/374b72b4/compiler.jx/src/org/apache/flex/compiler/clients/MXMLJSC.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/clients/MXMLJSC.java b/compiler.jx/src/org/apache/flex/compiler/clients/MXMLJSC.java
index cd956d5..5ed4dca 100644
--- a/compiler.jx/src/org/apache/flex/compiler/clients/MXMLJSC.java
+++ b/compiler.jx/src/org/apache/flex/compiler/clients/MXMLJSC.java
@@ -37,7 +37,6 @@ import org.apache.flex.compiler.clients.problems.ProblemQuery;
import org.apache.flex.compiler.clients.problems.WorkspaceProblemFormatter;
import org.apache.flex.compiler.codegen.as.IASWriter;
import org.apache.flex.compiler.codegen.js.IJSPublisher;
-import org.apache.flex.compiler.common.VersionInfo;
import org.apache.flex.compiler.config.Configuration;
import org.apache.flex.compiler.config.ConfigurationBuffer;
import org.apache.flex.compiler.config.Configurator;
@@ -306,13 +305,11 @@ public class MXMLJSC
try
{
- setupJS();
+ project.getSourceCompilationUnitFactory().addHandler(asFileHandler);
+
if (!setupTargetFile())
return false;
- //if (config.isDumpAst())
- // dumpAST();
-
buildArtifact();
if (jsTarget != null)
@@ -320,8 +317,6 @@ public class MXMLJSC
Collection<ICompilerProblem> errors = new ArrayList<ICompilerProblem>();
Collection<ICompilerProblem> warnings = new ArrayList<ICompilerProblem>();
- // Don't create a swf if there are errors unless a
- // developer requested otherwise.
if (!config.getCreateTargetWithErrors())
{
problems.getErrorsAndWarnings(errors, warnings);
@@ -329,7 +324,6 @@ public class MXMLJSC
return false;
}
- // output type specific pre-compile actions
switch (jsOutputType)
{
case FLEXJS: {
@@ -395,7 +389,6 @@ public class MXMLJSC
}
}
- // output type specific post-compile actions
switch (jsOutputType)
{
case AMD: {
@@ -462,8 +455,6 @@ public class MXMLJSC
problems.add(problem);
}
- //reportRequiredRSLs(target);
-
return app;
}
@@ -564,12 +555,8 @@ public class MXMLJSC
File normalizedMainFile = new File(normalizedMainFileName);
if (compilationUnitFactory.canCreateCompilationUnit(normalizedMainFile))
{
- // adds the source path to the sourceListManager
project.addIncludeSourceFile(normalizedMainFile);
- // just using the basename is obviously wrong:
- // final String mainQName = FilenameUtils.getBaseName(normalizedMainFile);
-
final List<String> sourcePath = config.getCompilerSourcePath();
String mainQName = null;
if (sourcePath != null && !sourcePath.isEmpty())
@@ -597,21 +584,14 @@ public class MXMLJSC
Collection<ICompilationUnit> mainFileCompilationUnits = workspace
.getCompilationUnits(normalizedMainFileName, project);
- //assert mainFileCompilationUnits.size() == 1;
mainCU = Iterables.getOnlyElement(mainFileCompilationUnits);
- //assert ((DefinitionPriority)mainCU.getDefinitionPriority()).getBasePriority() == DefinitionPriority.BasePriority.SOURCE_LIST;
-
- // Use main source file name as the root class name.
config.setMainDefinition(mainQName);
}
Preconditions.checkNotNull(mainCU,
"Main compilation unit can't be null");
- // if (getTargetSettings() == null)
- // return false;
-
ITargetSettings settings = getTargetSettings();
if (settings != null)
project.setTargetSettings(settings);
@@ -630,44 +610,6 @@ public class MXMLJSC
return targetSettings;
}
- private void setupJS() throws IOException, InterruptedException
- {
- // JSSharedData.instance.reset();
- project.getSourceCompilationUnitFactory().addHandler(asFileHandler);
-
- // JSSharedData.instance.setVerbose(config.isVerbose());
-
- //JSSharedData.DEBUG = config.debug();
- //JSSharedData.OPTIMIZE = !config.debug() && config.optimize();
-
- //--- final Set<ICompilationUnit> compilationUnits = new HashSet<ICompilationUnit>();
-
- // XXX // add builtins?
-
- registerSWCs(project); // XXX is this needed?
- }
-
- public static void registerSWCs(CompilerProject project)
- throws InterruptedException
- {
- // final JSSharedData sharedData = JSSharedData.instance;
- //
- // // collect all SWCCompilationUnit in swcUnits
- // final List<ICompilationUnit> swcUnits = new ArrayList<ICompilationUnit>();
- // for (ICompilationUnit cu : project.getCompilationUnits())
- // {
- // // if (cu instanceof SWCCompilationUnit)
- // // swcUnits.add(cu);
- // //
- // // final List<IDefinition> defs = getDefinitions(cu, false);
- // // for (IDefinition def : defs)
- // // {
- // // sharedData.registerDefinition(def);
- // // }
- // }
-
- }
-
/**
* Create a new Configurator. This method may be overridden to allow
* Configurator subclasses to be created that have custom configurations.
@@ -692,64 +634,19 @@ public class MXMLJSC
try
{
- // // Print brief usage if no arguments provided.
- // if (args.length == 0)
- // {
- // final String usage = CommandLineConfigurator.brief(
- // getProgramName(), DEFAULT_VAR,
- // LocalizationManager.get(), L10N_CONFIG_PREFIX);
- // if (usage != null)
- // println(usage);
- // return false;
- // }
- //
projectConfigurator.setConfiguration(args,
ICompilerSettingsConstants.FILE_SPECS_VAR);
projectConfigurator.applyToProject(project);
problems = new ProblemQuery(
projectConfigurator.getCompilerProblemSettings());
- // Get the configuration and configBuffer which are now initialized.
config = projectConfigurator.getConfiguration();
configBuffer = projectConfigurator.getConfigurationBuffer();
problems.addAll(projectConfigurator.getConfigurationProblems());
- // Print version if "-version" is present.
if (configBuffer.getVar("version") != null) //$NON-NLS-1$
- {
- println(VersionInfo.buildMessage()
- + " (" + JSSharedData.COMPILER_VERSION + ")");
return false;
- }
- //
- // // Print help if "-help" is present.
- // final List<ConfigurationValue> helpVar = configBuffer
- // .getVar("help"); //$NON-NLS-1$
- // if (helpVar != null)
- // {
- // processHelp(helpVar);
- // return false;
- // }
- //
- // for (String fileName : projectConfigurator
- // .getLoadedConfigurationFiles())
- // {
- // JSSharedData.instance.stdout("Loading configuration: "
- // + fileName);
- // }
- //
- // if (config.isVerbose())
- // {
- // for (final IFileSpecification themeFile : project
- // .getThemeFiles())
- // {
- // JSSharedData.instance.stdout(String.format(
- // "Found theme file %s", themeFile.getPath()));
- // }
- // }
- //
- // If we have configuration errors then exit before trying to
- // validate the target.
+
if (problems.hasErrors())
return false;
@@ -771,8 +668,6 @@ public class MXMLJSC
}
finally
{
- // If we couldn't create a configuration, then create a default one
- // so we can exit without throwing an exception.
if (config == null)
{
config = new Configuration();
@@ -802,12 +697,6 @@ public class MXMLJSC
throw new ConfigurationException.IOError(targetFile);
}
- private void println(String string)
- {
- // TODO Auto-generated method stub
-
- }
-
/**
* Wait till the workspace to finish compilation and close.
*/
@@ -833,9 +722,8 @@ public class MXMLJSC
workspace.close();
}
- // workaround for Falcon bug.
- // Input files with relative paths confuse the algorithm that extracts the root class name.
-
+ // Workaround for Falcon bug: input files with relative paths confuse the
+ // algorithm that extracts the root class name.
protected static String[] fixArgs(final String[] args)
{
String[] newArgs = args;
[15/19] git commit: [flex-falcon] - [FalconJX] resolved TODO
Posted by er...@apache.org.
[FalconJX] resolved TODO
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/a8c50e0e
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/a8c50e0e
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/a8c50e0e
Branch: refs/heads/develop
Commit: a8c50e0e7da16426451a86f8953da4d87515d9fc
Parents: 896a10f
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Apr 19 17:23:33 2013 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Apr 19 17:23:33 2013 +0200
----------------------------------------------------------------------
.../compiler/internal/codegen/js/JSWriter.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a8c50e0e/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSWriter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSWriter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSWriter.java
index 4fb5f78..9d2c5c1 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSWriter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSWriter.java
@@ -81,7 +81,6 @@ public class JSWriter implements IJSWriter
}
catch (IOException e)
{
- // TODO Auto-generated catch block
e.printStackTrace();
}
}
[09/19] git commit: [flex-falcon] - [FalconJX] resolved TODO
Posted by er...@apache.org.
[FalconJX] resolved TODO
Use IFunctionCallNode instead of IIfNode.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/9a6d0112
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/9a6d0112
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/9a6d0112
Branch: refs/heads/develop
Commit: 9a6d01124e80a02feef13147b7bfe34dca169d2a
Parents: 452e4ab
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Apr 19 17:02:14 2013 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Apr 19 17:02:14 2013 +0200
----------------------------------------------------------------------
.../codegen/js/goog/TestGoogExpressions.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a6d0112/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogExpressions.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogExpressions.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogExpressions.java
index 8938da9..997b46a 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogExpressions.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogExpressions.java
@@ -135,12 +135,11 @@ public class TestGoogExpressions extends TestExpressions
@Test
public void testAnonymousFunctionAsArgument()
{
- // TODO (mschmalle) using IIfNode in expressions test, any other way to do this without statement?
- IIfNode node = (IIfNode) getNode(
- "if (a) {addListener('foo', function(event:Object):void{doit();});}",
- IIfNode.class);
- asBlockWalker.visitIf(node);
- assertOut("if (a) {\n\taddListener('foo', function(event) {\n\t\tdoit();\n\t});\n}");
+ IFunctionCallNode node = (IFunctionCallNode) getNode(
+ "addListener('foo', function(event:Object):void{doit();})",
+ IFunctionCallNode.class);
+ asBlockWalker.visitFunctionCall(node);
+ assertOut("addListener('foo', function(event) {\n\tdoit();\n})");
}
@Override