Updated Branches: refs/heads/develop 0eb72d8bc -> c050380d9
[FalconJX] wildcard import test Added test files and code for a test of 'wildcard' imports (my.package.*); ignored same test because compiler is not yet handling these imports ;-) Signed-off-by: Erik de Bruin <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/0fa98cfe Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/0fa98cfe Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/0fa98cfe Branch: refs/heads/develop Commit: 0fa98cfe2892c57efff7bb15dec9b7ce3cd271a4 Parents: 0eb72d8 Author: Erik de Bruin <[email protected]> Authored: Wed Apr 10 09:19:27 2013 +0200 Committer: Erik de Bruin <[email protected]> Committed: Wed Apr 10 09:19:27 2013 +0200 ---------------------------------------------------------------------- .../mxml/flexjs/TestFlexJSMXMLApplication.java | 23 ++++- .../test-files/flexjs/files/wildcard_import.mxml | 18 +++ .../flexjs/files/wildcard_import_result.js | 82 +++++++++++++++ .../codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 24 +++-- 4 files changed, 134 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0fa98cfe/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java index ddf143b..bd7c4f9 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java @@ -2,12 +2,29 @@ package org.apache.flex.compiler.internal.codegen.mxml.flexjs; import org.apache.flex.compiler.internal.test.FlexJSTestBase; import org.apache.flex.compiler.tree.mxml.IMXMLFileNode; +import org.junit.Ignore; import org.junit.Test; public class TestFlexJSMXMLApplication extends FlexJSTestBase { + @Ignore @Test + public void testFile() + { + String fileName = "wildcard_import"; + + IMXMLFileNode node = compileMXML(fileName, true, + "test-files/flexjs/files", false); + + mxmlBlockWalker.visitFile(node); + + //writeResultToFile(writer.toString(), fileName); + + assertOut(getCodeFromFile(fileName + "_result", true, "flexjs/files")); + } + + //@Test public void testFlexJSMainFile() { String fileName = "FlexJSTest_2013_03_11"; @@ -17,12 +34,12 @@ public class TestFlexJSMXMLApplication extends FlexJSTestBase mxmlBlockWalker.visitFile(node); - writeResultToFile(writer.toString(), fileName); // for external comparison + //writeResultToFile(writer.toString(), fileName); assertOut(getCodeFromFile(fileName + "_result", true, "flexjs/files")); } - @Test + //@Test public void testFlexJSInitialViewFile() { String fileName = "MyInitialView_2013_03_11"; @@ -32,7 +49,7 @@ public class TestFlexJSMXMLApplication extends FlexJSTestBase mxmlBlockWalker.visitFile(node); - writeResultToFile(writer.toString(), fileName); // for external comparison + //writeResultToFile(writer.toString(), fileName); assertOut(getCodeFromFile(fileName + "_result", true, "flexjs/files")); } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0fa98cfe/compiler.jx.tests/test-files/flexjs/files/wildcard_import.mxml ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/test-files/flexjs/files/wildcard_import.mxml b/compiler.jx.tests/test-files/flexjs/files/wildcard_import.mxml new file mode 100644 index 0000000..cafe2d0 --- /dev/null +++ b/compiler.jx.tests/test-files/flexjs/files/wildcard_import.mxml @@ -0,0 +1,18 @@ +<basic:Application xmlns:fx="http://ns.adobe.com/mxml/2009"; + xmlns:basic="library://ns.apache.org/flexjs/basic" + > + <fx:Script> + <![CDATA[ + + import org.apache.flex.html.staticControls.*; + + private function tmp():void + { + var myButton:Button; + + myButton = new Button(); + } + + ]]> + </fx:Script> +</basic:Application> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0fa98cfe/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 new file mode 100644 index 0000000..85f85db --- /dev/null +++ b/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js @@ -0,0 +1,82 @@ +goog.provide('wildcard_import'); + +goog.require('org.apache.flex.core.Application'); +goog.require('org.apache.flex.html.staticControls.Button'); + +/** + * @constructor + * @extends {org.apache.flex.core.Application} + */ +wildcard_import = function() { + goog.base(this); + + /** + * @private + * @type {Array} + */ + this.mxmldd; + + /** + * @private + * @type {Array} + */ + this.mxmldp; +}; +goog.inherits(wildcard_import, org.apache.flex.core.Application); + + +wildcard_import.prototype.tmp = function() { + var self = this; + var /** @type {Button} */ self.myButton; + self.myButton = new org.apache.flex.html.staticControls.Button(); +}; + +/** + * @override + * @this {wildcard_import} + * @return {Array} the Array of UI element descriptors. + */ +wildcard_import.prototype.get_MXMLDescriptor = function() +{ + if (this.mxmldd == undefined) + { + /** @type {Array} */ + var arr = goog.base(this, 'get_MXMLDescriptor'); + /** @type {Array} */ + var data = [ +]; + + if (arr) + this.mxmldd = arr.concat(data); + else + this.mxmldd = data; + } + return this.mxmldd; +}; + +/** + * @override + * @this {wildcard_import} + * @return {Array} the Array of UI element descriptors. + */ +wildcard_import.prototype.get_MXMLProperties = function() +{ + if (this.mxmldp == undefined) + { + /** @type {Array} */ + var arr = goog.base(this, 'get_MXMLProperties'); + /** @type {Array} */ + var data = [ +0, +0, +0 +]; + + if (arr) + this.mxmldp = arr.concat(data); + else + this.mxmldp = data; + } + return this.mxmldp; +}; + http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0fa98cfe/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 0531278..cdff146 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 @@ -87,8 +87,11 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements currentInstances = new ArrayList<MXMLDescriptorSpecifier>(); currentPropertySpecifiers = new ArrayList<MXMLDescriptorSpecifier>(); - isMainFile = !isMXMLContentNode((IMXMLPropertySpecifierNode) node - .getPropertySpecifierNodes()[0]); + isMainFile = true; + IMXMLPropertySpecifierNode[] propertySpecifierNodes = node + .getPropertySpecifierNodes(); + if (propertySpecifierNodes != null && propertySpecifierNodes.length > 0) + isMainFile = !isMXMLContentNode((IMXMLPropertySpecifierNode) propertySpecifierNodes[0]); eventCounter = 0; idCounter = 0; @@ -110,9 +113,9 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements } String cname = node.getFileNode().getName(); - + emitHeader(node); - + writeNewline(); writeNewline("/**"); writeNewline(" * @constructor"); @@ -123,7 +126,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements write(ASEmitterTokens.FUNCTION); write(ASEmitterTokens.PAREN_OPEN); writeToken(ASEmitterTokens.PAREN_CLOSE); - if (!isMainFile) + if (!isMainFile || propertySpecifierNodes == null) indentPush(); writeNewline(ASEmitterTokens.BLOCK_OPEN, true); write(JSGoogEmitterTokens.GOOG_BASE); @@ -188,7 +191,8 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements writeNewline(ASEmitterTokens.BLOCK_OPEN, true); writeNewline("var self = this;"); - writeNewline(event.value + ASEmitterTokens.SEMICOLON.getToken(), false); + writeNewline(event.value + ASEmitterTokens.SEMICOLON.getToken(), + false); write(ASEmitterTokens.BLOCK_CLOSE); writeNewline(";"); @@ -333,7 +337,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements .getASEmitter(); String indent = getIndent(getCurrentIndent()); - + StringBuilder sb = null; int len = node.getChildCount(); if (len > 0) @@ -547,7 +551,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements private void emitHeader(IMXMLDocumentNode node) { String cname = node.getFileNode().getName(); - + emitHeaderLine(cname, true); writeNewline(); emitHeaderLine(node.getBaseClassName()); @@ -570,7 +574,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements } } } - + private void emitHeaderLine(String qname) { emitHeaderLine(qname, false); @@ -600,7 +604,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements if (cnode.getValue() != null) getMXMLWalker().walk((IASNode) cnode); // Literal } - + private MXMLDescriptorSpecifier getCurrentDescriptor(String type) { MXMLDescriptorSpecifier currentDescriptor = null;
