I have an ant script that does this, so I'm on it. EdB
On Wed, Jun 25, 2014 at 7:48 PM, Alex Harui <aha...@adobe.com> wrote: > OK. I'll try to find time for that unless you have time. > > Let me know, > -Alex > > On 6/25/14 10:35 AM, "Erik de Bruin" <e...@ixsoftware.nl> wrote: > > >I say we try to 'auto-update'. One of the reasons for using CI is to be > >alerted to new issues as soon as possible. The GC Compiler and Library are > >constantly being developed to keep up with the newest standards, browsers > >and JS VMs, and our framework should as well. > > > >EdB > > > > > > > > > >On Wed, Jun 25, 2014 at 7:22 PM, Alex Harui <aha...@adobe.com> wrote: > > > >> Awesome, thanks. > >> > >> As you may have noted, the build/install script does not pull down the > >> latest GCL. Do you think we should? I think we've been burned by this > >>in > >> the past when they make some incompatible change. Right now, we'll end > >>up > >> bundling some known good version the RM is using. > >> > >> Thoughts? > >> -Alex > >> > >> From: Erik de Bruin <e...@ixsoftware.nl<mailto:e...@ixsoftware.nl>> > >> Reply-To: "dev@flex.apache.org<mailto:dev@flex.apache.org>" < > >> dev@flex.apache.org<mailto:dev@flex.apache.org>> > >> Date: Wednesday, June 25, 2014 10:04 AM > >> To: "dev@flex.apache.org<mailto:dev@flex.apache.org>" > >><dev@flex.apache.org > >> <mailto:dev@flex.apache.org>> > >> Cc: "comm...@flex.apache.org<mailto:comm...@flex.apache.org>" < > >> comm...@flex.apache.org<mailto:comm...@flex.apache.org>> > >> Subject: Re: [3/3] git commit: [flex-falcon] [refs/heads/develop] - Fix > >> tests to use '[qname].base' instead of 'goog.base'. > >> > >> Done. > >> > >> EdB > >> > >> > >> > >> > >> On Wed, Jun 25, 2014 at 6:53 PM, Erik de Bruin > >><e...@ixsoftware.nl<mailto: > >> e...@ixsoftware.nl>> wrote: > >> On it. > >> > >> EdB > >> > >> > >> > >> > >> On Wed, Jun 25, 2014 at 6:13 PM, Alex Harui <aha...@adobe.com<mailto: > >> aha...@adobe.com>> wrote: > >> Thanks for doing this! > >> > >> Do you have time to upgrade the GCL on the builds machine? I don't have > >> my windows machine handy and VMWare is painful slow. Or maybe you did > >>it > >> already, I haven't checked. > >> > >> Thanks, > >> -Alex > >> > >> On 6/25/14 8:38 AM, > >>"erikdebr...@apache.org<mailto:erikdebr...@apache.org>" > >> <erikdebr...@apache.org<mailto:erikdebr...@apache.org>> > >> wrote: > >> > >> >Fix tests to use '[qname].base' instead of 'goog.base'. > >> > > >> >Signed-off-by: Erik de Bruin <e...@ixsoftware.nl<mailto: > >> e...@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/3438a56e > >> >Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/3438a56e > >> >Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/3438a56e > >> > > >> >Branch: refs/heads/develop > >> >Commit: 3438a56ec28fe7a20a827c24a88867ff56b05671 > >> >Parents: 507d5eb > >> >Author: Erik de Bruin <e...@ixsoftware.nl<mailto:e...@ixsoftware.nl>> > >> >Authored: Wed Jun 25 17:32:49 2014 +0200 > >> >Committer: Erik de Bruin > >><e...@ixsoftware.nl<mailto:e...@ixsoftware.nl>> > >> >Committed: Wed Jun 25 17:32:49 2014 +0200 > >> > > >> >---------------------------------------------------------------------- > >> > .../js/flexjs/TestFlexJSAccessorMembers.java | 4 ++-- > >> > .../codegen/js/flexjs/TestFlexJSClass.java | 20 > >>++++++++++---------- > >> > .../codegen/js/flexjs/TestFlexJSEmiter.java | 2 +- > >> > .../js/flexjs/TestFlexJSExpressions.java | 4 ++-- > >> > .../js/goog/TestGoogAccessorMembers.java | 4 ++-- > >> > .../internal/codegen/js/goog/TestGoogClass.java | 16 ++++++++-------- > >> > .../codegen/js/goog/TestGoogEmiter.java | 2 +- > >> > .../codegen/js/goog/TestGoogExpressions.java | 4 ++-- > >> > .../flexjs/files/FlexJSTest_again_result.js | 4 ++-- > >> > .../flexjs/files/MyInitialView_result.js | 4 ++-- > >> > .../flexjs/files/models/MyModel_result.js | 2 +- > >> > .../flexjs/files/wildcard_import_result.js | 2 +- > >> > .../flexjs/projects/interfaces/Test_result.js | 2 +- > >> > .../projects/interfaces/classes/A_result.js | 2 +- > >> > .../flexjs/projects/super/Base_result.js | 8 ++++---- > >> > .../test-files/goog/files/call-super_result.js | 4 ++-- > >> > .../test-files/goog/files/output.js | 2 +- > >> > .../test-files/goog/files/poc_result.js | 2 +- > >> > .../goog/files/qualify-new-object_result.js | 2 +- > >> > 19 files changed, 45 insertions(+), 45 deletions(-) > >> >---------------------------------------------------------------------- > >> > > >> > > >> > >>> > http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3438a56e/compile > >>>r > >> . > >> > >>>jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFle > >>>xJ > >> >SAccessorMembers.java > >> >---------------------------------------------------------------------- > >> >diff --git > >> > >>>a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/fle > >>>xj > >> >s/TestFlexJSAccessorMembers.java > >> > >>>b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/fle > >>>xj > >> >s/TestFlexJSAccessorMembers.java > >> >index bddaeab..0d40229 100644 > >> >--- > >> > >>>a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/fle > >>>xj > >> >s/TestFlexJSAccessorMembers.java > >> >+++ > >> > >>>b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/fle > >>>xj > >> >s/TestFlexJSAccessorMembers.java > >> >@@ -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 > >> >*/\nFalconTest_A.prototype.get_foo = function() {\n goog.base(this, > >> >'get_foo');\n return -1;\n}"); > >> >+ assertOut("/**\n * @expose\n * @return {number}\n * > >>@override\n > >> >*/\nFalconTest_A.prototype.get_foo = function() {\n > >> >FalconTest_A.base(this, 'get_foo');\n return -1;\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 */\nFalconTest_A.prototype.set_foo = function(value) {\n > >> >goog.base(this, 'set_foo');\n}"); > >> >+ assertOut("/**\n * @expose\n * @param {number} value\n * > >> >@override\n */\nFalconTest_A.prototype.set_foo = function(value) {\n > >> >FalconTest_A.base(this, 'set_foo');\n}"); > >> > } > >> > > >> > @Override > >> > > >> > >>> > http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3438a56e/compile > >>>r > >> . > >> > >>>jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFle > >>>xJ > >> >SClass.java > >> >---------------------------------------------------------------------- > >> >diff --git > >> > >>>a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/fle > >>>xj > >> >s/TestFlexJSClass.java > >> > >>>b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/fle > >>>xj > >> >s/TestFlexJSClass.java > >> >index 4a45d10..1d2ac89 100644 > >> >--- > >> > >>>a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/fle > >>>xj > >> >s/TestFlexJSClass.java > >> >+++ > >> > >>>b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/fle > >>>xj > >> >s/TestFlexJSClass.java > >> >@@ -46,7 +46,7 @@ public class TestFlexJSClass extends TestGoogClass > >> > { > >> > IClassNode node = getClassNode("public class A extends Button > >> >{public function A() {}}"); > >> > asBlockWalker.visitClass(node); > >> >- assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n */\norg.apache.flex.A = function() {\n > >> >goog.base(this);\n};\ngoog.inherits(org.apache.flex.A, > >> >spark.components.Button);"); > >> >+ assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n */\norg.apache.flex.A = function() {\n > >> >org.apache.flex.A.base(this, > >> >'constructor');\n};\ngoog.inherits(org.apache.flex.A, > >> >spark.components.Button);"); > >> > } > >> > > >> > @Override > >> >@@ -55,7 +55,7 @@ public class TestFlexJSClass extends TestGoogClass > >> > { > >> > IClassNode node = getClassNode("public class A extends Button > >> >implements IEventDispatcher {public function A() {}}"); > >> > asBlockWalker.visitClass(node); > >> >- assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n * @implements > >> >{flash.events.IEventDispatcher}\n */\norg.apache.flex.A = function() > >>{\n > >> >goog.base(this);\n};\ngoog.inherits(org.apache.flex.A, > >> >spark.components.Button);"); > >> >+ assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n * @implements > >> >{flash.events.IEventDispatcher}\n */\norg.apache.flex.A = function() > >>{\n > >> >org.apache.flex.A.base(this, > >> >'constructor');\n};\ngoog.inherits(org.apache.flex.A, > >> >spark.components.Button);"); > >> > } > >> > > >> > @Override > >> >@@ -64,7 +64,7 @@ public class TestFlexJSClass extends TestGoogClass > >> > { > >> > IClassNode node = getClassNode("public class A extends Button > >> >implements IEventDispatcher, ILogger {public function A() {}}"); > >> > asBlockWalker.visitClass(node); > >> >- assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n * @implements > >> >{flash.events.IEventDispatcher}\n * @implements {mx.logging.ILogger}\n > >> >*/\norg.apache.flex.A = function() {\n > >> >goog.base(this);\n};\ngoog.inherits(org.apache.flex.A, > >> >spark.components.Button);"); > >> >+ assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n * @implements > >> >{flash.events.IEventDispatcher}\n * @implements {mx.logging.ILogger}\n > >> >*/\norg.apache.flex.A = function() {\n org.apache.flex.A.base(this, > >> >'constructor');\n};\ngoog.inherits(org.apache.flex.A, > >> >spark.components.Button);"); > >> > } > >> > > >> > @Override > >> >@@ -73,7 +73,7 @@ public class TestFlexJSClass extends TestGoogClass > >> > { > >> > IClassNode node = getClassNode("public final class A extends > >> >Button implements IEventDispatcher, ILogger {public function A() {}}"); > >> > asBlockWalker.visitClass(node); > >> >- assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n * @implements > >> >{flash.events.IEventDispatcher}\n * @implements {mx.logging.ILogger}\n > >> >*/\norg.apache.flex.A = function() {\n > >> >goog.base(this);\n};\ngoog.inherits(org.apache.flex.A, > >> >spark.components.Button);"); > >> >+ assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n * @implements > >> >{flash.events.IEventDispatcher}\n * @implements {mx.logging.ILogger}\n > >> >*/\norg.apache.flex.A = function() {\n org.apache.flex.A.base(this, > >> >'constructor');\n};\ngoog.inherits(org.apache.flex.A, > >> >spark.components.Button);"); > >> > } > >> > > >> > @Override > >> >@@ -82,7 +82,7 @@ public class TestFlexJSClass extends TestGoogClass > >> > { > >> > IClassNode node = getClassNode("public class A extends > >> >spark.components.Button implements flash.events.IEventDispatcher, > >> >mx.logging.ILogger {public function A() {}}"); > >> > asBlockWalker.visitClass(node); > >> >- assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n * @implements > >> >{flash.events.IEventDispatcher}\n * @implements {mx.logging.ILogger}\n > >> >*/\norg.apache.flex.A = function() {\n > >> >goog.base(this);\n};\ngoog.inherits(org.apache.flex.A, > >> >spark.components.Button);"); > >> >+ assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n * @implements > >> >{flash.events.IEventDispatcher}\n * @implements {mx.logging.ILogger}\n > >> >*/\norg.apache.flex.A = function() {\n org.apache.flex.A.base(this, > >> >'constructor');\n};\ngoog.inherits(org.apache.flex.A, > >> >spark.components.Button);"); > >> > } > >> > > >> > @Override > >> >@@ -91,7 +91,7 @@ public class TestFlexJSClass extends TestGoogClass > >> > { > >> > IClassNode node = getClassNode("public class A extends > >> >spark.components.Button { public function A() { super('foo', 42);}}"); > >> > asBlockWalker.visitClass(node); > >> >- assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n */\norg.apache.flex.A = function() {\n > >> >goog.base(this, 'foo', 42);\n};\ngoog.inherits(org.apache.flex.A, > >> >spark.components.Button);"); > >> >+ assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n */\norg.apache.flex.A = function() {\n > >> >org.apache.flex.A.base(this, 'constructor', 'foo', > >> >42);\n};\ngoog.inherits(org.apache.flex.A, spark.components.Button);"); > >> > } > >> > > >> > @Test > >> >@@ -144,7 +144,7 @@ public class TestFlexJSClass extends TestGoogClass > >> > { > >> > IClassNode node = getClassNode("public class B {public > >>function > >> >B() {}; override public function foo():void {super.foo();};}"); > >> > asBlockWalker.visitClass(node); > >> >- String expected = "/**\n * @constructor\n > >>*/\norg.apache.flex.B > >> >= function() {\n};\n\n\n/**\n * @expose\n * @override\n > >> >*/\norg.apache.flex.B.prototype.foo = function() {\n goog.base(this, > >> >'foo');\n};"; > >> >+ String expected = "/**\n * @constructor\n > >>*/\norg.apache.flex.B > >> >= function() {\n};\n\n\n/**\n * @expose\n * @override\n > >> >*/\norg.apache.flex.B.prototype.foo = function() {\n > >> >org.apache.flex.B.base(this, 'foo');\n};"; > >> > assertOut(expected); > >> > } > >> > > >> >@@ -162,7 +162,7 @@ public class TestFlexJSClass extends TestGoogClass > >> > { > >> > IClassNode node = getClassNode("public class B {public > >>function > >> >B() {}; override public function set foo(value:Object):void {super.foo > >>= > >> >value;};}"); > >> > asBlockWalker.visitClass(node); > >> >- String expected = "/**\n * @constructor\n > >>*/\norg.apache.flex.B > >> >= function() {\n};\n\n\n/**\n * @expose\n * @param {Object} value\n * > >> >@override\n */\norg.apache.flex.B.prototype.set_foo = function(value) > >>{\n > >> > goog.base(this, 'set_foo', value);\n};"; > >> >+ String expected = "/**\n * @constructor\n > >>*/\norg.apache.flex.B > >> >= function() {\n};\n\n\n/**\n * @expose\n * @param {Object} value\n * > >> >@override\n */\norg.apache.flex.B.prototype.set_foo = function(value) > >>{\n > >> > org.apache.flex.B.base(this, 'set_foo', value);\n};"; > >> > assertOut(expected); > >> > } > >> > > >> >@@ -172,7 +172,7 @@ public class TestFlexJSClass extends TestGoogClass > >> > { > >> > IClassNode node = getClassNode("public class A extends > >> >spark.components.Button {public function A(arg1:String, arg2:int) > >>{}}"); > >> > asBlockWalker.visitClass(node); > >> >- assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n * @param {string} arg1\n * @param {number} > >> >arg2\n */\norg.apache.flex.A = function(arg1, arg2) {\n > >>goog.base(this, > >> >arg1, arg2);\n};\ngoog.inherits(org.apache.flex.A, > >> >spark.components.Button);"); > >> >+ assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n * @param {string} arg1\n * @param {number} > >> >arg2\n */\norg.apache.flex.A = function(arg1, arg2) {\n > >> >org.apache.flex.A.base(this, 'constructor', arg1, > >> >arg2);\n};\ngoog.inherits(org.apache.flex.A, > >>spark.components.Button);"); > >> > } > >> > > >> > @Override > >> >@@ -232,7 +232,7 @@ public class TestFlexJSClass extends TestGoogClass > >> > + "public static function foo7(value:Object):void{}" > >> > + "foo_bar static function foo7(value:Object):void{}" > >>+ > >> >"}"); > >> > asBlockWalker.visitClass(node); > >> >- assertOut("/**\n * @constructor\n */\norg.apache.flex.A = > >> >function() {\n};\n\n\n/**\n * @expose\n * @return {Object}\n > >> >*/\norg.apache.flex.A.prototype.foo1 = function() {\n return > >> >null;\n};\n\n\n/**\n * @expose\n * @return {Object}\n > >> >*/\norg.apache.flex.A.prototype.foo1a = function() {\n return > >> >null;\n};\n\n\n/**\n * @expose\n * @return {Object}\n * @override\n > >> >*/\norg.apache.flex.A.prototype.foo1b = function() {\n return > >> >goog.base(this, 'foo1b');\n};\n\n\n/**\n * @protected\n * @param > >>{Object} > >> >value\n */\norg.apache.flex.A.prototype.foo2 = function(value) > >> >{\n};\n\n\n/**\n * @private\n * @param {Object} value\n > >> >*/\norg.apache.flex.A.prototype.foo3 = function(value) > >>{\n};\n\n\n/**\n * > >> >@param {Object} value\n */\norg.apache.flex.A.prototype.foo5 = > >> >function(value) {\n};\n\n\n/**\n * @param {Object} value\n > >> >*/\norg.apache.flex.A.prototype.foo6 = function(value) > >>{\n};\n\n\n/**\n * > >> >@expose\n * @param {Object} value\n */\norg.apache.flex.A.foo7 = > >> >function(value) {\n};\n! > >> > \n\n/**\n > >> > * @param {Object} value\n */\norg.apache.flex.A.foo7 = > >>function(value) > >> >{\n};"); > >> >+ assertOut("/**\n * @constructor\n */\norg.apache.flex.A = > >> >function() {\n};\n\n\n/**\n * @expose\n * @return {Object}\n > >> >*/\norg.apache.flex.A.prototype.foo1 = function() {\n return > >> >null;\n};\n\n\n/**\n * @expose\n * @return {Object}\n > >> >*/\norg.apache.flex.A.prototype.foo1a = function() {\n return > >> >null;\n};\n\n\n/**\n * @expose\n * @return {Object}\n * @override\n > >> >*/\norg.apache.flex.A.prototype.foo1b = function() {\n return > >> >org.apache.flex.A.base(this, 'foo1b');\n};\n\n\n/**\n * @protected\n * > >> >@param {Object} value\n */\norg.apache.flex.A.prototype.foo2 = > >> >function(value) {\n};\n\n\n/**\n * @private\n * @param {Object} value\n > >> >*/\norg.apache.flex.A.prototype.foo3 = function(value) > >>{\n};\n\n\n/**\n * > >> >@param {Object} value\n */\norg.apache.flex.A.prototype.foo5 = > >> >function(value) {\n};\n\n\n/**\n * @param {Object} value\n > >> >*/\norg.apache.flex.A.prototype.foo6 = function(value) > >>{\n};\n\n\n/**\n * > >> >@expose\n * @param {Object} value\n */\norg.apache.flex.A.foo7 = > >> >function(v! > >> > alue) {\n > >> > };\n\n\n/**\n * @param {Object} value\n */\norg.apache.flex.A.foo7 = > >> >function(value) {\n};"); > >> > } > >> > > >> > @Test > >> > > >> > >>> > http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3438a56e/compile > >>>r > >> . > >> > >>>jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFle > >>>xJ > >> >SEmiter.java > >> >---------------------------------------------------------------------- > >> >diff --git > >> > >>>a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/fle > >>>xj > >> >s/TestFlexJSEmiter.java > >> > >>>b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/fle > >>>xj > >> >s/TestFlexJSEmiter.java > >> >index eef643d..5b7abf4 100644 > >> >--- > >> > >>>a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/fle > >>>xj > >> >s/TestFlexJSEmiter.java > >> >+++ > >> > >>>b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/fle > >>>xj > >> >s/TestFlexJSEmiter.java > >> >@@ -54,7 +54,7 @@ public class TestFlexJSEmiter extends TestGoogEmiter > >> > + "return \"Don't \" + _privateVar + value; }"; > >> > IFileNode node = compileAS(code); > >> > asBlockWalker.visitFile(node); > >> >- assertOut("/**\n * com.example.components.MyTextButton\n *\n * > >> >@fileoverview\n *\n * @suppress {checkTypes}\n > >> > >>>*/\n\ngoog.provide('com.example.components.MyTextButton');\n\n\n\n/**\n > >>>* > >> >@constructor\n * @extends {spark.components.Button}\n > >> >*/\ncom.example.components.MyTextButton = function() {\n > >> >goog.base(this);\n if (foo() != 42) {\n bar();\n > >> >}\n};\ngoog.inherits(com.example.components.MyTextButton, > >> >spark.components.Button);\n\n\n/**\n * @private\n * @type {string}\n > >> >*/\ncom.example.components.MyTextButton.prototype._privateVar = \"do > >> >\";\n\n\n/**\n * @type {number}\n > >> >*/\ncom.example.components.MyTextButton.prototype.publicProperty = > >> >100;\n\n\n/**\n * @expose\n * @param {string} value\n * @return > >> >{string}\n > >>*/\ncom.example.components.MyTextButton.prototype.myFunction = > >> >function(value) {\n return \"Don't \" + this._privateVar + > >> >value;\n};\n\n\n/**\n * Metadata\n *\n * @type {Object.<string, > >> >Array.<Object>>}\n > >>*/\ncom.example.components.MyTextButton.prototype.FL! > >> > EXJS_CLAS > >> > S_INFO = { names: [{ name: 'MyTextButton', qName: > >> >'com.example.components.MyTextButton'}] };\n"); > >> >+ assertOut("/**\n * com.example.components.MyTextButton\n *\n * > >> >@fileoverview\n *\n * @suppress {checkTypes}\n > >> > >>>*/\n\ngoog.provide('com.example.components.MyTextButton');\n\n\n\n/**\n > >>>* > >> >@constructor\n * @extends {spark.components.Button}\n > >> >*/\ncom.example.components.MyTextButton = function() {\n > >> >com.example.components.MyTextButton.base(this, 'constructor');\n if > >> >(foo() != 42) {\n bar();\n > >> >}\n};\ngoog.inherits(com.example.components.MyTextButton, > >> >spark.components.Button);\n\n\n/**\n * @private\n * @type {string}\n > >> >*/\ncom.example.components.MyTextButton.prototype._privateVar = \"do > >> >\";\n\n\n/**\n * @type {number}\n > >> >*/\ncom.example.components.MyTextButton.prototype.publicProperty = > >> >100;\n\n\n/**\n * @expose\n * @param {string} value\n * @return > >> >{string}\n > >>*/\ncom.example.components.MyTextButton.prototype.myFunction = > >> >function(value) {\n return \"Don't \" + this._privateVar + > >> >value;\n};\n\n\n/**\n * Metadata\n *\n * @type {Object.<string, > >> >Array.<Object>>}\n */\nco! > >> > m.example > >> > .components.MyTextButton.prototype.FLEXJS_CLASS_INFO = { names: [{ > >>name: > >> >'MyTextButton', qName: 'com.example.components.MyTextButton'}] };\n"); > >> > } > >> > > >> > @Override > >> > > >> > >>> > http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3438a56e/compile > >>>r > >> . > >> > >>>jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFle > >>>xJ > >> >SExpressions.java > >> >---------------------------------------------------------------------- > >> >diff --git > >> > >>>a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/fle > >>>xj > >> >s/TestFlexJSExpressions.java > >> > >>>b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/fle > >>>xj > >> >s/TestFlexJSExpressions.java > >> >index 76f86e7..ecfbb62 100644 > >> >--- > >> > >>>a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/fle > >>>xj > >> >s/TestFlexJSExpressions.java > >> >+++ > >> > >>>b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/fle > >>>xj > >> >s/TestFlexJSExpressions.java > >> >@@ -59,7 +59,7 @@ public class TestFlexJSExpressions extends > >> >TestGoogExpressions > >> > { > >> > IFunctionNode node = getMethod("function foo(){if (a) > >> >super.foo();}"); > >> > asBlockWalker.visitFunction(node); > >> >- assertOut("FalconTest_A.prototype.foo = function() {\n if > >>(a)\n > >> > goog.base(this, 'foo');\n}"); > >> >+ assertOut("FalconTest_A.prototype.foo = function() {\n if > >>(a)\n > >> > FalconTest_A.base(this, 'foo');\n}"); > >> > } > >> > > >> > @Override > >> >@@ -68,7 +68,7 @@ public class TestFlexJSExpressions extends > >> >TestGoogExpressions > >> > { > >> > IFunctionNode node = getMethod("function foo(){if (a) > >> >super.foo(a, b, c);}"); > >> > asBlockWalker.visitFunction(node); > >> >- assertOut("FalconTest_A.prototype.foo = function() {\n if > >>(a)\n > >> > goog.base(this, 'foo', a, b, c);\n}"); > >> >+ assertOut("FalconTest_A.prototype.foo = function() {\n if > >>(a)\n > >> > FalconTest_A.base(this, 'foo', a, b, c);\n}"); > >> > } > >> > > >> > //---------------------------------- > >> > > >> > >>> > http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3438a56e/compile > >>>r > >> . > >> > >>>jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogA > >>>cc > >> >essorMembers.java > >> >---------------------------------------------------------------------- > >> >diff --git > >> > >>>a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goo > >>>g/ > >> >TestGoogAccessorMembers.java > >> > >>>b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goo > >>>g/ > >> >TestGoogAccessorMembers.java > >> >index c8375cf..02965c0 100644 > >> >--- > >> > >>>a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goo > >>>g/ > >> >TestGoogAccessorMembers.java > >> >+++ > >> > >>>b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goo > >>>g/ > >> >TestGoogAccessorMembers.java > >> >@@ -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\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)"); > >> >+ assertOut("Object.defineProperty(\n\tFalconTest_A.prototype, > >> >\n\t'foo', \n\t{get:function() {\n\t\tvar self = > >> >this;\n\t\tFalconTest_A.base(this, 'foo');\n\t\treturn -1;\n\t}, > >> >configurable:true}\n)"); > >> > } > >> > > >> > @Override > >> >@@ -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\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)"); > >> >+ assertOut("Object.defineProperty(\n\tFalconTest_A.prototype, > >> >\n\t'foo', \n\t{set:function(value) {\n\t\tvar self = > >> >this;\n\t\tFalconTest_A.base(this, 'foo');\n\t}, > >>configurable:true}\n)"); > >> > } > >> > > >> > @Override > >> > > >> > >>> > http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3438a56e/compile > >>>r > >> . > >> > >>>jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogC > >>>la > >> >ss.java > >> >---------------------------------------------------------------------- > >> >diff --git > >> > >>>a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goo > >>>g/ > >> >TestGoogClass.java > >> > >>>b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goo > >>>g/ > >> >TestGoogClass.java > >> >index ed056d8..791e7d4 100644 > >> >--- > >> > >>>a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goo > >>>g/ > >> >TestGoogClass.java > >> >+++ > >> > >>>b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goo > >>>g/ > >> >TestGoogClass.java > >> >@@ -81,7 +81,7 @@ public class TestGoogClass extends TestClass > >> > { > >> > IClassNode node = getClassNode("public class A extends Button > >> >{public function A() {}}"); > >> > asBlockWalker.visitClass(node); > >> >- assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n */\norg.apache.flex.A = function() > >> >{\n\tgoog.base(this);\n}\ngoog.inherits(org.apache.flex.A, > >> >spark.components.Button);"); > >> >+ assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n */\norg.apache.flex.A = function() > >> >{\n\torg.apache.flex.A.base(this, > >> >'constructor');\n}\ngoog.inherits(org.apache.flex.A, > >> >spark.components.Button);"); > >> > } > >> > > >> > @Override > >> >@@ -108,7 +108,7 @@ public class TestGoogClass extends TestClass > >> > { > >> > IClassNode node = getClassNode("public class A extends Button > >> >implements IEventDispatcher {public function A() {}}"); > >> > asBlockWalker.visitClass(node); > >> >- assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n * @implements > >> >{flash.events.IEventDispatcher}\n */\norg.apache.flex.A = function() > >> >{\n\tgoog.base(this);\n}\ngoog.inherits(org.apache.flex.A, > >> >spark.components.Button);"); > >> >+ assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n * @implements > >> >{flash.events.IEventDispatcher}\n */\norg.apache.flex.A = function() > >> >{\n\torg.apache.flex.A.base(this, > >> >'constructor');\n}\ngoog.inherits(org.apache.flex.A, > >> >spark.components.Button);"); > >> > } > >> > > >> > @Override > >> >@@ -117,7 +117,7 @@ public class TestGoogClass extends TestClass > >> > { > >> > IClassNode node = getClassNode("public class A extends Button > >> >implements IEventDispatcher, ILogger {public function A() {}}"); > >> > asBlockWalker.visitClass(node); > >> >- assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n * @implements > >> >{flash.events.IEventDispatcher}\n * @implements {mx.logging.ILogger}\n > >> >*/\norg.apache.flex.A = function() > >> >{\n\tgoog.base(this);\n}\ngoog.inherits(org.apache.flex.A, > >> >spark.components.Button);"); > >> >+ assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n * @implements > >> >{flash.events.IEventDispatcher}\n * @implements {mx.logging.ILogger}\n > >> >*/\norg.apache.flex.A = function() {\n\torg.apache.flex.A.base(this, > >> >'constructor');\n}\ngoog.inherits(org.apache.flex.A, > >> >spark.components.Button);"); > >> > } > >> > > >> > @Override > >> >@@ -126,7 +126,7 @@ public class TestGoogClass extends TestClass > >> > { > >> > IClassNode node = getClassNode("public final class A extends > >> >Button implements IEventDispatcher, ILogger {public function A() {}}"); > >> > asBlockWalker.visitClass(node); > >> >- assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n * @implements > >> >{flash.events.IEventDispatcher}\n * @implements {mx.logging.ILogger}\n > >> >*/\norg.apache.flex.A = function() > >> >{\n\tgoog.base(this);\n}\ngoog.inherits(org.apache.flex.A, > >> >spark.components.Button);"); > >> >+ assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n * @implements > >> >{flash.events.IEventDispatcher}\n * @implements {mx.logging.ILogger}\n > >> >*/\norg.apache.flex.A = function() {\n\torg.apache.flex.A.base(this, > >> >'constructor');\n}\ngoog.inherits(org.apache.flex.A, > >> >spark.components.Button);"); > >> > } > >> > > >> > @Override > >> >@@ -135,7 +135,7 @@ public class TestGoogClass extends TestClass > >> > { > >> > IClassNode node = getClassNode("public class A extends > >> >spark.components.Button implements flash.events.IEventDispatcher, > >> >mx.logging.ILogger {public function A() {}}"); > >> > asBlockWalker.visitClass(node); > >> >- assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n * @implements > >> >{flash.events.IEventDispatcher}\n * @implements {mx.logging.ILogger}\n > >> >*/\norg.apache.flex.A = function() > >> >{\n\tgoog.base(this);\n}\ngoog.inherits(org.apache.flex.A, > >> >spark.components.Button);"); > >> >+ assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n * @implements > >> >{flash.events.IEventDispatcher}\n * @implements {mx.logging.ILogger}\n > >> >*/\norg.apache.flex.A = function() {\n\torg.apache.flex.A.base(this, > >> >'constructor');\n}\ngoog.inherits(org.apache.flex.A, > >> >spark.components.Button);"); > >> > } > >> > > >> > @Override > >> >@@ -160,7 +160,7 @@ public class TestGoogClass extends TestClass > >> > { > >> > IClassNode node = getClassNode("public class A extends > >> >spark.components.Button { public function A() { super('foo', 42);}}"); > >> > asBlockWalker.visitClass(node); > >> >- assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n */\norg.apache.flex.A = function() {\n\tvar > >> >self = this;\n\tgoog.base(this, 'foo', > >> >42);\n}\ngoog.inherits(org.apache.flex.A, spark.components.Button);"); > >> >+ assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n */\norg.apache.flex.A = function() {\n\tvar > >> >self = this;\n\torg.apache.flex.A.base(this, 'constructor', 'foo', > >> >42);\n}\ngoog.inherits(org.apache.flex.A, spark.components.Button);"); > >> > } > >> > > >> > @Override > >> >@@ -178,7 +178,7 @@ public class TestGoogClass extends TestClass > >> > { > >> > IClassNode node = getClassNode("public class A extends > >> >spark.components.Button {public function A(arg1:String, arg2:int) > >>{}}"); > >> > asBlockWalker.visitClass(node); > >> >- assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n * @param {string} arg1\n * @param {number} > >> >arg2\n */\norg.apache.flex.A = function(arg1, arg2) > >>{\n\tgoog.base(this, > >> >arg1, arg2);\n}\ngoog.inherits(org.apache.flex.A, > >> >spark.components.Button);"); > >> >+ assertOut("/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n * @param {string} arg1\n * @param {number} > >> >arg2\n */\norg.apache.flex.A = function(arg1, arg2) > >> >{\n\torg.apache.flex.A.base(this, 'constructor', arg1, > >> >arg2);\n}\ngoog.inherits(org.apache.flex.A, > >>spark.components.Button);"); > >> > } > >> > > >> > @Override > >> >@@ -238,7 +238,7 @@ public class TestGoogClass extends TestClass > >> > + "public static function foo7(value:Object):void{}" > >> > + "foo_bar static function foo7(value:Object):void{}" > >>+ > >> >"}"); > >> > asBlockWalker.visitClass(node); > >> >- assertOut("/**\n * @constructor\n */\norg.apache.flex.A = > >> >function() {\n};\n\n/**\n * @return {Object}\n > >> >*/\norg.apache.flex.A.prototype.foo1 = function() {\n\tvar self = > >> >this;\n\treturn null;\n};\n\n/**\n * @return {Object}\n > >> >*/\norg.apache.flex.A.prototype.foo1a = function() {\n\tvar self = > >> >this;\n\treturn null;\n};\n\n/**\n * @return {Object}\n * @override\n > >> >*/\norg.apache.flex.A.prototype.foo1b = function() {\n\tvar self = > >> >this;\n\treturn goog.base(this, 'foo1b');\n};\n\n/**\n * @param > >>{Object} > >> >value\n */\norg.apache.flex.A.prototype.foo2 = function(value) > >> >{\n};\n\n/**\n * @param {Object} value\n > >> >*/\norg.apache.flex.A.prototype.foo3 = function(value) {\n};\n\n/**\n * > >> >@param {Object} value\n */\norg.apache.flex.A.prototype.foo5 = > >> >function(value) {\n};\n\n/**\n * @param {Object} value\n > >> >*/\norg.apache.flex.A.prototype.foo6 = function(value) {\n};\n\n/**\n * > >> >@param {Object} value\n */\norg.apache.flex.A.foo7 = function(value) > >> >{\n};\n\n/**\n * @param {Object} value\! > >> > n */\norg > >> > .apache.flex.A.foo7 = function(value) {\n};"); > >> >+ assertOut("/**\n * @constructor\n */\norg.apache.flex.A = > >> >function() {\n};\n\n/**\n * @return {Object}\n > >> >*/\norg.apache.flex.A.prototype.foo1 = function() {\n\tvar self = > >> >this;\n\treturn null;\n};\n\n/**\n * @return {Object}\n > >> >*/\norg.apache.flex.A.prototype.foo1a = function() {\n\tvar self = > >> >this;\n\treturn null;\n};\n\n/**\n * @return {Object}\n * @override\n > >> >*/\norg.apache.flex.A.prototype.foo1b = function() {\n\tvar self = > >> >this;\n\treturn org.apache.flex.A.base(this, 'foo1b');\n};\n\n/**\n * > >> >@param {Object} value\n */\norg.apache.flex.A.prototype.foo2 = > >> >function(value) {\n};\n\n/**\n * @param {Object} value\n > >> >*/\norg.apache.flex.A.prototype.foo3 = function(value) {\n};\n\n/**\n * > >> >@param {Object} value\n */\norg.apache.flex.A.prototype.foo5 = > >> >function(value) {\n};\n\n/**\n * @param {Object} value\n > >> >*/\norg.apache.flex.A.prototype.foo6 = function(value) {\n};\n\n/**\n * > >> >@param {Object} value\n */\norg.apache.flex.A.foo7 = function(value) > >> >{\n};\n\n/**\n * @param {O! > >> > bject} va > >> > lue\n */\norg.apache.flex.A.foo7 = function(value) {\n};"); > >> > } > >> > > >> > @Override > >> > > >> > >>> > http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3438a56e/compile > >>>r > >> . > >> > >>>jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogE > >>>mi > >> >ter.java > >> >---------------------------------------------------------------------- > >> >diff --git > >> > >>>a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goo > >>>g/ > >> >TestGoogEmiter.java > >> > >>>b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goo > >>>g/ > >> >TestGoogEmiter.java > >> >index 422f85e..ac460d2 100644 > >> >--- > >> > >>>a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goo > >>>g/ > >> >TestGoogEmiter.java > >> >+++ > >> > >>>b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goo > >>>g/ > >> >TestGoogEmiter.java > >> >@@ -50,7 +50,7 @@ public class TestGoogEmiter extends ASTestBase > >> > + "return \"Don't \" + _privateVar + value; }"; > >> > IFileNode node = compileAS(code); > >> > asBlockWalker.visitFile(node); > >> >- > >> >assertOut("goog.provide('com.example.components.MyTextButton');\n\ > >> ngoog.re<http://ngoog.re> > >> >quire('spark.components.Button');\n\n/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n */\ncom.example.components.MyTextButton = > >> >function() {\n\tvar self = this;\n\tgoog.base(this);\n\tif (foo() != > >>42) > >> > >>>{\n\t\tbar();\n\t}\n}\ngoog.inherits(com.example.components.MyTextButton > >>>, > >> >spark.components.Button);\n\n/**\n * @private\n * @type {string}\n > >> >*/\ncom.example.components.MyTextButton.prototype._privateVar = \"do > >> >\";\n\n/**\n * @type {number}\n > >> >*/\ncom.example.components.MyTextButton.prototype.publicProperty = > >> >100;\n\n/**\n * @param {string} value\n * @return {string}\n > >> >*/\ncom.example.components.MyTextButton.prototype.myFunction = > >> >function(value) {\n\tvar self = this;\n\treturn \"Don't \" + > >> >self._privateVar + value;\n};"); > >> >+ > >> >assertOut("goog.provide('com.example.components.MyTextButton');\n\ > >> ngoog.re<http://ngoog.re> > >> >quire('spark.components.Button');\n\n/**\n * @constructor\n * @extends > >> >{spark.components.Button}\n */\ncom.example.components.MyTextButton = > >> >function() {\n\tvar self = > >> >this;\n\tcom.example.components.MyTextButton.base(this, > >> >'constructor');\n\tif (foo() != 42) > >> > >>>{\n\t\tbar();\n\t}\n}\ngoog.inherits(com.example.components.MyTextButton > >>>, > >> >spark.components.Button);\n\n/**\n * @private\n * @type {string}\n > >> >*/\ncom.example.components.MyTextButton.prototype._privateVar = \"do > >> >\";\n\n/**\n * @type {number}\n > >> >*/\ncom.example.components.MyTextButton.prototype.publicProperty = > >> >100;\n\n/**\n * @param {string} value\n * @return {string}\n > >> >*/\ncom.example.components.MyTextButton.prototype.myFunction = > >> >function(value) {\n\tvar self = this;\n\treturn \"Don't \" + > >> >self._privateVar + value;\n};"); > >> > } > >> > > >> > @Test > >> > > >> > >>> > http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3438a56e/compile > >>>r > >> . > >> > >>>jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogE > >>>xp > >> >ressions.java > >> >---------------------------------------------------------------------- > >> >diff --git > >> > >>>a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goo > >>>g/ > >> >TestGoogExpressions.java > >> > >>>b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goo > >>>g/ > >> >TestGoogExpressions.java > >> >index efcd335..df0c1cc 100644 > >> >--- > >> > >>>a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goo > >>>g/ > >> >TestGoogExpressions.java > >> >+++ > >> > >>>b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goo > >>>g/ > >> >TestGoogExpressions.java > >> >@@ -41,7 +41,7 @@ public class TestGoogExpressions extends > >>TestExpressions > >> > { > >> > IFunctionNode node = getMethod("function foo(){if (a) > >> >super.foo();}"); > >> > asBlockWalker.visitFunction(node); > >> >- assertOut("FalconTest_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\tFalconTest_A.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("FalconTest_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\tFalconTest_A.base(this, 'foo', a, b, c);\n}"); > >> > } > >> > > >> > //---------------------------------- > >> > > >> > >>> > http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3438a56e/compile > >>>r > >> . > >> >jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js > >> >---------------------------------------------------------------------- > >> >diff --git > >> >a/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js > >> >b/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js > >> >index 2c637cb..00a7f57 100644 > >> >--- > >>a/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js > >> >+++ > >>b/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js > >> >@@ -40,7 +40,7 @@ goog.require('org.apache.flex.events.Event'); > >> > * @extends {org.apache.flex.core.Application} > >> > */ > >> > FlexJSTest_again = function() { > >> >- goog.base(this); > >> >+ FlexJSTest_again.base(this, 'constructor'); > >> > > >> > /** > >> > * @private > >> >@@ -174,7 +174,7 @@ FlexJSTest_again.prototype.get_MXMLProperties = > >> >function() > >> > if (this.mxmldp == undefined) > >> > { > >> > /** @type {Array} */ > >> >- var arr = goog.base(this, 'get_MXMLProperties'); > >> >+ var arr = FlexJSTest_again.base(this, 'get_MXMLProperties'); > >> > /** @type {Array} */ > >> > var data = [ > >> > 5, > >> > > >> > >>> > http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3438a56e/compile > >>>r > >> . > >> >jx.tests/test-files/flexjs/files/MyInitialView_result.js > >> >---------------------------------------------------------------------- > >> >diff --git > >> >a/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js > >> >b/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js > >> >index 1cb09f4..5ce13fb 100644 > >> >--- a/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js > >> >+++ b/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js > >> >@@ -45,7 +45,7 @@ goog.require('org.apache.flex.utils.Timer'); > >> > * @extends {org.apache.flex.core.ViewBase} > >> > */ > >> > MyInitialView = function() { > >> >- goog.base(this); > >> >+ MyInitialView.base(this, 'constructor'); > >> > > >> > /** > >> > * @private > >> >@@ -498,7 +498,7 @@ MyInitialView.prototype.get_MXMLDescriptor = > >> >function() > >> > if (this.mxmldd == undefined) > >> > { > >> > /** @type {Array} */ > >> >- var arr = goog.base(this, 'get_MXMLDescriptor'); > >> >+ var arr = MyInitialView.base(this, 'get_MXMLDescriptor'); > >> > /** @type {Array} */ > >> > var data = [ > >> > org.apache.flex.html.Label, > >> > > >> > >>> > http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3438a56e/compile > >>>r > >> . > >> >jx.tests/test-files/flexjs/files/models/MyModel_result.js > >> >---------------------------------------------------------------------- > >> >diff --git > >> >a/compiler.jx.tests/test-files/flexjs/files/models/MyModel_result.js > >> >b/compiler.jx.tests/test-files/flexjs/files/models/MyModel_result.js > >> >index 46ec945..ac35168 100644 > >> >--- > >>a/compiler.jx.tests/test-files/flexjs/files/models/MyModel_result.js > >> >+++ > >>b/compiler.jx.tests/test-files/flexjs/files/models/MyModel_result.js > >> >@@ -28,7 +28,7 @@ goog.provide('models.MyModel'); > >> > * @extends {org.apache.flex.events.EventDispatcher} > >> > */ > >> > models.MyModel = function() { > >> >- goog.base(this); > >> >+ models.MyModel.base(this, 'constructor'); > >> > }; > >> > goog.inherits(models.MyModel, org.apache.flex.events.EventDispatcher); > >> > > >> > > >> > >>> > http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3438a56e/compile > >>>r > >> . > >> >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 > >> >index d9bd942..3370f1f 100644 > >> >--- > >>a/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js > >> >+++ > >>b/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js > >> >@@ -32,7 +32,7 @@ goog.require('org.apache.flex.html.Button'); > >> > * @extends {org.apache.flex.core.Application} > >> > */ > >> > wildcard_import = function() { > >> >- goog.base(this); > >> >+ wildcard_import.base(this, 'constructor'); > >> > > >> > /** > >> > * @private > >> > > >> > >>> > http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3438a56e/compile > >>>r > >> . > >> >jx.tests/test-files/flexjs/projects/interfaces/Test_result.js > >> >---------------------------------------------------------------------- > >> >diff --git > >> > >>>a/compiler.jx.tests/test-files/flexjs/projects/interfaces/Test_result.js > >> > >>>b/compiler.jx.tests/test-files/flexjs/projects/interfaces/Test_result.js > >> >index c0358a0..d76ea8d 100644 > >> >--- > >> > >>>a/compiler.jx.tests/test-files/flexjs/projects/interfaces/Test_result.js > >> >+++ > >> > >>>b/compiler.jx.tests/test-files/flexjs/projects/interfaces/Test_result.js > >> >@@ -36,7 +36,7 @@ goog.require('org.apache.flex.utils.Language'); > >> > * @implements {interfaces.IE} > >> > */ > >> > Test = function() { > >> >- goog.base(this); > >> >+ Test.base(this, 'constructor'); > >> > var /** @type {interfaces.IA} */ ia = > >> >org.apache.flex.utils.Language.as< > >> > >>http://org.apache.flex.utils.Language.as > >(this.doSomething(interfaces.IC) > >>, > >> >interfaces.IA); > >> > }; > >> > goog.inherits(Test, classes.A); > >> > > >> > >>> > http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3438a56e/compile > >>>r > >> . > >> >jx.tests/test-files/flexjs/projects/interfaces/classes/A_result.js > >> >---------------------------------------------------------------------- > >> >diff --git > >> > >>>a/compiler.jx.tests/test-files/flexjs/projects/interfaces/classes/A_resu > >>>lt > >> >.js > >> > >>>b/compiler.jx.tests/test-files/flexjs/projects/interfaces/classes/A_resu > >>>lt > >> >.js > >> >index 321c04b..e2dd3f0 100644 > >> >--- > >> > >>>a/compiler.jx.tests/test-files/flexjs/projects/interfaces/classes/A_resu > >>>lt > >> >.js > >> >+++ > >> > >>>b/compiler.jx.tests/test-files/flexjs/projects/interfaces/classes/A_resu > >>>lt > >> >.js > >> >@@ -30,7 +30,7 @@ goog.require('classes.C'); > >> > * @extends {classes.C} > >> > */ > >> > classes.A = function() { > >> >- goog.base(this); > >> >+ classes.A.base(this, 'constructor'); > >> > }; > >> > goog.inherits(classes.A, classes.C); > >> > > >> > > >> > >>> > http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3438a56e/compile > >>>r > >> . > >> >jx.tests/test-files/flexjs/projects/super/Base_result.js > >> >---------------------------------------------------------------------- > >> >diff --git > >> >a/compiler.jx.tests/test-files/flexjs/projects/super/Base_result.js > >> >b/compiler.jx.tests/test-files/flexjs/projects/super/Base_result.js > >> >index 179a96d..b89d15e 100644 > >> >--- a/compiler.jx.tests/test-files/flexjs/projects/super/Base_result.js > >> >+++ b/compiler.jx.tests/test-files/flexjs/projects/super/Base_result.js > >> >@@ -31,7 +31,7 @@ goog.require('org.apache.flex.utils.Language'); > >> > * @extends {Super} > >> > */ > >> > Base = function() { > >> >- goog.base(this); > >> >+ Base.base(this, 'constructor'); > >> > }; > >> > goog.inherits(Base, Super); > >> > > >> >@@ -42,7 +42,7 @@ goog.inherits(Base, Super); > >> > * @override > >> > */ > >> > Base.prototype.get_text = function() { > >> >- return "A" + goog.base(this, 'get_text'); > >> >+ return "A" + Base.base(this, 'get_text'); > >> > }; > >> > > >> > > >> >@@ -52,8 +52,8 @@ Base.prototype.get_text = function() { > >> > * @override > >> > */ > >> > Base.prototype.set_text = function(value) { > >> >- if (value != goog.base(this, 'get_text')) { > >> >- goog.base(this, 'set_text', "B" + value); > >> >+ if (value != Base.base(this, 'get_text')) { > >> >+ Base.base(this, 'set_text', "B" + value); > >> > } > >> > }; > >> > > >> > > >> > >>> > http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3438a56e/compile > >>>r > >> . > >> >jx.tests/test-files/goog/files/call-super_result.js > >> >---------------------------------------------------------------------- > >> >diff --git > >>a/compiler.jx.tests/test-files/goog/files/call-super_result.js > >> >b/compiler.jx.tests/test-files/goog/files/call-super_result.js > >> >index 0b8783e..93b52aa 100644 > >> >--- a/compiler.jx.tests/test-files/goog/files/call-super_result.js > >> >+++ b/compiler.jx.tests/test-files/goog/files/call-super_result.js > >> >@@ -24,7 +24,7 @@ goog.require('spark.components.Button'); > >> > */ > >> > org.apache.flex.A = function(z) { > >> > var self = this; > >> >- goog.base(this, z); > >> >+ org.apache.flex.A.base(this, 'constructor', z); > >> > } > >> > goog.inherits(org.apache.flex.A, spark.components.Button); > >> > > >> >@@ -35,7 +35,7 @@ goog.inherits(org.apache.flex.A, > >> >spark.components.Button); > >> > */ > >> > org.apache.flex.A.prototype.hasSuperCall = function(a, b) { > >> > var self = this; > >> >- goog.base(this, 'hasSuperCall', a, b, 100); > >> >+ org.apache.flex.A.base(this, 'hasSuperCall', a, b, 100); > >> > var /** @type {string} */ result = myRegularFunctionCall(-1); > >> > return result; > >> > }; > >> >\ No newline at end of file > >> > > >> > >>> > http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3438a56e/compile > >>>r > >> . > >> >jx.tests/test-files/goog/files/output.js > >> >---------------------------------------------------------------------- > >> >diff --git a/compiler.jx.tests/test-files/goog/files/output.js > >> >b/compiler.jx.tests/test-files/goog/files/output.js > >> >index e6ef05a..bee3fbb 100644 > >> >--- a/compiler.jx.tests/test-files/goog/files/output.js > >> >+++ b/compiler.jx.tests/test-files/goog/files/output.js > >> >@@ -23,7 +23,7 @@ goog.require('spark.components.Button'); > >> > */ > >> > org.apache.flex.A = function() { > >> > var self = this; > >> >- goog.base(this); > >> >+ org.apache.flex.A.base(this, 'constructor'); > >> > self.trace(typeof("a")); > >> > } > >> > goog.inherits(org.apache.flex.A, spark.components.Button); > >> > > >> > >>> > http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3438a56e/compile > >>>r > >> . > >> >jx.tests/test-files/goog/files/poc_result.js > >> >---------------------------------------------------------------------- > >> >diff --git a/compiler.jx.tests/test-files/goog/files/poc_result.js > >> >b/compiler.jx.tests/test-files/goog/files/poc_result.js > >> >index 4367c20..8f8e4cb 100644 > >> >--- a/compiler.jx.tests/test-files/goog/files/poc_result.js > >> >+++ b/compiler.jx.tests/test-files/goog/files/poc_result.js > >> >@@ -24,7 +24,7 @@ goog.require('spark.components.Label'); > >> > */ > >> > Example = function() { > >> > var self = this; > >> >- goog.base(this); > >> >+ Example.base(this, 'constructor'); > >> > self.init(); > >> > } > >> > goog.inherits(Example, spark.components.Group); > >> > > >> > >>> > http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3438a56e/compile > >>>r > >> . > >> >jx.tests/test-files/goog/files/qualify-new-object_result.js > >> >---------------------------------------------------------------------- > >> >diff --git > >> >a/compiler.jx.tests/test-files/goog/files/qualify-new-object_result.js > >> >b/compiler.jx.tests/test-files/goog/files/qualify-new-object_result.js > >> >index 0863529..a5dc7d7 100644 > >> >--- > >>a/compiler.jx.tests/test-files/goog/files/qualify-new-object_result.js > >> >+++ > >>b/compiler.jx.tests/test-files/goog/files/qualify-new-object_result.js > >> >@@ -22,7 +22,7 @@ goog.require('spark.components.Button'); > >> > */ > >> > org.apache.flex.A = function() { > >> > var self = this; > >> >- goog.base(this); > >> >+ org.apache.flex.A.base(this, 'constructor'); > >> > self.init(); > >> > } > >> > goog.inherits(org.apache.flex.A, flash.events.EventDispatcher); > >> > > >> > >> > >> > >> > >> -- > >> Ix Multimedia Software > >> > >> Jan Luykenstraat 27 > >> 3521 VB Utrecht > >> > >> T. 06-51952295<tel:06-51952295> > >> I. www.ixsoftware.nl<http://www.ixsoftware.nl> > >> > >> > >> > >> -- > >> Ix Multimedia Software > >> > >> Jan Luykenstraat 27 > >> 3521 VB Utrecht > >> > >> T. 06-51952295 > >> I. www.ixsoftware.nl<http://www.ixsoftware.nl> > >> > > > > > > > >-- > >Ix Multimedia Software > > > >Jan Luykenstraat 27 > >3521 VB Utrecht > > > >T. 06-51952295 > >I. www.ixsoftware.nl > > -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl