This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit 900140647ba98aa0bb0f04fd73ad2a25c80f25f0 Author: Alex Harui <[email protected]> AuthorDate: Sun Feb 18 16:02:59 2018 -0800 don't prune unused names as many times it is a type needed to prevent renaming --- .../royale/compiler/internal/codegen/js/royale/JSRoyaleEmitter.java | 2 ++ .../internal/codegen/mxml/sourcemaps/TestSourceMapMXMLEvents.java | 2 +- .../src/test/resources/royale/files/controllers/MyController_result.js | 2 ++ compiler-jx/src/test/resources/royale/projects/circular/Super_result.js | 1 + compiler-jx/src/test/resources/royale/projects/overrides/Test_result.js | 2 ++ .../src/test/resources/royale/projects/overrides/classes/A_result.js | 2 ++ .../test/resources/royale/projects/overrides/interfaces/IA_result.js | 2 ++ 7 files changed, 12 insertions(+), 1 deletion(-) diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleEmitter.java index 64926bf..87a53c3 100644 --- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleEmitter.java +++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleEmitter.java @@ -200,11 +200,13 @@ public class JSRoyaleEmitter extends JSGoogEmitter implements IJSRoyaleEmitter foundNamespace = true; } sawRequires = true; + /* if (!usedNames.contains(s)) { removeLineFromMappings(i); continue; } + */ } else if (sawRequires || i == len - 1) { diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLEvents.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLEvents.java index c5067fe..1672e31 100644 --- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLEvents.java +++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLEvents.java @@ -37,7 +37,7 @@ public class TestSourceMapMXMLEvents extends RoyaleSourceMapTestBase .getAncestorOfType(IMXMLDocumentNode.class); mxmlBlockWalker.walk(dnode); ///event - assertMapping(node, 0, 6, 74, 2, 74, 7); // event + assertMapping(node, 0, 6, 67, 2, 67, 7); // event //the start column in the ActionScript seems to be outside the quote //instead of inside. that seems like a bug. -JT } diff --git a/compiler-jx/src/test/resources/royale/files/controllers/MyController_result.js b/compiler-jx/src/test/resources/royale/files/controllers/MyController_result.js index e51daad..6a49473 100644 --- a/compiler-jx/src/test/resources/royale/files/controllers/MyController_result.js +++ b/compiler-jx/src/test/resources/royale/files/controllers/MyController_result.js @@ -24,6 +24,8 @@ goog.provide('controllers.MyController'); goog.require('MyInitialView'); goog.require('RoyaleTest_again'); goog.require('models.MyModel'); +goog.require('org.apache.royale.core.Application'); +goog.require('org.apache.royale.events.Event'); goog.require('org.apache.royale.core.IDocument'); goog.require('org.apache.royale.utils.Language'); 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 b0916b5..146ca29 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 @@ -21,6 +21,7 @@ goog.provide('Super'); +goog.require('Base'); 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 eb9fcd0..5a0e4db 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 @@ -22,6 +22,8 @@ goog.provide('Test'); goog.require('classes.A'); +goog.require('classes.C'); +goog.require('interfaces.IC'); 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 e9f68a9..65ede50 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 @@ -21,6 +21,8 @@ goog.provide('classes.A'); +goog.require('classes.B'); +goog.require('interfaces.IB'); goog.require('interfaces.IA'); 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 39c1162..f71d6ca 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 @@ -21,6 +21,8 @@ goog.provide('interfaces.IA'); +goog.require('classes.B'); +goog.require('interfaces.IB'); -- To stop receiving notification emails like this one, please contact [email protected].
