You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by jo...@apache.org on 2020/06/30 18:18:17 UTC
[royale-compiler] branch develop updated (5bd59e4 -> 9087d56)
This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git.
from 5bd59e4 JSRoyaleDocEmitter: missed protected in previous commit
new 407b2ea royale.dependent.tests: fixes for commits 96b42e5a980c1d919d0c3a620c500f7a0aff2e9d and 10d0e0b952ff10b2f17f9db5bbc0112693befe70
new 9087d56 JSRoyaleDocEmitter: internal-to-package members use at-package JSDoc annotation, since that's the purpose of this annotation
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../codegen/js/goog/IJSGoogDocEmitter.java | 2 +
.../internal/codegen/js/goog/JSGoogDocEmitter.java | 10 ++
.../codegen/js/goog/JSGoogDocEmitterTokens.java | 2 +-
.../codegen/js/royale/JSRoyaleDocEmitter.java | 8 ++
.../internal/codegen/js/goog/TestGoogClass.java | 4 +-
.../codegen/js/goog/TestGoogFieldMembers.java | 20 ++--
.../codegen/js/goog/TestGoogGlobalConstants.java | 8 +-
.../codegen/js/royale/TestRoyaleClass.java | 16 +++-
.../codegen/js/royale/TestRoyaleFieldMembers.java | 6 +-
.../js/royale/TestRoyaleGlobalConstants.java | 8 +-
.../codegen/js/royale/TestRoyalePackage.java | 2 +-
.../js/sourcemaps/TestSourceMapFieldMembers.java | 104 ++++++++++-----------
.../mxml/royale/TestRoyaleMXMLApplication.java | 101 ++++++++++----------
.../mxml/sourcemaps/TestSourceMapMXMLScript.java | 4 +-
.../resources/royale/files/MyInitialView_result.js | 92 +++++++++---------
.../royale/files/RoyaleTest_again_result.js | 28 +++---
16 files changed, 221 insertions(+), 194 deletions(-)
[royale-compiler] 01/02: royale.dependent.tests: fixes for commits
96b42e5a980c1d919d0c3a620c500f7a0aff2e9d and
10d0e0b952ff10b2f17f9db5bbc0112693befe70
Posted by jo...@apache.org.
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 407b2ea9b6260576e513096e2bafa7b6f1b74754
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Tue Jun 30 11:10:13 2020 -0700
royale.dependent.tests: fixes for commits 96b42e5a980c1d919d0c3a620c500f7a0aff2e9d and 10d0e0b952ff10b2f17f9db5bbc0112693befe70
---
.../mxml/royale/TestRoyaleMXMLApplication.java | 101 +++++++++++----------
.../resources/royale/files/MyInitialView_result.js | 92 +++++++++----------
.../royale/files/RoyaleTest_again_result.js | 28 +++---
3 files changed, 111 insertions(+), 110 deletions(-)
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/royale/TestRoyaleMXMLApplication.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/royale/TestRoyaleMXMLApplication.java
index 6524960..25c46d3 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/royale/TestRoyaleMXMLApplication.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/royale/TestRoyaleMXMLApplication.java
@@ -160,7 +160,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" * @private\n" +
" * @type {org.apache.royale.html.accessories.TextPromptBead}\n" +
" */\n" +
- " this.$ID0_;\n" +
+ " this.$ID_8_0;\n" +
" \n" +
" /**\n" +
" * @private\n" +
@@ -183,7 +183,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" 2,\n" +
" '_id',\n" +
" true,\n" +
- " '$ID0',\n" +
+ " '$ID_8_0',\n" +
" 'prompt',\n" +
" true,\n" +
" '0-9\\\\',\n" +
@@ -273,7 +273,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" * @private\n" +
" * @type {org.apache.royale.html.accessories.TextPromptBead}\n" +
" */\n" +
- " this.$ID0_;\n" +
+ " this.$ID_8_0;\n" +
" \n" +
" /**\n" +
" * @private\n" +
@@ -296,7 +296,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" 2,\n" +
" '_id',\n" +
" true,\n" +
- " '$ID0',\n" +
+ " '$ID_8_0',\n" +
" 'prompt',\n" +
" true,\n" +
" '0-9\\\\',\n" +
@@ -569,13 +569,13 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" * @private\n" +
" * @type {org.apache.royale.core.View}\n" +
" */\n" +
- " this.$ID1_;\n" +
+ " this.$ID_8_1;\n" +
" \n" +
" /**\n" +
" * @private\n" +
" * @type {org.apache.royale.html.Label}\n" +
" */\n" +
- " this.$ID0_;\n" +
+ " this.$ID_8_0;\n" +
" \n" +
" /**\n" +
" * @private\n" +
@@ -598,7 +598,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" 1,\n" +
" '_id',\n" +
" true,\n" +
- " '$ID1',\n" +
+ " '$ID_8_1',\n" +
" 0,\n" +
" 0,\n" +
" [\n" +
@@ -606,7 +606,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" 1,\n" +
" '_id',\n" +
" true,\n" +
- " '$ID0',\n" +
+ " '$ID_8_0',\n" +
" 0,\n" +
" 0,\n" +
" null\n" +
@@ -629,7 +629,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
"1,\n" +
"[\"org.apache.royale.net.HTTPConstants\", \"GET\"],\n" +
"null,\n" +
- "[\"$ID0\", \"text\"]\n" +
+ "[\"$ID_8_0\", \"text\"]\n" +
"];\n" +
"/**\n" +
" * Metadata\n" +
@@ -707,13 +707,13 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" * @private\n" +
" * @type {org.apache.royale.core.View}\n" +
" */\n" +
- " this.$ID1_;\n" +
+ " this.$ID_8_1;\n" +
" \n" +
" /**\n" +
" * @private\n" +
" * @type {org.apache.royale.html.Label}\n" +
" */\n" +
- " this.$ID0_;\n" +
+ " this.$ID_8_0;\n" +
" \n" +
" /**\n" +
" * @private\n" +
@@ -736,7 +736,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" 1,\n" +
" '_id',\n" +
" true,\n" +
- " '$ID1',\n" +
+ " '$ID_8_1',\n" +
" 0,\n" +
" 0,\n" +
" [\n" +
@@ -744,7 +744,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" 1,\n" +
" '_id',\n" +
" true,\n" +
- " '$ID0',\n" +
+ " '$ID_8_0',\n" +
" 0,\n" +
" 0,\n" +
" null\n" +
@@ -767,7 +767,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
"1,\n" +
"[\"org.apache.royale.net.HTTPConstants\", \"GET\"],\n" +
"null,\n" +
- "[\"$ID0\", \"text\"]\n" +
+ "[\"$ID_8_0\", \"text\"]\n" +
"];\n" +
"/**\n" +
" * Metadata\n" +
@@ -846,13 +846,13 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" * @private\n" +
" * @type {org.apache.royale.core.View}\n" +
" */\n" +
- " this.$ID1_;\n" +
+ " this.$ID_8_1;\n" +
" \n" +
" /**\n" +
" * @private\n" +
" * @type {org.apache.royale.html.Label}\n" +
" */\n" +
- " this.$ID0_;\n" +
+ " this.$ID_8_0;\n" +
" \n" +
" /**\n" +
" * @private\n" +
@@ -875,7 +875,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" 1,\n" +
" '_id',\n" +
" true,\n" +
- " '$ID1',\n" +
+ " '$ID_8_1',\n" +
" 0,\n" +
" 0,\n" +
" [\n" +
@@ -883,7 +883,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" 1,\n" +
" '_id',\n" +
" true,\n" +
- " '$ID0',\n" +
+ " '$ID_8_0',\n" +
" 0,\n" +
" 0,\n" +
" null\n" +
@@ -913,7 +913,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
"1,\n" +
"[\"firstOne\", \"subObject\", \"labelText\"],\n" +
"null,\n" +
- "[\"$ID0\", \"text\"],\n" +
+ "[\"$ID_8_0\", \"text\"],\n" +
"0,\n" +
"2,\n" +
"\"firstOne\",\n" +
@@ -1020,13 +1020,13 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" * @private\n" +
" * @type {org.apache.royale.core.View}\n" +
" */\n" +
- " this.$ID1_;\n" +
+ " this.$ID_8_1;\n" +
" \n" +
" /**\n" +
" * @private\n" +
" * @type {org.apache.royale.html.Label}\n" +
" */\n" +
- " this.$ID0_;\n" +
+ " this.$ID_8_0;\n" +
" \n" +
" /**\n" +
" * @private\n" +
@@ -1049,7 +1049,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" 1,\n" +
" '_id',\n" +
" true,\n" +
- " '$ID1',\n" +
+ " '$ID_8_1',\n" +
" 0,\n" +
" 0,\n" +
" [\n" +
@@ -1057,7 +1057,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" 2,\n" +
" '_id',\n" +
" true,\n" +
- " '$ID0',\n" +
+ " '$ID_8_0',\n" +
" 'text',\n" +
" true,\n" +
" 'Hello World',\n" +
@@ -1162,13 +1162,13 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" * @private\n" +
" * @type {org.apache.royale.core.View}\n" +
" */\n" +
- " this.$ID1_;\n" +
+ " this.$ID_8_1;\n" +
" \n" +
" /**\n" +
" * @private\n" +
" * @type {org.apache.royale.html.DropDownList}\n" +
" */\n" +
- " this.$ID0_;\n" +
+ " this.$ID_8_0;\n" +
" \n" +
" /**\n" +
" * @private\n" +
@@ -1191,7 +1191,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" 1,\n" +
" '_id',\n" +
" true,\n" +
- " '$ID1',\n" +
+ " '$ID_8_1',\n" +
" 0,\n" +
" 0,\n" +
" [\n" +
@@ -1199,7 +1199,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" 2,\n" +
" '_id',\n" +
" true,\n" +
- " '$ID0',\n" +
+ " '$ID_8_0',\n" +
" 'dataProvider',\n" +
" true,\n" +
" ['Hello','World'],\n" +
@@ -1302,13 +1302,13 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" * @private\n" +
" * @type {org.apache.royale.core.View}\n" +
" */\n" +
- " this.$ID3_;\n" +
+ " this.$ID_8_3;\n" +
" \n" +
" /**\n" +
" * @private\n" +
" * @type {org.apache.royale.html.DropDownList}\n" +
" */\n" +
- " this.$ID2_;\n" +
+ " this.$ID_8_2;\n" +
" \n" +
" /**\n" +
" * @private\n" +
@@ -1331,7 +1331,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" 1,\n" +
" '_id',\n" +
" true,\n" +
- " '$ID3',\n" +
+ " '$ID_8_3',\n" +
" 0,\n" +
" 0,\n" +
" [\n" +
@@ -1339,7 +1339,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" 2,\n" +
" '_id',\n" +
" true,\n" +
- " '$ID2',\n" +
+ " '$ID_8_2',\n" +
" 'dataProvider',\n" +
" true,\n" +
" ['Hello','World'],\n" +
@@ -1444,13 +1444,13 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" * @private\n" +
" * @type {org.apache.royale.core.View}\n" +
" */\n" +
- " this.$ID1_;\n" +
+ " this.$ID_8_1;\n" +
" \n" +
" /**\n" +
" * @private\n" +
" * @type {org.apache.royale.html.DropDownList}\n" +
" */\n" +
- " this.$ID0_;\n" +
+ " this.$ID_8_0;\n" +
" \n" +
" /**\n" +
" * @private\n" +
@@ -1473,7 +1473,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" 1,\n" +
" '_id',\n" +
" true,\n" +
- " '$ID1',\n" +
+ " '$ID_8_1',\n" +
" 0,\n" +
" 0,\n" +
" [\n" +
@@ -1481,7 +1481,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" 2,\n" +
" '_id',\n" +
" true,\n" +
- " '$ID0',\n" +
+ " '$ID_8_0',\n" +
" 'dataProvider',\n" +
" true,\n" +
" ['Hello','World'],\n" +
@@ -1585,13 +1585,13 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" * @private\n" +
" * @type {org.apache.royale.core.View}\n" +
" */\n" +
- " this.$ID1_;\n" +
+ " this.$ID_8_1;\n" +
" \n" +
" /**\n" +
" * @private\n" +
" * @type {org.apache.royale.html.DropDownList}\n" +
" */\n" +
- " this.$ID0_;\n" +
+ " this.$ID_8_0;\n" +
" \n" +
" /**\n" +
" * @private\n" +
@@ -1614,7 +1614,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" 1,\n" +
" '_id',\n" +
" true,\n" +
- " '$ID1',\n" +
+ " '$ID_8_1',\n" +
" 0,\n" +
" 0,\n" +
" [\n" +
@@ -1622,7 +1622,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" 2,\n" +
" '_id',\n" +
" true,\n" +
- " '$ID0',\n" +
+ " '$ID_8_0',\n" +
" 'dataProvider',\n" +
" true,\n" +
" ['Hello','World'],\n" +
@@ -1763,7 +1763,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" 0,\n" +
" 1,\n" +
" 'change',\n" +
- "this.$EH0\n" +
+ "this.$EH_9_0\n" +
" ]);\n" +
" \n" +
"};\n" +
@@ -1806,7 +1806,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" * @export\n" +
" * @param {org.apache.royale.events.Event} event\n" +
" */\n" +
- "AppName.AppName_component0.prototype.$EH0 = function(event)\n" +
+ "AppName.AppName_component0.prototype.$EH_9_0 = function(event)\n" +
"{\n" +
" org.apache.royale.utils.Language.trace('bar');\n" +
"};\n" +
@@ -1885,7 +1885,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" * @private\n" +
" * @type {org.apache.royale.charts.beads.DataTipBead}\n" +
" */\n" +
- " this.$ID0_;\n" +
+ " this.$ID_8_0;\n" +
" \n" +
" /**\n" +
" * @private\n" +
@@ -1908,7 +1908,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" 2,\n" +
" '_id',\n" +
" true,\n" +
- " '$ID0',\n" +
+ " '$ID_8_0',\n" +
" 'labelFunction',\n" +
" true,\n" +
" org.apache.royale.utils.Language.closure(this.fn_test, this, 'fn_test'),\n" +
@@ -2008,7 +2008,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" * @private\n" +
" * @type {org.apache.royale.charts.beads.DataTipBead}\n" +
" */\n" +
- " this.$ID0_;\n" +
+ " this.$ID_8_0;\n" +
" \n" +
" /**\n" +
" * @private\n" +
@@ -2031,7 +2031,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" 2,\n" +
" '_id',\n" +
" true,\n" +
- " '$ID0',\n" +
+ " '$ID_8_0',\n" +
" 'labelFunction',\n" +
" true,\n" +
" org.apache.royale.utils.Language.closure(this.initialView.addedToParent, this.initialView, 'addedToParent'),\n" +
@@ -2121,7 +2121,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" * @private\n" +
" * @type {org.apache.royale.charts.beads.DataTipBead}\n" +
" */\n" +
- " this.$ID0_;\n" +
+ " this.$ID_8_0;\n" +
" \n" +
" /**\n" +
" * @private\n" +
@@ -2144,7 +2144,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" 2,\n" +
" '_id',\n" +
" true,\n" +
- " '$ID0',\n" +
+ " '$ID_8_0',\n" +
" 'labelFunction',\n" +
" true,\n" +
" AppName.fn_test,\n" +
@@ -2162,7 +2162,8 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
"\n" +
"\n" +
"\n" +
- "/**\n" +
+ "/**\n" +
+ " * @nocollapse\n" +
" * @param {string} foo\n" +
" */\n" +
"AppName.fn_test = function(foo) {\n" +
@@ -2251,7 +2252,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" * @private\n" +
" * @type {org.apache.royale.charts.beads.DataTipBead}\n" +
" */\n" +
- " this.$ID0_;\n" +
+ " this.$ID_8_0;\n" +
" \n" +
" /**\n" +
" * @private\n" +
@@ -2274,7 +2275,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
" 2,\n" +
" '_id',\n" +
" true,\n" +
- " '$ID0',\n" +
+ " '$ID_8_0',\n" +
" 'labelFunction',\n" +
" true,\n" +
" org.apache.royale.utils.Language.closure(this.AppName_fn_test, this, 'AppName_fn_test'),\n" +
diff --git a/compiler-jx/src/test/resources/royale/files/MyInitialView_result.js b/compiler-jx/src/test/resources/royale/files/MyInitialView_result.js
index 3bc10fb..11a752d 100644
--- a/compiler-jx/src/test/resources/royale/files/MyInitialView_result.js
+++ b/compiler-jx/src/test/resources/royale/files/MyInitialView_result.js
@@ -57,19 +57,19 @@ MyInitialView = function() {
* @private
* @type {org.apache.royale.binding.SimpleBinding}
*/
- this.$ID0_;
+ this.$ID_11_0;
/**
* @private
* @type {org.apache.royale.html.TextButton}
*/
- this.$ID1_;
+ this.$ID_11_1;
/**
* @private
* @type {org.apache.royale.html.TextButton}
*/
- this.$ID2_;
+ this.$ID_11_2;
/**
* @private
@@ -87,19 +87,19 @@ MyInitialView = function() {
* @private
* @type {org.apache.royale.binding.ConstantBinding}
*/
- this.$ID3_;
+ this.$ID_11_3;
/**
* @private
* @type {org.apache.royale.html.TextArea}
*/
- this.$ID5_;
+ this.$ID_11_5;
/**
* @private
* @type {org.apache.royale.binding.SimpleBinding}
*/
- this.$ID4_;
+ this.$ID_11_4;
/**
* @private
@@ -111,7 +111,7 @@ MyInitialView = function() {
* @private
* @type {org.apache.royale.html.TextButton}
*/
- this.$ID6_;
+ this.$ID_11_6;
/**
* @private
@@ -123,37 +123,37 @@ MyInitialView = function() {
* @private
* @type {org.apache.royale.html.RadioButton}
*/
- this.$ID7_;
+ this.$ID_11_7;
/**
* @private
* @type {org.apache.royale.html.RadioButton}
*/
- this.$ID8_;
+ this.$ID_11_8;
/**
* @private
* @type {org.apache.royale.html.RadioButton}
*/
- this.$ID9_;
+ this.$ID_11_9;
/**
* @private
* @type {org.apache.royale.html.RadioButton}
*/
- this.$ID10_;
+ this.$ID_11_10;
/**
* @private
* @type {org.apache.royale.html.RadioButton}
*/
- this.$ID11_;
+ this.$ID_11_11;
/**
* @private
* @type {org.apache.royale.html.RadioButton}
*/
- this.$ID12_;
+ this.$ID_11_12;
/**
* @private
@@ -165,13 +165,13 @@ MyInitialView = function() {
* @private
* @type {org.apache.royale.binding.ConstantBinding}
*/
- this.$ID13_;
+ this.$ID_11_13;
/**
* @private
* @type {org.apache.royale.html.TextButton}
*/
- this.$ID14_;
+ this.$ID_11_14;
/**
* @private
@@ -183,7 +183,7 @@ MyInitialView = function() {
* @private
* @type {org.apache.royale.binding.ConstantBinding}
*/
- this.$ID15_;
+ this.$ID_11_15;
/**
* @private
@@ -288,7 +288,7 @@ get: MyInitialView.prototype.get__comboBoxValue}}
* @export
* @param {org.apache.royale.events.MouseEvent} event
*/
-MyInitialView.prototype.$EH0 = function(event)
+MyInitialView.prototype.$EH_11_0 = function(event)
{
this.startTimer();
};
@@ -298,7 +298,7 @@ MyInitialView.prototype.$EH0 = function(event)
* @export
* @param {org.apache.royale.events.MouseEvent} event
*/
-MyInitialView.prototype.$EH1 = function(event)
+MyInitialView.prototype.$EH_11_1 = function(event)
{
this.timer.removeEventListener('timer', org.apache.royale.utils.Language.closure(this.timerHandler, this, 'timerHandler'));
this.timer.stop();
@@ -309,7 +309,7 @@ MyInitialView.prototype.$EH1 = function(event)
* @export
* @param {org.apache.royale.events.Event} event
*/
-MyInitialView.prototype.$EH2 = function(event)
+MyInitialView.prototype.$EH_11_2 = function(event)
{
this.dispatchEvent(new org.apache.royale.events.CustomEvent('cityListChanged'));
};
@@ -319,7 +319,7 @@ MyInitialView.prototype.$EH2 = function(event)
* @export
* @param {org.apache.royale.events.MouseEvent} event
*/
-MyInitialView.prototype.$EH3 = function(event)
+MyInitialView.prototype.$EH_11_3 = function(event)
{
this.dispatchEvent(new org.apache.royale.events.CustomEvent('transferClicked'));
};
@@ -329,7 +329,7 @@ MyInitialView.prototype.$EH3 = function(event)
* @export
* @param {org.apache.royale.events.Event} event
*/
-MyInitialView.prototype.$EH4 = function(event)
+MyInitialView.prototype.$EH_11_4 = function(event)
{
this.dispatchEvent(new org.apache.royale.events.CustomEvent('listChanged'));
};
@@ -339,7 +339,7 @@ MyInitialView.prototype.$EH4 = function(event)
* @export
* @param {org.apache.royale.events.MouseEvent} event
*/
-MyInitialView.prototype.$EH5 = function(event)
+MyInitialView.prototype.$EH_11_5 = function(event)
{
this.dispatchEvent(new org.apache.royale.events.CustomEvent('buttonClicked'));
};
@@ -349,7 +349,7 @@ MyInitialView.prototype.$EH5 = function(event)
* @export
* @param {org.apache.royale.events.Event} event
*/
-MyInitialView.prototype.$EH6 = function(event)
+MyInitialView.prototype.$EH_11_6 = function(event)
{
this.dispatchEvent(new org.apache.royale.events.CustomEvent('comboBoxChanged'));
};
@@ -481,7 +481,7 @@ Object.defineProperties(MyInitialView.prototype, /** @lends {MyInitialView.proto
5,
'_id',
true,
- '$ID0',
+ '$ID_11_0',
'eventName',
true,
'labelTextChanged',
@@ -505,7 +505,7 @@ Object.defineProperties(MyInitialView.prototype, /** @lends {MyInitialView.proto
4,
'_id',
true,
- '$ID1',
+ '$ID_11_1',
'text',
true,
'Let\'s Start Timer',
@@ -518,13 +518,13 @@ Object.defineProperties(MyInitialView.prototype, /** @lends {MyInitialView.proto
0,
1,
'click',
-this.$EH0,
+this.$EH_11_0,
null,
org.apache.royale.html.TextButton,
4,
'_id',
true,
- '$ID2',
+ '$ID_11_2',
'text',
true,
'Stop Timer',
@@ -537,7 +537,7 @@ this.$EH0,
0,
1,
'click',
-this.$EH1,
+this.$EH_11_1,
null,
org.apache.royale.html.Label,
3,
@@ -577,7 +577,7 @@ this.$EH1,
4,
'_id',
true,
- '$ID3',
+ '$ID_11_3',
'sourceID',
true,
'applicationModel',
@@ -594,13 +594,13 @@ this.$EH1,
0,
1,
'change',
-this.$EH2,
+this.$EH_11_2,
null,
org.apache.royale.html.TextArea,
6,
'_id',
true,
- '$ID5',
+ '$ID_11_5',
'x',
true,
320,
@@ -620,7 +620,7 @@ this.$EH2,
5,
'_id',
true,
- '$ID4',
+ '$ID_11_4',
'eventName',
true,
'labelTextChanged',
@@ -658,7 +658,7 @@ this.$EH2,
4,
'_id',
true,
- '$ID6',
+ '$ID_11_6',
'text',
true,
'Transfer',
@@ -671,7 +671,7 @@ this.$EH2,
0,
1,
'click',
-this.$EH3,
+this.$EH_11_3,
null,
org.apache.royale.html.CheckBox,
4,
@@ -694,7 +694,7 @@ this.$EH3,
6,
'_id',
true,
- '$ID7',
+ '$ID_11_7',
'groupName',
true,
'group1',
@@ -717,7 +717,7 @@ this.$EH3,
7,
'_id',
true,
- '$ID8',
+ '$ID_11_8',
'groupName',
true,
'group1',
@@ -743,7 +743,7 @@ this.$EH3,
6,
'_id',
true,
- '$ID9',
+ '$ID_11_9',
'groupName',
true,
'group1',
@@ -766,7 +766,7 @@ this.$EH3,
7,
'_id',
true,
- '$ID10',
+ '$ID_11_10',
'groupName',
true,
'group2',
@@ -792,7 +792,7 @@ this.$EH3,
6,
'_id',
true,
- '$ID11',
+ '$ID_11_11',
'groupName',
true,
'group2',
@@ -815,7 +815,7 @@ this.$EH3,
6,
'_id',
true,
- '$ID12',
+ '$ID_11_12',
'groupName',
true,
'group2',
@@ -858,7 +858,7 @@ this.$EH3,
4,
'_id',
true,
- '$ID13',
+ '$ID_11_13',
'sourceID',
true,
'applicationModel',
@@ -875,13 +875,13 @@ this.$EH3,
0,
1,
'change',
-this.$EH4,
+this.$EH_11_4,
null,
org.apache.royale.html.TextButton,
4,
'_id',
true,
- '$ID14',
+ '$ID_11_14',
'text',
true,
'OK',
@@ -894,7 +894,7 @@ this.$EH4,
0,
1,
'click',
-this.$EH5,
+this.$EH_11_5,
null,
org.apache.royale.html.ComboBox,
5,
@@ -917,7 +917,7 @@ this.$EH5,
4,
'_id',
true,
- '$ID15',
+ '$ID_11_15',
'sourceID',
true,
'applicationModel',
@@ -934,7 +934,7 @@ this.$EH5,
0,
1,
'change',
-this.$EH6,
+this.$EH_11_6,
null
];
if (arr)
diff --git a/compiler-jx/src/test/resources/royale/files/RoyaleTest_again_result.js b/compiler-jx/src/test/resources/royale/files/RoyaleTest_again_result.js
index dc301ee..1cf38b9 100644
--- a/compiler-jx/src/test/resources/royale/files/RoyaleTest_again_result.js
+++ b/compiler-jx/src/test/resources/royale/files/RoyaleTest_again_result.js
@@ -45,25 +45,25 @@ RoyaleTest_again = function() {
* @private
* @type {org.apache.royale.core.SimpleCSSValuesImpl}
*/
- this.$ID0_;
+ this.$ID_8_0;
/**
* @private
* @type {MyInitialView}
*/
- this.$ID1_;
+ this.$ID_8_1;
/**
* @private
* @type {models.MyModel}
*/
- this.$ID2_;
+ this.$ID_8_2;
/**
* @private
* @type {controllers.MyController}
*/
- this.$ID3_;
+ this.$ID_8_3;
/**
* @private
@@ -81,13 +81,13 @@ RoyaleTest_again = function() {
* @private
* @type {org.apache.royale.collections.parsers.JSONInputParser}
*/
- this.$ID4_;
+ this.$ID_8_4;
/**
* @private
* @type {StockDataJSONItemConverter}
*/
- this.$ID5_;
+ this.$ID_8_5;
/**
* @private
@@ -110,7 +110,7 @@ RoyaleTest_again = function() {
1,
'_id',
true,
- '$ID2',
+ '$ID_8_2',
0,
0,
null
@@ -122,7 +122,7 @@ RoyaleTest_again = function() {
1,
'_id',
true,
- '$ID0',
+ '$ID_8_0',
0,
0,
null
@@ -134,7 +134,7 @@ RoyaleTest_again = function() {
1,
'_id',
true,
- '$ID1',
+ '$ID_8_1',
0,
0,
null
@@ -146,7 +146,7 @@ RoyaleTest_again = function() {
1,
'_id',
true,
- '$ID3',
+ '$ID_8_3',
0,
0,
null
@@ -174,7 +174,7 @@ RoyaleTest_again = function() {
1,
'_id',
true,
- '$ID4',
+ '$ID_8_4',
0,
0,
null
@@ -186,7 +186,7 @@ RoyaleTest_again = function() {
1,
'_id',
true,
- '$ID5',
+ '$ID_8_5',
0,
0,
null
@@ -202,7 +202,7 @@ RoyaleTest_again = function() {
0,
1,
'initialize',
-this.$EH0
+this.$EH_8_0
]);
};
@@ -215,7 +215,7 @@ goog.inherits(RoyaleTest_again, org.apache.royale.core.Application);
* @export
* @param {org.apache.royale.events.Event} event
*/
-RoyaleTest_again.prototype.$EH0 = function(event)
+RoyaleTest_again.prototype.$EH_8_0 = function(event)
{
org.apache.royale.utils.Language.as(this.model, models.MyModel, true).labelText = 'Hello World';
};
[royale-compiler] 02/02: JSRoyaleDocEmitter: internal-to-package
members use at-package JSDoc annotation,
since that's the purpose of this annotation
Posted by jo...@apache.org.
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 9087d56a04f873ba0d32d2599a14dfd36b82c453
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Tue Jun 30 11:18:09 2020 -0700
JSRoyaleDocEmitter: internal-to-package members use at-package JSDoc annotation, since that's the purpose of this annotation
---
.../codegen/js/goog/IJSGoogDocEmitter.java | 2 +
.../internal/codegen/js/goog/JSGoogDocEmitter.java | 10 ++
.../codegen/js/goog/JSGoogDocEmitterTokens.java | 2 +-
.../codegen/js/royale/JSRoyaleDocEmitter.java | 8 ++
.../internal/codegen/js/goog/TestGoogClass.java | 4 +-
.../codegen/js/goog/TestGoogFieldMembers.java | 20 ++--
.../codegen/js/goog/TestGoogGlobalConstants.java | 8 +-
.../codegen/js/royale/TestRoyaleClass.java | 16 +++-
.../codegen/js/royale/TestRoyaleFieldMembers.java | 6 +-
.../js/royale/TestRoyaleGlobalConstants.java | 8 +-
.../codegen/js/royale/TestRoyalePackage.java | 2 +-
.../js/sourcemaps/TestSourceMapFieldMembers.java | 104 ++++++++++-----------
.../mxml/sourcemaps/TestSourceMapMXMLScript.java | 4 +-
13 files changed, 110 insertions(+), 84 deletions(-)
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/goog/IJSGoogDocEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/goog/IJSGoogDocEmitter.java
index 6c99459..33b2afa 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/goog/IJSGoogDocEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/goog/IJSGoogDocEmitter.java
@@ -130,6 +130,8 @@ public interface IJSGoogDocEmitter extends IJSDocEmitter
void emitProtected(IASNode node);
+ void emitInternal(IASNode node);
+
void emitReturn(IFunctionNode node, String packageName);
void emitThis(ITypeDefinition node, String packageName);
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java
index 40d28a0..f5620b5 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java
@@ -122,6 +122,10 @@ public class JSGoogDocEmitter extends JSDocEmitter implements IJSGoogDocEmitter
{
emitProtected(node);
}
+ else if (ns == IASKeywordConstants.INTERNAL)
+ {
+ emitInternal(node);
+ }
if (node.isConst())
emitConst(node);
@@ -339,6 +343,12 @@ public class JSGoogDocEmitter extends JSDocEmitter implements IJSGoogDocEmitter
}
@Override
+ public void emitInternal(IASNode node)
+ {
+ emitJSDocLine(JSGoogDocEmitterTokens.PACKAGE);
+ }
+
+ @Override
public void emitPublic(IASNode node)
{
emitJSDocLine(JSGoogDocEmitterTokens.EXPORT);
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogDocEmitterTokens.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogDocEmitterTokens.java
index 623f131..4a777aa 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogDocEmitterTokens.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogDocEmitterTokens.java
@@ -22,7 +22,7 @@ import org.apache.royale.compiler.codegen.IEmitterTokens;
public enum JSGoogDocEmitterTokens implements IEmitterTokens
{
- PARAM("param"), STAR("*"), TYPE("type"), EXPOSE("expose"), EXPORT("export"), NOCOLLAPSE("nocollapse");
+ PARAM("param"), STAR("*"), TYPE("type"), EXPOSE("expose"), EXPORT("export"), NOCOLLAPSE("nocollapse"), PACKAGE("package");
private String token;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleDocEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleDocEmitter.java
index 7d9aa22..f65833e 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleDocEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleDocEmitter.java
@@ -547,6 +547,10 @@ public class JSRoyaleDocEmitter extends JSGoogDocEmitter
{
emitProtected(node);
}
+ else if (ns == IASKeywordConstants.INTERNAL)
+ {
+ emitInternal(node);
+ }
else // public or custom namespace
{
emitPublic(node);
@@ -624,6 +628,10 @@ public class JSRoyaleDocEmitter extends JSGoogDocEmitter
emitNoCollapse(node);
}
}
+ else if (ns == IASKeywordConstants.INTERNAL)
+ {
+ emitInternal(node);
+ }
else
{
boolean warnPublicVars = fjp.config != null && fjp.config.getWarnPublicVars() && !fjp.config.getPreventRenamePublicSymbols();
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogClass.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogClass.java
index 67c4caa..961d4fe 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogClass.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogClass.java
@@ -188,7 +188,7 @@ public class TestGoogClass extends TestClass
IClassNode node = getClassNode("public class A {public var a:Object;protected var b:String; "
+ "private var c:int; internal var d:uint; var e:Number}");
asBlockWalker.visitClass(node);
- assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};\n\n/**\n * @type {Object}\n */\norg.apache.royale.A.prototype.a;\n\n/**\n * @protected\n * @type {string}\n */\norg.apache.royale.A.prototype.b;\n\n/**\n * @private\n * @type {number}\n */\norg.apache.royale.A.prototype.c;\n\n/**\n * @type {number}\n */\norg.apache.royale.A.prototype.d;\n\n/**\n * @type {number}\n */\norg.apache.royale.A.prototype.e;");
+ assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};\n\n/**\n * @type {Object}\n */\norg.apache.royale.A.prototype.a;\n\n/**\n * @protected\n * @type {string}\n */\norg.apache.royale.A.prototype.b;\n\n/**\n * @private\n * @type {number}\n */\norg.apache.royale.A.prototype.c;\n\n/**\n * @package\n * @type {number}\n */\norg.apache.royale.A.prototype.d;\n\n/**\n * @package\n * @type {number}\n */\norg.apache.royale.A.prototype.e;");
}
@Override
@@ -220,7 +220,7 @@ public class TestGoogClass extends TestClass
+ "foo_bar function get foo6():Object{return null;}"
+ "foo_bar function set foo6(value:Object):void{}" + "}");
asBlockWalker.visitClass(node);
- assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};\n\n/**\n * @type {Object}\n */\norg.apache.royale.A.prototype.foo1;\n\nObject.defineProperty(\n\torg.apache.royale.A.prototype, \n\t'foo1', \n\t{get:function() {\n\t\tvar self = this;\n\t\treturn null;\n\t}, configurable:true}\n);\n\nObject.defineProperty(\n\torg.apache.royale.A.prototype, \n\t'foo1', \n\t{set:function(value) {\n\t}, configurable:true}\n);\n\n/**\n * @protected\n * @type {Object}\n */\no [...]
+ assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};\n\n/**\n * @type {Object}\n */\norg.apache.royale.A.prototype.foo1;\n\nObject.defineProperty(\n\torg.apache.royale.A.prototype, \n\t'foo1', \n\t{get:function() {\n\t\tvar self = this;\n\t\treturn null;\n\t}, configurable:true}\n);\n\nObject.defineProperty(\n\torg.apache.royale.A.prototype, \n\t'foo1', \n\t{set:function(value) {\n\t}, configurable:true}\n);\n\n/**\n * @protected\n * @type {Object}\n */\no [...]
}
@Override
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogFieldMembers.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogFieldMembers.java
index a1318d4..e410ab3 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogFieldMembers.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogFieldMembers.java
@@ -43,7 +43,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("var foo;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @type {*}\n */\nRoyaleTest_A.prototype.foo");
+ assertOut("/**\n * @package\n * @type {*}\n */\nRoyaleTest_A.prototype.foo");
}
@Override
@@ -52,7 +52,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("var foo:int;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @type {number}\n */\nRoyaleTest_A.prototype.foo");
+ assertOut("/**\n * @package\n * @type {number}\n */\nRoyaleTest_A.prototype.foo");
}
@Override
@@ -61,7 +61,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("var foo:int = 420;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 420");
+ assertOut("/**\n * @package\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 420");
}
@Test
@@ -69,7 +69,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("var foo:int = -420;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = -420");
+ assertOut("/**\n * @package\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = -420");
}
@Override
@@ -137,7 +137,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("static const foo;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @const\n * @type {*}\n */\nRoyaleTest_A.foo");
+ assertOut("/**\n * @package\n * @const\n * @type {*}\n */\nRoyaleTest_A.foo");
}
@Test
@@ -145,7 +145,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("const foo;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @const\n * @type {*}\n */\nRoyaleTest_A.prototype.foo");
+ assertOut("/**\n * @package\n * @const\n * @type {*}\n */\nRoyaleTest_A.prototype.foo");
}
@Override
@@ -154,7 +154,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("static const foo:int;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @const\n * @type {number}\n */\nRoyaleTest_A.foo");
+ assertOut("/**\n * @package\n * @const\n * @type {number}\n */\nRoyaleTest_A.foo");
}
@Test
@@ -162,7 +162,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("const foo:int;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @const\n * @type {number}\n */\nRoyaleTest_A.prototype.foo");
+ assertOut("/**\n * @package\n * @const\n * @type {number}\n */\nRoyaleTest_A.prototype.foo");
}
@Override
@@ -171,7 +171,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("static const foo:int = 420;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @const\n * @type {number}\n */\nRoyaleTest_A.foo = 420");
+ assertOut("/**\n * @package\n * @const\n * @type {number}\n */\nRoyaleTest_A.foo = 420");
}
@Test
@@ -179,7 +179,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
{
IVariableNode node = getField("const foo:int = 420;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @const\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 420");
+ assertOut("/**\n * @package\n * @const\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 420");
}
@Override
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogGlobalConstants.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogGlobalConstants.java
index 985df6d..a3706c7 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogGlobalConstants.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogGlobalConstants.java
@@ -34,7 +34,7 @@ public class TestGoogGlobalConstants extends TestGlobalConstants
@Test
public void testInfinity()
{
- IVariableNode node = getField("var a:Number = Infinity;");
+ IVariableNode node = getField("public var a:Number = Infinity;");
asBlockWalker.visitVariable(node);
assertOut("/**\n * @type {number}\n */\nRoyaleTest_A.prototype.a = Infinity");
}
@@ -43,7 +43,7 @@ public class TestGoogGlobalConstants extends TestGlobalConstants
@Test
public void testNegativeInfinity()
{
- IVariableNode node = getField("var a:Number = -Infinity;");
+ IVariableNode node = getField("public var a:Number = -Infinity;");
asBlockWalker.visitVariable(node);
assertOut("/**\n * @type {number}\n */\nRoyaleTest_A.prototype.a = -Infinity");
}
@@ -52,7 +52,7 @@ public class TestGoogGlobalConstants extends TestGlobalConstants
@Test
public void testNaN()
{
- IVariableNode node = getField("var a:Number = NaN;");
+ IVariableNode node = getField("public var a:Number = NaN;");
asBlockWalker.visitVariable(node);
assertOut("/**\n * @type {number}\n */\nRoyaleTest_A.prototype.a = NaN");
}
@@ -61,7 +61,7 @@ public class TestGoogGlobalConstants extends TestGlobalConstants
@Test
public void testUndefined()
{
- IVariableNode node = getField("var a:* = undefined;");
+ IVariableNode node = getField("public var a:* = undefined;");
asBlockWalker.visitVariable(node);
assertOut("/**\n * @type {*}\n */\nRoyaleTest_A.prototype.a = undefined");
}
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleClass.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleClass.java
index 39f85dd..cf750eb 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleClass.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleClass.java
@@ -390,7 +390,7 @@ public class TestRoyaleClass extends TestGoogClass
IClassNode node = getClassNode("public class A {public var a:Object;protected var b:String; "
+ "private var c:int; internal var d:uint; var e:Number}");
asBlockWalker.visitClass(node);
- assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};\n\n\n/**\n * @export\n * @type {Object}\n */\norg.apache.royale.A.prototype.a = null;\n\n\n/**\n * @protected\n * @type {string}\n */\norg.apache.royale.A.prototype.b = null;\n\n\n/**\n * @private\n * @type {number}\n */\norg.apache.royale.A.prototype.c = 0;\n\n\n/**\n * @type {number}\n */\norg.apache.royale.A.prototype.d = 0;\n\n\n/**\n * @type {number}\n */\norg.apache.royale.A.prototype.e = NaN;");
+ assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};\n\n\n/**\n * @export\n * @type {Object}\n */\norg.apache.royale.A.prototype.a = null;\n\n\n/**\n * @protected\n * @type {string}\n */\norg.apache.royale.A.prototype.b = null;\n\n\n/**\n * @private\n * @type {number}\n */\norg.apache.royale.A.prototype.c = 0;\n\n\n/**\n * @package\n * @type {number}\n */\norg.apache.royale.A.prototype.d = 0;\n\n\n/**\n * @package\n * @type {number}\n */\norg.apache.royale [...]
}
@Test
@@ -417,11 +417,13 @@ public class TestRoyaleClass extends TestGoogClass
" * @type {number}\n" +
" */\n" +
"org.apache.royale.A.prototype.c_ = 0;\n\n\n" +
- "/**\n" +
+ "/**\n" +
+ " * @package\n" +
" * @type {number}\n" +
" */\n" +
"org.apache.royale.A.prototype.d = 0;\n\n\n" +
- "/**\n" +
+ "/**\n" +
+ " * @package\n" +
" * @type {number}\n" +
" */\n" +
"org.apache.royale.A.prototype.e = NaN;Object.defineProperties(org.apache.royale.A.prototype, /** @lends {org.apache.royale.A.prototype} */ {\n" +
@@ -505,11 +507,13 @@ public class TestRoyaleClass extends TestGoogClass
" * @type {number}\n" +
" */\n" +
"org.apache.royale.A.prototype.c_ = 0;\n\n\n" +
- "/**\n" +
+ "/**\n" +
+ " * @package\n" +
" * @type {number}\n" +
" */\n" +
"org.apache.royale.A.prototype.d = 0;\n\n\n" +
"/**\n" +
+ " * @package\n" +
" * @type {number}\n" +
" */\n" +
"org.apache.royale.A.prototype.e = NaN;Object.defineProperties(org.apache.royale.A.prototype, /** @lends {org.apache.royale.A.prototype} */ {\n" +
@@ -593,10 +597,12 @@ public class TestRoyaleClass extends TestGoogClass
" */\n" +
"org.apache.royale.A.prototype.c = 0;\n\n\n" +
"/**\n" +
+ " * @package\n" +
" * @type {number}\n" +
" */\n" +
"org.apache.royale.A.prototype.d = 0;\n\n\n" +
"/**\n" +
+ " * @package\n" +
" * @type {number}\n" +
" */\n" +
"org.apache.royale.A.prototype.e = NaN;Object.defineProperties(org.apache.royale.A.prototype, /** @lends {org.apache.royale.A.prototype} */ {\n" +
@@ -701,7 +707,7 @@ public class TestRoyaleClass extends TestGoogClass
+ "public static function foo7(value:Object):void{}"
+ "custom_namespace static function foo7(value:Object):void{}" + "}");
asBlockWalker.visitClass(node);
- assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};\n\n\n/**\n * @export\n * @return {Object}\n */\norg.apache.royale.A.prototype.foo1 = function() {\n return null;\n};\n\n\n/**\n * @export\n * @return {Object}\n */\norg.apache.royale.A.prototype.foo1a = function() {\n return null;\n};\n\n\n/**\n * @export\n * @override\n */\norg.apache.royale.A.prototype.foo1b = function() {\n return org.apache.royale.A.superClass_.foo1b.apply(this);\n};\n\n\n/**\n * [...]
+ assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};\n\n\n/**\n * @export\n * @return {Object}\n */\norg.apache.royale.A.prototype.foo1 = function() {\n return null;\n};\n\n\n/**\n * @export\n * @return {Object}\n */\norg.apache.royale.A.prototype.foo1a = function() {\n return null;\n};\n\n\n/**\n * @export\n * @override\n */\norg.apache.royale.A.prototype.foo1b = function() {\n return org.apache.royale.A.superClass_.foo1b.apply(this);\n};\n\n\n/**\n * [...]
}
@Test
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleFieldMembers.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleFieldMembers.java
index 33005cd..c715e9d 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleFieldMembers.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleFieldMembers.java
@@ -44,7 +44,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
{
IVariableNode node = getField("var foo;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @type {*}\n */\nRoyaleTest_A.prototype.foo");
+ assertOut("/**\n * @package\n * @type {*}\n */\nRoyaleTest_A.prototype.foo");
}
@Test
@@ -167,7 +167,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
{
IVariableNode node = getField("static var foo;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @type {*}\n */\nRoyaleTest_A.foo");
+ assertOut("/**\n * @package\n * @type {*}\n */\nRoyaleTest_A.foo");
}
@Test
@@ -183,7 +183,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
{
IVariableNode node = getField("static var foo:int = 420;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @type {number}\n */\nRoyaleTest_A.foo = 420");
+ assertOut("/**\n * @package\n * @type {number}\n */\nRoyaleTest_A.foo = 420");
}
@Test
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalConstants.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalConstants.java
index 8cc7803..71f5c6a 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalConstants.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalConstants.java
@@ -43,7 +43,7 @@ public class TestRoyaleGlobalConstants extends TestGoogGlobalConstants
{
IVariableNode node = getField("var a:Number = Infinity;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @type {number}\n */\nRoyaleTest_A.prototype.a = Infinity");
+ assertOut("/**\n * @package\n * @type {number}\n */\nRoyaleTest_A.prototype.a = Infinity");
}
@Override
@@ -52,7 +52,7 @@ public class TestRoyaleGlobalConstants extends TestGoogGlobalConstants
{
IVariableNode node = getField("var a:Number = -Infinity;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @type {number}\n */\nRoyaleTest_A.prototype.a = -Infinity");
+ assertOut("/**\n * @package\n * @type {number}\n */\nRoyaleTest_A.prototype.a = -Infinity");
}
@Override
@@ -61,7 +61,7 @@ public class TestRoyaleGlobalConstants extends TestGoogGlobalConstants
{
IVariableNode node = getField("var a:Number = NaN;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @type {number}\n */\nRoyaleTest_A.prototype.a = NaN");
+ assertOut("/**\n * @package\n * @type {number}\n */\nRoyaleTest_A.prototype.a = NaN");
}
@Override
@@ -70,6 +70,6 @@ public class TestRoyaleGlobalConstants extends TestGoogGlobalConstants
{
IVariableNode node = getField("var a:* = undefined;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @type {*}\n */\nRoyaleTest_A.prototype.a = undefined");
+ assertOut("/**\n * @package\n * @type {*}\n */\nRoyaleTest_A.prototype.a = undefined");
}
}
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 0ca2e6a..9fdceab 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
@@ -625,7 +625,7 @@ public class TestRoyalePackage extends TestGoogPackage
"\n" +
"\n" +
"/**\n" +
- //" * @export\n" +
+ " * @package\n" +
" * @type {number}\n" +
" */\n" +
"foo.bar.baz.A.internalVar = 2"
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapFieldMembers.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapFieldMembers.java
index 503923c..219f6f6 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapFieldMembers.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapFieldMembers.java
@@ -32,8 +32,8 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
{
IVariableNode node = getField("var foo;");
asBlockWalker.visitVariable(node);
- ///**\n * @type {*}\n */\nRoyaleTest_A.prototype.foo
- assertMapping(node, 0, 4, 3, 0, 3, 26); // foo
+ ///**\n * @package\n * @type {*}\n */\nRoyaleTest_A.prototype.foo
+ assertMapping(node, 0, 4, 4, 0, 4, 26); // foo
}
@Test
@@ -41,10 +41,10 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
{
IVariableNode node = getField("var foo:String = null;");
asBlockWalker.visitVariable(node);
- //**\n * @type {string}\n */\nRoyaleTest_A.prototype.foo = null
- assertMapping(node, 0, 4, 3, 0, 3, 26); // foo
- assertMapping(node, 0, 14, 3, 26, 3, 29); // =
- assertMapping(node, 0, 17, 3, 29, 3, 33); // null
+ //**\n * @package\n * @type {string}\n */\nRoyaleTest_A.prototype.foo = null
+ assertMapping(node, 0, 4, 4, 0, 4, 26); // foo
+ assertMapping(node, 0, 14, 4, 26, 4, 29); // =
+ assertMapping(node, 0, 17, 4, 29, 4, 33); // null
}
@Test
@@ -52,8 +52,8 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
{
IVariableNode node = getField("var foo:int;");
asBlockWalker.visitVariable(node);
- ///**\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 0
- assertMapping(node, 0, 4, 3, 0, 3, 26); // foo
+ ///**\n * @package\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 0
+ assertMapping(node, 0, 4, 4, 0, 4, 26); // foo
}
@Test
@@ -61,10 +61,10 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
{
IVariableNode node = getField("var foo = 420;");
asBlockWalker.visitVariable(node);
- ///**\n * @type {*}\n */\nRoyaleTest_A.prototype.foo = 420
- assertMapping(node, 0, 4, 3, 0, 3, 26); // foo
- assertMapping(node, 0, 7, 3, 26, 3, 29); // =
- assertMapping(node, 0, 10, 3, 29, 3, 32); // 420
+ ///**\n * @package\n * @type {*}\n */\nRoyaleTest_A.prototype.foo = 420
+ assertMapping(node, 0, 4, 4, 0, 4, 26); // foo
+ assertMapping(node, 0, 7, 4, 26, 4, 29); // =
+ assertMapping(node, 0, 10, 4, 29, 4, 32); // 420
}
@Test
@@ -72,10 +72,10 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
{
IVariableNode node = getField("var foo:int = 420;");
asBlockWalker.visitVariable(node);
- ///**\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 420
- assertMapping(node, 0, 4, 3, 0, 3, 26); // foo
- assertMapping(node, 0, 11, 3, 26, 3, 29); // =
- assertMapping(node, 0, 14, 3, 29, 3, 32); // 420
+ ///**\n * @package\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 420
+ assertMapping(node, 0, 4, 4, 0, 4, 26); // foo
+ assertMapping(node, 0, 11, 4, 26, 4, 29); // =
+ assertMapping(node, 0, 14, 4, 29, 4, 32); // 420
}
@Test
@@ -83,8 +83,8 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
{
IVariableNode node = getField("static var foo;");
asBlockWalker.visitVariable(node);
- ////**\n * @type {*}\n */\nRoyaleTest_A.foo
- assertMapping(node, 0, 11, 3, 0, 3, 16); // foo
+ ////**\n * @package\n * @type {*}\n */\nRoyaleTest_A.foo
+ assertMapping(node, 0, 11, 4, 0, 4, 16); // foo
}
@Test
@@ -92,8 +92,8 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
{
IVariableNode node = getField("static var foo:int;");
asBlockWalker.visitVariable(node);
- ///**\n * @type {number}\n */\nRoyaleTest_A.foo = 0
- assertMapping(node, 0, 11, 3, 0, 3, 16); // foo
+ ///**\n * @package\n * @type {number}\n */\nRoyaleTest_A.foo = 0
+ assertMapping(node, 0, 11, 4, 0, 4, 16); // foo
}
@Test
@@ -101,10 +101,10 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
{
IVariableNode node = getField("static var foo = 420;");
asBlockWalker.visitVariable(node);
- ///**\n * @type {*}\n */\nRoyaleTest_A.foo = 420
- assertMapping(node, 0, 11, 3, 0, 3, 16); // foo
- assertMapping(node, 0, 14, 3, 16, 3, 19); // =
- assertMapping(node, 0, 17, 3, 19, 3, 22); // 420
+ ///**\n * @package\n * @type {*}\n */\nRoyaleTest_A.foo = 420
+ assertMapping(node, 0, 11, 4, 0, 4, 16); // foo
+ assertMapping(node, 0, 14, 4, 16, 4, 19); // =
+ assertMapping(node, 0, 17, 4, 19, 4, 22); // 420
}
@Test
@@ -112,10 +112,10 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
{
IVariableNode node = getField("static var foo:int = 420;");
asBlockWalker.visitVariable(node);
- ///**\n * @type {number}\n */\nRoyaleTest_A.foo = 420
- assertMapping(node, 0, 11, 3, 0, 3, 16); // foo
- assertMapping(node, 0, 18, 3, 16, 3, 19); // =
- assertMapping(node, 0, 21, 3, 19, 3, 22); // 420
+ ///**\n * @package\n * @type {number}\n */\nRoyaleTest_A.foo = 420
+ assertMapping(node, 0, 11, 4, 0, 4, 16); // foo
+ assertMapping(node, 0, 18, 4, 16, 4, 19); // =
+ assertMapping(node, 0, 21, 4, 19, 4, 22); // 420
}
@Test
@@ -123,8 +123,8 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
{
IVariableNode node = getField("const foo;");
asBlockWalker.visitVariable(node);
- ///**\n * @const\n * @type {*}\n */\nRoyaleTest_A.prototype.foo
- assertMapping(node, 0, 6, 4, 0, 4, 26); // foo
+ ///**\n * @package\n * @const\n * @type {*}\n */\nRoyaleTest_A.prototype.foo
+ assertMapping(node, 0, 6, 5, 0, 5, 26); // foo
}
@Test
@@ -132,8 +132,8 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
{
IVariableNode node = getField("const foo:int;");
asBlockWalker.visitVariable(node);
- ///**\n * @const\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 0
- assertMapping(node, 0, 6, 4, 0, 4, 26); // foo
+ ///**\n * @package\n * @const\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 0
+ assertMapping(node, 0, 6, 5, 0, 5, 26); // foo
}
@Test
@@ -141,10 +141,10 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
{
IVariableNode node = getField("const foo = 420;");
asBlockWalker.visitVariable(node);
- ///**\n * @const\n * @type {*}\n */\nRoyaleTest_A.prototype.foo = 420
- assertMapping(node, 0, 6, 4, 0, 4, 26); // foo
- assertMapping(node, 0, 9, 4, 26, 4, 29); // =
- assertMapping(node, 0, 12, 4, 29, 4, 32); // 420
+ ///**\n * @package\n * @const\n * @type {*}\n */\nRoyaleTest_A.prototype.foo = 420
+ assertMapping(node, 0, 6, 5, 0, 5, 26); // foo
+ assertMapping(node, 0, 9, 5, 26, 5, 29); // =
+ assertMapping(node, 0, 12, 5, 29, 5, 32); // 420
}
@Test
@@ -152,10 +152,10 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
{
IVariableNode node = getField("const foo:int = 420;");
asBlockWalker.visitVariable(node);
- ///**\n * @const\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 420
- assertMapping(node, 0, 6, 4, 0, 4, 26); // foo
- assertMapping(node, 0, 13, 4, 26, 4, 29); // =
- assertMapping(node, 0, 16, 4, 29, 4, 32); // 420
+ ///**\n * @package\n * @const\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 420
+ assertMapping(node, 0, 6, 5, 0, 5, 26); // foo
+ assertMapping(node, 0, 13, 5, 26, 5, 29); // =
+ assertMapping(node, 0, 16, 5, 29, 5, 32); // 420
}
@Test
@@ -163,8 +163,8 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
{
IVariableNode node = getField("static const foo;");
asBlockWalker.visitVariable(node);
- ///**\n * @const\n * @type {*}\n */\nRoyaleTest_A.foo
- assertMapping(node, 0, 13, 4, 0, 4, 16); // foo
+ ///**\n * @package\n * @const\n * @type {*}\n */\nRoyaleTest_A.foo
+ assertMapping(node, 0, 13, 5, 0, 5, 16); // foo
}
@Test
@@ -172,8 +172,8 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
{
IVariableNode node = getField("static const foo:int;");
asBlockWalker.visitVariable(node);
- ///**\n * @const\n * @type {number}\n */\nRoyaleTest_A.foo = 0
- assertMapping(node, 0, 13, 4, 0, 4, 16); // foo
+ ///**\n * @package\n * @const\n * @type {number}\n */\nRoyaleTest_A.foo = 0
+ assertMapping(node, 0, 13, 5, 0, 5, 16); // foo
}
@Test
@@ -181,10 +181,10 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
{
IVariableNode node = getField("static const foo = 420;");
asBlockWalker.visitVariable(node);
- ///**\n * @const\n * @type {*}\n */\nRoyaleTest_A.foo = 420
- assertMapping(node, 0, 13, 4, 0, 4, 16); // foo
- assertMapping(node, 0, 16, 4, 16, 4, 19); // =
- assertMapping(node, 0, 19, 4, 19, 4, 22); // 420
+ ///**\n * @package\n * @const\n * @type {*}\n */\nRoyaleTest_A.foo = 420
+ assertMapping(node, 0, 13, 5, 0, 5, 16); // foo
+ assertMapping(node, 0, 16, 5, 16, 5, 19); // =
+ assertMapping(node, 0, 19, 5, 19, 5, 22); // 420
}
@Test
@@ -192,10 +192,10 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
{
IVariableNode node = getField("static const foo:int = 420;");
asBlockWalker.visitVariable(node);
- ///**\n * @export\n * @const\n * @type {number}\n */\nRoyaleTest_A.foo = 420
- assertMapping(node, 0, 13, 4, 0, 4, 16); // foo
- assertMapping(node, 0, 20, 4, 16, 4, 19); // =
- assertMapping(node, 0, 23, 4, 19, 4, 22); // 420
+ ///**\n * @package\n * @const\n * @type {number}\n */\nRoyaleTest_A.foo = 420
+ assertMapping(node, 0, 13, 5, 0, 5, 16); // foo
+ assertMapping(node, 0, 20, 5, 16, 5, 19); // =
+ assertMapping(node, 0, 23, 5, 19, 5, 22); // 420
}
protected IBackend createBackend()
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLScript.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLScript.java
index edf8c4f..6416831 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLScript.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLScript.java
@@ -44,8 +44,8 @@ public class TestSourceMapMXMLScript extends RoyaleSourceMapTestBase
String definitionName = definition.getQualifiedName();
assertTrue(definitionName.startsWith(getClass().getSimpleName()));
int endColumn = definitionName.length() + 14;
- ///**\n * @export\n * @type {*}\n */\nRoyaleTest_A.prototype.foo
- assertMapping(node, 0, 4, 42, 0, 42, endColumn); // foo
+ ///**\n * @package\n * @type {*}\n */\nRoyaleTest_A.prototype.foo
+ assertMapping(node, 0, 4, 43, 0, 43, endColumn); // foo
}
@Test