From fff7adc8e51bdb13c266f0777101e4ead75df1d8 Mon Sep 17 00:00:00 2001 From: Csaba Hruska Date: Fri, 1 Apr 2016 18:27:12 +0200 Subject: fix java json handling --- ddl/Generate.hs | 1 - ddl/out/LambdaCube.IR.cpp | 2 +- ddl/out/LambdaCube.IR.cs | 2 +- ddl/out/LambdaCube.IR.hpp | 2 +- ddl/out/LambdaCube.IR.hs | 2 +- ddl/out/LambdaCube.IR.purs | 2 +- ddl/out/LambdaCube.IR.swift | 2 +- ddl/out/LambdaCube.IR2.hpp | 2 +- ddl/out/LambdaCube.Mesh.cpp | 2 +- ddl/out/LambdaCube.Mesh.cs | 2 +- ddl/out/LambdaCube.Mesh.hpp | 2 +- ddl/out/LambdaCube.Mesh.hs | 2 +- ddl/out/LambdaCube.Mesh.purs | 2 +- ddl/out/LambdaCube.Mesh.swift | 2 +- ddl/out/LambdaCube.Mesh2.hpp | 2 +- ddl/out/LambdaCube.PipelineSchema.cpp | 2 +- ddl/out/LambdaCube.PipelineSchema.cs | 2 +- ddl/out/LambdaCube.PipelineSchema.hpp | 2 +- ddl/out/LambdaCube.PipelineSchema.hs | 2 +- ddl/out/LambdaCube.PipelineSchema.purs | 2 +- ddl/out/LambdaCube.PipelineSchema.swift | 2 +- ddl/out/LambdaCube.PipelineSchema2.hpp | 2 +- ddl/out/LambdaCube.TypeInfo.cpp | 2 +- ddl/out/LambdaCube.TypeInfo.cs | 2 +- ddl/out/LambdaCube.TypeInfo.hpp | 2 +- ddl/out/LambdaCube.TypeInfo.hs | 2 +- ddl/out/LambdaCube.TypeInfo.purs | 2 +- ddl/out/LambdaCube.TypeInfo.swift | 2 +- ddl/out/LambdaCube.TypeInfo2.hpp | 2 +- ddl/out/TestData.cpp | 2 +- ddl/out/TestData.cs | 2 +- ddl/out/TestData.hpp | 2 +- ddl/out/TestData.hs | 2 +- ddl/out/TestData.purs | 2 +- ddl/out/TestData.swift | 2 +- ddl/out/TestData2.hpp | 2 +- .../java/LambdaCube/IR/AccumulationContext.java | 2 +- ddl/out/java/LambdaCube/IR/ArrayValue.java | 2 +- ddl/out/java/LambdaCube/IR/Backend.java | 2 +- ddl/out/java/LambdaCube/IR/BlendEquation.java | 2 +- ddl/out/java/LambdaCube/IR/Blending.java | 2 +- ddl/out/java/LambdaCube/IR/BlendingFactor.java | 2 +- ddl/out/java/LambdaCube/IR/ClearImage.java | 2 +- ddl/out/java/LambdaCube/IR/ColorArity.java | 2 +- ddl/out/java/LambdaCube/IR/Command.java | 2 +- ddl/out/java/LambdaCube/IR/ComparisonFunction.java | 2 +- ddl/out/java/LambdaCube/IR/CullMode.java | 2 +- ddl/out/java/LambdaCube/IR/EdgeMode.java | 2 +- ddl/out/java/LambdaCube/IR/FetchPrimitive.java | 2 +- ddl/out/java/LambdaCube/IR/Filter.java | 2 +- ddl/out/java/LambdaCube/IR/FragmentOperation.java | 2 +- ddl/out/java/LambdaCube/IR/FrontFace.java | 2 +- ddl/out/java/LambdaCube/IR/ImageRef.java | 2 +- ddl/out/java/LambdaCube/IR/ImageSemantic.java | 2 +- ddl/out/java/LambdaCube/IR/InputType.java | 2 +- ddl/out/java/LambdaCube/IR/JSON.java | 85 ++++++++++++++++------ ddl/out/java/LambdaCube/IR/LogicOperation.java | 2 +- ddl/out/java/LambdaCube/IR/MipMap.java | 2 +- ddl/out/java/LambdaCube/IR/OutputPrimitive.java | 2 +- ddl/out/java/LambdaCube/IR/Parameter.java | 2 +- ddl/out/java/LambdaCube/IR/Pipeline.java | 2 +- ddl/out/java/LambdaCube/IR/PointSize.java | 2 +- .../java/LambdaCube/IR/PointSpriteCoordOrigin.java | 2 +- ddl/out/java/LambdaCube/IR/PolygonMode.java | 2 +- ddl/out/java/LambdaCube/IR/PolygonOffset.java | 2 +- ddl/out/java/LambdaCube/IR/Program.java | 2 +- ddl/out/java/LambdaCube/IR/ProvokingVertex.java | 2 +- ddl/out/java/LambdaCube/IR/RasterContext.java | 2 +- ddl/out/java/LambdaCube/IR/RenderTarget.java | 2 +- ddl/out/java/LambdaCube/IR/SamplerDescriptor.java | 2 +- ddl/out/java/LambdaCube/IR/Slot.java | 2 +- ddl/out/java/LambdaCube/IR/StencilOperation.java | 2 +- ddl/out/java/LambdaCube/IR/StencilOps.java | 2 +- ddl/out/java/LambdaCube/IR/StencilTest.java | 2 +- ddl/out/java/LambdaCube/IR/StencilTests.java | 2 +- ddl/out/java/LambdaCube/IR/StreamData.java | 2 +- ddl/out/java/LambdaCube/IR/TargetItem.java | 2 +- ddl/out/java/LambdaCube/IR/TextureDataType.java | 2 +- ddl/out/java/LambdaCube/IR/TextureDescriptor.java | 2 +- ddl/out/java/LambdaCube/IR/TextureType.java | 2 +- ddl/out/java/LambdaCube/IR/Value.java | 2 +- ddl/out/java/LambdaCube/Mesh/JSON.java | 17 ++++- ddl/out/java/LambdaCube/Mesh/Mesh.java | 2 +- ddl/out/java/LambdaCube/Mesh/MeshAttribute.java | 2 +- ddl/out/java/LambdaCube/Mesh/MeshPrimitive.java | 2 +- ddl/out/java/LambdaCube/PipelineSchema/JSON.java | 2 +- .../PipelineSchema/ObjectArraySchema.java | 2 +- .../LambdaCube/PipelineSchema/PipelineSchema.java | 2 +- .../java/LambdaCube/PipelineSchema/StreamType.java | 2 +- .../java/LambdaCube/TypeInfo/CompileResult.java | 2 +- ddl/out/java/LambdaCube/TypeInfo/JSON.java | 4 +- ddl/out/java/LambdaCube/TypeInfo/Range.java | 2 +- ddl/out/java/LambdaCube/TypeInfo/TypeInfo.java | 2 +- ddl/out/java/TestData/ClientInfo.java | 2 +- ddl/out/java/TestData/Frame.java | 2 +- ddl/out/java/TestData/FrameResult.java | 2 +- ddl/out/java/TestData/JSON.java | 6 +- ddl/out/java/TestData/PipelineInfo.java | 2 +- ddl/out/java/TestData/RenderJob.java | 2 +- ddl/out/java/TestData/RenderJobResult.java | 2 +- ddl/out/java/TestData/Scene.java | 2 +- ddl/templates/json.java.ede | 17 ++++- 102 files changed, 188 insertions(+), 134 deletions(-) diff --git a/ddl/Generate.hs b/ddl/Generate.hs index 36d913e..7e7d3ca 100644 --- a/ddl/Generate.hs +++ b/ddl/Generate.hs @@ -45,7 +45,6 @@ main = do , "imports" .= imports , "usedTypes" .= collectTypes aliasMap mod , "usedCSTypes" .= (Set.fromList $ Map.elems $ Map.fromList [ (csType name aliasMap t,t) | t <- Set.toList $ collectTypes aliasMap mod]) - , "usedJavaTypes" .= (Set.fromList $ Map.elems $ Map.fromList [ (javaType aliasMap t,t) | t <- Set.toList $ collectTypes aliasMap mod]) ] aliasMap = Map.fromList [(n,t) | TypeAlias n t <- def] mylib :: HashMap Text Term diff --git a/ddl/out/LambdaCube.IR.cpp b/ddl/out/LambdaCube.IR.cpp index 94c9dfd..6fd1c1d 100644 --- a/ddl/out/LambdaCube.IR.cpp +++ b/ddl/out/LambdaCube.IR.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z #include "LambdaCube.IR.hpp" template<> json toJSON>(std::shared_ptr &v) { diff --git a/ddl/out/LambdaCube.IR.cs b/ddl/out/LambdaCube.IR.cs index e8216a6..2ae4f62 100644 --- a/ddl/out/LambdaCube.IR.cs +++ b/ddl/out/LambdaCube.IR.cs @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z using System; using System.Linq; diff --git a/ddl/out/LambdaCube.IR.hpp b/ddl/out/LambdaCube.IR.hpp index 8fffc33..53d411e 100644 --- a/ddl/out/LambdaCube.IR.hpp +++ b/ddl/out/LambdaCube.IR.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z #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 ce09f16..cb22f67 100644 --- a/ddl/out/LambdaCube.IR.hs +++ b/ddl/out/LambdaCube.IR.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-03-29T11:30:12.412728000000Z +-- 2016-04-01T16:25:34.381854000000Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module LambdaCube.IR where diff --git a/ddl/out/LambdaCube.IR.purs b/ddl/out/LambdaCube.IR.purs index cb442d6..8b2a76e 100644 --- a/ddl/out/LambdaCube.IR.purs +++ b/ddl/out/LambdaCube.IR.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-03-29T11:30:12.412728000000Z +-- 2016-04-01T16:25:34.381854000000Z module LambdaCube.IR where import Prelude diff --git a/ddl/out/LambdaCube.IR.swift b/ddl/out/LambdaCube.IR.swift index 732794e..f2c4fb9 100644 --- a/ddl/out/LambdaCube.IR.swift +++ b/ddl/out/LambdaCube.IR.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z typealias StreamName = Int diff --git a/ddl/out/LambdaCube.IR2.hpp b/ddl/out/LambdaCube.IR2.hpp index 718d2c7..d56a99a 100644 --- a/ddl/out/LambdaCube.IR2.hpp +++ b/ddl/out/LambdaCube.IR2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z #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 17241ae..b5f889c 100644 --- a/ddl/out/LambdaCube.Mesh.cpp +++ b/ddl/out/LambdaCube.Mesh.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:13.232726000000Z +// 2016-04-01T16:25:35.222504000000Z #include "LambdaCube.Mesh.hpp" template<> json toJSON>(std::shared_ptr &v) { diff --git a/ddl/out/LambdaCube.Mesh.cs b/ddl/out/LambdaCube.Mesh.cs index a091e71..dd9ae75 100644 --- a/ddl/out/LambdaCube.Mesh.cs +++ b/ddl/out/LambdaCube.Mesh.cs @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:13.232726000000Z +// 2016-04-01T16:25:35.222504000000Z using System; using System.Linq; diff --git a/ddl/out/LambdaCube.Mesh.hpp b/ddl/out/LambdaCube.Mesh.hpp index ec049ff..bc88710 100644 --- a/ddl/out/LambdaCube.Mesh.hpp +++ b/ddl/out/LambdaCube.Mesh.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:13.232726000000Z +// 2016-04-01T16:25:35.222504000000Z #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 d9c2a53..722cbd3 100644 --- a/ddl/out/LambdaCube.Mesh.hs +++ b/ddl/out/LambdaCube.Mesh.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-03-29T11:30:13.232726000000Z +-- 2016-04-01T16:25:35.222504000000Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module LambdaCube.Mesh where diff --git a/ddl/out/LambdaCube.Mesh.purs b/ddl/out/LambdaCube.Mesh.purs index 251a064..7919fa7 100644 --- a/ddl/out/LambdaCube.Mesh.purs +++ b/ddl/out/LambdaCube.Mesh.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-03-29T11:30:13.232726000000Z +-- 2016-04-01T16:25:35.222504000000Z module LambdaCube.Mesh where import Prelude diff --git a/ddl/out/LambdaCube.Mesh.swift b/ddl/out/LambdaCube.Mesh.swift index b62b517..4fef6d0 100644 --- a/ddl/out/LambdaCube.Mesh.swift +++ b/ddl/out/LambdaCube.Mesh.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:13.232726000000Z +// 2016-04-01T16:25:35.222504000000Z enum MeshAttribute { case A_Float(Array) diff --git a/ddl/out/LambdaCube.Mesh2.hpp b/ddl/out/LambdaCube.Mesh2.hpp index c13aa90..55190e8 100644 --- a/ddl/out/LambdaCube.Mesh2.hpp +++ b/ddl/out/LambdaCube.Mesh2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:13.232726000000Z +// 2016-04-01T16:25:35.222504000000Z #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 ebd5c06..a655981 100644 --- a/ddl/out/LambdaCube.PipelineSchema.cpp +++ b/ddl/out/LambdaCube.PipelineSchema.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:13.180467000000Z +// 2016-04-01T16:25:35.172905000000Z #include "LambdaCube.PipelineSchema.hpp" template<> json toJSON>(std::shared_ptr &v) { diff --git a/ddl/out/LambdaCube.PipelineSchema.cs b/ddl/out/LambdaCube.PipelineSchema.cs index 349d5c1..a089a85 100644 --- a/ddl/out/LambdaCube.PipelineSchema.cs +++ b/ddl/out/LambdaCube.PipelineSchema.cs @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:13.180467000000Z +// 2016-04-01T16:25:35.172905000000Z using System; using System.Linq; diff --git a/ddl/out/LambdaCube.PipelineSchema.hpp b/ddl/out/LambdaCube.PipelineSchema.hpp index 2fb01f2..fc24770 100644 --- a/ddl/out/LambdaCube.PipelineSchema.hpp +++ b/ddl/out/LambdaCube.PipelineSchema.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:13.180467000000Z +// 2016-04-01T16:25:35.172905000000Z #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 6616276..1a5178b 100644 --- a/ddl/out/LambdaCube.PipelineSchema.hs +++ b/ddl/out/LambdaCube.PipelineSchema.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-03-29T11:30:13.180467000000Z +-- 2016-04-01T16:25:35.172905000000Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module LambdaCube.PipelineSchema where diff --git a/ddl/out/LambdaCube.PipelineSchema.purs b/ddl/out/LambdaCube.PipelineSchema.purs index 2aa425b..315cc31 100644 --- a/ddl/out/LambdaCube.PipelineSchema.purs +++ b/ddl/out/LambdaCube.PipelineSchema.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-03-29T11:30:13.180467000000Z +-- 2016-04-01T16:25:35.172905000000Z module LambdaCube.PipelineSchema where import Prelude diff --git a/ddl/out/LambdaCube.PipelineSchema.swift b/ddl/out/LambdaCube.PipelineSchema.swift index 3243cd9..7ce6ac6 100644 --- a/ddl/out/LambdaCube.PipelineSchema.swift +++ b/ddl/out/LambdaCube.PipelineSchema.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:13.180467000000Z +// 2016-04-01T16:25:35.172905000000Z enum StreamType { case Attribute_Word diff --git a/ddl/out/LambdaCube.PipelineSchema2.hpp b/ddl/out/LambdaCube.PipelineSchema2.hpp index 9bb0d19..cb6b0f6 100644 --- a/ddl/out/LambdaCube.PipelineSchema2.hpp +++ b/ddl/out/LambdaCube.PipelineSchema2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:13.180467000000Z +// 2016-04-01T16:25:35.172905000000Z #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 5e76455..291d823 100644 --- a/ddl/out/LambdaCube.TypeInfo.cpp +++ b/ddl/out/LambdaCube.TypeInfo.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:13.322407000000Z +// 2016-04-01T16:25:35.327304000000Z #include "LambdaCube.TypeInfo.hpp" template<> json toJSON>(std::shared_ptr &v) { diff --git a/ddl/out/LambdaCube.TypeInfo.cs b/ddl/out/LambdaCube.TypeInfo.cs index d95b8e4..6ba57c6 100644 --- a/ddl/out/LambdaCube.TypeInfo.cs +++ b/ddl/out/LambdaCube.TypeInfo.cs @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:13.322407000000Z +// 2016-04-01T16:25:35.327304000000Z using System; using System.Linq; diff --git a/ddl/out/LambdaCube.TypeInfo.hpp b/ddl/out/LambdaCube.TypeInfo.hpp index f5e7bd8..fbe45f6 100644 --- a/ddl/out/LambdaCube.TypeInfo.hpp +++ b/ddl/out/LambdaCube.TypeInfo.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:13.322407000000Z +// 2016-04-01T16:25:35.327304000000Z #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 19256f1..9629231 100644 --- a/ddl/out/LambdaCube.TypeInfo.hs +++ b/ddl/out/LambdaCube.TypeInfo.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-03-29T11:30:13.322407000000Z +-- 2016-04-01T16:25:35.327304000000Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module LambdaCube.TypeInfo where diff --git a/ddl/out/LambdaCube.TypeInfo.purs b/ddl/out/LambdaCube.TypeInfo.purs index 36d44c5..2e357af 100644 --- a/ddl/out/LambdaCube.TypeInfo.purs +++ b/ddl/out/LambdaCube.TypeInfo.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-03-29T11:30:13.322407000000Z +-- 2016-04-01T16:25:35.327304000000Z module LambdaCube.TypeInfo where import Prelude diff --git a/ddl/out/LambdaCube.TypeInfo.swift b/ddl/out/LambdaCube.TypeInfo.swift index 9a9ac42..378c534 100644 --- a/ddl/out/LambdaCube.TypeInfo.swift +++ b/ddl/out/LambdaCube.TypeInfo.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:13.322407000000Z +// 2016-04-01T16:25:35.327304000000Z enum Range { case Range(Range_Data) diff --git a/ddl/out/LambdaCube.TypeInfo2.hpp b/ddl/out/LambdaCube.TypeInfo2.hpp index 0255091..ec91fc1 100644 --- a/ddl/out/LambdaCube.TypeInfo2.hpp +++ b/ddl/out/LambdaCube.TypeInfo2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:13.322407000000Z +// 2016-04-01T16:25:35.327304000000Z #ifndef HEADER_LambdaCube.TypeInfo_H #define HEADER_LambdaCube.TypeInfo_H diff --git a/ddl/out/TestData.cpp b/ddl/out/TestData.cpp index fdaaa09..dbf2a6b 100644 --- a/ddl/out/TestData.cpp +++ b/ddl/out/TestData.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:13.376022000000Z +// 2016-04-01T16:25:35.381981000000Z #include "TestData.hpp" template<> json toJSON>(std::shared_ptr &v) { diff --git a/ddl/out/TestData.cs b/ddl/out/TestData.cs index bb8b25f..f8fc336 100644 --- a/ddl/out/TestData.cs +++ b/ddl/out/TestData.cs @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:13.376022000000Z +// 2016-04-01T16:25:35.381981000000Z using System; using System.Linq; diff --git a/ddl/out/TestData.hpp b/ddl/out/TestData.hpp index 7e297b9..d8ed663 100644 --- a/ddl/out/TestData.hpp +++ b/ddl/out/TestData.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:13.376022000000Z +// 2016-04-01T16:25:35.381981000000Z #ifndef HEADER_TestData_H #define HEADER_TestData_H diff --git a/ddl/out/TestData.hs b/ddl/out/TestData.hs index cf7af70..97642bc 100644 --- a/ddl/out/TestData.hs +++ b/ddl/out/TestData.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-03-29T11:30:13.376022000000Z +-- 2016-04-01T16:25:35.381981000000Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module TestData where diff --git a/ddl/out/TestData.purs b/ddl/out/TestData.purs index 0856b0f..b30d329 100644 --- a/ddl/out/TestData.purs +++ b/ddl/out/TestData.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-03-29T11:30:13.376022000000Z +-- 2016-04-01T16:25:35.381981000000Z module TestData where import Prelude diff --git a/ddl/out/TestData.swift b/ddl/out/TestData.swift index e9583b4..6b33b59 100644 --- a/ddl/out/TestData.swift +++ b/ddl/out/TestData.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:13.376022000000Z +// 2016-04-01T16:25:35.381981000000Z enum ClientInfo { case ClientInfo(ClientInfo_Data) diff --git a/ddl/out/TestData2.hpp b/ddl/out/TestData2.hpp index d8de43c..2cc8089 100644 --- a/ddl/out/TestData2.hpp +++ b/ddl/out/TestData2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:13.376022000000Z +// 2016-04-01T16:25:35.381981000000Z #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 3c6b021..22d1e22 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/ArrayValue.java b/ddl/out/java/LambdaCube/IR/ArrayValue.java index b28362d..5c607e5 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Backend.java b/ddl/out/java/LambdaCube/IR/Backend.java index bd0921a..b938596 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/BlendEquation.java b/ddl/out/java/LambdaCube/IR/BlendEquation.java index 4c7e398..d846193 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Blending.java b/ddl/out/java/LambdaCube/IR/Blending.java index cafc0c2..57d4e27 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/BlendingFactor.java b/ddl/out/java/LambdaCube/IR/BlendingFactor.java index 2930fa2..86b6360 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/ClearImage.java b/ddl/out/java/LambdaCube/IR/ClearImage.java index b6960d8..7c9579b 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/ColorArity.java b/ddl/out/java/LambdaCube/IR/ColorArity.java index f196e21..4566db2 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Command.java b/ddl/out/java/LambdaCube/IR/Command.java index b26e4dc..b073a1b 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/ComparisonFunction.java b/ddl/out/java/LambdaCube/IR/ComparisonFunction.java index 39f46cc..be3bfbe 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/CullMode.java b/ddl/out/java/LambdaCube/IR/CullMode.java index 1c14f58..711057d 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/EdgeMode.java b/ddl/out/java/LambdaCube/IR/EdgeMode.java index ec84095..dc1112b 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/FetchPrimitive.java b/ddl/out/java/LambdaCube/IR/FetchPrimitive.java index 3d69090..c078d9a 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Filter.java b/ddl/out/java/LambdaCube/IR/Filter.java index 815fe1e..b532891 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/FragmentOperation.java b/ddl/out/java/LambdaCube/IR/FragmentOperation.java index a464138..961659c 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/FrontFace.java b/ddl/out/java/LambdaCube/IR/FrontFace.java index 62f781b..6fea9cd 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/ImageRef.java b/ddl/out/java/LambdaCube/IR/ImageRef.java index 213ffb2..33978e2 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/ImageSemantic.java b/ddl/out/java/LambdaCube/IR/ImageSemantic.java index 60494ec..595d17e 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/InputType.java b/ddl/out/java/LambdaCube/IR/InputType.java index 1584b71..423453e 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/JSON.java b/ddl/out/java/LambdaCube/IR/JSON.java index 2710e28..d3d5e4e 100644 --- a/ddl/out/java/LambdaCube/IR/JSON.java +++ b/ddl/out/java/LambdaCube/IR/JSON.java @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; @@ -115,11 +115,11 @@ public class JSON { public static Object fromJSON(Type type, Object rawObj) throws JSONException, Exception { switch (type) { - case Int: return (Integer)rawObj; - case Int32: return (Integer)rawObj; - case Word: return (Integer)rawObj; - case Word32: return (Integer)rawObj; - case Float: return (Float)rawObj; + case Int: return ((Number)rawObj).intValue(); + case Int32: return ((Number)rawObj).intValue(); + case Word: return ((Number)rawObj).intValue(); + case Word32: return ((Number)rawObj).intValue(); + case Float: return ((Number)rawObj).floatValue(); case Bool: return (Boolean)rawObj; case String: return (String)rawObj; case V2_Int: { @@ -419,68 +419,62 @@ public class JSON { return v; } case Maybe_Int: { - JSONObject obj = (JSONObject)rawObj; Maybe m = new Maybe (); - if (obj == null || obj == JSONObject.NULL) { + if (rawObj == null || rawObj == JSONObject.NULL) { m.valid = false; } else { m.valid = true; - m.data = (Integer)fromJSON (Type.Int,obj); + m.data = (Integer)fromJSON (Type.Int,(JSONObject)rawObj); } return m; } case Maybe_Float: { - JSONObject obj = (JSONObject)rawObj; Maybe m = new Maybe (); - if (obj == null || obj == JSONObject.NULL) { + if (rawObj == null || rawObj == JSONObject.NULL) { m.valid = false; } else { m.valid = true; - m.data = (Float)fromJSON (Type.Float,obj); + m.data = (Float)fromJSON (Type.Float,(JSONObject)rawObj); } return m; } case Maybe_String: { - JSONObject obj = (JSONObject)rawObj; Maybe m = new Maybe (); - if (obj == null || obj == JSONObject.NULL) { + if (rawObj == null || rawObj == JSONObject.NULL) { m.valid = false; } else { m.valid = true; - m.data = (String)fromJSON (Type.String,obj); + m.data = (String)fromJSON (Type.String,(JSONObject)rawObj); } return m; } case Maybe_ComparisonFunction: { - JSONObject obj = (JSONObject)rawObj; Maybe m = new Maybe (); - if (obj == null || obj == JSONObject.NULL) { + if (rawObj == null || rawObj == JSONObject.NULL) { m.valid = false; } else { m.valid = true; - m.data = (ComparisonFunction)fromJSON (Type.ComparisonFunction,obj); + m.data = (ComparisonFunction)fromJSON (Type.ComparisonFunction,(JSONObject)rawObj); } return m; } case Maybe_EdgeMode: { - JSONObject obj = (JSONObject)rawObj; Maybe m = new Maybe (); - if (obj == null || obj == JSONObject.NULL) { + if (rawObj == null || rawObj == JSONObject.NULL) { m.valid = false; } else { m.valid = true; - m.data = (EdgeMode)fromJSON (Type.EdgeMode,obj); + m.data = (EdgeMode)fromJSON (Type.EdgeMode,(JSONObject)rawObj); } return m; } case Maybe_ImageRef: { - JSONObject obj = (JSONObject)rawObj; Maybe m = new Maybe (); - if (obj == null || obj == JSONObject.NULL) { + if (rawObj == null || rawObj == JSONObject.NULL) { m.valid = false; } else { m.valid = true; - m.data = (ImageRef)fromJSON (Type.ImageRef,obj); + m.data = (ImageRef)fromJSON (Type.ImageRef,(JSONObject)rawObj); } return m; } @@ -3002,10 +2996,20 @@ public class JSON { return obj; } + case Int: { return rawObj; } + case Int32: { return rawObj; } + case Word: { return rawObj; } case Word32: { return rawObj; } case Float: { return rawObj; } case Bool: { return rawObj; } case String: { return rawObj; } + case V2_Int: { + V2 v = (V2)rawObj; + JSONObject obj = new JSONObject(); + obj.put("x", toJSON(Type.Int,v.x)); + obj.put("y", toJSON(Type.Int,v.y)); + return obj; + } case V2_Word: { V2 v = (V2)rawObj; JSONObject obj = new JSONObject(); @@ -3048,6 +3052,14 @@ public class JSON { obj.put("y", toJSON(Type.V4_Float,v.y)); return obj; } + case V3_Int: { + V3 v = (V3)rawObj; + JSONObject obj = new JSONObject(); + obj.put("x", toJSON(Type.Int,v.x)); + obj.put("y", toJSON(Type.Int,v.y)); + obj.put("z", toJSON(Type.Int,v.z)); + return obj; + } case V3_Word: { V3 v = (V3)rawObj; JSONObject obj = new JSONObject(); @@ -3096,6 +3108,15 @@ public class JSON { obj.put("z", toJSON(Type.V4_Float,v.z)); return obj; } + case V4_Int: { + V4 v = (V4)rawObj; + JSONObject obj = new JSONObject(); + obj.put("x", toJSON(Type.Int,v.x)); + obj.put("y", toJSON(Type.Int,v.y)); + obj.put("z", toJSON(Type.Int,v.z)); + obj.put("w", toJSON(Type.Int,v.w)); + return obj; + } case V4_Word: { V4 v = (V4)rawObj; JSONObject obj = new JSONObject(); @@ -3150,6 +3171,22 @@ public class JSON { obj.put("w", toJSON(Type.V4_Float,v.w)); return obj; } + case Array_Int: { + ArrayList v = (ArrayList)rawObj; + JSONArray obj = new JSONArray(); + for(Integer i : v) { + obj.put(toJSON(Type.Int,i)); + } + return obj; + } + case Array_Int32: { + ArrayList v = (ArrayList)rawObj; + JSONArray obj = new JSONArray(); + for(Integer i : v) { + obj.put(toJSON(Type.Int32,i)); + } + return obj; + } case Array_Word32: { ArrayList v = (ArrayList)rawObj; JSONArray obj = new JSONArray(); diff --git a/ddl/out/java/LambdaCube/IR/LogicOperation.java b/ddl/out/java/LambdaCube/IR/LogicOperation.java index 4f71624..505aa61 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/MipMap.java b/ddl/out/java/LambdaCube/IR/MipMap.java index 585bf4a..03469f6 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/OutputPrimitive.java b/ddl/out/java/LambdaCube/IR/OutputPrimitive.java index a50cbf1..710e612 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Parameter.java b/ddl/out/java/LambdaCube/IR/Parameter.java index 59f9f25..e1aa0e1 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Pipeline.java b/ddl/out/java/LambdaCube/IR/Pipeline.java index 3702a6b..ee00e23 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/PointSize.java b/ddl/out/java/LambdaCube/IR/PointSize.java index 79ea789..d7c8551 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/PointSpriteCoordOrigin.java b/ddl/out/java/LambdaCube/IR/PointSpriteCoordOrigin.java index 2bb15a3..28d408a 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/PolygonMode.java b/ddl/out/java/LambdaCube/IR/PolygonMode.java index f039d7e..504604d 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/PolygonOffset.java b/ddl/out/java/LambdaCube/IR/PolygonOffset.java index 2ebb443..4e66be8 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Program.java b/ddl/out/java/LambdaCube/IR/Program.java index 35dda67..680e8be 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/ProvokingVertex.java b/ddl/out/java/LambdaCube/IR/ProvokingVertex.java index 2af20fe..9224932 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/RasterContext.java b/ddl/out/java/LambdaCube/IR/RasterContext.java index ea4e6c6..3510d82 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/RenderTarget.java b/ddl/out/java/LambdaCube/IR/RenderTarget.java index 86c1742..e6fa397 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/SamplerDescriptor.java b/ddl/out/java/LambdaCube/IR/SamplerDescriptor.java index 3f1e0ef..1bf46b0 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Slot.java b/ddl/out/java/LambdaCube/IR/Slot.java index c986d90..462ec2a 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/StencilOperation.java b/ddl/out/java/LambdaCube/IR/StencilOperation.java index 164b122..974062a 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/StencilOps.java b/ddl/out/java/LambdaCube/IR/StencilOps.java index 4d0baa5..fd2f166 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/StencilTest.java b/ddl/out/java/LambdaCube/IR/StencilTest.java index 52707d1..08c87a2 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/StencilTests.java b/ddl/out/java/LambdaCube/IR/StencilTests.java index 8f98f0b..8467dc8 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/StreamData.java b/ddl/out/java/LambdaCube/IR/StreamData.java index 23c7f99..cdee011 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/TargetItem.java b/ddl/out/java/LambdaCube/IR/TargetItem.java index 13bb985..baa38dc 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/TextureDataType.java b/ddl/out/java/LambdaCube/IR/TextureDataType.java index 77c0d78..b6b55d7 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/TextureDescriptor.java b/ddl/out/java/LambdaCube/IR/TextureDescriptor.java index f4cfa1e..f2d6323 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/TextureType.java b/ddl/out/java/LambdaCube/IR/TextureType.java index 823a99d..7fa1d8f 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Value.java b/ddl/out/java/LambdaCube/IR/Value.java index 3fb3ec0..8d3e45d 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-29T11:30:12.412728000000Z +// 2016-04-01T16:25:34.381854000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/Mesh/JSON.java b/ddl/out/java/LambdaCube/Mesh/JSON.java index f878c4e..b19b4e2 100644 --- a/ddl/out/java/LambdaCube/Mesh/JSON.java +++ b/ddl/out/java/LambdaCube/Mesh/JSON.java @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:13.232726000000Z +// 2016-04-01T16:25:35.222504000000Z package LambdaCube.Mesh; @@ -41,9 +41,9 @@ public class JSON { public static Object fromJSON(Type type, Object rawObj) throws JSONException, Exception { switch (type) { - case Int32: return (Integer)rawObj; - case Word32: return (Integer)rawObj; - case Float: return (Float)rawObj; + case Int32: return ((Number)rawObj).intValue(); + case Word32: return ((Number)rawObj).intValue(); + case Float: return ((Number)rawObj).floatValue(); case String: return (String)rawObj; case V2_Float: { JSONObject obj = (JSONObject)rawObj; @@ -387,6 +387,7 @@ public class JSON { return obj; } + case Int32: { return rawObj; } case Word32: { return rawObj; } case Float: { return rawObj; } case String: { return rawObj; } @@ -438,6 +439,14 @@ public class JSON { obj.put("w", toJSON(Type.V4_Float,v.w)); return obj; } + case Array_Int32: { + ArrayList v = (ArrayList)rawObj; + JSONArray obj = new JSONArray(); + for(Integer i : v) { + obj.put(toJSON(Type.Int32,i)); + } + return obj; + } case Array_Word32: { ArrayList v = (ArrayList)rawObj; JSONArray obj = new JSONArray(); diff --git a/ddl/out/java/LambdaCube/Mesh/Mesh.java b/ddl/out/java/LambdaCube/Mesh/Mesh.java index 8b62ab7..db5fc0a 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-29T11:30:13.232726000000Z +// 2016-04-01T16:25:35.222504000000Z package LambdaCube.Mesh; diff --git a/ddl/out/java/LambdaCube/Mesh/MeshAttribute.java b/ddl/out/java/LambdaCube/Mesh/MeshAttribute.java index a29a371..a2982b3 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-29T11:30:13.232726000000Z +// 2016-04-01T16:25:35.222504000000Z package LambdaCube.Mesh; diff --git a/ddl/out/java/LambdaCube/Mesh/MeshPrimitive.java b/ddl/out/java/LambdaCube/Mesh/MeshPrimitive.java index f334a71..909e9bd 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-29T11:30:13.232726000000Z +// 2016-04-01T16:25:35.222504000000Z package LambdaCube.Mesh; diff --git a/ddl/out/java/LambdaCube/PipelineSchema/JSON.java b/ddl/out/java/LambdaCube/PipelineSchema/JSON.java index 29e9567..7e06c4e 100644 --- a/ddl/out/java/LambdaCube/PipelineSchema/JSON.java +++ b/ddl/out/java/LambdaCube/PipelineSchema/JSON.java @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:13.180467000000Z +// 2016-04-01T16:25:35.172905000000Z package LambdaCube.PipelineSchema; diff --git a/ddl/out/java/LambdaCube/PipelineSchema/ObjectArraySchema.java b/ddl/out/java/LambdaCube/PipelineSchema/ObjectArraySchema.java index dcc498a..13ff8c2 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-29T11:30:13.180467000000Z +// 2016-04-01T16:25:35.172905000000Z package LambdaCube.PipelineSchema; diff --git a/ddl/out/java/LambdaCube/PipelineSchema/PipelineSchema.java b/ddl/out/java/LambdaCube/PipelineSchema/PipelineSchema.java index 392d71e..631b01c 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-29T11:30:13.180467000000Z +// 2016-04-01T16:25:35.172905000000Z package LambdaCube.PipelineSchema; diff --git a/ddl/out/java/LambdaCube/PipelineSchema/StreamType.java b/ddl/out/java/LambdaCube/PipelineSchema/StreamType.java index 990023d..41cef93 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-29T11:30:13.180467000000Z +// 2016-04-01T16:25:35.172905000000Z package LambdaCube.PipelineSchema; diff --git a/ddl/out/java/LambdaCube/TypeInfo/CompileResult.java b/ddl/out/java/LambdaCube/TypeInfo/CompileResult.java index 1384d75..36bba0d 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-29T11:30:13.322407000000Z +// 2016-04-01T16:25:35.327304000000Z package LambdaCube.TypeInfo; diff --git a/ddl/out/java/LambdaCube/TypeInfo/JSON.java b/ddl/out/java/LambdaCube/TypeInfo/JSON.java index 59498c6..6491702 100644 --- a/ddl/out/java/LambdaCube/TypeInfo/JSON.java +++ b/ddl/out/java/LambdaCube/TypeInfo/JSON.java @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:13.322407000000Z +// 2016-04-01T16:25:35.327304000000Z package LambdaCube.TypeInfo; @@ -27,7 +27,7 @@ public class JSON { public static Object fromJSON(Type type, Object rawObj) throws JSONException, Exception { switch (type) { - case Int: return (Integer)rawObj; + case Int: return ((Number)rawObj).intValue(); case String: return (String)rawObj; case Array_Range: { JSONArray obj = (JSONArray)rawObj; diff --git a/ddl/out/java/LambdaCube/TypeInfo/Range.java b/ddl/out/java/LambdaCube/TypeInfo/Range.java index c0ab81b..c5de275 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-29T11:30:13.322407000000Z +// 2016-04-01T16:25:35.327304000000Z package LambdaCube.TypeInfo; diff --git a/ddl/out/java/LambdaCube/TypeInfo/TypeInfo.java b/ddl/out/java/LambdaCube/TypeInfo/TypeInfo.java index 3975008..2e966f7 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-29T11:30:13.322407000000Z +// 2016-04-01T16:25:35.327304000000Z package LambdaCube.TypeInfo; diff --git a/ddl/out/java/TestData/ClientInfo.java b/ddl/out/java/TestData/ClientInfo.java index 8356f60..b2c4cf8 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-29T11:30:13.376022000000Z +// 2016-04-01T16:25:35.381981000000Z package TestData; diff --git a/ddl/out/java/TestData/Frame.java b/ddl/out/java/TestData/Frame.java index 8d13656..b9a0d6a 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-29T11:30:13.376022000000Z +// 2016-04-01T16:25:35.381981000000Z package TestData; diff --git a/ddl/out/java/TestData/FrameResult.java b/ddl/out/java/TestData/FrameResult.java index 69fd702..45d3e9d 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-29T11:30:13.376022000000Z +// 2016-04-01T16:25:35.381981000000Z package TestData; diff --git a/ddl/out/java/TestData/JSON.java b/ddl/out/java/TestData/JSON.java index b6c11f3..61b5c21 100644 --- a/ddl/out/java/TestData/JSON.java +++ b/ddl/out/java/TestData/JSON.java @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-03-29T11:30:13.376022000000Z +// 2016-04-01T16:25:35.381981000000Z package TestData; @@ -46,8 +46,8 @@ public class JSON { public static Object fromJSON(Type type, Object rawObj) throws JSONException, Exception { switch (type) { - case Int: return (Integer)rawObj; - case Float: return (Float)rawObj; + case Int: return ((Number)rawObj).intValue(); + case Float: return ((Number)rawObj).floatValue(); case String: return (String)rawObj; case Array_Int: { JSONArray obj = (JSONArray)rawObj; diff --git a/ddl/out/java/TestData/PipelineInfo.java b/ddl/out/java/TestData/PipelineInfo.java index fbb7585..20033ce 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-29T11:30:13.376022000000Z +// 2016-04-01T16:25:35.381981000000Z package TestData; diff --git a/ddl/out/java/TestData/RenderJob.java b/ddl/out/java/TestData/RenderJob.java index 63ebceb..076ae55 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-29T11:30:13.376022000000Z +// 2016-04-01T16:25:35.381981000000Z package TestData; diff --git a/ddl/out/java/TestData/RenderJobResult.java b/ddl/out/java/TestData/RenderJobResult.java index 2d383cc..e04afa2 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-29T11:30:13.376022000000Z +// 2016-04-01T16:25:35.381981000000Z package TestData; diff --git a/ddl/out/java/TestData/Scene.java b/ddl/out/java/TestData/Scene.java index 07da5b2..363915a 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-29T11:30:13.376022000000Z +// 2016-04-01T16:25:35.381981000000Z package TestData; diff --git a/ddl/templates/json.java.ede b/ddl/templates/json.java.ede index d644ef6..ffa5876 100644 --- a/ddl/templates/json.java.ede +++ b/ddl/templates/json.java.ede @@ -83,16 +83,25 @@ public class JSON { } {% when "Maybe" %} case {{ t.value | typeEnum }}: { - JSONObject obj = (JSONObject)rawObj; {{ t.value | javaType }} m = new {{ t.value | javaType }} (); - if (obj == null || obj == JSONObject.NULL) { + if (rawObj == null || rawObj == JSONObject.NULL) { m.valid = false; } else { m.valid = true; - m.data = ({{ t.value.type_ | javaType }})fromJSON (Type.{{ t.value.type_ | typeEnum }},obj); + m.data = ({{ t.value.type_ | javaType }})fromJSON (Type.{{ t.value.type_ | typeEnum }},(JSONObject)rawObj); } return m; } + {% when "Int" %} + case {{ t.value | typeEnum }}: return ((Number)rawObj).intValue(); + {% when "Int32" %} + case {{ t.value | typeEnum }}: return ((Number)rawObj).intValue(); + {% when "Word" %} + case {{ t.value | typeEnum }}: return ((Number)rawObj).intValue(); + {% when "Word32" %} + case {{ t.value | typeEnum }}: return ((Number)rawObj).intValue(); + {% when "Float" %} + case Float: return ((Number)rawObj).floatValue(); {% else %} case {{ t.value | typeEnum }}: return ({{ t.value | javaType }})rawObj; {% endcase %} @@ -149,7 +158,7 @@ public class JSON { } {% endfor %} - {% for t in usedJavaTypes %} + {% for t in usedTypes %} {% case t.value.tag %} {% when "Data" %} {% when "V2" %} -- cgit v1.2.3