From 4d892df7d149e9c8891fde9a0229f7b3aca547db Mon Sep 17 00:00:00 2001 From: Csaba Hruska Date: Fri, 26 Feb 2016 11:57:54 +0100 Subject: rename MyEither to CompileResult --- ddl/Definitions.hs | 6 +++--- ddl/out/LambdaCube.IR.cpp | 2 +- ddl/out/LambdaCube.IR.hpp | 2 +- ddl/out/LambdaCube.IR.hs | 2 +- ddl/out/LambdaCube.IR.purs | 2 +- ddl/out/LambdaCube.IR.swift | 2 +- ddl/out/LambdaCube.IR2.hpp | 2 +- ddl/out/LambdaCube.Mesh.cpp | 2 +- ddl/out/LambdaCube.Mesh.hpp | 2 +- ddl/out/LambdaCube.Mesh.hs | 2 +- ddl/out/LambdaCube.Mesh.purs | 2 +- ddl/out/LambdaCube.Mesh.swift | 2 +- ddl/out/LambdaCube.Mesh2.hpp | 2 +- ddl/out/LambdaCube.PipelineSchema.cpp | 2 +- ddl/out/LambdaCube.PipelineSchema.hpp | 2 +- ddl/out/LambdaCube.PipelineSchema.hs | 2 +- ddl/out/LambdaCube.PipelineSchema.purs | 2 +- ddl/out/LambdaCube.PipelineSchema.swift | 2 +- ddl/out/LambdaCube.PipelineSchema2.hpp | 2 +- ddl/out/LambdaCube.TypeInfo.cpp | 36 ++++++++++++++++----------------- ddl/out/LambdaCube.TypeInfo.hpp | 18 ++++++++--------- ddl/out/LambdaCube.TypeInfo.hs | 20 +++++++++--------- ddl/out/LambdaCube.TypeInfo.purs | 20 +++++++++--------- ddl/out/LambdaCube.TypeInfo.swift | 20 +++++++++--------- ddl/out/LambdaCube.TypeInfo2.hpp | 18 ++++++++--------- ddl/out/TestData.cpp | 2 +- ddl/out/TestData.hpp | 2 +- ddl/out/TestData.hs | 2 +- ddl/out/TestData.purs | 2 +- ddl/out/TestData.swift | 2 +- ddl/out/TestData2.hpp | 2 +- 31 files changed, 93 insertions(+), 93 deletions(-) diff --git a/ddl/Definitions.hs b/ddl/Definitions.hs index 6fd6afd..04f461c 100644 --- a/ddl/Definitions.hs +++ b/ddl/Definitions.hs @@ -468,9 +468,9 @@ typeInfo = do , "text" #:: String ] - data_ "MyEither" $ do - const_ "MyLeft" ["TypeInfo", Array "TypeInfo"] - const_ "MyRight" [String, "Pipeline", Array "TypeInfo"] + data_ "CompileResult" $ do + const_ "CompileError" [Array "TypeInfo", Array "TypeInfo"] + const_ "Compiled" [String, "Pipeline", Array "TypeInfo"] pipelineSchema = do data_ "StreamType" $ do diff --git a/ddl/out/LambdaCube.IR.cpp b/ddl/out/LambdaCube.IR.cpp index 335a512..67e5f0d 100644 --- a/ddl/out/LambdaCube.IR.cpp +++ b/ddl/out/LambdaCube.IR.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-12T16:05:12.941660000000Z +// 2016-02-26T10:42:56.948155000000Z #include "LambdaCube.IR.hpp" template<> json toJSON>(std::shared_ptr &v) { diff --git a/ddl/out/LambdaCube.IR.hpp b/ddl/out/LambdaCube.IR.hpp index 06e5835..fa8f583 100644 --- a/ddl/out/LambdaCube.IR.hpp +++ b/ddl/out/LambdaCube.IR.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-12T16:05:12.941660000000Z +// 2016-02-26T10:42:56.948155000000Z #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 fdf8116..b1ab3ce 100644 --- a/ddl/out/LambdaCube.IR.hs +++ b/ddl/out/LambdaCube.IR.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-02-12T16:05:12.941660000000Z +-- 2016-02-26T10:42:56.948155000000Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module LambdaCube.IR where diff --git a/ddl/out/LambdaCube.IR.purs b/ddl/out/LambdaCube.IR.purs index f62464e..f21a121 100644 --- a/ddl/out/LambdaCube.IR.purs +++ b/ddl/out/LambdaCube.IR.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-02-12T16:05:12.941660000000Z +-- 2016-02-26T10:42:56.948155000000Z module LambdaCube.IR where import Prelude diff --git a/ddl/out/LambdaCube.IR.swift b/ddl/out/LambdaCube.IR.swift index 2dd9300..2b55d76 100644 --- a/ddl/out/LambdaCube.IR.swift +++ b/ddl/out/LambdaCube.IR.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-12T16:05:12.941660000000Z +// 2016-02-26T10:42:56.948155000000Z typealias StreamName = Int diff --git a/ddl/out/LambdaCube.IR2.hpp b/ddl/out/LambdaCube.IR2.hpp index d353460..cad7c73 100644 --- a/ddl/out/LambdaCube.IR2.hpp +++ b/ddl/out/LambdaCube.IR2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-12T16:05:12.941660000000Z +// 2016-02-26T10:42:56.948155000000Z #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 9e704e1..a2e34cb 100644 --- a/ddl/out/LambdaCube.Mesh.cpp +++ b/ddl/out/LambdaCube.Mesh.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-12T16:05:13.332951000000Z +// 2016-02-26T10:42:57.342809000000Z #include "LambdaCube.Mesh.hpp" template<> json toJSON>(std::shared_ptr &v) { diff --git a/ddl/out/LambdaCube.Mesh.hpp b/ddl/out/LambdaCube.Mesh.hpp index b93ec58..383ccea 100644 --- a/ddl/out/LambdaCube.Mesh.hpp +++ b/ddl/out/LambdaCube.Mesh.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-12T16:05:13.332951000000Z +// 2016-02-26T10:42:57.342809000000Z #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 da937f3..340570e 100644 --- a/ddl/out/LambdaCube.Mesh.hs +++ b/ddl/out/LambdaCube.Mesh.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-02-12T16:05:13.332951000000Z +-- 2016-02-26T10:42:57.342809000000Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module LambdaCube.Mesh where diff --git a/ddl/out/LambdaCube.Mesh.purs b/ddl/out/LambdaCube.Mesh.purs index d418ac2..517d76b 100644 --- a/ddl/out/LambdaCube.Mesh.purs +++ b/ddl/out/LambdaCube.Mesh.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-02-12T16:05:13.332951000000Z +-- 2016-02-26T10:42:57.342809000000Z module LambdaCube.Mesh where import Prelude diff --git a/ddl/out/LambdaCube.Mesh.swift b/ddl/out/LambdaCube.Mesh.swift index 82c8ba5..d469011 100644 --- a/ddl/out/LambdaCube.Mesh.swift +++ b/ddl/out/LambdaCube.Mesh.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-12T16:05:13.332951000000Z +// 2016-02-26T10:42:57.342809000000Z enum MeshAttribute { case A_Float(Array) diff --git a/ddl/out/LambdaCube.Mesh2.hpp b/ddl/out/LambdaCube.Mesh2.hpp index a6a7cfe..855fafa 100644 --- a/ddl/out/LambdaCube.Mesh2.hpp +++ b/ddl/out/LambdaCube.Mesh2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-12T16:05:13.332951000000Z +// 2016-02-26T10:42:57.342809000000Z #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 283aa31..9161ceb 100644 --- a/ddl/out/LambdaCube.PipelineSchema.cpp +++ b/ddl/out/LambdaCube.PipelineSchema.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-12T16:05:13.310528000000Z +// 2016-02-26T10:42:57.323154000000Z #include "LambdaCube.PipelineSchema.hpp" template<> json toJSON>(std::shared_ptr &v) { diff --git a/ddl/out/LambdaCube.PipelineSchema.hpp b/ddl/out/LambdaCube.PipelineSchema.hpp index 68b309f..4ed14d4 100644 --- a/ddl/out/LambdaCube.PipelineSchema.hpp +++ b/ddl/out/LambdaCube.PipelineSchema.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-12T16:05:13.310528000000Z +// 2016-02-26T10:42:57.323154000000Z #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 a573d27..5f6822b 100644 --- a/ddl/out/LambdaCube.PipelineSchema.hs +++ b/ddl/out/LambdaCube.PipelineSchema.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-02-12T16:05:13.310528000000Z +-- 2016-02-26T10:42:57.323154000000Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module LambdaCube.PipelineSchema where diff --git a/ddl/out/LambdaCube.PipelineSchema.purs b/ddl/out/LambdaCube.PipelineSchema.purs index b31416b..258744a 100644 --- a/ddl/out/LambdaCube.PipelineSchema.purs +++ b/ddl/out/LambdaCube.PipelineSchema.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-02-12T16:05:13.310528000000Z +-- 2016-02-26T10:42:57.323154000000Z module LambdaCube.PipelineSchema where import Prelude diff --git a/ddl/out/LambdaCube.PipelineSchema.swift b/ddl/out/LambdaCube.PipelineSchema.swift index 542e8e2..6019917 100644 --- a/ddl/out/LambdaCube.PipelineSchema.swift +++ b/ddl/out/LambdaCube.PipelineSchema.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-12T16:05:13.310528000000Z +// 2016-02-26T10:42:57.323154000000Z enum StreamType { case Attribute_Word diff --git a/ddl/out/LambdaCube.PipelineSchema2.hpp b/ddl/out/LambdaCube.PipelineSchema2.hpp index 153a9f6..fbf04ff 100644 --- a/ddl/out/LambdaCube.PipelineSchema2.hpp +++ b/ddl/out/LambdaCube.PipelineSchema2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-12T16:05:13.310528000000Z +// 2016-02-26T10:42:57.323154000000Z #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 ce2dcff..643afda 100644 --- a/ddl/out/LambdaCube.TypeInfo.cpp +++ b/ddl/out/LambdaCube.TypeInfo.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-12T16:05:13.364534000000Z +// 2016-02-26T10:42:57.376331000000Z #include "LambdaCube.TypeInfo.hpp" template<> json toJSON>(std::shared_ptr &v) { @@ -39,21 +39,21 @@ template<> std::shared_ptr fromJSON>(W json toJSON>(std::shared_ptr &v) { +template<> json toJSON>(std::shared_ptr &v) { json obj({}); switch (v->tag) { - case ::MyEither::tag::MyLeft: - obj["tag"] = "MyLeft"; + case ::CompileResult::tag::CompileError: + obj["tag"] = "CompileError"; { - std::shared_ptr tv = std::static_pointer_cast(v); + std::shared_ptr tv = std::static_pointer_cast(v); obj["arg0"] = toJSON(tv->_0); obj["arg1"] = toJSON(tv->_1); } break; - case ::MyEither::tag::MyRight: - obj["tag"] = "MyRight"; + case ::CompileResult::tag::Compiled: + obj["tag"] = "Compiled"; { - std::shared_ptr tv = std::static_pointer_cast(v); + std::shared_ptr tv = std::static_pointer_cast(v); obj["arg0"] = toJSON(tv->_0); obj["arg1"] = toJSON(tv->_1); obj["arg2"] = toJSON(tv->_2); @@ -63,26 +63,26 @@ template<> json toJSON>(std::shared_ptr &v) return obj; } -template<> std::shared_ptr fromJSON>(W> v, json &obj) { - enum ::MyEither::tag tagType; +template<> std::shared_ptr fromJSON>(W> v, json &obj) { + enum ::CompileResult::tag tagType; std::string tag = obj["tag"]; - if (tag == "MyLeft") { - tagType = ::MyEither::tag::MyLeft; - std::shared_ptr tv(new data::MyLeft()); - tv->_0 = fromJSON(W>(), obj["arg0"]); + if (tag == "CompileError") { + tagType = ::CompileResult::tag::CompileError; + std::shared_ptr tv(new data::CompileError()); + tv->_0 = fromJSON(W>>(), obj["arg0"]); tv->_1 = fromJSON(W>>(), obj["arg1"]); return tv; } - else if (tag == "MyRight") { - tagType = ::MyEither::tag::MyRight; - std::shared_ptr tv(new data::MyRight()); + else if (tag == "Compiled") { + tagType = ::CompileResult::tag::Compiled; + std::shared_ptr tv(new data::Compiled()); tv->_0 = fromJSON(W(), obj["arg0"]); tv->_1 = fromJSON(W>(), obj["arg1"]); tv->_2 = fromJSON(W>>(), obj["arg2"]); return tv; } else throw "unknown constructor: " + tag; - std::shared_ptr<::MyEither> o(new ::MyEither()); + std::shared_ptr<::CompileResult> o(new ::CompileResult()); o->tag = tagType; return o; } diff --git a/ddl/out/LambdaCube.TypeInfo.hpp b/ddl/out/LambdaCube.TypeInfo.hpp index 6e302f3..dd6b023 100644 --- a/ddl/out/LambdaCube.TypeInfo.hpp +++ b/ddl/out/LambdaCube.TypeInfo.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-12T16:05:13.364534000000Z +// 2016-02-26T10:42:57.376331000000Z #ifndef HEADER_LambdaCube.TypeInfo_H #define HEADER_LambdaCube.TypeInfo_H @@ -25,26 +25,26 @@ namespace data { TypeInfo() { tag = tag::TypeInfo; } }; } -class MyEither { +class CompileResult { public: enum class tag { - MyLeft, - MyRight + CompileError, + Compiled } tag; }; namespace data { - class MyLeft : public ::MyEither { + class CompileError : public ::CompileResult { public: - std::shared_ptr<::TypeInfo> _0; + std::vector> _0; std::vector> _1; - MyLeft() { tag = tag::MyLeft; } + CompileError() { tag = tag::CompileError; } }; - class MyRight : public ::MyEither { + class Compiled : public ::CompileResult { public: String _0; std::shared_ptr<::Pipeline> _1; std::vector> _2; - MyRight() { tag = tag::MyRight; } + Compiled() { tag = tag::Compiled; } }; } #endif diff --git a/ddl/out/LambdaCube.TypeInfo.hs b/ddl/out/LambdaCube.TypeInfo.hs index a2df59c..f23bd83 100644 --- a/ddl/out/LambdaCube.TypeInfo.hs +++ b/ddl/out/LambdaCube.TypeInfo.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-02-12T16:05:13.364534000000Z +-- 2016-02-26T10:42:57.376331000000Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module LambdaCube.TypeInfo where @@ -28,9 +28,9 @@ data TypeInfo deriving (Show, Eq, Ord) -data MyEither - = MyLeft TypeInfo (Vector TypeInfo) - | MyRight String Pipeline (Vector TypeInfo) +data CompileResult + = CompileError (Vector TypeInfo) (Vector TypeInfo) + | Compiled String Pipeline (Vector TypeInfo) deriving (Show, Eq, Ord) @@ -64,16 +64,16 @@ instance FromJSON TypeInfo where } parseJSON _ = mzero -instance ToJSON MyEither where +instance ToJSON CompileResult where toJSON v = case v of - MyLeft arg0 arg1 -> object [ "tag" .= ("MyLeft" :: Text), "arg0" .= arg0, "arg1" .= arg1] - MyRight arg0 arg1 arg2 -> object [ "tag" .= ("MyRight" :: Text), "arg0" .= arg0, "arg1" .= arg1, "arg2" .= arg2] + CompileError arg0 arg1 -> object [ "tag" .= ("CompileError" :: Text), "arg0" .= arg0, "arg1" .= arg1] + Compiled arg0 arg1 arg2 -> object [ "tag" .= ("Compiled" :: Text), "arg0" .= arg0, "arg1" .= arg1, "arg2" .= arg2] -instance FromJSON MyEither where +instance FromJSON CompileResult where parseJSON (Object obj) = do tag <- obj .: "tag" case tag :: Text of - "MyLeft" -> MyLeft <$> obj .: "arg0" <*> obj .: "arg1" - "MyRight" -> MyRight <$> obj .: "arg0" <*> obj .: "arg1" <*> obj .: "arg2" + "CompileError" -> CompileError <$> obj .: "arg0" <*> obj .: "arg1" + "Compiled" -> Compiled <$> obj .: "arg0" <*> obj .: "arg1" <*> obj .: "arg2" parseJSON _ = mzero diff --git a/ddl/out/LambdaCube.TypeInfo.purs b/ddl/out/LambdaCube.TypeInfo.purs index afd8a86..3252a7f 100644 --- a/ddl/out/LambdaCube.TypeInfo.purs +++ b/ddl/out/LambdaCube.TypeInfo.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-02-12T16:05:13.364534000000Z +-- 2016-02-26T10:42:57.376331000000Z module LambdaCube.TypeInfo where import Prelude @@ -28,9 +28,9 @@ data TypeInfo } -data MyEither - = MyLeft TypeInfo (Array TypeInfo) - | MyRight String Pipeline (Array TypeInfo) +data CompileResult + = CompileError (Array TypeInfo) (Array TypeInfo) + | Compiled String Pipeline (Array TypeInfo) @@ -64,16 +64,16 @@ instance decodeJsonTypeInfo :: DecodeJson TypeInfo where , text:text } -instance encodeJsonMyEither :: EncodeJson MyEither where +instance encodeJsonCompileResult :: EncodeJson CompileResult where encodeJson v = case v of - MyLeft arg0 arg1 -> "tag" := "MyLeft" ~> "arg0" := arg0 ~> "arg1" := arg1 ~> jsonEmptyObject - MyRight arg0 arg1 arg2 -> "tag" := "MyRight" ~> "arg0" := arg0 ~> "arg1" := arg1 ~> "arg2" := arg2 ~> jsonEmptyObject + CompileError arg0 arg1 -> "tag" := "CompileError" ~> "arg0" := arg0 ~> "arg1" := arg1 ~> jsonEmptyObject + Compiled arg0 arg1 arg2 -> "tag" := "Compiled" ~> "arg0" := arg0 ~> "arg1" := arg1 ~> "arg2" := arg2 ~> jsonEmptyObject -instance decodeJsonMyEither :: DecodeJson MyEither where +instance decodeJsonCompileResult :: DecodeJson CompileResult where decodeJson json = do obj <- decodeJson json tag <- obj .? "tag" case tag of - "MyLeft" -> MyLeft <$> obj .? "arg0" <*> obj .? "arg1" - "MyRight" -> MyRight <$> obj .? "arg0" <*> obj .? "arg1" <*> obj .? "arg2" + "CompileError" -> CompileError <$> obj .? "arg0" <*> obj .? "arg1" + "Compiled" -> Compiled <$> obj .? "arg0" <*> obj .? "arg1" <*> obj .? "arg2" diff --git a/ddl/out/LambdaCube.TypeInfo.swift b/ddl/out/LambdaCube.TypeInfo.swift index d3b03d1..2e2fb0f 100644 --- a/ddl/out/LambdaCube.TypeInfo.swift +++ b/ddl/out/LambdaCube.TypeInfo.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-12T16:05:13.364534000000Z +// 2016-02-26T10:42:57.376331000000Z enum TypeInfo { case TypeInfo(TypeInfo_Data) @@ -12,9 +12,9 @@ enum TypeInfo { } } -enum MyEither { - case MyLeft(TypeInfo,Array) - case MyRight(String,Pipeline,Array) +enum CompileResult { + case CompileError(Array,Array) + case Compiled(String,Pipeline,Array) } @@ -85,13 +85,13 @@ extension TypeInfo { } } } -extension MyEither { +extension CompileResult { var toJSON : [String: AnyObject] { switch self { - case .MyLeft(let arg0, let arg1): - return [ "tag" : "MyLeft", "arg0" : arg0.toJSON, "arg1" : arg1.toJSON] - case .MyRight(let arg0, let arg1, let arg2): - return [ "tag" : "MyRight", "arg0" : arg0.toJSON, "arg1" : arg1.toJSON, "arg2" : arg2.toJSON] + case .CompileError(let arg0, let arg1): + return [ "tag" : "CompileError", "arg0" : arg0.toJSON, "arg1" : arg1.toJSON] + case .Compiled(let arg0, let arg1, let arg2): + return [ "tag" : "Compiled", "arg0" : arg0.toJSON, "arg1" : arg1.toJSON, "arg2" : arg2.toJSON] } } } @@ -114,7 +114,7 @@ enum Type { case Maybe(Type) case Map(Type,Type) case TypeInfo - case MyEither + case CompileResult } func fromJSON(type: Type, personName: String) -> Any { diff --git a/ddl/out/LambdaCube.TypeInfo2.hpp b/ddl/out/LambdaCube.TypeInfo2.hpp index c6d5f4b..cffe5ea 100644 --- a/ddl/out/LambdaCube.TypeInfo2.hpp +++ b/ddl/out/LambdaCube.TypeInfo2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-12T16:05:13.364534000000Z +// 2016-02-26T10:42:57.376331000000Z #ifndef HEADER_LambdaCube.TypeInfo_H #define HEADER_LambdaCube.TypeInfo_H @@ -26,25 +26,25 @@ public: std::shared_ptr TypeInfo; }; namespace data { - class MyLeft { + class CompileError { public: - std::shared_ptr<::TypeInfo> _0; + std::vector> _0; std::vector> _1; }; - class MyRight { + class Compiled { public: String _0; std::shared_ptr<::Pipeline> _1; std::vector> _2; }; } -class MyEither { +class CompileResult { public: enum class tag { - MyLeft, - MyRight + CompileError, + Compiled } tag; - std::shared_ptr MyLeft; - std::shared_ptr MyRight; + std::shared_ptr CompileError; + std::shared_ptr Compiled; }; #endif diff --git a/ddl/out/TestData.cpp b/ddl/out/TestData.cpp index 558a45b..5eaf158 100644 --- a/ddl/out/TestData.cpp +++ b/ddl/out/TestData.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-12T16:05:13.383716000000Z +// 2016-02-26T10:42:57.396138000000Z #include "TestData.hpp" template<> json toJSON>(std::shared_ptr &v) { diff --git a/ddl/out/TestData.hpp b/ddl/out/TestData.hpp index 39aa824..8aa75cd 100644 --- a/ddl/out/TestData.hpp +++ b/ddl/out/TestData.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-12T16:05:13.383716000000Z +// 2016-02-26T10:42:57.396138000000Z #ifndef HEADER_TestData_H #define HEADER_TestData_H diff --git a/ddl/out/TestData.hs b/ddl/out/TestData.hs index d6d8e38..6c17fc9 100644 --- a/ddl/out/TestData.hs +++ b/ddl/out/TestData.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-02-12T16:05:13.383716000000Z +-- 2016-02-26T10:42:57.396138000000Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module TestData where diff --git a/ddl/out/TestData.purs b/ddl/out/TestData.purs index 426da42..2fa0812 100644 --- a/ddl/out/TestData.purs +++ b/ddl/out/TestData.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-02-12T16:05:13.383716000000Z +-- 2016-02-26T10:42:57.396138000000Z module TestData where import Prelude diff --git a/ddl/out/TestData.swift b/ddl/out/TestData.swift index 671c6bf..875f73c 100644 --- a/ddl/out/TestData.swift +++ b/ddl/out/TestData.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-12T16:05:13.383716000000Z +// 2016-02-26T10:42:57.396138000000Z enum ClientInfo { case ClientInfo(ClientInfo_Data) diff --git a/ddl/out/TestData2.hpp b/ddl/out/TestData2.hpp index e876551..0fa5e60 100644 --- a/ddl/out/TestData2.hpp +++ b/ddl/out/TestData2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-02-12T16:05:13.383716000000Z +// 2016-02-26T10:42:57.396138000000Z #ifndef HEADER_TestData_H #define HEADER_TestData_H -- cgit v1.2.3