finish java json loader

101 files changed, 481 insertions, 230 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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 #include "LambdaCube.IR.hpp"
 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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 using System;
 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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 #ifndef HEADER_LambdaCube.IR_H
 #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 @@
 -- generated file, do not modify!
--- 2016-03-21T13:31:09.634879000000Z
+-- 2016-03-21T14:06:54.700322000000Z
 
 {-# LANGUAGE OverloadedStrings, RecordWildCards #-}
 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 @@
 -- generated file, do not modify!
--- 2016-03-21T13:31:09.634879000000Z
+-- 2016-03-21T14:06:54.700322000000Z
 
 module LambdaCube.IR where
 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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 typealias StreamName = Int
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 #ifndef HEADER_LambdaCube.IR_H
 #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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.335329000000Z
+// 2016-03-21T14:06:55.404479000000Z
 
 #include "LambdaCube.Mesh.hpp"
 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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.335329000000Z
+// 2016-03-21T14:06:55.404479000000Z
 
 using System;
 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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.335329000000Z
+// 2016-03-21T14:06:55.404479000000Z
 
 #ifndef HEADER_LambdaCube.Mesh_H
 #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 @@
 -- generated file, do not modify!
--- 2016-03-21T13:31:10.335329000000Z
+-- 2016-03-21T14:06:55.404479000000Z
 
 {-# LANGUAGE OverloadedStrings, RecordWildCards #-}
 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 @@
 -- generated file, do not modify!
--- 2016-03-21T13:31:10.335329000000Z
+-- 2016-03-21T14:06:55.404479000000Z
 
 module LambdaCube.Mesh where
 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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.335329000000Z
+// 2016-03-21T14:06:55.404479000000Z
 
 enum MeshAttribute {
   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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.335329000000Z
+// 2016-03-21T14:06:55.404479000000Z
 
 #ifndef HEADER_LambdaCube.Mesh_H
 #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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.293368000000Z
+// 2016-03-21T14:06:55.360355000000Z
 
 #include "LambdaCube.PipelineSchema.hpp"
 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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.293368000000Z
+// 2016-03-21T14:06:55.360355000000Z
 
 using System;
 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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.293368000000Z
+// 2016-03-21T14:06:55.360355000000Z
 
 #ifndef HEADER_LambdaCube.PipelineSchema_H
 #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 @@
 -- generated file, do not modify!
--- 2016-03-21T13:31:10.293368000000Z
+-- 2016-03-21T14:06:55.360355000000Z
 
 {-# LANGUAGE OverloadedStrings, RecordWildCards #-}
 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 @@
 -- generated file, do not modify!
--- 2016-03-21T13:31:10.293368000000Z
+-- 2016-03-21T14:06:55.360355000000Z
 
 module LambdaCube.PipelineSchema where
 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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.293368000000Z
+// 2016-03-21T14:06:55.360355000000Z
 
 enum StreamType {
   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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.293368000000Z
+// 2016-03-21T14:06:55.360355000000Z
 
 #ifndef HEADER_LambdaCube.PipelineSchema_H
 #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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.409214000000Z
+// 2016-03-21T14:06:55.479415000000Z
 
 #include "LambdaCube.TypeInfo.hpp"
 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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.409214000000Z
+// 2016-03-21T14:06:55.479415000000Z
 
 using System;
 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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.409214000000Z
+// 2016-03-21T14:06:55.479415000000Z
 
 #ifndef HEADER_LambdaCube.TypeInfo_H
 #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 @@
 -- generated file, do not modify!
--- 2016-03-21T13:31:10.409214000000Z
+-- 2016-03-21T14:06:55.479415000000Z
 
 {-# LANGUAGE OverloadedStrings, RecordWildCards #-}
 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 @@
 -- generated file, do not modify!
--- 2016-03-21T13:31:10.409214000000Z
+-- 2016-03-21T14:06:55.479415000000Z
 
 module LambdaCube.TypeInfo where
 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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.409214000000Z
+// 2016-03-21T14:06:55.479415000000Z
 
 enum Range {
   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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.409214000000Z
+// 2016-03-21T14:06:55.479415000000Z
 
 #ifndef HEADER_LambdaCube.TypeInfo_H
 #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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.455557000000Z
+// 2016-03-21T14:06:55.528630000000Z
 
 #include "TestData.hpp"
 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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.455557000000Z
+// 2016-03-21T14:06:55.528630000000Z
 
 using System;
 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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.455557000000Z
+// 2016-03-21T14:06:55.528630000000Z
 
 #ifndef HEADER_TestData_H
 #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 @@
 -- generated file, do not modify!
--- 2016-03-21T13:31:10.455557000000Z
+-- 2016-03-21T14:06:55.528630000000Z
 
 {-# LANGUAGE OverloadedStrings, RecordWildCards #-}
 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 @@
 -- generated file, do not modify!
--- 2016-03-21T13:31:10.455557000000Z
+-- 2016-03-21T14:06:55.528630000000Z
 
 module TestData where
 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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.455557000000Z
+// 2016-03-21T14:06:55.528630000000Z
 
 enum ClientInfo {
   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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.455557000000Z
+// 2016-03-21T14:06:55.528630000000Z
 
 #ifndef HEADER_TestData_H
 #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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import org.json.*;
 import RT.*;
 
@@ -288,26 +289,138 @@ public class JSON {
           , (V4<Float>)fromJSON(Type.V4_Float,obj.get("w"))
           );
       }
-//      case Array_Int: return ((JArray)obj).Select(x => fromJSON (Type.Int, x)).ToList();
-//      case Array_Int32: return ((JArray)obj).Select(x => fromJSON (Type.Int32, x)).ToList();
-//      case Array_Word32: return ((JArray)obj).Select(x => fromJSON (Type.Word32, x)).ToList();
-//      case Array_Float: return ((JArray)obj).Select(x => fromJSON (Type.Float, x)).ToList();
-//      case Array_Bool: return ((JArray)obj).Select(x => fromJSON (Type.Bool, x)).ToList();
-//      case Array_ClearImage: return ((JArray)obj).Select(x => fromJSON (Type.ClearImage, x)).ToList();
-//      case Array_Command: return ((JArray)obj).Select(x => fromJSON (Type.Command, x)).ToList();
-//      case Array_Parameter: return ((JArray)obj).Select(x => fromJSON (Type.Parameter, x)).ToList();
-//      case Array_Program: return ((JArray)obj).Select(x => fromJSON (Type.Program, x)).ToList();
-//      case Array_RenderTarget: return ((JArray)obj).Select(x => fromJSON (Type.RenderTarget, x)).ToList();
-//      case Array_SamplerDescriptor: return ((JArray)obj).Select(x => fromJSON (Type.SamplerDescriptor, x)).ToList();
-//      case Array_Slot: return ((JArray)obj).Select(x => fromJSON (Type.Slot, x)).ToList();
-//      case Array_StreamData: return ((JArray)obj).Select(x => fromJSON (Type.StreamData, x)).ToList();
-//      case Array_TargetItem: return ((JArray)obj).Select(x => fromJSON (Type.TargetItem, x)).ToList();
-//      case Array_TextureDescriptor: return ((JArray)obj).Select(x => fromJSON (Type.TextureDescriptor, x)).ToList();
-//      case List_FragmentOperation: return ((JArray)obj).Select(x => fromJSON (Type.FragmentOperation, x)).ToList();
-/*
+      case Array_Int: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<Integer> v = new ArrayList<Integer> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((Integer)fromJSON (Type.Int, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_Int32: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<Integer> v = new ArrayList<Integer> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((Integer)fromJSON (Type.Int32, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_Word32: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<Integer> v = new ArrayList<Integer> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((Integer)fromJSON (Type.Word32, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_Float: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<Float> v = new ArrayList<Float> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((Float)fromJSON (Type.Float, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_Bool: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<Boolean> v = new ArrayList<Boolean> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((Boolean)fromJSON (Type.Bool, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_ClearImage: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<ClearImage> v = new ArrayList<ClearImage> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((ClearImage)fromJSON (Type.ClearImage, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_Command: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<Command> v = new ArrayList<Command> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((Command)fromJSON (Type.Command, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_Parameter: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<Parameter> v = new ArrayList<Parameter> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((Parameter)fromJSON (Type.Parameter, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_Program: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<Program> v = new ArrayList<Program> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((Program)fromJSON (Type.Program, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_RenderTarget: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<RenderTarget> v = new ArrayList<RenderTarget> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((RenderTarget)fromJSON (Type.RenderTarget, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_SamplerDescriptor: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<SamplerDescriptor> v = new ArrayList<SamplerDescriptor> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((SamplerDescriptor)fromJSON (Type.SamplerDescriptor, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_Slot: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<Slot> v = new ArrayList<Slot> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((Slot)fromJSON (Type.Slot, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_StreamData: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<StreamData> v = new ArrayList<StreamData> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((StreamData)fromJSON (Type.StreamData, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_TargetItem: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<TargetItem> v = new ArrayList<TargetItem> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((TargetItem)fromJSON (Type.TargetItem, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_TextureDescriptor: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<TextureDescriptor> v = new ArrayList<TextureDescriptor> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((TextureDescriptor)fromJSON (Type.TextureDescriptor, obj.get(i)));
+        }
+        return v;
+      }
+      case List_FragmentOperation: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<FragmentOperation> v = new ArrayList<FragmentOperation> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((FragmentOperation)fromJSON (Type.FragmentOperation, obj.get(i)));
+        }
+        return v;
+      }
       case Maybe_Int: {
-        var m = new Maybe<Integer> ();
-        if (obj == null || obj.Type == JTokenType.Null) {
+        JSONObject obj = (JSONObject)rawObj;
+        Maybe<Integer> m = new Maybe<Integer> ();
+        if (obj == null || obj == JSONObject.NULL) {
           m.valid = false;
         } else {
           m.valid = true;
@@ -315,11 +428,10 @@ public class JSON {
         }
         return m;
       }
-*/
-/*
       case Maybe_Float: {
-        var m = new Maybe<Float> ();
-        if (obj == null || obj.Type == JTokenType.Null) {
+        JSONObject obj = (JSONObject)rawObj;
+        Maybe<Float> m = new Maybe<Float> ();
+        if (obj == null || obj == JSONObject.NULL) {
           m.valid = false;
         } else {
           m.valid = true;
@@ -327,11 +439,10 @@ public class JSON {
         }
         return m;
       }
-*/
-/*
       case Maybe_String: {
-        var m = new Maybe<String> ();
-        if (obj == null || obj.Type == JTokenType.Null) {
+        JSONObject obj = (JSONObject)rawObj;
+        Maybe<String> m = new Maybe<String> ();
+        if (obj == null || obj == JSONObject.NULL) {
           m.valid = false;
         } else {
           m.valid = true;
@@ -339,11 +450,10 @@ public class JSON {
         }
         return m;
       }
-*/
-/*
       case Maybe_ComparisonFunction: {
-        var m = new Maybe<ComparisonFunction> ();
-        if (obj == null || obj.Type == JTokenType.Null) {
+        JSONObject obj = (JSONObject)rawObj;
+        Maybe<ComparisonFunction> m = new Maybe<ComparisonFunction> ();
+        if (obj == null || obj == JSONObject.NULL) {
           m.valid = false;
         } else {
           m.valid = true;
@@ -351,11 +461,10 @@ public class JSON {
         }
         return m;
       }
-*/
-/*
       case Maybe_EdgeMode: {
-        var m = new Maybe<EdgeMode> ();
-        if (obj == null || obj.Type == JTokenType.Null) {
+        JSONObject obj = (JSONObject)rawObj;
+        Maybe<EdgeMode> m = new Maybe<EdgeMode> ();
+        if (obj == null || obj == JSONObject.NULL) {
           m.valid = false;
         } else {
           m.valid = true;
@@ -363,11 +472,10 @@ public class JSON {
         }
         return m;
       }
-*/
-/*
       case Maybe_ImageRef: {
-        var m = new Maybe<ImageRef> ();
-        if (obj == null || obj.Type == JTokenType.Null) {
+        JSONObject obj = (JSONObject)rawObj;
+        Maybe<ImageRef> m = new Maybe<ImageRef> ();
+        if (obj == null || obj == JSONObject.NULL) {
           m.valid = false;
         } else {
           m.valid = true;
@@ -375,37 +483,36 @@ public class JSON {
         }
         return m;
       }
-*/
-/*
       case Map_String_ArrayValue: {
-        var map = new HashMap<String, ArrayValue> ();
-        foreach(var i in (JSONObject)rawObj) {
-          map.Add( (String)fromJSON(Type.String,i.Key)
-                 , (ArrayValue)fromJSON(Type.ArrayValue,i.Value));
+        JSONObject obj = (JSONObject)rawObj;
+        HashMap<String, ArrayValue> map = new HashMap<String, ArrayValue> ();
+        Iterator<String> keyIt = obj.keys();
+        while(keyIt.hasNext()) {
+          String key = keyIt.next();
+          map.put(key, (ArrayValue)fromJSON(Type.ArrayValue,obj.get(key)));
         }
         return map;
       }
-*/
-/*
       case Map_String_InputType: {
-        var map = new HashMap<String, InputType> ();
-        foreach(var i in (JSONObject)rawObj) {
-          map.Add( (String)fromJSON(Type.String,i.Key)
-                 , (InputType)fromJSON(Type.InputType,i.Value));
+        JSONObject obj = (JSONObject)rawObj;
+        HashMap<String, InputType> map = new HashMap<String, InputType> ();
+        Iterator<String> keyIt = obj.keys();
+        while(keyIt.hasNext()) {
+          String key = keyIt.next();
+          map.put(key, (InputType)fromJSON(Type.InputType,obj.get(key)));
         }
         return map;
       }
-*/
-/*
       case Map_String_Parameter: {
-        var map = new HashMap<String, Parameter> ();
-        foreach(var i in (JSONObject)rawObj) {
-          map.Add( (String)fromJSON(Type.String,i.Key)
-                 , (Parameter)fromJSON(Type.Parameter,i.Value));
+        JSONObject obj = (JSONObject)rawObj;
+        HashMap<String, Parameter> map = new HashMap<String, Parameter> ();
+        Iterator<String> keyIt = obj.keys();
+        while(keyIt.hasNext()) {
+          String key = keyIt.next();
+          map.put(key, (Parameter)fromJSON(Type.Parameter,obj.get(key)));
         }
         return map;
       }
-*/
 
       case ArrayValue: {
         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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:09.634879000000Z
+// 2016-03-21T14:06:54.700322000000Z
 
 package LambdaCube.IR;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.335329000000Z
+// 2016-03-21T14:06:55.404479000000Z
 
 package LambdaCube.Mesh;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import org.json.*;
 import RT.*;
 
@@ -91,25 +92,88 @@ public class JSON {
           , (V4<Float>)fromJSON(Type.V4_Float,obj.get("w"))
           );
       }
-//      case Array_Int32: return ((JArray)obj).Select(x => fromJSON (Type.Int32, x)).ToList();
-//      case Array_Word32: return ((JArray)obj).Select(x => fromJSON (Type.Word32, x)).ToList();
-//      case Array_Float: return ((JArray)obj).Select(x => fromJSON (Type.Float, x)).ToList();
-//      case Array_V2_Float: return ((JArray)obj).Select(x => fromJSON (Type.V2_Float, x)).ToList();
-//      case Array_V2_V2_Float: return ((JArray)obj).Select(x => fromJSON (Type.V2_V2_Float, x)).ToList();
-//      case Array_V3_Float: return ((JArray)obj).Select(x => fromJSON (Type.V3_Float, x)).ToList();
-//      case Array_V3_V3_Float: return ((JArray)obj).Select(x => fromJSON (Type.V3_V3_Float, x)).ToList();
-//      case Array_V4_Float: return ((JArray)obj).Select(x => fromJSON (Type.V4_Float, x)).ToList();
-//      case Array_V4_V4_Float: return ((JArray)obj).Select(x => fromJSON (Type.V4_V4_Float, x)).ToList();
-/*
+      case Array_Int32: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<Integer> v = new ArrayList<Integer> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((Integer)fromJSON (Type.Int32, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_Word32: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<Integer> v = new ArrayList<Integer> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((Integer)fromJSON (Type.Word32, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_Float: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<Float> v = new ArrayList<Float> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((Float)fromJSON (Type.Float, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_V2_Float: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<V2<Float>> v = new ArrayList<V2<Float>> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((V2<Float>)fromJSON (Type.V2_Float, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_V2_V2_Float: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<V2<V2<Float>>> v = new ArrayList<V2<V2<Float>>> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((V2<V2<Float>>)fromJSON (Type.V2_V2_Float, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_V3_Float: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<V3<Float>> v = new ArrayList<V3<Float>> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((V3<Float>)fromJSON (Type.V3_Float, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_V3_V3_Float: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<V3<V3<Float>>> v = new ArrayList<V3<V3<Float>>> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((V3<V3<Float>>)fromJSON (Type.V3_V3_Float, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_V4_Float: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<V4<Float>> v = new ArrayList<V4<Float>> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((V4<Float>)fromJSON (Type.V4_Float, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_V4_V4_Float: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<V4<V4<Float>>> v = new ArrayList<V4<V4<Float>>> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((V4<V4<Float>>)fromJSON (Type.V4_V4_Float, obj.get(i)));
+        }
+        return v;
+      }
       case Map_String_MeshAttribute: {
-        var map = new HashMap<String, MeshAttribute> ();
-        foreach(var i in (JSONObject)rawObj) {
-          map.Add( (String)fromJSON(Type.String,i.Key)
-                 , (MeshAttribute)fromJSON(Type.MeshAttribute,i.Value));
+        JSONObject obj = (JSONObject)rawObj;
+        HashMap<String, MeshAttribute> map = new HashMap<String, MeshAttribute> ();
+        Iterator<String> keyIt = obj.keys();
+        while(keyIt.hasNext()) {
+          String key = keyIt.next();
+          map.put(key, (MeshAttribute)fromJSON(Type.MeshAttribute,obj.get(key)));
         }
         return map;
       }
-*/
 
       case MeshAttribute: {
         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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.335329000000Z
+// 2016-03-21T14:06:55.404479000000Z
 
 package LambdaCube.Mesh;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.335329000000Z
+// 2016-03-21T14:06:55.404479000000Z
 
 package LambdaCube.Mesh;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.335329000000Z
+// 2016-03-21T14:06:55.404479000000Z
 
 package LambdaCube.Mesh;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.293368000000Z
+// 2016-03-21T14:06:55.360355000000Z
 
 package LambdaCube.PipelineSchema;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import org.json.*;
 import RT.*;
 
@@ -27,36 +28,36 @@ public class JSON {
   public static Object fromJSON(Type type, Object rawObj) throws JSONException, Exception {
     switch (type) {
       case String: return (String)rawObj;
-/*
       case Map_String_InputType: {
-        var map = new HashMap<String, InputType> ();
-        foreach(var i in (JSONObject)rawObj) {
-          map.Add( (String)fromJSON(Type.String,i.Key)
-                 , (InputType)fromJSON(Type.InputType,i.Value));
+        JSONObject obj = (JSONObject)rawObj;
+        HashMap<String, InputType> map = new HashMap<String, InputType> ();
+        Iterator<String> keyIt = obj.keys();
+        while(keyIt.hasNext()) {
+          String key = keyIt.next();
+          map.put(key, (InputType)fromJSON(Type.InputType,obj.get(key)));
         }
         return map;
       }
-*/
-/*
       case Map_String_ObjectArraySchema: {
-        var map = new HashMap<String, ObjectArraySchema> ();
-        foreach(var i in (JSONObject)rawObj) {
-          map.Add( (String)fromJSON(Type.String,i.Key)
-                 , (ObjectArraySchema)fromJSON(Type.ObjectArraySchema,i.Value));
+        JSONObject obj = (JSONObject)rawObj;
+        HashMap<String, ObjectArraySchema> map = new HashMap<String, ObjectArraySchema> ();
+        Iterator<String> keyIt = obj.keys();
+        while(keyIt.hasNext()) {
+          String key = keyIt.next();
+          map.put(key, (ObjectArraySchema)fromJSON(Type.ObjectArraySchema,obj.get(key)));
         }
         return map;
       }
-*/
-/*
       case Map_String_StreamType: {
-        var map = new HashMap<String, StreamType> ();
-        foreach(var i in (JSONObject)rawObj) {
-          map.Add( (String)fromJSON(Type.String,i.Key)
-                 , (StreamType)fromJSON(Type.StreamType,i.Value));
+        JSONObject obj = (JSONObject)rawObj;
+        HashMap<String, StreamType> map = new HashMap<String, StreamType> ();
+        Iterator<String> keyIt = obj.keys();
+        while(keyIt.hasNext()) {
+          String key = keyIt.next();
+          map.put(key, (StreamType)fromJSON(Type.StreamType,obj.get(key)));
         }
         return map;
       }
-*/
 
       case StreamType: {
         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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.293368000000Z
+// 2016-03-21T14:06:55.360355000000Z
 
 package LambdaCube.PipelineSchema;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.293368000000Z
+// 2016-03-21T14:06:55.360355000000Z
 
 package LambdaCube.PipelineSchema;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.293368000000Z
+// 2016-03-21T14:06:55.360355000000Z
 
 package LambdaCube.PipelineSchema;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.409214000000Z
+// 2016-03-21T14:06:55.479415000000Z
 
 package LambdaCube.TypeInfo;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.409214000000Z
+// 2016-03-21T14:06:55.479415000000Z
 
 package LambdaCube.TypeInfo;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import org.json.*;
 import RT.*;
 
@@ -27,8 +28,22 @@ public class JSON {
     switch (type) {
       case Int: return (Integer)rawObj;
       case String: return (String)rawObj;
-//      case Array_Range: return ((JArray)obj).Select(x => fromJSON (Type.Range, x)).ToList();
-//      case Array_TypeInfo: return ((JArray)obj).Select(x => fromJSON (Type.TypeInfo, x)).ToList();
+      case Array_Range: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<Range> v = new ArrayList<Range> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((Range)fromJSON (Type.Range, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_TypeInfo: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<TypeInfo> v = new ArrayList<TypeInfo> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((TypeInfo)fromJSON (Type.TypeInfo, obj.get(i)));
+        }
+        return v;
+      }
 
       case Range: {
         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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.409214000000Z
+// 2016-03-21T14:06:55.479415000000Z
 
 package LambdaCube.TypeInfo;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.409214000000Z
+// 2016-03-21T14:06:55.479415000000Z
 
 package LambdaCube.TypeInfo;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.455557000000Z
+// 2016-03-21T14:06:55.528630000000Z
 
 package TestData;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.455557000000Z
+// 2016-03-21T14:06:55.528630000000Z
 
 package TestData;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.455557000000Z
+// 2016-03-21T14:06:55.528630000000Z
 
 package TestData;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.455557000000Z
+// 2016-03-21T14:06:55.528630000000Z
 
 package TestData;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import org.json.*;
 import RT.*;
 
@@ -47,43 +48,92 @@ public class JSON {
       case Int: return (Integer)rawObj;
       case Float: return (Float)rawObj;
       case String: return (String)rawObj;
-//      case Array_Int: return ((JArray)obj).Select(x => fromJSON (Type.Int, x)).ToList();
-//      case Array_Float: return ((JArray)obj).Select(x => fromJSON (Type.Float, x)).ToList();
-//      case Array_String: return ((JArray)obj).Select(x => fromJSON (Type.String, x)).ToList();
-//      case Array_Frame: return ((JArray)obj).Select(x => fromJSON (Type.Frame, x)).ToList();
-//      case Array_Mesh: return ((JArray)obj).Select(x => fromJSON (Type.Mesh, x)).ToList();
-//      case Array_PipelineInfo: return ((JArray)obj).Select(x => fromJSON (Type.PipelineInfo, x)).ToList();
-//      case Array_Scene: return ((JArray)obj).Select(x => fromJSON (Type.Scene, x)).ToList();
-/*
+      case Array_Int: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<Integer> v = new ArrayList<Integer> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((Integer)fromJSON (Type.Int, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_Float: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<Float> v = new ArrayList<Float> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((Float)fromJSON (Type.Float, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_String: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<String> v = new ArrayList<String> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((String)fromJSON (Type.String, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_Frame: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<Frame> v = new ArrayList<Frame> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((Frame)fromJSON (Type.Frame, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_Mesh: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<Mesh> v = new ArrayList<Mesh> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((Mesh)fromJSON (Type.Mesh, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_PipelineInfo: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<PipelineInfo> v = new ArrayList<PipelineInfo> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((PipelineInfo)fromJSON (Type.PipelineInfo, obj.get(i)));
+        }
+        return v;
+      }
+      case Array_Scene: {
+        JSONArray obj = (JSONArray)rawObj;
+        ArrayList<Scene> v = new ArrayList<Scene> ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add((Scene)fromJSON (Type.Scene, obj.get(i)));
+        }
+        return v;
+      }
       case Map_String_Int: {
-        var map = new HashMap<String, Integer> ();
-        foreach(var i in (JSONObject)rawObj) {
-          map.Add( (String)fromJSON(Type.String,i.Key)
-                 , (Integer)fromJSON(Type.Int,i.Value));
+        JSONObject obj = (JSONObject)rawObj;
+        HashMap<String, Integer> map = new HashMap<String, Integer> ();
+        Iterator<String> keyIt = obj.keys();
+        while(keyIt.hasNext()) {
+          String key = keyIt.next();
+          map.put(key, (Integer)fromJSON(Type.Int,obj.get(key)));
         }
         return map;
       }
-*/
-/*
       case Map_String_Array_Int: {
-        var map = new HashMap<String, ArrayList<Integer>> ();
-        foreach(var i in (JSONObject)rawObj) {
-          map.Add( (String)fromJSON(Type.String,i.Key)
-                 , (ArrayList<Integer>)fromJSON(Type.Array_Int,i.Value));
+        JSONObject obj = (JSONObject)rawObj;
+        HashMap<String, ArrayList<Integer>> map = new HashMap<String, ArrayList<Integer>> ();
+        Iterator<String> keyIt = obj.keys();
+        while(keyIt.hasNext()) {
+          String key = keyIt.next();
+          map.put(key, (ArrayList<Integer>)fromJSON(Type.Array_Int,obj.get(key)));
         }
         return map;
       }
-*/
-/*
       case Map_String_Value: {
-        var map = new HashMap<String, Value> ();
-        foreach(var i in (JSONObject)rawObj) {
-          map.Add( (String)fromJSON(Type.String,i.Key)
-                 , (Value)fromJSON(Type.Value,i.Value));
+        JSONObject obj = (JSONObject)rawObj;
+        HashMap<String, Value> map = new HashMap<String, Value> ();
+        Iterator<String> keyIt = obj.keys();
+        while(keyIt.hasNext()) {
+          String key = keyIt.next();
+          map.put(key, (Value)fromJSON(Type.Value,obj.get(key)));
         }
         return map;
       }
-*/
 
       case ClientInfo: {
         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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.455557000000Z
+// 2016-03-21T14:06:55.528630000000Z
 
 package TestData;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.455557000000Z
+// 2016-03-21T14:06:55.528630000000Z
 
 package TestData;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.455557000000Z
+// 2016-03-21T14:06:55.528630000000Z
 
 package TestData;
 
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 @@
 // generated file, do not modify!
-// 2016-03-21T13:31:10.455557000000Z
+// 2016-03-21T14:06:55.528630000000Z
 
 package TestData;
 
diff --git a/ddl/templates/json.java.ede b/ddl/templates/json.java.ede
index cf09533..cfb639a 100644
--- a/ddl/templates/json.java.ede
+++ b/ddl/templates/json.java.ede
@@ -5,6 +5,7 @@ package {{ moduleName }};
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import org.json.*;
 import RT.*;
 
@@ -51,25 +52,39 @@ public class JSON {
           );
       }
       {% when "Map" %}
-/*
       case {{ t.value | typeEnum }}: {
-        var map = new {{ t.value | javaType }} ();
-        foreach(var i in (JSONObject)rawObj) {
-          map.Add( ({{ t.value.key_ | javaType }})fromJSON(Type.{{ t.value.key_ | typeEnum }},i.Key)
-                 , ({{ t.value.value_ | javaType }})fromJSON(Type.{{ t.value.value_ | typeEnum }},i.Value));
+        JSONObject obj = (JSONObject)rawObj;
+        {{ t.value | javaType }} map = new {{ t.value | javaType }} ();
+        Iterator<String> keyIt = obj.keys();
+        while(keyIt.hasNext()) {
+          String key = keyIt.next();
+          map.put(key, ({{ t.value.value_ | javaType }})fromJSON(Type.{{ t.value.value_ | typeEnum }},obj.get(key)));
         }
         return map;
       }
-*/
       {% when "Array" %}
-//      case {{ t.value | typeEnum }}: return ((JArray)obj).Select(x => fromJSON (Type.{{ t.value.type_ | typeEnum }}, x)).ToList();
+      case {{ t.value | typeEnum }}: {
+        JSONArray obj = (JSONArray)rawObj;
+        {{ t.value | javaType }} v = new {{ t.value | javaType }} ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add(({{ t.value.type_ | javaType }})fromJSON (Type.{{ t.value.type_ | typeEnum }}, obj.get(i)));
+        }
+        return v;
+      }
       {% when "List" %}
-//      case {{ t.value | typeEnum }}: return ((JArray)obj).Select(x => fromJSON (Type.{{ t.value.type_ | typeEnum }}, x)).ToList();
+      case {{ t.value | typeEnum }}: {
+        JSONArray obj = (JSONArray)rawObj;
+        {{ t.value | javaType }} v = new {{ t.value | javaType }} ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add(({{ t.value.type_ | javaType }})fromJSON (Type.{{ t.value.type_ | typeEnum }}, obj.get(i)));
+        }
+        return v;
+      }
       {% when "Maybe" %}
-/*
       case {{ t.value | typeEnum }}: {
-        var m = new {{ t.value | javaType }} ();
-        if (obj == null || obj.Type == JTokenType.Null) {
+        JSONObject obj = (JSONObject)rawObj;
+        {{ t.value | javaType }} m = new {{ t.value | javaType }} ();
+        if (obj == null || obj == JSONObject.NULL) {
           m.valid = false;
         } else {
           m.valid = true;
@@ -77,7 +92,6 @@ public class JSON {
         }
         return m;
       }
-*/
       {% else %}
       case {{ t.value | typeEnum }}: return ({{ t.value | javaType }})rawObj;
       {% endcase %}