modify Compiled: add desugared String field

31 files changed, 50 insertions, 46 deletions

diff --git a/ddl/Definitions.hs b/ddl/Definitions.hs
index 7aa32bd..cc8d042 100644
--- a/ddl/Definitions.hs
+++ b/ddl/Definitions.hs
@@ -475,7 +475,7 @@ typeInfo = do
 
   data_ "CompileResult" $ do
     const_ "CompileError" [Array "Range", String, Array "TypeInfo"]
-    const_ "Compiled"     [String, "Pipeline", Array "TypeInfo"]
+    const_ "Compiled"     [String, String, "Pipeline", Array "TypeInfo"]
 
 pipelineSchema = do
   data_ "StreamType" $ do
diff --git a/ddl/out/LambdaCube.IR.cpp b/ddl/out/LambdaCube.IR.cpp
index 1185dde..75a26eb 100644
--- a/ddl/out/LambdaCube.IR.cpp
+++ b/ddl/out/LambdaCube.IR.cpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:37:22.233668000000Z
+// 2016-03-01T13:00:40.426854000000Z
 
 #include "LambdaCube.IR.hpp"
 template<> json toJSON<std::shared_ptr<ArrayValue>>(std::shared_ptr<ArrayValue> &v) {
diff --git a/ddl/out/LambdaCube.IR.hpp b/ddl/out/LambdaCube.IR.hpp
index afd560b..0e139b1 100644
--- a/ddl/out/LambdaCube.IR.hpp
+++ b/ddl/out/LambdaCube.IR.hpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:37:22.233668000000Z
+// 2016-03-01T13:00:40.426854000000Z
 
 #ifndef HEADER_LambdaCube.IR_H
 #define HEADER_LambdaCube.IR_H
diff --git a/ddl/out/LambdaCube.IR.hs b/ddl/out/LambdaCube.IR.hs
index 70a0788..7776a6d 100644
--- a/ddl/out/LambdaCube.IR.hs
+++ b/ddl/out/LambdaCube.IR.hs
@@ -1,5 +1,5 @@
 -- generated file, do not modify!
--- 2016-02-26T11:37:22.233668000000Z
+-- 2016-03-01T13:00:40.426854000000Z
 
 {-# LANGUAGE OverloadedStrings, RecordWildCards #-}
 module LambdaCube.IR where
diff --git a/ddl/out/LambdaCube.IR.purs b/ddl/out/LambdaCube.IR.purs
index 2bec655..5e2e548 100644
--- a/ddl/out/LambdaCube.IR.purs
+++ b/ddl/out/LambdaCube.IR.purs
@@ -1,5 +1,5 @@
 -- generated file, do not modify!
--- 2016-02-26T11:37:22.233668000000Z
+-- 2016-03-01T13:00:40.426854000000Z
 
 module LambdaCube.IR where
 import Prelude
diff --git a/ddl/out/LambdaCube.IR.swift b/ddl/out/LambdaCube.IR.swift
index 884e3dc..3131320 100644
--- a/ddl/out/LambdaCube.IR.swift
+++ b/ddl/out/LambdaCube.IR.swift
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:37:22.233668000000Z
+// 2016-03-01T13:00:40.426854000000Z
 
 typealias StreamName = Int
 
diff --git a/ddl/out/LambdaCube.IR2.hpp b/ddl/out/LambdaCube.IR2.hpp
index ed23b5d..48153e5 100644
--- a/ddl/out/LambdaCube.IR2.hpp
+++ b/ddl/out/LambdaCube.IR2.hpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:37:22.233668000000Z
+// 2016-03-01T13:00:40.426854000000Z
 
 #ifndef HEADER_LambdaCube.IR_H
 #define HEADER_LambdaCube.IR_H
diff --git a/ddl/out/LambdaCube.Mesh.cpp b/ddl/out/LambdaCube.Mesh.cpp
index 1b24da2..ccbf035 100644
--- a/ddl/out/LambdaCube.Mesh.cpp
+++ b/ddl/out/LambdaCube.Mesh.cpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:37:22.580893000000Z
+// 2016-03-01T13:00:40.781208000000Z
 
 #include "LambdaCube.Mesh.hpp"
 template<> json toJSON<std::shared_ptr<MeshAttribute>>(std::shared_ptr<MeshAttribute> &v) {
diff --git a/ddl/out/LambdaCube.Mesh.hpp b/ddl/out/LambdaCube.Mesh.hpp
index f643d1f..29bb2ba 100644
--- a/ddl/out/LambdaCube.Mesh.hpp
+++ b/ddl/out/LambdaCube.Mesh.hpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:37:22.580893000000Z
+// 2016-03-01T13:00:40.781208000000Z
 
 #ifndef HEADER_LambdaCube.Mesh_H
 #define HEADER_LambdaCube.Mesh_H
diff --git a/ddl/out/LambdaCube.Mesh.hs b/ddl/out/LambdaCube.Mesh.hs
index f1c7a3b..1e7926a 100644
--- a/ddl/out/LambdaCube.Mesh.hs
+++ b/ddl/out/LambdaCube.Mesh.hs
@@ -1,5 +1,5 @@
 -- generated file, do not modify!
--- 2016-02-26T11:37:22.580893000000Z
+-- 2016-03-01T13:00:40.781208000000Z
 
 {-# LANGUAGE OverloadedStrings, RecordWildCards #-}
 module LambdaCube.Mesh where
diff --git a/ddl/out/LambdaCube.Mesh.purs b/ddl/out/LambdaCube.Mesh.purs
index 77e54c8..22a8380 100644
--- a/ddl/out/LambdaCube.Mesh.purs
+++ b/ddl/out/LambdaCube.Mesh.purs
@@ -1,5 +1,5 @@
 -- generated file, do not modify!
--- 2016-02-26T11:37:22.580893000000Z
+-- 2016-03-01T13:00:40.781208000000Z
 
 module LambdaCube.Mesh where
 import Prelude
diff --git a/ddl/out/LambdaCube.Mesh.swift b/ddl/out/LambdaCube.Mesh.swift
index 4e0f689..e300c0f 100644
--- a/ddl/out/LambdaCube.Mesh.swift
+++ b/ddl/out/LambdaCube.Mesh.swift
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:37:22.580893000000Z
+// 2016-03-01T13:00:40.781208000000Z
 
 enum MeshAttribute {
   case A_Float(Array<Float>)
diff --git a/ddl/out/LambdaCube.Mesh2.hpp b/ddl/out/LambdaCube.Mesh2.hpp
index 6c36caf..56cf730 100644
--- a/ddl/out/LambdaCube.Mesh2.hpp
+++ b/ddl/out/LambdaCube.Mesh2.hpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:37:22.580893000000Z
+// 2016-03-01T13:00:40.781208000000Z
 
 #ifndef HEADER_LambdaCube.Mesh_H
 #define HEADER_LambdaCube.Mesh_H
diff --git a/ddl/out/LambdaCube.PipelineSchema.cpp b/ddl/out/LambdaCube.PipelineSchema.cpp
index 34c2138..9e2604a 100644
--- a/ddl/out/LambdaCube.PipelineSchema.cpp
+++ b/ddl/out/LambdaCube.PipelineSchema.cpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:37:22.561871000000Z
+// 2016-03-01T13:00:40.761274000000Z
 
 #include "LambdaCube.PipelineSchema.hpp"
 template<> json toJSON<std::shared_ptr<StreamType>>(std::shared_ptr<StreamType> &v) {
diff --git a/ddl/out/LambdaCube.PipelineSchema.hpp b/ddl/out/LambdaCube.PipelineSchema.hpp
index 2cba072..82e9853 100644
--- a/ddl/out/LambdaCube.PipelineSchema.hpp
+++ b/ddl/out/LambdaCube.PipelineSchema.hpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:37:22.561871000000Z
+// 2016-03-01T13:00:40.761274000000Z
 
 #ifndef HEADER_LambdaCube.PipelineSchema_H
 #define HEADER_LambdaCube.PipelineSchema_H
diff --git a/ddl/out/LambdaCube.PipelineSchema.hs b/ddl/out/LambdaCube.PipelineSchema.hs
index 3d4f612..ba83200 100644
--- a/ddl/out/LambdaCube.PipelineSchema.hs
+++ b/ddl/out/LambdaCube.PipelineSchema.hs
@@ -1,5 +1,5 @@
 -- generated file, do not modify!
--- 2016-02-26T11:37:22.561871000000Z
+-- 2016-03-01T13:00:40.761274000000Z
 
 {-# LANGUAGE OverloadedStrings, RecordWildCards #-}
 module LambdaCube.PipelineSchema where
diff --git a/ddl/out/LambdaCube.PipelineSchema.purs b/ddl/out/LambdaCube.PipelineSchema.purs
index a6da8d6..1f741cb 100644
--- a/ddl/out/LambdaCube.PipelineSchema.purs
+++ b/ddl/out/LambdaCube.PipelineSchema.purs
@@ -1,5 +1,5 @@
 -- generated file, do not modify!
--- 2016-02-26T11:37:22.561871000000Z
+-- 2016-03-01T13:00:40.761274000000Z
 
 module LambdaCube.PipelineSchema where
 import Prelude
diff --git a/ddl/out/LambdaCube.PipelineSchema.swift b/ddl/out/LambdaCube.PipelineSchema.swift
index 479af91..0c48df8 100644
--- a/ddl/out/LambdaCube.PipelineSchema.swift
+++ b/ddl/out/LambdaCube.PipelineSchema.swift
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:37:22.561871000000Z
+// 2016-03-01T13:00:40.761274000000Z
 
 enum StreamType {
   case Attribute_Word
diff --git a/ddl/out/LambdaCube.PipelineSchema2.hpp b/ddl/out/LambdaCube.PipelineSchema2.hpp
index efdff06..691aa9b 100644
--- a/ddl/out/LambdaCube.PipelineSchema2.hpp
+++ b/ddl/out/LambdaCube.PipelineSchema2.hpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:37:22.561871000000Z
+// 2016-03-01T13:00:40.761274000000Z
 
 #ifndef HEADER_LambdaCube.PipelineSchema_H
 #define HEADER_LambdaCube.PipelineSchema_H
diff --git a/ddl/out/LambdaCube.TypeInfo.cpp b/ddl/out/LambdaCube.TypeInfo.cpp
index c68fc2d..bf793c3 100644
--- a/ddl/out/LambdaCube.TypeInfo.cpp
+++ b/ddl/out/LambdaCube.TypeInfo.cpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:37:22.609565000000Z
+// 2016-03-01T13:00:40.810157000000Z
 
 #include "LambdaCube.TypeInfo.hpp"
 template<> json toJSON<std::shared_ptr<Range>>(std::shared_ptr<Range> &v) {
@@ -87,6 +87,7 @@ template<> json toJSON<std::shared_ptr<CompileResult>>(std::shared_ptr<CompileRe
         obj["arg0"] = toJSON(tv->_0);
         obj["arg1"] = toJSON(tv->_1);
         obj["arg2"] = toJSON(tv->_2);
+        obj["arg3"] = toJSON(tv->_3);
       }
       break;
   }
@@ -108,8 +109,9 @@ template<> std::shared_ptr<CompileResult> fromJSON<std::shared_ptr<CompileResult
     tagType = ::CompileResult::tag::Compiled;
     std::shared_ptr<data::Compiled> tv(new data::Compiled());
     tv->_0 = fromJSON(W<String>(), obj["arg0"]);
-    tv->_1 = fromJSON(W<std::shared_ptr<::Pipeline>>(), obj["arg1"]);
-    tv->_2 = fromJSON(W<std::vector<std::shared_ptr<::TypeInfo>>>(), obj["arg2"]);
+    tv->_1 = fromJSON(W<String>(), obj["arg1"]);
+    tv->_2 = fromJSON(W<std::shared_ptr<::Pipeline>>(), obj["arg2"]);
+    tv->_3 = fromJSON(W<std::vector<std::shared_ptr<::TypeInfo>>>(), obj["arg3"]);
     return tv;
   }
   else throw "unknown constructor: " + tag;
diff --git a/ddl/out/LambdaCube.TypeInfo.hpp b/ddl/out/LambdaCube.TypeInfo.hpp
index ec24562..66a4eba 100644
--- a/ddl/out/LambdaCube.TypeInfo.hpp
+++ b/ddl/out/LambdaCube.TypeInfo.hpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:37:22.609565000000Z
+// 2016-03-01T13:00:40.810157000000Z
 
 #ifndef HEADER_LambdaCube.TypeInfo_H
 #define HEADER_LambdaCube.TypeInfo_H
@@ -56,8 +56,9 @@ namespace data {
   class Compiled : public ::CompileResult {
     public:
       String _0;
-      std::shared_ptr<::Pipeline> _1;
-      std::vector<std::shared_ptr<::TypeInfo>> _2;
+      String _1;
+      std::shared_ptr<::Pipeline> _2;
+      std::vector<std::shared_ptr<::TypeInfo>> _3;
       Compiled() { tag = tag::Compiled; }
   };
 }
diff --git a/ddl/out/LambdaCube.TypeInfo.hs b/ddl/out/LambdaCube.TypeInfo.hs
index 38a3e48..77ccbfd 100644
--- a/ddl/out/LambdaCube.TypeInfo.hs
+++ b/ddl/out/LambdaCube.TypeInfo.hs
@@ -1,5 +1,5 @@
 -- generated file, do not modify!
--- 2016-02-26T11:37:22.609565000000Z
+-- 2016-03-01T13:00:40.810157000000Z
 
 {-# LANGUAGE OverloadedStrings, RecordWildCards #-}
 module LambdaCube.TypeInfo where
@@ -37,7 +37,7 @@ data TypeInfo
 
 data CompileResult
   = CompileError (Vector Range) String (Vector TypeInfo)
-  | Compiled String Pipeline (Vector TypeInfo)
+  | Compiled String String Pipeline (Vector TypeInfo)
   deriving (Show, Eq, Ord)
 
 
@@ -92,13 +92,13 @@ instance FromJSON TypeInfo where
 instance ToJSON CompileResult where
   toJSON v = case v of
     CompileError arg0 arg1 arg2 -> object [ "tag" .= ("CompileError" :: Text), "arg0" .= arg0, "arg1" .= arg1, "arg2" .= arg2]
-    Compiled arg0 arg1 arg2 -> object [ "tag" .= ("Compiled" :: Text), "arg0" .= arg0, "arg1" .= arg1, "arg2" .= arg2]
+    Compiled arg0 arg1 arg2 arg3 -> object [ "tag" .= ("Compiled" :: Text), "arg0" .= arg0, "arg1" .= arg1, "arg2" .= arg2, "arg3" .= arg3]
 
 instance FromJSON CompileResult where
   parseJSON (Object obj) = do
     tag <- obj .: "tag"
     case tag :: Text of
       "CompileError" -> CompileError <$> obj .: "arg0" <*> obj .: "arg1" <*> obj .: "arg2"
-      "Compiled" -> Compiled <$> obj .: "arg0" <*> obj .: "arg1" <*> obj .: "arg2"
+      "Compiled" -> Compiled <$> obj .: "arg0" <*> obj .: "arg1" <*> obj .: "arg2" <*> obj .: "arg3"
   parseJSON _ = mzero
 
diff --git a/ddl/out/LambdaCube.TypeInfo.purs b/ddl/out/LambdaCube.TypeInfo.purs
index 87af438..1b7cef8 100644
--- a/ddl/out/LambdaCube.TypeInfo.purs
+++ b/ddl/out/LambdaCube.TypeInfo.purs
@@ -1,5 +1,5 @@
 -- generated file, do not modify!
--- 2016-02-26T11:37:22.609565000000Z
+-- 2016-03-01T13:00:40.810157000000Z
 
 module LambdaCube.TypeInfo where
 import Prelude
@@ -36,7 +36,7 @@ data TypeInfo
 
 data CompileResult
   = CompileError (Array Range) String (Array TypeInfo)
-  | Compiled String Pipeline (Array TypeInfo)
+  | Compiled String String Pipeline (Array TypeInfo)
 
 
 
@@ -91,7 +91,7 @@ instance decodeJsonTypeInfo :: DecodeJson TypeInfo where
 instance encodeJsonCompileResult :: EncodeJson CompileResult where
   encodeJson v = case v of
     CompileError arg0 arg1 arg2 -> "tag" := "CompileError" ~> "arg0" := arg0 ~> "arg1" := arg1 ~> "arg2" := arg2 ~> jsonEmptyObject
-    Compiled arg0 arg1 arg2 -> "tag" := "Compiled" ~> "arg0" := arg0 ~> "arg1" := arg1 ~> "arg2" := arg2 ~> jsonEmptyObject
+    Compiled arg0 arg1 arg2 arg3 -> "tag" := "Compiled" ~> "arg0" := arg0 ~> "arg1" := arg1 ~> "arg2" := arg2 ~> "arg3" := arg3 ~> jsonEmptyObject
 
 instance decodeJsonCompileResult :: DecodeJson CompileResult where
   decodeJson json = do
@@ -99,5 +99,5 @@ instance decodeJsonCompileResult :: DecodeJson CompileResult where
     tag <- obj .? "tag"
     case tag of
       "CompileError" -> CompileError <$> obj .? "arg0" <*> obj .? "arg1" <*> obj .? "arg2"
-      "Compiled" -> Compiled <$> obj .? "arg0" <*> obj .? "arg1" <*> obj .? "arg2"
+      "Compiled" -> Compiled <$> obj .? "arg0" <*> obj .? "arg1" <*> obj .? "arg2" <*> obj .? "arg3"
 
diff --git a/ddl/out/LambdaCube.TypeInfo.swift b/ddl/out/LambdaCube.TypeInfo.swift
index e55314d..8bb041f 100644
--- a/ddl/out/LambdaCube.TypeInfo.swift
+++ b/ddl/out/LambdaCube.TypeInfo.swift
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:37:22.609565000000Z
+// 2016-03-01T13:00:40.810157000000Z
 
 enum Range {
   case Range(Range_Data)
@@ -21,7 +21,7 @@ enum TypeInfo {
 
 enum CompileResult {
   case CompileError(Array<Range>,String,Array<TypeInfo>)
-  case Compiled(String,Pipeline,Array<TypeInfo>)
+  case Compiled(String,String,Pipeline,Array<TypeInfo>)
 }
 
 
@@ -107,8 +107,8 @@ extension CompileResult {
     switch self {
       case .CompileError(let arg0, let arg1, let arg2):
         return [ "tag" : "CompileError", "arg0" : arg0.toJSON, "arg1" : arg1.toJSON, "arg2" : arg2.toJSON]
-      case .Compiled(let arg0, let arg1, let arg2):
-        return [ "tag" : "Compiled", "arg0" : arg0.toJSON, "arg1" : arg1.toJSON, "arg2" : arg2.toJSON]
+      case .Compiled(let arg0, let arg1, let arg2, let arg3):
+        return [ "tag" : "Compiled", "arg0" : arg0.toJSON, "arg1" : arg1.toJSON, "arg2" : arg2.toJSON, "arg3" : arg3.toJSON]
     }
   }
 }
diff --git a/ddl/out/LambdaCube.TypeInfo2.hpp b/ddl/out/LambdaCube.TypeInfo2.hpp
index ebd50aa..f80978f 100644
--- a/ddl/out/LambdaCube.TypeInfo2.hpp
+++ b/ddl/out/LambdaCube.TypeInfo2.hpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:37:22.609565000000Z
+// 2016-03-01T13:00:40.810157000000Z
 
 #ifndef HEADER_LambdaCube.TypeInfo_H
 #define HEADER_LambdaCube.TypeInfo_H
@@ -48,8 +48,9 @@ namespace data {
   class Compiled {
   public: 
     String _0;
-    std::shared_ptr<::Pipeline> _1;
-    std::vector<std::shared_ptr<::TypeInfo>> _2;
+    String _1;
+    std::shared_ptr<::Pipeline> _2;
+    std::vector<std::shared_ptr<::TypeInfo>> _3;
   };
 }
 class CompileResult {
diff --git a/ddl/out/TestData.cpp b/ddl/out/TestData.cpp
index 416815d..8b2cdf5 100644
--- a/ddl/out/TestData.cpp
+++ b/ddl/out/TestData.cpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:37:22.627476000000Z
+// 2016-03-01T13:00:40.829757000000Z
 
 #include "TestData.hpp"
 template<> json toJSON<std::shared_ptr<ClientInfo>>(std::shared_ptr<ClientInfo> &v) {
diff --git a/ddl/out/TestData.hpp b/ddl/out/TestData.hpp
index 3033688..bf90d88 100644
--- a/ddl/out/TestData.hpp
+++ b/ddl/out/TestData.hpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:37:22.627476000000Z
+// 2016-03-01T13:00:40.829757000000Z
 
 #ifndef HEADER_TestData_H
 #define HEADER_TestData_H
diff --git a/ddl/out/TestData.hs b/ddl/out/TestData.hs
index 4fb6aa3..489e3c3 100644
--- a/ddl/out/TestData.hs
+++ b/ddl/out/TestData.hs
@@ -1,5 +1,5 @@
 -- generated file, do not modify!
--- 2016-02-26T11:37:22.627476000000Z
+-- 2016-03-01T13:00:40.829757000000Z
 
 {-# LANGUAGE OverloadedStrings, RecordWildCards #-}
 module TestData where
diff --git a/ddl/out/TestData.purs b/ddl/out/TestData.purs
index fa1fff4..e4da3b2 100644
--- a/ddl/out/TestData.purs
+++ b/ddl/out/TestData.purs
@@ -1,5 +1,5 @@
 -- generated file, do not modify!
--- 2016-02-26T11:37:22.627476000000Z
+-- 2016-03-01T13:00:40.829757000000Z
 
 module TestData where
 import Prelude
diff --git a/ddl/out/TestData.swift b/ddl/out/TestData.swift
index 7ad54c5..adb9e25 100644
--- a/ddl/out/TestData.swift
+++ b/ddl/out/TestData.swift
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:37:22.627476000000Z
+// 2016-03-01T13:00:40.829757000000Z
 
 enum ClientInfo {
   case ClientInfo(ClientInfo_Data)
diff --git a/ddl/out/TestData2.hpp b/ddl/out/TestData2.hpp
index f07dd13..49ac46e 100644
--- a/ddl/out/TestData2.hpp
+++ b/ddl/out/TestData2.hpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:37:22.627476000000Z
+// 2016-03-01T13:00:40.829757000000Z
 
 #ifndef HEADER_TestData_H
 #define HEADER_TestData_H