3 files changed, 139 insertions, 23 deletions

diff --git a/ddl/templates/data.cs.ede b/ddl/templates/data.cs.ede
index dffad32..74e0dac 100644
--- a/ddl/templates/data.cs.ede
+++ b/ddl/templates/data.cs.ede
@@ -33,7 +33,7 @@ namespace {{ moduleName }} {
 
   // JSON deserializer
   enum Type { {% for t in usedTypes %}
-    {{ t.value | csTypeEnum }}{% if !t.last %},{% endif %}{% endfor %}
+    {{ t.value | typeEnum }}{% if !t.last %},{% endif %}{% endfor %}
   }
 
   class Loader {
@@ -43,52 +43,52 @@ namespace {{ moduleName }} {
         {% case t.value.tag %}
         {% when "Data" %}
         {% when "V2" %}
-        case Type.{{ t.value | csTypeEnum }}:
+        case Type.{{ t.value | typeEnum }}:
           return new {{ t.value | csType }}
-            { x = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | csTypeEnum }},obj["x"])
-            , y = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | csTypeEnum }},obj["y"])
+            { x = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | typeEnum }},obj["x"])
+            , y = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | typeEnum }},obj["y"])
             };
         {% when "V3" %}
-        case Type.{{ t.value | csTypeEnum }}:
+        case Type.{{ t.value | typeEnum }}:
           return new {{ t.value | csType }}
-            { x = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | csTypeEnum }},obj["x"])
-            , y = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | csTypeEnum }},obj["y"])
-            , z = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | csTypeEnum }},obj["z"])
+            { x = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | typeEnum }},obj["x"])
+            , y = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | typeEnum }},obj["y"])
+            , z = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | typeEnum }},obj["z"])
             };
         {% when "V4" %}
-        case Type.{{ t.value | csTypeEnum }}:
+        case Type.{{ t.value | typeEnum }}:
           return new {{ t.value | csType }}
-            { x = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | csTypeEnum }},obj["x"])
-            , y = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | csTypeEnum }},obj["y"])
-            , z = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | csTypeEnum }},obj["z"])
-            , w = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | csTypeEnum }},obj["w"])
+            { x = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | typeEnum }},obj["x"])
+            , y = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | typeEnum }},obj["y"])
+            , z = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | typeEnum }},obj["z"])
+            , w = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | typeEnum }},obj["w"])
             };
         {% when "Map" %}
