From 0c885c5c6bfb69c543635fd08d697ce44f24642d Mon Sep 17 00:00:00 2001 From: Csaba Hruska Date: Mon, 18 Jan 2016 15:50:24 +0100 Subject: send pipeline source in TypeInfo --- ddl/Definitions.hs | 2 +- ddl/out/IR.cpp | 2 +- ddl/out/IR.hpp | 2 +- ddl/out/IR.hs | 2 +- ddl/out/IR.purs | 2 +- ddl/out/IR.swift | 2 +- ddl/out/IR2.hpp | 2 +- ddl/out/Mesh.cpp | 2 +- ddl/out/Mesh.hpp | 2 +- ddl/out/Mesh.hs | 2 +- ddl/out/Mesh.purs | 2 +- ddl/out/Mesh.swift | 2 +- ddl/out/Mesh2.hpp | 2 +- ddl/out/TypeInfo.cpp | 8 +++++--- ddl/out/TypeInfo.hpp | 7 ++++--- ddl/out/TypeInfo.hs | 8 ++++---- ddl/out/TypeInfo.purs | 8 ++++---- ddl/out/TypeInfo.swift | 8 ++++---- ddl/out/TypeInfo2.hpp | 7 ++++--- 19 files changed, 38 insertions(+), 34 deletions(-) diff --git a/ddl/Definitions.hs b/ddl/Definitions.hs index 9618407..53930ef 100644 --- a/ddl/Definitions.hs +++ b/ddl/Definitions.hs @@ -469,7 +469,7 @@ typeInfo = do data_ "MyEither" $ do const_ "MyLeft" ["TypeInfo", Array "TypeInfo"] - const_ "MyRight" ["Pipeline", Array "TypeInfo"] + const_ "MyRight" [String, "Pipeline", Array "TypeInfo"] modules = do module_ "IR" ir diff --git a/ddl/out/IR.cpp b/ddl/out/IR.cpp index 729bdd9..cac97e7 100644 --- a/ddl/out/IR.cpp +++ b/ddl/out/IR.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2015-12-21T12:00:19.420877000000Z +// 2016-01-18T14:30:07.798481Z #include "IR.hpp" template<> json toJSON>(std::shared_ptr &v) { diff --git a/ddl/out/IR.hpp b/ddl/out/IR.hpp index 3c6055f..4c6e9f1 100644 --- a/ddl/out/IR.hpp +++ b/ddl/out/IR.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2015-12-21T12:00:19.420877000000Z +// 2016-01-18T14:30:07.798481Z #ifndef HEADER_IR_H #define HEADER_IR_H diff --git a/ddl/out/IR.hs b/ddl/out/IR.hs index a788161..d65d628 100644 --- a/ddl/out/IR.hs +++ b/ddl/out/IR.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2015-12-21T12:00:19.420877000000Z +-- 2016-01-18T14:30:07.798481Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module IR where diff --git a/ddl/out/IR.purs b/ddl/out/IR.purs index 801e3f9..bfdeb62 100644 --- a/ddl/out/IR.purs +++ b/ddl/out/IR.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2015-12-21T12:00:19.420877000000Z +-- 2016-01-18T14:30:07.798481Z module IR where import Prelude diff --git a/ddl/out/IR.swift b/ddl/out/IR.swift index c30e6d7..78358f4 100644 --- a/ddl/out/IR.swift +++ b/ddl/out/IR.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2015-12-21T12:00:19.420877000000Z +// 2016-01-18T14:30:07.798481Z typealias StreamName = Int diff --git a/ddl/out/IR2.hpp b/ddl/out/IR2.hpp index 61fc2c6..d286395 100644 --- a/ddl/out/IR2.hpp +++ b/ddl/out/IR2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2015-12-21T12:00:19.420877000000Z +// 2016-01-18T14:30:07.798481Z #ifndef HEADER_IR_H #define HEADER_IR_H diff --git a/ddl/out/Mesh.cpp b/ddl/out/Mesh.cpp index 1661d8e..ce902bd 100644 --- a/ddl/out/Mesh.cpp +++ b/ddl/out/Mesh.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2015-12-21T12:00:19.818584000000Z +// 2016-01-18T14:30:08.223471Z #include "Mesh.hpp" template<> json toJSON>(std::shared_ptr &v) { diff --git a/ddl/out/Mesh.hpp b/ddl/out/Mesh.hpp index badf1da..ab8c193 100644 --- a/ddl/out/Mesh.hpp +++ b/ddl/out/Mesh.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2015-12-21T12:00:19.818584000000Z +// 2016-01-18T14:30:08.223471Z #ifndef HEADER_Mesh_H #define HEADER_Mesh_H diff --git a/ddl/out/Mesh.hs b/ddl/out/Mesh.hs index 13a6996..8a5b339 100644 --- a/ddl/out/Mesh.hs +++ b/ddl/out/Mesh.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2015-12-21T12:00:19.818584000000Z +-- 2016-01-18T14:30:08.223471Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module Mesh where diff --git a/ddl/out/Mesh.purs b/ddl/out/Mesh.purs index 230c896..725cced 100644 --- a/ddl/out/Mesh.purs +++ b/ddl/out/Mesh.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2015-12-21T12:00:19.818584000000Z +-- 2016-01-18T14:30:08.223471Z module Mesh where import Prelude diff --git a/ddl/out/Mesh.swift b/ddl/out/Mesh.swift index df8ab88..82b1d20 100644 --- a/ddl/out/Mesh.swift +++ b/ddl/out/Mesh.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2015-12-21T12:00:19.818584000000Z +// 2016-01-18T14:30:08.223471Z enum MeshAttribute { case A_Float(Array) diff --git a/ddl/out/Mesh2.hpp b/ddl/out/Mesh2.hpp index aafa637..041fa0f 100644 --- a/ddl/out/Mesh2.hpp +++ b/ddl/out/Mesh2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2015-12-21T12:00:19.818584000000Z +// 2016-01-18T14:30:08.223471Z #ifndef HEADER_Mesh_H #define HEADER_Mesh_H diff --git a/ddl/out/TypeInfo.cpp b/ddl/out/TypeInfo.cpp index abf93a5..6834bcc 100644 --- a/ddl/out/TypeInfo.cpp +++ b/ddl/out/TypeInfo.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2015-12-21T12:00:19.854088000000Z +// 2016-01-18T14:30:08.262123Z #include "TypeInfo.hpp" template<> json toJSON>(std::shared_ptr &v) { @@ -56,6 +56,7 @@ template<> json toJSON>(std::shared_ptr &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); } break; } @@ -75,8 +76,9 @@ template<> std::shared_ptr fromJSON>(W tv(new data::MyRight()); - tv->_0 = fromJSON(W>(), obj["arg0"]); - tv->_1 = fromJSON(W>>(), obj["arg1"]); + 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; diff --git a/ddl/out/TypeInfo.hpp b/ddl/out/TypeInfo.hpp index afba764..fdad33d 100644 --- a/ddl/out/TypeInfo.hpp +++ b/ddl/out/TypeInfo.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2015-12-21T12:00:19.854088000000Z +// 2016-01-18T14:30:08.262123Z #ifndef HEADER_TypeInfo_H #define HEADER_TypeInfo_H @@ -41,8 +41,9 @@ namespace data { }; class MyRight : public ::MyEither { public: - std::shared_ptr<::Pipeline> _0; - std::vector> _1; + String _0; + std::shared_ptr<::Pipeline> _1; + std::vector> _2; MyRight() { tag = tag::MyRight; } }; } diff --git a/ddl/out/TypeInfo.hs b/ddl/out/TypeInfo.hs index 695315f..6891924 100644 --- a/ddl/out/TypeInfo.hs +++ b/ddl/out/TypeInfo.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2015-12-21T12:00:19.854088000000Z +-- 2016-01-18T14:30:08.262123Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module TypeInfo where @@ -30,7 +30,7 @@ data TypeInfo data MyEither = MyLeft TypeInfo (Vector TypeInfo) - | MyRight Pipeline (Vector TypeInfo) + | MyRight String Pipeline (Vector TypeInfo) deriving (Show, Eq, Ord) @@ -67,13 +67,13 @@ instance FromJSON TypeInfo where instance ToJSON MyEither where toJSON v = case v of MyLeft arg0 arg1 -> object [ "tag" .= ("MyLeft" :: Text), "arg0" .= arg0, "arg1" .= arg1] - MyRight arg0 arg1 -> object [ "tag" .= ("MyRight" :: Text), "arg0" .= arg0, "arg1" .= arg1] + MyRight arg0 arg1 arg2 -> object [ "tag" .= ("MyRight" :: Text), "arg0" .= arg0, "arg1" .= arg1, "arg2" .= arg2] instance FromJSON MyEither where parseJSON (Object obj) = do tag <- obj .: "tag" case tag :: Text of "MyLeft" -> MyLeft <$> obj .: "arg0" <*> obj .: "arg1" - "MyRight" -> MyRight <$> obj .: "arg0" <*> obj .: "arg1" + "MyRight" -> MyRight <$> obj .: "arg0" <*> obj .: "arg1" <*> obj .: "arg2" parseJSON _ = mzero diff --git a/ddl/out/TypeInfo.purs b/ddl/out/TypeInfo.purs index d2d8351..667de39 100644 --- a/ddl/out/TypeInfo.purs +++ b/ddl/out/TypeInfo.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2015-12-21T12:00:19.854088000000Z +-- 2016-01-18T14:30:08.262123Z module TypeInfo where import Prelude @@ -30,7 +30,7 @@ data TypeInfo data MyEither = MyLeft TypeInfo (Array TypeInfo) - | MyRight Pipeline (Array TypeInfo) + | MyRight String Pipeline (Array TypeInfo) @@ -67,7 +67,7 @@ instance decodeJsonTypeInfo :: DecodeJson TypeInfo where instance encodeJsonMyEither :: EncodeJson MyEither where encodeJson v = case v of MyLeft arg0 arg1 -> "tag" := "MyLeft" ~> "arg0" := arg0 ~> "arg1" := arg1 ~> jsonEmptyObject - MyRight arg0 arg1 -> "tag" := "MyRight" ~> "arg0" := arg0 ~> "arg1" := arg1 ~> jsonEmptyObject + MyRight arg0 arg1 arg2 -> "tag" := "MyRight" ~> "arg0" := arg0 ~> "arg1" := arg1 ~> "arg2" := arg2 ~> jsonEmptyObject instance decodeJsonMyEither :: DecodeJson MyEither where decodeJson json = do @@ -75,5 +75,5 @@ instance decodeJsonMyEither :: DecodeJson MyEither where tag <- obj .? "tag" case tag of "MyLeft" -> MyLeft <$> obj .? "arg0" <*> obj .? "arg1" - "MyRight" -> MyRight <$> obj .? "arg0" <*> obj .? "arg1" + "MyRight" -> MyRight <$> obj .? "arg0" <*> obj .? "arg1" <*> obj .? "arg2" diff --git a/ddl/out/TypeInfo.swift b/ddl/out/TypeInfo.swift index f05a343..c0c3a29 100644 --- a/ddl/out/TypeInfo.swift +++ b/ddl/out/TypeInfo.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2015-12-21T12:00:19.854088000000Z +// 2016-01-18T14:30:08.262123Z enum TypeInfo { case TypeInfo(TypeInfo_Data) @@ -14,7 +14,7 @@ enum TypeInfo { enum MyEither { case MyLeft(TypeInfo,Array) - case MyRight(Pipeline,Array) + case MyRight(String,Pipeline,Array) } @@ -90,8 +90,8 @@ extension MyEither { switch self { case .MyLeft(let arg0, let arg1): return [ "tag" : "MyLeft", "arg0" : arg0.toJSON, "arg1" : arg1.toJSON] - case .MyRight(let arg0, let arg1): - return [ "tag" : "MyRight", "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] } } } diff --git a/ddl/out/TypeInfo2.hpp b/ddl/out/TypeInfo2.hpp index 739db82..9ac29c9 100644 --- a/ddl/out/TypeInfo2.hpp +++ b/ddl/out/TypeInfo2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2015-12-21T12:00:19.854088000000Z +// 2016-01-18T14:30:08.262123Z #ifndef HEADER_TypeInfo_H #define HEADER_TypeInfo_H @@ -33,8 +33,9 @@ namespace data { }; class MyRight { public: - std::shared_ptr<::Pipeline> _0; - std::vector> _1; + String _0; + std::shared_ptr<::Pipeline> _1; + std::vector> _2; }; } class MyEither { -- cgit v1.2.3