This is an automated email from the ASF dual-hosted git repository. joshtynjala pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit 7565699d3e1310637338f7bf150ca1d4b20d34cd Author: Josh Tynjala <[email protected]> AuthorDate: Fri Mar 15 15:56:08 2019 -0700 compiler-jx: fixed tests with js-default-initializers enabled --- .../codegen/js/royale/TestRoyaleAccessors.java | 14 ++++++------ .../codegen/js/royale/TestRoyaleEmitter.java | 8 +++---- .../codegen/js/royale/TestRoyaleExpressions.java | 18 +++++++-------- .../codegen/js/royale/TestRoyalePackage.java | 26 +++++++++++----------- .../royale/projects/circular/Base_result.js | 2 +- .../royale/projects/circular/Super_result.js | 11 +++++++-- .../royale/projects/interfaces/Test_result.js | 2 +- .../royale/projects/interfaces/classes/A_result.js | 2 +- .../royale/projects/interfaces/classes/B_result.js | 2 +- .../royale/projects/interfaces/classes/C_result.js | 2 +- .../projects/interfaces/interfaces/IA_result.js | 2 +- .../projects/interfaces/interfaces/IC_result.js | 2 +- .../projects/interfaces/interfaces/ID_result.js | 2 +- .../projects/interfaces/interfaces/IE_result.js | 2 +- .../royale/projects/internal/MainClass_result.js | 4 ++-- .../royale/projects/internal/OtherClass_result.js | 2 +- .../royale/projects/overrides/Test_result.js | 2 +- .../royale/projects/overrides/classes/A_result.js | 2 +- .../royale/projects/overrides/classes/B_result.js | 2 +- .../royale/projects/overrides/classes/C_result.js | 2 +- .../projects/overrides/interfaces/IA_result.js | 2 +- .../projects/overrides/interfaces/IB_result.js | 2 +- .../projects/overrides/interfaces/IC_result.js | 2 +- .../AmbiguousDefinition_result.js | 2 +- .../DifferentPackageAsConflict_result.js | 4 ++-- .../Event_result.js | 2 +- .../mypackage/TestClass_result.js | 4 ++-- .../otherpackage/Event_result.js | 2 +- .../Event_result.js | 2 +- .../NoConflictNoWindow_result.js | 4 ++-- .../mypackage/TestClass_result.js | 4 ++-- .../Event_result.js | 2 +- .../NoConflictUseWindow_result.js | 4 ++-- .../mypackage/TestClass_result.js | 4 ++-- .../Event_result.js | 2 +- .../SamePackageAsConflict_result.js | 4 ++-- .../mypackage/Event_result.js | 2 +- .../mypackage/TestClass_result.js | 4 ++-- .../package_conflicts_use_window/Event_result.js | 2 +- .../UseWindow_result.js | 4 ++-- .../mypackage/TestClass_result.js | 6 ++--- .../otherpackage/Event_result.js | 2 +- .../resources/royale/projects/super/Base_result.js | 2 +- .../royale/projects/super/Super_result.js | 2 +- .../projects/xml_requires/XMLRequire_result.js | 2 +- 45 files changed, 94 insertions(+), 87 deletions(-) diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleAccessors.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleAccessors.java index 8e7a8c7..917f615 100644 --- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleAccessors.java +++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleAccessors.java @@ -46,7 +46,7 @@ public class TestRoyaleAccessors extends ASTestBase "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 */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @export\n */\nRoyaleTest_A.prototype.doStuff = function() {\n this.label = 'hello, bye';\n var /** @type {string} */ theLabel = this.label;\n};\n\n\n/**\n * @private\n * @type {string}\n */\nRoyaleTest_A.prototype._label;\n\n\n" + + String expected = "/**\n * @constructor\n */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @export\n */\nRoyaleTest_A.prototype.doStuff = function() {\n this.label = 'hello, bye';\n var /** @type {string} */ theLabel = this.label;\n};\n\n\n/**\n * @private\n * @type {string}\n */\nRoyaleTest_A.prototype._label = null;\n\n\n" + "RoyaleTest_A.prototype.get__label = function() {\n return this._label;\n};\n\n\n" + "RoyaleTest_A.prototype.set__label = function(value) {\n this._label = value;\n};\n\n\n" + "Object.defineProperties(RoyaleTest_A.prototype, /** @lends {RoyaleTest_A.prototype} */ {\n/**\n * @export\n * @type {string} */\n" + @@ -61,7 +61,7 @@ public class TestRoyaleAccessors extends ASTestBase "public class B { public function B() {}; public function doStuff():void {this.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_PACKAGE); asBlockWalker.visitClass(node); - String expected = "/**\n * @constructor\n */\nB = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('B', B);\n\n\n/**\n * @export\n */\nB.prototype.doStuff = function() {\n this.label = this.label + 'bye';\n var /** @type {string} */ theLabel = this.label;\n};\n\n\n/**\n * @private\n * @type {string}\n */\nB.prototype._label;\n\n\n" + + String expected = "/**\n * @constructor\n */\nB = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('B', B);\n\n\n/**\n * @export\n */\nB.prototype.doStuff = function() {\n this.label = this.label + 'bye';\n var /** @type {string} */ theLabel = this.label;\n};\n\n\n/**\n * @private\n * @type {string}\n */\nB.prototype._label = null;\n\n\n" + "B.prototype.get__label = function() {\n return this._label;\n};\n\n\n" + "B.prototype.set__label = function(value) {\n this._label = value;\n};\n\n\n" + "Object.defineProperties(B.prototype, /** @lends {B.prototype} */ {\n/**\n * @export\n * @type {string} */\nlabel: {\n" + @@ -76,7 +76,7 @@ public class TestRoyaleAccessors extends ASTestBase "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 */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @export\n */\nRoyaleTest_A.prototype.doStuff = function() {\n this.label = this.label + 'bye';\n var /** @type {string} */ theLabel = this.label;\n};\n\n\n/**\n * @private\n * @type {string}\n */\nRoyaleTest_A.prototype._label;\n\n\n" + + String expected = "/**\n * @constructor\n */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @export\n */\nRoyaleTest_A.prototype.doStuff = function() {\n this.label = this.label + 'bye';\n var /** @type {string} */ theLabel = this.label;\n};\n\n\n/**\n * @private\n * @type {string}\n */\nRoyaleTest_A.prototype._label = null;\n\n\n" + "RoyaleTest_A.prototype.get__label = function() {\n return this._label;\n};\n\n\n" + "RoyaleTest_A.prototype.set__label = function(value) {\n this._label = value;\n};\n\n\n" + "Object.defineProperties(RoyaleTest_A.prototype, /** @lends {RoyaleTest_A.prototype} */ {\n/**\n * @export\n * @type {string} */\nlabel: {\n" + @@ -91,7 +91,7 @@ public class TestRoyaleAccessors extends ASTestBase "public class B { public function B() {}; public function doStuff():void {label = this.label; 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_PACKAGE); asBlockWalker.visitClass(node); - String expected = "/**\n * @constructor\n */\nB = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('B', B);\n\n\n/**\n * @export\n */\nB.prototype.doStuff = function() {\n this.label = this.label;\n var /** @type {string} */ theLabel = this.label;\n};\n\n\n/**\n * @private\n * @type {string}\n */\nB.prototype._label;\n\n\n" + + String expected = "/**\n * @constructor\n */\nB = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('B', B);\n\n\n/**\n * @export\n */\nB.prototype.doStuff = function() {\n this.label = this.label;\n var /** @type {string} */ theLabel = this.label;\n};\n\n\n/**\n * @private\n * @type {string}\n */\nB.prototype._label = null;\n\n\n" + "B.prototype.get__label = function() {\n return this._label;\n};\n\n\n" + "B.prototype.set__label = function(value) {\n this._label = value;\n};\n\n\n" + "Object.defineProperties(B.prototype, /** @lends {B.prototype} */ {\n/**\n * @export\n * @type {string} */\nlabel: {\n" + @@ -106,7 +106,7 @@ public class TestRoyaleAccessors extends ASTestBase "import custom.custom_namespace;use namespace custom_namespace;public class B { public function B() {}; public function doStuff():void {var theLabel:String = label; label = theLabel;}; private var _label:String; custom_namespace function get label():String {return _label}; custom_namespace function set label(value:String):void {_label = value};}", IClassNode.class, WRAP_LEVEL_PACKAGE); asBlockWalker.visitClass(node); - String expected = "/**\n * @constructor\n */\nB = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('B', B);\n\n\n/**\n * @export\n */\nB.prototype.doStuff = function() {\n var /** @type {string} */ theLabel = this.http_$$ns_apache_org$2017$custom$namespace__label;\n this.http_$$ns_apache_org$2017$custom$namespace__label = theLabel;\n};\n\n\n/**\n * @private\n * @type {string}\n */\nB.prototype._label;\n\n\n" + + String expected = "/**\n * @constructor\n */\nB = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('B', B);\n\n\n/**\n * @export\n */\nB.prototype.doStuff = function() {\n var /** @type {string} */ theLabel = this.http_$$ns_apache_org$2017$custom$namespace__label;\n this.http_$$ns_apache_org$2017$custom$namespace__label = theLabel;\n};\n\n\n/**\n * @private\n * @type {string}\n */\nB.prototype._label = null;\n\n\n" + "B.prototype.http_$$ns_apache_org$2017$custom$namespace__get__label = function() {\n return this._label;\n};\n\n\n" + "B.prototype.http_$$ns_apache_org$2017$custom$namespace__set__label = function(value) {\n this._label = value;\n};\n\n\n" + "Object.defineProperties(B.prototype, /** @lends {B.prototype} */ {\n/**\n * @export\n * @type {string} */\nhttp_$$ns_apache_org$2017$custom$namespace__label: {\nget: B.prototype.http_$$ns_apache_org$2017$custom$namespace__get__label,\nset: B.prototype.http_$$ns_apache_org$2017$custom$namespace__set__label}}\n);"; @@ -120,7 +120,7 @@ public class TestRoyaleAccessors extends ASTestBase "public function doStuff():void {label = 'hello, bye'; var theLabel:String = label;}; private var _label:String; [Bindable] 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 */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @export\n */\nRoyaleTest_A.prototype.doStuff = function() {\n this.label = 'hello, bye';\n var /** @type {string} */ theLabel = this.label;\n};\n\n\n/**\n * @private\n * @type {string}\n */\nRoyaleTest_A.prototype._label;\n\n\n" + + String expected = "/**\n * @constructor\n */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @export\n */\nRoyaleTest_A.prototype.doStuff = function() {\n this.label = 'hello, bye';\n var /** @type {string} */ theLabel = this.label;\n};\n\n\n/**\n * @private\n * @type {string}\n */\nRoyaleTest_A.prototype._label = null;\n\n\n" + "RoyaleTest_A.prototype.get__label = function() {\n return this._label;\n};\n\n\n" + "RoyaleTest_A.prototype.bindable__set__label = function(value) {\n this._label = value;\n};\n\n\n" + "RoyaleTest_A.prototype.set__label = function(value) {\nvar oldValue = this.get__label();\nif (oldValue != value) {\nthis.bindable__set__label(value);\n" + @@ -138,7 +138,7 @@ public class TestRoyaleAccessors extends ASTestBase "public function doStuff():void {label = 'hello, bye'; var theLabel:String = label;}; private var _label:String; [Bindable(\"change\")] 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 */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @export\n */\nRoyaleTest_A.prototype.doStuff = function() {\n this.label = 'hello, bye';\n var /** @type {string} */ theLabel = this.label;\n};\n\n\n/**\n * @private\n * @type {string}\n */\nRoyaleTest_A.prototype._label;\n\n\n" + + String expected = "/**\n * @constructor\n */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @export\n */\nRoyaleTest_A.prototype.doStuff = function() {\n this.label = 'hello, bye';\n var /** @type {string} */ theLabel = this.label;\n};\n\n\n/**\n * @private\n * @type {string}\n */\nRoyaleTest_A.prototype._label = null;\n\n\n" + "RoyaleTest_A.prototype.get__label = function() {\n return this._label;\n};\n\n\n" + "RoyaleTest_A.prototype.set__label = function(value) {\n this._label = value;\n};\n\n\n" + "Object.defineProperties(RoyaleTest_A.prototype, /** @lends {RoyaleTest_A.prototype} */ {\n/**\n * @export\n * @type {string} */\n" + diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleEmitter.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleEmitter.java index 6a96320..94d39f5 100644 --- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleEmitter.java +++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleEmitter.java @@ -150,7 +150,7 @@ public class TestRoyaleEmitter extends TestGoogEmitter " * @const\n" + " * @type {number}\n" + " */\n" + - "com.example.components.MyEventTarget.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8;\n"); + "com.example.components.MyEventTarget.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9;\n"); } @Override @@ -210,7 +210,7 @@ public class TestRoyaleEmitter extends TestGoogEmitter " * @const\n" + " * @type {number}\n" + " */\n" + - "com.example.components.TestInterface.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8;\n"); + "com.example.components.TestInterface.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9;\n"); } @Override @@ -272,7 +272,7 @@ public class TestRoyaleEmitter extends TestGoogEmitter " * @const\n" + " * @type {number}\n" + " */\n" + - "com.example.components.TestClass.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8;\n"); + "com.example.components.TestClass.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9;\n"); } @Test @@ -346,7 +346,7 @@ public class TestRoyaleEmitter extends TestGoogEmitter " * @const\n" + " * @type {number}\n" + " */\n" + - "com.example.components.TestClass.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8;\n"); + "com.example.components.TestClass.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9;\n"); } diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleExpressions.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleExpressions.java index 3eea2d3..57276c7 100644 --- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleExpressions.java +++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleExpressions.java @@ -187,7 +187,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions IClassDefinition def = classnode.getDefinition(); ((JSRoyaleEmitter)asEmitter).getModel().setCurrentClass(def); asBlockWalker.visitFunction(fnode); - assertOut("/**\n * @export\n * @override\n */\nRoyaleTest_A.prototype.foo = function() {\n var /** @type {Function} */ f;\n f = org.apache.royale.utils.Language.closure(RoyaleTest_A.superClass_.foo, this, 'foo');\n}"); + assertOut("/**\n * @export\n * @override\n */\nRoyaleTest_A.prototype.foo = function() {\n var /** @type {Function} */ f = null;\n f = org.apache.royale.utils.Language.closure(RoyaleTest_A.superClass_.foo, this, 'foo');\n}"); } @Test @@ -1200,7 +1200,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions "public class B {public function b() { function c(f:Function):void {}; var f:Function; f = b; c(f); }}", IFunctionNode.class, WRAP_LEVEL_PACKAGE); asBlockWalker.visitFunction(node); - assertOut("/**\n * @export\n */\nB.prototype.b = function() {\n var self = this;\n function c(f) {\n };\n var /** @type {Function} */ f;\n f = org.apache.royale.utils.Language.closure(this.b, this, 'b');\n c(f);\n}"); + assertOut("/**\n * @export\n */\nB.prototype.b = function() {\n var self = this;\n function c(f) {\n };\n var /** @type {Function} */ f = null;\n f = org.apache.royale.utils.Language.closure(this.b, this, 'b');\n c(f);\n}"); } @Test @@ -1210,7 +1210,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions "public class B {static public function b() { function c(f:Function):void {}; var f:Function; f = b; c(f); }}", IFunctionNode.class, WRAP_LEVEL_PACKAGE, true); asBlockWalker.visitFunction(node); - assertOut("/**\n * @export\n */\nfoo.bar.B.b = function() {\n function c(f) {\n };\n var /** @type {Function} */ f;\n f = foo.bar.B.b;\n c(f);\n}"); + assertOut("/**\n * @export\n */\nfoo.bar.B.b = function() {\n function c(f) {\n };\n var /** @type {Function} */ f = null;\n f = foo.bar.B.b;\n c(f);\n}"); } @Test @@ -1261,7 +1261,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions IFunctionNode.class, WRAP_LEVEL_PACKAGE, true); asBlockWalker.visitFunction(node); // String.length is a getter but is a property in JS, so don't generate set_length() call. - assertOut("/**\n * @export\n * @return {number}\n */\nfoo.bar.B.prototype.b = function() {\n var /** @type {string} */ s;\n return s.length;\n}"); + assertOut("/**\n * @export\n * @return {number}\n */\nfoo.bar.B.prototype.b = function() {\n var /** @type {string} */ s = null;\n return s.length;\n}"); } @Test @@ -1272,7 +1272,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions IFunctionNode.class, WRAP_LEVEL_PACKAGE, true); asBlockWalker.visitFunction(node); // String.length is a getter but is a property in JS, so don't generate set_length() call. - assertOut("/**\n * @export\n * @return {number}\n */\nfoo.bar.B.prototype.b = function() {\n var /** @type {Array} */ a;\n return a.length;\n}"); + assertOut("/**\n * @export\n * @return {number}\n */\nfoo.bar.B.prototype.b = function() {\n var /** @type {Array} */ a = null;\n return a.length;\n}"); } //---------------------------------- @@ -1328,7 +1328,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions { IFunctionNode node = getMethod("function foo(b:Boolean):Boolean {var c:String; var d:String; if (!(b ? c : d)) { return b;}}"); asBlockWalker.visitFunction(node); - assertOut("/**\n * @export\n * @param {boolean} b\n * @return {boolean}\n */\nRoyaleTest_A.prototype.foo = function(b) {\n var /** @type {string} */ c;\n var /** @type {string} */ d;\n if (!(b ? c : d)) {\n return b;\n }\n}"); + assertOut("/**\n * @export\n * @param {boolean} b\n * @return {boolean}\n */\nRoyaleTest_A.prototype.foo = function(b) {\n var /** @type {string} */ c = null;\n var /** @type {string} */ d = null;\n if (!(b ? c : d)) {\n return b;\n }\n}"); } @Override @@ -1494,7 +1494,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions "public class B {public function b(o:Object):int { var a:B; a = o as B; }}", IFunctionNode.class, WRAP_LEVEL_PACKAGE, true); asBlockWalker.visitFunction(node); - assertOut("/**\n * @export\n * @param {Object} o\n * @return {number}\n */\nfoo.bar.B.prototype.b = function(o) {\n var /** @type {foo.bar.B} */ a;\n a = org.apache.royale.utils.Language.as(o, foo.bar.B);\n}"); + assertOut("/**\n * @export\n * @param {Object} o\n * @return {number}\n */\nfoo.bar.B.prototype.b = function(o) {\n var /** @type {foo.bar.B} */ a = null;\n a = org.apache.royale.utils.Language.as(o, foo.bar.B);\n}"); } @Test @@ -1520,7 +1520,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions "public class B {private var memberVar:Class; public function b(o:Object):int { var a:B; a = o as memberVar; }}", IFunctionNode.class, WRAP_LEVEL_PACKAGE, true); asBlockWalker.visitFunction(node); - assertOut("/**\n * @export\n * @param {Object} o\n * @return {number}\n */\nfoo.bar.B.prototype.b = function(o) {\n var /** @type {foo.bar.B} */ a;\n a = org.apache.royale.utils.Language.as(o, this.memberVar);\n}"); + assertOut("/**\n * @export\n * @param {Object} o\n * @return {number}\n */\nfoo.bar.B.prototype.b = function(o) {\n var /** @type {foo.bar.B} */ a = null;\n a = org.apache.royale.utils.Language.as(o, this.memberVar);\n}"); } @Test @@ -1530,7 +1530,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions "public class LinkableString {public function b(o:Object):int { var a:LinkableString; a = o as LinkableString; }}", IFunctionNode.class, WRAP_LEVEL_PACKAGE, true); asBlockWalker.visitFunction(node); - assertOut("/**\n * @export\n * @param {Object} o\n * @return {number}\n */\nfoo.bar.LinkableString.prototype.b = function(o) {\n var /** @type {foo.bar.LinkableString} */ a;\n a = org.apache.royale.utils.Language.as(o, foo.bar.LinkableString);\n}"); + assertOut("/**\n * @export\n * @param {Object} o\n * @return {number}\n */\nfoo.bar.LinkableString.prototype.b = function(o) {\n var /** @type {foo.bar.LinkableString} */ a = null;\n a = org.apache.royale.utils.Language.as(o, foo.bar.LinkableString);\n}"); } @Override diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyalePackage.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyalePackage.java index 32815fb..488954a 100644 --- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyalePackage.java +++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyalePackage.java @@ -111,7 +111,7 @@ public class TestRoyalePackage extends TestGoogPackage " * @const\n" + " * @type {number}\n" + " */\n" + - "A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 14;\n"); + "A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 15;\n"); } @Override @@ -165,7 +165,7 @@ public class TestRoyalePackage extends TestGoogPackage " * @const\n" + " * @type {number}\n" + " */\n" + - "foo.bar.baz.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 14;\n"); + "foo.bar.baz.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 15;\n"); } @Override @@ -229,7 +229,7 @@ public class TestRoyalePackage extends TestGoogPackage " * @const\n" + " * @type {number}\n" + " */\n" + - "foo.bar.baz.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 14;\n" + "foo.bar.baz.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 15;\n" ); } @@ -300,7 +300,7 @@ public class TestRoyalePackage extends TestGoogPackage " * @const\n" + " * @type {number}\n" + " */\n" + - "foo.bar.baz.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 14;\n"); + "foo.bar.baz.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 15;\n"); } @Test @@ -364,7 +364,7 @@ public class TestRoyalePackage extends TestGoogPackage " * @const\n" + " * @type {number}\n" + " */\n" + - "foo.bar.baz.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 14;\n"); + "foo.bar.baz.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 15;\n"); } @Test @@ -436,7 +436,7 @@ public class TestRoyalePackage extends TestGoogPackage " * @const\n" + " * @type {number}\n" + " */\n" + - "foo.bar.baz.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 14;\n" + + "foo.bar.baz.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 15;\n" + "goog.exportProperty(foo.bar.baz.A.prototype, 'foo', foo.bar.baz.A.prototype.foo);\n" ); } @@ -509,7 +509,7 @@ public class TestRoyalePackage extends TestGoogPackage " * @const\n" + " * @type {number}\n" + " */\n" + - "foo.bar.baz.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 14;\n" + + "foo.bar.baz.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 15;\n" + "\n" + "\n" + "\n" + @@ -602,7 +602,7 @@ public class TestRoyalePackage extends TestGoogPackage " * @const\n" + " * @type {number}\n" + " */\n" + - "foo.bar.baz.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 14;\n" + + "foo.bar.baz.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 15;\n" + "\n" + "\n" + "\n" + @@ -677,7 +677,7 @@ public class TestRoyalePackage extends TestGoogPackage " * @const\n" + " * @type {number}\n" + " */\n" + - "foo.bar.baz.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 14;\n" + + "foo.bar.baz.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 15;\n" + "\n" + "\n" + "\n" + @@ -768,7 +768,7 @@ public class TestRoyalePackage extends TestGoogPackage " * @const\n" + " * @type {number}\n" + " */\n" + - "foo.bar.baz.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 14;\n" + + "foo.bar.baz.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 15;\n" + "\n" + "\n" + "\n" + @@ -925,7 +925,7 @@ public class TestRoyalePackage extends TestGoogPackage " * @const\n" + " * @type {number}\n" + " */\n" + - "foo.bar.baz.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 14;\n" + + "foo.bar.baz.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 15;\n" + "\n" + "\n" + "\n" + @@ -1048,7 +1048,7 @@ public class TestRoyalePackage extends TestGoogPackage " * @const\n" + " * @type {number}\n" + " */\n" + - "foo.bar.baz.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 14;\n" + + "foo.bar.baz.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 15;\n" + "\n" + "\n" + "\n" + @@ -1096,7 +1096,7 @@ public class TestRoyalePackage extends TestGoogPackage " * @const\n" + " * @type {number}\n" + " */\n" + - "foo.bar.baz.A.ITestInterface.prototype.ROYALE_REFLECTION_INFO.compileFlags = 14;\n" + + "foo.bar.baz.A.ITestInterface.prototype.ROYALE_REFLECTION_INFO.compileFlags = 15;\n" + "\n" + "\n" + "\n" + diff --git a/compiler-jx/src/test/resources/royale/projects/circular/Base_result.js b/compiler-jx/src/test/resources/royale/projects/circular/Base_result.js index 3737be0..ea802df 100644 --- a/compiler-jx/src/test/resources/royale/projects/circular/Base_result.js +++ b/compiler-jx/src/test/resources/royale/projects/circular/Base_result.js @@ -71,4 +71,4 @@ Base.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -Base.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +Base.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/circular/Super_result.js b/compiler-jx/src/test/resources/royale/projects/circular/Super_result.js index 450ca38..60b608f 100644 --- a/compiler-jx/src/test/resources/royale/projects/circular/Super_result.js +++ b/compiler-jx/src/test/resources/royale/projects/circular/Super_result.js @@ -42,7 +42,7 @@ goog.exportSymbol('Super', Super); * @private * @type {Base} */ -Super.isItCircular; +Super.isItCircular = null; /** @@ -75,4 +75,11 @@ Super.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -Super.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +Super.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; +/** + * Provide reflection support for distinguishing dynamic fields on class object (static) + * @export + * @const + * @type {Array<string>} + */ +Super.prototype.ROYALE_REFLECTION_INFO.statics = Object.keys(Super); \ No newline at end of file diff --git a/compiler-jx/src/test/resources/royale/projects/interfaces/Test_result.js b/compiler-jx/src/test/resources/royale/projects/interfaces/Test_result.js index 1517644..41f6619 100644 --- a/compiler-jx/src/test/resources/royale/projects/interfaces/Test_result.js +++ b/compiler-jx/src/test/resources/royale/projects/interfaces/Test_result.js @@ -92,4 +92,4 @@ Test.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -Test.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +Test.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/interfaces/classes/A_result.js b/compiler-jx/src/test/resources/royale/projects/interfaces/classes/A_result.js index b843e24..38adfe9 100644 --- a/compiler-jx/src/test/resources/royale/projects/interfaces/classes/A_result.js +++ b/compiler-jx/src/test/resources/royale/projects/interfaces/classes/A_result.js @@ -71,4 +71,4 @@ classes.A.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -classes.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +classes.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/interfaces/classes/B_result.js b/compiler-jx/src/test/resources/royale/projects/interfaces/classes/B_result.js index a0174ff..362c2ac 100644 --- a/compiler-jx/src/test/resources/royale/projects/interfaces/classes/B_result.js +++ b/compiler-jx/src/test/resources/royale/projects/interfaces/classes/B_result.js @@ -66,4 +66,4 @@ classes.B.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -classes.B.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +classes.B.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/interfaces/classes/C_result.js b/compiler-jx/src/test/resources/royale/projects/interfaces/classes/C_result.js index 4799d88..3a586f8 100644 --- a/compiler-jx/src/test/resources/royale/projects/interfaces/classes/C_result.js +++ b/compiler-jx/src/test/resources/royale/projects/interfaces/classes/C_result.js @@ -66,4 +66,4 @@ classes.C.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -classes.C.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +classes.C.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/interfaces/interfaces/IA_result.js b/compiler-jx/src/test/resources/royale/projects/interfaces/interfaces/IA_result.js index 604bf16..92fc242 100644 --- a/compiler-jx/src/test/resources/royale/projects/interfaces/interfaces/IA_result.js +++ b/compiler-jx/src/test/resources/royale/projects/interfaces/interfaces/IA_result.js @@ -64,4 +64,4 @@ interfaces.IA.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -interfaces.IA.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +interfaces.IA.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/interfaces/interfaces/IC_result.js b/compiler-jx/src/test/resources/royale/projects/interfaces/interfaces/IC_result.js index b769f2a..0aaf33e 100644 --- a/compiler-jx/src/test/resources/royale/projects/interfaces/interfaces/IC_result.js +++ b/compiler-jx/src/test/resources/royale/projects/interfaces/interfaces/IC_result.js @@ -64,4 +64,4 @@ interfaces.IC.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -interfaces.IC.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +interfaces.IC.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/interfaces/interfaces/ID_result.js b/compiler-jx/src/test/resources/royale/projects/interfaces/interfaces/ID_result.js index 2531d35..31223a4 100644 --- a/compiler-jx/src/test/resources/royale/projects/interfaces/interfaces/ID_result.js +++ b/compiler-jx/src/test/resources/royale/projects/interfaces/interfaces/ID_result.js @@ -61,4 +61,4 @@ interfaces.ID.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -interfaces.ID.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +interfaces.ID.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/interfaces/interfaces/IE_result.js b/compiler-jx/src/test/resources/royale/projects/interfaces/interfaces/IE_result.js index 7aea0a3..d4f2f8f 100644 --- a/compiler-jx/src/test/resources/royale/projects/interfaces/interfaces/IE_result.js +++ b/compiler-jx/src/test/resources/royale/projects/interfaces/interfaces/IE_result.js @@ -73,4 +73,4 @@ interfaces.IE.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -interfaces.IE.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +interfaces.IE.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/internal/MainClass_result.js b/compiler-jx/src/test/resources/royale/projects/internal/MainClass_result.js index 9a5c28e..f2bff9f 100644 --- a/compiler-jx/src/test/resources/royale/projects/internal/MainClass_result.js +++ b/compiler-jx/src/test/resources/royale/projects/internal/MainClass_result.js @@ -69,7 +69,7 @@ MainClass.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -MainClass.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +MainClass.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; @@ -91,7 +91,7 @@ goog.exportSymbol('MainClass.InternalClass', MainClass.InternalClass); * @export * @type {OtherClass} */ -MainClass.InternalClass.prototype.foo; +MainClass.InternalClass.prototype.foo = null; /** diff --git a/compiler-jx/src/test/resources/royale/projects/internal/OtherClass_result.js b/compiler-jx/src/test/resources/royale/projects/internal/OtherClass_result.js index 471b66a..ad59e37 100644 --- a/compiler-jx/src/test/resources/royale/projects/internal/OtherClass_result.js +++ b/compiler-jx/src/test/resources/royale/projects/internal/OtherClass_result.js @@ -66,4 +66,4 @@ OtherClass.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -OtherClass.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +OtherClass.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/overrides/Test_result.js b/compiler-jx/src/test/resources/royale/projects/overrides/Test_result.js index c04f324..3d227df 100644 --- a/compiler-jx/src/test/resources/royale/projects/overrides/Test_result.js +++ b/compiler-jx/src/test/resources/royale/projects/overrides/Test_result.js @@ -93,4 +93,4 @@ Test.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -Test.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +Test.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/overrides/classes/A_result.js b/compiler-jx/src/test/resources/royale/projects/overrides/classes/A_result.js index 50a3f63..577dab8 100644 --- a/compiler-jx/src/test/resources/royale/projects/overrides/classes/A_result.js +++ b/compiler-jx/src/test/resources/royale/projects/overrides/classes/A_result.js @@ -91,4 +91,4 @@ classes.A.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -classes.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +classes.A.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/overrides/classes/B_result.js b/compiler-jx/src/test/resources/royale/projects/overrides/classes/B_result.js index a0174ff..362c2ac 100644 --- a/compiler-jx/src/test/resources/royale/projects/overrides/classes/B_result.js +++ b/compiler-jx/src/test/resources/royale/projects/overrides/classes/B_result.js @@ -66,4 +66,4 @@ classes.B.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -classes.B.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +classes.B.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/overrides/classes/C_result.js b/compiler-jx/src/test/resources/royale/projects/overrides/classes/C_result.js index d7e10b4..a8fa919 100644 --- a/compiler-jx/src/test/resources/royale/projects/overrides/classes/C_result.js +++ b/compiler-jx/src/test/resources/royale/projects/overrides/classes/C_result.js @@ -71,4 +71,4 @@ classes.C.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -classes.C.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +classes.C.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/overrides/interfaces/IA_result.js b/compiler-jx/src/test/resources/royale/projects/overrides/interfaces/IA_result.js index 8c09540..1a5b8ce 100644 --- a/compiler-jx/src/test/resources/royale/projects/overrides/interfaces/IA_result.js +++ b/compiler-jx/src/test/resources/royale/projects/overrides/interfaces/IA_result.js @@ -81,4 +81,4 @@ interfaces.IA.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -interfaces.IA.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +interfaces.IA.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/overrides/interfaces/IB_result.js b/compiler-jx/src/test/resources/royale/projects/overrides/interfaces/IB_result.js index c70befd..cfd1886 100644 --- a/compiler-jx/src/test/resources/royale/projects/overrides/interfaces/IB_result.js +++ b/compiler-jx/src/test/resources/royale/projects/overrides/interfaces/IB_result.js @@ -61,4 +61,4 @@ interfaces.IB.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -interfaces.IB.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +interfaces.IB.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/overrides/interfaces/IC_result.js b/compiler-jx/src/test/resources/royale/projects/overrides/interfaces/IC_result.js index 54923f7..cc176a9 100644 --- a/compiler-jx/src/test/resources/royale/projects/overrides/interfaces/IC_result.js +++ b/compiler-jx/src/test/resources/royale/projects/overrides/interfaces/IC_result.js @@ -64,4 +64,4 @@ interfaces.IC.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -interfaces.IC.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +interfaces.IC.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_ambiguous_definition/AmbiguousDefinition_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_ambiguous_definition/AmbiguousDefinition_result.js index b176467..59ea4a8 100644 --- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_ambiguous_definition/AmbiguousDefinition_result.js +++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_ambiguous_definition/AmbiguousDefinition_result.js @@ -38,7 +38,7 @@ AmbiguousDefinition = function() { * @export * @type {mypackage.TestClass} */ -AmbiguousDefinition.prototype.testClass; +AmbiguousDefinition.prototype.testClass = null; /** diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/DifferentPackageAsConflict_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/DifferentPackageAsConflict_result.js index ff4cae7..e937e30 100644 --- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/DifferentPackageAsConflict_result.js +++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/DifferentPackageAsConflict_result.js @@ -43,7 +43,7 @@ goog.exportSymbol('DifferentPackageAsConflict', DifferentPackageAsConflict); * @private * @type {mypackage.TestClass} */ -DifferentPackageAsConflict.prototype.testClass; +DifferentPackageAsConflict.prototype.testClass = null; /** @@ -76,4 +76,4 @@ DifferentPackageAsConflict.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -DifferentPackageAsConflict.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +DifferentPackageAsConflict.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/Event_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/Event_result.js index 6b5f4e8..e66b810 100644 --- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/Event_result.js +++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/Event_result.js @@ -67,4 +67,4 @@ Event.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -Event.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +Event.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/mypackage/TestClass_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/mypackage/TestClass_result.js index 1f4075c..edc4b35 100644 --- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/mypackage/TestClass_result.js +++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/mypackage/TestClass_result.js @@ -45,7 +45,7 @@ goog.exportSymbol('mypackage.TestClass', mypackage.TestClass); * @private * @type {otherpackage.Event} */ -mypackage.TestClass.prototype.event; +mypackage.TestClass.prototype.event = null; /** @@ -78,4 +78,4 @@ mypackage.TestClass.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -mypackage.TestClass.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +mypackage.TestClass.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/otherpackage/Event_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/otherpackage/Event_result.js index ccd2439..17edd42 100644 --- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/otherpackage/Event_result.js +++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/otherpackage/Event_result.js @@ -67,4 +67,4 @@ otherpackage.Event.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -otherpackage.Event.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +otherpackage.Event.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_no_window/Event_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_no_window/Event_result.js index bef8801..2ff7e8d 100644 --- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_no_window/Event_result.js +++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_no_window/Event_result.js @@ -66,4 +66,4 @@ Event.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -Event.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +Event.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_no_window/NoConflictNoWindow_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_no_window/NoConflictNoWindow_result.js index 4a77bb5..fbac53a 100644 --- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_no_window/NoConflictNoWindow_result.js +++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_no_window/NoConflictNoWindow_result.js @@ -43,7 +43,7 @@ goog.exportSymbol('NoConflictNoWindow', NoConflictNoWindow); * @private * @type {mypackage.TestClass} */ -NoConflictNoWindow.prototype.testClass; +NoConflictNoWindow.prototype.testClass = null; /** @@ -76,4 +76,4 @@ NoConflictNoWindow.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -NoConflictNoWindow.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +NoConflictNoWindow.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_no_window/mypackage/TestClass_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_no_window/mypackage/TestClass_result.js index 29803ad..73ec794 100644 --- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_no_window/mypackage/TestClass_result.js +++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_no_window/mypackage/TestClass_result.js @@ -43,7 +43,7 @@ goog.exportSymbol('mypackage.TestClass', mypackage.TestClass); * @private * @type {Event} */ -mypackage.TestClass.prototype.event; +mypackage.TestClass.prototype.event = null; /** @@ -76,4 +76,4 @@ mypackage.TestClass.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -mypackage.TestClass.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +mypackage.TestClass.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_use_window/Event_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_use_window/Event_result.js index 6b5f4e8..e66b810 100644 --- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_use_window/Event_result.js +++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_use_window/Event_result.js @@ -67,4 +67,4 @@ Event.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -Event.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +Event.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_use_window/NoConflictUseWindow_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_use_window/NoConflictUseWindow_result.js index 366eed0..f4e8888 100644 --- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_use_window/NoConflictUseWindow_result.js +++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_use_window/NoConflictUseWindow_result.js @@ -43,7 +43,7 @@ goog.exportSymbol('NoConflictUseWindow', NoConflictUseWindow); * @private * @type {mypackage.TestClass} */ -NoConflictUseWindow.prototype.testClass; +NoConflictUseWindow.prototype.testClass = null; /** @@ -76,4 +76,4 @@ NoConflictUseWindow.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -NoConflictUseWindow.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +NoConflictUseWindow.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_use_window/mypackage/TestClass_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_use_window/mypackage/TestClass_result.js index 29803ad..73ec794 100644 --- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_use_window/mypackage/TestClass_result.js +++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_use_window/mypackage/TestClass_result.js @@ -43,7 +43,7 @@ goog.exportSymbol('mypackage.TestClass', mypackage.TestClass); * @private * @type {Event} */ -mypackage.TestClass.prototype.event; +mypackage.TestClass.prototype.event = null; /** @@ -76,4 +76,4 @@ mypackage.TestClass.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -mypackage.TestClass.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +mypackage.TestClass.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/Event_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/Event_result.js index 6b5f4e8..e66b810 100644 --- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/Event_result.js +++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/Event_result.js @@ -67,4 +67,4 @@ Event.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -Event.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +Event.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/SamePackageAsConflict_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/SamePackageAsConflict_result.js index 9b15787..cab6477 100644 --- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/SamePackageAsConflict_result.js +++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/SamePackageAsConflict_result.js @@ -43,7 +43,7 @@ goog.exportSymbol('SamePackageAsConflict', SamePackageAsConflict); * @private * @type {mypackage.TestClass} */ -SamePackageAsConflict.prototype.testClass; +SamePackageAsConflict.prototype.testClass = null; /** @@ -76,4 +76,4 @@ SamePackageAsConflict.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -SamePackageAsConflict.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +SamePackageAsConflict.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/mypackage/Event_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/mypackage/Event_result.js index 019ca3d..03790e1 100644 --- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/mypackage/Event_result.js +++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/mypackage/Event_result.js @@ -67,4 +67,4 @@ mypackage.Event.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -mypackage.Event.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +mypackage.Event.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/mypackage/TestClass_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/mypackage/TestClass_result.js index 88ac267..1dcdb08 100644 --- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/mypackage/TestClass_result.js +++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/mypackage/TestClass_result.js @@ -45,7 +45,7 @@ goog.exportSymbol('mypackage.TestClass', mypackage.TestClass); * @private * @type {mypackage.Event} */ -mypackage.TestClass.prototype.event; +mypackage.TestClass.prototype.event = null; /** @@ -78,4 +78,4 @@ mypackage.TestClass.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -mypackage.TestClass.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +mypackage.TestClass.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/Event_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/Event_result.js index 6b5f4e8..e66b810 100644 --- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/Event_result.js +++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/Event_result.js @@ -67,4 +67,4 @@ Event.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -Event.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +Event.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/UseWindow_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/UseWindow_result.js index 9899bd9..bf41e5d 100644 --- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/UseWindow_result.js +++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/UseWindow_result.js @@ -43,7 +43,7 @@ goog.exportSymbol('UseWindow', UseWindow); * @private * @type {mypackage.TestClass} */ -UseWindow.prototype.testClass; +UseWindow.prototype.testClass = null; /** @@ -76,4 +76,4 @@ UseWindow.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -UseWindow.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +UseWindow.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/mypackage/TestClass_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/mypackage/TestClass_result.js index 49aa8dc..b58f94c 100644 --- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/mypackage/TestClass_result.js +++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/mypackage/TestClass_result.js @@ -46,14 +46,14 @@ goog.exportSymbol('mypackage.TestClass', mypackage.TestClass); * @private * @type {Event} */ -mypackage.TestClass.prototype.event1; +mypackage.TestClass.prototype.event1 = null; /** * @private * @type {otherpackage.Event} */ -mypackage.TestClass.prototype.event2; +mypackage.TestClass.prototype.event2 = null; /** @@ -86,4 +86,4 @@ mypackage.TestClass.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -mypackage.TestClass.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +mypackage.TestClass.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/otherpackage/Event_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/otherpackage/Event_result.js index ccd2439..17edd42 100644 --- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/otherpackage/Event_result.js +++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/otherpackage/Event_result.js @@ -67,4 +67,4 @@ otherpackage.Event.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -otherpackage.Event.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +otherpackage.Event.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/super/Base_result.js b/compiler-jx/src/test/resources/royale/projects/super/Base_result.js index 6276d70..1c99d83 100644 --- a/compiler-jx/src/test/resources/royale/projects/super/Base_result.js +++ b/compiler-jx/src/test/resources/royale/projects/super/Base_result.js @@ -97,4 +97,4 @@ Base.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -Base.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +Base.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/super/Super_result.js b/compiler-jx/src/test/resources/royale/projects/super/Super_result.js index 0521323..17ad26f 100644 --- a/compiler-jx/src/test/resources/royale/projects/super/Super_result.js +++ b/compiler-jx/src/test/resources/royale/projects/super/Super_result.js @@ -99,4 +99,4 @@ Super.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -Super.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +Super.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9; diff --git a/compiler-jx/src/test/resources/royale/projects/xml_requires/XMLRequire_result.js b/compiler-jx/src/test/resources/royale/projects/xml_requires/XMLRequire_result.js index 801c3d8..9b088fd 100644 --- a/compiler-jx/src/test/resources/royale/projects/xml_requires/XMLRequire_result.js +++ b/compiler-jx/src/test/resources/royale/projects/xml_requires/XMLRequire_result.js @@ -69,4 +69,4 @@ XMLRequire.prototype.ROYALE_REFLECTION_INFO = function () { * @const * @type {number} */ -XMLRequire.prototype.ROYALE_REFLECTION_INFO.compileFlags = 8; +XMLRequire.prototype.ROYALE_REFLECTION_INFO.compileFlags = 9;
