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/02/19 00:10:42 UTC

[royale-compiler] 01/03: make all records have the same fields. No more optional fields. If I missed one, it will need to be fixed in the same way

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 492650f786b2268cdc62316f889cc659218b9ced
Author: Alex Harui <ah...@apache.org>
AuthorDate: Sun Feb 18 16:00:43 2018 -0800

    make all records have the same fields.  No more optional fields.  If I missed one, it will need to be fixed in the same way
---
 .../codegen/js/royale/JSRoyaleASDocEmitter.java    | 28 +++++++++++++++-------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleASDocEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleASDocEmitter.java
index b22548f..44befd2 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleASDocEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleASDocEmitter.java
@@ -681,9 +681,9 @@ public class JSRoyaleASDocEmitter extends JSGoogEmitter implements IJSRoyaleEmit
         	INamespaceReference nsRef = def.getNamespaceReference();
         	write("\"" + nsRef.getBaseName() + "\"");
         }
+    	writeNewline(",");
         if (def.isBindable())
         {
-        	writeNewline(",");
         	List<String> events = def.getBindableEventNames();
             write("  \"bindable\": [");
             boolean firstEvent = true;
@@ -696,26 +696,32 @@ public class JSRoyaleASDocEmitter extends JSGoogEmitter implements IJSRoyaleEmit
             }
             write("]");
         }
+        else
+            write("  \"bindable\": []");
+    	writeNewline(",");
+        write("  \"details\": [");
+        String sep = "";
         if (def.isOverride())
         {
-        	writeNewline(",");
-            write("  \"override\": true");
+            write(sep + "\"override\"");
+            sep = ",";
         }
         if (def.isStatic())
         {
-        	writeNewline(",");
-            write("  \"static\": true");
+            write(sep + "\"static\"");
+            sep = ",";
         }
         if (def.isDynamic())
         {
-        	writeNewline(",");
-            write("  \"dynamic\": true");
+            write(sep + "\"dynamic\"");
+            sep = ",";
         }
         if (def.isFinal())
         {
-        	writeNewline(",");
-            write("  \"final\": true");
+            write(sep + "\"final\"");
         }
+        write("]");
+    	writeNewline(",");
         if (def.isDeprecated())
         {
         	writeNewline(",");
@@ -732,6 +738,10 @@ public class JSRoyaleASDocEmitter extends JSGoogEmitter implements IJSRoyaleEmit
             write(dep.getSince());
             writeNewline("\"}");
         }
+        else
+        {
+            write("  \"deprecated\": {}");
+        }
     }
     
     public void writeEventTagNode(IMetaTagNode node)

-- 
To stop receiving notification emails like this one, please contact
aharui@apache.org.