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 2015/05/31 19:47:51 UTC
[1/5] git commit: [flex-falcon] [refs/heads/develop] - Revert "Quick
commit to keep get everything in the repo before Mike goes wild"
Repository: flex-falcon
Updated Branches:
refs/heads/develop 2b06e1e9f -> ac4c40d07
Revert "Quick commit to keep get everything in the repo before Mike goes wild"
This reverts commit 2b06e1e9f743366aa8333e1b6ab10405b220b76f.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/ac4c40d0
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/ac4c40d0
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/ac4c40d0
Branch: refs/heads/develop
Commit: ac4c40d07ca56e6941b6a90c3234920db873c919
Parents: 39b63cf
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Sun May 31 19:47:38 2015 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sun May 31 19:47:38 2015 +0200
----------------------------------------------------------------------
.../internal/codegen/js/vf2js/TestVF2JSStatements.java | 4 ++--
.../org/apache/flex/compiler/internal/test/TestBase.java | 2 +-
.../projects/simpleMXML/src/SimpleMXML_Project_result.js | 2 +-
compiler.jx.tests/test-files/vf2js/projects/super/Base.as | 2 --
.../compiler/internal/codegen/js/vf2js/JSVF2JSEmitter.java | 9 +++++----
5 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ac4c40d0/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSStatements.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSStatements.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSStatements.java
index 8327fcf..3385b47 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSStatements.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSStatements.java
@@ -346,7 +346,7 @@ public class TestVF2JSStatements extends TestGoogStatements
IIfNode node = (IIfNode) getNode(
"if (numChildren == 0) { if (!typeDescription.@dynamic) { trace(\"warning: no describeType entry for '\" + childName + \"' on non-dynamic type '\" + typeDescription.@name + \"'\"); } }", IIfNode.class);
asBlockWalker.visitIf(node);
- assertOut("if (numChildren == 0) {\n if (!typeDescription['E4XOperator']) {\n org_apache_flex_utils_Language.trace(\"warning: no describeType entry for '\" + childName + \"' on non-dynamic type '\" + typeDescription['E4XOperator'] + \"'\");\n }\n}");
+ assertOut("if (numChildren == 0) {\n if (!this.typeDescription['E4XOperator']) {\n org_apache_flex_utils_Language.trace(\"warning: no describeType entry for '\" + childName + \"' on non-dynamic type '\" + this.typeDescription['E4XOperator'] + \"'\");\n }\n}");
}
@Test
@@ -355,7 +355,7 @@ public class TestVF2JSStatements extends TestGoogStatements
IIfNode node = (IIfNode) getNode(
"if (options.includeReadOnly) { properties = classInfo..accessor.(@access != \"writeonly\") + classInfo..variable; }", IIfNode.class);
asBlockWalker.visitIf(node);
- assertOut("if (options.includeReadOnly) {\n properties = 'E4XFilter' + classInfo['E4XSelector'];\n}");
+ assertOut("if (options.includeReadOnly) {\n properties = 'E4XFilter' + this.classInfo['E4XSelector'];\n}");
}
@Test
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ac4c40d0/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/TestBase.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/TestBase.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/TestBase.java
index 3b4f464..2a2e90b 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/TestBase.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/TestBase.java
@@ -261,7 +261,7 @@ public class TestBase implements ITestBase
walker.visitCompilationUnit(cu);
- System.out.println(writer.toString());
+ //System.out.println(writer.toString());
BufferedOutputStream out = new BufferedOutputStream(
new FileOutputStream(outputClassFile));
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ac4c40d0/compiler.jx.tests/test-files/vf2js/projects/simpleMXML/src/SimpleMXML_Project_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/vf2js/projects/simpleMXML/src/SimpleMXML_Project_result.js b/compiler.jx.tests/test-files/vf2js/projects/simpleMXML/src/SimpleMXML_Project_result.js
index d493d28..e34f12d 100644
--- a/compiler.jx.tests/test-files/vf2js/projects/simpleMXML/src/SimpleMXML_Project_result.js
+++ b/compiler.jx.tests/test-files/vf2js/projects/simpleMXML/src/SimpleMXML_Project_result.js
@@ -23,7 +23,7 @@ goog.provide('SimpleMXML_Project');
goog.require('spark.components.Application');
goog.require('example.Component');
-goog.require('org.apache.flex.utils.Language');
+goog.require('org_apache_flex_utils_Language');
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ac4c40d0/compiler.jx.tests/test-files/vf2js/projects/super/Base.as
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/vf2js/projects/super/Base.as b/compiler.jx.tests/test-files/vf2js/projects/super/Base.as
index 7c2330c..ee69d65 100644
--- a/compiler.jx.tests/test-files/vf2js/projects/super/Base.as
+++ b/compiler.jx.tests/test-files/vf2js/projects/super/Base.as
@@ -52,8 +52,6 @@ public class Base extends Super
public function getNumber():void
{
alert(super.doStuff());
-
- alert(Math.max(0, super.x - 1));
var x:Number = super.x;
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ac4c40d0/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSEmitter.java
index 68d0cb6..b11193b 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSEmitter.java
@@ -990,10 +990,7 @@ public class JSVF2JSEmitter extends JSGoogEmitter implements IJSVF2JSEmitter
if (pfnode == null)
return false;
- String parentName = pfnode.getName();
- String currentName = node.getName();
-
- return parentName.equals(currentName);
+ return pfnode.getName().equals(node.getName());
}
//--------------------------------------------------------------------------
@@ -1362,6 +1359,8 @@ public class JSVF2JSEmitter extends JSGoogEmitter implements IJSVF2JSEmitter
{
// ToDo (erikdebruin): properly handle E4X
+ write(ASEmitterTokens.THIS);
+ write(ASEmitterTokens.MEMBER_ACCESS);
getWalker().walk(node.getLeftOperandNode());
write(ASEmitterTokens.SQUARE_OPEN);
write(ASEmitterTokens.SINGLE_QUOTE);
@@ -1374,6 +1373,8 @@ public class JSVF2JSEmitter extends JSGoogEmitter implements IJSVF2JSEmitter
{
// ToDo (erikdebruin): properly handle E4X
+ write(ASEmitterTokens.THIS);
+ write(ASEmitterTokens.MEMBER_ACCESS);
getWalker().walk(node.getLeftOperandNode());
write(ASEmitterTokens.SQUARE_OPEN);
write(ASEmitterTokens.SINGLE_QUOTE);
[4/5] git commit: [flex-falcon] [refs/heads/develop] - Revert "Make
comment more distinct"
Posted by er...@apache.org.
Revert "Make comment more distinct"
This reverts commit 9b95414ba99eca4bb0401a906414635e240fc2aa.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/39b63cf7
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/39b63cf7
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/39b63cf7
Branch: refs/heads/develop
Commit: 39b63cf79c7eb651891d4bed74d043cb3711c5df
Parents: 27b6d98
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Sun May 31 19:47:38 2015 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sun May 31 19:47:38 2015 +0200
----------------------------------------------------------------------
.../org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/39b63cf7/compiler.jx/src/org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java b/compiler.jx/src/org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java
index ade44c2..4d625d4 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java
@@ -74,7 +74,7 @@ public class VF2JSDepsWriter {
this.problems = problems;
buildDB();
ArrayList<GoogDep> dps = sort(mainName);
- String outString = "// generated by FalconJX (VF2JS)" + "\n";
+ String outString = "// generated by FalconJS" + "\n";
int n = dps.size();
for (int i = n - 1; i >= 0; i--)
{
[5/5] git commit: [flex-falcon] [refs/heads/develop] - Revert "Bypass
FlexJS' new underscored namespace convention"
Posted by er...@apache.org.
Revert "Bypass FlexJS' new underscored namespace convention"
This reverts commit a388b191544e7fee7d999b0301d2e4a0b8f1f939.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/2d0adbb1
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/2d0adbb1
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/2d0adbb1
Branch: refs/heads/develop
Commit: 2d0adbb1ab0293d343b4ae077971171a8abee6eb
Parents: 08846be
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Sun May 31 19:47:38 2015 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sun May 31 19:47:38 2015 +0200
----------------------------------------------------------------------
.../codegen/js/vf2js/JSVF2JSDocEmitter.java | 48 --------------------
.../codegen/mxml/vf2js/MXMLVF2JSEmitter.java | 2 +-
.../codegen/mxml/vf2js/MXMLVF2JSPublisher.java | 2 +-
3 files changed, 2 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2d0adbb1/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java
index f731c2b..c0a1241 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java
@@ -40,7 +40,6 @@ import org.apache.flex.compiler.projects.ICompilerProject;
import org.apache.flex.compiler.tree.as.IDefinitionNode;
import org.apache.flex.compiler.tree.as.IExpressionNode;
import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IInterfaceNode;
import org.apache.flex.compiler.tree.as.IParameterNode;
import org.apache.flex.compiler.tree.as.IVariableNode;
@@ -53,41 +52,6 @@ public class JSVF2JSDocEmitter extends JSGoogDocEmitter
}
@Override
- public void emitInterfaceDoc(IInterfaceNode node, ICompilerProject project)
- {
- begin();
-
- emitJSDocLine(JSEmitterTokens.INTERFACE.getToken());
-
- boolean hasQualifiedNames = true;
- IExpressionNode[] inodes = node.getExtendedInterfaceNodes();
- for (IExpressionNode inode : inodes)
- {
- IDefinition dnode = inode.resolve(project);
- if (dnode != null)
- {
- emitJSDocLine(ASEmitterTokens.EXTENDS, dnode.getQualifiedName());
- }
- else
- {
- hasQualifiedNames = false;
- break;
- }
- }
-
- if (!hasQualifiedNames)
- {
- String[] inames = node.getExtendedInterfaces();
- for (String iname : inames)
- {
- emitJSDocLine(ASEmitterTokens.EXTENDS, iname);
- }
- }
-
- end();
- }
-
- @Override
public void emitMethodDoc(IFunctionNode node, ICompilerProject project)
{
IClassDefinition classDefinition = resolveClassDefinition(node);
@@ -304,16 +268,4 @@ public class JSVF2JSDocEmitter extends JSGoogDocEmitter
emitPublic(node);
}
}
-
- @Override
- public void emitExtends(IClassDefinition superDefinition, String packageName)
- {
- emitJSDocLine(ASEmitterTokens.EXTENDS, superDefinition.getQualifiedName());
- }
-
- @Override
- public void emitImplements(ITypeDefinition definition, String packageName)
- {
- emitJSDocLine(ASEmitterTokens.IMPLEMENTS, definition.getQualifiedName());
- }
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2d0adbb1/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java
index 209916a..e56a654 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java
@@ -1495,7 +1495,7 @@ public class MXMLVF2JSEmitter extends MXMLEmitter implements
if (project.mainCU != null &&
cu.getName().equals(project.mainCU.getName()))
{
- emitHeaderLine("org.apache.flex.utils.Language");
+ emitHeaderLine(JSFlexJSEmitterTokens.LANGUAGE_QNAME.getToken());
}
writeNewline();
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2d0adbb1/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSPublisher.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSPublisher.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSPublisher.java
index 5adbc90..164806c 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSPublisher.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSPublisher.java
@@ -205,7 +205,7 @@ public class MXMLVF2JSPublisher extends JSGoogPublisher implements
+ File.separator + outputFileName;
appendExportSymbol(projectIntermediateJSFilePath, projectName);
- //appendEncodedCSS(projectIntermediateJSFilePath, projectName);
+ appendEncodedCSS(projectIntermediateJSFilePath, projectName);
if (!subsetGoog)
{
[2/5] git commit: [flex-falcon] [refs/heads/develop] - Revert "Add
null check"
Posted by er...@apache.org.
Revert "Add null check"
This reverts commit 06cbaf4a4b6a953c34f253fedcb97f64fc7f23ee.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/27b6d989
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/27b6d989
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/27b6d989
Branch: refs/heads/develop
Commit: 27b6d989607128c79dcdab04227a5f18d13e6f7a
Parents: 2d0adbb
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Sun May 31 19:47:38 2015 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sun May 31 19:47:38 2015 +0200
----------------------------------------------------------------------
.../internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/27b6d989/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java
index e56a654..5c2aae0 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java
@@ -1391,13 +1391,10 @@ public class MXMLVF2JSEmitter extends MXMLEmitter implements
public void emitComponent(IMXMLComponentNode node)
{
MXMLVF2JSDescriptorSpecifier ps = getCurrentDescriptor("ps");
- if (ps != null)
- {
- ps.value = "new mx.core.ClassFactory(";
+ ps.value = "new mx.core.ClassFactory(";
- ps.value += node.getName();
- ps.value += ")";
- }
+ ps.value += node.getName();
+ ps.value += ")";
setBufferWrite(true);
emitSubDocument(node);
[3/5] git commit: [flex-falcon] [refs/heads/develop] - Revert "Raise
visibility to allow sub class to call from @override method"
Posted by er...@apache.org.
Revert "Raise visibility to allow sub class to call from @override method"
This reverts commit 33961df15ff123b4af57883069b6124f3acbb02d.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/08846bed
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/08846bed
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/08846bed
Branch: refs/heads/develop
Commit: 08846bed4a7f1fe62059194e4beb1bef8d7926d6
Parents: 2b06e1e
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Sun May 31 19:47:38 2015 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sun May 31 19:47:38 2015 +0200
----------------------------------------------------------------------
.../flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/08846bed/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 b8e513d..e402ac9 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
@@ -398,7 +398,7 @@ public class JSGoogDocEmitter extends JSDocEmitter implements IJSGoogDocEmitter
emitJSDocLine(name.getToken(), "");
}
- protected void emitJSDocLine(String name)
+ private void emitJSDocLine(String name)
{
emitJSDocLine(name, "");
}