diff options
Diffstat (limited to 'ddl')
100 files changed, 113 insertions, 588 deletions
diff --git a/ddl/out/LambdaCube.IR.cpp b/ddl/out/LambdaCube.IR.cpp index f4bc067..380dd5d 100644 --- a/ddl/out/LambdaCube.IR.cpp +++ b/ddl/out/LambdaCube.IR.cpp | |||
@@ -1,21 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | // 2016-03-01T13:00:40.426854000000Z | ||
7 | ======= | ||
8 | // 2016-03-20T21:42:12.172652000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | // 2016-03-20T22:19:42.844053000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | // 2016-03-21T11:36:00.283777000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | // 2016-03-21T11:41:51.714241000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | #include "LambdaCube.IR.hpp" | 4 | #include "LambdaCube.IR.hpp" |
21 | 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.cs b/ddl/out/LambdaCube.IR.cs index 3c603ca..90e9a7f 100644 --- a/ddl/out/LambdaCube.IR.cs +++ b/ddl/out/LambdaCube.IR.cs | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | using System; | 4 | using System; |
5 | using System.Linq; | 5 | using System.Linq; |
diff --git a/ddl/out/LambdaCube.IR.hpp b/ddl/out/LambdaCube.IR.hpp index 5b0827c..56d32ed 100644 --- a/ddl/out/LambdaCube.IR.hpp +++ b/ddl/out/LambdaCube.IR.hpp | |||
@@ -1,21 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | // 2016-03-01T13:00:40.426854000000Z | ||
7 | ======= | ||
8 | // 2016-03-20T21:42:12.172652000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | // 2016-03-20T22:19:42.844053000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | // 2016-03-21T11:36:00.283777000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | // 2016-03-21T11:41:51.714241000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | #ifndef HEADER_LambdaCube.IR_H | 4 | #ifndef HEADER_LambdaCube.IR_H |
21 | #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 d676f29..b18a2c7 100644 --- a/ddl/out/LambdaCube.IR.hs +++ b/ddl/out/LambdaCube.IR.hs | |||
@@ -1,21 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | -- 2016-03-21T13:14:17.421561000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | -- 2016-03-01T13:00:40.426854000000Z | ||
7 | ======= | ||
8 | -- 2016-03-20T21:42:12.172652000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | -- 2016-03-20T22:19:42.844053000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | -- 2016-03-21T11:36:00.283777000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | -- 2016-03-21T11:41:51.714241000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} | 4 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} |
21 | module LambdaCube.IR where | 5 | module LambdaCube.IR where |
diff --git a/ddl/out/LambdaCube.IR.purs b/ddl/out/LambdaCube.IR.purs index 97c76bd..89965ef 100644 --- a/ddl/out/LambdaCube.IR.purs +++ b/ddl/out/LambdaCube.IR.purs | |||
@@ -1,21 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | -- 2016-03-21T13:14:17.421561000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | -- 2016-03-01T13:00:40.426854000000Z | ||
7 | ======= | ||
8 | -- 2016-03-20T21:42:12.172652000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | -- 2016-03-20T22:19:42.844053000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | -- 2016-03-21T11:36:00.283777000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | -- 2016-03-21T11:41:51.714241000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | module LambdaCube.IR where | 4 | module LambdaCube.IR where |
21 | import Prelude | 5 | import Prelude |
diff --git a/ddl/out/LambdaCube.IR.swift b/ddl/out/LambdaCube.IR.swift index 5c81d4b..62cbaa3 100644 --- a/ddl/out/LambdaCube.IR.swift +++ b/ddl/out/LambdaCube.IR.swift | |||
@@ -1,21 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | // 2016-03-01T13:00:40.426854000000Z | ||
7 | ======= | ||
8 | // 2016-03-20T21:42:12.172652000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | // 2016-03-20T22:19:42.844053000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | // 2016-03-21T11:36:00.283777000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | // 2016-03-21T11:41:51.714241000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | typealias StreamName = Int | 4 | typealias StreamName = Int |
21 | 5 | ||
diff --git a/ddl/out/LambdaCube.IR2.hpp b/ddl/out/LambdaCube.IR2.hpp index 0fc1736..bdcdec3 100644 --- a/ddl/out/LambdaCube.IR2.hpp +++ b/ddl/out/LambdaCube.IR2.hpp | |||
@@ -1,21 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | // 2016-03-01T13:00:40.426854000000Z | ||
7 | ======= | ||
8 | // 2016-03-20T21:42:12.172652000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | // 2016-03-20T22:19:42.844053000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | // 2016-03-21T11:36:00.283777000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | // 2016-03-21T11:41:51.714241000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | #ifndef HEADER_LambdaCube.IR_H | 4 | #ifndef HEADER_LambdaCube.IR_H |
21 | #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 b0950ee..50e4072 100644 --- a/ddl/out/LambdaCube.Mesh.cpp +++ b/ddl/out/LambdaCube.Mesh.cpp | |||
@@ -1,21 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | // 2016-03-21T13:14:18.184851000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | // 2016-03-01T13:00:40.781208000000Z | ||
7 | ======= | ||
8 | // 2016-03-20T21:42:12.936741000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | // 2016-03-20T22:19:43.568791000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | // 2016-03-21T11:36:01.121658000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | // 2016-03-21T11:41:52.391032000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | #include "LambdaCube.Mesh.hpp" | 4 | #include "LambdaCube.Mesh.hpp" |
21 | 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.cs b/ddl/out/LambdaCube.Mesh.cs index 62b8d29..694cbef 100644 --- a/ddl/out/LambdaCube.Mesh.cs +++ b/ddl/out/LambdaCube.Mesh.cs | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:52.391032000000Z | 2 | // 2016-03-21T13:14:18.184851000000Z |
3 | 3 | ||
4 | using System; | 4 | using System; |
5 | using System.Linq; | 5 | using System.Linq; |
diff --git a/ddl/out/LambdaCube.Mesh.hpp b/ddl/out/LambdaCube.Mesh.hpp index 808642c..4f259f3 100644 --- a/ddl/out/LambdaCube.Mesh.hpp +++ b/ddl/out/LambdaCube.Mesh.hpp | |||
@@ -1,21 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | // 2016-03-21T13:14:18.184851000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | // 2016-03-01T13:00:40.781208000000Z | ||
7 | ======= | ||
8 | // 2016-03-20T21:42:12.936741000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | // 2016-03-20T22:19:43.568791000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | // 2016-03-21T11:36:01.121658000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | // 2016-03-21T11:41:52.391032000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | #ifndef HEADER_LambdaCube.Mesh_H | 4 | #ifndef HEADER_LambdaCube.Mesh_H |
21 | #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 27b0462..4ecb2f0 100644 --- a/ddl/out/LambdaCube.Mesh.hs +++ b/ddl/out/LambdaCube.Mesh.hs | |||
@@ -1,21 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | -- 2016-03-21T13:14:18.184851000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | -- 2016-03-01T13:00:40.781208000000Z | ||
7 | ======= | ||
8 | -- 2016-03-20T21:42:12.936741000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | -- 2016-03-20T22:19:43.568791000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | -- 2016-03-21T11:36:01.121658000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | -- 2016-03-21T11:41:52.391032000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} | 4 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} |
21 | module LambdaCube.Mesh where | 5 | module LambdaCube.Mesh where |
diff --git a/ddl/out/LambdaCube.Mesh.purs b/ddl/out/LambdaCube.Mesh.purs index 6f90887..ef25eb8 100644 --- a/ddl/out/LambdaCube.Mesh.purs +++ b/ddl/out/LambdaCube.Mesh.purs | |||
@@ -1,21 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | -- 2016-03-21T13:14:18.184851000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | -- 2016-03-01T13:00:40.781208000000Z | ||
7 | ======= | ||
8 | -- 2016-03-20T21:42:12.936741000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | -- 2016-03-20T22:19:43.568791000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | -- 2016-03-21T11:36:01.121658000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | -- 2016-03-21T11:41:52.391032000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | module LambdaCube.Mesh where | 4 | module LambdaCube.Mesh where |
21 | import Prelude | 5 | import Prelude |
diff --git a/ddl/out/LambdaCube.Mesh.swift b/ddl/out/LambdaCube.Mesh.swift index a5cfba9..c5e4257 100644 --- a/ddl/out/LambdaCube.Mesh.swift +++ b/ddl/out/LambdaCube.Mesh.swift | |||
@@ -1,21 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | // 2016-03-21T13:14:18.184851000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | // 2016-03-01T13:00:40.781208000000Z | ||
7 | ======= | ||
8 | // 2016-03-20T21:42:12.936741000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | // 2016-03-20T22:19:43.568791000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | // 2016-03-21T11:36:01.121658000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | // 2016-03-21T11:41:52.391032000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | enum MeshAttribute { | 4 | enum MeshAttribute { |
21 | 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 6a8957d..1b8c6ad 100644 --- a/ddl/out/LambdaCube.Mesh2.hpp +++ b/ddl/out/LambdaCube.Mesh2.hpp | |||
@@ -1,21 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | // 2016-03-21T13:14:18.184851000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | // 2016-03-01T13:00:40.781208000000Z | ||
7 | ======= | ||
8 | // 2016-03-20T21:42:12.936741000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | // 2016-03-20T22:19:43.568791000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | // 2016-03-21T11:36:01.121658000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | // 2016-03-21T11:41:52.391032000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | #ifndef HEADER_LambdaCube.Mesh_H | 4 | #ifndef HEADER_LambdaCube.Mesh_H |
21 | #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 45e4dce..f4c1946 100644 --- a/ddl/out/LambdaCube.PipelineSchema.cpp +++ b/ddl/out/LambdaCube.PipelineSchema.cpp | |||
@@ -1,21 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | // 2016-03-21T13:14:18.137981000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | // 2016-03-01T13:00:40.761274000000Z | ||
7 | ======= | ||
8 | // 2016-03-20T21:42:12.892571000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | // 2016-03-20T22:19:43.498688000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | // 2016-03-21T11:36:01.075399000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | // 2016-03-21T11:41:52.343859000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | #include "LambdaCube.PipelineSchema.hpp" | 4 | #include "LambdaCube.PipelineSchema.hpp" |
21 | 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.cs b/ddl/out/LambdaCube.PipelineSchema.cs index 945ae0c..68acd42 100644 --- a/ddl/out/LambdaCube.PipelineSchema.cs +++ b/ddl/out/LambdaCube.PipelineSchema.cs | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:52.343859000000Z | 2 | // 2016-03-21T13:14:18.137981000000Z |
3 | 3 | ||
4 | using System; | 4 | using System; |
5 | using System.Linq; | 5 | using System.Linq; |
diff --git a/ddl/out/LambdaCube.PipelineSchema.hpp b/ddl/out/LambdaCube.PipelineSchema.hpp index a69994c..d0777fe 100644 --- a/ddl/out/LambdaCube.PipelineSchema.hpp +++ b/ddl/out/LambdaCube.PipelineSchema.hpp | |||
@@ -1,21 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | // 2016-03-21T13:14:18.137981000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | // 2016-03-01T13:00:40.761274000000Z | ||
7 | ======= | ||
8 | // 2016-03-20T21:42:12.892571000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | // 2016-03-20T22:19:43.498688000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | // 2016-03-21T11:36:01.075399000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | // 2016-03-21T11:41:52.343859000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | #ifndef HEADER_LambdaCube.PipelineSchema_H | 4 | #ifndef HEADER_LambdaCube.PipelineSchema_H |
21 | #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 01846c7..a7f3e40 100644 --- a/ddl/out/LambdaCube.PipelineSchema.hs +++ b/ddl/out/LambdaCube.PipelineSchema.hs | |||
@@ -1,21 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | -- 2016-03-21T13:14:18.137981000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | -- 2016-03-01T13:00:40.761274000000Z | ||
7 | ======= | ||
8 | -- 2016-03-20T21:42:12.892571000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | -- 2016-03-20T22:19:43.498688000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | -- 2016-03-21T11:36:01.075399000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | -- 2016-03-21T11:41:52.343859000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} | 4 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} |
21 | module LambdaCube.PipelineSchema where | 5 | module LambdaCube.PipelineSchema where |
diff --git a/ddl/out/LambdaCube.PipelineSchema.purs b/ddl/out/LambdaCube.PipelineSchema.purs index 23c0762..f8c210b 100644 --- a/ddl/out/LambdaCube.PipelineSchema.purs +++ b/ddl/out/LambdaCube.PipelineSchema.purs | |||
@@ -1,21 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | -- 2016-03-21T13:14:18.137981000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | -- 2016-03-01T13:00:40.761274000000Z | ||
7 | ======= | ||
8 | -- 2016-03-20T21:42:12.892571000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | -- 2016-03-20T22:19:43.498688000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | -- 2016-03-21T11:36:01.075399000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | -- 2016-03-21T11:41:52.343859000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | module LambdaCube.PipelineSchema where | 4 | module LambdaCube.PipelineSchema where |
21 | import Prelude | 5 | import Prelude |
diff --git a/ddl/out/LambdaCube.PipelineSchema.swift b/ddl/out/LambdaCube.PipelineSchema.swift index 1fa6189..2a6e8f2 100644 --- a/ddl/out/LambdaCube.PipelineSchema.swift +++ b/ddl/out/LambdaCube.PipelineSchema.swift | |||
@@ -1,21 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | // 2016-03-21T13:14:18.137981000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | // 2016-03-01T13:00:40.761274000000Z | ||
7 | ======= | ||
8 | // 2016-03-20T21:42:12.892571000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | // 2016-03-20T22:19:43.498688000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | // 2016-03-21T11:36:01.075399000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | // 2016-03-21T11:41:52.343859000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | enum StreamType { | 4 | enum StreamType { |
21 | case Attribute_Word | 5 | case Attribute_Word |
diff --git a/ddl/out/LambdaCube.PipelineSchema2.hpp b/ddl/out/LambdaCube.PipelineSchema2.hpp index ac12eb0..05a4521 100644 --- a/ddl/out/LambdaCube.PipelineSchema2.hpp +++ b/ddl/out/LambdaCube.PipelineSchema2.hpp | |||
@@ -1,21 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | // 2016-03-21T13:14:18.137981000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | // 2016-03-01T13:00:40.761274000000Z | ||
7 | ======= | ||
8 | // 2016-03-20T21:42:12.892571000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | // 2016-03-20T22:19:43.498688000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | // 2016-03-21T11:36:01.075399000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | // 2016-03-21T11:41:52.343859000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | #ifndef HEADER_LambdaCube.PipelineSchema_H | 4 | #ifndef HEADER_LambdaCube.PipelineSchema_H |
21 | #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 26e3ef7..0cecc31 100644 --- a/ddl/out/LambdaCube.TypeInfo.cpp +++ b/ddl/out/LambdaCube.TypeInfo.cpp | |||
@@ -1,21 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | // 2016-03-21T13:14:18.260874000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | // 2016-03-01T13:00:40.810157000000Z | ||
7 | ======= | ||
8 | // 2016-03-20T21:42:12.996366000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | // 2016-03-20T22:19:43.646837000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | // 2016-03-21T11:36:01.199696000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | // 2016-03-21T11:41:52.460562000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | #include "LambdaCube.TypeInfo.hpp" | 4 | #include "LambdaCube.TypeInfo.hpp" |
21 | 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) { |
diff --git a/ddl/out/LambdaCube.TypeInfo.cs b/ddl/out/LambdaCube.TypeInfo.cs index 967aa01..70642a0 100644 --- a/ddl/out/LambdaCube.TypeInfo.cs +++ b/ddl/out/LambdaCube.TypeInfo.cs | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:52.460562000000Z | 2 | // 2016-03-21T13:14:18.260874000000Z |
3 | 3 | ||
4 | using System; | 4 | using System; |
5 | using System.Linq; | 5 | using System.Linq; |
@@ -56,8 +56,9 @@ namespace LambdaCube.TypeInfo { | |||
56 | }; | 56 | }; |
57 | class Compiled : LambdaCube.TypeInfo.CompileResult { | 57 | class Compiled : LambdaCube.TypeInfo.CompileResult { |
58 | public string _0; | 58 | public string _0; |
59 | public global::LambdaCube.TypeInfo.Pipeline _1; | 59 | public string _1; |
60 | public List<global::LambdaCube.TypeInfo.TypeInfo> _2; | 60 | public global::LambdaCube.TypeInfo.Pipeline _2; |
61 | public List<global::LambdaCube.TypeInfo.TypeInfo> _3; | ||
61 | public Compiled() { tag = LambdaCube.TypeInfo.CompileResult.Tag.Compiled; } | 62 | public Compiled() { tag = LambdaCube.TypeInfo.CompileResult.Tag.Compiled; } |
62 | }; | 63 | }; |
63 | } | 64 | } |
@@ -129,8 +130,9 @@ namespace LambdaCube.TypeInfo { | |||
129 | tagType = CompileResult.Tag.Compiled; | 130 | tagType = CompileResult.Tag.Compiled; |
130 | data.Compiled tv = new data.Compiled(); | 131 | data.Compiled tv = new data.Compiled(); |
131 | tv._0 = (string)fromJSON(Type.String,obj["arg0"]); | 132 | tv._0 = (string)fromJSON(Type.String,obj["arg0"]); |
132 | tv._1 = (global::LambdaCube.TypeInfo.Pipeline)fromJSON(Type.Pipeline,obj["arg1"]); | 133 | tv._1 = (string)fromJSON(Type.String,obj["arg1"]); |
133 | tv._2 = (List<global::LambdaCube.TypeInfo.TypeInfo>)fromJSON(Type.Array_TypeInfo,obj["arg2"]); | 134 | tv._2 = (global::LambdaCube.TypeInfo.Pipeline)fromJSON(Type.Pipeline,obj["arg2"]); |
135 | tv._3 = (List<global::LambdaCube.TypeInfo.TypeInfo>)fromJSON(Type.Array_TypeInfo,obj["arg3"]); | ||
134 | return tv; | 136 | return tv; |
135 | } | 137 | } |
136 | else throw new Exception("unknown constructor: " + tag); | 138 | else throw new Exception("unknown constructor: " + tag); |
@@ -192,6 +194,7 @@ namespace LambdaCube.TypeInfo { | |||
192 | obj["arg0"] = toJSON(tv._0); | 194 | obj["arg0"] = toJSON(tv._0); |
193 | obj["arg1"] = toJSON(tv._1); | 195 | obj["arg1"] = toJSON(tv._1); |
194 | obj["arg2"] = toJSON(tv._2); | 196 | obj["arg2"] = toJSON(tv._2); |
197 | obj["arg3"] = toJSON(tv._3); | ||
195 | } | 198 | } |
196 | break; | 199 | break; |
197 | } | 200 | } |
diff --git a/ddl/out/LambdaCube.TypeInfo.hpp b/ddl/out/LambdaCube.TypeInfo.hpp index 56b3d78..c57870f 100644 --- a/ddl/out/LambdaCube.TypeInfo.hpp +++ b/ddl/out/LambdaCube.TypeInfo.hpp | |||
@@ -1,21 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | // 2016-03-21T13:14:18.260874000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | // 2016-03-01T13:00:40.810157000000Z | ||
7 | ======= | ||
8 | // 2016-03-20T21:42:12.996366000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | // 2016-03-20T22:19:43.646837000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | // 2016-03-21T11:36:01.199696000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | // 2016-03-21T11:41:52.460562000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | #ifndef HEADER_LambdaCube.TypeInfo_H | 4 | #ifndef HEADER_LambdaCube.TypeInfo_H |
21 | #define HEADER_LambdaCube.TypeInfo_H | 5 | #define HEADER_LambdaCube.TypeInfo_H |
diff --git a/ddl/out/LambdaCube.TypeInfo.hs b/ddl/out/LambdaCube.TypeInfo.hs index b9b07a3..db3c77f 100644 --- a/ddl/out/LambdaCube.TypeInfo.hs +++ b/ddl/out/LambdaCube.TypeInfo.hs | |||
@@ -1,21 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | -- 2016-03-21T13:14:18.260874000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | -- 2016-03-01T13:00:40.810157000000Z | ||
7 | ======= | ||
8 | -- 2016-03-20T21:42:12.996366000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | -- 2016-03-20T22:19:43.646837000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | -- 2016-03-21T11:36:01.199696000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | -- 2016-03-21T11:41:52.460562000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} | 4 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} |
21 | module LambdaCube.TypeInfo where | 5 | module LambdaCube.TypeInfo where |
diff --git a/ddl/out/LambdaCube.TypeInfo.purs b/ddl/out/LambdaCube.TypeInfo.purs index 1871220..a2f85e3 100644 --- a/ddl/out/LambdaCube.TypeInfo.purs +++ b/ddl/out/LambdaCube.TypeInfo.purs | |||
@@ -1,21 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | -- 2016-03-21T13:14:18.260874000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | -- 2016-03-01T13:00:40.810157000000Z | ||
7 | ======= | ||
8 | -- 2016-03-20T21:42:12.996366000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | -- 2016-03-20T22:19:43.646837000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | -- 2016-03-21T11:36:01.199696000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | -- 2016-03-21T11:41:52.460562000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | module LambdaCube.TypeInfo where | 4 | module LambdaCube.TypeInfo where |
21 | import Prelude | 5 | import Prelude |
diff --git a/ddl/out/LambdaCube.TypeInfo.swift b/ddl/out/LambdaCube.TypeInfo.swift index 27ccdc7..f024792 100644 --- a/ddl/out/LambdaCube.TypeInfo.swift +++ b/ddl/out/LambdaCube.TypeInfo.swift | |||
@@ -1,21 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | // 2016-03-21T13:14:18.260874000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | // 2016-03-01T13:00:40.810157000000Z | ||
7 | ======= | ||
8 | // 2016-03-20T21:42:12.996366000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | // 2016-03-20T22:19:43.646837000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | // 2016-03-21T11:36:01.199696000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | // 2016-03-21T11:41:52.460562000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | enum Range { | 4 | enum Range { |
21 | case Range(Range_Data) | 5 | case Range(Range_Data) |
diff --git a/ddl/out/LambdaCube.TypeInfo2.hpp b/ddl/out/LambdaCube.TypeInfo2.hpp index 4672107..cd2c26c 100644 --- a/ddl/out/LambdaCube.TypeInfo2.hpp +++ b/ddl/out/LambdaCube.TypeInfo2.hpp | |||
@@ -1,21 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | // 2016-03-21T13:14:18.260874000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | // 2016-03-01T13:00:40.810157000000Z | ||
7 | ======= | ||
8 | // 2016-03-20T21:42:12.996366000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | // 2016-03-20T22:19:43.646837000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | // 2016-03-21T11:36:01.199696000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | // 2016-03-21T11:41:52.460562000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | #ifndef HEADER_LambdaCube.TypeInfo_H | 4 | #ifndef HEADER_LambdaCube.TypeInfo_H |
21 | #define HEADER_LambdaCube.TypeInfo_H | 5 | #define HEADER_LambdaCube.TypeInfo_H |
diff --git a/ddl/out/TestData.cpp b/ddl/out/TestData.cpp index d6a1497..2ddf138 100644 --- a/ddl/out/TestData.cpp +++ b/ddl/out/TestData.cpp | |||
@@ -1,21 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | // 2016-03-21T13:14:18.341517000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | // 2016-03-01T13:00:40.829757000000Z | ||
7 | ======= | ||
8 | // 2016-03-20T21:42:13.043021000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | // 2016-03-20T22:19:43.692329000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | // 2016-03-21T11:36:01.244766000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | // 2016-03-21T11:41:52.508392000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | #include "TestData.hpp" | 4 | #include "TestData.hpp" |
21 | 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.cs b/ddl/out/TestData.cs index 0ea14a3..7bb120f 100644 --- a/ddl/out/TestData.cs +++ b/ddl/out/TestData.cs | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:52.508392000000Z | 2 | // 2016-03-21T13:14:18.341517000000Z |
3 | 3 | ||
4 | using System; | 4 | using System; |
5 | using System.Linq; | 5 | using System.Linq; |
diff --git a/ddl/out/TestData.hpp b/ddl/out/TestData.hpp index cc11915..d1645fe 100644 --- a/ddl/out/TestData.hpp +++ b/ddl/out/TestData.hpp | |||
@@ -1,21 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | // 2016-03-21T13:14:18.341517000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | // 2016-03-01T13:00:40.829757000000Z | ||
7 | ======= | ||
8 | // 2016-03-20T21:42:13.043021000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | // 2016-03-20T22:19:43.692329000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | // 2016-03-21T11:36:01.244766000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | // 2016-03-21T11:41:52.508392000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | #ifndef HEADER_TestData_H | 4 | #ifndef HEADER_TestData_H |
21 | #define HEADER_TestData_H | 5 | #define HEADER_TestData_H |
diff --git a/ddl/out/TestData.hs b/ddl/out/TestData.hs index 8b1fb9f..75bc9be 100644 --- a/ddl/out/TestData.hs +++ b/ddl/out/TestData.hs | |||
@@ -1,21 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | -- 2016-03-21T13:14:18.341517000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | -- 2016-03-01T13:00:40.829757000000Z | ||
7 | ======= | ||
8 | -- 2016-03-20T21:42:13.043021000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | -- 2016-03-20T22:19:43.692329000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | -- 2016-03-21T11:36:01.244766000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | -- 2016-03-21T11:41:52.508392000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} | 4 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} |
21 | module TestData where | 5 | module TestData where |
diff --git a/ddl/out/TestData.purs b/ddl/out/TestData.purs index 5a3b7c6..b3204bc 100644 --- a/ddl/out/TestData.purs +++ b/ddl/out/TestData.purs | |||
@@ -1,21 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | -- 2016-03-21T13:14:18.341517000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | -- 2016-03-01T13:00:40.829757000000Z | ||
7 | ======= | ||
8 | -- 2016-03-20T21:42:13.043021000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | -- 2016-03-20T22:19:43.692329000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | -- 2016-03-21T11:36:01.244766000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | -- 2016-03-21T11:41:52.508392000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | module TestData where | 4 | module TestData where |
21 | import Prelude | 5 | import Prelude |
diff --git a/ddl/out/TestData.swift b/ddl/out/TestData.swift index be520e2..918287d 100644 --- a/ddl/out/TestData.swift +++ b/ddl/out/TestData.swift | |||
@@ -1,21 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | // 2016-03-21T13:14:18.341517000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | // 2016-03-01T13:00:40.829757000000Z | ||
7 | ======= | ||
8 | // 2016-03-20T21:42:13.043021000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | // 2016-03-20T22:19:43.692329000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | // 2016-03-21T11:36:01.244766000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | // 2016-03-21T11:41:52.508392000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | enum ClientInfo { | 4 | enum ClientInfo { |
21 | case ClientInfo(ClientInfo_Data) | 5 | case ClientInfo(ClientInfo_Data) |
diff --git a/ddl/out/TestData2.hpp b/ddl/out/TestData2.hpp index 0643d3b..2e49ab6 100644 --- a/ddl/out/TestData2.hpp +++ b/ddl/out/TestData2.hpp | |||
@@ -1,21 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | // 2016-03-21T13:14:18.341517000000Z |
3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
6 | // 2016-03-01T13:00:40.829757000000Z | ||
7 | ======= | ||
8 | // 2016-03-20T21:42:13.043021000000Z | ||
9 | >>>>>>> working c# backend | ||
10 | ======= | ||
11 | // 2016-03-20T22:19:43.692329000000Z | ||
12 | >>>>>>> fix c# | ||
13 | ======= | ||
14 | // 2016-03-21T11:36:01.244766000000Z | ||
15 | >>>>>>> work on java json loader | ||
16 | ======= | ||
17 | // 2016-03-21T11:41:52.508392000000Z | ||
18 | >>>>>>> improve java json | ||
19 | 3 | ||
20 | #ifndef HEADER_TestData_H | 4 | #ifndef HEADER_TestData_H |
21 | #define HEADER_TestData_H | 5 | #define HEADER_TestData_H |
diff --git a/ddl/out/java/LambdaCube/IR/AccumulationContext.java b/ddl/out/java/LambdaCube/IR/AccumulationContext.java index a190597..370a7e7 100644 --- a/ddl/out/java/LambdaCube/IR/AccumulationContext.java +++ b/ddl/out/java/LambdaCube/IR/AccumulationContext.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/ArrayValue.java b/ddl/out/java/LambdaCube/IR/ArrayValue.java index b176300..04c7176 100644 --- a/ddl/out/java/LambdaCube/IR/ArrayValue.java +++ b/ddl/out/java/LambdaCube/IR/ArrayValue.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Backend.java b/ddl/out/java/LambdaCube/IR/Backend.java index bbe74b8..91645c0 100644 --- a/ddl/out/java/LambdaCube/IR/Backend.java +++ b/ddl/out/java/LambdaCube/IR/Backend.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/BlendEquation.java b/ddl/out/java/LambdaCube/IR/BlendEquation.java index 6dd1523..1c93189 100644 --- a/ddl/out/java/LambdaCube/IR/BlendEquation.java +++ b/ddl/out/java/LambdaCube/IR/BlendEquation.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Blending.java b/ddl/out/java/LambdaCube/IR/Blending.java index 331ae4e..58c208f 100644 --- a/ddl/out/java/LambdaCube/IR/Blending.java +++ b/ddl/out/java/LambdaCube/IR/Blending.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/BlendingFactor.java b/ddl/out/java/LambdaCube/IR/BlendingFactor.java index fe73075..1283737 100644 --- a/ddl/out/java/LambdaCube/IR/BlendingFactor.java +++ b/ddl/out/java/LambdaCube/IR/BlendingFactor.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/ClearImage.java b/ddl/out/java/LambdaCube/IR/ClearImage.java index 64491e9..d8db2b9 100644 --- a/ddl/out/java/LambdaCube/IR/ClearImage.java +++ b/ddl/out/java/LambdaCube/IR/ClearImage.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/ColorArity.java b/ddl/out/java/LambdaCube/IR/ColorArity.java index 77ba1a0..3ded450 100644 --- a/ddl/out/java/LambdaCube/IR/ColorArity.java +++ b/ddl/out/java/LambdaCube/IR/ColorArity.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Command.java b/ddl/out/java/LambdaCube/IR/Command.java index 90ec2c5..39d70fd 100644 --- a/ddl/out/java/LambdaCube/IR/Command.java +++ b/ddl/out/java/LambdaCube/IR/Command.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/ComparisonFunction.java b/ddl/out/java/LambdaCube/IR/ComparisonFunction.java index d3c5112..46bed68 100644 --- a/ddl/out/java/LambdaCube/IR/ComparisonFunction.java +++ b/ddl/out/java/LambdaCube/IR/ComparisonFunction.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/CullMode.java b/ddl/out/java/LambdaCube/IR/CullMode.java index f2ce3a8..6b0623c 100644 --- a/ddl/out/java/LambdaCube/IR/CullMode.java +++ b/ddl/out/java/LambdaCube/IR/CullMode.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/EdgeMode.java b/ddl/out/java/LambdaCube/IR/EdgeMode.java index 19a8eba..adf7f82 100644 --- a/ddl/out/java/LambdaCube/IR/EdgeMode.java +++ b/ddl/out/java/LambdaCube/IR/EdgeMode.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/FetchPrimitive.java b/ddl/out/java/LambdaCube/IR/FetchPrimitive.java index 16453bc..a142a91 100644 --- a/ddl/out/java/LambdaCube/IR/FetchPrimitive.java +++ b/ddl/out/java/LambdaCube/IR/FetchPrimitive.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Filter.java b/ddl/out/java/LambdaCube/IR/Filter.java index 4bd3b7c..b79fe17 100644 --- a/ddl/out/java/LambdaCube/IR/Filter.java +++ b/ddl/out/java/LambdaCube/IR/Filter.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/FragmentOperation.java b/ddl/out/java/LambdaCube/IR/FragmentOperation.java index 35aa5a9..a098e99 100644 --- a/ddl/out/java/LambdaCube/IR/FragmentOperation.java +++ b/ddl/out/java/LambdaCube/IR/FragmentOperation.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/FrontFace.java b/ddl/out/java/LambdaCube/IR/FrontFace.java index dff345f..6979742 100644 --- a/ddl/out/java/LambdaCube/IR/FrontFace.java +++ b/ddl/out/java/LambdaCube/IR/FrontFace.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/ImageRef.java b/ddl/out/java/LambdaCube/IR/ImageRef.java index 51385dc..b5f1ebf 100644 --- a/ddl/out/java/LambdaCube/IR/ImageRef.java +++ b/ddl/out/java/LambdaCube/IR/ImageRef.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/ImageSemantic.java b/ddl/out/java/LambdaCube/IR/ImageSemantic.java index 22aea08..4eda2b3 100644 --- a/ddl/out/java/LambdaCube/IR/ImageSemantic.java +++ b/ddl/out/java/LambdaCube/IR/ImageSemantic.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/InputType.java b/ddl/out/java/LambdaCube/IR/InputType.java index f8764d1..eb55ab1 100644 --- a/ddl/out/java/LambdaCube/IR/InputType.java +++ b/ddl/out/java/LambdaCube/IR/InputType.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/JSON.java b/ddl/out/java/LambdaCube/IR/JSON.java index 3515e25..ad4622c 100644 --- a/ddl/out/java/LambdaCube/IR/JSON.java +++ b/ddl/out/java/LambdaCube/IR/JSON.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/LogicOperation.java b/ddl/out/java/LambdaCube/IR/LogicOperation.java index 351bfe5..5f89372 100644 --- a/ddl/out/java/LambdaCube/IR/LogicOperation.java +++ b/ddl/out/java/LambdaCube/IR/LogicOperation.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/MipMap.java b/ddl/out/java/LambdaCube/IR/MipMap.java index 69c7fb4..3ea426a 100644 --- a/ddl/out/java/LambdaCube/IR/MipMap.java +++ b/ddl/out/java/LambdaCube/IR/MipMap.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/OutputPrimitive.java b/ddl/out/java/LambdaCube/IR/OutputPrimitive.java index cda4e7a..c3e2fc9 100644 --- a/ddl/out/java/LambdaCube/IR/OutputPrimitive.java +++ b/ddl/out/java/LambdaCube/IR/OutputPrimitive.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Parameter.java b/ddl/out/java/LambdaCube/IR/Parameter.java index 11f6778..fb57062 100644 --- a/ddl/out/java/LambdaCube/IR/Parameter.java +++ b/ddl/out/java/LambdaCube/IR/Parameter.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Pipeline.java b/ddl/out/java/LambdaCube/IR/Pipeline.java index 5a98897..d5d697f 100644 --- a/ddl/out/java/LambdaCube/IR/Pipeline.java +++ b/ddl/out/java/LambdaCube/IR/Pipeline.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/PointSize.java b/ddl/out/java/LambdaCube/IR/PointSize.java index 195cd89..25fc231 100644 --- a/ddl/out/java/LambdaCube/IR/PointSize.java +++ b/ddl/out/java/LambdaCube/IR/PointSize.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/PointSpriteCoordOrigin.java b/ddl/out/java/LambdaCube/IR/PointSpriteCoordOrigin.java index 6b705bb..24f1a1a 100644 --- a/ddl/out/java/LambdaCube/IR/PointSpriteCoordOrigin.java +++ b/ddl/out/java/LambdaCube/IR/PointSpriteCoordOrigin.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/PolygonMode.java b/ddl/out/java/LambdaCube/IR/PolygonMode.java index a1beedc..68c21d1 100644 --- a/ddl/out/java/LambdaCube/IR/PolygonMode.java +++ b/ddl/out/java/LambdaCube/IR/PolygonMode.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/PolygonOffset.java b/ddl/out/java/LambdaCube/IR/PolygonOffset.java index dea6684..c96984d 100644 --- a/ddl/out/java/LambdaCube/IR/PolygonOffset.java +++ b/ddl/out/java/LambdaCube/IR/PolygonOffset.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Program.java b/ddl/out/java/LambdaCube/IR/Program.java index 4f0e999..1b4e431 100644 --- a/ddl/out/java/LambdaCube/IR/Program.java +++ b/ddl/out/java/LambdaCube/IR/Program.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/ProvokingVertex.java b/ddl/out/java/LambdaCube/IR/ProvokingVertex.java index 30ee0fc..c602610 100644 --- a/ddl/out/java/LambdaCube/IR/ProvokingVertex.java +++ b/ddl/out/java/LambdaCube/IR/ProvokingVertex.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/RasterContext.java b/ddl/out/java/LambdaCube/IR/RasterContext.java index c246a8a..32d05e7 100644 --- a/ddl/out/java/LambdaCube/IR/RasterContext.java +++ b/ddl/out/java/LambdaCube/IR/RasterContext.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/RenderTarget.java b/ddl/out/java/LambdaCube/IR/RenderTarget.java index 816dbc6..4b91fb4 100644 --- a/ddl/out/java/LambdaCube/IR/RenderTarget.java +++ b/ddl/out/java/LambdaCube/IR/RenderTarget.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/SamplerDescriptor.java b/ddl/out/java/LambdaCube/IR/SamplerDescriptor.java index 1149bf3..0424cb0 100644 --- a/ddl/out/java/LambdaCube/IR/SamplerDescriptor.java +++ b/ddl/out/java/LambdaCube/IR/SamplerDescriptor.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Slot.java b/ddl/out/java/LambdaCube/IR/Slot.java index bd6fac3..16fa1d5 100644 --- a/ddl/out/java/LambdaCube/IR/Slot.java +++ b/ddl/out/java/LambdaCube/IR/Slot.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/StencilOperation.java b/ddl/out/java/LambdaCube/IR/StencilOperation.java index ef3a62f..35224f8 100644 --- a/ddl/out/java/LambdaCube/IR/StencilOperation.java +++ b/ddl/out/java/LambdaCube/IR/StencilOperation.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/StencilOps.java b/ddl/out/java/LambdaCube/IR/StencilOps.java index 54f6d95..4eb2e46 100644 --- a/ddl/out/java/LambdaCube/IR/StencilOps.java +++ b/ddl/out/java/LambdaCube/IR/StencilOps.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/StencilTest.java b/ddl/out/java/LambdaCube/IR/StencilTest.java index ef16647..f6107e5 100644 --- a/ddl/out/java/LambdaCube/IR/StencilTest.java +++ b/ddl/out/java/LambdaCube/IR/StencilTest.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/StencilTests.java b/ddl/out/java/LambdaCube/IR/StencilTests.java index d350f5f..a64efdd 100644 --- a/ddl/out/java/LambdaCube/IR/StencilTests.java +++ b/ddl/out/java/LambdaCube/IR/StencilTests.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/StreamData.java b/ddl/out/java/LambdaCube/IR/StreamData.java index 81c9d0b..8904a4c 100644 --- a/ddl/out/java/LambdaCube/IR/StreamData.java +++ b/ddl/out/java/LambdaCube/IR/StreamData.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/TargetItem.java b/ddl/out/java/LambdaCube/IR/TargetItem.java index f6315fc..8fdb7d6 100644 --- a/ddl/out/java/LambdaCube/IR/TargetItem.java +++ b/ddl/out/java/LambdaCube/IR/TargetItem.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/TextureDataType.java b/ddl/out/java/LambdaCube/IR/TextureDataType.java index 4725a3f..14dd217 100644 --- a/ddl/out/java/LambdaCube/IR/TextureDataType.java +++ b/ddl/out/java/LambdaCube/IR/TextureDataType.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/TextureDescriptor.java b/ddl/out/java/LambdaCube/IR/TextureDescriptor.java index d4d3cdd..1283e48 100644 --- a/ddl/out/java/LambdaCube/IR/TextureDescriptor.java +++ b/ddl/out/java/LambdaCube/IR/TextureDescriptor.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/TextureType.java b/ddl/out/java/LambdaCube/IR/TextureType.java index 2425c1f..c250571 100644 --- a/ddl/out/java/LambdaCube/IR/TextureType.java +++ b/ddl/out/java/LambdaCube/IR/TextureType.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Value.java b/ddl/out/java/LambdaCube/IR/Value.java index 75de175..68dc3c7 100644 --- a/ddl/out/java/LambdaCube/IR/Value.java +++ b/ddl/out/java/LambdaCube/IR/Value.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:51.714241000000Z | 2 | // 2016-03-21T13:14:17.421561000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/Mesh/JSON.java b/ddl/out/java/LambdaCube/Mesh/JSON.java index db0641e..64af069 100644 --- a/ddl/out/java/LambdaCube/Mesh/JSON.java +++ b/ddl/out/java/LambdaCube/Mesh/JSON.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:52.391032000000Z | 2 | // 2016-03-21T13:14:18.184851000000Z |
3 | 3 | ||
4 | package LambdaCube.Mesh; | 4 | package LambdaCube.Mesh; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/Mesh/Mesh.java b/ddl/out/java/LambdaCube/Mesh/Mesh.java index b708db9..1ecb273 100644 --- a/ddl/out/java/LambdaCube/Mesh/Mesh.java +++ b/ddl/out/java/LambdaCube/Mesh/Mesh.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:52.391032000000Z | 2 | // 2016-03-21T13:14:18.184851000000Z |
3 | 3 | ||
4 | package LambdaCube.Mesh; | 4 | package LambdaCube.Mesh; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/Mesh/MeshAttribute.java b/ddl/out/java/LambdaCube/Mesh/MeshAttribute.java index 585138c..b618bda 100644 --- a/ddl/out/java/LambdaCube/Mesh/MeshAttribute.java +++ b/ddl/out/java/LambdaCube/Mesh/MeshAttribute.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:52.391032000000Z | 2 | // 2016-03-21T13:14:18.184851000000Z |
3 | 3 | ||
4 | package LambdaCube.Mesh; | 4 | package LambdaCube.Mesh; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/Mesh/MeshPrimitive.java b/ddl/out/java/LambdaCube/Mesh/MeshPrimitive.java index 8fd3b52..eeaf0f9 100644 --- a/ddl/out/java/LambdaCube/Mesh/MeshPrimitive.java +++ b/ddl/out/java/LambdaCube/Mesh/MeshPrimitive.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:52.391032000000Z | 2 | // 2016-03-21T13:14:18.184851000000Z |
3 | 3 | ||
4 | package LambdaCube.Mesh; | 4 | package LambdaCube.Mesh; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/PipelineSchema/JSON.java b/ddl/out/java/LambdaCube/PipelineSchema/JSON.java index 4303a7f..afc8c0a 100644 --- a/ddl/out/java/LambdaCube/PipelineSchema/JSON.java +++ b/ddl/out/java/LambdaCube/PipelineSchema/JSON.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:52.343859000000Z | 2 | // 2016-03-21T13:14:18.137981000000Z |
3 | 3 | ||
4 | package LambdaCube.PipelineSchema; | 4 | package LambdaCube.PipelineSchema; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/PipelineSchema/ObjectArraySchema.java b/ddl/out/java/LambdaCube/PipelineSchema/ObjectArraySchema.java index ffbcf56..ad34f07 100644 --- a/ddl/out/java/LambdaCube/PipelineSchema/ObjectArraySchema.java +++ b/ddl/out/java/LambdaCube/PipelineSchema/ObjectArraySchema.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:52.343859000000Z | 2 | // 2016-03-21T13:14:18.137981000000Z |
3 | 3 | ||
4 | package LambdaCube.PipelineSchema; | 4 | package LambdaCube.PipelineSchema; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/PipelineSchema/PipelineSchema.java b/ddl/out/java/LambdaCube/PipelineSchema/PipelineSchema.java index a2f22ac..732e212 100644 --- a/ddl/out/java/LambdaCube/PipelineSchema/PipelineSchema.java +++ b/ddl/out/java/LambdaCube/PipelineSchema/PipelineSchema.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:52.343859000000Z | 2 | // 2016-03-21T13:14:18.137981000000Z |
3 | 3 | ||
4 | package LambdaCube.PipelineSchema; | 4 | package LambdaCube.PipelineSchema; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/PipelineSchema/StreamType.java b/ddl/out/java/LambdaCube/PipelineSchema/StreamType.java index 75af8d5..4187857 100644 --- a/ddl/out/java/LambdaCube/PipelineSchema/StreamType.java +++ b/ddl/out/java/LambdaCube/PipelineSchema/StreamType.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:52.343859000000Z | 2 | // 2016-03-21T13:14:18.137981000000Z |
3 | 3 | ||
4 | package LambdaCube.PipelineSchema; | 4 | package LambdaCube.PipelineSchema; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/TypeInfo/CompileResult.java b/ddl/out/java/LambdaCube/TypeInfo/CompileResult.java index 340d92e..58713d9 100644 --- a/ddl/out/java/LambdaCube/TypeInfo/CompileResult.java +++ b/ddl/out/java/LambdaCube/TypeInfo/CompileResult.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:52.460562000000Z | 2 | // 2016-03-21T13:14:18.260874000000Z |
3 | 3 | ||
4 | package LambdaCube.TypeInfo; | 4 | package LambdaCube.TypeInfo; |
5 | 5 | ||
@@ -24,8 +24,9 @@ public class CompileResult { | |||
24 | } | 24 | } |
25 | public class Compiled_ extends CompileResult { | 25 | public class Compiled_ extends CompileResult { |
26 | public String _0; | 26 | public String _0; |
27 | public Pipeline _1; | 27 | public String _1; |
28 | public ArrayList<TypeInfo> _2; | 28 | public Pipeline _2; |
29 | public ArrayList<TypeInfo> _3; | ||
29 | public Compiled_() { tag = CompileResult.Tag.Compiled; } | 30 | public Compiled_() { tag = CompileResult.Tag.Compiled; } |
30 | } | 31 | } |
31 | } | 32 | } |
diff --git a/ddl/out/java/LambdaCube/TypeInfo/JSON.java b/ddl/out/java/LambdaCube/TypeInfo/JSON.java index 410ce3f..9a2fa6c 100644 --- a/ddl/out/java/LambdaCube/TypeInfo/JSON.java +++ b/ddl/out/java/LambdaCube/TypeInfo/JSON.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:52.460562000000Z | 2 | // 2016-03-21T13:14:18.260874000000Z |
3 | 3 | ||
4 | package LambdaCube.TypeInfo; | 4 | package LambdaCube.TypeInfo; |
5 | 5 | ||
@@ -72,8 +72,9 @@ public class JSON { | |||
72 | case "Compiled": { | 72 | case "Compiled": { |
73 | CompileResult.Compiled_ tv = new CompileResult().new Compiled_(); | 73 | CompileResult.Compiled_ tv = new CompileResult().new Compiled_(); |
74 | tv._0 = (String)fromJSON(Type.String,obj.get("arg0")); | 74 | tv._0 = (String)fromJSON(Type.String,obj.get("arg0")); |
75 | tv._1 = (Pipeline)fromJSON(Type.Pipeline,obj.get("arg1")); | 75 | tv._1 = (String)fromJSON(Type.String,obj.get("arg1")); |
76 | tv._2 = (ArrayList<TypeInfo>)fromJSON(Type.Array_TypeInfo,obj.get("arg2")); | 76 | tv._2 = (Pipeline)fromJSON(Type.Pipeline,obj.get("arg2")); |
77 | tv._3 = (ArrayList<TypeInfo>)fromJSON(Type.Array_TypeInfo,obj.get("arg3")); | ||
77 | return tv; | 78 | return tv; |
78 | } | 79 | } |
79 | default: throw new Exception("unknown constructor: " + tag); | 80 | default: throw new Exception("unknown constructor: " + tag); |
diff --git a/ddl/out/java/LambdaCube/TypeInfo/Range.java b/ddl/out/java/LambdaCube/TypeInfo/Range.java index 8bb89d4..901980f 100644 --- a/ddl/out/java/LambdaCube/TypeInfo/Range.java +++ b/ddl/out/java/LambdaCube/TypeInfo/Range.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:52.460562000000Z | 2 | // 2016-03-21T13:14:18.260874000000Z |
3 | 3 | ||
4 | package LambdaCube.TypeInfo; | 4 | package LambdaCube.TypeInfo; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/TypeInfo/TypeInfo.java b/ddl/out/java/LambdaCube/TypeInfo/TypeInfo.java index a134fdb..2998902 100644 --- a/ddl/out/java/LambdaCube/TypeInfo/TypeInfo.java +++ b/ddl/out/java/LambdaCube/TypeInfo/TypeInfo.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:52.460562000000Z | 2 | // 2016-03-21T13:14:18.260874000000Z |
3 | 3 | ||
4 | package LambdaCube.TypeInfo; | 4 | package LambdaCube.TypeInfo; |
5 | 5 | ||
diff --git a/ddl/out/java/TestData/ClientInfo.java b/ddl/out/java/TestData/ClientInfo.java index 667c957..d842f81 100644 --- a/ddl/out/java/TestData/ClientInfo.java +++ b/ddl/out/java/TestData/ClientInfo.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:52.508392000000Z | 2 | // 2016-03-21T13:14:18.341517000000Z |
3 | 3 | ||
4 | package TestData; | 4 | package TestData; |
5 | 5 | ||
diff --git a/ddl/out/java/TestData/Frame.java b/ddl/out/java/TestData/Frame.java index 39db4a4..af71eda 100644 --- a/ddl/out/java/TestData/Frame.java +++ b/ddl/out/java/TestData/Frame.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:52.508392000000Z | 2 | // 2016-03-21T13:14:18.341517000000Z |
3 | 3 | ||
4 | package TestData; | 4 | package TestData; |
5 | 5 | ||
diff --git a/ddl/out/java/TestData/FrameResult.java b/ddl/out/java/TestData/FrameResult.java index e1e51db..d21d8c9 100644 --- a/ddl/out/java/TestData/FrameResult.java +++ b/ddl/out/java/TestData/FrameResult.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:52.508392000000Z | 2 | // 2016-03-21T13:14:18.341517000000Z |
3 | 3 | ||
4 | package TestData; | 4 | package TestData; |
5 | 5 | ||
diff --git a/ddl/out/java/TestData/JSON.java b/ddl/out/java/TestData/JSON.java index 4fbe47e..7f3e27c 100644 --- a/ddl/out/java/TestData/JSON.java +++ b/ddl/out/java/TestData/JSON.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:52.508392000000Z | 2 | // 2016-03-21T13:14:18.341517000000Z |
3 | 3 | ||
4 | package TestData; | 4 | package TestData; |
5 | 5 | ||
diff --git a/ddl/out/java/TestData/PipelineInfo.java b/ddl/out/java/TestData/PipelineInfo.java index 6171080..92dea76 100644 --- a/ddl/out/java/TestData/PipelineInfo.java +++ b/ddl/out/java/TestData/PipelineInfo.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:52.508392000000Z | 2 | // 2016-03-21T13:14:18.341517000000Z |
3 | 3 | ||
4 | package TestData; | 4 | package TestData; |
5 | 5 | ||
diff --git a/ddl/out/java/TestData/RenderJob.java b/ddl/out/java/TestData/RenderJob.java index 523cf47..3152459 100644 --- a/ddl/out/java/TestData/RenderJob.java +++ b/ddl/out/java/TestData/RenderJob.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:52.508392000000Z | 2 | // 2016-03-21T13:14:18.341517000000Z |
3 | 3 | ||
4 | package TestData; | 4 | package TestData; |
5 | 5 | ||
diff --git a/ddl/out/java/TestData/RenderJobResult.java b/ddl/out/java/TestData/RenderJobResult.java index 8a55fca..346b609 100644 --- a/ddl/out/java/TestData/RenderJobResult.java +++ b/ddl/out/java/TestData/RenderJobResult.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:52.508392000000Z | 2 | // 2016-03-21T13:14:18.341517000000Z |
3 | 3 | ||
4 | package TestData; | 4 | package TestData; |
5 | 5 | ||
diff --git a/ddl/out/java/TestData/Scene.java b/ddl/out/java/TestData/Scene.java index ef60dde..57d1e0b 100644 --- a/ddl/out/java/TestData/Scene.java +++ b/ddl/out/java/TestData/Scene.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T11:41:52.508392000000Z | 2 | // 2016-03-21T13:14:18.341517000000Z |
3 | 3 | ||
4 | package TestData; | 4 | package TestData; |
5 | 5 | ||