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:40:49 UTC
[5/5] git commit: [flex-falcon] [refs/heads/develop] - Quick commit
to keep get everything in the repo before Mike goes wild
Quick commit to keep get everything in the repo before Mike goes wild
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/2b06e1e9
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/2b06e1e9
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/2b06e1e9
Branch: refs/heads/develop
Commit: 2b06e1e9f743366aa8333e1b6ab10405b220b76f
Parents: 9b95414
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Sun May 31 19:39:40 2015 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sun May 31 19:40:31 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, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2b06e1e9/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 3385b47..8327fcf 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 (!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}");
+ 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}");
}
@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' + this.classInfo['E4XSelector'];\n}");
+ assertOut("if (options.includeReadOnly) {\n properties = 'E4XFilter' + classInfo['E4XSelector'];\n}");
}
@Test
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2b06e1e9/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 2a2e90b..3b4f464 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/2b06e1e9/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 e34f12d..d493d28 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/2b06e1e9/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 ee69d65..7c2330c 100644
--- a/compiler.jx.tests/test-files/vf2js/projects/super/Base.as
+++ b/compiler.jx.tests/test-files/vf2js/projects/super/Base.as
@@ -52,6 +52,8 @@ 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/2b06e1e9/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 b11193b..68d0cb6 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,7 +990,10 @@ public class JSVF2JSEmitter extends JSGoogEmitter implements IJSVF2JSEmitter
if (pfnode == null)
return false;
- return pfnode.getName().equals(node.getName());
+ String parentName = pfnode.getName();
+ String currentName = node.getName();
+
+ return parentName.equals(currentName);
}
//--------------------------------------------------------------------------
@@ -1359,8 +1362,6 @@ 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);
@@ -1373,8 +1374,6 @@ 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);