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/07/31 22:29:21 UTC
[royale-compiler] branch develop updated: AccessorEmitter:
temporarily restore exporting all static getters/setters until separate
issue can be fixed (closes #157)
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
The following commit(s) were added to refs/heads/develop by this push:
new b95dc90 AccessorEmitter: temporarily restore exporting all static getters/setters until separate issue can be fixed (closes #157)
b95dc90 is described below
commit b95dc90cc0a35e14a68ff8c05cddc30c04f3863d
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Fri Jul 31 15:29:12 2020 -0700
AccessorEmitter: temporarily restore exporting all static getters/setters until separate issue can be fixed (closes #157)
Currently, all static getter/setters must be exported. This seems to be caused by them being referenced with strings in IdentifierEmitter instead of being referenced directly. Once that is fixed, we can limit exporting per namespace again.
---
.../compiler/internal/codegen/js/jx/AccessorEmitter.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/AccessorEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/AccessorEmitter.java
index 00006dc..97b34bf 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/AccessorEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/AccessorEmitter.java
@@ -611,8 +611,8 @@ public class AccessorEmitter extends JSSubEmitter implements
ISetterNode setterNode = p.setter;
String baseName = p.name;
writeNewline("/**");
- if (p.resolvedExport && !p.suppressExport)
- writeNewline(" * @export");
+ if (emitExports && !p.suppressExport)
+ writeNewline(" * @export");
if (p.type != null)
writeNewline(" * @type {" + JSGoogDocEmitter.convertASTypeToJSType(p.type.getBaseName(), p.type.getPackageName()) + "} */");
else
@@ -735,15 +735,15 @@ public class AccessorEmitter extends JSSubEmitter implements
}
if(uri != null || def.isPublic())
{
- p.resolvedExport = emitExports;
+ p.resolvedExport = p.resolvedExport || emitExports;
}
else if(def.isInternal())
{
- p.resolvedExport = exportInternal;
+ p.resolvedExport = p.resolvedExport || exportInternal;
}
else if(def.isProtected())
{
- p.resolvedExport = exportProtected;
+ p.resolvedExport = p.resolvedExport || exportProtected;
}
p.getter = node;
if (!p.suppressExport) p.suppressExport = suppress;
@@ -803,15 +803,15 @@ public class AccessorEmitter extends JSSubEmitter implements
}
if(uri != null || def.isPublic())
{
- p.resolvedExport = emitExports;
+ p.resolvedExport = p.resolvedExport || emitExports;
}
else if(def.isInternal())
{
- p.resolvedExport = exportInternal;
+ p.resolvedExport = p.resolvedExport || exportInternal;
}
else if(def.isProtected())
{
- p.resolvedExport = exportProtected;
+ p.resolvedExport = p.resolvedExport || exportProtected;
}
p.setter = node;
if (!p.suppressExport) p.suppressExport = suppress;