You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2016/03/01 02:50:34 UTC
[1/3] git commit: [flex-falcon] [refs/heads/develop] - fix up tests
after making components inner classes
Repository: flex-falcon
Updated Branches:
refs/heads/develop d37eaae59 -> 82df47658
fix up tests after making components inner classes
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/82df4765
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/82df4765
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/82df4765
Branch: refs/heads/develop
Commit: 82df47658fefb9f95ae18cba64df2d01fa1209bf
Parents: 47852ab
Author: Alex Harui <ah...@apache.org>
Authored: Mon Feb 29 17:50:12 2016 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Feb 29 17:50:29 2016 -0800
----------------------------------------------------------------------
.../compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java | 2 --
.../internal/codegen/mxml/flexjs/TestFlexJSMXMLScript.java | 4 ++--
.../test-files/flexjs/files/FlexJSTest_again_result.js | 2 +-
.../test-files/flexjs/files/MyInitialView_result.js | 2 +-
.../test-files/flexjs/files/wildcard_import_result.js | 2 +-
5 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/82df4765/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java
index a456900..e6ab1e4 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java
@@ -785,7 +785,6 @@ public class TestFlexJSPackage extends TestGoogPackage
" return {\n" +
" variables: function () {\n" +
" return {\n" +
- " 'someString': { type: 'String'}\n" +
" };\n" +
" },\n" +
" accessors: function () {\n" +
@@ -795,7 +794,6 @@ public class TestFlexJSPackage extends TestGoogPackage
" methods: function () {\n" +
" return {\n" +
" 'InternalClass': { type: '', declaredBy: 'foo.bar.baz.A.InternalClass'},\n" +
- " 'someStaticFunction': { type: 'String', declaredBy: 'foo.bar.baz.A.InternalClass'},\n" +
" 'someMethod': { type: 'String', declaredBy: 'foo.bar.baz.A.InternalClass'}\n" +
" };\n" +
" }\n" +
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/82df4765/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLScript.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLScript.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLScript.java
index 4a58096..3da0c36 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLScript.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLScript.java
@@ -57,7 +57,6 @@ public class TestFlexJSMXMLScript extends FlexJSTestBase
"\n" +
"\n" +
"\n" +
- "\n" +
"/**\n" +
" * @constructor\n" +
" * @extends {org.apache.flex.core.Application}\n" +
@@ -119,6 +118,7 @@ public class TestFlexJSMXMLScript extends FlexJSTestBase
"};\n" +
"\n" +
"\n" +
+ "\n" +
"/**\n" +
" * @export\n" +
" * @override\n" +
@@ -161,7 +161,6 @@ public class TestFlexJSMXMLScript extends FlexJSTestBase
"\n" +
"\n" +
"\n" +
- "\n" +
"/**\n" +
" * @constructor\n" +
" * @extends {org.apache.flex.core.Application}\n" +
@@ -223,6 +222,7 @@ public class TestFlexJSMXMLScript extends FlexJSTestBase
"};\n" +
"\n" +
"\n" +
+ "\n" +
"/**\n" +
" * @export\n" +
" * @type {Array}\n" +
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/82df4765/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js b/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js
index bf68564..71eb945 100644
--- a/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js
+++ b/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js
@@ -34,7 +34,6 @@ goog.require('org.apache.flex.events.Event');
-
/**
* @constructor
* @extends {org.apache.flex.core.Application}
@@ -169,6 +168,7 @@ FlexJSTest_again.prototype.FLEXJS_REFLECTION_INFO = function () {
};
+
/**
* @export
* @param {org.apache.flex.events.Event} event
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/82df4765/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js b/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
index 6ba45a3..95b90ce 100644
--- a/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
+++ b/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
@@ -40,7 +40,6 @@ goog.require('org.apache.flex.utils.Timer');
-
/**
* @constructor
* @extends {org.apache.flex.core.ViewBase}
@@ -259,6 +258,7 @@ MyInitialView.prototype.FLEXJS_REFLECTION_INFO = function () {
};
+
/**
* @private
* @type {org.apache.flex.utils.Timer}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/82df4765/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js b/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js
index 43c5780..4ef8a61 100644
--- a/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js
+++ b/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js
@@ -26,7 +26,6 @@ goog.require('org.apache.flex.html.Button');
-
/**
* @constructor
* @extends {org.apache.flex.core.Application}
@@ -87,6 +86,7 @@ wildcard_import.prototype.FLEXJS_REFLECTION_INFO = function () {
};
+
/**
* @private
*/
[3/3] git commit: [flex-falcon] [refs/heads/develop] - only put
instance data in reflection info. In the future we should put static data on
the class as well as putting the instance data on the prototype
Posted by ah...@apache.org.
only put instance data in reflection info. In the future we should put static data on the class as well as putting the instance data on the prototype
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/eb41d259
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/eb41d259
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/eb41d259
Branch: refs/heads/develop
Commit: eb41d2597169af9581eb6242df35efd60ae2a23b
Parents: d37eaae
Author: Alex Harui <ah...@apache.org>
Authored: Mon Feb 29 10:42:57 2016 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Feb 29 17:50:29 2016 -0800
----------------------------------------------------------------------
.../codegen/js/jx/PackageFooterEmitter.java | 21 +++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/eb41d259/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/PackageFooterEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/PackageFooterEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/PackageFooterEmitter.java
index 7c5e244..fa99a54 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/PackageFooterEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/PackageFooterEmitter.java
@@ -26,6 +26,8 @@ import java.util.Set;
import org.apache.flex.compiler.codegen.ISubEmitter;
import org.apache.flex.compiler.codegen.js.IJSEmitter;
+import org.apache.flex.compiler.common.ASModifier;
+import org.apache.flex.compiler.common.ModifiersSet;
import org.apache.flex.compiler.constants.IASKeywordConstants;
import org.apache.flex.compiler.definitions.IDefinition;
import org.apache.flex.compiler.definitions.IPackageDefinition;
@@ -222,8 +224,11 @@ public class PackageFooterEmitter extends JSSubEmitter implements
for (IDefinitionNode dnode : dnodes)
{
- if (dnode.getNodeID() == ASTNodeID.VariableID ||
- dnode.getNodeID() == ASTNodeID.BindableVariableID)
+ ModifiersSet modifierSet = dnode.getDefinition().getModifiers();
+ boolean isStatic = (modifierSet != null && modifierSet
+ .hasModifier(ASModifier.STATIC));
+ if (!isStatic && (dnode.getNodeID() == ASTNodeID.VariableID ||
+ dnode.getNodeID() == ASTNodeID.BindableVariableID))
{
IVariableNode varNode = (IVariableNode)dnode;
String ns = varNode.getNamespace();
@@ -247,8 +252,11 @@ public class PackageFooterEmitter extends JSSubEmitter implements
HashMap<String, MethodData> accessorMap = new HashMap<String, MethodData>();
for (IDefinitionNode dnode : dnodes)
{
- if (dnode.getNodeID() == ASTNodeID.GetterID ||
- dnode.getNodeID() == ASTNodeID.SetterID)
+ ModifiersSet modifierSet = dnode.getDefinition().getModifiers();
+ boolean isStatic = (modifierSet != null && modifierSet
+ .hasModifier(ASModifier.STATIC));
+ if (!isStatic && (dnode.getNodeID() == ASTNodeID.GetterID ||
+ dnode.getNodeID() == ASTNodeID.SetterID))
{
IFunctionNode fnNode = (IFunctionNode)dnode;
String ns = fnNode.getNamespace();
@@ -281,7 +289,10 @@ public class PackageFooterEmitter extends JSSubEmitter implements
}
for (IDefinitionNode dnode : dnodes)
{
- if (dnode.getNodeID() == ASTNodeID.FunctionID)
+ ModifiersSet modifierSet = dnode.getDefinition().getModifiers();
+ boolean isStatic = (modifierSet != null && modifierSet
+ .hasModifier(ASModifier.STATIC));
+ if (dnode.getNodeID() == ASTNodeID.FunctionID && !isStatic)
{
IFunctionNode fnNode = (IFunctionNode)dnode;
String ns = fnNode.getNamespace();
[2/3] git commit: [flex-falcon] [refs/heads/develop] - hack in
emitting sub-components as inner classes. Implementation needs improvement
someday
Posted by ah...@apache.org.
hack in emitting sub-components as inner classes. Implementation needs improvement someday
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/47852ab4
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/47852ab4
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/47852ab4
Branch: refs/heads/develop
Commit: 47852ab48748b2a4fe865351f8aade16634395c5
Parents: eb41d25
Author: Alex Harui <ah...@apache.org>
Authored: Mon Feb 29 14:53:47 2016 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Feb 29 17:50:29 2016 -0800
----------------------------------------------------------------------
.../compiler/internal/codegen/as/ASEmitter.java | 2 +-
.../codegen/js/flexjs/JSFlexJSEmitter.java | 5 ++++
.../codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 25 ++++++++++++++++----
.../codegen/mxml/jsc/MXMLJSCJSEmitter.java | 2 +-
4 files changed, 27 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/47852ab4/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 32e7130..107e809 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
@@ -115,7 +115,7 @@ public class ASEmitter implements IASEmitter, IEmitter
return bufferWrite;
}
- protected void setBufferWrite(boolean value)
+ public void setBufferWrite(boolean value)
{
bufferWrite = value;
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/47852ab4/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 f3fd8b6..72a59f1 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
@@ -52,6 +52,7 @@ import org.apache.flex.compiler.internal.codegen.js.jx.PackageHeaderEmitter;
import org.apache.flex.compiler.internal.codegen.js.jx.SelfReferenceEmitter;
import org.apache.flex.compiler.internal.codegen.js.jx.SuperCallEmitter;
import org.apache.flex.compiler.internal.codegen.js.jx.VarDeclarationEmitter;
+import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLFlexJSEmitter;
import org.apache.flex.compiler.internal.projects.FlexJSProject;
import org.apache.flex.compiler.internal.projects.FlexProject;
import org.apache.flex.compiler.internal.tree.as.BinaryOperatorAsNode;
@@ -327,8 +328,12 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter
return formatQualifiedName(name, false);
}
+ public MXMLFlexJSEmitter mxmlEmitter = null;
+
public String formatQualifiedName(String name, boolean isDoc)
{
+ if (mxmlEmitter != null)
+ name = mxmlEmitter.formatQualifiedName(name);
/*
if (name.contains("goog.") || name.startsWith("Vector."))
return name;
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/47852ab4/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 d8d99ea..dd89f6b 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
@@ -116,6 +116,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
private ArrayList<MXMLScriptSpecifier> scripts;
//private ArrayList<MXMLStyleSpecifier> styles;
private IClassDefinition classDefinition;
+ private IClassDefinition documentDefinition;
private ArrayList<String> usedNames = new ArrayList<String>();
private ArrayList<IMXMLMetadataNode> metadataNodes = new ArrayList<IMXMLMetadataNode>();
@@ -228,6 +229,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
// visit MXML
IClassDefinition cdef = node.getClassDefinition();
classDefinition = cdef;
+ documentDefinition = cdef;
// TODO (mschmalle) will remove this cast as more things get abstracted
JSFlexJSEmitter fjs = (JSFlexJSEmitter) ((IMXMLBlockWalker) getMXMLWalker())
@@ -246,9 +248,6 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
emitHeader(node);
- write(subDocuments.toString());
- writeNewline();
-
emitClassDeclStart(cname, node.getBaseClassName(), false);
emitComplexInitializers(node);
@@ -259,6 +258,9 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
emitMetaData(cdef);
+ write(subDocuments.toString());
+ writeNewline();
+
emitScripts();
fjs.getBindableEmitter().emit(cdef);
@@ -318,7 +320,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
IASEmitter asEmitter = ((IMXMLBlockWalker) getMXMLWalker())
.getASEmitter();
((JSFlexJSEmitter) asEmitter).getModel().pushClass(cdef);
-
+
IASNode classNode = node.getContainedClassDefinitionNode();
// visit tags
final int len = classNode.getChildCount();
@@ -329,6 +331,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
String cname = cdef.getQualifiedName();
subDocumentNames.add(cname);
+ ((JSFlexJSEmitter) asEmitter).mxmlEmitter = this;
String baseClassName = cdef.getBaseClassAsDisplayString();
emitClassDeclStart(cname, baseClassName, false);
@@ -366,6 +369,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
inMXMLContent = oldInMXMLContent;
classDefinition = oldClassDef;
((JSFlexJSEmitter) asEmitter).getModel().popClass();
+ ((JSFlexJSEmitter) asEmitter).mxmlEmitter = null;
}
@@ -1929,6 +1933,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
MXMLDescriptorSpecifier ps = getCurrentDescriptor("ps");
ps.value = "new " + formatQualifiedName("org.apache.flex.core.ClassFactory") + "(";
+ ps.value += formatQualifiedName(documentDefinition.getQualifiedName()) + ".";
ps.value += formatQualifiedName(node.getName());
ps.value += ")";
@@ -1939,6 +1944,14 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
setBufferWrite(false);
}
+ @Override
+ protected void setBufferWrite(boolean value)
+ {
+ super.setBufferWrite(value);
+ IASEmitter asEmitter = ((IMXMLBlockWalker) getMXMLWalker()).getASEmitter();
+ ((JSFlexJSEmitter)asEmitter).setBufferWrite(value);
+ }
+
//--------------------------------------------------------------------------
// JS output
//--------------------------------------------------------------------------
@@ -2146,7 +2159,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
}
}
- protected String formatQualifiedName(String name)
+ public String formatQualifiedName(String name)
{
return formatQualifiedName(name, true);
}
@@ -2158,6 +2171,8 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
return name;
name = name.replaceAll("\\.", "_");
*/
+ if (subDocumentNames.contains(name))
+ return documentDefinition.getQualifiedName() + "." + name;
if (useName && !usedNames.contains(name))
usedNames.add(name);
return name;
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/47852ab4/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/jsc/MXMLJSCJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/jsc/MXMLJSCJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/jsc/MXMLJSCJSEmitter.java
index 184158b..088ee62 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/jsc/MXMLJSCJSEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/jsc/MXMLJSCJSEmitter.java
@@ -38,7 +38,7 @@ public class MXMLJSCJSEmitter extends MXMLFlexJSEmitter implements
}
@Override
- protected String formatQualifiedName(String name)
+ public String formatQualifiedName(String name)
{
return name;
}