ddl: work on C++ backend

3 files changed, 96 insertions, 20 deletions

diff --git a/Language.hs b/Language.hs
index e0e53cf..6a5cc33 100644
--- a/Language.hs
+++ b/Language.hs
@@ -176,7 +176,7 @@ hsType aliasMap = \case
   Data t        -> t
   x -> error $ "unknown type: " ++ show x
 
-csType :: AliasMap -> Type -> String
+csType :: AliasMap -> Type -> String -- TODO
 csType aliasMap a = case normalize aliasMap a of
   Data t        -> t
   Int           -> "int"
@@ -193,7 +193,6 @@ csType aliasMap a = case normalize aliasMap a of
 
 cppType :: AliasMap -> Type -> String
 cppType aliasMap = \case
-  Data t        -> "::" ++ t
   Int           -> "Int"
   Int32         -> "Int32"
   Word          -> "Word"
@@ -201,18 +200,6 @@ cppType aliasMap = \case
   Float         -> "Float"
   Bool          -> "Bool"
   String        -> "String"
-  Array t       -> "std::vector<" ++ cppType aliasMap t ++ ">"
-  List t        -> "std::vector<" ++ cppType aliasMap t ++ ">"
-  Map k v       -> "std::map<" ++ cppType aliasMap k ++ ", " ++ cppType aliasMap v ++ ">"
-  _ -> "int"
-{-
-  Int     -> "Int"
-  Int32   -> "Int32"
-  Word    -> "Word"
-  Word32  -> "Word32"
-  Float   -> "Float"
-  Bool    -> "Bool"
-  String  -> "String"
 
   V2 Int        -> "V2I"
   V2 Word       -> "V2U"
@@ -238,14 +225,13 @@ cppType aliasMap = \case
   V4 (V3 Float) -> "M34F"
   V4 (V4 Float) -> "M44F"
 
-  Array t       -> "Vector " ++ parens (cppType aliasMap t)
-  List t        -> "[" ++ cppType aliasMap t ++ "]"
-  Maybe t       -> "Maybe " ++ parens (cppType aliasMap t)
-  Map k v       -> "Map " ++ parens (cppType aliasMap k) ++ " " ++ parens (cppType aliasMap v)
+  Array t       -> "std::vector<" ++ cppType aliasMap t ++ ">"
+  List t        -> "std::vector<" ++ cppType aliasMap t ++ ">"
+  Maybe t       -> "Maybe<" ++ cppType aliasMap t ++ ">"
+  Map k v       -> "std::map<" ++ cppType aliasMap k ++ ", " ++ cppType aliasMap v ++ ">"
   -- user defined
-  Data t        -> t
+  Data t        -> "::" ++ t
   x -> error $ "unknown type: " ++ show x
--}
 
 hasFieldNames :: [Field] -> Bool
 hasFieldNames [] = False
diff --git a/lib/RT.hpp b/lib/RT.hpp
index 8ecd47a..569ebf2 100644
--- a/lib/RT.hpp
+++ b/lib/RT.hpp
@@ -17,10 +17,72 @@ typedef float Float;
 typedef bool Bool;
 typedef std::string String;
 
+template<typename T1>
+struct Maybe
+{
+  T1 data;
+  bool valid;
+};
+
+template<typename T>
+struct V2 { T x,y; };
+
+template<typename T>
+struct V3 { T x,y,z; };
+
+template<typename T>
+struct V4 { T x,y,z,w; };
+
+typedef struct V2<Int>    V2I;
+typedef struct V2<Word>   V2U;
+typedef struct V2<Float>  V2F;
+typedef struct V2<Bool>   V2B;
+
+typedef struct V3<Int>    V3I;
+typedef struct V3<Word>   V3U;
+typedef struct V3<Float>  V3F;
+typedef struct V3<Bool>   V3B;
+
+typedef struct V4<Int>    V4I;
+typedef struct V4<Word>   V4U;
+typedef struct V4<Float>  V4F;
+typedef struct V4<Bool>   V4B;
+
+typedef struct V2<V2F>    M22F;
+typedef struct V2<V3F>    M32F;
+typedef struct V2<V4F>    M42F;
+typedef struct V3<V2F>    M23F;
+typedef struct V3<V3F>    M33F;
+typedef struct V3<V4F>    M43F;
+typedef struct V4<V2F>    M24F;
+typedef struct V4<V3F>    M34F;
+typedef struct V4<V4F>    M44F;
+
+
 template<typename T>
 json toJSON(T &v);
 
 template<typename any>
+json toJSON(Maybe<any> &value) {
+  return json();
+}
+
+template<typename any>
+json toJSON(V2<any> &value) {
+  return json();
+}
+
+template<typename any>
+json toJSON(V3<any> &value) {
+  return json();
+}
+
+template<typename any>
+json toJSON(V4<any> &value) {
+  return json();
+}
+
+template<typename any>
 json toJSON(std::vector<any> &v) {
   json obj = json::array();
   for (any i : v) {
@@ -38,6 +100,30 @@ template<typename T>
 T fromJSON(T &v, json &obj);
 
 template<typename any>
+Maybe<any> fromJSON(Maybe<any> &v, json &obj) {
+  Maybe<any> a;
+  return a;
+}
+
+template<typename any>
+V2<any> fromJSON(V2<any> &v, json &obj) {
+  V2<any> a;
+  return a;
+}
+
+template<typename any>
+V3<any> fromJSON(V3<any> &v, json &obj) {
+  V3<any> a;
+  return a;
+}
+
+template<typename any>
+V4<any> fromJSON(V4<any> &v, json &obj) {
+  V4<any> a;
+  return a;
+}
+
+template<typename any>
 std::vector<any> fromJSON(std::vector<any> &v, json &obj) {
   std::vector<any> a;
   return a;
diff --git a/templates/data.cpp.ede b/templates/data.cpp.ede
index c56d9fc..ac6012c 100644
--- a/templates/data.cpp.ede
+++ b/templates/data.cpp.ede
@@ -1,6 +1,9 @@
 // generated file, do not modify!
 // {{ dateTime }}
 
+#include <string>
+#include <iostream>
+
 #include "{{ moduleName }}.hpp"
 
 {% for t in definitions %}
@@ -20,6 +23,7 @@ template<> json toJSON<{{ t.value.dataName }}>({{ t.value.dataName }} &v) {
 }
 
 template<> {{ t.value.dataName }} fromJSON<{{ t.value.dataName }}>({{ t.value.dataName }} &v, json &obj) {
+  std::cout << "fromJSON: {{ t.value.dataName }}\n";
   enum ::{{ t.value.dataName }}::tag tagType;
   std::string tag = obj["tag"];
   {% for c in t.value.constructors %}