summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCsaba Hruska <csaba.hruska@gmail.com>2016-03-20 23:20:35 +0100
committerCsaba Hruska <csaba.hruska@gmail.com>2016-03-21 14:12:08 +0100
commit4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 (patch)
tree716e9b6f90bdf55b9a5f0cfe33f2b77a1b9f71b1
parentc5e063b3c9aeff65161e24445e9672daff980b45 (diff)
fix c#
Diffstat
-rw-r--r--ddl/Language.hs12
-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
-rw-r--r--ddl/templates/data.cs.ede18
32 files changed, 140 insertions, 10 deletions
diff --git a/ddl/Language.hs b/ddl/Language.hs
index 989314a..afa87fa 100644
--- a/ddl/Language.hs
+++ b/ddl/Language.hs
@@ -83,7 +83,17 @@ data Type
83 83
84collectTypes :: AliasMap -> ModuleDef -> Set Type 84collectTypes :: AliasMap -> ModuleDef -> Set Type
85collectTypes aliasMap ModuleDef{..} = Set.fromList $ map (normalize aliasMap) $ concat 85collectTypes aliasMap ModuleDef{..} = Set.fromList $ map (normalize aliasMap) $ concat
86 [Data dataName : [fieldType | ConstructorDef{..} <- constructors, Field{..} <- fields] | DataDef{..} <- definitions] 86 [Data dataName : concatMap flatType [fieldType | ConstructorDef{..} <- constructors, Field{..} <- fields] | DataDef{..} <- definitions]
87 where
88 flatType t = case t of
89 V2 a -> [t,a]
90 V3 a -> [t,a]
91 V4 a -> [t,a]
92 Array a -> [t,a]
93 List a -> [t,a]
94 Maybe a -> [t,a]
95 Map k v -> [t,k,v]
96 _ -> [t]
87 97
88parens :: String -> String 98parens :: String -> String
89parens a 99parens a
diff --git a/ddl/out/LambdaCube.IR.cpp b/ddl/out/LambdaCube.IR.cpp
index fcbcebb..6e0691b 100644
--- a/ddl/out/LambdaCube.IR.cpp
+++ b/ddl/out/LambdaCube.IR.cpp
@@ -1,9 +1,13 @@
1// generated file, do not modify! 1// generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3// 2016-03-01T13:00:40.426854000000Z 4// 2016-03-01T13:00:40.426854000000Z
4======= 5=======
5// 2016-03-20T21:42:12.172652000000Z 6// 2016-03-20T21:42:12.172652000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9// 2016-03-20T22:19:42.844053000000Z
10>>>>>>> fix c#
7 11
8#include "LambdaCube.IR.hpp" 12#include "LambdaCube.IR.hpp"
9template<> json toJSON<std::shared_ptr<ArrayValue>>(std::shared_ptr<ArrayValue> &v) { 13template<> 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 d6d74ac..2fea261 100644
--- a/ddl/out/LambdaCube.IR.hpp
+++ b/ddl/out/LambdaCube.IR.hpp
@@ -1,9 +1,13 @@
1// generated file, do not modify! 1// generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3// 2016-03-01T13:00:40.426854000000Z 4// 2016-03-01T13:00:40.426854000000Z
4======= 5=======
5// 2016-03-20T21:42:12.172652000000Z 6// 2016-03-20T21:42:12.172652000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9// 2016-03-20T22:19:42.844053000000Z
10>>>>>>> fix c#
7 11
8#ifndef HEADER_LambdaCube.IR_H 12#ifndef HEADER_LambdaCube.IR_H
9#define HEADER_LambdaCube.IR_H 13#define HEADER_LambdaCube.IR_H
diff --git a/ddl/out/LambdaCube.IR.hs b/ddl/out/LambdaCube.IR.hs
index 2a414dc..75104bc 100644
--- a/ddl/out/LambdaCube.IR.hs
+++ b/ddl/out/LambdaCube.IR.hs
@@ -1,9 +1,13 @@
1-- generated file, do not modify! 1-- generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3-- 2016-03-01T13:00:40.426854000000Z 4-- 2016-03-01T13:00:40.426854000000Z
4======= 5=======
5-- 2016-03-20T21:42:12.172652000000Z 6-- 2016-03-20T21:42:12.172652000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9-- 2016-03-20T22:19:42.844053000000Z
10>>>>>>> fix c#
7 11
8{-# LANGUAGE OverloadedStrings, RecordWildCards #-} 12{-# LANGUAGE OverloadedStrings, RecordWildCards #-}
9module LambdaCube.IR where 13module LambdaCube.IR where
diff --git a/ddl/out/LambdaCube.IR.purs b/ddl/out/LambdaCube.IR.purs
index 7a36d7e..8c2a2ab 100644
--- a/ddl/out/LambdaCube.IR.purs
+++ b/ddl/out/LambdaCube.IR.purs
@@ -1,9 +1,13 @@
1-- generated file, do not modify! 1-- generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3-- 2016-03-01T13:00:40.426854000000Z 4-- 2016-03-01T13:00:40.426854000000Z
4======= 5=======
5-- 2016-03-20T21:42:12.172652000000Z 6-- 2016-03-20T21:42:12.172652000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9-- 2016-03-20T22:19:42.844053000000Z
10>>>>>>> fix c#
7 11
8module LambdaCube.IR where 12module LambdaCube.IR where
9import Prelude 13import Prelude
diff --git a/ddl/out/LambdaCube.IR.swift b/ddl/out/LambdaCube.IR.swift
index 4cc6239..cef6db2 100644
--- a/ddl/out/LambdaCube.IR.swift
+++ b/ddl/out/LambdaCube.IR.swift
@@ -1,9 +1,13 @@
1// generated file, do not modify! 1// generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3// 2016-03-01T13:00:40.426854000000Z 4// 2016-03-01T13:00:40.426854000000Z
4======= 5=======
5// 2016-03-20T21:42:12.172652000000Z 6// 2016-03-20T21:42:12.172652000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9// 2016-03-20T22:19:42.844053000000Z
10>>>>>>> fix c#
7 11
8typealias StreamName = Int 12typealias StreamName = Int
9 13
diff --git a/ddl/out/LambdaCube.IR2.hpp b/ddl/out/LambdaCube.IR2.hpp
index a2e531a..5a0e965 100644
--- a/ddl/out/LambdaCube.IR2.hpp
+++ b/ddl/out/LambdaCube.IR2.hpp
@@ -1,9 +1,13 @@
1// generated file, do not modify! 1// generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3// 2016-03-01T13:00:40.426854000000Z 4// 2016-03-01T13:00:40.426854000000Z
4======= 5=======
5// 2016-03-20T21:42:12.172652000000Z 6// 2016-03-20T21:42:12.172652000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9// 2016-03-20T22:19:42.844053000000Z
10>>>>>>> fix c#
7 11
8#ifndef HEADER_LambdaCube.IR_H 12#ifndef HEADER_LambdaCube.IR_H
9#define HEADER_LambdaCube.IR_H 13#define HEADER_LambdaCube.IR_H
diff --git a/ddl/out/LambdaCube.Mesh.cpp b/ddl/out/LambdaCube.Mesh.cpp
index aa1ca00..82b2723 100644
--- a/ddl/out/LambdaCube.Mesh.cpp
+++ b/ddl/out/LambdaCube.Mesh.cpp
@@ -1,9 +1,13 @@
1// generated file, do not modify! 1// generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3// 2016-03-01T13:00:40.781208000000Z 4// 2016-03-01T13:00:40.781208000000Z
4======= 5=======
5// 2016-03-20T21:42:12.936741000000Z 6// 2016-03-20T21:42:12.936741000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9// 2016-03-20T22:19:43.568791000000Z
10>>>>>>> fix c#
7 11
8#include "LambdaCube.Mesh.hpp" 12#include "LambdaCube.Mesh.hpp"
9template<> json toJSON<std::shared_ptr<MeshAttribute>>(std::shared_ptr<MeshAttribute> &v) { 13template<> 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 d0899fd..0bc2920 100644
--- a/ddl/out/LambdaCube.Mesh.hpp
+++ b/ddl/out/LambdaCube.Mesh.hpp
@@ -1,9 +1,13 @@
1// generated file, do not modify! 1// generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3// 2016-03-01T13:00:40.781208000000Z 4// 2016-03-01T13:00:40.781208000000Z
4======= 5=======
5// 2016-03-20T21:42:12.936741000000Z 6// 2016-03-20T21:42:12.936741000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9// 2016-03-20T22:19:43.568791000000Z
10>>>>>>> fix c#
7 11
8#ifndef HEADER_LambdaCube.Mesh_H 12#ifndef HEADER_LambdaCube.Mesh_H
9#define HEADER_LambdaCube.Mesh_H 13#define HEADER_LambdaCube.Mesh_H
diff --git a/ddl/out/LambdaCube.Mesh.hs b/ddl/out/LambdaCube.Mesh.hs
index ddf90c9..194cc46 100644
--- a/ddl/out/LambdaCube.Mesh.hs
+++ b/ddl/out/LambdaCube.Mesh.hs
@@ -1,9 +1,13 @@
1-- generated file, do not modify! 1-- generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3-- 2016-03-01T13:00:40.781208000000Z 4-- 2016-03-01T13:00:40.781208000000Z
4======= 5=======
5-- 2016-03-20T21:42:12.936741000000Z 6-- 2016-03-20T21:42:12.936741000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9-- 2016-03-20T22:19:43.568791000000Z
10>>>>>>> fix c#
7 11
8{-# LANGUAGE OverloadedStrings, RecordWildCards #-} 12{-# LANGUAGE OverloadedStrings, RecordWildCards #-}
9module LambdaCube.Mesh where 13module LambdaCube.Mesh where
diff --git a/ddl/out/LambdaCube.Mesh.purs b/ddl/out/LambdaCube.Mesh.purs
index 60a61e2..349ffef 100644
--- a/ddl/out/LambdaCube.Mesh.purs
+++ b/ddl/out/LambdaCube.Mesh.purs
@@ -1,9 +1,13 @@
1-- generated file, do not modify! 1-- generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3-- 2016-03-01T13:00:40.781208000000Z 4-- 2016-03-01T13:00:40.781208000000Z
4======= 5=======
5-- 2016-03-20T21:42:12.936741000000Z 6-- 2016-03-20T21:42:12.936741000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9-- 2016-03-20T22:19:43.568791000000Z
10>>>>>>> fix c#
7 11
8module LambdaCube.Mesh where 12module LambdaCube.Mesh where
9import Prelude 13import Prelude
diff --git a/ddl/out/LambdaCube.Mesh.swift b/ddl/out/LambdaCube.Mesh.swift
index ff4ac52..d1f3677 100644
--- a/ddl/out/LambdaCube.Mesh.swift
+++ b/ddl/out/LambdaCube.Mesh.swift
@@ -1,9 +1,13 @@
1// generated file, do not modify! 1// generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3// 2016-03-01T13:00:40.781208000000Z 4// 2016-03-01T13:00:40.781208000000Z
4======= 5=======
5// 2016-03-20T21:42:12.936741000000Z 6// 2016-03-20T21:42:12.936741000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9// 2016-03-20T22:19:43.568791000000Z
10>>>>>>> fix c#
7 11
8enum MeshAttribute { 12enum MeshAttribute {
9 case A_Float(Array<Float>) 13 case A_Float(Array<Float>)
diff --git a/ddl/out/LambdaCube.Mesh2.hpp b/ddl/out/LambdaCube.Mesh2.hpp
index fc84a17..c6312f3 100644
--- a/ddl/out/LambdaCube.Mesh2.hpp
+++ b/ddl/out/LambdaCube.Mesh2.hpp
@@ -1,9 +1,13 @@
1// generated file, do not modify! 1// generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3// 2016-03-01T13:00:40.781208000000Z 4// 2016-03-01T13:00:40.781208000000Z
4======= 5=======
5// 2016-03-20T21:42:12.936741000000Z 6// 2016-03-20T21:42:12.936741000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9// 2016-03-20T22:19:43.568791000000Z
10>>>>>>> fix c#
7 11
8#ifndef HEADER_LambdaCube.Mesh_H 12#ifndef HEADER_LambdaCube.Mesh_H
9#define HEADER_LambdaCube.Mesh_H 13#define HEADER_LambdaCube.Mesh_H
diff --git a/ddl/out/LambdaCube.PipelineSchema.cpp b/ddl/out/LambdaCube.PipelineSchema.cpp
index 450bf72..fec1b1f 100644
--- a/ddl/out/LambdaCube.PipelineSchema.cpp
+++ b/ddl/out/LambdaCube.PipelineSchema.cpp
@@ -1,9 +1,13 @@
1// generated file, do not modify! 1// generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3// 2016-03-01T13:00:40.761274000000Z 4// 2016-03-01T13:00:40.761274000000Z
4======= 5=======
5// 2016-03-20T21:42:12.892571000000Z 6// 2016-03-20T21:42:12.892571000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9// 2016-03-20T22:19:43.498688000000Z
10>>>>>>> fix c#
7 11
8#include "LambdaCube.PipelineSchema.hpp" 12#include "LambdaCube.PipelineSchema.hpp"
9template<> json toJSON<std::shared_ptr<StreamType>>(std::shared_ptr<StreamType> &v) { 13template<> 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 afddf06..63be6ea 100644
--- a/ddl/out/LambdaCube.PipelineSchema.hpp
+++ b/ddl/out/LambdaCube.PipelineSchema.hpp
@@ -1,9 +1,13 @@
1// generated file, do not modify! 1// generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3// 2016-03-01T13:00:40.761274000000Z 4// 2016-03-01T13:00:40.761274000000Z
4======= 5=======
5// 2016-03-20T21:42:12.892571000000Z 6// 2016-03-20T21:42:12.892571000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9// 2016-03-20T22:19:43.498688000000Z
10>>>>>>> fix c#
7 11
8#ifndef HEADER_LambdaCube.PipelineSchema_H 12#ifndef HEADER_LambdaCube.PipelineSchema_H
9#define HEADER_LambdaCube.PipelineSchema_H 13#define HEADER_LambdaCube.PipelineSchema_H
diff --git a/ddl/out/LambdaCube.PipelineSchema.hs b/ddl/out/LambdaCube.PipelineSchema.hs
index 90ad67a..c875895 100644
--- a/ddl/out/LambdaCube.PipelineSchema.hs
+++ b/ddl/out/LambdaCube.PipelineSchema.hs
@@ -1,9 +1,13 @@
1-- generated file, do not modify! 1-- generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3-- 2016-03-01T13:00:40.761274000000Z 4-- 2016-03-01T13:00:40.761274000000Z
4======= 5=======
5-- 2016-03-20T21:42:12.892571000000Z 6-- 2016-03-20T21:42:12.892571000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9-- 2016-03-20T22:19:43.498688000000Z
10>>>>>>> fix c#
7 11
8{-# LANGUAGE OverloadedStrings, RecordWildCards #-} 12{-# LANGUAGE OverloadedStrings, RecordWildCards #-}
9module LambdaCube.PipelineSchema where 13module LambdaCube.PipelineSchema where
diff --git a/ddl/out/LambdaCube.PipelineSchema.purs b/ddl/out/LambdaCube.PipelineSchema.purs
index a1919a1..4db9ac3 100644
--- a/ddl/out/LambdaCube.PipelineSchema.purs
+++ b/ddl/out/LambdaCube.PipelineSchema.purs
@@ -1,9 +1,13 @@
1-- generated file, do not modify! 1-- generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3-- 2016-03-01T13:00:40.761274000000Z 4-- 2016-03-01T13:00:40.761274000000Z
4======= 5=======
5-- 2016-03-20T21:42:12.892571000000Z 6-- 2016-03-20T21:42:12.892571000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9-- 2016-03-20T22:19:43.498688000000Z
10>>>>>>> fix c#
7 11
8module LambdaCube.PipelineSchema where 12module LambdaCube.PipelineSchema where
9import Prelude 13import Prelude
diff --git a/ddl/out/LambdaCube.PipelineSchema.swift b/ddl/out/LambdaCube.PipelineSchema.swift
index 418ed7b..617e076 100644
--- a/ddl/out/LambdaCube.PipelineSchema.swift
+++ b/ddl/out/LambdaCube.PipelineSchema.swift
@@ -1,9 +1,13 @@
1// generated file, do not modify! 1// generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3// 2016-03-01T13:00:40.761274000000Z 4// 2016-03-01T13:00:40.761274000000Z
4======= 5=======
5// 2016-03-20T21:42:12.892571000000Z 6// 2016-03-20T21:42:12.892571000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9// 2016-03-20T22:19:43.498688000000Z
10>>>>>>> fix c#
7 11
8enum StreamType { 12enum StreamType {
9 case Attribute_Word 13 case Attribute_Word
diff --git a/ddl/out/LambdaCube.PipelineSchema2.hpp b/ddl/out/LambdaCube.PipelineSchema2.hpp
index 9d5acfe..4ce32da 100644
--- a/ddl/out/LambdaCube.PipelineSchema2.hpp
+++ b/ddl/out/LambdaCube.PipelineSchema2.hpp
@@ -1,9 +1,13 @@
1// generated file, do not modify! 1// generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3// 2016-03-01T13:00:40.761274000000Z 4// 2016-03-01T13:00:40.761274000000Z
4======= 5=======
5// 2016-03-20T21:42:12.892571000000Z 6// 2016-03-20T21:42:12.892571000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9// 2016-03-20T22:19:43.498688000000Z
10>>>>>>> fix c#
7 11
8#ifndef HEADER_LambdaCube.PipelineSchema_H 12#ifndef HEADER_LambdaCube.PipelineSchema_H
9#define HEADER_LambdaCube.PipelineSchema_H 13#define HEADER_LambdaCube.PipelineSchema_H
diff --git a/ddl/out/LambdaCube.TypeInfo.cpp b/ddl/out/LambdaCube.TypeInfo.cpp
index a32436c..7c229ca 100644
--- a/ddl/out/LambdaCube.TypeInfo.cpp
+++ b/ddl/out/LambdaCube.TypeInfo.cpp
@@ -1,9 +1,13 @@
1// generated file, do not modify! 1// generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3// 2016-03-01T13:00:40.810157000000Z 4// 2016-03-01T13:00:40.810157000000Z
4======= 5=======
5// 2016-03-20T21:42:12.996366000000Z 6// 2016-03-20T21:42:12.996366000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9// 2016-03-20T22:19:43.646837000000Z
10>>>>>>> fix c#
7 11
8#include "LambdaCube.TypeInfo.hpp" 12#include "LambdaCube.TypeInfo.hpp"
9template<> json toJSON<std::shared_ptr<Range>>(std::shared_ptr<Range> &v) { 13template<> 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 05fbd45..60cdbff 100644
--- a/ddl/out/LambdaCube.TypeInfo.hpp
+++ b/ddl/out/LambdaCube.TypeInfo.hpp
@@ -1,9 +1,13 @@
1// generated file, do not modify! 1// generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3// 2016-03-01T13:00:40.810157000000Z 4// 2016-03-01T13:00:40.810157000000Z
4======= 5=======
5// 2016-03-20T21:42:12.996366000000Z 6// 2016-03-20T21:42:12.996366000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9// 2016-03-20T22:19:43.646837000000Z
10>>>>>>> fix c#
7 11
8#ifndef HEADER_LambdaCube.TypeInfo_H 12#ifndef HEADER_LambdaCube.TypeInfo_H
9#define HEADER_LambdaCube.TypeInfo_H 13#define HEADER_LambdaCube.TypeInfo_H
diff --git a/ddl/out/LambdaCube.TypeInfo.hs b/ddl/out/LambdaCube.TypeInfo.hs
index fa8ddc6..1205391 100644
--- a/ddl/out/LambdaCube.TypeInfo.hs
+++ b/ddl/out/LambdaCube.TypeInfo.hs
@@ -1,9 +1,13 @@
1-- generated file, do not modify! 1-- generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3-- 2016-03-01T13:00:40.810157000000Z 4-- 2016-03-01T13:00:40.810157000000Z
4======= 5=======
5-- 2016-03-20T21:42:12.996366000000Z 6-- 2016-03-20T21:42:12.996366000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9-- 2016-03-20T22:19:43.646837000000Z
10>>>>>>> fix c#
7 11
8{-# LANGUAGE OverloadedStrings, RecordWildCards #-} 12{-# LANGUAGE OverloadedStrings, RecordWildCards #-}
9module LambdaCube.TypeInfo where 13module LambdaCube.TypeInfo where
diff --git a/ddl/out/LambdaCube.TypeInfo.purs b/ddl/out/LambdaCube.TypeInfo.purs
index b33afda..7422a22 100644
--- a/ddl/out/LambdaCube.TypeInfo.purs
+++ b/ddl/out/LambdaCube.TypeInfo.purs
@@ -1,9 +1,13 @@
1-- generated file, do not modify! 1-- generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3-- 2016-03-01T13:00:40.810157000000Z 4-- 2016-03-01T13:00:40.810157000000Z
4======= 5=======
5-- 2016-03-20T21:42:12.996366000000Z 6-- 2016-03-20T21:42:12.996366000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9-- 2016-03-20T22:19:43.646837000000Z
10>>>>>>> fix c#
7 11
8module LambdaCube.TypeInfo where 12module LambdaCube.TypeInfo where
9import Prelude 13import Prelude
diff --git a/ddl/out/LambdaCube.TypeInfo.swift b/ddl/out/LambdaCube.TypeInfo.swift
index e4776e9..3978081 100644
--- a/ddl/out/LambdaCube.TypeInfo.swift
+++ b/ddl/out/LambdaCube.TypeInfo.swift
@@ -1,9 +1,13 @@
1// generated file, do not modify! 1// generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3// 2016-03-01T13:00:40.810157000000Z 4// 2016-03-01T13:00:40.810157000000Z
4======= 5=======
5// 2016-03-20T21:42:12.996366000000Z 6// 2016-03-20T21:42:12.996366000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9// 2016-03-20T22:19:43.646837000000Z
10>>>>>>> fix c#
7 11
8enum Range { 12enum Range {
9 case Range(Range_Data) 13 case Range(Range_Data)
diff --git a/ddl/out/LambdaCube.TypeInfo2.hpp b/ddl/out/LambdaCube.TypeInfo2.hpp
index 8a69dcf..a76deb4 100644
--- a/ddl/out/LambdaCube.TypeInfo2.hpp
+++ b/ddl/out/LambdaCube.TypeInfo2.hpp
@@ -1,9 +1,13 @@
1// generated file, do not modify! 1// generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3// 2016-03-01T13:00:40.810157000000Z 4// 2016-03-01T13:00:40.810157000000Z
4======= 5=======
5// 2016-03-20T21:42:12.996366000000Z 6// 2016-03-20T21:42:12.996366000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9// 2016-03-20T22:19:43.646837000000Z
10>>>>>>> fix c#
7 11
8#ifndef HEADER_LambdaCube.TypeInfo_H 12#ifndef HEADER_LambdaCube.TypeInfo_H
9#define HEADER_LambdaCube.TypeInfo_H 13#define HEADER_LambdaCube.TypeInfo_H
diff --git a/ddl/out/TestData.cpp b/ddl/out/TestData.cpp
index b7d4d31..0ed0903 100644
--- a/ddl/out/TestData.cpp
+++ b/ddl/out/TestData.cpp
@@ -1,9 +1,13 @@
1// generated file, do not modify! 1// generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3// 2016-03-01T13:00:40.829757000000Z 4// 2016-03-01T13:00:40.829757000000Z
4======= 5=======
5// 2016-03-20T21:42:13.043021000000Z 6// 2016-03-20T21:42:13.043021000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9// 2016-03-20T22:19:43.692329000000Z
10>>>>>>> fix c#
7 11
8#include "TestData.hpp" 12#include "TestData.hpp"
9template<> json toJSON<std::shared_ptr<ClientInfo>>(std::shared_ptr<ClientInfo> &v) { 13template<> json toJSON<std::shared_ptr<ClientInfo>>(std::shared_ptr<ClientInfo> &v) {
diff --git a/ddl/out/TestData.hpp b/ddl/out/TestData.hpp
index 00cdfda..bb302c3 100644
--- a/ddl/out/TestData.hpp
+++ b/ddl/out/TestData.hpp
@@ -1,9 +1,13 @@
1// generated file, do not modify! 1// generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3// 2016-03-01T13:00:40.829757000000Z 4// 2016-03-01T13:00:40.829757000000Z
4======= 5=======
5// 2016-03-20T21:42:13.043021000000Z 6// 2016-03-20T21:42:13.043021000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9// 2016-03-20T22:19:43.692329000000Z
10>>>>>>> fix c#
7 11
8#ifndef HEADER_TestData_H 12#ifndef HEADER_TestData_H
9#define HEADER_TestData_H 13#define HEADER_TestData_H
diff --git a/ddl/out/TestData.hs b/ddl/out/TestData.hs
index 60f8ff9..0f063d2 100644
--- a/ddl/out/TestData.hs
+++ b/ddl/out/TestData.hs
@@ -1,9 +1,13 @@
1-- generated file, do not modify! 1-- generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3-- 2016-03-01T13:00:40.829757000000Z 4-- 2016-03-01T13:00:40.829757000000Z
4======= 5=======
5-- 2016-03-20T21:42:13.043021000000Z 6-- 2016-03-20T21:42:13.043021000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9-- 2016-03-20T22:19:43.692329000000Z
10>>>>>>> fix c#
7 11
8{-# LANGUAGE OverloadedStrings, RecordWildCards #-} 12{-# LANGUAGE OverloadedStrings, RecordWildCards #-}
9module TestData where 13module TestData where
diff --git a/ddl/out/TestData.purs b/ddl/out/TestData.purs
index 47f46ca..6969fc7 100644
--- a/ddl/out/TestData.purs
+++ b/ddl/out/TestData.purs
@@ -1,9 +1,13 @@
1-- generated file, do not modify! 1-- generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3-- 2016-03-01T13:00:40.829757000000Z 4-- 2016-03-01T13:00:40.829757000000Z
4======= 5=======
5-- 2016-03-20T21:42:13.043021000000Z 6-- 2016-03-20T21:42:13.043021000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9-- 2016-03-20T22:19:43.692329000000Z
10>>>>>>> fix c#
7 11
8module TestData where 12module TestData where
9import Prelude 13import Prelude
diff --git a/ddl/out/TestData.swift b/ddl/out/TestData.swift
index 6e31913..92969a1 100644
--- a/ddl/out/TestData.swift
+++ b/ddl/out/TestData.swift
@@ -1,9 +1,13 @@
1// generated file, do not modify! 1// generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3// 2016-03-01T13:00:40.829757000000Z 4// 2016-03-01T13:00:40.829757000000Z
4======= 5=======
5// 2016-03-20T21:42:13.043021000000Z 6// 2016-03-20T21:42:13.043021000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9// 2016-03-20T22:19:43.692329000000Z
10>>>>>>> fix c#
7 11
8enum ClientInfo { 12enum ClientInfo {
9 case ClientInfo(ClientInfo_Data) 13 case ClientInfo(ClientInfo_Data)
diff --git a/ddl/out/TestData2.hpp b/ddl/out/TestData2.hpp
index a88050a..7f1d4b3 100644
--- a/ddl/out/TestData2.hpp
+++ b/ddl/out/TestData2.hpp
@@ -1,9 +1,13 @@
1// generated file, do not modify! 1// generated file, do not modify!
2<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 3<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
3// 2016-03-01T13:00:40.829757000000Z 4// 2016-03-01T13:00:40.829757000000Z
4======= 5=======
5// 2016-03-20T21:42:13.043021000000Z 6// 2016-03-20T21:42:13.043021000000Z
6>>>>>>> working c# backend 7>>>>>>> working c# backend
8=======
9// 2016-03-20T22:19:43.692329000000Z
10>>>>>>> fix c#
7 11
8#ifndef HEADER_TestData_H 12#ifndef HEADER_TestData_H
9#define HEADER_TestData_H 13#define HEADER_TestData_H
diff --git a/ddl/templates/data.cs.ede b/ddl/templates/data.cs.ede
index 13d20f9..dffad32 100644
--- a/ddl/templates/data.cs.ede
+++ b/ddl/templates/data.cs.ede
@@ -45,23 +45,23 @@ namespace {{ moduleName }} {
45 {% when "V2" %} 45 {% when "V2" %}
46 case Type.{{ t.value | csTypeEnum }}: 46 case Type.{{ t.value | csTypeEnum }}:
47 return new {{ t.value | csType }} 47 return new {{ t.value | csType }}
48 { x = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value | csTypeEnum }},obj["x"]) 48 { x = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | csTypeEnum }},obj["x"])
49 , y = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value | csTypeEnum }},obj["y"]) 49 , y = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | csTypeEnum }},obj["y"])
50 }; 50 };
51 {% when "V3" %} 51 {% when "V3" %}
52 case Type.{{ t.value | csTypeEnum }}: 52 case Type.{{ t.value | csTypeEnum }}:
53 return new {{ t.value | csType }} 53 return new {{ t.value | csType }}
54 { x = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value | csTypeEnum }},obj["x"]) 54 { x = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | csTypeEnum }},obj["x"])
55 , y = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value | csTypeEnum }},obj["y"]) 55 , y = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | csTypeEnum }},obj["y"])
56 , z = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value | csTypeEnum }},obj["z"]) 56 , z = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | csTypeEnum }},obj["z"])
57 }; 57 };
58 {% when "V4" %} 58 {% when "V4" %}
59 case Type.{{ t.value | csTypeEnum }}: 59 case Type.{{ t.value | csTypeEnum }}:
60 return new {{ t.value | csType }} 60 return new {{ t.value | csType }}
61 { x = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value | csTypeEnum }},obj["x"]) 61 { x = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | csTypeEnum }},obj["x"])
62 , y = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value | csTypeEnum }},obj["y"]) 62 , y = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | csTypeEnum }},obj["y"])
63 , z = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value | csTypeEnum }},obj["z"]) 63 , z = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | csTypeEnum }},obj["z"])
64 , w = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value | csTypeEnum }},obj["w"]) 64 , w = ({{ t.value.type_ | csType }})fromJSON(Type.{{ t.value.type_ | csTypeEnum }},obj["w"])
65 }; 65 };
66 {% when "Map" %} 66 {% when "Map" %}
67 case Type.{{ t.value | csTypeEnum }}: { 67 case Type.{{ t.value | csTypeEnum }}: {
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-17 11:47:15 +0000