You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2018/08/29 19:50:34 UTC
[royale-compiler] branch develop updated: try keeping external
dependencies out of staticUsedNames list. Fixes #47
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
The following commit(s) were added to refs/heads/develop by this push:
new c6df44b try keeping external dependencies out of staticUsedNames list. Fixes #47
c6df44b is described below
commit c6df44bf8cab97240685e329f4383dd30da2ddc8
Author: Alex Harui <ah...@apache.org>
AuthorDate: Wed Aug 29 12:50:20 2018 -0700
try keeping external dependencies out of staticUsedNames list. Fixes #47
---
.../royale/compiler/internal/codegen/js/royale/JSRoyaleEmitter.java | 2 +-
.../royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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 9e8b53c..b7ba4f6 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
@@ -564,7 +564,7 @@ public class JSRoyaleEmitter extends JSGoogEmitter implements IJSRoyaleEmitter
else if (!isDoc)
{
if (getModel().inStaticInitializer)
- if (!staticUsedNames.contains(name) && !NativeUtils.isJSNative(name))
+ if (!staticUsedNames.contains(name) && !NativeUtils.isJSNative(name) && !isExternal(name))
staticUsedNames.add(name);
if (!usedNames.contains(name) && !isExternal(name))
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java
index af18bd9..cd76d61 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java
@@ -2836,7 +2836,7 @@ public class MXMLRoyaleEmitter extends MXMLEmitter implements
return documentDefinition.getQualifiedName() + "." + name;
if (NativeUtils.isJSNative(name)) return name;
if (inStaticInitializer)
- if (!staticUsedNames.contains(name) && !NativeUtils.isJSNative(name))
+ if (!staticUsedNames.contains(name) && !NativeUtils.isJSNative(name) && !isExternal(name))
staticUsedNames.add(name);
if (useName && !usedNames.contains(name) && !isExternal(name))