diff options
Diffstat (limited to 'ddl/out')
100 files changed, 455 insertions, 218 deletions
diff --git a/ddl/out/LambdaCube.IR.cpp b/ddl/out/LambdaCube.IR.cpp index 17c781c..f999419 100644 --- a/ddl/out/LambdaCube.IR.cpp +++ b/ddl/out/LambdaCube.IR.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | #include "LambdaCube.IR.hpp" | 4 | #include "LambdaCube.IR.hpp" |
5 | template<> json toJSON<std::shared_ptr<ArrayValue>>(std::shared_ptr<ArrayValue> &v) { | 5 | template<> json toJSON<std::shared_ptr<ArrayValue>>(std::shared_ptr<ArrayValue> &v) { |
diff --git a/ddl/out/LambdaCube.IR.cs b/ddl/out/LambdaCube.IR.cs index cc9469d..39813dd 100644 --- a/ddl/out/LambdaCube.IR.cs +++ b/ddl/out/LambdaCube.IR.cs | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | using System; | 4 | using System; |
5 | using System.Linq; | 5 | using System.Linq; |
diff --git a/ddl/out/LambdaCube.IR.hpp b/ddl/out/LambdaCube.IR.hpp index ebbee08..f69d4fc 100644 --- a/ddl/out/LambdaCube.IR.hpp +++ b/ddl/out/LambdaCube.IR.hpp | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | #ifndef HEADER_LambdaCube.IR_H | 4 | #ifndef HEADER_LambdaCube.IR_H |
5 | #define HEADER_LambdaCube.IR_H | 5 | #define HEADER_LambdaCube.IR_H |
diff --git a/ddl/out/LambdaCube.IR.hs b/ddl/out/LambdaCube.IR.hs index bcb1850..ee9ac35 100644 --- a/ddl/out/LambdaCube.IR.hs +++ b/ddl/out/LambdaCube.IR.hs | |||
@@ -1,5 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | -- 2016-03-21T13:31:09.634879000000Z | 2 | -- 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} | 4 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} |
5 | module LambdaCube.IR where | 5 | module LambdaCube.IR where |
diff --git a/ddl/out/LambdaCube.IR.purs b/ddl/out/LambdaCube.IR.purs index 56b5f5b..5540d8d 100644 --- a/ddl/out/LambdaCube.IR.purs +++ b/ddl/out/LambdaCube.IR.purs | |||
@@ -1,5 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | -- 2016-03-21T13:31:09.634879000000Z | 2 | -- 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | module LambdaCube.IR where | 4 | module LambdaCube.IR where |
5 | import Prelude | 5 | import Prelude |
diff --git a/ddl/out/LambdaCube.IR.swift b/ddl/out/LambdaCube.IR.swift index 7b848b1..6293abd 100644 --- a/ddl/out/LambdaCube.IR.swift +++ b/ddl/out/LambdaCube.IR.swift | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | typealias StreamName = Int | 4 | typealias StreamName = Int |
5 | 5 | ||
diff --git a/ddl/out/LambdaCube.IR2.hpp b/ddl/out/LambdaCube.IR2.hpp index 718778e..b5da9b0 100644 --- a/ddl/out/LambdaCube.IR2.hpp +++ b/ddl/out/LambdaCube.IR2.hpp | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | #ifndef HEADER_LambdaCube.IR_H | 4 | #ifndef HEADER_LambdaCube.IR_H |
5 | #define HEADER_LambdaCube.IR_H | 5 | #define HEADER_LambdaCube.IR_H |
diff --git a/ddl/out/LambdaCube.Mesh.cpp b/ddl/out/LambdaCube.Mesh.cpp index 8687341..a89f0f7 100644 --- a/ddl/out/LambdaCube.Mesh.cpp +++ b/ddl/out/LambdaCube.Mesh.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.335329000000Z | 2 | // 2016-03-21T14:06:55.404479000000Z |
3 | 3 | ||
4 | #include "LambdaCube.Mesh.hpp" | 4 | #include "LambdaCube.Mesh.hpp" |
5 | template<> json toJSON<std::shared_ptr<MeshAttribute>>(std::shared_ptr<MeshAttribute> &v) { | 5 | template<> json toJSON<std::shared_ptr<MeshAttribute>>(std::shared_ptr<MeshAttribute> &v) { |
diff --git a/ddl/out/LambdaCube.Mesh.cs b/ddl/out/LambdaCube.Mesh.cs index 096daef..95be336 100644 --- a/ddl/out/LambdaCube.Mesh.cs +++ b/ddl/out/LambdaCube.Mesh.cs | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.335329000000Z | 2 | // 2016-03-21T14:06:55.404479000000Z |
3 | 3 | ||
4 | using System; | 4 | using System; |
5 | using System.Linq; | 5 | using System.Linq; |
diff --git a/ddl/out/LambdaCube.Mesh.hpp b/ddl/out/LambdaCube.Mesh.hpp index 6b8bb85..4692756 100644 --- a/ddl/out/LambdaCube.Mesh.hpp +++ b/ddl/out/LambdaCube.Mesh.hpp | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.335329000000Z | 2 | // 2016-03-21T14:06:55.404479000000Z |
3 | 3 | ||
4 | #ifndef HEADER_LambdaCube.Mesh_H | 4 | #ifndef HEADER_LambdaCube.Mesh_H |
5 | #define HEADER_LambdaCube.Mesh_H | 5 | #define HEADER_LambdaCube.Mesh_H |
diff --git a/ddl/out/LambdaCube.Mesh.hs b/ddl/out/LambdaCube.Mesh.hs index 173a689..9ae5a3a 100644 --- a/ddl/out/LambdaCube.Mesh.hs +++ b/ddl/out/LambdaCube.Mesh.hs | |||
@@ -1,5 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | -- 2016-03-21T13:31:10.335329000000Z | 2 | -- 2016-03-21T14:06:55.404479000000Z |
3 | 3 | ||
4 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} | 4 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} |
5 | module LambdaCube.Mesh where | 5 | module LambdaCube.Mesh where |
diff --git a/ddl/out/LambdaCube.Mesh.purs b/ddl/out/LambdaCube.Mesh.purs index 1fef519..8976b23 100644 --- a/ddl/out/LambdaCube.Mesh.purs +++ b/ddl/out/LambdaCube.Mesh.purs | |||
@@ -1,5 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | -- 2016-03-21T13:31:10.335329000000Z | 2 | -- 2016-03-21T14:06:55.404479000000Z |
3 | 3 | ||
4 | module LambdaCube.Mesh where | 4 | module LambdaCube.Mesh where |
5 | import Prelude | 5 | import Prelude |
diff --git a/ddl/out/LambdaCube.Mesh.swift b/ddl/out/LambdaCube.Mesh.swift index bb71038..f890267 100644 --- a/ddl/out/LambdaCube.Mesh.swift +++ b/ddl/out/LambdaCube.Mesh.swift | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.335329000000Z | 2 | // 2016-03-21T14:06:55.404479000000Z |
3 | 3 | ||
4 | enum MeshAttribute { | 4 | enum MeshAttribute { |
5 | case A_Float(Array<Float>) | 5 | case A_Float(Array<Float>) |
diff --git a/ddl/out/LambdaCube.Mesh2.hpp b/ddl/out/LambdaCube.Mesh2.hpp index 3f28a3e..ac910b7 100644 --- a/ddl/out/LambdaCube.Mesh2.hpp +++ b/ddl/out/LambdaCube.Mesh2.hpp | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.335329000000Z | 2 | // 2016-03-21T14:06:55.404479000000Z |
3 | 3 | ||
4 | #ifndef HEADER_LambdaCube.Mesh_H | 4 | #ifndef HEADER_LambdaCube.Mesh_H |
5 | #define HEADER_LambdaCube.Mesh_H | 5 | #define HEADER_LambdaCube.Mesh_H |
diff --git a/ddl/out/LambdaCube.PipelineSchema.cpp b/ddl/out/LambdaCube.PipelineSchema.cpp index dd0ba47..047ab67 100644 --- a/ddl/out/LambdaCube.PipelineSchema.cpp +++ b/ddl/out/LambdaCube.PipelineSchema.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.293368000000Z | 2 | // 2016-03-21T14:06:55.360355000000Z |
3 | 3 | ||
4 | #include "LambdaCube.PipelineSchema.hpp" | 4 | #include "LambdaCube.PipelineSchema.hpp" |
5 | template<> json toJSON<std::shared_ptr<StreamType>>(std::shared_ptr<StreamType> &v) { | 5 | template<> json toJSON<std::shared_ptr<StreamType>>(std::shared_ptr<StreamType> &v) { |
diff --git a/ddl/out/LambdaCube.PipelineSchema.cs b/ddl/out/LambdaCube.PipelineSchema.cs index acdbcc1..4644b5a 100644 --- a/ddl/out/LambdaCube.PipelineSchema.cs +++ b/ddl/out/LambdaCube.PipelineSchema.cs | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.293368000000Z | 2 | // 2016-03-21T14:06:55.360355000000Z |
3 | 3 | ||
4 | using System; | 4 | using System; |
5 | using System.Linq; | 5 | using System.Linq; |
diff --git a/ddl/out/LambdaCube.PipelineSchema.hpp b/ddl/out/LambdaCube.PipelineSchema.hpp index 2760daa..3d9b092 100644 --- a/ddl/out/LambdaCube.PipelineSchema.hpp +++ b/ddl/out/LambdaCube.PipelineSchema.hpp | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.293368000000Z | 2 | // 2016-03-21T14:06:55.360355000000Z |
3 | 3 | ||
4 | #ifndef HEADER_LambdaCube.PipelineSchema_H | 4 | #ifndef HEADER_LambdaCube.PipelineSchema_H |
5 | #define HEADER_LambdaCube.PipelineSchema_H | 5 | #define HEADER_LambdaCube.PipelineSchema_H |
diff --git a/ddl/out/LambdaCube.PipelineSchema.hs b/ddl/out/LambdaCube.PipelineSchema.hs index 9237fff..447afe4 100644 --- a/ddl/out/LambdaCube.PipelineSchema.hs +++ b/ddl/out/LambdaCube.PipelineSchema.hs | |||
@@ -1,5 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | -- 2016-03-21T13:31:10.293368000000Z | 2 | -- 2016-03-21T14:06:55.360355000000Z |
3 | 3 | ||
4 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} | 4 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} |
5 | module LambdaCube.PipelineSchema where | 5 | module LambdaCube.PipelineSchema where |
diff --git a/ddl/out/LambdaCube.PipelineSchema.purs b/ddl/out/LambdaCube.PipelineSchema.purs index c7a5b54..7292bf5 100644 --- a/ddl/out/LambdaCube.PipelineSchema.purs +++ b/ddl/out/LambdaCube.PipelineSchema.purs | |||
@@ -1,5 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | -- 2016-03-21T13:31:10.293368000000Z | 2 | -- 2016-03-21T14:06:55.360355000000Z |
3 | 3 | ||
4 | module LambdaCube.PipelineSchema where | 4 | module LambdaCube.PipelineSchema where |
5 | import Prelude | 5 | import Prelude |
diff --git a/ddl/out/LambdaCube.PipelineSchema.swift b/ddl/out/LambdaCube.PipelineSchema.swift index 35906bb..f824093 100644 --- a/ddl/out/LambdaCube.PipelineSchema.swift +++ b/ddl/out/LambdaCube.PipelineSchema.swift | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.293368000000Z | 2 | // 2016-03-21T14:06:55.360355000000Z |
3 | 3 | ||
4 | enum StreamType { | 4 | enum StreamType { |
5 | case Attribute_Word | 5 | case Attribute_Word |
diff --git a/ddl/out/LambdaCube.PipelineSchema2.hpp b/ddl/out/LambdaCube.PipelineSchema2.hpp index c3c1158..c35b803 100644 --- a/ddl/out/LambdaCube.PipelineSchema2.hpp +++ b/ddl/out/LambdaCube.PipelineSchema2.hpp | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.293368000000Z | 2 | // 2016-03-21T14:06:55.360355000000Z |
3 | 3 | ||
4 | #ifndef HEADER_LambdaCube.PipelineSchema_H | 4 | #ifndef HEADER_LambdaCube.PipelineSchema_H |
5 | #define HEADER_LambdaCube.PipelineSchema_H | 5 | #define HEADER_LambdaCube.PipelineSchema_H |
diff --git a/ddl/out/LambdaCube.TypeInfo.cpp b/ddl/out/LambdaCube.TypeInfo.cpp index 6c64556..f015db4 100644 --- a/ddl/out/LambdaCube.TypeInfo.cpp +++ b/ddl/out/LambdaCube.TypeInfo.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.409214000000Z | 2 | // 2016-03-21T14:06:55.479415000000Z |
3 | 3 | ||
4 | #include "LambdaCube.TypeInfo.hpp" | 4 | #include "LambdaCube.TypeInfo.hpp" |
5 | template<> json toJSON<std::shared_ptr<Range>>(std::shared_ptr<Range> &v) { | 5 | template<> json toJSON<std::shared_ptr<Range>>(std::shared_ptr<Range> &v) { |
diff --git a/ddl/out/LambdaCube.TypeInfo.cs b/ddl/out/LambdaCube.TypeInfo.cs index ed57f07..43d094e 100644 --- a/ddl/out/LambdaCube.TypeInfo.cs +++ b/ddl/out/LambdaCube.TypeInfo.cs | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.409214000000Z | 2 | // 2016-03-21T14:06:55.479415000000Z |
3 | 3 | ||
4 | using System; | 4 | using System; |
5 | using System.Linq; | 5 | using System.Linq; |
diff --git a/ddl/out/LambdaCube.TypeInfo.hpp b/ddl/out/LambdaCube.TypeInfo.hpp index 22518b9..4c6413b 100644 --- a/ddl/out/LambdaCube.TypeInfo.hpp +++ b/ddl/out/LambdaCube.TypeInfo.hpp | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.409214000000Z | 2 | // 2016-03-21T14:06:55.479415000000Z |
3 | 3 | ||
4 | #ifndef HEADER_LambdaCube.TypeInfo_H | 4 | #ifndef HEADER_LambdaCube.TypeInfo_H |
5 | #define HEADER_LambdaCube.TypeInfo_H | 5 | #define HEADER_LambdaCube.TypeInfo_H |
diff --git a/ddl/out/LambdaCube.TypeInfo.hs b/ddl/out/LambdaCube.TypeInfo.hs index 0bd04f6..d66c490 100644 --- a/ddl/out/LambdaCube.TypeInfo.hs +++ b/ddl/out/LambdaCube.TypeInfo.hs | |||
@@ -1,5 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | -- 2016-03-21T13:31:10.409214000000Z | 2 | -- 2016-03-21T14:06:55.479415000000Z |
3 | 3 | ||
4 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} | 4 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} |
5 | module LambdaCube.TypeInfo where | 5 | module LambdaCube.TypeInfo where |
diff --git a/ddl/out/LambdaCube.TypeInfo.purs b/ddl/out/LambdaCube.TypeInfo.purs index 4cbdd74..fffac7f 100644 --- a/ddl/out/LambdaCube.TypeInfo.purs +++ b/ddl/out/LambdaCube.TypeInfo.purs | |||
@@ -1,5 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | -- 2016-03-21T13:31:10.409214000000Z | 2 | -- 2016-03-21T14:06:55.479415000000Z |
3 | 3 | ||
4 | module LambdaCube.TypeInfo where | 4 | module LambdaCube.TypeInfo where |
5 | import Prelude | 5 | import Prelude |
diff --git a/ddl/out/LambdaCube.TypeInfo.swift b/ddl/out/LambdaCube.TypeInfo.swift index 3eb10db..808b61c 100644 --- a/ddl/out/LambdaCube.TypeInfo.swift +++ b/ddl/out/LambdaCube.TypeInfo.swift | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.409214000000Z | 2 | // 2016-03-21T14:06:55.479415000000Z |
3 | 3 | ||
4 | enum Range { | 4 | enum Range { |
5 | case Range(Range_Data) | 5 | case Range(Range_Data) |
diff --git a/ddl/out/LambdaCube.TypeInfo2.hpp b/ddl/out/LambdaCube.TypeInfo2.hpp index 6ef3009..13c48a7 100644 --- a/ddl/out/LambdaCube.TypeInfo2.hpp +++ b/ddl/out/LambdaCube.TypeInfo2.hpp | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.409214000000Z | 2 | // 2016-03-21T14:06:55.479415000000Z |
3 | 3 | ||
4 | #ifndef HEADER_LambdaCube.TypeInfo_H | 4 | #ifndef HEADER_LambdaCube.TypeInfo_H |
5 | #define HEADER_LambdaCube.TypeInfo_H | 5 | #define HEADER_LambdaCube.TypeInfo_H |
diff --git a/ddl/out/TestData.cpp b/ddl/out/TestData.cpp index 223df9f..b354cde 100644 --- a/ddl/out/TestData.cpp +++ b/ddl/out/TestData.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.455557000000Z | 2 | // 2016-03-21T14:06:55.528630000000Z |
3 | 3 | ||
4 | #include "TestData.hpp" | 4 | #include "TestData.hpp" |
5 | template<> json toJSON<std::shared_ptr<ClientInfo>>(std::shared_ptr<ClientInfo> &v) { | 5 | template<> json toJSON<std::shared_ptr<ClientInfo>>(std::shared_ptr<ClientInfo> &v) { |
diff --git a/ddl/out/TestData.cs b/ddl/out/TestData.cs index c112934..0c2a143 100644 --- a/ddl/out/TestData.cs +++ b/ddl/out/TestData.cs | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.455557000000Z | 2 | // 2016-03-21T14:06:55.528630000000Z |
3 | 3 | ||
4 | using System; | 4 | using System; |
5 | using System.Linq; | 5 | using System.Linq; |
diff --git a/ddl/out/TestData.hpp b/ddl/out/TestData.hpp index c28b8d2..6d87ec3 100644 --- a/ddl/out/TestData.hpp +++ b/ddl/out/TestData.hpp | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.455557000000Z | 2 | // 2016-03-21T14:06:55.528630000000Z |
3 | 3 | ||
4 | #ifndef HEADER_TestData_H | 4 | #ifndef HEADER_TestData_H |
5 | #define HEADER_TestData_H | 5 | #define HEADER_TestData_H |
diff --git a/ddl/out/TestData.hs b/ddl/out/TestData.hs index 3a4ec43..4fc19ff 100644 --- a/ddl/out/TestData.hs +++ b/ddl/out/TestData.hs | |||
@@ -1,5 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | -- 2016-03-21T13:31:10.455557000000Z | 2 | -- 2016-03-21T14:06:55.528630000000Z |
3 | 3 | ||
4 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} | 4 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} |
5 | module TestData where | 5 | module TestData where |
diff --git a/ddl/out/TestData.purs b/ddl/out/TestData.purs index f909f30..5c0eeb3 100644 --- a/ddl/out/TestData.purs +++ b/ddl/out/TestData.purs | |||
@@ -1,5 +1,5 @@ | |||
1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
2 | -- 2016-03-21T13:31:10.455557000000Z | 2 | -- 2016-03-21T14:06:55.528630000000Z |
3 | 3 | ||
4 | module TestData where | 4 | module TestData where |
5 | import Prelude | 5 | import Prelude |
diff --git a/ddl/out/TestData.swift b/ddl/out/TestData.swift index d02a684..70241b5 100644 --- a/ddl/out/TestData.swift +++ b/ddl/out/TestData.swift | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.455557000000Z | 2 | // 2016-03-21T14:06:55.528630000000Z |
3 | 3 | ||
4 | enum ClientInfo { | 4 | enum ClientInfo { |
5 | case ClientInfo(ClientInfo_Data) | 5 | case ClientInfo(ClientInfo_Data) |
diff --git a/ddl/out/TestData2.hpp b/ddl/out/TestData2.hpp index d5a84c4..d89775c 100644 --- a/ddl/out/TestData2.hpp +++ b/ddl/out/TestData2.hpp | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.455557000000Z | 2 | // 2016-03-21T14:06:55.528630000000Z |
3 | 3 | ||
4 | #ifndef HEADER_TestData_H | 4 | #ifndef HEADER_TestData_H |
5 | #define HEADER_TestData_H | 5 | #define HEADER_TestData_H |
diff --git a/ddl/out/java/LambdaCube/IR/AccumulationContext.java b/ddl/out/java/LambdaCube/IR/AccumulationContext.java index 4b35c4c..47e92cc 100644 --- a/ddl/out/java/LambdaCube/IR/AccumulationContext.java +++ b/ddl/out/java/LambdaCube/IR/AccumulationContext.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/ArrayValue.java b/ddl/out/java/LambdaCube/IR/ArrayValue.java index 4bdf944..df0d096 100644 --- a/ddl/out/java/LambdaCube/IR/ArrayValue.java +++ b/ddl/out/java/LambdaCube/IR/ArrayValue.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Backend.java b/ddl/out/java/LambdaCube/IR/Backend.java index dcc58d7..8a395af 100644 --- a/ddl/out/java/LambdaCube/IR/Backend.java +++ b/ddl/out/java/LambdaCube/IR/Backend.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/BlendEquation.java b/ddl/out/java/LambdaCube/IR/BlendEquation.java index 138f3cb..c6712d3 100644 --- a/ddl/out/java/LambdaCube/IR/BlendEquation.java +++ b/ddl/out/java/LambdaCube/IR/BlendEquation.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Blending.java b/ddl/out/java/LambdaCube/IR/Blending.java index d30b963..f3e1e48 100644 --- a/ddl/out/java/LambdaCube/IR/Blending.java +++ b/ddl/out/java/LambdaCube/IR/Blending.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/BlendingFactor.java b/ddl/out/java/LambdaCube/IR/BlendingFactor.java index 8c02971..b45483b 100644 --- a/ddl/out/java/LambdaCube/IR/BlendingFactor.java +++ b/ddl/out/java/LambdaCube/IR/BlendingFactor.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/ClearImage.java b/ddl/out/java/LambdaCube/IR/ClearImage.java index 48fdbe1..de88625 100644 --- a/ddl/out/java/LambdaCube/IR/ClearImage.java +++ b/ddl/out/java/LambdaCube/IR/ClearImage.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/ColorArity.java b/ddl/out/java/LambdaCube/IR/ColorArity.java index dee0704..1a89df1 100644 --- a/ddl/out/java/LambdaCube/IR/ColorArity.java +++ b/ddl/out/java/LambdaCube/IR/ColorArity.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Command.java b/ddl/out/java/LambdaCube/IR/Command.java index 407059f..4a1c915 100644 --- a/ddl/out/java/LambdaCube/IR/Command.java +++ b/ddl/out/java/LambdaCube/IR/Command.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/ComparisonFunction.java b/ddl/out/java/LambdaCube/IR/ComparisonFunction.java index ecd2947..d64cd26 100644 --- a/ddl/out/java/LambdaCube/IR/ComparisonFunction.java +++ b/ddl/out/java/LambdaCube/IR/ComparisonFunction.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/CullMode.java b/ddl/out/java/LambdaCube/IR/CullMode.java index 10f7630..bd462ef 100644 --- a/ddl/out/java/LambdaCube/IR/CullMode.java +++ b/ddl/out/java/LambdaCube/IR/CullMode.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/EdgeMode.java b/ddl/out/java/LambdaCube/IR/EdgeMode.java index 1c597a6..280ed53 100644 --- a/ddl/out/java/LambdaCube/IR/EdgeMode.java +++ b/ddl/out/java/LambdaCube/IR/EdgeMode.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/FetchPrimitive.java b/ddl/out/java/LambdaCube/IR/FetchPrimitive.java index bfd60ee..89bc1a5 100644 --- a/ddl/out/java/LambdaCube/IR/FetchPrimitive.java +++ b/ddl/out/java/LambdaCube/IR/FetchPrimitive.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Filter.java b/ddl/out/java/LambdaCube/IR/Filter.java index 19e692b..19d9a39 100644 --- a/ddl/out/java/LambdaCube/IR/Filter.java +++ b/ddl/out/java/LambdaCube/IR/Filter.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/FragmentOperation.java b/ddl/out/java/LambdaCube/IR/FragmentOperation.java index 42c5738..65d284f 100644 --- a/ddl/out/java/LambdaCube/IR/FragmentOperation.java +++ b/ddl/out/java/LambdaCube/IR/FragmentOperation.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/FrontFace.java b/ddl/out/java/LambdaCube/IR/FrontFace.java index fca8e14..6d5323d 100644 --- a/ddl/out/java/LambdaCube/IR/FrontFace.java +++ b/ddl/out/java/LambdaCube/IR/FrontFace.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/ImageRef.java b/ddl/out/java/LambdaCube/IR/ImageRef.java index 1da3948..bc382bc 100644 --- a/ddl/out/java/LambdaCube/IR/ImageRef.java +++ b/ddl/out/java/LambdaCube/IR/ImageRef.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/ImageSemantic.java b/ddl/out/java/LambdaCube/IR/ImageSemantic.java index b17b954..4777479 100644 --- a/ddl/out/java/LambdaCube/IR/ImageSemantic.java +++ b/ddl/out/java/LambdaCube/IR/ImageSemantic.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/InputType.java b/ddl/out/java/LambdaCube/IR/InputType.java index 38e1cdb..48d42c1 100644 --- a/ddl/out/java/LambdaCube/IR/InputType.java +++ b/ddl/out/java/LambdaCube/IR/InputType.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/JSON.java b/ddl/out/java/LambdaCube/IR/JSON.java index f5f7967..a25af3d 100644 --- a/ddl/out/java/LambdaCube/IR/JSON.java +++ b/ddl/out/java/LambdaCube/IR/JSON.java | |||
@@ -1,10 +1,11 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
6 | import java.util.ArrayList; | 6 | import java.util.ArrayList; |
7 | import java.util.HashMap; | 7 | import java.util.HashMap; |
8 | import java.util.Iterator; | ||
8 | import org.json.*; | 9 | import org.json.*; |
9 | import RT.*; | 10 | import RT.*; |
10 | 11 | ||
@@ -288,26 +289,138 @@ public class JSON { | |||
288 | , (V4<Float>)fromJSON(Type.V4_Float,obj.get("w")) | 289 | , (V4<Float>)fromJSON(Type.V4_Float,obj.get("w")) |
289 | ); | 290 | ); |
290 | } | 291 | } |
291 | // case Array_Int: return ((JArray)obj).Select(x => fromJSON (Type.Int, x)).ToList(); | 292 | case Array_Int: { |
292 | // case Array_Int32: return ((JArray)obj).Select(x => fromJSON (Type.Int32, x)).ToList(); | 293 | JSONArray obj = (JSONArray)rawObj; |
293 | // case Array_Word32: return ((JArray)obj).Select(x => fromJSON (Type.Word32, x)).ToList(); | 294 | ArrayList<Integer> v = new ArrayList<Integer> (); |
294 | // case Array_Float: return ((JArray)obj).Select(x => fromJSON (Type.Float, x)).ToList(); | 295 | for (int i = 0; i < obj.length(); i++) { |
295 | // case Array_Bool: return ((JArray)obj).Select(x => fromJSON (Type.Bool, x)).ToList(); | 296 | v.add((Integer)fromJSON (Type.Int, obj.get(i))); |
296 | // case Array_ClearImage: return ((JArray)obj).Select(x => fromJSON (Type.ClearImage, x)).ToList(); | 297 | } |
297 | // case Array_Command: return ((JArray)obj).Select(x => fromJSON (Type.Command, x)).ToList(); | 298 | return v; |
298 | // case Array_Parameter: return ((JArray)obj).Select(x => fromJSON (Type.Parameter, x)).ToList(); | 299 | } |
299 | // case Array_Program: return ((JArray)obj).Select(x => fromJSON (Type.Program, x)).ToList(); | 300 | case Array_Int32: { |
300 | // case Array_RenderTarget: return ((JArray)obj).Select(x => fromJSON (Type.RenderTarget, x)).ToList(); | 301 | JSONArray obj = (JSONArray)rawObj; |
301 | // case Array_SamplerDescriptor: return ((JArray)obj).Select(x => fromJSON (Type.SamplerDescriptor, x)).ToList(); | 302 | ArrayList<Integer> v = new ArrayList<Integer> (); |
302 | // case Array_Slot: return ((JArray)obj).Select(x => fromJSON (Type.Slot, x)).ToList(); | 303 | for (int i = 0; i < obj.length(); i++) { |
303 | // case Array_StreamData: return ((JArray)obj).Select(x => fromJSON (Type.StreamData, x)).ToList(); | 304 | v.add((Integer)fromJSON (Type.Int32, obj.get(i))); |
304 | // case Array_TargetItem: return ((JArray)obj).Select(x => fromJSON (Type.TargetItem, x)).ToList(); | 305 | } |
305 | // case Array_TextureDescriptor: return ((JArray)obj).Select(x => fromJSON (Type.TextureDescriptor, x)).ToList(); | 306 | return v; |
306 | // case List_FragmentOperation: return ((JArray)obj).Select(x => fromJSON (Type.FragmentOperation, x)).ToList(); | 307 | } |
307 | /* | 308 | case Array_Word32: { |
309 | JSONArray obj = (JSONArray)rawObj; | ||
310 | ArrayList<Integer> v = new ArrayList<Integer> (); | ||
311 | for (int i = 0; i < obj.length(); i++) { | ||
312 | v.add((Integer)fromJSON (Type.Word32, obj.get(i))); | ||
313 | } | ||
314 | return v; | ||
315 | } | ||
316 | case Array_Float: { | ||
317 | JSONArray obj = (JSONArray)rawObj; | ||
318 | ArrayList<Float> v = new ArrayList<Float> (); | ||
319 | for (int i = 0; i < obj.length(); i++) { | ||
320 | v.add((Float)fromJSON (Type.Float, obj.get(i))); | ||
321 | } | ||
322 | return v; | ||
323 | } | ||
324 | case Array_Bool: { | ||
325 | JSONArray obj = (JSONArray)rawObj; | ||
326 | ArrayList<Boolean> v = new ArrayList<Boolean> (); | ||
327 | for (int i = 0; i < obj.length(); i++) { | ||
328 | v.add((Boolean)fromJSON (Type.Bool, obj.get(i))); | ||
329 | } | ||
330 | return v; | ||
331 | } | ||
332 | case Array_ClearImage: { | ||
333 | JSONArray obj = (JSONArray)rawObj; | ||
334 | ArrayList<ClearImage> v = new ArrayList<ClearImage> (); | ||
335 | for (int i = 0; i < obj.length(); i++) { | ||
336 | v.add((ClearImage)fromJSON (Type.ClearImage, obj.get(i))); | ||
337 | } | ||
338 | return v; | ||
339 | } | ||
340 | case Array_Command: { | ||
341 | JSONArray obj = (JSONArray)rawObj; | ||
342 | ArrayList<Command> v = new ArrayList<Command> (); | ||
343 | for (int i = 0; i < obj.length(); i++) { | ||
344 | v.add((Command)fromJSON (Type.Command, obj.get(i))); | ||
345 | } | ||
346 | return v; | ||
347 | } | ||
348 | case Array_Parameter: { | ||
349 | JSONArray obj = (JSONArray)rawObj; | ||
350 | ArrayList<Parameter> v = new ArrayList<Parameter> (); | ||
351 | for (int i = 0; i < obj.length(); i++) { | ||
352 | v.add((Parameter)fromJSON (Type.Parameter, obj.get(i))); | ||
353 | } | ||
354 | return v; | ||
355 | } | ||
356 | case Array_Program: { | ||
357 | JSONArray obj = (JSONArray)rawObj; | ||
358 | ArrayList<Program> v = new ArrayList<Program> (); | ||
359 | for (int i = 0; i < obj.length(); i++) { | ||
360 | v.add((Program)fromJSON (Type.Program, obj.get(i))); | ||
361 | } | ||
362 | return v; | ||
363 | } | ||
364 | case Array_RenderTarget: { | ||
365 | JSONArray obj = (JSONArray)rawObj; | ||
366 | ArrayList<RenderTarget> v = new ArrayList<RenderTarget> (); | ||
367 | for (int i = 0; i < obj.length(); i++) { | ||
368 | v.add((RenderTarget)fromJSON (Type.RenderTarget, obj.get(i))); | ||
369 | } | ||
370 | return v; | ||
371 | } | ||
372 | case Array_SamplerDescriptor: { | ||
373 | JSONArray obj = (JSONArray)rawObj; | ||
374 | ArrayList<SamplerDescriptor> v = new ArrayList<SamplerDescriptor> (); | ||
375 | for (int i = 0; i < obj.length(); i++) { | ||
376 | v.add((SamplerDescriptor)fromJSON (Type.SamplerDescriptor, obj.get(i))); | ||
377 | } | ||
378 | return v; | ||
379 | } | ||
380 | case Array_Slot: { | ||
381 | JSONArray obj = (JSONArray)rawObj; | ||
382 | ArrayList<Slot> v = new ArrayList<Slot> (); | ||
383 | for (int i = 0; i < obj.length(); i++) { | ||
384 | v.add((Slot)fromJSON (Type.Slot, obj.get(i))); | ||
385 | } | ||
386 | return v; | ||
387 | } | ||
388 | case Array_StreamData: { | ||
389 | JSONArray obj = (JSONArray)rawObj; | ||
390 | ArrayList<StreamData> v = new ArrayList<StreamData> (); | ||
391 | for (int i = 0; i < obj.length(); i++) { | ||
392 | v.add((StreamData)fromJSON (Type.StreamData, obj.get(i))); | ||
393 | } | ||
394 | return v; | ||
395 | } | ||
396 | case Array_TargetItem: { | ||
397 | JSONArray obj = (JSONArray)rawObj; | ||
398 | ArrayList<TargetItem> v = new ArrayList<TargetItem> (); | ||
399 | for (int i = 0; i < obj.length(); i++) { | ||
400 | v.add((TargetItem)fromJSON (Type.TargetItem, obj.get(i))); | ||
401 | } | ||
402 | return v; | ||
403 | } | ||
404 | case Array_TextureDescriptor: { | ||
405 | JSONArray obj = (JSONArray)rawObj; | ||
406 | ArrayList<TextureDescriptor> v = new ArrayList<TextureDescriptor> (); | ||
407 | for (int i = 0; i < obj.length(); i++) { | ||
408 | v.add((TextureDescriptor)fromJSON (Type.TextureDescriptor, obj.get(i))); | ||
409 | } | ||
410 | return v; | ||
411 | } | ||
412 | case List_FragmentOperation: { | ||
413 | JSONArray obj = (JSONArray)rawObj; | ||
414 | ArrayList<FragmentOperation> v = new ArrayList<FragmentOperation> (); | ||
415 | for (int i = 0; i < obj.length(); i++) { | ||
416 | v.add((FragmentOperation)fromJSON (Type.FragmentOperation, obj.get(i))); | ||
417 | } | ||
418 | return v; | ||
419 | } | ||
308 | case Maybe_Int: { | 420 | case Maybe_Int: { |
309 | var m = new Maybe<Integer> (); | 421 | JSONObject obj = (JSONObject)rawObj; |
310 | if (obj == null || obj.Type == JTokenType.Null) { | 422 | Maybe<Integer> m = new Maybe<Integer> (); |
423 | if (obj == null || obj == JSONObject.NULL) { | ||
311 | m.valid = false; | 424 | m.valid = false; |
312 | } else { | 425 | } else { |
313 | m.valid = true; | 426 | m.valid = true; |
@@ -315,11 +428,10 @@ public class JSON { | |||
315 | } | 428 | } |
316 | return m; | 429 | return m; |
317 | } | 430 | } |
318 | */ | ||
319 | /* | ||
320 | case Maybe_Float: { | 431 | case Maybe_Float: { |
321 | var m = new Maybe<Float> (); | 432 | JSONObject obj = (JSONObject)rawObj; |
322 | if (obj == null || obj.Type == JTokenType.Null) { | 433 | Maybe<Float> m = new Maybe<Float> (); |
434 | if (obj == null || obj == JSONObject.NULL) { | ||
323 | m.valid = false; | 435 | m.valid = false; |
324 | } else { | 436 | } else { |
325 | m.valid = true; | 437 | m.valid = true; |
@@ -327,11 +439,10 @@ public class JSON { | |||
327 | } | 439 | } |
328 | return m; | 440 | return m; |
329 | } | 441 | } |
330 | */ | ||
331 | /* | ||
332 | case Maybe_String: { | 442 | case Maybe_String: { |
333 | var m = new Maybe<String> (); | 443 | JSONObject obj = (JSONObject)rawObj; |
334 | if (obj == null || obj.Type == JTokenType.Null) { | 444 | Maybe<String> m = new Maybe<String> (); |
445 | if (obj == null || obj == JSONObject.NULL) { | ||
335 | m.valid = false; | 446 | m.valid = false; |
336 | } else { | 447 | } else { |
337 | m.valid = true; | 448 | m.valid = true; |
@@ -339,11 +450,10 @@ public class JSON { | |||
339 | } | 450 | } |
340 | return m; | 451 | return m; |
341 | } | 452 | } |
342 | */ | ||
343 | /* | ||
344 | case Maybe_ComparisonFunction: { | 453 | case Maybe_ComparisonFunction: { |
345 | var m = new Maybe<ComparisonFunction> (); | 454 | JSONObject obj = (JSONObject)rawObj; |
346 | if (obj == null || obj.Type == JTokenType.Null) { | 455 | Maybe<ComparisonFunction> m = new Maybe<ComparisonFunction> (); |
456 | if (obj == null || obj == JSONObject.NULL) { | ||
347 | m.valid = false; | 457 | m.valid = false; |
348 | } else { | 458 | } else { |
349 | m.valid = true; | 459 | m.valid = true; |
@@ -351,11 +461,10 @@ public class JSON { | |||
351 | } | 461 | } |
352 | return m; | 462 | return m; |
353 | } | 463 | } |
354 | */ | ||
355 | /* | ||
356 | case Maybe_EdgeMode: { | 464 | case Maybe_EdgeMode: { |
357 | var m = new Maybe<EdgeMode> (); | 465 | JSONObject obj = (JSONObject)rawObj; |
358 | if (obj == null || obj.Type == JTokenType.Null) { | 466 | Maybe<EdgeMode> m = new Maybe<EdgeMode> (); |
467 | if (obj == null || obj == JSONObject.NULL) { | ||
359 | m.valid = false; | 468 | m.valid = false; |
360 | } else { | 469 | } else { |
361 | m.valid = true; | 470 | m.valid = true; |
@@ -363,11 +472,10 @@ public class JSON { | |||
363 | } | 472 | } |
364 | return m; | 473 | return m; |
365 | } | 474 | } |
366 | */ | ||
367 | /* | ||
368 | case Maybe_ImageRef: { | 475 | case Maybe_ImageRef: { |
369 | var m = new Maybe<ImageRef> (); | 476 | JSONObject obj = (JSONObject)rawObj; |
370 | if (obj == null || obj.Type == JTokenType.Null) { | 477 | Maybe<ImageRef> m = new Maybe<ImageRef> (); |
478 | if (obj == null || obj == JSONObject.NULL) { | ||
371 | m.valid = false; | 479 | m.valid = false; |
372 | } else { | 480 | } else { |
373 | m.valid = true; | 481 | m.valid = true; |
@@ -375,37 +483,36 @@ public class JSON { | |||
375 | } | 483 | } |
376 | return m; | 484 | return m; |
377 | } | 485 | } |
378 | */ | ||
379 | /* | ||
380 | case Map_String_ArrayValue: { | 486 | case Map_String_ArrayValue: { |
381 | var map = new HashMap<String, ArrayValue> (); | 487 | JSONObject obj = (JSONObject)rawObj; |
382 | foreach(var i in (JSONObject)rawObj) { | 488 | HashMap<String, ArrayValue> map = new HashMap<String, ArrayValue> (); |
383 | map.Add( (String)fromJSON(Type.String,i.Key) | 489 | Iterator<String> keyIt = obj.keys(); |
384 | , (ArrayValue)fromJSON(Type.ArrayValue,i.Value)); | 490 | while(keyIt.hasNext()) { |
491 | String key = keyIt.next(); | ||
492 | map.put(key, (ArrayValue)fromJSON(Type.ArrayValue,obj.get(key))); | ||
385 | } | 493 | } |
386 | return map; | 494 | return map; |
387 | } | 495 | } |
388 | */ | ||
389 | /* | ||
390 | case Map_String_InputType: { | 496 | case Map_String_InputType: { |
391 | var map = new HashMap<String, InputType> (); | 497 | JSONObject obj = (JSONObject)rawObj; |
392 | foreach(var i in (JSONObject)rawObj) { | 498 | HashMap<String, InputType> map = new HashMap<String, InputType> (); |
393 | map.Add( (String)fromJSON(Type.String,i.Key) | 499 | Iterator<String> keyIt = obj.keys(); |
394 | , (InputType)fromJSON(Type.InputType,i.Value)); | 500 | while(keyIt.hasNext()) { |
501 | String key = keyIt.next(); | ||
502 | map.put(key, (InputType)fromJSON(Type.InputType,obj.get(key))); | ||
395 | } | 503 | } |
396 | return map; | 504 | return map; |
397 | } | 505 | } |
398 | */ | ||
399 | /* | ||
400 | case Map_String_Parameter: { | 506 | case Map_String_Parameter: { |
401 | var map = new HashMap<String, Parameter> (); | 507 | JSONObject obj = (JSONObject)rawObj; |
402 | foreach(var i in (JSONObject)rawObj) { | 508 | HashMap<String, Parameter> map = new HashMap<String, Parameter> (); |
403 | map.Add( (String)fromJSON(Type.String,i.Key) | 509 | Iterator<String> keyIt = obj.keys(); |
404 | , (Parameter)fromJSON(Type.Parameter,i.Value)); | 510 | while(keyIt.hasNext()) { |
511 | String key = keyIt.next(); | ||
512 | map.put(key, (Parameter)fromJSON(Type.Parameter,obj.get(key))); | ||
405 | } | 513 | } |
406 | return map; | 514 | return map; |
407 | } | 515 | } |
408 | */ | ||
409 | 516 | ||
410 | case ArrayValue: { | 517 | case ArrayValue: { |
411 | JSONObject obj = (JSONObject)rawObj; | 518 | JSONObject obj = (JSONObject)rawObj; |
diff --git a/ddl/out/java/LambdaCube/IR/LogicOperation.java b/ddl/out/java/LambdaCube/IR/LogicOperation.java index 564f069..b7efcff 100644 --- a/ddl/out/java/LambdaCube/IR/LogicOperation.java +++ b/ddl/out/java/LambdaCube/IR/LogicOperation.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/MipMap.java b/ddl/out/java/LambdaCube/IR/MipMap.java index fdfa90b..068c824 100644 --- a/ddl/out/java/LambdaCube/IR/MipMap.java +++ b/ddl/out/java/LambdaCube/IR/MipMap.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/OutputPrimitive.java b/ddl/out/java/LambdaCube/IR/OutputPrimitive.java index 80b9233..267ff8a 100644 --- a/ddl/out/java/LambdaCube/IR/OutputPrimitive.java +++ b/ddl/out/java/LambdaCube/IR/OutputPrimitive.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Parameter.java b/ddl/out/java/LambdaCube/IR/Parameter.java index 6eb1e8b..31b8701 100644 --- a/ddl/out/java/LambdaCube/IR/Parameter.java +++ b/ddl/out/java/LambdaCube/IR/Parameter.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Pipeline.java b/ddl/out/java/LambdaCube/IR/Pipeline.java index 020df55..b5c9a86 100644 --- a/ddl/out/java/LambdaCube/IR/Pipeline.java +++ b/ddl/out/java/LambdaCube/IR/Pipeline.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/PointSize.java b/ddl/out/java/LambdaCube/IR/PointSize.java index 4f2981d..b1d4fe3 100644 --- a/ddl/out/java/LambdaCube/IR/PointSize.java +++ b/ddl/out/java/LambdaCube/IR/PointSize.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/PointSpriteCoordOrigin.java b/ddl/out/java/LambdaCube/IR/PointSpriteCoordOrigin.java index 7145e2d..7c387b8 100644 --- a/ddl/out/java/LambdaCube/IR/PointSpriteCoordOrigin.java +++ b/ddl/out/java/LambdaCube/IR/PointSpriteCoordOrigin.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/PolygonMode.java b/ddl/out/java/LambdaCube/IR/PolygonMode.java index 8e8bda0..decf1e5 100644 --- a/ddl/out/java/LambdaCube/IR/PolygonMode.java +++ b/ddl/out/java/LambdaCube/IR/PolygonMode.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/PolygonOffset.java b/ddl/out/java/LambdaCube/IR/PolygonOffset.java index d5898ae..d25c57a 100644 --- a/ddl/out/java/LambdaCube/IR/PolygonOffset.java +++ b/ddl/out/java/LambdaCube/IR/PolygonOffset.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Program.java b/ddl/out/java/LambdaCube/IR/Program.java index 48f9e44..520ad58 100644 --- a/ddl/out/java/LambdaCube/IR/Program.java +++ b/ddl/out/java/LambdaCube/IR/Program.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/ProvokingVertex.java b/ddl/out/java/LambdaCube/IR/ProvokingVertex.java index 44c33a2..ebe5f5f 100644 --- a/ddl/out/java/LambdaCube/IR/ProvokingVertex.java +++ b/ddl/out/java/LambdaCube/IR/ProvokingVertex.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/RasterContext.java b/ddl/out/java/LambdaCube/IR/RasterContext.java index bd1b381..dc3c725 100644 --- a/ddl/out/java/LambdaCube/IR/RasterContext.java +++ b/ddl/out/java/LambdaCube/IR/RasterContext.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/RenderTarget.java b/ddl/out/java/LambdaCube/IR/RenderTarget.java index 3a430f5..ea18e10 100644 --- a/ddl/out/java/LambdaCube/IR/RenderTarget.java +++ b/ddl/out/java/LambdaCube/IR/RenderTarget.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/SamplerDescriptor.java b/ddl/out/java/LambdaCube/IR/SamplerDescriptor.java index d531106..1fceace 100644 --- a/ddl/out/java/LambdaCube/IR/SamplerDescriptor.java +++ b/ddl/out/java/LambdaCube/IR/SamplerDescriptor.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Slot.java b/ddl/out/java/LambdaCube/IR/Slot.java index d5226fa..970c79e 100644 --- a/ddl/out/java/LambdaCube/IR/Slot.java +++ b/ddl/out/java/LambdaCube/IR/Slot.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/StencilOperation.java b/ddl/out/java/LambdaCube/IR/StencilOperation.java index 3b2c9d7..9a4156d 100644 --- a/ddl/out/java/LambdaCube/IR/StencilOperation.java +++ b/ddl/out/java/LambdaCube/IR/StencilOperation.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/StencilOps.java b/ddl/out/java/LambdaCube/IR/StencilOps.java index 6759674..5dff15d 100644 --- a/ddl/out/java/LambdaCube/IR/StencilOps.java +++ b/ddl/out/java/LambdaCube/IR/StencilOps.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/StencilTest.java b/ddl/out/java/LambdaCube/IR/StencilTest.java index 275e52e..083c053 100644 --- a/ddl/out/java/LambdaCube/IR/StencilTest.java +++ b/ddl/out/java/LambdaCube/IR/StencilTest.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/StencilTests.java b/ddl/out/java/LambdaCube/IR/StencilTests.java index 35304b5..7cf730c 100644 --- a/ddl/out/java/LambdaCube/IR/StencilTests.java +++ b/ddl/out/java/LambdaCube/IR/StencilTests.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/StreamData.java b/ddl/out/java/LambdaCube/IR/StreamData.java index 8f48d54..6a2f49d 100644 --- a/ddl/out/java/LambdaCube/IR/StreamData.java +++ b/ddl/out/java/LambdaCube/IR/StreamData.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/TargetItem.java b/ddl/out/java/LambdaCube/IR/TargetItem.java index 89705b5..392a38c 100644 --- a/ddl/out/java/LambdaCube/IR/TargetItem.java +++ b/ddl/out/java/LambdaCube/IR/TargetItem.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/TextureDataType.java b/ddl/out/java/LambdaCube/IR/TextureDataType.java index f4b2e15..2a7824d 100644 --- a/ddl/out/java/LambdaCube/IR/TextureDataType.java +++ b/ddl/out/java/LambdaCube/IR/TextureDataType.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/TextureDescriptor.java b/ddl/out/java/LambdaCube/IR/TextureDescriptor.java index d8df081..23dedde 100644 --- a/ddl/out/java/LambdaCube/IR/TextureDescriptor.java +++ b/ddl/out/java/LambdaCube/IR/TextureDescriptor.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/TextureType.java b/ddl/out/java/LambdaCube/IR/TextureType.java index a17600a..bea424e 100644 --- a/ddl/out/java/LambdaCube/IR/TextureType.java +++ b/ddl/out/java/LambdaCube/IR/TextureType.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Value.java b/ddl/out/java/LambdaCube/IR/Value.java index d4b809e..fe9d0cd 100644 --- a/ddl/out/java/LambdaCube/IR/Value.java +++ b/ddl/out/java/LambdaCube/IR/Value.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/Mesh/JSON.java b/ddl/out/java/LambdaCube/Mesh/JSON.java index d46b506..9a1767e 100644 --- a/ddl/out/java/LambdaCube/Mesh/JSON.java +++ b/ddl/out/java/LambdaCube/Mesh/JSON.java | |||
@@ -1,10 +1,11 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.335329000000Z | 2 | // 2016-03-21T14:06:55.404479000000Z |
3 | 3 | ||
4 | package LambdaCube.Mesh; | 4 | package LambdaCube.Mesh; |
5 | 5 | ||
6 | import java.util.ArrayList; | 6 | import java.util.ArrayList; |
7 | import java.util.HashMap; | 7 | import java.util.HashMap; |
8 | import java.util.Iterator; | ||
8 | import org.json.*; | 9 | import org.json.*; |
9 | import RT.*; | 10 | import RT.*; |
10 | 11 | ||
@@ -91,25 +92,88 @@ public class JSON { | |||
91 | , (V4<Float>)fromJSON(Type.V4_Float,obj.get("w")) | 92 | , (V4<Float>)fromJSON(Type.V4_Float,obj.get("w")) |
92 | ); | 93 | ); |
93 | } | 94 | } |
94 | // case Array_Int32: return ((JArray)obj).Select(x => fromJSON (Type.Int32, x)).ToList(); | 95 | case Array_Int32: { |
95 | // case Array_Word32: return ((JArray)obj).Select(x => fromJSON (Type.Word32, x)).ToList(); | 96 | JSONArray obj = (JSONArray)rawObj; |
96 | // case Array_Float: return ((JArray)obj).Select(x => fromJSON (Type.Float, x)).ToList(); | 97 | ArrayList<Integer> v = new ArrayList<Integer> (); |
97 | // case Array_V2_Float: return ((JArray)obj).Select(x => fromJSON (Type.V2_Float, x)).ToList(); | 98 | for (int i = 0; i < obj.length(); i++) { |
98 | // case Array_V2_V2_Float: return ((JArray)obj).Select(x => fromJSON (Type.V2_V2_Float, x)).ToList(); | 99 | v.add((Integer)fromJSON (Type.Int32, obj.get(i))); |
99 | // case Array_V3_Float: return ((JArray)obj).Select(x => fromJSON (Type.V3_Float, x)).ToList(); | 100 | } |
100 | // case Array_V3_V3_Float: return ((JArray)obj).Select(x => fromJSON (Type.V3_V3_Float, x)).ToList(); | 101 | return v; |
101 | // case Array_V4_Float: return ((JArray)obj).Select(x => fromJSON (Type.V4_Float, x)).ToList(); | 102 | } |
102 | // case Array_V4_V4_Float: return ((JArray)obj).Select(x => fromJSON (Type.V4_V4_Float, x)).ToList(); | 103 | case Array_Word32: { |
103 | /* | 104 | JSONArray obj = (JSONArray)rawObj; |
105 | ArrayList<Integer> v = new ArrayList<Integer> (); | ||
106 | for (int i = 0; i < obj.length(); i++) { | ||
107 | v.add((Integer)fromJSON (Type.Word32, obj.get(i))); | ||
108 | } | ||
109 | return v; | ||
110 | } | ||
111 | case Array_Float: { | ||
112 | JSONArray obj = (JSONArray)rawObj; | ||
113 | ArrayList<Float> v = new ArrayList<Float> (); | ||
114 | for (int i = 0; i < obj.length(); i++) { | ||
115 | v.add((Float)fromJSON (Type.Float, obj.get(i))); | ||
116 | } | ||
117 | return v; | ||
118 | } | ||
119 | case Array_V2_Float: { | ||
120 | JSONArray obj = (JSONArray)rawObj; | ||
121 | ArrayList<V2<Float>> v = new ArrayList<V2<Float>> (); | ||
122 | for (int i = 0; i < obj.length(); i++) { | ||
123 | v.add((V2<Float>)fromJSON (Type.V2_Float, obj.get(i))); | ||
124 | } | ||
125 | return v; | ||
126 | } | ||
127 | case Array_V2_V2_Float: { | ||
128 | JSONArray obj = (JSONArray)rawObj; | ||
129 | ArrayList<V2<V2<Float>>> v = new ArrayList<V2<V2<Float>>> (); | ||
130 | for (int i = 0; i < obj.length(); i++) { | ||
131 | v.add((V2<V2<Float>>)fromJSON (Type.V2_V2_Float, obj.get(i))); | ||
132 | } | ||
133 | return v; | ||
134 | } | ||
135 | case Array_V3_Float: { | ||
136 | JSONArray obj = (JSONArray)rawObj; | ||
137 | ArrayList<V3<Float>> v = new ArrayList<V3<Float>> (); | ||
138 | for (int i = 0; i < obj.length(); i++) { | ||
139 | v.add((V3<Float>)fromJSON (Type.V3_Float, obj.get(i))); | ||
140 | } | ||
141 | return v; | ||
142 | } | ||
143 | case Array_V3_V3_Float: { | ||
144 | JSONArray obj = (JSONArray)rawObj; | ||
145 | ArrayList<V3<V3<Float>>> v = new ArrayList<V3<V3<Float>>> (); | ||
146 | for (int i = 0; i < obj.length(); i++) { | ||
147 | v.add((V3<V3<Float>>)fromJSON (Type.V3_V3_Float, obj.get(i))); | ||
148 | } | ||
149 | return v; | ||
150 | } | ||
151 | case Array_V4_Float: { | ||
152 | JSONArray obj = (JSONArray)rawObj; | ||
153 | ArrayList<V4<Float>> v = new ArrayList<V4<Float>> (); | ||
154 | for (int i = 0; i < obj.length(); i++) { | ||
155 | v.add((V4<Float>)fromJSON (Type.V4_Float, obj.get(i))); | ||
156 | } | ||
157 | return v; | ||
158 | } | ||
159 | case Array_V4_V4_Float: { | ||
160 | JSONArray obj = (JSONArray)rawObj; | ||
161 | ArrayList<V4<V4<Float>>> v = new ArrayList<V4<V4<Float>>> (); | ||
162 | for (int i = 0; i < obj.length(); i++) { | ||
163 | v.add((V4<V4<Float>>)fromJSON (Type.V4_V4_Float, obj.get(i))); | ||
164 | } | ||
165 | return v; | ||
166 | } | ||
104 | case Map_String_MeshAttribute: { | 167 | case Map_String_MeshAttribute: { |
105 | var map = new HashMap<String, MeshAttribute> (); | 168 | JSONObject obj = (JSONObject)rawObj; |
106 | foreach(var i in (JSONObject)rawObj) { | 169 | HashMap<String, MeshAttribute> map = new HashMap<String, MeshAttribute> (); |
107 | map.Add( (String)fromJSON(Type.String,i.Key) | 170 | Iterator<String> keyIt = obj.keys(); |
108 | , (MeshAttribute)fromJSON(Type.MeshAttribute,i.Value)); | 171 | while(keyIt.hasNext()) { |
172 | String key = keyIt.next(); | ||
173 | map.put(key, (MeshAttribute)fromJSON(Type.MeshAttribute,obj.get(key))); | ||
109 | } | 174 | } |
110 | return map; | 175 | return map; |
111 | } | 176 | } |
112 | */ | ||
113 | 177 | ||
114 | case MeshAttribute: { | 178 | case MeshAttribute: { |
115 | JSONObject obj = (JSONObject)rawObj; | 179 | JSONObject obj = (JSONObject)rawObj; |
diff --git a/ddl/out/java/LambdaCube/Mesh/Mesh.java b/ddl/out/java/LambdaCube/Mesh/Mesh.java index 00bd352..1eb05d2 100644 --- a/ddl/out/java/LambdaCube/Mesh/Mesh.java +++ b/ddl/out/java/LambdaCube/Mesh/Mesh.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.335329000000Z | 2 | // 2016-03-21T14:06:55.404479000000Z |
3 | 3 | ||
4 | package LambdaCube.Mesh; | 4 | package LambdaCube.Mesh; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/Mesh/MeshAttribute.java b/ddl/out/java/LambdaCube/Mesh/MeshAttribute.java index b6d3585..dff2e02 100644 --- a/ddl/out/java/LambdaCube/Mesh/MeshAttribute.java +++ b/ddl/out/java/LambdaCube/Mesh/MeshAttribute.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.335329000000Z | 2 | // 2016-03-21T14:06:55.404479000000Z |
3 | 3 | ||
4 | package LambdaCube.Mesh; | 4 | package LambdaCube.Mesh; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/Mesh/MeshPrimitive.java b/ddl/out/java/LambdaCube/Mesh/MeshPrimitive.java index 90a2797..7c25ae8 100644 --- a/ddl/out/java/LambdaCube/Mesh/MeshPrimitive.java +++ b/ddl/out/java/LambdaCube/Mesh/MeshPrimitive.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.335329000000Z | 2 | // 2016-03-21T14:06:55.404479000000Z |
3 | 3 | ||
4 | package LambdaCube.Mesh; | 4 | package LambdaCube.Mesh; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/PipelineSchema/JSON.java b/ddl/out/java/LambdaCube/PipelineSchema/JSON.java index 346f719..1fec7e8 100644 --- a/ddl/out/java/LambdaCube/PipelineSchema/JSON.java +++ b/ddl/out/java/LambdaCube/PipelineSchema/JSON.java | |||
@@ -1,10 +1,11 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.293368000000Z | 2 | // 2016-03-21T14:06:55.360355000000Z |
3 | 3 | ||
4 | package LambdaCube.PipelineSchema; | 4 | package LambdaCube.PipelineSchema; |
5 | 5 | ||
6 | import java.util.ArrayList; | 6 | import java.util.ArrayList; |
7 | import java.util.HashMap; | 7 | import java.util.HashMap; |
8 | import java.util.Iterator; | ||
8 | import org.json.*; | 9 | import org.json.*; |
9 | import RT.*; | 10 | import RT.*; |
10 | 11 | ||
@@ -27,36 +28,36 @@ public class JSON { | |||
27 | public static Object fromJSON(Type type, Object rawObj) throws JSONException, Exception { | 28 | public static Object fromJSON(Type type, Object rawObj) throws JSONException, Exception { |
28 | switch (type) { | 29 | switch (type) { |
29 | case String: return (String)rawObj; | 30 | case String: return (String)rawObj; |
30 | /* | ||
31 | case Map_String_InputType: { | 31 | case Map_String_InputType: { |
32 | var map = new HashMap<String, InputType> (); | 32 | JSONObject obj = (JSONObject)rawObj; |
33 | foreach(var i in (JSONObject)rawObj) { | 33 | HashMap<String, InputType> map = new HashMap<String, InputType> (); |
34 | map.Add( (String)fromJSON(Type.String,i.Key) | 34 | Iterator<String> keyIt = obj.keys(); |
35 | , (InputType)fromJSON(Type.InputType,i.Value)); | 35 | while(keyIt.hasNext()) { |
36 | String key = keyIt.next(); | ||
37 | map.put(key, (InputType)fromJSON(Type.InputType,obj.get(key))); | ||
36 | } | 38 | } |
37 | return map; | 39 | return map; |
38 | } | 40 | } |
39 | */ | ||
40 | /* | ||
41 | case Map_String_ObjectArraySchema: { | 41 | case Map_String_ObjectArraySchema: { |
42 | var map = new HashMap<String, ObjectArraySchema> (); | 42 | JSONObject obj = (JSONObject)rawObj; |
43 | foreach(var i in (JSONObject)rawObj) { | 43 | HashMap<String, ObjectArraySchema> map = new HashMap<String, ObjectArraySchema> (); |
44 | map.Add( (String)fromJSON(Type.String,i.Key) | 44 | Iterator<String> keyIt = obj.keys(); |
45 | , (ObjectArraySchema)fromJSON(Type.ObjectArraySchema,i.Value)); | 45 | while(keyIt.hasNext()) { |
46 | String key = keyIt.next(); | ||
47 | map.put(key, (ObjectArraySchema)fromJSON(Type.ObjectArraySchema,obj.get(key))); | ||
46 | } | 48 | } |
47 | return map; | 49 | return map; |
48 | } | 50 | } |
49 | */ | ||
50 | /* | ||
51 | case Map_String_StreamType: { | 51 | case Map_String_StreamType: { |
52 | var map = new HashMap<String, StreamType> (); | 52 | JSONObject obj = (JSONObject)rawObj; |
53 | foreach(var i in (JSONObject)rawObj) { | 53 | HashMap<String, StreamType> map = new HashMap<String, StreamType> (); |
54 | map.Add( (String)fromJSON(Type.String,i.Key) | 54 | Iterator<String> keyIt = obj.keys(); |
55 | , (StreamType)fromJSON(Type.StreamType,i.Value)); | 55 | while(keyIt.hasNext()) { |
56 | String key = keyIt.next(); | ||
57 | map.put(key, (StreamType)fromJSON(Type.StreamType,obj.get(key))); | ||
56 | } | 58 | } |
57 | return map; | 59 | return map; |
58 | } | 60 | } |
59 | */ | ||
60 | 61 | ||
61 | case StreamType: { | 62 | case StreamType: { |
62 | JSONObject obj = (JSONObject)rawObj; | 63 | JSONObject obj = (JSONObject)rawObj; |
diff --git a/ddl/out/java/LambdaCube/PipelineSchema/ObjectArraySchema.java b/ddl/out/java/LambdaCube/PipelineSchema/ObjectArraySchema.java index 282cfe6..cc15385 100644 --- a/ddl/out/java/LambdaCube/PipelineSchema/ObjectArraySchema.java +++ b/ddl/out/java/LambdaCube/PipelineSchema/ObjectArraySchema.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.293368000000Z | 2 | // 2016-03-21T14:06:55.360355000000Z |
3 | 3 | ||
4 | package LambdaCube.PipelineSchema; | 4 | package LambdaCube.PipelineSchema; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/PipelineSchema/PipelineSchema.java b/ddl/out/java/LambdaCube/PipelineSchema/PipelineSchema.java index 3128d7f..3618a3a 100644 --- a/ddl/out/java/LambdaCube/PipelineSchema/PipelineSchema.java +++ b/ddl/out/java/LambdaCube/PipelineSchema/PipelineSchema.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.293368000000Z | 2 | // 2016-03-21T14:06:55.360355000000Z |
3 | 3 | ||
4 | package LambdaCube.PipelineSchema; | 4 | package LambdaCube.PipelineSchema; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/PipelineSchema/StreamType.java b/ddl/out/java/LambdaCube/PipelineSchema/StreamType.java index f8d8e8f..1861146 100644 --- a/ddl/out/java/LambdaCube/PipelineSchema/StreamType.java +++ b/ddl/out/java/LambdaCube/PipelineSchema/StreamType.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.293368000000Z | 2 | // 2016-03-21T14:06:55.360355000000Z |
3 | 3 | ||
4 | package LambdaCube.PipelineSchema; | 4 | package LambdaCube.PipelineSchema; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/TypeInfo/CompileResult.java b/ddl/out/java/LambdaCube/TypeInfo/CompileResult.java index c9e7b2d..0b21b64 100644 --- a/ddl/out/java/LambdaCube/TypeInfo/CompileResult.java +++ b/ddl/out/java/LambdaCube/TypeInfo/CompileResult.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.409214000000Z | 2 | // 2016-03-21T14:06:55.479415000000Z |
3 | 3 | ||
4 | package LambdaCube.TypeInfo; | 4 | package LambdaCube.TypeInfo; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/TypeInfo/JSON.java b/ddl/out/java/LambdaCube/TypeInfo/JSON.java index ba6b3d6..d4ea991 100644 --- a/ddl/out/java/LambdaCube/TypeInfo/JSON.java +++ b/ddl/out/java/LambdaCube/TypeInfo/JSON.java | |||
@@ -1,10 +1,11 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.409214000000Z | 2 | // 2016-03-21T14:06:55.479415000000Z |
3 | 3 | ||
4 | package LambdaCube.TypeInfo; | 4 | package LambdaCube.TypeInfo; |
5 | 5 | ||
6 | import java.util.ArrayList; | 6 | import java.util.ArrayList; |
7 | import java.util.HashMap; | 7 | import java.util.HashMap; |
8 | import java.util.Iterator; | ||
8 | import org.json.*; | 9 | import org.json.*; |
9 | import RT.*; | 10 | import RT.*; |
10 | 11 | ||
@@ -27,8 +28,22 @@ public class JSON { | |||
27 | switch (type) { | 28 | switch (type) { |
28 | case Int: return (Integer)rawObj; | 29 | case Int: return (Integer)rawObj; |
29 | case String: return (String)rawObj; | 30 | case String: return (String)rawObj; |
30 | // case Array_Range: return ((JArray)obj).Select(x => fromJSON (Type.Range, x)).ToList(); | 31 | case Array_Range: { |
31 | // case Array_TypeInfo: return ((JArray)obj).Select(x => fromJSON (Type.TypeInfo, x)).ToList(); | 32 | JSONArray obj = (JSONArray)rawObj; |
33 | ArrayList<Range> v = new ArrayList<Range> (); | ||
34 | for (int i = 0; i < obj.length(); i++) { | ||
35 | v.add((Range)fromJSON (Type.Range, obj.get(i))); | ||
36 | } | ||
37 | return v; | ||
38 | } | ||
39 | case Array_TypeInfo: { | ||
40 | JSONArray obj = (JSONArray)rawObj; | ||
41 | ArrayList<TypeInfo> v = new ArrayList<TypeInfo> (); | ||
42 | for (int i = 0; i < obj.length(); i++) { | ||
43 | v.add((TypeInfo)fromJSON (Type.TypeInfo, obj.get(i))); | ||
44 | } | ||
45 | return v; | ||
46 | } | ||
32 | 47 | ||
33 | case Range: { | 48 | case Range: { |
34 | JSONObject obj = (JSONObject)rawObj; | 49 | JSONObject obj = (JSONObject)rawObj; |
diff --git a/ddl/out/java/LambdaCube/TypeInfo/Range.java b/ddl/out/java/LambdaCube/TypeInfo/Range.java index 3ecd9b0..61e2ddb 100644 --- a/ddl/out/java/LambdaCube/TypeInfo/Range.java +++ b/ddl/out/java/LambdaCube/TypeInfo/Range.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.409214000000Z | 2 | // 2016-03-21T14:06:55.479415000000Z |
3 | 3 | ||
4 | package LambdaCube.TypeInfo; | 4 | package LambdaCube.TypeInfo; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/TypeInfo/TypeInfo.java b/ddl/out/java/LambdaCube/TypeInfo/TypeInfo.java index c06980e..a34fda6 100644 --- a/ddl/out/java/LambdaCube/TypeInfo/TypeInfo.java +++ b/ddl/out/java/LambdaCube/TypeInfo/TypeInfo.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.409214000000Z | 2 | // 2016-03-21T14:06:55.479415000000Z |
3 | 3 | ||
4 | package LambdaCube.TypeInfo; | 4 | package LambdaCube.TypeInfo; |
5 | 5 | ||
diff --git a/ddl/out/java/TestData/ClientInfo.java b/ddl/out/java/TestData/ClientInfo.java index f054e9f..81f9c9a 100644 --- a/ddl/out/java/TestData/ClientInfo.java +++ b/ddl/out/java/TestData/ClientInfo.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.455557000000Z | 2 | // 2016-03-21T14:06:55.528630000000Z |
3 | 3 | ||
4 | package TestData; | 4 | package TestData; |
5 | 5 | ||
diff --git a/ddl/out/java/TestData/Frame.java b/ddl/out/java/TestData/Frame.java index d9f22de..1e4f4a5 100644 --- a/ddl/out/java/TestData/Frame.java +++ b/ddl/out/java/TestData/Frame.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.455557000000Z | 2 | // 2016-03-21T14:06:55.528630000000Z |
3 | 3 | ||
4 | package TestData; | 4 | package TestData; |
5 | 5 | ||
diff --git a/ddl/out/java/TestData/FrameResult.java b/ddl/out/java/TestData/FrameResult.java index 41748d6..ded69a2 100644 --- a/ddl/out/java/TestData/FrameResult.java +++ b/ddl/out/java/TestData/FrameResult.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.455557000000Z | 2 | // 2016-03-21T14:06:55.528630000000Z |
3 | 3 | ||
4 | package TestData; | 4 | package TestData; |
5 | 5 | ||
diff --git a/ddl/out/java/TestData/JSON.java b/ddl/out/java/TestData/JSON.java index 011b471..7bf7ff0 100644 --- a/ddl/out/java/TestData/JSON.java +++ b/ddl/out/java/TestData/JSON.java | |||
@@ -1,10 +1,11 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.455557000000Z | 2 | // 2016-03-21T14:06:55.528630000000Z |
3 | 3 | ||
4 | package TestData; | 4 | package TestData; |
5 | 5 | ||
6 | import java.util.ArrayList; | 6 | import java.util.ArrayList; |
7 | import java.util.HashMap; | 7 | import java.util.HashMap; |
8 | import java.util.Iterator; | ||
8 | import org.json.*; | 9 | import org.json.*; |
9 | import RT.*; | 10 | import RT.*; |
10 | 11 | ||
@@ -47,43 +48,92 @@ public class JSON { | |||
47 | case Int: return (Integer)rawObj; | 48 | case Int: return (Integer)rawObj; |
48 | case Float: return (Float)rawObj; | 49 | case Float: return (Float)rawObj; |
49 | case String: return (String)rawObj; | 50 | case String: return (String)rawObj; |
50 | // case Array_Int: return ((JArray)obj).Select(x => fromJSON (Type.Int, x)).ToList(); | 51 | case Array_Int: { |
51 | // case Array_Float: return ((JArray)obj).Select(x => fromJSON (Type.Float, x)).ToList(); | 52 | JSONArray obj = (JSONArray)rawObj; |
52 | // case Array_String: return ((JArray)obj).Select(x => fromJSON (Type.String, x)).ToList(); | 53 | ArrayList<Integer> v = new ArrayList<Integer> (); |
53 | // case Array_Frame: return ((JArray)obj).Select(x => fromJSON (Type.Frame, x)).ToList(); | 54 | for (int i = 0; i < obj.length(); i++) { |
54 | // case Array_Mesh: return ((JArray)obj).Select(x => fromJSON (Type.Mesh, x)).ToList(); | 55 | v.add((Integer)fromJSON (Type.Int, obj.get(i))); |
55 | // case Array_PipelineInfo: return ((JArray)obj).Select(x => fromJSON (Type.PipelineInfo, x)).ToList(); | 56 | } |
56 | // case Array_Scene: return ((JArray)obj).Select(x => fromJSON (Type.Scene, x)).ToList(); | 57 | return v; |
57 | /* | 58 | } |
59 | case Array_Float: { | ||
60 | JSONArray obj = (JSONArray)rawObj; | ||
61 | ArrayList<Float> v = new ArrayList<Float> (); | ||
62 | for (int i = 0; i < obj.length(); i++) { | ||
63 | v.add((Float)fromJSON (Type.Float, obj.get(i))); | ||
64 | } | ||
65 | return v; | ||
66 | } | ||
67 | case Array_String: { | ||
68 | JSONArray obj = (JSONArray)rawObj; | ||
69 | ArrayList<String> v = new ArrayList<String> (); | ||
70 | for (int i = 0; i < obj.length(); i++) { | ||
71 | v.add((String)fromJSON (Type.String, obj.get(i))); | ||
72 | } | ||
73 | return v; | ||
74 | } | ||
75 | case Array_Frame: { | ||
76 | JSONArray obj = (JSONArray)rawObj; | ||
77 | ArrayList<Frame> v = new ArrayList<Frame> (); | ||
78 | for (int i = 0; i < obj.length(); i++) { | ||
79 | v.add((Frame)fromJSON (Type.Frame, obj.get(i))); | ||
80 | } | ||
81 | return v; | ||
82 | } | ||
83 | case Array_Mesh: { | ||
84 | JSONArray obj = (JSONArray)rawObj; | ||
85 | ArrayList<Mesh> v = new ArrayList<Mesh> (); | ||
86 | for (int i = 0; i < obj.length(); i++) { | ||
87 | v.add((Mesh)fromJSON (Type.Mesh, obj.get(i))); | ||
88 | } | ||
89 | return v; | ||
90 | } | ||
91 | case Array_PipelineInfo: { | ||
92 | JSONArray obj = (JSONArray)rawObj; | ||
93 | ArrayList<PipelineInfo> v = new ArrayList<PipelineInfo> (); | ||
94 | for (int i = 0; i < obj.length(); i++) { | ||
95 | v.add((PipelineInfo)fromJSON (Type.PipelineInfo, obj.get(i))); | ||
96 | } | ||
97 | return v; | ||
98 | } | ||
99 | case Array_Scene: { | ||
100 | JSONArray obj = (JSONArray)rawObj; | ||
101 | ArrayList<Scene> v = new ArrayList<Scene> (); | ||
102 | for (int i = 0; i < obj.length(); i++) { | ||
103 | v.add((Scene)fromJSON (Type.Scene, obj.get(i))); | ||
104 | } | ||
105 | return v; | ||
106 | } | ||
58 | case Map_String_Int: { | 107 | case Map_String_Int: { |
59 | var map = new HashMap<String, Integer> (); | 108 | JSONObject obj = (JSONObject)rawObj; |
60 | foreach(var i in (JSONObject)rawObj) { | 109 | HashMap<String, Integer> map = new HashMap<String, Integer> (); |
61 | map.Add( (String)fromJSON(Type.String,i.Key) | 110 | Iterator<String> keyIt = obj.keys(); |
62 | , (Integer)fromJSON(Type.Int,i.Value)); | 111 | while(keyIt.hasNext()) { |
112 | String key = keyIt.next(); | ||
113 | map.put(key, (Integer)fromJSON(Type.Int,obj.get(key))); | ||
63 | } | 114 | } |
64 | return map; | 115 | return map; |
65 | } | 116 | } |
66 | */ | ||
67 | /* | ||
68 | case Map_String_Array_Int: { | 117 | case Map_String_Array_Int: { |
69 | var map = new HashMap<String, ArrayList<Integer>> (); | 118 | JSONObject obj = (JSONObject)rawObj; |
70 | foreach(var i in (JSONObject)rawObj) { | 119 | HashMap<String, ArrayList<Integer>> map = new HashMap<String, ArrayList<Integer>> (); |
71 | map.Add( (String)fromJSON(Type.String,i.Key) | 120 | Iterator<String> keyIt = obj.keys(); |
72 | , (ArrayList<Integer>)fromJSON(Type.Array_Int,i.Value)); | 121 | while(keyIt.hasNext()) { |
122 | String key = keyIt.next(); | ||
123 | map.put(key, (ArrayList<Integer>)fromJSON(Type.Array_Int,obj.get(key))); | ||
73 | } | 124 | } |
74 | return map; | 125 | return map; |
75 | } | 126 | } |
76 | */ | ||
77 | /* | ||
78 | case Map_String_Value: { | 127 | case Map_String_Value: { |
79 | var map = new HashMap<String, Value> (); | 128 | JSONObject obj = (JSONObject)rawObj; |
80 | foreach(var i in (JSONObject)rawObj) { | 129 | HashMap<String, Value> map = new HashMap<String, Value> (); |
81 | map.Add( (String)fromJSON(Type.String,i.Key) | 130 | Iterator<String> keyIt = obj.keys(); |
82 | , (Value)fromJSON(Type.Value,i.Value)); | 131 | while(keyIt.hasNext()) { |
132 | String key = keyIt.next(); | ||
133 | map.put(key, (Value)fromJSON(Type.Value,obj.get(key))); | ||
83 | } | 134 | } |
84 | return map; | 135 | return map; |
85 | } | 136 | } |
86 | */ | ||
87 | 137 | ||
88 | case ClientInfo: { | 138 | case ClientInfo: { |
89 | JSONObject obj = (JSONObject)rawObj; | 139 | JSONObject obj = (JSONObject)rawObj; |
diff --git a/ddl/out/java/TestData/PipelineInfo.java b/ddl/out/java/TestData/PipelineInfo.java index b49e3cd..89e8ca5 100644 --- a/ddl/out/java/TestData/PipelineInfo.java +++ b/ddl/out/java/TestData/PipelineInfo.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.455557000000Z | 2 | // 2016-03-21T14:06:55.528630000000Z |
3 | 3 | ||
4 | package TestData; | 4 | package TestData; |
5 | 5 | ||
diff --git a/ddl/out/java/TestData/RenderJob.java b/ddl/out/java/TestData/RenderJob.java index c6b2504..279bd6c 100644 --- a/ddl/out/java/TestData/RenderJob.java +++ b/ddl/out/java/TestData/RenderJob.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.455557000000Z | 2 | // 2016-03-21T14:06:55.528630000000Z |
3 | 3 | ||
4 | package TestData; | 4 | package TestData; |
5 | 5 | ||
diff --git a/ddl/out/java/TestData/RenderJobResult.java b/ddl/out/java/TestData/RenderJobResult.java index 25e8fc2..b6bf2c9 100644 --- a/ddl/out/java/TestData/RenderJobResult.java +++ b/ddl/out/java/TestData/RenderJobResult.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.455557000000Z | 2 | // 2016-03-21T14:06:55.528630000000Z |
3 | 3 | ||
4 | package TestData; | 4 | package TestData; |
5 | 5 | ||
diff --git a/ddl/out/java/TestData/Scene.java b/ddl/out/java/TestData/Scene.java index 87bf983..45a21ed 100644 --- a/ddl/out/java/TestData/Scene.java +++ b/ddl/out/java/TestData/Scene.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:10.455557000000Z | 2 | // 2016-03-21T14:06:55.528630000000Z |
3 | 3 | ||
4 | package TestData; | 4 | package TestData; |
5 | 5 | ||