ddl: improve typedef look in C++

2 files changed, 6 insertions, 1 deletions

diff --git a/Language.hs b/Language.hs
index b2e250c..ab96349 100644
--- a/Language.hs
+++ b/Language.hs
@@ -231,7 +231,7 @@ cppType aliasMap = \case
   Map k v       -> "std::map<" ++ cppType aliasMap k ++ ", " ++ cppType aliasMap v ++ ">"
   -- user defined
   Data t        -> case normalize aliasMap (Data t) of
-    Data n | t == n -> "std::shared_ptr<::" ++ t ++ ">"
+    Data _  -> "std::shared_ptr<::" ++ t ++ ">"
     _       -> "::" ++ t
   x -> error $ "unknown type: " ++ show x
 
diff --git a/templates/data.hpp.ede b/templates/data.hpp.ede
index 383ed5f..dab478c 100644
--- a/templates/data.hpp.ede
+++ b/templates/data.hpp.ede
@@ -28,7 +28,12 @@ namespace data { {% for c in t.value.constructors %}{% if !(c.value.fields | emp
   };{% endif %}{% endfor %}
 }
 {% when "TypeAlias" %}
+{% case t.value.aliasType.tag %}
+{% when "Data" %}
+typedef {{ t.value.aliasType.contents }} {{ t.value.aliasName }};
+{% else %}
 typedef {{ t.value.aliasType | cppType }} {{ t.value.aliasName }};
+{% endcase %}
 
 {% endcase %}
 {% endfor %}