summaryrefslogtreecommitdiff
path: root/ddl/out
diff options
context:
space:
mode:
Diffstat (limited to 'ddl/out')
-rw-r--r--ddl/out/LambdaCube.IR.cpp4
-rw-r--r--ddl/out/LambdaCube.IR.hpp4
-rw-r--r--ddl/out/LambdaCube.IR.hs4
-rw-r--r--ddl/out/LambdaCube.IR.purs4
-rw-r--r--ddl/out/LambdaCube.IR.swift4
-rw-r--r--ddl/out/LambdaCube.IR2.hpp4
-rw-r--r--ddl/out/LambdaCube.Mesh.cpp4
-rw-r--r--ddl/out/LambdaCube.Mesh.hpp4
-rw-r--r--ddl/out/LambdaCube.Mesh.hs4
-rw-r--r--ddl/out/LambdaCube.Mesh.purs4
-rw-r--r--ddl/out/LambdaCube.Mesh.swift4
-rw-r--r--ddl/out/LambdaCube.Mesh2.hpp4
-rw-r--r--ddl/out/LambdaCube.PipelineSchema.cpp4
-rw-r--r--ddl/out/LambdaCube.PipelineSchema.hpp4
-rw-r--r--ddl/out/LambdaCube.PipelineSchema.hs4
-rw-r--r--ddl/out/LambdaCube.PipelineSchema.purs4
-rw-r--r--ddl/out/LambdaCube.PipelineSchema.swift4
-rw-r--r--ddl/out/LambdaCube.PipelineSchema2.hpp4
-rw-r--r--ddl/out/LambdaCube.TypeInfo.cpp4
-rw-r--r--ddl/out/LambdaCube.TypeInfo.hpp4
-rw-r--r--ddl/out/LambdaCube.TypeInfo.hs4
-rw-r--r--ddl/out/LambdaCube.TypeInfo.purs4
-rw-r--r--ddl/out/LambdaCube.TypeInfo.swift4
-rw-r--r--ddl/out/LambdaCube.TypeInfo2.hpp4
-rw-r--r--ddl/out/TestData.cpp4
-rw-r--r--ddl/out/TestData.hpp4
-rw-r--r--ddl/out/TestData.hs4
-rw-r--r--ddl/out/TestData.purs4
-rw-r--r--ddl/out/TestData.swift4
-rw-r--r--ddl/out/TestData2.hpp4
30 files changed, 120 insertions, 0 deletions
diff --git a/ddl/out/LambdaCube.IR.cpp b/ddl/out/LambdaCube.IR.cpp
index 6e0691b..113f827 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4// 2016-03-01T13:00:40.426854000000Z 5// 2016-03-01T13:00:40.426854000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9// 2016-03-20T22:19:42.844053000000Z 10// 2016-03-20T22:19:42.844053000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13// 2016-03-21T11:36:00.283777000000Z
14>>>>>>> work on java json loader
11 15
12#include "LambdaCube.IR.hpp" 16#include "LambdaCube.IR.hpp"
13template<> json toJSON<std::shared_ptr<ArrayValue>>(std::shared_ptr<ArrayValue> &v) { 17template<> 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 2fea261..5863ad9 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4// 2016-03-01T13:00:40.426854000000Z 5// 2016-03-01T13:00:40.426854000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9// 2016-03-20T22:19:42.844053000000Z 10// 2016-03-20T22:19:42.844053000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13// 2016-03-21T11:36:00.283777000000Z
14>>>>>>> work on java json loader
11 15
12#ifndef HEADER_LambdaCube.IR_H 16#ifndef HEADER_LambdaCube.IR_H
13#define HEADER_LambdaCube.IR_H 17#define HEADER_LambdaCube.IR_H
diff --git a/ddl/out/LambdaCube.IR.hs b/ddl/out/LambdaCube.IR.hs
index 75104bc..66b89f4 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4-- 2016-03-01T13:00:40.426854000000Z 5-- 2016-03-01T13:00:40.426854000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9-- 2016-03-20T22:19:42.844053000000Z 10-- 2016-03-20T22:19:42.844053000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13-- 2016-03-21T11:36:00.283777000000Z
14>>>>>>> work on java json loader
11 15
12{-# LANGUAGE OverloadedStrings, RecordWildCards #-} 16{-# LANGUAGE OverloadedStrings, RecordWildCards #-}
13module LambdaCube.IR where 17module LambdaCube.IR where
diff --git a/ddl/out/LambdaCube.IR.purs b/ddl/out/LambdaCube.IR.purs
index 8c2a2ab..10c7a56 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4-- 2016-03-01T13:00:40.426854000000Z 5-- 2016-03-01T13:00:40.426854000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9-- 2016-03-20T22:19:42.844053000000Z 10-- 2016-03-20T22:19:42.844053000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13-- 2016-03-21T11:36:00.283777000000Z
14>>>>>>> work on java json loader
11 15
12module LambdaCube.IR where 16module LambdaCube.IR where
13import Prelude 17import Prelude
diff --git a/ddl/out/LambdaCube.IR.swift b/ddl/out/LambdaCube.IR.swift
index cef6db2..873d8e8 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4// 2016-03-01T13:00:40.426854000000Z 5// 2016-03-01T13:00:40.426854000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9// 2016-03-20T22:19:42.844053000000Z 10// 2016-03-20T22:19:42.844053000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13// 2016-03-21T11:36:00.283777000000Z
14>>>>>>> work on java json loader
11 15
12typealias StreamName = Int 16typealias StreamName = Int
13 17
diff --git a/ddl/out/LambdaCube.IR2.hpp b/ddl/out/LambdaCube.IR2.hpp
index 5a0e965..dd26830 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4// 2016-03-01T13:00:40.426854000000Z 5// 2016-03-01T13:00:40.426854000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9// 2016-03-20T22:19:42.844053000000Z 10// 2016-03-20T22:19:42.844053000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13// 2016-03-21T11:36:00.283777000000Z
14>>>>>>> work on java json loader
11 15
12#ifndef HEADER_LambdaCube.IR_H 16#ifndef HEADER_LambdaCube.IR_H
13#define HEADER_LambdaCube.IR_H 17#define HEADER_LambdaCube.IR_H
diff --git a/ddl/out/LambdaCube.Mesh.cpp b/ddl/out/LambdaCube.Mesh.cpp
index 82b2723..845142a 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4// 2016-03-01T13:00:40.781208000000Z 5// 2016-03-01T13:00:40.781208000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9// 2016-03-20T22:19:43.568791000000Z 10// 2016-03-20T22:19:43.568791000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13// 2016-03-21T11:36:01.121658000000Z
14>>>>>>> work on java json loader
11 15
12#include "LambdaCube.Mesh.hpp" 16#include "LambdaCube.Mesh.hpp"
13template<> json toJSON<std::shared_ptr<MeshAttribute>>(std::shared_ptr<MeshAttribute> &v) { 17template<> 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 0bc2920..e1500bc 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4// 2016-03-01T13:00:40.781208000000Z 5// 2016-03-01T13:00:40.781208000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9// 2016-03-20T22:19:43.568791000000Z 10// 2016-03-20T22:19:43.568791000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13// 2016-03-21T11:36:01.121658000000Z
14>>>>>>> work on java json loader
11 15
12#ifndef HEADER_LambdaCube.Mesh_H 16#ifndef HEADER_LambdaCube.Mesh_H
13#define HEADER_LambdaCube.Mesh_H 17#define HEADER_LambdaCube.Mesh_H
diff --git a/ddl/out/LambdaCube.Mesh.hs b/ddl/out/LambdaCube.Mesh.hs
index 194cc46..880af52 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4-- 2016-03-01T13:00:40.781208000000Z 5-- 2016-03-01T13:00:40.781208000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9-- 2016-03-20T22:19:43.568791000000Z 10-- 2016-03-20T22:19:43.568791000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13-- 2016-03-21T11:36:01.121658000000Z
14>>>>>>> work on java json loader
11 15
12{-# LANGUAGE OverloadedStrings, RecordWildCards #-} 16{-# LANGUAGE OverloadedStrings, RecordWildCards #-}
13module LambdaCube.Mesh where 17module LambdaCube.Mesh where
diff --git a/ddl/out/LambdaCube.Mesh.purs b/ddl/out/LambdaCube.Mesh.purs
index 349ffef..3c46962 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4-- 2016-03-01T13:00:40.781208000000Z 5-- 2016-03-01T13:00:40.781208000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9-- 2016-03-20T22:19:43.568791000000Z 10-- 2016-03-20T22:19:43.568791000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13-- 2016-03-21T11:36:01.121658000000Z
14>>>>>>> work on java json loader
11 15
12module LambdaCube.Mesh where 16module LambdaCube.Mesh where
13import Prelude 17import Prelude
diff --git a/ddl/out/LambdaCube.Mesh.swift b/ddl/out/LambdaCube.Mesh.swift
index d1f3677..b74ddf0 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4// 2016-03-01T13:00:40.781208000000Z 5// 2016-03-01T13:00:40.781208000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9// 2016-03-20T22:19:43.568791000000Z 10// 2016-03-20T22:19:43.568791000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13// 2016-03-21T11:36:01.121658000000Z
14>>>>>>> work on java json loader
11 15
12enum MeshAttribute { 16enum MeshAttribute {
13 case A_Float(Array<Float>) 17 case A_Float(Array<Float>)
diff --git a/ddl/out/LambdaCube.Mesh2.hpp b/ddl/out/LambdaCube.Mesh2.hpp
index c6312f3..75f1b67 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4// 2016-03-01T13:00:40.781208000000Z 5// 2016-03-01T13:00:40.781208000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9// 2016-03-20T22:19:43.568791000000Z 10// 2016-03-20T22:19:43.568791000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13// 2016-03-21T11:36:01.121658000000Z
14>>>>>>> work on java json loader
11 15
12#ifndef HEADER_LambdaCube.Mesh_H 16#ifndef HEADER_LambdaCube.Mesh_H
13#define HEADER_LambdaCube.Mesh_H 17#define HEADER_LambdaCube.Mesh_H
diff --git a/ddl/out/LambdaCube.PipelineSchema.cpp b/ddl/out/LambdaCube.PipelineSchema.cpp
index fec1b1f..4ec50ce 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4// 2016-03-01T13:00:40.761274000000Z 5// 2016-03-01T13:00:40.761274000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9// 2016-03-20T22:19:43.498688000000Z 10// 2016-03-20T22:19:43.498688000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13// 2016-03-21T11:36:01.075399000000Z
14>>>>>>> work on java json loader
11 15
12#include "LambdaCube.PipelineSchema.hpp" 16#include "LambdaCube.PipelineSchema.hpp"
13template<> json toJSON<std::shared_ptr<StreamType>>(std::shared_ptr<StreamType> &v) { 17template<> 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 63be6ea..68e68d3 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4// 2016-03-01T13:00:40.761274000000Z 5// 2016-03-01T13:00:40.761274000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9// 2016-03-20T22:19:43.498688000000Z 10// 2016-03-20T22:19:43.498688000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13// 2016-03-21T11:36:01.075399000000Z
14>>>>>>> work on java json loader
11 15
12#ifndef HEADER_LambdaCube.PipelineSchema_H 16#ifndef HEADER_LambdaCube.PipelineSchema_H
13#define HEADER_LambdaCube.PipelineSchema_H 17#define HEADER_LambdaCube.PipelineSchema_H
diff --git a/ddl/out/LambdaCube.PipelineSchema.hs b/ddl/out/LambdaCube.PipelineSchema.hs
index c875895..e4dd8c9 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4-- 2016-03-01T13:00:40.761274000000Z 5-- 2016-03-01T13:00:40.761274000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9-- 2016-03-20T22:19:43.498688000000Z 10-- 2016-03-20T22:19:43.498688000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13-- 2016-03-21T11:36:01.075399000000Z
14>>>>>>> work on java json loader
11 15
12{-# LANGUAGE OverloadedStrings, RecordWildCards #-} 16{-# LANGUAGE OverloadedStrings, RecordWildCards #-}
13module LambdaCube.PipelineSchema where 17module LambdaCube.PipelineSchema where
diff --git a/ddl/out/LambdaCube.PipelineSchema.purs b/ddl/out/LambdaCube.PipelineSchema.purs
index 4db9ac3..581515f 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4-- 2016-03-01T13:00:40.761274000000Z 5-- 2016-03-01T13:00:40.761274000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9-- 2016-03-20T22:19:43.498688000000Z 10-- 2016-03-20T22:19:43.498688000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13-- 2016-03-21T11:36:01.075399000000Z
14>>>>>>> work on java json loader
11 15
12module LambdaCube.PipelineSchema where 16module LambdaCube.PipelineSchema where
13import Prelude 17import Prelude
diff --git a/ddl/out/LambdaCube.PipelineSchema.swift b/ddl/out/LambdaCube.PipelineSchema.swift
index 617e076..2267581 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4// 2016-03-01T13:00:40.761274000000Z 5// 2016-03-01T13:00:40.761274000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9// 2016-03-20T22:19:43.498688000000Z 10// 2016-03-20T22:19:43.498688000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13// 2016-03-21T11:36:01.075399000000Z
14>>>>>>> work on java json loader
11 15
12enum StreamType { 16enum StreamType {
13 case Attribute_Word 17 case Attribute_Word
diff --git a/ddl/out/LambdaCube.PipelineSchema2.hpp b/ddl/out/LambdaCube.PipelineSchema2.hpp
index 4ce32da..18a0d09 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4// 2016-03-01T13:00:40.761274000000Z 5// 2016-03-01T13:00:40.761274000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9// 2016-03-20T22:19:43.498688000000Z 10// 2016-03-20T22:19:43.498688000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13// 2016-03-21T11:36:01.075399000000Z
14>>>>>>> work on java json loader
11 15
12#ifndef HEADER_LambdaCube.PipelineSchema_H 16#ifndef HEADER_LambdaCube.PipelineSchema_H
13#define HEADER_LambdaCube.PipelineSchema_H 17#define HEADER_LambdaCube.PipelineSchema_H
diff --git a/ddl/out/LambdaCube.TypeInfo.cpp b/ddl/out/LambdaCube.TypeInfo.cpp
index 7c229ca..cc5979f 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4// 2016-03-01T13:00:40.810157000000Z 5// 2016-03-01T13:00:40.810157000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9// 2016-03-20T22:19:43.646837000000Z 10// 2016-03-20T22:19:43.646837000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13// 2016-03-21T11:36:01.199696000000Z
14>>>>>>> work on java json loader
11 15
12#include "LambdaCube.TypeInfo.hpp" 16#include "LambdaCube.TypeInfo.hpp"
13template<> json toJSON<std::shared_ptr<Range>>(std::shared_ptr<Range> &v) { 17template<> 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 60cdbff..78f46f0 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4// 2016-03-01T13:00:40.810157000000Z 5// 2016-03-01T13:00:40.810157000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9// 2016-03-20T22:19:43.646837000000Z 10// 2016-03-20T22:19:43.646837000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13// 2016-03-21T11:36:01.199696000000Z
14>>>>>>> work on java json loader
11 15
12#ifndef HEADER_LambdaCube.TypeInfo_H 16#ifndef HEADER_LambdaCube.TypeInfo_H
13#define HEADER_LambdaCube.TypeInfo_H 17#define HEADER_LambdaCube.TypeInfo_H
diff --git a/ddl/out/LambdaCube.TypeInfo.hs b/ddl/out/LambdaCube.TypeInfo.hs
index 1205391..7e1666e 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4-- 2016-03-01T13:00:40.810157000000Z 5-- 2016-03-01T13:00:40.810157000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9-- 2016-03-20T22:19:43.646837000000Z 10-- 2016-03-20T22:19:43.646837000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13-- 2016-03-21T11:36:01.199696000000Z
14>>>>>>> work on java json loader
11 15
12{-# LANGUAGE OverloadedStrings, RecordWildCards #-} 16{-# LANGUAGE OverloadedStrings, RecordWildCards #-}
13module LambdaCube.TypeInfo where 17module LambdaCube.TypeInfo where
diff --git a/ddl/out/LambdaCube.TypeInfo.purs b/ddl/out/LambdaCube.TypeInfo.purs
index 7422a22..9899da8 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4-- 2016-03-01T13:00:40.810157000000Z 5-- 2016-03-01T13:00:40.810157000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9-- 2016-03-20T22:19:43.646837000000Z 10-- 2016-03-20T22:19:43.646837000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13-- 2016-03-21T11:36:01.199696000000Z
14>>>>>>> work on java json loader
11 15
12module LambdaCube.TypeInfo where 16module LambdaCube.TypeInfo where
13import Prelude 17import Prelude
diff --git a/ddl/out/LambdaCube.TypeInfo.swift b/ddl/out/LambdaCube.TypeInfo.swift
index 3978081..1172492 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4// 2016-03-01T13:00:40.810157000000Z 5// 2016-03-01T13:00:40.810157000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9// 2016-03-20T22:19:43.646837000000Z 10// 2016-03-20T22:19:43.646837000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13// 2016-03-21T11:36:01.199696000000Z
14>>>>>>> work on java json loader
11 15
12enum Range { 16enum Range {
13 case Range(Range_Data) 17 case Range(Range_Data)
diff --git a/ddl/out/LambdaCube.TypeInfo2.hpp b/ddl/out/LambdaCube.TypeInfo2.hpp
index a76deb4..8a0c15f 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4// 2016-03-01T13:00:40.810157000000Z 5// 2016-03-01T13:00:40.810157000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9// 2016-03-20T22:19:43.646837000000Z 10// 2016-03-20T22:19:43.646837000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13// 2016-03-21T11:36:01.199696000000Z
14>>>>>>> work on java json loader
11 15
12#ifndef HEADER_LambdaCube.TypeInfo_H 16#ifndef HEADER_LambdaCube.TypeInfo_H
13#define HEADER_LambdaCube.TypeInfo_H 17#define HEADER_LambdaCube.TypeInfo_H
diff --git a/ddl/out/TestData.cpp b/ddl/out/TestData.cpp
index 0ed0903..3b97f6b 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4// 2016-03-01T13:00:40.829757000000Z 5// 2016-03-01T13:00:40.829757000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9// 2016-03-20T22:19:43.692329000000Z 10// 2016-03-20T22:19:43.692329000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13// 2016-03-21T11:36:01.244766000000Z
14>>>>>>> work on java json loader
11 15
12#include "TestData.hpp" 16#include "TestData.hpp"
13template<> json toJSON<std::shared_ptr<ClientInfo>>(std::shared_ptr<ClientInfo> &v) { 17template<> json toJSON<std::shared_ptr<ClientInfo>>(std::shared_ptr<ClientInfo> &v) {
diff --git a/ddl/out/TestData.hpp b/ddl/out/TestData.hpp
index bb302c3..a0f48b8 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4// 2016-03-01T13:00:40.829757000000Z 5// 2016-03-01T13:00:40.829757000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9// 2016-03-20T22:19:43.692329000000Z 10// 2016-03-20T22:19:43.692329000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13// 2016-03-21T11:36:01.244766000000Z
14>>>>>>> work on java json loader
11 15
12#ifndef HEADER_TestData_H 16#ifndef HEADER_TestData_H
13#define HEADER_TestData_H 17#define HEADER_TestData_H
diff --git a/ddl/out/TestData.hs b/ddl/out/TestData.hs
index 0f063d2..96d680e 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4-- 2016-03-01T13:00:40.829757000000Z 5-- 2016-03-01T13:00:40.829757000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9-- 2016-03-20T22:19:43.692329000000Z 10-- 2016-03-20T22:19:43.692329000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13-- 2016-03-21T11:36:01.244766000000Z
14>>>>>>> work on java json loader
11 15
12{-# LANGUAGE OverloadedStrings, RecordWildCards #-} 16{-# LANGUAGE OverloadedStrings, RecordWildCards #-}
13module TestData where 17module TestData where
diff --git a/ddl/out/TestData.purs b/ddl/out/TestData.purs
index 6969fc7..acbd856 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4-- 2016-03-01T13:00:40.829757000000Z 5-- 2016-03-01T13:00:40.829757000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9-- 2016-03-20T22:19:43.692329000000Z 10-- 2016-03-20T22:19:43.692329000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13-- 2016-03-21T11:36:01.244766000000Z
14>>>>>>> work on java json loader
11 15
12module TestData where 16module TestData where
13import Prelude 17import Prelude
diff --git a/ddl/out/TestData.swift b/ddl/out/TestData.swift
index 92969a1..15ea32f 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4// 2016-03-01T13:00:40.829757000000Z 5// 2016-03-01T13:00:40.829757000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9// 2016-03-20T22:19:43.692329000000Z 10// 2016-03-20T22:19:43.692329000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13// 2016-03-21T11:36:01.244766000000Z
14>>>>>>> work on java json loader
11 15
12enum ClientInfo { 16enum ClientInfo {
13 case ClientInfo(ClientInfo_Data) 17 case ClientInfo(ClientInfo_Data)
diff --git a/ddl/out/TestData2.hpp b/ddl/out/TestData2.hpp
index 7f1d4b3..b70752a 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<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
4// 2016-03-01T13:00:40.829757000000Z 5// 2016-03-01T13:00:40.829757000000Z
@@ -8,6 +9,9 @@
8======= 9=======
9// 2016-03-20T22:19:43.692329000000Z 10// 2016-03-20T22:19:43.692329000000Z
10>>>>>>> fix c# 11>>>>>>> fix c#
12=======
13// 2016-03-21T11:36:01.244766000000Z
14>>>>>>> work on java json loader
11 15
12#ifndef HEADER_TestData_H 16#ifndef HEADER_TestData_H
13#define HEADER_TestData_H 17#define HEADER_TestData_H