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/03/25 17:57:16 UTC
[royale-compiler] 05/05: Revert "MXMLDescriptorSpecifier: uses
goog.reflect.objectProperty() to allow Closure renaming in release build"
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 b5020db307b89be9a255cb6ff725235194d351ee
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Wed Mar 25 10:25:58 2020 -0700
Revert "MXMLDescriptorSpecifier: uses goog.reflect.objectProperty() to allow Closure renaming in release build"
This reverts commit a06ef7f1c94cf45fbb28acc9a4f218a815982bfd.
---
.../internal/codegen/js/goog/JSGoogEmitterTokens.java | 1 -
.../codegen/mxml/royale/MXMLDescriptorSpecifier.java | 19 +++----------------
2 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogEmitterTokens.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogEmitterTokens.java
index d615b9f..8afd294 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogEmitterTokens.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogEmitterTokens.java
@@ -24,7 +24,6 @@ public enum JSGoogEmitterTokens implements IEmitterTokens
{
AS3("__AS3__"),
GOOG_ARRAY_FOREACH("goog.array.forEach"),
- GOOG_REFLECT_OBJECTPROPERTY("goog.reflect.objectProperty"),
GOOG_BASE("base"),
GOOG_CALL("call"),
GOOG_BIND("goog.bind"),
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLDescriptorSpecifier.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLDescriptorSpecifier.java
index 7f347b4..2208f3a 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLDescriptorSpecifier.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLDescriptorSpecifier.java
@@ -200,22 +200,9 @@ public class MXMLDescriptorSpecifier extends MXMLNodeSpecifier
private String outputPropertySpecifier(boolean writeNewline)
{
- if (isProperty)
- {
- write(JSGoogEmitterTokens.GOOG_REFLECT_OBJECTPROPERTY);
- write(ASEmitterTokens.PAREN_OPEN);
- write(ASEmitterTokens.SINGLE_QUOTE);
- write(name);
- write(ASEmitterTokens.SINGLE_QUOTE);
- write(ASEmitterTokens.COMMA);
- write(ASEmitterTokens.SPACE);
- write(ASEmitterTokens.THIS);
- write(ASEmitterTokens.PAREN_CLOSE);
- }
- else
- {
- write(name);
- }
+ write((isProperty) ? ASEmitterTokens.SINGLE_QUOTE.getToken() : "");
+ write(name);
+ write((isProperty) ? ASEmitterTokens.SINGLE_QUOTE.getToken() : "");
writeDelimiter(writeNewline);
if (isProperty)