diff options
author | Csaba Hruska <csaba.hruska@gmail.com> | 2016-03-21 14:11:09 +0100 |
---|---|---|
committer | Csaba Hruska <csaba.hruska@gmail.com> | 2016-03-21 14:14:04 +0100 |
commit | 10de287e9fdbdcae58048cc386416a4e72a5199b (patch) | |
tree | a4090ea5ca7e7996a60b60104ed35670d26695ed | |
parent | d022971b99be214c71429d58f97f85b13e33a426 (diff) |
improve java json
31 files changed, 122 insertions, 0 deletions
diff --git a/ddl/out/LambdaCube.IR.cpp b/ddl/out/LambdaCube.IR.cpp index 113f827..f4bc067 100644 --- a/ddl/out/LambdaCube.IR.cpp +++ b/ddl/out/LambdaCube.IR.cpp | |||
@@ -1,4 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | // 2016-03-21T11:36:00.283777000000Z | 14 | // 2016-03-21T11:36:00.283777000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | // 2016-03-21T11:41:51.714241000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | #include "LambdaCube.IR.hpp" | 20 | #include "LambdaCube.IR.hpp" |
17 | template<> json toJSON<std::shared_ptr<ArrayValue>>(std::shared_ptr<ArrayValue> &v) { | 21 | 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 5863ad9..5b0827c 100644 --- a/ddl/out/LambdaCube.IR.hpp +++ b/ddl/out/LambdaCube.IR.hpp | |||
@@ -1,4 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | // 2016-03-21T11:36:00.283777000000Z | 14 | // 2016-03-21T11:36:00.283777000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | // 2016-03-21T11:41:51.714241000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | #ifndef HEADER_LambdaCube.IR_H | 20 | #ifndef HEADER_LambdaCube.IR_H |
17 | #define HEADER_LambdaCube.IR_H | 21 | #define HEADER_LambdaCube.IR_H |
diff --git a/ddl/out/LambdaCube.IR.hs b/ddl/out/LambdaCube.IR.hs index 66b89f4..d676f29 100644 --- a/ddl/out/LambdaCube.IR.hs +++ b/ddl/out/LambdaCube.IR.hs | |||
@@ -1,4 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | -- 2016-03-21T11:36:00.283777000000Z | 14 | -- 2016-03-21T11:36:00.283777000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | -- 2016-03-21T11:41:51.714241000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} | 20 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} |
17 | module LambdaCube.IR where | 21 | module LambdaCube.IR where |
diff --git a/ddl/out/LambdaCube.IR.purs b/ddl/out/LambdaCube.IR.purs index 10c7a56..97c76bd 100644 --- a/ddl/out/LambdaCube.IR.purs +++ b/ddl/out/LambdaCube.IR.purs | |||
@@ -1,4 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | -- 2016-03-21T11:36:00.283777000000Z | 14 | -- 2016-03-21T11:36:00.283777000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | -- 2016-03-21T11:41:51.714241000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | module LambdaCube.IR where | 20 | module LambdaCube.IR where |
17 | import Prelude | 21 | import Prelude |
diff --git a/ddl/out/LambdaCube.IR.swift b/ddl/out/LambdaCube.IR.swift index 873d8e8..5c81d4b 100644 --- a/ddl/out/LambdaCube.IR.swift +++ b/ddl/out/LambdaCube.IR.swift | |||
@@ -1,4 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | // 2016-03-21T11:36:00.283777000000Z | 14 | // 2016-03-21T11:36:00.283777000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | // 2016-03-21T11:41:51.714241000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | typealias StreamName = Int | 20 | typealias StreamName = Int |
17 | 21 | ||
diff --git a/ddl/out/LambdaCube.IR2.hpp b/ddl/out/LambdaCube.IR2.hpp index dd26830..0fc1736 100644 --- a/ddl/out/LambdaCube.IR2.hpp +++ b/ddl/out/LambdaCube.IR2.hpp | |||
@@ -1,4 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | // 2016-03-21T11:36:00.283777000000Z | 14 | // 2016-03-21T11:36:00.283777000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | // 2016-03-21T11:41:51.714241000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | #ifndef HEADER_LambdaCube.IR_H | 20 | #ifndef HEADER_LambdaCube.IR_H |
17 | #define HEADER_LambdaCube.IR_H | 21 | #define HEADER_LambdaCube.IR_H |
diff --git a/ddl/out/LambdaCube.Mesh.cpp b/ddl/out/LambdaCube.Mesh.cpp index 845142a..b0950ee 100644 --- a/ddl/out/LambdaCube.Mesh.cpp +++ b/ddl/out/LambdaCube.Mesh.cpp | |||
@@ -1,4 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | // 2016-03-21T11:36:01.121658000000Z | 14 | // 2016-03-21T11:36:01.121658000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | // 2016-03-21T11:41:52.391032000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | #include "LambdaCube.Mesh.hpp" | 20 | #include "LambdaCube.Mesh.hpp" |
17 | template<> json toJSON<std::shared_ptr<MeshAttribute>>(std::shared_ptr<MeshAttribute> &v) { | 21 | 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 e1500bc..808642c 100644 --- a/ddl/out/LambdaCube.Mesh.hpp +++ b/ddl/out/LambdaCube.Mesh.hpp | |||
@@ -1,4 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | // 2016-03-21T11:36:01.121658000000Z | 14 | // 2016-03-21T11:36:01.121658000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | // 2016-03-21T11:41:52.391032000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | #ifndef HEADER_LambdaCube.Mesh_H | 20 | #ifndef HEADER_LambdaCube.Mesh_H |
17 | #define HEADER_LambdaCube.Mesh_H | 21 | #define HEADER_LambdaCube.Mesh_H |
diff --git a/ddl/out/LambdaCube.Mesh.hs b/ddl/out/LambdaCube.Mesh.hs index 880af52..27b0462 100644 --- a/ddl/out/LambdaCube.Mesh.hs +++ b/ddl/out/LambdaCube.Mesh.hs | |||
@@ -1,4 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | -- 2016-03-21T11:36:01.121658000000Z | 14 | -- 2016-03-21T11:36:01.121658000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | -- 2016-03-21T11:41:52.391032000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} | 20 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} |
17 | module LambdaCube.Mesh where | 21 | module LambdaCube.Mesh where |
diff --git a/ddl/out/LambdaCube.Mesh.purs b/ddl/out/LambdaCube.Mesh.purs index 3c46962..6f90887 100644 --- a/ddl/out/LambdaCube.Mesh.purs +++ b/ddl/out/LambdaCube.Mesh.purs | |||
@@ -1,4 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | -- 2016-03-21T11:36:01.121658000000Z | 14 | -- 2016-03-21T11:36:01.121658000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | -- 2016-03-21T11:41:52.391032000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | module LambdaCube.Mesh where | 20 | module LambdaCube.Mesh where |
17 | import Prelude | 21 | import Prelude |
diff --git a/ddl/out/LambdaCube.Mesh.swift b/ddl/out/LambdaCube.Mesh.swift index b74ddf0..a5cfba9 100644 --- a/ddl/out/LambdaCube.Mesh.swift +++ b/ddl/out/LambdaCube.Mesh.swift | |||
@@ -1,4 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | // 2016-03-21T11:36:01.121658000000Z | 14 | // 2016-03-21T11:36:01.121658000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | // 2016-03-21T11:41:52.391032000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | enum MeshAttribute { | 20 | enum MeshAttribute { |
17 | case A_Float(Array<Float>) | 21 | case A_Float(Array<Float>) |
diff --git a/ddl/out/LambdaCube.Mesh2.hpp b/ddl/out/LambdaCube.Mesh2.hpp index 75f1b67..6a8957d 100644 --- a/ddl/out/LambdaCube.Mesh2.hpp +++ b/ddl/out/LambdaCube.Mesh2.hpp | |||
@@ -1,4 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | // 2016-03-21T11:36:01.121658000000Z | 14 | // 2016-03-21T11:36:01.121658000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | // 2016-03-21T11:41:52.391032000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | #ifndef HEADER_LambdaCube.Mesh_H | 20 | #ifndef HEADER_LambdaCube.Mesh_H |
17 | #define HEADER_LambdaCube.Mesh_H | 21 | #define HEADER_LambdaCube.Mesh_H |
diff --git a/ddl/out/LambdaCube.PipelineSchema.cpp b/ddl/out/LambdaCube.PipelineSchema.cpp index 4ec50ce..45e4dce 100644 --- a/ddl/out/LambdaCube.PipelineSchema.cpp +++ b/ddl/out/LambdaCube.PipelineSchema.cpp | |||
@@ -1,4 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | // 2016-03-21T11:36:01.075399000000Z | 14 | // 2016-03-21T11:36:01.075399000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | // 2016-03-21T11:41:52.343859000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | #include "LambdaCube.PipelineSchema.hpp" | 20 | #include "LambdaCube.PipelineSchema.hpp" |
17 | template<> json toJSON<std::shared_ptr<StreamType>>(std::shared_ptr<StreamType> &v) { | 21 | 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 68e68d3..a69994c 100644 --- a/ddl/out/LambdaCube.PipelineSchema.hpp +++ b/ddl/out/LambdaCube.PipelineSchema.hpp | |||
@@ -1,4 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | // 2016-03-21T11:36:01.075399000000Z | 14 | // 2016-03-21T11:36:01.075399000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | // 2016-03-21T11:41:52.343859000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | #ifndef HEADER_LambdaCube.PipelineSchema_H | 20 | #ifndef HEADER_LambdaCube.PipelineSchema_H |
17 | #define HEADER_LambdaCube.PipelineSchema_H | 21 | #define HEADER_LambdaCube.PipelineSchema_H |
diff --git a/ddl/out/LambdaCube.PipelineSchema.hs b/ddl/out/LambdaCube.PipelineSchema.hs index e4dd8c9..01846c7 100644 --- a/ddl/out/LambdaCube.PipelineSchema.hs +++ b/ddl/out/LambdaCube.PipelineSchema.hs | |||
@@ -1,4 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | -- 2016-03-21T11:36:01.075399000000Z | 14 | -- 2016-03-21T11:36:01.075399000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | -- 2016-03-21T11:41:52.343859000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} | 20 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} |
17 | module LambdaCube.PipelineSchema where | 21 | module LambdaCube.PipelineSchema where |
diff --git a/ddl/out/LambdaCube.PipelineSchema.purs b/ddl/out/LambdaCube.PipelineSchema.purs index 581515f..23c0762 100644 --- a/ddl/out/LambdaCube.PipelineSchema.purs +++ b/ddl/out/LambdaCube.PipelineSchema.purs | |||
@@ -1,4 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | -- 2016-03-21T11:36:01.075399000000Z | 14 | -- 2016-03-21T11:36:01.075399000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | -- 2016-03-21T11:41:52.343859000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | module LambdaCube.PipelineSchema where | 20 | module LambdaCube.PipelineSchema where |
17 | import Prelude | 21 | import Prelude |
diff --git a/ddl/out/LambdaCube.PipelineSchema.swift b/ddl/out/LambdaCube.PipelineSchema.swift index 2267581..1fa6189 100644 --- a/ddl/out/LambdaCube.PipelineSchema.swift +++ b/ddl/out/LambdaCube.PipelineSchema.swift | |||
@@ -1,4 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | // 2016-03-21T11:36:01.075399000000Z | 14 | // 2016-03-21T11:36:01.075399000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | // 2016-03-21T11:41:52.343859000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | enum StreamType { | 20 | enum StreamType { |
17 | case Attribute_Word | 21 | case Attribute_Word |
diff --git a/ddl/out/LambdaCube.PipelineSchema2.hpp b/ddl/out/LambdaCube.PipelineSchema2.hpp index 18a0d09..ac12eb0 100644 --- a/ddl/out/LambdaCube.PipelineSchema2.hpp +++ b/ddl/out/LambdaCube.PipelineSchema2.hpp | |||
@@ -1,4 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | // 2016-03-21T11:36:01.075399000000Z | 14 | // 2016-03-21T11:36:01.075399000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | // 2016-03-21T11:41:52.343859000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | #ifndef HEADER_LambdaCube.PipelineSchema_H | 20 | #ifndef HEADER_LambdaCube.PipelineSchema_H |
17 | #define HEADER_LambdaCube.PipelineSchema_H | 21 | #define HEADER_LambdaCube.PipelineSchema_H |
diff --git a/ddl/out/LambdaCube.TypeInfo.cpp b/ddl/out/LambdaCube.TypeInfo.cpp index cc5979f..26e3ef7 100644 --- a/ddl/out/LambdaCube.TypeInfo.cpp +++ b/ddl/out/LambdaCube.TypeInfo.cpp | |||
@@ -1,4 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | // 2016-03-21T11:36:01.199696000000Z | 14 | // 2016-03-21T11:36:01.199696000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | // 2016-03-21T11:41:52.460562000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | #include "LambdaCube.TypeInfo.hpp" | 20 | #include "LambdaCube.TypeInfo.hpp" |
17 | template<> json toJSON<std::shared_ptr<Range>>(std::shared_ptr<Range> &v) { | 21 | template<> json toJSON<std::shared_ptr<Range>>(std::shared_ptr<Range> &v) { |
diff --git a/ddl/out/LambdaCube.TypeInfo.hpp b/ddl/out/LambdaCube.TypeInfo.hpp index 78f46f0..56b3d78 100644 --- a/ddl/out/LambdaCube.TypeInfo.hpp +++ b/ddl/out/LambdaCube.TypeInfo.hpp | |||
@@ -1,4 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | // 2016-03-21T11:36:01.199696000000Z | 14 | // 2016-03-21T11:36:01.199696000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | // 2016-03-21T11:41:52.460562000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | #ifndef HEADER_LambdaCube.TypeInfo_H | 20 | #ifndef HEADER_LambdaCube.TypeInfo_H |
17 | #define HEADER_LambdaCube.TypeInfo_H | 21 | #define HEADER_LambdaCube.TypeInfo_H |
diff --git a/ddl/out/LambdaCube.TypeInfo.hs b/ddl/out/LambdaCube.TypeInfo.hs index 7e1666e..b9b07a3 100644 --- a/ddl/out/LambdaCube.TypeInfo.hs +++ b/ddl/out/LambdaCube.TypeInfo.hs | |||
@@ -1,4 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | -- 2016-03-21T11:36:01.199696000000Z | 14 | -- 2016-03-21T11:36:01.199696000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | -- 2016-03-21T11:41:52.460562000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} | 20 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} |
17 | module LambdaCube.TypeInfo where | 21 | module LambdaCube.TypeInfo where |
diff --git a/ddl/out/LambdaCube.TypeInfo.purs b/ddl/out/LambdaCube.TypeInfo.purs index 9899da8..1871220 100644 --- a/ddl/out/LambdaCube.TypeInfo.purs +++ b/ddl/out/LambdaCube.TypeInfo.purs | |||
@@ -1,4 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | -- 2016-03-21T11:36:01.199696000000Z | 14 | -- 2016-03-21T11:36:01.199696000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | -- 2016-03-21T11:41:52.460562000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | module LambdaCube.TypeInfo where | 20 | module LambdaCube.TypeInfo where |
17 | import Prelude | 21 | import Prelude |
diff --git a/ddl/out/LambdaCube.TypeInfo.swift b/ddl/out/LambdaCube.TypeInfo.swift index 1172492..27ccdc7 100644 --- a/ddl/out/LambdaCube.TypeInfo.swift +++ b/ddl/out/LambdaCube.TypeInfo.swift | |||
@@ -1,4 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | // 2016-03-21T11:36:01.199696000000Z | 14 | // 2016-03-21T11:36:01.199696000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | // 2016-03-21T11:41:52.460562000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | enum Range { | 20 | enum Range { |
17 | case Range(Range_Data) | 21 | case Range(Range_Data) |
diff --git a/ddl/out/LambdaCube.TypeInfo2.hpp b/ddl/out/LambdaCube.TypeInfo2.hpp index 8a0c15f..4672107 100644 --- a/ddl/out/LambdaCube.TypeInfo2.hpp +++ b/ddl/out/LambdaCube.TypeInfo2.hpp | |||
@@ -1,4 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | // 2016-03-21T11:36:01.199696000000Z | 14 | // 2016-03-21T11:36:01.199696000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | // 2016-03-21T11:41:52.460562000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | #ifndef HEADER_LambdaCube.TypeInfo_H | 20 | #ifndef HEADER_LambdaCube.TypeInfo_H |
17 | #define HEADER_LambdaCube.TypeInfo_H | 21 | #define HEADER_LambdaCube.TypeInfo_H |
diff --git a/ddl/out/TestData.cpp b/ddl/out/TestData.cpp index 3b97f6b..d6a1497 100644 --- a/ddl/out/TestData.cpp +++ b/ddl/out/TestData.cpp | |||
@@ -1,4 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | // 2016-03-21T11:36:01.244766000000Z | 14 | // 2016-03-21T11:36:01.244766000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | // 2016-03-21T11:41:52.508392000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | #include "TestData.hpp" | 20 | #include "TestData.hpp" |
17 | template<> json toJSON<std::shared_ptr<ClientInfo>>(std::shared_ptr<ClientInfo> &v) { | 21 | 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 a0f48b8..cc11915 100644 --- a/ddl/out/TestData.hpp +++ b/ddl/out/TestData.hpp | |||
@@ -1,4 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | // 2016-03-21T11:36:01.244766000000Z | 14 | // 2016-03-21T11:36:01.244766000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | // 2016-03-21T11:41:52.508392000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | #ifndef HEADER_TestData_H | 20 | #ifndef HEADER_TestData_H |
17 | #define HEADER_TestData_H | 21 | #define HEADER_TestData_H |
diff --git a/ddl/out/TestData.hs b/ddl/out/TestData.hs index 96d680e..8b1fb9f 100644 --- a/ddl/out/TestData.hs +++ b/ddl/out/TestData.hs | |||
@@ -1,4 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | -- 2016-03-21T11:36:01.244766000000Z | 14 | -- 2016-03-21T11:36:01.244766000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | -- 2016-03-21T11:41:52.508392000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} | 20 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} |
17 | module TestData where | 21 | module TestData where |
diff --git a/ddl/out/TestData.purs b/ddl/out/TestData.purs index acbd856..5a3b7c6 100644 --- a/ddl/out/TestData.purs +++ b/ddl/out/TestData.purs | |||
@@ -1,4 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | -- 2016-03-21T11:36:01.244766000000Z | 14 | -- 2016-03-21T11:36:01.244766000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | -- 2016-03-21T11:41:52.508392000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | module TestData where | 20 | module TestData where |
17 | import Prelude | 21 | import Prelude |
diff --git a/ddl/out/TestData.swift b/ddl/out/TestData.swift index 15ea32f..be520e2 100644 --- a/ddl/out/TestData.swift +++ b/ddl/out/TestData.swift | |||
@@ -1,4 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | // 2016-03-21T11:36:01.244766000000Z | 14 | // 2016-03-21T11:36:01.244766000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | // 2016-03-21T11:41:52.508392000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | enum ClientInfo { | 20 | enum ClientInfo { |
17 | case ClientInfo(ClientInfo_Data) | 21 | case ClientInfo(ClientInfo_Data) |
diff --git a/ddl/out/TestData2.hpp b/ddl/out/TestData2.hpp index b70752a..0643d3b 100644 --- a/ddl/out/TestData2.hpp +++ b/ddl/out/TestData2.hpp | |||
@@ -1,4 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
@@ -12,6 +13,9 @@ | |||
12 | ======= | 13 | ======= |
13 | // 2016-03-21T11:36:01.244766000000Z | 14 | // 2016-03-21T11:36:01.244766000000Z |
14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
16 | ======= | ||
17 | // 2016-03-21T11:41:52.508392000000Z | ||
18 | >>>>>>> improve java json | ||
15 | 19 | ||
16 | #ifndef HEADER_TestData_H | 20 | #ifndef HEADER_TestData_H |
17 | #define HEADER_TestData_H | 21 | #define HEADER_TestData_H |
diff --git a/ddl/templates/json.java.ede b/ddl/templates/json.java.ede index 35bbfd7..cf09533 100644 --- a/ddl/templates/json.java.ede +++ b/ddl/templates/json.java.ede | |||
@@ -87,7 +87,9 @@ public class JSON { | |||
87 | case {{ t.value.dataName }}: { | 87 | case {{ t.value.dataName }}: { |
88 | JSONObject obj = (JSONObject)rawObj; | 88 | JSONObject obj = (JSONObject)rawObj; |
89 | String tag = obj.getString("tag"); | 89 | String tag = obj.getString("tag"); |
90 | {% if t.value | hasEnumConstructor %} | ||
90 | {{ t.value.dataName }}.Tag tagType; | 91 | {{ t.value.dataName }}.Tag tagType; |
92 | {% endif %} | ||
91 | switch (tag) { | 93 | switch (tag) { |
92 | {% for c in t.value.constructors %} | 94 | {% for c in t.value.constructors %} |
93 | case "{{ c.value.name }}":{% if (c.value.fields | empty) %} tagType = {{ t.value.dataName }}.Tag.{{ c.value.name }}; break; | 95 | case "{{ c.value.name }}":{% if (c.value.fields | empty) %} tagType = {{ t.value.dataName }}.Tag.{{ c.value.name }}; break; |