diff options
author | Péter Diviánszky <divipp@gmail.com> | 2016-03-01 14:01:34 +0100 |
---|---|---|
committer | Péter Diviánszky <divipp@gmail.com> | 2016-03-01 14:01:34 +0100 |
commit | 3b50722f433ec5ecc515ea1441fd633d85118cb9 (patch) | |
tree | 8bc7681a60e4471a4f0256cf411c074607f209c3 /ddl | |
parent | 2eb7cc7fab543a1ffb493015d98c1887ffac38c9 (diff) |
modify Compiled: add desugared String field
Diffstat (limited to 'ddl')
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 | |||
475 | 475 | ||
476 | data_ "CompileResult" $ do | 476 | data_ "CompileResult" $ do |
477 | const_ "CompileError" [Array "Range", String, Array "TypeInfo"] | 477 | const_ "CompileError" [Array "Range", String, Array "TypeInfo"] |
478 | const_ "Compiled" [String, "Pipeline", Array "TypeInfo"] | 478 | const_ "Compiled" [String, String, "Pipeline", Array "TypeInfo"] |
479 | 479 | ||
480 | pipelineSchema = do | 480 | pipelineSchema = do |
481 | data_ "StreamType" $ do | 481 | 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 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-02-26T11:37:22.233668000000Z | 2 | // 2016-03-01T13:00:40.426854000000Z |
3 | 3 | ||
4 | #include "LambdaCube.IR.hpp" | 4 | #include "LambdaCube.IR.hpp" |
5 | template<> json toJSON<std::shared_ptr<ArrayValue>>(std::shared_ptr<ArrayValue> &v) { | 5 | 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 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-02-26T11:37:22.233668000000Z | 2 | // 2016-03-01T13:00:40.426854000000Z |
3 | 3 | ||
4 | #ifndef HEADER_LambdaCube.IR_H | 4 | #ifndef HEADER_LambdaCube.IR_H |
5 | #define HEADER_LambdaCube.IR_H | 5 | #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 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | -- 2016-02-26T11:37:22.233668000000Z | 2 | -- 2016-03-01T13:00:40.426854000000Z |
3 | 3 | ||
4 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} | 4 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} |
5 | module LambdaCube.IR where | 5 | 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 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | -- 2016-02-26T11:37:22.233668000000Z | 2 | -- 2016-03-01T13:00:40.426854000000Z |
3 | 3 | ||
4 | module LambdaCube.IR where | 4 | module LambdaCube.IR where |
5 | import Prelude | 5 | 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 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-02-26T11:37:22.233668000000Z | 2 | // 2016-03-01T13:00:40.426854000000Z |
3 | 3 | ||
4 | typealias StreamName = Int | 4 | typealias StreamName = Int |
5 | 5 | ||
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 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-02-26T11:37:22.233668000000Z | 2 | // 2016-03-01T13:00:40.426854000000Z |
3 | 3 | ||
4 | #ifndef HEADER_LambdaCube.IR_H | 4 | #ifndef HEADER_LambdaCube.IR_H |
5 | #define HEADER_LambdaCube.IR_H | 5 | #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 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-02-26T11:37:22.580893000000Z | 2 | // 2016-03-01T13:00:40.781208000000Z |
3 | 3 | ||
4 | #include "LambdaCube.Mesh.hpp" | 4 | #include "LambdaCube.Mesh.hpp" |
5 | template<> json toJSON<std::shared_ptr<MeshAttribute>>(std::shared_ptr<MeshAttribute> &v) { | 5 | 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 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-02-26T11:37:22.580893000000Z | 2 | // 2016-03-01T13:00:40.781208000000Z |
3 | 3 | ||
4 | #ifndef HEADER_LambdaCube.Mesh_H | 4 | #ifndef HEADER_LambdaCube.Mesh_H |
5 | #define HEADER_LambdaCube.Mesh_H | 5 | #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 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | -- 2016-02-26T11:37:22.580893000000Z | 2 | -- 2016-03-01T13:00:40.781208000000Z |
3 | 3 | ||
4 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} | 4 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} |
5 | module LambdaCube.Mesh where | 5 | 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 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | -- 2016-02-26T11:37:22.580893000000Z | 2 | -- 2016-03-01T13:00:40.781208000000Z |
3 | 3 | ||
4 | module LambdaCube.Mesh where | 4 | module LambdaCube.Mesh where |
5 | import Prelude | 5 | 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 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-02-26T11:37:22.580893000000Z | 2 | // 2016-03-01T13:00:40.781208000000Z |
3 | 3 | ||
4 | enum MeshAttribute { | 4 | enum MeshAttribute { |
5 | case A_Float(Array<Float>) | 5 | 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 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-02-26T11:37:22.580893000000Z | 2 | // 2016-03-01T13:00:40.781208000000Z |
3 | 3 | ||
4 | #ifndef HEADER_LambdaCube.Mesh_H | 4 | #ifndef HEADER_LambdaCube.Mesh_H |
5 | #define HEADER_LambdaCube.Mesh_H | 5 | #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 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-02-26T11:37:22.561871000000Z | 2 | // 2016-03-01T13:00:40.761274000000Z |
3 | 3 | ||
4 | #include "LambdaCube.PipelineSchema.hpp" | 4 | #include "LambdaCube.PipelineSchema.hpp" |
5 | template<> json toJSON<std::shared_ptr<StreamType>>(std::shared_ptr<StreamType> &v) { | 5 | 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 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-02-26T11:37:22.561871000000Z | 2 | // 2016-03-01T13:00:40.761274000000Z |
3 | 3 | ||
4 | #ifndef HEADER_LambdaCube.PipelineSchema_H | 4 | #ifndef HEADER_LambdaCube.PipelineSchema_H |
5 | #define HEADER_LambdaCube.PipelineSchema_H | 5 | #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 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | -- 2016-02-26T11:37:22.561871000000Z | 2 | -- 2016-03-01T13:00:40.761274000000Z |
3 | 3 | ||
4 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} | 4 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} |
5 | module LambdaCube.PipelineSchema where | 5 | 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 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | -- 2016-02-26T11:37:22.561871000000Z | 2 | -- 2016-03-01T13:00:40.761274000000Z |
3 | 3 | ||
4 | module LambdaCube.PipelineSchema where | 4 | module LambdaCube.PipelineSchema where |
5 | import Prelude | 5 | 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 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-02-26T11:37:22.561871000000Z | 2 | // 2016-03-01T13:00:40.761274000000Z |
3 | 3 | ||
4 | enum StreamType { | 4 | enum StreamType { |
5 | case Attribute_Word | 5 | 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 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-02-26T11:37:22.561871000000Z | 2 | // 2016-03-01T13:00:40.761274000000Z |
3 | 3 | ||
4 | #ifndef HEADER_LambdaCube.PipelineSchema_H | 4 | #ifndef HEADER_LambdaCube.PipelineSchema_H |
5 | #define HEADER_LambdaCube.PipelineSchema_H | 5 | #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 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-02-26T11:37:22.609565000000Z | 2 | // 2016-03-01T13:00:40.810157000000Z |
3 | 3 | ||
4 | #include "LambdaCube.TypeInfo.hpp" | 4 | #include "LambdaCube.TypeInfo.hpp" |
5 | template<> json toJSON<std::shared_ptr<Range>>(std::shared_ptr<Range> &v) { | 5 | 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 | |||
87 | obj["arg0"] = toJSON(tv->_0); | 87 | obj["arg0"] = toJSON(tv->_0); |
88 | obj["arg1"] = toJSON(tv->_1); | 88 | obj["arg1"] = toJSON(tv->_1); |
89 | obj["arg2"] = toJSON(tv->_2); | 89 | obj["arg2"] = toJSON(tv->_2); |
90 | obj["arg3"] = toJSON(tv->_3); | ||
90 | } | 91 | } |
91 | break; | 92 | break; |
92 | } | 93 | } |
@@ -108,8 +109,9 @@ template<> std::shared_ptr<CompileResult> fromJSON<std::shared_ptr<CompileResult | |||
108 | tagType = ::CompileResult::tag::Compiled; | 109 | tagType = ::CompileResult::tag::Compiled; |
109 | std::shared_ptr<data::Compiled> tv(new data::Compiled()); | 110 | std::shared_ptr<data::Compiled> tv(new data::Compiled()); |
110 | tv->_0 = fromJSON(W<String>(), obj["arg0"]); | 111 | tv->_0 = fromJSON(W<String>(), obj["arg0"]); |
111 | tv->_1 = fromJSON(W<std::shared_ptr<::Pipeline>>(), obj["arg1"]); | 112 | tv->_1 = fromJSON(W<String>(), obj["arg1"]); |
112 | tv->_2 = fromJSON(W<std::vector<std::shared_ptr<::TypeInfo>>>(), obj["arg2"]); | 113 | tv->_2 = fromJSON(W<std::shared_ptr<::Pipeline>>(), obj["arg2"]); |
114 | tv->_3 = fromJSON(W<std::vector<std::shared_ptr<::TypeInfo>>>(), obj["arg3"]); | ||
113 | return tv; | 115 | return tv; |
114 | } | 116 | } |
115 | else throw "unknown constructor: " + tag; | 117 | 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 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-02-26T11:37:22.609565000000Z | 2 | // 2016-03-01T13:00:40.810157000000Z |
3 | 3 | ||
4 | #ifndef HEADER_LambdaCube.TypeInfo_H | 4 | #ifndef HEADER_LambdaCube.TypeInfo_H |
5 | #define HEADER_LambdaCube.TypeInfo_H | 5 | #define HEADER_LambdaCube.TypeInfo_H |
@@ -56,8 +56,9 @@ namespace data { | |||
56 | class Compiled : public ::CompileResult { | 56 | class Compiled : public ::CompileResult { |
57 | public: | 57 | public: |
58 | String _0; | 58 | String _0; |
59 | std::shared_ptr<::Pipeline> _1; | 59 | String _1; |
60 | std::vector<std::shared_ptr<::TypeInfo>> _2; | 60 | std::shared_ptr<::Pipeline> _2; |
61 | std::vector<std::shared_ptr<::TypeInfo>> _3; | ||
61 | Compiled() { tag = tag::Compiled; } | 62 | Compiled() { tag = tag::Compiled; } |
62 | }; | 63 | }; |
63 | } | 64 | } |
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 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | -- 2016-02-26T11:37:22.609565000000Z | 2 | -- 2016-03-01T13:00:40.810157000000Z |
3 | 3 | ||
4 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} | 4 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} |
5 | module LambdaCube.TypeInfo where | 5 | module LambdaCube.TypeInfo where |
@@ -37,7 +37,7 @@ data TypeInfo | |||
37 | 37 | ||
38 | data CompileResult | 38 | data CompileResult |
39 | = CompileError (Vector Range) String (Vector TypeInfo) | 39 | = CompileError (Vector Range) String (Vector TypeInfo) |
40 | | Compiled String Pipeline (Vector TypeInfo) | 40 | | Compiled String String Pipeline (Vector TypeInfo) |
41 | deriving (Show, Eq, Ord) | 41 | deriving (Show, Eq, Ord) |
42 | 42 | ||
43 | 43 | ||
@@ -92,13 +92,13 @@ instance FromJSON TypeInfo where | |||
92 | instance ToJSON CompileResult where | 92 | instance ToJSON CompileResult where |
93 | toJSON v = case v of | 93 | toJSON v = case v of |
94 | CompileError arg0 arg1 arg2 -> object [ "tag" .= ("CompileError" :: Text), "arg0" .= arg0, "arg1" .= arg1, "arg2" .= arg2] | 94 | CompileError arg0 arg1 arg2 -> object [ "tag" .= ("CompileError" :: Text), "arg0" .= arg0, "arg1" .= arg1, "arg2" .= arg2] |
95 | Compiled arg0 arg1 arg2 -> object [ "tag" .= ("Compiled" :: Text), "arg0" .= arg0, "arg1" .= arg1, "arg2" .= arg2] | 95 | Compiled arg0 arg1 arg2 arg3 -> object [ "tag" .= ("Compiled" :: Text), "arg0" .= arg0, "arg1" .= arg1, "arg2" .= arg2, "arg3" .= arg3] |
96 | 96 | ||
97 | instance FromJSON CompileResult where | 97 | instance FromJSON CompileResult where |
98 | parseJSON (Object obj) = do | 98 | parseJSON (Object obj) = do |
99 | tag <- obj .: "tag" | 99 | tag <- obj .: "tag" |
100 | case tag :: Text of | 100 | case tag :: Text of |
101 | "CompileError" -> CompileError <$> obj .: "arg0" <*> obj .: "arg1" <*> obj .: "arg2" | 101 | "CompileError" -> CompileError <$> obj .: "arg0" <*> obj .: "arg1" <*> obj .: "arg2" |
102 | "Compiled" -> Compiled <$> obj .: "arg0" <*> obj .: "arg1" <*> obj .: "arg2" | 102 | "Compiled" -> Compiled <$> obj .: "arg0" <*> obj .: "arg1" <*> obj .: "arg2" <*> obj .: "arg3" |
103 | parseJSON _ = mzero | 103 | parseJSON _ = mzero |
104 | 104 | ||
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 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | -- 2016-02-26T11:37:22.609565000000Z | 2 | -- 2016-03-01T13:00:40.810157000000Z |
3 | 3 | ||
4 | module LambdaCube.TypeInfo where | 4 | module LambdaCube.TypeInfo where |
5 | import Prelude | 5 | import Prelude |
@@ -36,7 +36,7 @@ data TypeInfo | |||
36 | 36 | ||
37 | data CompileResult | 37 | data CompileResult |
38 | = CompileError (Array Range) String (Array TypeInfo) | 38 | = CompileError (Array Range) String (Array TypeInfo) |
39 | | Compiled String Pipeline (Array TypeInfo) | 39 | | Compiled String String Pipeline (Array TypeInfo) |
40 | 40 | ||
41 | 41 | ||
42 | 42 | ||
@@ -91,7 +91,7 @@ instance decodeJsonTypeInfo :: DecodeJson TypeInfo where | |||
91 | instance encodeJsonCompileResult :: EncodeJson CompileResult where | 91 | instance encodeJsonCompileResult :: EncodeJson CompileResult where |
92 | encodeJson v = case v of | 92 | encodeJson v = case v of |
93 | CompileError arg0 arg1 arg2 -> "tag" := "CompileError" ~> "arg0" := arg0 ~> "arg1" := arg1 ~> "arg2" := arg2 ~> jsonEmptyObject | 93 | CompileError arg0 arg1 arg2 -> "tag" := "CompileError" ~> "arg0" := arg0 ~> "arg1" := arg1 ~> "arg2" := arg2 ~> jsonEmptyObject |
94 | Compiled arg0 arg1 arg2 -> "tag" := "Compiled" ~> "arg0" := arg0 ~> "arg1" := arg1 ~> "arg2" := arg2 ~> jsonEmptyObject | 94 | Compiled arg0 arg1 arg2 arg3 -> "tag" := "Compiled" ~> "arg0" := arg0 ~> "arg1" := arg1 ~> "arg2" := arg2 ~> "arg3" := arg3 ~> jsonEmptyObject |
95 | 95 | ||
96 | instance decodeJsonCompileResult :: DecodeJson CompileResult where | 96 | instance decodeJsonCompileResult :: DecodeJson CompileResult where |
97 | decodeJson json = do | 97 | decodeJson json = do |
@@ -99,5 +99,5 @@ instance decodeJsonCompileResult :: DecodeJson CompileResult where | |||
99 | tag <- obj .? "tag" | 99 | tag <- obj .? "tag" |
100 | case tag of | 100 | case tag of |
101 | "CompileError" -> CompileError <$> obj .? "arg0" <*> obj .? "arg1" <*> obj .? "arg2" | 101 | "CompileError" -> CompileError <$> obj .? "arg0" <*> obj .? "arg1" <*> obj .? "arg2" |
102 | "Compiled" -> Compiled <$> obj .? "arg0" <*> obj .? "arg1" <*> obj .? "arg2" | 102 | "Compiled" -> Compiled <$> obj .? "arg0" <*> obj .? "arg1" <*> obj .? "arg2" <*> obj .? "arg3" |
103 | 103 | ||
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 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-02-26T11:37:22.609565000000Z | 2 | // 2016-03-01T13:00:40.810157000000Z |
3 | 3 | ||
4 | enum Range { | 4 | enum Range { |
5 | case Range(Range_Data) | 5 | case Range(Range_Data) |
@@ -21,7 +21,7 @@ enum TypeInfo { | |||
21 | 21 | ||
22 | enum CompileResult { | 22 | enum CompileResult { |
23 | case CompileError(Array<Range>,String,Array<TypeInfo>) | 23 | case CompileError(Array<Range>,String,Array<TypeInfo>) |
24 | case Compiled(String,Pipeline,Array<TypeInfo>) | 24 | case Compiled(String,String,Pipeline,Array<TypeInfo>) |
25 | } | 25 | } |
26 | 26 | ||
27 | 27 | ||
@@ -107,8 +107,8 @@ extension CompileResult { | |||
107 | switch self { | 107 | switch self { |
108 | case .CompileError(let arg0, let arg1, let arg2): | 108 | case .CompileError(let arg0, let arg1, let arg2): |
109 | return [ "tag" : "CompileError", "arg0" : arg0.toJSON, "arg1" : arg1.toJSON, "arg2" : arg2.toJSON] | 109 | return [ "tag" : "CompileError", "arg0" : arg0.toJSON, "arg1" : arg1.toJSON, "arg2" : arg2.toJSON] |
110 | case .Compiled(let arg0, let arg1, let arg2): | 110 | case .Compiled(let arg0, let arg1, let arg2, let arg3): |
111 | return [ "tag" : "Compiled", "arg0" : arg0.toJSON, "arg1" : arg1.toJSON, "arg2" : arg2.toJSON] | 111 | return [ "tag" : "Compiled", "arg0" : arg0.toJSON, "arg1" : arg1.toJSON, "arg2" : arg2.toJSON, "arg3" : arg3.toJSON] |
112 | } | 112 | } |
113 | } | 113 | } |
114 | } | 114 | } |
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 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-02-26T11:37:22.609565000000Z | 2 | // 2016-03-01T13:00:40.810157000000Z |
3 | 3 | ||
4 | #ifndef HEADER_LambdaCube.TypeInfo_H | 4 | #ifndef HEADER_LambdaCube.TypeInfo_H |
5 | #define HEADER_LambdaCube.TypeInfo_H | 5 | #define HEADER_LambdaCube.TypeInfo_H |
@@ -48,8 +48,9 @@ namespace data { | |||
48 | class Compiled { | 48 | class Compiled { |
49 | public: | 49 | public: |
50 | String _0; | 50 | String _0; |
51 | std::shared_ptr<::Pipeline> _1; | 51 | String _1; |
52 | std::vector<std::shared_ptr<::TypeInfo>> _2; | 52 | std::shared_ptr<::Pipeline> _2; |
53 | std::vector<std::shared_ptr<::TypeInfo>> _3; | ||
53 | }; | 54 | }; |
54 | } | 55 | } |
55 | class CompileResult { | 56 | 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 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-02-26T11:37:22.627476000000Z | 2 | // 2016-03-01T13:00:40.829757000000Z |
3 | 3 | ||
4 | #include "TestData.hpp" | 4 | #include "TestData.hpp" |
5 | template<> json toJSON<std::shared_ptr<ClientInfo>>(std::shared_ptr<ClientInfo> &v) { | 5 | 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 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-02-26T11:37:22.627476000000Z | 2 | // 2016-03-01T13:00:40.829757000000Z |
3 | 3 | ||
4 | #ifndef HEADER_TestData_H | 4 | #ifndef HEADER_TestData_H |
5 | #define HEADER_TestData_H | 5 | #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 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | -- 2016-02-26T11:37:22.627476000000Z | 2 | -- 2016-03-01T13:00:40.829757000000Z |
3 | 3 | ||
4 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} | 4 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} |
5 | module TestData where | 5 | 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 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | -- 2016-02-26T11:37:22.627476000000Z | 2 | -- 2016-03-01T13:00:40.829757000000Z |
3 | 3 | ||
4 | module TestData where | 4 | module TestData where |
5 | import Prelude | 5 | 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 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-02-26T11:37:22.627476000000Z | 2 | // 2016-03-01T13:00:40.829757000000Z |
3 | 3 | ||
4 | enum ClientInfo { | 4 | enum ClientInfo { |
5 | case ClientInfo(ClientInfo_Data) | 5 | 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 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-02-26T11:37:22.627476000000Z | 2 | // 2016-03-01T13:00:40.829757000000Z |
3 | 3 | ||
4 | #ifndef HEADER_TestData_H | 4 | #ifndef HEADER_TestData_H |
5 | #define HEADER_TestData_H | 5 | #define HEADER_TestData_H |