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 2014/09/16 16:01:53 UTC
[01/11] git commit: [flex-falcon] [refs/heads/develop] - Add size
check
Repository: flex-falcon
Updated Branches:
refs/heads/develop ce457b3fd -> 35e648c82
Add size check
Prevents exception from being thrown when running full SDK through FalconJX. Check with compiler/SDK guru's about root cause for exception.
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/302b6bb1
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/302b6bb1
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/302b6bb1
Branch: refs/heads/develop
Commit: 302b6bb1ccb14e0dec595b1cb464beae4d71a827
Parents: ce457b3
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Tue Sep 16 13:27:55 2014 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Tue Sep 16 13:27:55 2014 +0200
----------------------------------------------------------------------
.../flex/compiler/internal/projects/FlexJSProject.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/302b6bb1/compiler.jx/src/org/apache/flex/compiler/internal/projects/FlexJSProject.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/projects/FlexJSProject.java b/compiler.jx/src/org/apache/flex/compiler/internal/projects/FlexJSProject.java
index eb1fa63..2be9d0f 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/projects/FlexJSProject.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/projects/FlexJSProject.java
@@ -20,6 +20,7 @@ package org.apache.flex.compiler.internal.projects;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Set;
import org.apache.flex.compiler.common.DependencyType;
@@ -62,7 +63,14 @@ public class FlexJSProject extends FlexProject
public void addDependency(ICompilationUnit from, ICompilationUnit to,
DependencyType dt, String qname)
{
- IDefinition def = to.getDefinitionPromises().get(0);
+ // ToDo (erikdebruin): add VF2JS conditional -> only use check during full SDK compilation
+ List<IDefinition> dp = to.getDefinitionPromises();
+
+ if (dp.size() == 0)
+ return;
+
+ IDefinition def = dp.get(0);
+ // IDefinition def = to.getDefinitionPromises().get(0);
IDefinition actualDef = ((DefinitionPromise) def).getActualDefinition();
boolean isInterface = actualDef instanceof InterfaceDefinition;
if (!isInterface)
[04/11] git commit: [flex-falcon] [refs/heads/develop] - Add null
check
Posted by er...@apache.org.
Add null check
Prevents exception from being thrown when running full SDK through FalconJX. Check with compiler/SDK guru's about root cause for exception.
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/84d92adf
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/84d92adf
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/84d92adf
Branch: refs/heads/develop
Commit: 84d92adff0d4c90e29ebec6204477f0703f106f7
Parents: a44c130
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Tue Sep 16 13:43:56 2014 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Tue Sep 16 13:43:56 2014 +0200
----------------------------------------------------------------------
.../compiler/internal/codegen/js/goog/JSGoogDocEmitter.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/84d92adf/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java
index a63992f..b2f8761 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java
@@ -501,6 +501,11 @@ public class JSGoogDocEmitter extends JSDocEmitter implements IJSGoogDocEmitter
IClassNode cnode = (IClassNode) node
.getAncestorOfType(IClassNode.class);
+
+ // ToDo (erikdebruin): add VF2JS conditional -> only use check during full SDK compilation
+ if (cnode == null)
+ return null;
+
return cnode.getDefinition();
}
}
[07/11] git commit: [flex-falcon] [refs/heads/develop] - Add null
check
Posted by er...@apache.org.
Add null check
Prevents exception from being thrown when running full SDK through FalconJX. Check with compiler/SDK guru's about root cause for exception.
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/55e000f6
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/55e000f6
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/55e000f6
Branch: refs/heads/develop
Commit: 55e000f6eddeb01faa2100a3aefb6618a55856b8
Parents: 1a7c183
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Tue Sep 16 14:01:18 2014 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Tue Sep 16 14:01:18 2014 +0200
----------------------------------------------------------------------
.../apache/flex/compiler/internal/visitor/as/ASNodeSwitch.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/55e000f6/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 610a644..04b98ef 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
@@ -101,6 +101,10 @@ public class ASNodeSwitch implements IASNodeStrategy
@Override
public void handle(IASNode node)
{
+ // ToDo (erikdebruin): add VF2JS conditional -> only use check during full SDK compilation
+ if (node == null)
+ return;
+
// TODO (mschmalle) Still working on the switch, its complication in the expressions
switch (node.getNodeID())
{
[10/11] git commit: [flex-falcon] [refs/heads/develop] - Bypass
unhandled type
Posted by er...@apache.org.
Bypass unhandled type
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/7e831458
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/7e831458
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/7e831458
Branch: refs/heads/develop
Commit: 7e83145801ede451f7cbb58c77698511048780ac
Parents: bc97dc7
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Tue Sep 16 14:15:12 2014 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Tue Sep 16 14:15:12 2014 +0200
----------------------------------------------------------------------
.../compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7e831458/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
index 6b1d341..f8e1e74 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
@@ -964,6 +964,10 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
// Each one will generate code to push an IOverride instance.
for (IMXMLNode anode : snodes)
{
+ // ToDo (erikdebruin): properly handle this type
+ if (node instanceof IMXMLStateNode)
+ continue;
+
switch (anode.getNodeID())
{
case MXMLPropertySpecifierID:
[08/11] git commit: [flex-falcon] [refs/heads/develop] - Add null
check
Posted by er...@apache.org.
Add null check
Prevents exception from being thrown when running full SDK through FalconJX. Check with compiler/SDK guru's about root cause for exception.
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/128904f6
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/128904f6
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/128904f6
Branch: refs/heads/develop
Commit: 128904f6526ce44c6e81637f5a57905864f44b97
Parents: 55e000f
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Tue Sep 16 14:06:18 2014 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Tue Sep 16 14:06:18 2014 +0200
----------------------------------------------------------------------
.../compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/128904f6/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 e31727c..d8b18ae 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
@@ -757,6 +757,10 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter
IClassNode cnode = (IClassNode) node
.getAncestorOfType(IClassNode.class);
+ // ToDo (erikdebruin): add VF2JS conditional -> only use check during full SDK compilation
+ if (cnode == null)
+ return;
+
write(cnode.getQualifiedName());
write(ASEmitterTokens.MEMBER_ACCESS);
write(JSGoogEmitterTokens.GOOG_BASE);
[06/11] git commit: [flex-falcon] [refs/heads/develop] - Add handler
+ stub for 'MXMLDatabindingNode'
Posted by er...@apache.org.
Add handler + stub for 'MXMLDatabindingNode'
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/1a7c1839
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/1a7c1839
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/1a7c1839
Branch: refs/heads/develop
Commit: 1a7c1839f799a8fbfa3c5220b86f3689c59612d6
Parents: 113443c
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Tue Sep 16 13:59:47 2014 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Tue Sep 16 13:59:47 2014 +0200
----------------------------------------------------------------------
.../apache/flex/compiler/codegen/mxml/IMXMLEmitter.java | 5 +++++
.../compiler/internal/codegen/mxml/MXMLBlockWalker.java | 11 +++++++++++
.../flex/compiler/internal/codegen/mxml/MXMLEmitter.java | 6 ++++++
.../compiler/internal/visitor/mxml/MXMLNodeSwitch.java | 5 ++++-
.../flex/compiler/visitor/mxml/IMXMLBlockVisitor.java | 5 +++++
5 files changed, 31 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/1a7c1839/compiler.jx/src/org/apache/flex/compiler/codegen/mxml/IMXMLEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/codegen/mxml/IMXMLEmitter.java b/compiler.jx/src/org/apache/flex/compiler/codegen/mxml/IMXMLEmitter.java
index 6d51790..fe4c771 100644
--- a/compiler.jx/src/org/apache/flex/compiler/codegen/mxml/IMXMLEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/codegen/mxml/IMXMLEmitter.java
@@ -26,6 +26,7 @@ import org.apache.flex.compiler.tree.mxml.IMXMLArrayNode;
import org.apache.flex.compiler.tree.mxml.IMXMLBooleanNode;
import org.apache.flex.compiler.tree.mxml.IMXMLClassDefinitionNode;
import org.apache.flex.compiler.tree.mxml.IMXMLComponentNode;
+import org.apache.flex.compiler.tree.mxml.IMXMLDataBindingNode;
import org.apache.flex.compiler.tree.mxml.IMXMLEmbedNode;
import org.apache.flex.compiler.tree.mxml.IMXMLEventSpecifierNode;
import org.apache.flex.compiler.tree.mxml.IMXMLFactoryNode;
@@ -123,5 +124,9 @@ public interface IMXMLEmitter extends IEmitter
//--------------------------------------------------------------------------
void emitVector(IMXMLVectorNode node);
+
+ //--------------------------------------------------------------------------
+
+ void emitDatabinding(IMXMLDataBindingNode node);
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/1a7c1839/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLBlockWalker.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLBlockWalker.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLBlockWalker.java
index f41ebe8..a6cbb95 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLBlockWalker.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLBlockWalker.java
@@ -34,6 +34,7 @@ import org.apache.flex.compiler.tree.mxml.IMXMLArrayNode;
import org.apache.flex.compiler.tree.mxml.IMXMLBooleanNode;
import org.apache.flex.compiler.tree.mxml.IMXMLClassDefinitionNode;
import org.apache.flex.compiler.tree.mxml.IMXMLComponentNode;
+import org.apache.flex.compiler.tree.mxml.IMXMLDataBindingNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDeclarationsNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDeferredInstanceNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
@@ -407,6 +408,16 @@ public class MXMLBlockWalker implements IMXMLBlockVisitor, IMXMLBlockWalker
}
//--------------------------------------------------------------------------
+
+ @Override
+ public void visitDatabinding(IMXMLDataBindingNode node)
+ {
+ debug("visitDatabinding()");
+
+ mxmlEmitter.emitDatabinding(node);
+ }
+
+ //--------------------------------------------------------------------------
protected void debug(String message)
{
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/1a7c1839/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLEmitter.java
index c8207a2..ea4f4d0 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/MXMLEmitter.java
@@ -32,6 +32,7 @@ import org.apache.flex.compiler.tree.mxml.IMXMLBooleanNode;
import org.apache.flex.compiler.tree.mxml.IMXMLClassDefinitionNode;
import org.apache.flex.compiler.tree.mxml.IMXMLClassNode;
import org.apache.flex.compiler.tree.mxml.IMXMLComponentNode;
+import org.apache.flex.compiler.tree.mxml.IMXMLDataBindingNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDeclarationsNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
import org.apache.flex.compiler.tree.mxml.IMXMLEmbedNode;
@@ -383,4 +384,9 @@ public class MXMLEmitter extends Emitter implements IMXMLEmitter
// ToDo (erikdebruin): implement vector output
}
+ public void emitDatabinding(IMXMLDataBindingNode node)
+ {
+ // ToDo (erikdebruin): implement databinding output
+ }
+
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/1a7c1839/compiler.jx/src/org/apache/flex/compiler/internal/visitor/mxml/MXMLNodeSwitch.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/visitor/mxml/MXMLNodeSwitch.java b/compiler.jx/src/org/apache/flex/compiler/internal/visitor/mxml/MXMLNodeSwitch.java
index 3f7e5ae..1c17717 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/visitor/mxml/MXMLNodeSwitch.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/visitor/mxml/MXMLNodeSwitch.java
@@ -23,6 +23,7 @@ import org.apache.flex.compiler.tree.as.IASNode;
import org.apache.flex.compiler.tree.mxml.IMXMLArrayNode;
import org.apache.flex.compiler.tree.mxml.IMXMLBooleanNode;
import org.apache.flex.compiler.tree.mxml.IMXMLComponentNode;
+import org.apache.flex.compiler.tree.mxml.IMXMLDataBindingNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDeclarationsNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDeferredInstanceNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
@@ -137,6 +138,9 @@ public class MXMLNodeSwitch implements IASNodeStrategy
case MXMLVectorID:
visitor.visitVector((IMXMLVectorNode) node);
break;
+ case MXMLDataBindingID:
+ visitor.visitDatabinding((IMXMLDataBindingNode) node);
+ break;
case MXMLApplicationID:
case MXMLBindingID:
@@ -145,7 +149,6 @@ public class MXMLNodeSwitch implements IASNodeStrategy
case MXMLClassDefinitionID:
case MXMLClearID:
case MXMLConcatenatedDataBindingID:
- case MXMLDataBindingID:
case MXMLDateID:
case MXMLDefinitionID:
case MXMLDesignLayerID:
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/1a7c1839/compiler.jx/src/org/apache/flex/compiler/visitor/mxml/IMXMLBlockVisitor.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/visitor/mxml/IMXMLBlockVisitor.java b/compiler.jx/src/org/apache/flex/compiler/visitor/mxml/IMXMLBlockVisitor.java
index 8d87e1b..ab2b537 100644
--- a/compiler.jx/src/org/apache/flex/compiler/visitor/mxml/IMXMLBlockVisitor.java
+++ b/compiler.jx/src/org/apache/flex/compiler/visitor/mxml/IMXMLBlockVisitor.java
@@ -23,6 +23,7 @@ import org.apache.flex.compiler.tree.mxml.IMXMLArrayNode;
import org.apache.flex.compiler.tree.mxml.IMXMLBooleanNode;
import org.apache.flex.compiler.tree.mxml.IMXMLClassDefinitionNode;
import org.apache.flex.compiler.tree.mxml.IMXMLComponentNode;
+import org.apache.flex.compiler.tree.mxml.IMXMLDataBindingNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDeclarationsNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDeferredInstanceNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
@@ -121,4 +122,8 @@ public interface IMXMLBlockVisitor extends IBlockVisitor
void visitVector(IMXMLVectorNode node);
+ //--------------------------------------------------------------------------
+
+ void visitDatabinding(IMXMLDataBindingNode node);
+
}
[02/11] git commit: [flex-falcon] [refs/heads/develop] - Add null
check
Posted by er...@apache.org.
Add null check
Prevents exception from being thrown when running full SDK through FalconJX. Check with compiler/SDK guru's about root cause for exception.
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/08be9466
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/08be9466
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/08be9466
Branch: refs/heads/develop
Commit: 08be9466b34636ece5a9395f86c66930bfa90d5a
Parents: 302b6bb
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Tue Sep 16 13:33:47 2014 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Tue Sep 16 13:33:47 2014 +0200
----------------------------------------------------------------------
.../compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/08be9466/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 73b7d4b..10456c7 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
@@ -825,6 +825,10 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter
IClassNode cnode = (IClassNode) node
.getAncestorOfType(IClassNode.class);
+ // ToDo (erikdebruin): add VF2JS conditional -> only use check during full SDK compilation
+ if (cnode == null)
+ return;
+
write(cnode.getQualifiedName());
write(ASEmitterTokens.MEMBER_ACCESS);
write(JSGoogEmitterTokens.GOOG_BASE);
[03/11] git commit: [flex-falcon] [refs/heads/develop] - Add handler
stubs
Posted by er...@apache.org.
Add handler stubs
For full cross-compilation, these stubs obviously need an implementation ;-)
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/a44c1307
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/a44c1307
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/a44c1307
Branch: refs/heads/develop
Commit: a44c13079079f75f88e9f9e71047ebc900c89de4
Parents: 08be946
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Tue Sep 16 13:40:30 2014 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Tue Sep 16 13:40:30 2014 +0200
----------------------------------------------------------------------
.../flex/compiler/internal/visitor/as/ASNodeSwitch.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a44c1307/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 8f95453..610a644 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
@@ -104,6 +104,14 @@ public class ASNodeSwitch implements IASNodeStrategy
// TODO (mschmalle) Still working on the switch, its complication in the expressions
switch (node.getNodeID())
{
+ case ContainerID:
+ // ToDo (erikdebruin): implement handler
+ return;
+
+ case ConfigBlockID:
+ // ToDo (erikdebruin): implement handler
+ return;
+
case FileID:
visitor.visitFile((IFileNode) node);
return;
[11/11] git commit: [flex-falcon] [refs/heads/develop] - Add null
check
Posted by er...@apache.org.
Add null check
Prevents exception from being thrown when running full SDK through FalconJX. Check with compiler/SDK guru's about root cause for exception.
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/35e648c8
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/35e648c8
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/35e648c8
Branch: refs/heads/develop
Commit: 35e648c825daa2b49289f1b872b7ff8d9cdfab7e
Parents: 7e83145
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Tue Sep 16 14:50:40 2014 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Tue Sep 16 14:50:40 2014 +0200
----------------------------------------------------------------------
.../internal/codegen/js/flexjs/JSFlexJSDocEmitter.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/35e648c8/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 235deb1..8571846 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
@@ -106,7 +106,13 @@ public class JSFlexJSDocEmitter extends JSGoogDocEmitter
}
IExpressionNode enode = pnode.getNameExpressionNode();
- emitParam(pnode, enode.resolveType(project).getPackageName());
+
+ // ToDo (erikdebruin): add VF2JS conditional -> only use check during full SDK compilation
+ ITypeDefinition tdef = enode.resolveType(project);
+ if (tdef == null)
+ continue;
+
+ emitParam(pnode, tdef.getPackageName());
}
if (!node.isConstructor())
[09/11] git commit: [flex-falcon] [refs/heads/develop] - "Bypass" XML
in JS issue by writing the value as a string
Posted by er...@apache.org.
"Bypass" XML in JS issue by writing the value as a string
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/bc97dc7c
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/bc97dc7c
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/bc97dc7c
Branch: refs/heads/develop
Commit: bc97dc7c70b81e7bf0b267cc5a1e2f3498b366a0
Parents: 128904f
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Tue Sep 16 14:10:50 2014 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Tue Sep 16 14:10:50 2014 +0200
----------------------------------------------------------------------
.../internal/codegen/js/flexjs/JSFlexJSEmitter.java | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bc97dc7c/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 d8b18ae..454bae6 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
@@ -1552,13 +1552,18 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter
@Override
public void emitLiteral(ILiteralNode node)
{
+ boolean isWritten = false;
+
String s = node.getValue(true);
if (!(node instanceof RegExpLiteralNode))
{
if (node.getLiteralType() == LiteralType.XML)
{
- UnsupportedLanguageFeatureProblem problem = new UnsupportedLanguageFeatureProblem(node, "XML");
- getProblems().add(problem);
+ // ToDo (erikdebruin): VF2JS -> handle XML output properly...
+
+ write("'" + s + "'");
+
+ isWritten = true;
}
s = s.replaceAll("\n", "__NEWLINE_PLACEHOLDER__");
s = s.replaceAll("\r", "__CR_PLACEHOLDER__");
@@ -1576,6 +1581,10 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter
s = s.replaceAll("__CR_PLACEHOLDER__", "\\\\r");
s = s.replaceAll("__NEWLINE_PLACEHOLDER__", "\\\\n");
}
- write(s);
+
+ if (!isWritten)
+ {
+ write(s);
+ }
}
}
[05/11] git commit: [flex-falcon] [refs/heads/develop] - Add null
check
Posted by er...@apache.org.
Add null check
Prevents exception from being thrown when running full SDK through FalconJX. Check with compiler/SDK guru's about root cause for exception.
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/113443c9
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/113443c9
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/113443c9
Branch: refs/heads/develop
Commit: 113443c9ad6576ca5ae76762116e4f1b8964bcf6
Parents: 84d92ad
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Tue Sep 16 13:48:42 2014 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Tue Sep 16 13:48:42 2014 +0200
----------------------------------------------------------------------
.../compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/113443c9/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 10456c7..e31727c 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
@@ -1151,6 +1151,10 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter
IFunctionDefinition definition = node.getDefinition();
ITypeDefinition type = (ITypeDefinition) definition.getParent();
+ // ToDo (erikdebruin): add VF2JS conditional -> only use check during full SDK compilation
+ if (type == null)
+ return;
+
if (project == null)
project = getWalker().getProject();