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 2013/04/17 11:30:40 UTC
[3/4] git commit: [flex-falcon] - [FalconJX] made tests pass again
[FalconJX] made tests pass again
The previous commit (change class and method names on build in test code) broke a whole bunch of tests, as expected. Made them pass again.
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/43e7b640
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/43e7b640
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/43e7b640
Branch: refs/heads/develop
Commit: 43e7b6408d50ab192c0990a1d43422a138b8cf21
Parents: b356b8f
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Wed Apr 17 11:28:22 2013 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Wed Apr 17 11:28:22 2013 +0200
----------------------------------------------------------------------
.../internal/codegen/as/TestStatements.java | 2 +-
.../js/flexjs/TestFlexJSAccessorMembers.java | 20 ++--
.../codegen/js/flexjs/TestFlexJSAccessors.java | 8 +-
.../codegen/js/flexjs/TestFlexJSExpressions.java | 14 ++-
.../codegen/js/flexjs/TestFlexJSMethodMembers.java | 16 ++--
.../codegen/js/flexjs/TestFlexJSStatements.java | 2 +-
.../codegen/js/goog/TestGoogAccessorMembers.java | 20 ++--
.../internal/codegen/js/goog/TestGoogEmiter.java | 20 ++--
.../codegen/js/goog/TestGoogExpressions.java | 4 +-
.../codegen/js/goog/TestGoogFieldMembers.java | 80 +++++++++++----
.../codegen/js/goog/TestGoogGlobalClasses.java | 2 +-
.../codegen/js/goog/TestGoogGlobalConstants.java | 8 +-
.../codegen/js/goog/TestGoogMethodMembers.java | 35 ++++---
.../codegen/js/goog/TestGoogStatements.java | 2 +-
14 files changed, 138 insertions(+), 95 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/43e7b640/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestStatements.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestStatements.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestStatements.java
index 6b6c900..d2b6333 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestStatements.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/as/TestStatements.java
@@ -451,6 +451,6 @@ public class TestStatements extends ASTestBase
+ "foo: for each(var i:int in obj) break foo;",
IFileNode.class);
asBlockWalker.visitFile(node);
- assertOut("package {\n\tpublic class A {\n\t\tfunction a():void {\n\t\t\ttry {\n\t\t\t\ta;\n\t\t\t} catch (e:Error) {\n\t\t\t\tif (a) {\n\t\t\t\t\tif (b) {\n\t\t\t\t\t\tif (c)\n\t\t\t\t\t\t\tb;\n\t\t\t\t\t\telse if (f)\n\t\t\t\t\t\t\ta;\n\t\t\t\t\t\telse\n\t\t\t\t\t\t\te;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t} finally {\n\t\t\t}\n\t\t\tif (d)\n\t\t\t\tfor (var i:int = 0; i < len; i++)\n\t\t\t\t\tbreak;\n\t\t\tif (a) {\n\t\t\t\twith (ab) {\n\t\t\t\t\tc();\n\t\t\t\t}\n\t\t\t\tdo {\n\t\t\t\t\ta++;\n\t\t\t\t\tdo\n\t\t\t\t\t\ta++;\n\t\t\t\t\twhile (a > b);\n\t\t\t\t} while (c > d);\n\t\t\t}\n\t\t\tif (b) {\n\t\t\t\ttry {\n\t\t\t\t\ta;\n\t\t\t\t\tthrow new Error('foo');\n\t\t\t\t} catch (e:Error) {\n\t\t\t\t\tswitch (i) {\n\t\t\t\t\t\tcase 1:\n\t\t\t\t\t\t\tbreak;\n\t\t\t\t\t\tdefault:\n\t\t\t\t\t\t\treturn;\n\t\t\t\t\t}\n\t\t\t\t} catch (f:Error) {\n\t\t\t\t\tc;\n\t\t\t\t\teee.dd;\n\t\t\t\t} finally {\n\t\t\t\t\td;\n\t\t\t\t\tvar a:Object = function(foo:int, bar:String = 'goo'):int {\n
\t\t\t\t\t\treturn -1;\n\t\t\t\t\t};\n\t\t\t\t\teee.dd;\n\t\t\t\t\teee.dd;\n\t\t\t\t\teee.dd;\n\t\t\t\t\teee.dd;\n\t\t\t\t}\n\t\t\t}\n\t\t\tfoo : for each (var i:int in obj)\n\t\t\t\tbreak foo;;\n\t}\n}\n}");
+ assertOut("package {\n\tpublic class FalconTest_A {\n\t\tfunction falconTest_a():void {\n\t\t\ttry {\n\t\t\t\ta;\n\t\t\t} catch (e:Error) {\n\t\t\t\tif (a) {\n\t\t\t\t\tif (b) {\n\t\t\t\t\t\tif (c)\n\t\t\t\t\t\t\tb;\n\t\t\t\t\t\telse if (f)\n\t\t\t\t\t\t\ta;\n\t\t\t\t\t\telse\n\t\t\t\t\t\t\te;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t} finally {\n\t\t\t}\n\t\t\tif (d)\n\t\t\t\tfor (var i:int = 0; i < len; i++)\n\t\t\t\t\tbreak;\n\t\t\tif (a) {\n\t\t\t\twith (ab) {\n\t\t\t\t\tc();\n\t\t\t\t}\n\t\t\t\tdo {\n\t\t\t\t\ta++;\n\t\t\t\t\tdo\n\t\t\t\t\t\ta++;\n\t\t\t\t\twhile (a > b);\n\t\t\t\t} while (c > d);\n\t\t\t}\n\t\t\tif (b) {\n\t\t\t\ttry {\n\t\t\t\t\ta;\n\t\t\t\t\tthrow new Error('foo');\n\t\t\t\t} catch (e:Error) {\n\t\t\t\t\tswitch (i) {\n\t\t\t\t\t\tcase 1:\n\t\t\t\t\t\t\tbreak;\n\t\t\t\t\t\tdefault:\n\t\t\t\t\t\t\treturn;\n\t\t\t\t\t}\n\t\t\t\t} catch (f:Error) {\n\t\t\t\t\tc;\n\t\t\t\t\teee.dd;\n\t\t\t\t} finally {\n\t\t\t\t\td;\n\t\t\t\t\tvar a:Object = function(foo:int, bar:S
tring = 'goo'):int {\n\t\t\t\t\t\treturn -1;\n\t\t\t\t\t};\n\t\t\t\t\teee.dd;\n\t\t\t\t\teee.dd;\n\t\t\t\t\teee.dd;\n\t\t\t\t\teee.dd;\n\t\t\t\t}\n\t\t\t}\n\t\t\tfoo : for each (var i:int in obj)\n\t\t\t\tbreak foo;;\n\t}\n}\n}");
}
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/43e7b640/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSAccessorMembers.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSAccessorMembers.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSAccessorMembers.java
index b58543f..0186e55 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSAccessorMembers.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSAccessorMembers.java
@@ -37,7 +37,7 @@ public class TestFlexJSAccessorMembers extends TestGoogAccessorMembers
{
IGetterNode node = (IGetterNode) getAccessor("function get foo():int{}");
asBlockWalker.visitGetter(node);
- assertOut("/**\n * @return {number}\n */\nA.prototype.get_foo = function() {\n}");
+ assertOut("/**\n * @return {number}\n */\nFalconTest_A.prototype.get_foo = function() {\n}");
}
@Override
@@ -46,7 +46,7 @@ public class TestFlexJSAccessorMembers extends TestGoogAccessorMembers
{
IGetterNode node = (IGetterNode) getAccessor("function get foo():int{return -1;}");
asBlockWalker.visitGetter(node);
- assertOut("/**\n * @return {number}\n */\nA.prototype.get_foo = function() {\n\tvar self = this;\n\treturn -1;\n}");
+ assertOut("/**\n * @return {number}\n */\nFalconTest_A.prototype.get_foo = function() {\n\tvar self = this;\n\treturn -1;\n}");
}
@Override
@@ -55,7 +55,7 @@ public class TestFlexJSAccessorMembers extends TestGoogAccessorMembers
{
IGetterNode node = (IGetterNode) getAccessor("public function get foo():int{return -1;}");
asBlockWalker.visitGetter(node);
- assertOut("/**\n * @expose\n * @return {number}\n */\nA.prototype.get_foo = function() {\n\tvar self = this;\n\treturn -1;\n}");
+ assertOut("/**\n * @expose\n * @return {number}\n */\nFalconTest_A.prototype.get_foo = function() {\n\tvar self = this;\n\treturn -1;\n}");
}
@Override
@@ -64,7 +64,7 @@ public class TestFlexJSAccessorMembers extends TestGoogAccessorMembers
{
IGetterNode node = (IGetterNode) getAccessor("public override function get foo():int{super.foo(); return -1;}");
asBlockWalker.visitGetter(node);
- assertOut("/**\n * @expose\n * @return {number}\n * @override\n */\nA.prototype.get_foo = function() {\n\tvar self = this;\n\tgoog.base(this, 'get_foo');\n\treturn -1;\n}");
+ assertOut("/**\n * @expose\n * @return {number}\n * @override\n */\nFalconTest_A.prototype.get_foo = function() {\n\tvar self = this;\n\tgoog.base(this, 'get_foo');\n\treturn -1;\n}");
}
@Override
@@ -73,7 +73,7 @@ public class TestFlexJSAccessorMembers extends TestGoogAccessorMembers
{
IGetterNode node = (IGetterNode) getAccessor("public static function get foo():int{return -1;}");
asBlockWalker.visitGetter(node);
- assertOut("/**\n * @expose\n * @return {number}\n */\nA.get_foo = function() {\n\treturn -1;\n}");
+ assertOut("/**\n * @expose\n * @return {number}\n */\nFalconTest_A.get_foo = function() {\n\treturn -1;\n}");
}
@Override
@@ -82,7 +82,7 @@ public class TestFlexJSAccessorMembers extends TestGoogAccessorMembers
{
ISetterNode node = (ISetterNode) getAccessor("function set foo(value:int):void{}");
asBlockWalker.visitSetter(node);
- assertOut("/**\n * @param {number} value\n */\nA.prototype.set_foo = function(value) {\n}");
+ assertOut("/**\n * @param {number} value\n */\nFalconTest_A.prototype.set_foo = function(value) {\n}");
}
@Override
@@ -91,7 +91,7 @@ public class TestFlexJSAccessorMembers extends TestGoogAccessorMembers
{
ISetterNode node = (ISetterNode) getAccessor("function set foo(value:int):void{fetch('haai');}");
asBlockWalker.visitSetter(node);
- assertOut("/**\n * @param {number} value\n */\nA.prototype.set_foo = function(value) {\n\tvar self = this;\n\tfetch('haai');\n}");
+ assertOut("/**\n * @param {number} value\n */\nFalconTest_A.prototype.set_foo = function(value) {\n\tvar self = this;\n\tfetch('haai');\n}");
}
@Override
@@ -100,7 +100,7 @@ public class TestFlexJSAccessorMembers extends TestGoogAccessorMembers
{
ISetterNode node = (ISetterNode) getAccessor("public function set foo(value:int):void{}");
asBlockWalker.visitSetter(node);
- assertOut("/**\n * @expose\n * @param {number} value\n */\nA.prototype.set_foo = function(value) {\n}");
+ assertOut("/**\n * @expose\n * @param {number} value\n */\nFalconTest_A.prototype.set_foo = function(value) {\n}");
}
@Override
@@ -109,7 +109,7 @@ public class TestFlexJSAccessorMembers extends TestGoogAccessorMembers
{
ISetterNode node = (ISetterNode) getAccessor("public override function set foo(value:int):void{super.foo();}");
asBlockWalker.visitSetter(node);
- assertOut("/**\n * @expose\n * @param {number} value\n * @override\n */\nA.prototype.set_foo = function(value) {\n\tvar self = this;\n\tgoog.base(this, 'set_foo');\n}");
+ assertOut("/**\n * @expose\n * @param {number} value\n * @override\n */\nFalconTest_A.prototype.set_foo = function(value) {\n\tvar self = this;\n\tgoog.base(this, 'set_foo');\n}");
}
@Override
@@ -118,7 +118,7 @@ public class TestFlexJSAccessorMembers extends TestGoogAccessorMembers
{
ISetterNode node = (ISetterNode) getAccessor("public static function set foo(value:int):void{}");
asBlockWalker.visitSetter(node);
- assertOut("/**\n * @expose\n * @param {number} value\n */\nA.set_foo = function(value) {\n}");
+ assertOut("/**\n * @expose\n * @param {number} value\n */\nFalconTest_A.set_foo = function(value) {\n}");
}
@Override
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/43e7b640/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSAccessors.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSAccessors.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSAccessors.java
index fb13a9e..0651577 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSAccessors.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSAccessors.java
@@ -35,10 +35,10 @@ public class TestFlexJSAccessors extends ASTestBase
public void testGetAndSetAccessor()
{
IClassNode node = (IClassNode) getNode(
- "public function A() {}; public function doStuff():void {label = 'hello, bye'; var theLabel:String = label;}; private var _label:String; public function get label():String {return _label}; public function set label(value:String):void {_label = value}; ",
+ "public function doStuff():void {label = 'hello, bye'; var theLabel:String = label;}; private var _label:String; public function get label():String {return _label}; public function set label(value:String):void {_label = value}; ",
IClassNode.class, WRAP_LEVEL_CLASS);
asBlockWalker.visitClass(node);
- String expected = "/**\n * @constructor\n */\nA = function() {\n};\n\nA.prototype.doStuff = function() {\n\tvar self = this;\n\tset_label('hello, bye');\n\tvar /** @type {string} */ theLabel = get_label();\n};\n\n/**\n * @private\n * @type {string}\n */\nA.prototype._label;\n\n/**\n * @expose\n * @return {string}\n */\nA.prototype.get_label = function() {\n\tvar self = this;\n\treturn _label;\n};\n\n/**\n * @expose\n * @param {string} value\n */\nA.prototype.set_label = function(value) {\n\tvar self = this;\n\t_label = value;\n};";
+ String expected = "/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\nFalconTest_A.prototype.doStuff = function() {\n\tvar self = this;\n\tset_label('hello, bye');\n\tvar /** @type {string} */ theLabel = get_label();\n};\n\n/**\n * @private\n * @type {string}\n */\nFalconTest_A.prototype._label;\n\n/**\n * @expose\n * @return {string}\n */\nFalconTest_A.prototype.get_label = function() {\n\tvar self = this;\n\treturn _label;\n};\n\n/**\n * @expose\n * @param {string} value\n */\nFalconTest_A.prototype.set_label = function(value) {\n\tvar self = this;\n\t_label = value;\n};";
assertOut(expected);
}
@@ -57,10 +57,10 @@ public class TestFlexJSAccessors extends ASTestBase
public void testSetAccessorWithCompoundRightSide()
{
IClassNode node = (IClassNode) getNode(
- "public function A() {}; public function doStuff():void {label = label + 'bye'; var theLabel:String = label;}; private var _label:String; public function get label():String {return _label}; public function set label(value:String):void {_label = value}; ",
+ "public function doStuff():void {label = label + 'bye'; var theLabel:String = label;}; private var _label:String; public function get label():String {return _label}; public function set label(value:String):void {_label = value}; ",
IClassNode.class, WRAP_LEVEL_CLASS);
asBlockWalker.visitClass(node);
- String expected = "/**\n * @constructor\n */\nA = function() {\n};\n\nA.prototype.doStuff = function() {\n\tvar self = this;\n\tset_label(get_label() + 'bye');\n\tvar /** @type {string} */ theLabel = get_label();\n};\n\n/**\n * @private\n * @type {string}\n */\nA.prototype._label;\n\n/**\n * @expose\n * @return {string}\n */\nA.prototype.get_label = function() {\n\tvar self = this;\n\treturn _label;\n};\n\n/**\n * @expose\n * @param {string} value\n */\nA.prototype.set_label = function(value) {\n\tvar self = this;\n\t_label = value;\n};";
+ String expected = "/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\nFalconTest_A.prototype.doStuff = function() {\n\tvar self = this;\n\tset_label(get_label() + 'bye');\n\tvar /** @type {string} */ theLabel = get_label();\n};\n\n/**\n * @private\n * @type {string}\n */\nFalconTest_A.prototype._label;\n\n/**\n * @expose\n * @return {string}\n */\nFalconTest_A.prototype.get_label = function() {\n\tvar self = this;\n\treturn _label;\n};\n\n/**\n * @expose\n * @param {string} value\n */\nFalconTest_A.prototype.set_label = function(value) {\n\tvar self = this;\n\t_label = value;\n};";
assertOut(expected);
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/43e7b640/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 9f613b4..282449a 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
@@ -22,7 +22,9 @@ package org.apache.flex.compiler.internal.codegen.js.flexjs;
import org.apache.flex.compiler.driver.IBackend;
import org.apache.flex.compiler.internal.codegen.js.goog.TestGoogExpressions;
import org.apache.flex.compiler.internal.driver.js.flexjs.FlexJSBackend;
+import org.apache.flex.compiler.internal.tree.as.ClassNode;
import org.apache.flex.compiler.tree.as.IBinaryOperatorNode;
+import org.apache.flex.compiler.tree.as.IClassNode;
import org.apache.flex.compiler.tree.as.IFunctionNode;
import org.apache.flex.compiler.tree.as.IMemberAccessExpressionNode;
import org.junit.Test;
@@ -71,7 +73,7 @@ public class TestFlexJSExpressions extends TestGoogExpressions
{
IFunctionNode node = getMethod("function foo(){if (a) super.foo();}");
asBlockWalker.visitFunction(node);
- assertOut("A.prototype.foo = function() {\n\tvar self = this;\n\tif (a)\n\t\tgoog.base(this, 'foo');\n}");
+ assertOut("FalconTest_A.prototype.foo = function() {\n\tvar self = this;\n\tif (a)\n\t\tgoog.base(this, 'foo');\n}");
}
@Override
@@ -80,7 +82,7 @@ public class TestFlexJSExpressions extends TestGoogExpressions
{
IFunctionNode node = getMethod("function foo(){if (a) super.foo(a, b, c);}");
asBlockWalker.visitFunction(node);
- assertOut("A.prototype.foo = function() {\n\tvar self = this;\n\tif (a)\n\t\tgoog.base(this, 'foo', a, b, c);\n}");
+ assertOut("FalconTest_A.prototype.foo = function() {\n\tvar self = this;\n\tif (a)\n\t\tgoog.base(this, 'foo', a, b, c);\n}");
}
//----------------------------------
@@ -499,9 +501,9 @@ public class TestFlexJSExpressions extends TestGoogExpressions
@Test
public void testClassCast()
{
- IFunctionNode node = getMethod("function foo(){A(b).text = '';}");
- asBlockWalker.visitFunction(node);
- assertOut("A.prototype.foo = function() {\n\tvar self = this;\n\tb/** Cast to A */.text = '';\n}");
+ IClassNode node = (IClassNode) getNode("import spark.components.Button; public class B implements Button { public function B() { Button(b).label = ''; } }", ClassNode.class, WRAP_LEVEL_PACKAGE);
+ asBlockWalker.visitClass(node);
+ assertOut("/**\n * @constructor\n * @implements {spark.components.Button}\n */\nB = function() {\n\tvar self = this;\n\tb/** Cast to spark.components.Button */.set_label('');\n};");
}
@Test
@@ -509,7 +511,7 @@ public class TestFlexJSExpressions extends TestGoogExpressions
{
IFunctionNode node = getMethod("function foo(){bar(b).text = '';}");
asBlockWalker.visitFunction(node);
- assertOut("A.prototype.foo = function() {\n\tvar self = this;\n\tbar(b).text = '';\n}");
+ assertOut("FalconTest_A.prototype.foo = function() {\n\tvar self = this;\n\tbar(b).text = '';\n}");
}
@Override
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/43e7b640/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSMethodMembers.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSMethodMembers.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSMethodMembers.java
index c6b3560..0e7b9a6 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSMethodMembers.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSMethodMembers.java
@@ -39,9 +39,9 @@ public class TestFlexJSMethodMembers extends TestGoogMethodMembers
@Test
public void testConstructor_withThisInBody()
{
- IFunctionNode node = getMethod("public function A(){this.foo;};");
+ IFunctionNode node = getMethod("public function FalconTest_A(){this.foo;};");
asBlockWalker.visitFunction(node);
- assertOut("/**\n * @constructor\n */\nA = function() {\n\tvar self = this;\n\tfoo;\n}");
+ assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n\tvar self = this;\n\tfoo;\n}");
}
@Override
@@ -50,7 +50,7 @@ public class TestFlexJSMethodMembers extends TestGoogMethodMembers
{
IFunctionNode node = getMethod("function foo(){this.foo;}");
asBlockWalker.visitFunction(node);
- assertOut("/**\n * @this {A}\n */\nA.prototype.foo = function() {\n\tvar self = this;\n\tfoo;\n}");
+ assertOut("/**\n * @this {FalconTest_A}\n */\nFalconTest_A.prototype.foo = function() {\n\tvar self = this;\n\tfoo;\n}");
}
@Override
@@ -59,7 +59,7 @@ public class TestFlexJSMethodMembers extends TestGoogMethodMembers
{
IFunctionNode node = getMethod("function foo(){if(true){while(i){this.bar(42);}}}");
asBlockWalker.visitFunction(node);
- assertOut("/**\n * @this {A}\n */\nA.prototype.foo = function() {\n\tvar self = this;\n\tif (true) "
+ assertOut("/**\n * @this {FalconTest_A}\n */\nFalconTest_A.prototype.foo = function() {\n\tvar self = this;\n\tif (true) "
+ "{\n\t\twhile (i) {\n\t\t\tbar(42);\n\t\t}\n\t}\n}");
}
@@ -70,7 +70,7 @@ public class TestFlexJSMethodMembers extends TestGoogMethodMembers
IFunctionNode node = getMethod("public function foo(bar:String, baz:int = null):int{\treturn -1;}");
asBlockWalker.visitFunction(node);
// we ignore the 'public' namespace completely
- assertOut("/**\n * @expose\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nA.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
+ assertOut("/**\n * @expose\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nFalconTest_A.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
}
@Override
@@ -82,7 +82,7 @@ public class TestFlexJSMethodMembers extends TestGoogMethodMembers
// (erikdebruin) here we actually DO want to declare the method
// directly on the 'class' constructor instead of the
// prototype!
- assertOut("/**\n * @expose\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nA.foo = function(bar, baz) {\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
+ assertOut("/**\n * @expose\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nFalconTest_A.foo = function(bar, baz) {\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
}
@Override
@@ -91,7 +91,7 @@ public class TestFlexJSMethodMembers extends TestGoogMethodMembers
{
IFunctionNode node = getMethod("public override function foo(bar:String, baz:int = null):int{\treturn -1;}");
asBlockWalker.visitFunction(node);
- assertOut("/**\n * @expose\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n * @override\n */\nA.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
+ assertOut("/**\n * @expose\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n * @override\n */\nFalconTest_A.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
}
@Override
@@ -100,7 +100,7 @@ public class TestFlexJSMethodMembers extends TestGoogMethodMembers
{
IFunctionNode node = getMethod("override public function foo(bar:String, baz:int = null):int{return -1;}");
asBlockWalker.visitFunction(node);
- assertOut("/**\n * @expose\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n * @override\n */\nA.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
+ assertOut("/**\n * @expose\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n * @override\n */\nFalconTest_A.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
}
@Override
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/43e7b640/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSStatements.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSStatements.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSStatements.java
index 6b6a2d3..cd9fff7 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSStatements.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSStatements.java
@@ -111,7 +111,7 @@ public class TestFlexJSStatements extends TestGoogStatements
+ "foo: for each(var i:int in obj) break foo;",
IFileNode.class);
asBlockWalker.visitFile(node);
- assertOut("goog.provide('A');\n\n/**\n * @constructor\n */\nA = function() {\n};\n\nA.prototype.a = function() {\n\tvar self = this;\n\ttry {\n\t\ta;\n\t} catch (e) {\n\t\tif (a) {\n\t\t\tif (b) {\n\t\t\t\tif (c)\n\t\t\t\t\tb;\n\t\t\t\telse if (f)\n\t\t\t\t\ta;\n\t\t\t\telse\n\t\t\t\t\te;\n\t\t\t}\n\t\t}\n\t} finally {\n\t}\n\tif (d)\n\t\tfor (var /** @type {number} */ i = 0; i < len; i++)\n\t\t\tbreak;\n\tif (a) {\n\t\twith (ab) {\n\t\t\tc();\n\t\t}\n\t\tdo {\n\t\t\ta++;\n\t\t\tdo\n\t\t\t\ta++;\n\t\t\twhile (a > b);\n\t\t} while (c > d);\n\t}\n\tif (b) {\n\t\ttry {\n\t\t\ta;\n\t\t\tthrow new Error('foo');\n\t\t} catch (e) {\n\t\t\tswitch (i) {\n\t\t\t\tcase 1:\n\t\t\t\t\tbreak;\n\t\t\t\tdefault:\n\t\t\t\t\treturn;\n\t\t\t}\n\t\t} finally {\n\t\t\td;\n\t\t\tvar /** @type {Object} */ a = function(foo, bar) {\n\t\t\t\tbar = typeof bar !== 'undefined' ? bar : 'goo';\n\t\t\t\treturn -1;\n\t\t\t};\n\t\t\teee.dd;\n\t\t\teee.dd;\n\t\t\teee.dd;\n\t\t\teee.dd;\n\t\t}\n\t}\n\tfoo : fo
r (var foreachiter0 in obj) \n\t{\n\tvar i = obj[foreachiter0];\n\t\n\t\tbreak foo;}\n\t;\n};");
+ assertOut("goog.provide('FalconTest_A');\n\n/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\nFalconTest_A.prototype.falconTest_a = function() {\n\tvar self = this;\n\ttry {\n\t\ta;\n\t} catch (e) {\n\t\tif (a) {\n\t\t\tif (b) {\n\t\t\t\tif (c)\n\t\t\t\t\tb;\n\t\t\t\telse if (f)\n\t\t\t\t\ta;\n\t\t\t\telse\n\t\t\t\t\te;\n\t\t\t}\n\t\t}\n\t} finally {\n\t}\n\tif (d)\n\t\tfor (var /** @type {number} */ i = 0; i < len; i++)\n\t\t\tbreak;\n\tif (a) {\n\t\twith (ab) {\n\t\t\tc();\n\t\t}\n\t\tdo {\n\t\t\ta++;\n\t\t\tdo\n\t\t\t\ta++;\n\t\t\twhile (a > b);\n\t\t} while (c > d);\n\t}\n\tif (b) {\n\t\ttry {\n\t\t\ta;\n\t\t\tthrow new Error('foo');\n\t\t} catch (e) {\n\t\t\tswitch (i) {\n\t\t\t\tcase 1:\n\t\t\t\t\tbreak;\n\t\t\t\tdefault:\n\t\t\t\t\treturn;\n\t\t\t}\n\t\t} finally {\n\t\t\td;\n\t\t\tvar /** @type {Object} */ a = function(foo, bar) {\n\t\t\t\tbar = typeof bar !== 'undefined' ? bar : 'goo';\n\t\t\t\treturn -1;\n\t\t\t};\n\t\t\teee.dd;\n\t\t\teee.dd;\n\t\t\tee
e.dd;\n\t\t\teee.dd;\n\t\t}\n\t}\n\tfoo : for (var foreachiter0 in obj) \n\t{\n\tvar i = obj[foreachiter0];\n\t\n\t\tbreak foo;}\n\t;\n};");
}
@Override
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/43e7b640/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogAccessorMembers.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogAccessorMembers.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogAccessorMembers.java
index 128a2e7..c8375cf 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogAccessorMembers.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogAccessorMembers.java
@@ -41,7 +41,7 @@ public class TestGoogAccessorMembers extends TestAccessorMembers
{
IGetterNode node = (IGetterNode) getAccessor("function get foo():int{}");
asBlockWalker.visitGetter(node);
- assertOut("Object.defineProperty(\n\tA.prototype, \n\t'foo', "
+ assertOut("Object.defineProperty(\n\tFalconTest_A.prototype, \n\t'foo', "
+ "\n\t{get:function() {\n\t}, configurable:true}\n)");
}
@@ -50,7 +50,7 @@ public class TestGoogAccessorMembers extends TestAccessorMembers
{
IGetterNode node = (IGetterNode) getAccessor("function get foo():int{return -1;}");
asBlockWalker.visitGetter(node);
- assertOut("Object.defineProperty(\n\tA.prototype, \n\t'foo', "
+ assertOut("Object.defineProperty(\n\tFalconTest_A.prototype, \n\t'foo', "
+ "\n\t{get:function() {\n\t\tvar self = this;\n\t\treturn -1;\n\t}, configurable:true}\n)");
}
@@ -60,7 +60,7 @@ public class TestGoogAccessorMembers extends TestAccessorMembers
{
IGetterNode node = (IGetterNode) getAccessor("public function get foo():int{return -1;}");
asBlockWalker.visitGetter(node);
- assertOut("Object.defineProperty(\n\tA.prototype, \n\t'foo', "
+ assertOut("Object.defineProperty(\n\tFalconTest_A.prototype, \n\t'foo', "
+ "\n\t{get:function() {\n\t\tvar self = this;\n\t\treturn -1;\n\t}, configurable:true}\n)");
}
@@ -73,7 +73,7 @@ public class TestGoogAccessorMembers extends TestAccessorMembers
// anonymous function... goog.bind or goog.partial?
IGetterNode node = (IGetterNode) getAccessor("public override function get foo():int{super.foo(); return -1;}");
asBlockWalker.visitGetter(node);
- assertOut("Object.defineProperty(\n\tA.prototype, \n\t'foo', \n\t{get:function() {\n\t\tvar self = this;\n\t\tgoog.base(this, 'foo');\n\t\treturn -1;\n\t}, configurable:true}\n)");
+ assertOut("Object.defineProperty(\n\tFalconTest_A.prototype, \n\t'foo', \n\t{get:function() {\n\t\tvar self = this;\n\t\tgoog.base(this, 'foo');\n\t\treturn -1;\n\t}, configurable:true}\n)");
}
@Override
@@ -82,7 +82,7 @@ public class TestGoogAccessorMembers extends TestAccessorMembers
{
IGetterNode node = (IGetterNode) getAccessor("public static function get foo():int{return -1;}");
asBlockWalker.visitGetter(node);
- assertOut("Object.defineProperty(\n\tA, \n\t'foo', \n\t{get:function() {\n\t\treturn -1;\n\t}, configurable:true}\n)");
+ assertOut("Object.defineProperty(\n\tFalconTest_A, \n\t'foo', \n\t{get:function() {\n\t\treturn -1;\n\t}, configurable:true}\n)");
}
@Override
@@ -91,7 +91,7 @@ public class TestGoogAccessorMembers extends TestAccessorMembers
{
ISetterNode node = (ISetterNode) getAccessor("function set foo(value:int):void{}");
asBlockWalker.visitSetter(node);
- assertOut("Object.defineProperty(\n\tA.prototype, \n\t'foo', \n\t{set:function(value)"
+ assertOut("Object.defineProperty(\n\tFalconTest_A.prototype, \n\t'foo', \n\t{set:function(value)"
+ " {\n\t}, configurable:true}\n)");
}
@@ -100,7 +100,7 @@ public class TestGoogAccessorMembers extends TestAccessorMembers
{
ISetterNode node = (ISetterNode) getAccessor("function set foo(value:int):void{trace('haai');}");
asBlockWalker.visitSetter(node);
- assertOut("Object.defineProperty(\n\tA.prototype, \n\t'foo', "
+ assertOut("Object.defineProperty(\n\tFalconTest_A.prototype, \n\t'foo', "
+ "\n\t{set:function(value) {\n\t\tvar self = this;\n\t\ttrace('haai');\n\t}, configurable:true}\n)");
}
@@ -110,7 +110,7 @@ public class TestGoogAccessorMembers extends TestAccessorMembers
{
ISetterNode node = (ISetterNode) getAccessor("public function set foo(value:int):void{}");
asBlockWalker.visitSetter(node);
- assertOut("Object.defineProperty(\n\tA.prototype, \n\t'foo', \n\t{set:function(value)"
+ assertOut("Object.defineProperty(\n\tFalconTest_A.prototype, \n\t'foo', \n\t{set:function(value)"
+ " {\n\t}, configurable:true}\n)");
}
@@ -121,7 +121,7 @@ public class TestGoogAccessorMembers extends TestAccessorMembers
// TODO (erikdebruin) see: testGetAccessor_withNamespaceOverride
ISetterNode node = (ISetterNode) getAccessor("public override function set foo(value:int):void{super.foo();}");
asBlockWalker.visitSetter(node);
- assertOut("Object.defineProperty(\n\tA.prototype, \n\t'foo', \n\t{set:function(value) {\n\t\tvar self = this;\n\t\tgoog.base(this, 'foo');\n\t}, configurable:true}\n)");
+ assertOut("Object.defineProperty(\n\tFalconTest_A.prototype, \n\t'foo', \n\t{set:function(value) {\n\t\tvar self = this;\n\t\tgoog.base(this, 'foo');\n\t}, configurable:true}\n)");
}
@Override
@@ -130,7 +130,7 @@ public class TestGoogAccessorMembers extends TestAccessorMembers
{
ISetterNode node = (ISetterNode) getAccessor("public static function set foo(value:int):void{}");
asBlockWalker.visitSetter(node);
- assertOut("Object.defineProperty(\n\tA, \n\t'foo', \n\t{set:function(value) {\n\t}, configurable:true}\n)");
+ assertOut("Object.defineProperty(\n\tFalconTest_A, \n\t'foo', \n\t{set:function(value) {\n\t}, configurable:true}\n)");
}
@Override
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/43e7b640/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogEmiter.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogEmiter.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogEmiter.java
index 8a6ca10..97c8443 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogEmiter.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogEmiter.java
@@ -80,7 +80,7 @@ public class TestGoogEmiter extends ASTestBase
{
IFunctionNode node = getMethod("function method1():void{\n}");
asBlockWalker.visitFunction(node);
- assertOut("A.prototype.method1 = function() {\n}");
+ assertOut("FalconTest_A.prototype.method1 = function() {\n}");
}
@Test
@@ -89,25 +89,25 @@ public class TestGoogEmiter extends ASTestBase
IFunctionNode node = getMethodWithPackage("function method1(bar:int):int{\n}");
asBlockWalker.visitFunction(node);
assertOut("/**\n * @param {number} bar\n * @return {number}\n */\n"
- + "foo.bar.A.prototype.method1 = function(bar) {\n}");
+ + "foo.bar.FalconTest_A.prototype.method1 = function(bar) {\n}");
}
@Test
public void testSimpleMultipleParameter()
{
- IFunctionNode node = getMethodWithPackage("function method1(bar:int, baz:String, goo:A):void{\n}");
+ IFunctionNode node = getMethodWithPackage("function method1(bar:int, baz:String, goo:Array):void{\n}");
asBlockWalker.visitFunction(node);
- assertOut("/**\n * @param {number} bar\n * @param {string} baz\n * @param {foo.bar.A} goo\n */\n"
- + "foo.bar.A.prototype.method1 = function(bar, baz, goo) {\n}");
+ assertOut("/**\n * @param {number} bar\n * @param {string} baz\n * @param {Array} goo\n */\n"
+ + "foo.bar.FalconTest_A.prototype.method1 = function(bar, baz, goo) {\n}");
}
@Test
public void testSimpleMultipleParameter_JSDoc()
{
- IFunctionNode node = getMethodWithPackage("function method1(bar:int, baz:String, goo:A):void{\n}");
+ IFunctionNode node = getMethodWithPackage("function method1(bar:int, baz:String, goo:Array):void{\n}");
asBlockWalker.visitFunction(node);
- assertOut("/**\n * @param {number} bar\n * @param {string} baz\n * @param {foo.bar.A} goo\n */\n"
- + "foo.bar.A.prototype.method1 = function(bar, baz, goo) {\n}");
+ assertOut("/**\n * @param {number} bar\n * @param {string} baz\n * @param {Array} goo\n */\n"
+ + "foo.bar.FalconTest_A.prototype.method1 = function(bar, baz, goo) {\n}");
}
// XXX (mschmalle) () get back to this when more work is done
@@ -131,7 +131,7 @@ public class TestGoogEmiter extends ASTestBase
IFunctionNode node = getMethodWithPackage("function method1(bar:int = 42, bax:int = 4):void{if (a) foo();}");
asBlockWalker.visitFunction(node);
assertOut("/**\n * @param {number=} bar\n * @param {number=} bax\n */\n"
- + "foo.bar.A.prototype.method1 = function(bar, bax) {\n"
+ + "foo.bar.FalconTest_A.prototype.method1 = function(bar, bax) {\n"
+ "\tvar self = this;\n"
+ "\tbar = typeof bar !== 'undefined' ? bar : 42;\n"
+ "\tbax = typeof bax !== 'undefined' ? bax : 4;\n"
@@ -144,7 +144,7 @@ public class TestGoogEmiter extends ASTestBase
IFunctionNode node = getMethodWithPackage("function method1(p1:int, p2:int, p3:int = 3, p4:int = 4):int{}");
asBlockWalker.visitFunction(node);
assertOut("/**\n * @param {number} p1\n * @param {number} p2\n * @param {number=} p3\n * @param {number=} p4\n * @return {number}\n */\n"
- + "foo.bar.A.prototype.method1 = function(p1, p2, p3, p4) {\n"
+ + "foo.bar.FalconTest_A.prototype.method1 = function(p1, p2, p3, p4) {\n"
+ "\tp3 = typeof p3 !== 'undefined' ? p3 : 3;\n"
+ "\tp4 = typeof p4 !== 'undefined' ? p4 : 4;\n}");
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/43e7b640/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogExpressions.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogExpressions.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogExpressions.java
index 5c7a5da..3938737 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogExpressions.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogExpressions.java
@@ -41,7 +41,7 @@ public class TestGoogExpressions extends TestExpressions
{
IFunctionNode node = getMethod("function foo(){if (a) super.foo();}");
asBlockWalker.visitFunction(node);
- assertOut("A.prototype.foo = function() {\n\tvar self = this;\n\tif (a)\n\t\tgoog.base(this, 'foo');\n}");
+ assertOut("FalconTest_A.prototype.foo = function() {\n\tvar self = this;\n\tif (a)\n\t\tgoog.base(this, 'foo');\n}");
}
@Override
@@ -50,7 +50,7 @@ public class TestGoogExpressions extends TestExpressions
{
IFunctionNode node = getMethod("function foo(){if (a) super.foo(a, b, c);}");
asBlockWalker.visitFunction(node);
- assertOut("A.prototype.foo = function() {\n\tvar self = this;\n\tif (a)\n\t\tgoog.base(this, 'foo', a, b, c);\n}");
+ assertOut("FalconTest_A.prototype.foo = function() {\n\tvar self = this;\n\tif (a)\n\t\tgoog.base(this, 'foo', a, b, c);\n}");
}
//----------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/43e7b640/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogFieldMembers.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogFieldMembers.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogFieldMembers.java
index cbb848e..5d20c0a 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogFieldMembers.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogFieldMembers.java
@@ -22,7 +22,9 @@ package org.apache.flex.compiler.internal.codegen.js.goog;
import org.apache.flex.compiler.driver.IBackend;
import org.apache.flex.compiler.internal.codegen.as.TestFieldMembers;
import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend;
+import org.apache.flex.compiler.tree.as.INamespaceNode;
import org.apache.flex.compiler.tree.as.IVariableNode;
+import org.junit.Ignore;
import org.junit.Test;
/**
@@ -43,7 +45,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("var foo;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @type {*}\n */\nA.prototype.foo");
+ assertOut("/**\n * @type {*}\n */\nFalconTest_A.prototype.foo");
}
@Override
@@ -52,7 +54,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("var foo:int;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @type {number}\n */\nA.prototype.foo");
+ assertOut("/**\n * @type {number}\n */\nFalconTest_A.prototype.foo");
}
@Override
@@ -61,7 +63,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("var foo:int = 420;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @type {number}\n */\nA.prototype.foo = 420");
+ assertOut("/**\n * @type {number}\n */\nFalconTest_A.prototype.foo = 420");
}
@Test
@@ -69,7 +71,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("var foo:int = -420;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @type {number}\n */\nA.prototype.foo = -420");
+ assertOut("/**\n * @type {number}\n */\nFalconTest_A.prototype.foo = -420");
}
@Override
@@ -78,7 +80,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("private var foo:int = 420;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @private\n * @type {number}\n */\nA.prototype.foo = 420");
+ assertOut("/**\n * @private\n * @type {number}\n */\nFalconTest_A.prototype.foo = 420");
}
@Override
@@ -88,7 +90,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
IVariableNode node = getField("mx_internal var foo:int = 420;");
asBlockWalker.visitVariable(node);
// (erikdebruin) we ignore custom namespaces completely (are there side effects I'm missing?)
- assertOut("/**\n * @type {number}\n */\nA.prototype.foo = 420");
+ assertOut("/**\n * @type {number}\n */\nFalconTest_A.prototype.foo = 420");
}
@Override
@@ -97,7 +99,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("protected var foo:Vector.<Foo>;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @protected\n * @type {Vector.<Foo>}\n */\nA.prototype.foo");
+ assertOut("/**\n * @protected\n * @type {Vector.<Foo>}\n */\nFalconTest_A.prototype.foo");
}
@Override
@@ -106,7 +108,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("protected var foo:Vector.<Vector.<Vector.<Foo>>>;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @protected\n * @type {Vector.<Vector.<Vector.<Foo>>>}\n */\nA.prototype.foo");
+ assertOut("/**\n * @protected\n * @type {Vector.<Vector.<Vector.<Foo>>>}\n */\nFalconTest_A.prototype.foo");
}
@Override
@@ -115,7 +117,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("protected var foo:Foo = new Foo('bar', 42);");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @protected\n * @type {Foo}\n */\nA.prototype.foo = new Foo('bar', 42)");
+ assertOut("/**\n * @protected\n * @type {Foo}\n */\nFalconTest_A.prototype.foo = new Foo('bar', 42)");
}
@Override
@@ -124,7 +126,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("protected var a:int = 4, b:int = 11, c:int = 42;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @protected\n * @type {number}\n */\nA.prototype.a = 4;\n\n/**\n * @protected\n * @type {number}\n */\nA.prototype.b = 11;\n\n/**\n * @protected\n * @type {number}\n */\nA.prototype.c = 42");
+ assertOut("/**\n * @protected\n * @type {number}\n */\nFalconTest_A.prototype.a = 4;\n\n/**\n * @protected\n * @type {number}\n */\nFalconTest_A.prototype.b = 11;\n\n/**\n * @protected\n * @type {number}\n */\nFalconTest_A.prototype.c = 42");
}
//--------------------------------------------------------------------------
@@ -137,7 +139,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("static const foo;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @const\n * @type {*}\n */\nA.foo");
+ assertOut("/**\n * @const\n * @type {*}\n */\nFalconTest_A.foo");
}
@Test
@@ -145,7 +147,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("const foo;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @const\n * @type {*}\n */\nA.prototype.foo");
+ assertOut("/**\n * @const\n * @type {*}\n */\nFalconTest_A.prototype.foo");
}
@Override
@@ -154,7 +156,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("static const foo:int;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @const\n * @type {number}\n */\nA.foo");
+ assertOut("/**\n * @const\n * @type {number}\n */\nFalconTest_A.foo");
}
@Test
@@ -162,7 +164,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("const foo:int;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @const\n * @type {number}\n */\nA.prototype.foo");
+ assertOut("/**\n * @const\n * @type {number}\n */\nFalconTest_A.prototype.foo");
}
@Override
@@ -171,7 +173,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("static const foo:int = 420;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @const\n * @type {number}\n */\nA.foo = 420");
+ assertOut("/**\n * @const\n * @type {number}\n */\nFalconTest_A.foo = 420");
}
@Test
@@ -179,7 +181,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("const foo:int = 420;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @const\n * @type {number}\n */\nA.prototype.foo = 420");
+ assertOut("/**\n * @const\n * @type {number}\n */\nFalconTest_A.prototype.foo = 420");
}
@Override
@@ -188,7 +190,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("private static const foo:int = 420;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @private\n * @const\n * @type {number}\n */\nA.foo = 420");
+ assertOut("/**\n * @private\n * @const\n * @type {number}\n */\nFalconTest_A.foo = 420");
}
@Test
@@ -196,7 +198,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("private const foo:int = 420;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @private\n * @const\n * @type {number}\n */\nA.prototype.foo = 420");
+ assertOut("/**\n * @private\n * @const\n * @type {number}\n */\nFalconTest_A.prototype.foo = 420");
}
@Override
@@ -206,7 +208,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
IVariableNode node = getField("mx_internal static const foo:int = 420;");
asBlockWalker.visitVariable(node);
// (erikdebruin) we ignore custom namespaces completely (are there side effects I'm missing?)
- assertOut("/**\n * @const\n * @type {number}\n */\nA.foo = 420");
+ assertOut("/**\n * @const\n * @type {number}\n */\nFalconTest_A.foo = 420");
}
@Test
@@ -215,9 +217,47 @@ public class TestGoogFieldMembers extends TestFieldMembers
IVariableNode node = getField("mx_internal const foo:int = 420;");
asBlockWalker.visitVariable(node);
// (erikdebruin) we ignore custom namespaces completely (are there side effects I'm missing?)
- assertOut("/**\n * @const\n * @type {number}\n */\nA.prototype.foo = 420");
+ assertOut("/**\n * @const\n * @type {number}\n */\nFalconTest_A.prototype.foo = 420");
}
+ //--------------------------------------------------------------------------
+ // Namespace
+ //--------------------------------------------------------------------------
+
+ // TODO (erikdebruin) not sure what to do with this when emitting JS...
+
+ @Ignore
+ @Override
+ @Test
+ public void testNamespace()
+ {
+ INamespaceNode node = getNamespace("namespace ns = \"http://whatever\";");
+ asBlockWalker.visitNamespace(node);
+ assertOut("namespace ns = \"http://whatever\"");
+ }
+
+ @Ignore
+ @Override
+ @Test
+ public void testNamespace_public()
+ {
+ INamespaceNode node = getNamespace("public namespace ns = \"http://whatever\";");
+ asBlockWalker.visitNamespace(node);
+ assertOut("public namespace ns = \"http://whatever\"");
+ }
+
+ @Ignore
+ @Override
+ @Test
+ public void testNamespace_protected()
+ {
+ INamespaceNode node = getNamespace("protected namespace ns = \"http://whatever\";");
+ asBlockWalker.visitNamespace(node);
+ assertOut("protected namespace ns = \"http://whatever\"");
+ }
+
+ //--------------------------------------------------------------------------
+
@Override
protected IBackend createBackend()
{
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/43e7b640/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogGlobalClasses.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogGlobalClasses.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogGlobalClasses.java
index 9b4df37..4e37ea7 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogGlobalClasses.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogGlobalClasses.java
@@ -47,7 +47,7 @@ public class TestGoogGlobalClasses extends TestGlobalClasses
{
IFunctionNode node = getMethod("function a():void {\ttrace(arguments);}");
asBlockWalker.visitFunction(node);
- assertOut("A.prototype.a = function() {\n\tvar self = this;\n\ttrace(arguments);\n}");
+ assertOut("FalconTest_A.prototype.a = function() {\n\tvar self = this;\n\ttrace(arguments);\n}");
}
@Override
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/43e7b640/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogGlobalConstants.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogGlobalConstants.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogGlobalConstants.java
index 9db7937..4bb2186 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogGlobalConstants.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogGlobalConstants.java
@@ -36,7 +36,7 @@ public class TestGoogGlobalConstants extends TestGlobalConstants
{
IVariableNode node = getField("var a:Number = Infinity;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @type {number}\n */\nA.prototype.a = Infinity");
+ assertOut("/**\n * @type {number}\n */\nFalconTest_A.prototype.a = Infinity");
}
@Override
@@ -45,7 +45,7 @@ public class TestGoogGlobalConstants extends TestGlobalConstants
{
IVariableNode node = getField("var a:Number = -Infinity;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @type {number}\n */\nA.prototype.a = -Infinity");
+ assertOut("/**\n * @type {number}\n */\nFalconTest_A.prototype.a = -Infinity");
}
@Override
@@ -54,7 +54,7 @@ public class TestGoogGlobalConstants extends TestGlobalConstants
{
IVariableNode node = getField("var a:Number = NaN;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @type {number}\n */\nA.prototype.a = NaN");
+ assertOut("/**\n * @type {number}\n */\nFalconTest_A.prototype.a = NaN");
}
@Override
@@ -63,7 +63,7 @@ public class TestGoogGlobalConstants extends TestGlobalConstants
{
IVariableNode node = getField("var a:* = undefined;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @type {*}\n */\nA.prototype.a = undefined");
+ assertOut("/**\n * @type {*}\n */\nFalconTest_A.prototype.a = undefined");
}
@Override
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/43e7b640/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogMethodMembers.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogMethodMembers.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogMethodMembers.java
index acf6bea..0dace3b 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogMethodMembers.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogMethodMembers.java
@@ -22,6 +22,7 @@ package org.apache.flex.compiler.internal.codegen.js.goog;
import org.apache.flex.compiler.driver.IBackend;
import org.apache.flex.compiler.internal.codegen.as.TestMethodMembers;
import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend;
+import org.apache.flex.compiler.tree.as.IClassNode;
import org.apache.flex.compiler.tree.as.IFunctionNode;
import org.junit.Test;
@@ -40,7 +41,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
{
IFunctionNode node = getMethod("function foo(){}");
asBlockWalker.visitFunction(node);
- assertOut("A.prototype.foo = function() {\n}");
+ assertOut("FalconTest_A.prototype.foo = function() {\n}");
}
@Override
@@ -49,7 +50,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
{
IFunctionNode node = getMethod("function foo():int{\treturn -1;}");
asBlockWalker.visitFunction(node);
- assertOut("/**\n * @return {number}\n */\nA.prototype.foo = function() {\n\tvar self = this;\n\treturn -1;\n}");
+ assertOut("/**\n * @return {number}\n */\nFalconTest_A.prototype.foo = function() {\n\tvar self = this;\n\treturn -1;\n}");
}
@Override
@@ -58,7 +59,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
{
IFunctionNode node = getMethod("function foo(bar):int{\treturn -1;}");
asBlockWalker.visitFunction(node);
- assertOut("/**\n * @param {*} bar\n * @return {number}\n */\nA.prototype.foo = function(bar) {\n\tvar self = this;\n\treturn -1;\n}");
+ assertOut("/**\n * @param {*} bar\n * @return {number}\n */\nFalconTest_A.prototype.foo = function(bar) {\n\tvar self = this;\n\treturn -1;\n}");
}
@Override
@@ -67,7 +68,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
{
IFunctionNode node = getMethod("function foo(bar:String):int{\treturn -1;}");
asBlockWalker.visitFunction(node);
- assertOut("/**\n * @param {string} bar\n * @return {number}\n */\nA.prototype.foo = function(bar) {\n\tvar self = this;\n\treturn -1;\n}");
+ assertOut("/**\n * @param {string} bar\n * @return {number}\n */\nFalconTest_A.prototype.foo = function(bar) {\n\tvar self = this;\n\treturn -1;\n}");
}
@Override
@@ -76,7 +77,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
{
IFunctionNode node = getMethod("function foo(bar:String = \"baz\"):int{\treturn -1;}");
asBlockWalker.visitFunction(node);
- assertOut("/**\n * @param {string=} bar\n * @return {number}\n */\nA.prototype.foo = function(bar) {\n\tvar self = this;\n\tbar = typeof bar !== 'undefined' ? bar : \"baz\";\n\treturn -1;\n}");
+ assertOut("/**\n * @param {string=} bar\n * @return {number}\n */\nFalconTest_A.prototype.foo = function(bar) {\n\tvar self = this;\n\tbar = typeof bar !== 'undefined' ? bar : \"baz\";\n\treturn -1;\n}");
}
@Override
@@ -85,7 +86,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
{
IFunctionNode node = getMethod("function foo(bar:String, baz:int = null):int{\treturn -1;}");
asBlockWalker.visitFunction(node);
- assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nA.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
+ assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nFalconTest_A.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
}
@Override
@@ -94,7 +95,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
{
IFunctionNode node = getMethod("function foo(bar:String, ...rest):int{\treturn -1;}");
asBlockWalker.visitFunction(node);
- assertOut("/**\n * @param {string} bar\n * @param {...} rest\n * @return {number}\n */\nA.prototype.foo = function(bar, rest) {\n\tvar self = this;\n\trest = Array.prototype.slice.call(arguments, 1);\n\treturn -1;\n}");
+ assertOut("/**\n * @param {string} bar\n * @param {...} rest\n * @return {number}\n */\nFalconTest_A.prototype.foo = function(bar, rest) {\n\tvar self = this;\n\trest = Array.prototype.slice.call(arguments, 1);\n\treturn -1;\n}");
}
@Override
@@ -104,7 +105,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
IFunctionNode node = getMethod("public function foo(bar:String, baz:int = null):int{\treturn -1;}");
asBlockWalker.visitFunction(node);
// we ignore the 'public' namespace completely
- assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nA.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
+ assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nFalconTest_A.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
}
@Override
@@ -113,7 +114,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
{
IFunctionNode node = getMethod("mx_internal function foo(bar:String, baz:int = null):int{\treturn -1;}");
asBlockWalker.visitFunction(node);
- assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nA.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
+ assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nFalconTest_A.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
}
@Override
@@ -125,7 +126,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
// (erikdebruin) here we actually DO want to declare the method
// directly on the 'class' constructor instead of the
// prototype!
- assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nA.foo = function(bar, baz) {\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
+ assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nFalconTest_A.foo = function(bar, baz) {\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
}
@Override
@@ -134,7 +135,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
{
IFunctionNode node = getMethod("public override function foo(bar:String, baz:int = null):int{\treturn -1;}");
asBlockWalker.visitFunction(node);
- assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n * @override\n */\nA.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
+ assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n * @override\n */\nFalconTest_A.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
}
@Override
@@ -143,7 +144,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
{
IFunctionNode node = getMethod("override public function foo(bar:String, baz:int = null):int{return -1;}");
asBlockWalker.visitFunction(node);
- assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n * @override\n */\nA.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
+ assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n * @override\n */\nFalconTest_A.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
}
//--------------------------------------------------------------------------
@@ -153,9 +154,9 @@ public class TestGoogMethodMembers extends TestMethodMembers
@Test
public void testConstructor_withThisInBody()
{
- IFunctionNode node = getMethod("public function A(){this.foo;}");
- asBlockWalker.visitFunction(node);
- assertOut("/**\n * @constructor\n */\nA = function() {\n\tvar self = this;\n\tthis.foo;\n}");
+ IClassNode node = (IClassNode) getNode("public function FalconTest_A() {this.foo;}", IClassNode.class, WRAP_LEVEL_CLASS);
+ asBlockWalker.visitClass(node);
+ assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n\tvar self = this;\n\tthis.foo;\n};");
}
@Test
@@ -163,7 +164,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
{
IFunctionNode node = getMethod("function foo(){this.foo;}");
asBlockWalker.visitFunction(node);
- assertOut("/**\n * @this {A}\n */\nA.prototype.foo = function() {\n\tvar self = this;\n\tthis.foo;\n}");
+ assertOut("/**\n * @this {FalconTest_A}\n */\nFalconTest_A.prototype.foo = function() {\n\tvar self = this;\n\tthis.foo;\n}");
}
@Test
@@ -171,7 +172,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
{
IFunctionNode node = getMethod("function foo(){if(true){while(i){this.bar(42);}}}");
asBlockWalker.visitFunction(node);
- assertOut("/**\n * @this {A}\n */\nA.prototype.foo = function() {\n\tvar self = this;\n\tif (true) "
+ assertOut("/**\n * @this {FalconTest_A}\n */\nFalconTest_A.prototype.foo = function() {\n\tvar self = this;\n\tif (true) "
+ "{\n\t\twhile (i) {\n\t\t\tthis.bar(42);\n\t\t}\n\t}\n}");
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/43e7b640/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogStatements.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogStatements.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogStatements.java
index e49d2a4..b879741 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogStatements.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogStatements.java
@@ -285,7 +285,7 @@ public class TestGoogStatements extends TestStatements
+ "foo: for each(var i:int in obj) break foo;",
IFileNode.class);
asBlockWalker.visitFile(node);
- assertOut("goog.provide('A');\n\n/**\n * @constructor\n */\nA = function() {\n};\n\nA.prototype.a = function() {\n\tvar self = this;\n\ttry {\n\t\ta;\n\t} catch (e) {\n\t\tif (a) {\n\t\t\tif (b) {\n\t\t\t\tif (c)\n\t\t\t\t\tb;\n\t\t\t\telse if (f)\n\t\t\t\t\ta;\n\t\t\t\telse\n\t\t\t\t\te;\n\t\t\t}\n\t\t}\n\t} finally {\n\t}\n\tif (d)\n\t\tfor (var /** @type {number} */ i = 0; i < len; i++)\n\t\t\tbreak;\n\tif (a) {\n\t\twith (ab) {\n\t\t\tc();\n\t\t}\n\t\tdo {\n\t\t\ta++;\n\t\t\tdo\n\t\t\t\ta++;\n\t\t\twhile (a > b);\n\t\t} while (c > d);\n\t}\n\tif (b) {\n\t\ttry {\n\t\t\ta;\n\t\t\tthrow new Error('foo');\n\t\t} catch (e) {\n\t\t\tswitch (i) {\n\t\t\t\tcase 1:\n\t\t\t\t\tbreak;\n\t\t\t\tdefault:\n\t\t\t\t\treturn;\n\t\t\t}\n\t\t} finally {\n\t\t\td;\n\t\t\tvar /** @type {Object} */ a = function(foo, bar) {\n\t\t\t\tbar = typeof bar !== 'undefined' ? bar : 'goo';\n\t\t\t\treturn -1;\n\t\t\t};\n\t\t\teee.dd;\n\t\t\teee.dd;\n\t\t\teee.dd;\n\t\t\teee.dd;\n\t\t}\n\t}\n\tfoo : go
og.array.forEach(obj, function (i) {\n\t\tbreak foo;\n\t});\n};");
+ assertOut("goog.provide('FalconTest_A');\n\n/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\nFalconTest_A.prototype.falconTest_a = function() {\n\tvar self = this;\n\ttry {\n\t\ta;\n\t} catch (e) {\n\t\tif (a) {\n\t\t\tif (b) {\n\t\t\t\tif (c)\n\t\t\t\t\tb;\n\t\t\t\telse if (f)\n\t\t\t\t\ta;\n\t\t\t\telse\n\t\t\t\t\te;\n\t\t\t}\n\t\t}\n\t} finally {\n\t}\n\tif (d)\n\t\tfor (var /** @type {number} */ i = 0; i < len; i++)\n\t\t\tbreak;\n\tif (a) {\n\t\twith (ab) {\n\t\t\tc();\n\t\t}\n\t\tdo {\n\t\t\ta++;\n\t\t\tdo\n\t\t\t\ta++;\n\t\t\twhile (a > b);\n\t\t} while (c > d);\n\t}\n\tif (b) {\n\t\ttry {\n\t\t\ta;\n\t\t\tthrow new Error('foo');\n\t\t} catch (e) {\n\t\t\tswitch (i) {\n\t\t\t\tcase 1:\n\t\t\t\t\tbreak;\n\t\t\t\tdefault:\n\t\t\t\t\treturn;\n\t\t\t}\n\t\t} finally {\n\t\t\td;\n\t\t\tvar /** @type {Object} */ a = function(foo, bar) {\n\t\t\t\tbar = typeof bar !== 'undefined' ? bar : 'goo';\n\t\t\t\treturn -1;\n\t\t\t};\n\t\t\teee.dd;\n\t\t\teee.dd;\n\t\t\tee
e.dd;\n\t\t\teee.dd;\n\t\t}\n\t}\n\tfoo : goog.array.forEach(obj, function (i) {\n\t\tbreak foo;\n\t});\n};");
}
@Override