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/1422546c Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/1422546c Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/1422546c Branch: refs/heads/IDEA-FLEX_JS_COMPILER Commit: 1422546c5212149574fe92eb10077c9c62986f57 Parents: 4fa27ae Author: Erik de Bruin <e...@ixsoftware.nl> Authored: Sun May 31 19:47:38 2015 +0200 Committer: Frédéric THOMAS <webdoubl...@gmail.com> Committed: Tue Jun 2 13:41:07 2015 +0100 ---------------------------------------------------------------------- .../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/1422546c/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/1422546c/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/1422546c/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/1422546c/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/1422546c/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);