-        case Type.{{ t.value | csTypeEnum }}: {
+        case Type.{{ t.value | typeEnum }}: {
           var map = new {{ t.value | csType }} ();
           foreach(var i in (JObject)obj) {
-            map.Add( ({{ t.value.key_ | csType }})fromJSON(Type.{{ t.value.key_ | csTypeEnum }},i.Key)
-                   , ({{ t.value.value_ | csType }})fromJSON(Type.{{ t.value.value_ | csTypeEnum }},i.Value));
+            map.Add( ({{ t.value.key_ | csType }})fromJSON(Type.{{ t.value.key_ | typeEnum }},i.Key)
+                   , ({{ t.value.value_ | csType }})fromJSON(Type.{{ t.value.value_ | typeEnum }},i.Value));
           }
           return map;
         }
         {% when "Array" %}
-        case Type.{{ t.value | csTypeEnum }}: return ((JArray)obj).Select(x => fromJSON (Type.{{ t.value.type_ | csTypeEnum }}, x)).ToList();
+        case Type.{{ t.value | typeEnum }}: return ((JArray)obj).Select(x => fromJSON (Type.{{ t.value.type_ | typeEnum }}, x)).ToList();
         {% when "List" %}
-        case Type.{{ t.value | csTypeEnum }}: return ((JArray)obj).Select(x => fromJSON (Type.{{ t.value.type_ | csTypeEnum }}, x)).ToList();
+        case Type.{{ t.value | typeEnum }}: return ((JArray)obj).Select(x => fromJSON (Type.{{ t.value.type_ | typeEnum }}, x)).ToList();
         {% when "Maybe" %}
-        case Type.{{ t.value | csTypeEnum }}: {
+        case Type.{{ t.value | typeEnum }}: {
           var m = new {{ t.value | csType }} ();
           if (obj == null || obj.Type == JTokenType.Null) {
             m.valid = false;
           } else {
             m.valid = true;
-            m.data = ({{ t.value.type_ | csType }})fromJSON (Type.{{ t.value.type_ | csTypeEnum }},obj);
+            m.data = ({{ t.value.type_ | csType }})fromJSON (Type.{{ t.value.type_ | typeEnum }},obj);
           }
           return m;
         }
         {% else %}
-        case Type.{{ t.value | csTypeEnum }}: return ({{ t.value | csType }})obj;
+        case Type.{{ t.value | typeEnum }}: return ({{ t.value | csType }})obj;
         {% endcase %}
         {% endfor %}
 
@@ -101,8 +101,8 @@ namespace {{ moduleName }} {
             tagType = {{ t.value.dataName }}.Tag.{{ c.value.name }};
             {% if !(c.value.fields | empty) %}
             data.{{ c.value.name }} tv = new data.{{ c.value.name }}();{% for f in c.value.fields %}{% if c.value.fields | hasFieldNames %}
-            tv.{{ f.value.fieldName }} = ({{ f.value.fieldType | csType }})fromJSON(Type.{{ f.value.fieldType | csTypeEnum }},obj["{{ f.value.fieldName }}"]);{% else %}
-            tv._{{ f.index0 }} = ({{ f.value.fieldType | csType }})fromJSON(Type.{{ f.value.fieldType | csTypeEnum }},obj["arg{{ f.index0 }}"]);{% endif %}{% endfor %}
+            tv.{{ f.value.fieldName }} = ({{ f.value.fieldType | csType }})fromJSON(Type.{{ f.value.fieldType | typeEnum }},obj["{{ f.value.fieldName }}"]);{% else %}
+            tv._{{ f.index0 }} = ({{ f.value.fieldType | csType }})fromJSON(Type.{{ f.value.fieldType | typeEnum }},obj["arg{{ f.index0 }}"]);{% endif %}{% endfor %}
             return tv;
             {% endif %}
           }
diff --git a/ddl/templates/data.java.ede b/ddl/templates/data.java.ede
index 2aec628..71e3bd2 100644
--- a/ddl/templates/data.java.ede
+++ b/ddl/templates/data.java.ede
@@ -5,6 +5,7 @@ package {{ moduleName }};
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import RT.*;
 
 {% for m in imports %}
 import {{ m.value }}.*;
@@ -21,6 +22,7 @@ public class {{ def.dataName }} {
   public class {{ c.value.name }}_ extends {{ def.dataName }} { {% for f in c.value.fields %}{% if c.value.fields | hasFieldNames %}
     public {{ f.value.fieldType | javaType }} {{ f.value.fieldName }};{% else %}
     public {{ f.value.fieldType | javaType }} _{{ f.index0 }};{% endif %}{% endfor %}
+    public {{ c.value.name }}_() { tag = {{ def.dataName }}.Tag.{{ c.value.name }}; }
   }{% endif %}{% endfor %}
 }
 
diff --git a/ddl/templates/json.java.ede b/ddl/templates/json.java.ede
new file mode 100644
index 0000000..35bbfd7
--- /dev/null
+++ b/ddl/templates/json.java.ede
@@ -0,0 +1,114 @@
+// generated file, do not modify!
+// {{ dateTime }}
+
+package {{ moduleName }};
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import org.json.*;
+import RT.*;
+
+{% for m in imports %}
+import {{ m.value }}.*;
+{% endfor %}
+
+public class JSON {
+  // JSON deserializer
+  public enum Type { {% for t in usedTypes %}
+    {{ t.value | typeEnum }}{% if !t.last %},{% endif %}{% endfor %}
+  }
+
+  public static Object fromJSON(Type type, Object rawObj) throws JSONException, Exception {
+    switch (type) {
+      {% for t in usedTypes %}
+      {% case t.value.tag %}
+      {% when "Data" %}
+      {% when "V2" %}
+      case {{ t.value | typeEnum }}: {
+        JSONObject obj = (JSONObject)rawObj;
+        return new {{ t.value | javaType }}
+          ( ({{ t.value.type_ | javaType }})fromJSON(Type.{{ t.value.type_ | typeEnum }},obj.get("x"))
+          , ({{ t.value.type_ | javaType }})fromJSON(Type.{{ t.value.type_ | typeEnum }},obj.get("y"))
+          );
+      }
+      {% when "V3" %}
+      case {{ t.value | typeEnum }}: {
+        JSONObject obj = (JSONObject)rawObj;
+        return new {{ t.value | javaType }}
+          ( ({{ t.value.type_ | javaType }})fromJSON(Type.{{ t.value.type_ | typeEnum }},obj.get("x"))
+          , ({{ t.value.type_ | javaType }})fromJSON(Type.{{ t.value.type_ | typeEnum }},obj.get("y"))
+          , ({{ t.value.type_ | javaType }})fromJSON(Type.{{ t.value.type_ | typeEnum }},obj.get("z"))
+          );
+      }
+      {% when "V4" %}
+      case {{ t.value | typeEnum }}: {
+        JSONObject obj = (JSONObject)rawObj;
+        return new {{ t.value | javaType }}
+          ( ({{ t.value.type_ | javaType }})fromJSON(Type.{{ t.value.type_ | typeEnum }},obj.get("x"))
+          , ({{ t.value.type_ | javaType }})fromJSON(Type.{{ t.value.type_ | typeEnum }},obj.get("y"))
+          , ({{ t.value.type_ | javaType }})fromJSON(Type.{{ t.value.type_ | typeEnum }},obj.get("z"))
+          , ({{ t.value.type_ | javaType }})fromJSON(Type.{{ t.value.type_ | typeEnum }},obj.get("w"))
+          );
+      }
+      {% when "Map" %}
+/*
+      case {{ t.value | typeEnum }}: {
+        var map = new {{ t.value | javaType }} ();
+        foreach(var i in (JSONObject)rawObj) {
+          map.Add( ({{ t.value.key_ | javaType }})fromJSON(Type.{{ t.value.key_ | typeEnum }},i.Key)
+                 , ({{ t.value.value_ | javaType }})fromJSON(Type.{{ t.value.value_ | typeEnum }},i.Value));
+        }
+        return map;
+      }
+*/
+      {% when "Array" %}
+//      case {{ t.value | typeEnum }}: return ((JArray)obj).Select(x => fromJSON (Type.{{ t.value.type_ | typeEnum }}, x)).ToList();
+      {% when "List" %}
+//      case {{ t.value | typeEnum }}: return ((JArray)obj).Select(x => fromJSON (Type.{{ t.value.type_ | typeEnum }}, x)).ToList();
+      {% when "Maybe" %}
+/*
+      case {{ t.value | typeEnum }}: {
+        var m = new {{ t.value | javaType }} ();
+        if (obj == null || obj.Type == JTokenType.Null) {
+          m.valid = false;
+        } else {
+          m.valid = true;
+          m.data = ({{ t.value.type_ | javaType }})fromJSON (Type.{{ t.value.type_ | typeEnum }},obj);
+        }
+        return m;
+      }
+*/
+      {% else %}
+      case {{ t.value | typeEnum }}: return ({{ t.value | javaType }})rawObj;
+      {% endcase %}
+      {% endfor %}
+
+      {% for t in definitions %}
+      case {{ t.value.dataName }}: {
+        JSONObject obj = (JSONObject)rawObj;
+        String tag = obj.getString("tag");
+        {{ t.value.dataName }}.Tag tagType;
+        switch (tag) {
+        {% for c in t.value.constructors %}
+          case "{{ c.value.name }}":{% if (c.value.fields | empty) %} tagType = {{ t.value.dataName }}.Tag.{{ c.value.name }}; break;
+{% else %} {
+            {{ t.value.dataName }}.{{ c.value.name }}_ tv = new {{ t.value.dataName }}().new {{ c.value.name }}_();{% for f in c.value.fields %}{% if c.value.fields | hasFieldNames %}
+            tv.{{ f.value.fieldName }} = ({{ f.value.fieldType | javaType }})fromJSON(Type.{{ f.value.fieldType | typeEnum }},obj.get("{{ f.value.fieldName }}"));{% else %}
+            tv._{{ f.index0 }} = ({{ f.value.fieldType | javaType }})fromJSON(Type.{{ f.value.fieldType | typeEnum }},obj.get("arg{{ f.index0 }}"));{% endif %}{% endfor %}
+            return tv;
+          }
+          {% endif %}
+        {% endfor %}
+          default: throw new Exception("unknown constructor: " + tag);
+        }
+        {% if t.value | hasEnumConstructor %}
+        {{ t.value.dataName }} o = new {{ t.value.dataName }}();
+        o.tag = tagType;
+        return o;
+        {% endif %}
+      }
+      {% endfor %}
+    }
+    throw new Exception("unknown type");
+  }
+}
\ No newline at end of file