fix a few issues after merging Erik's changes
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/123afb75 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/123afb75 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/123afb75 Branch: refs/heads/develop Commit: 123afb7587d1de2bf32af275bd584c995bf9390b Parents: feb25bf Author: Alex Harui <aha...@apache.org> Authored: Fri Apr 19 12:27:43 2013 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Fri Apr 19 12:27:43 2013 -0700 ---------------------------------------------------------------------- .../codegen/js/flexjs/TestFlexJSExpressions.java | 4 +- .../codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 40 ++++++++------- 2 files changed, 23 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/123afb75/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java index 56d0aef..8e6bd86 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java @@ -512,7 +512,7 @@ public class TestFlexJSExpressions extends TestGoogExpressions IFunctionNode.class, WRAP_LEVEL_PACKAGE, true); asBlockWalker.visitFunction(node); // String.length is a getter but is a property in JS, so don't generate set_length() call. - assertOut("/**\n * @expose\n * @return {number}\n */\nfoo.bar.B.prototype.b = function() {\n\tvar self = this;\n\tvar /** @type {Vector.<string>} */ a;\n\treturn a.length;\n}"); + assertOut("/**\n * @expose\n * @return {number}\n */\nfoo.bar.B.prototype.b = function() {\n\tvar /** @type {Vector.<string>} */ a;\n\treturn a.length;\n}"); } //---------------------------------- @@ -540,7 +540,7 @@ public class TestFlexJSExpressions extends TestGoogExpressions { IFunctionNode node = getMethod("function foo(b:Boolean):Boolean {var c:String; var d:String; if (!(b ? c : d)) { return b;}"); asBlockWalker.visitFunction(node); - assertOut("/**\n * @param {boolean} b\n * @return {boolean}\n */\nFalconTest_A.prototype.foo = function(b) {\n\tvar self = this;\n\tvar /** @type {string} */ c;\n\tvar /** @type {string} */ d;\n\tif (!(b ? c : d)) {\n\t\treturn b;\n\t}\n}"); + assertOut("/**\n * @param {boolean} b\n * @return {boolean}\n */\nFalconTest_A.prototype.foo = function(b) {\n\tvar /** @type {string} */ c;\n\tvar /** @type {string} */ d;\n\tif (!(b ? c : d)) {\n\t\treturn b;\n\t}\n}"); } @Override http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/123afb75/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 6e18b20..0f10cd8 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 @@ -630,29 +630,31 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements .getCompilationUnitForDefinition(cdef); ArrayList<String> deps = project.getRequires(cu); - for (String imp : deps) + if (deps != null) { - if (imp.indexOf(JSGoogEmitterTokens.AS3.getToken()) != -1) - continue; - - if (imp.equals(cname)) - continue; - - if (imp.equals("mx.events.PropertyChangeEvent")) - continue; - if (imp.equals("mx.events.PropertyChangeEventKind")) - continue; - - if (NativeUtils.isNative(imp)) - continue; - - if (writtenInstances.indexOf(imp) == -1) + for (String imp : deps) { - emitHeaderLine(imp); - writtenInstances.add(imp); + if (imp.indexOf(JSGoogEmitterTokens.AS3.getToken()) != -1) + continue; + + if (imp.equals(cname)) + continue; + + if (imp.equals("mx.events.PropertyChangeEvent")) + continue; + if (imp.equals("mx.events.PropertyChangeEventKind")) + continue; + + if (NativeUtils.isNative(imp)) + continue; + + if (writtenInstances.indexOf(imp) == -1) + { + emitHeaderLine(imp); + writtenInstances.add(imp); + } } } - } private void emitHeaderLine(String qname)