From 95f209b1d6415605d881c1ffaa643a8aec3763eb Mon Sep 17 00:00:00 2001 From: Csaba Hruska Date: Thu, 10 Nov 2016 17:02:55 +0100 Subject: update type info --- ddl/Definitions.hs | 2 +- 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 | 10 ++++++---- ddl/out/LambdaCube.TypeInfo.cs | 17 ++++++++++------- ddl/out/LambdaCube.TypeInfo.hpp | 9 +++++---- ddl/out/LambdaCube.TypeInfo.hs | 8 ++++---- ddl/out/LambdaCube.TypeInfo.purs | 16 +++++++--------- ddl/out/LambdaCube.TypeInfo.swift | 8 ++++---- ddl/out/LambdaCube.TypeInfo2.hpp | 9 +++++---- 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 +- ddl/out/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 | 2 +- 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 +- ddl/out/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 | 2 +- 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 +- .../LambdaCube/PipelineSchema/ObjectArraySchema.java | 2 +- .../java/LambdaCube/PipelineSchema/PipelineSchema.java | 2 +- ddl/out/java/LambdaCube/PipelineSchema/StreamType.java | 2 +- ddl/out/java/LambdaCube/TypeInfo/CompileResult.java | 9 +++++---- ddl/out/java/LambdaCube/TypeInfo/ErrorInfo.java | 2 +- ddl/out/java/LambdaCube/TypeInfo/JSON.java | 16 +++++++++------- ddl/out/java/LambdaCube/TypeInfo/Range.java | 2 +- ddl/out/java/LambdaCube/TypeInfo/TypeInfo.java | 2 +- ddl/out/java/LambdaCube/TypeInfo/WarningInfo.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 | 2 +- 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 +- 103 files changed, 149 insertions(+), 141 deletions(-) diff --git a/ddl/Definitions.hs b/ddl/Definitions.hs index 847078c..5dbd89e 100644 --- a/ddl/Definitions.hs +++ b/ddl/Definitions.hs @@ -487,7 +487,7 @@ typeInfo = do ] data_ "CompileResult" $ do - const_ "CompileError" [Array "TypeInfo", Array "WarningInfo", Array "ErrorInfo"] + const_ "CompileError" [String, Array "TypeInfo", Array "WarningInfo", Array "ErrorInfo"] const_ "Compiled" [String, String, "Pipeline", Array "TypeInfo", Array "WarningInfo"] pipelineSchema = do diff --git a/ddl/out/LambdaCube.IR.cpp b/ddl/out/LambdaCube.IR.cpp index 0d9c312..993dcc0 100644 --- a/ddl/out/LambdaCube.IR.cpp +++ b/ddl/out/LambdaCube.IR.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z #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 cd00b46..0bb2d70 100644 --- a/ddl/out/LambdaCube.IR.cs +++ b/ddl/out/LambdaCube.IR.cs @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z using System; using System.Linq; diff --git a/ddl/out/LambdaCube.IR.hpp b/ddl/out/LambdaCube.IR.hpp index 4b4560e..9bbaf67 100644 --- a/ddl/out/LambdaCube.IR.hpp +++ b/ddl/out/LambdaCube.IR.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z #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 3aaf6eb..3e441d5 100644 --- a/ddl/out/LambdaCube.IR.hs +++ b/ddl/out/LambdaCube.IR.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-11-10T15:07:10.798971000000Z +-- 2016-11-10T16:02:37.496440000000Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module LambdaCube.IR where diff --git a/ddl/out/LambdaCube.IR.purs b/ddl/out/LambdaCube.IR.purs index b159581..6e864c7 100644 --- a/ddl/out/LambdaCube.IR.purs +++ b/ddl/out/LambdaCube.IR.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-11-10T15:07:10.798971000000Z +-- 2016-11-10T16:02:37.496440000000Z module LambdaCube.IR where import Prelude diff --git a/ddl/out/LambdaCube.IR.swift b/ddl/out/LambdaCube.IR.swift index 6ce13f5..8a9847c 100644 --- a/ddl/out/LambdaCube.IR.swift +++ b/ddl/out/LambdaCube.IR.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z typealias StreamName = Int diff --git a/ddl/out/LambdaCube.IR2.hpp b/ddl/out/LambdaCube.IR2.hpp index 36eee3a..01d2684 100644 --- a/ddl/out/LambdaCube.IR2.hpp +++ b/ddl/out/LambdaCube.IR2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z #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 3810028..556936e 100644 --- a/ddl/out/LambdaCube.Mesh.cpp +++ b/ddl/out/LambdaCube.Mesh.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:11.866163000000Z +// 2016-11-10T16:02:38.260630000000Z #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 825e571..099ac28 100644 --- a/ddl/out/LambdaCube.Mesh.cs +++ b/ddl/out/LambdaCube.Mesh.cs @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:11.866163000000Z +// 2016-11-10T16:02:38.260630000000Z using System; using System.Linq; diff --git a/ddl/out/LambdaCube.Mesh.hpp b/ddl/out/LambdaCube.Mesh.hpp index f5c7fab..876d798 100644 --- a/ddl/out/LambdaCube.Mesh.hpp +++ b/ddl/out/LambdaCube.Mesh.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:11.866163000000Z +// 2016-11-10T16:02:38.260630000000Z #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 c2c4ac1..168114c 100644 --- a/ddl/out/LambdaCube.Mesh.hs +++ b/ddl/out/LambdaCube.Mesh.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-11-10T15:07:11.866163000000Z +-- 2016-11-10T16:02:38.260630000000Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module LambdaCube.Mesh where diff --git a/ddl/out/LambdaCube.Mesh.purs b/ddl/out/LambdaCube.Mesh.purs index d06934b..7ba8cc9 100644 --- a/ddl/out/LambdaCube.Mesh.purs +++ b/ddl/out/LambdaCube.Mesh.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-11-10T15:07:11.866163000000Z +-- 2016-11-10T16:02:38.260630000000Z module LambdaCube.Mesh where import Prelude diff --git a/ddl/out/LambdaCube.Mesh.swift b/ddl/out/LambdaCube.Mesh.swift index ce778fd..1bd4f7e 100644 --- a/ddl/out/LambdaCube.Mesh.swift +++ b/ddl/out/LambdaCube.Mesh.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:11.866163000000Z +// 2016-11-10T16:02:38.260630000000Z enum MeshAttribute { case A_Float(Array) diff --git a/ddl/out/LambdaCube.Mesh2.hpp b/ddl/out/LambdaCube.Mesh2.hpp index 33e91e0..82fdbbd 100644 --- a/ddl/out/LambdaCube.Mesh2.hpp +++ b/ddl/out/LambdaCube.Mesh2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:11.866163000000Z +// 2016-11-10T16:02:38.260630000000Z #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 a3bdb7f..d1ae88c 100644 --- a/ddl/out/LambdaCube.PipelineSchema.cpp +++ b/ddl/out/LambdaCube.PipelineSchema.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:11.805936000000Z +// 2016-11-10T16:02:38.214442000000Z #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 a069bc3..c05a307 100644 --- a/ddl/out/LambdaCube.PipelineSchema.cs +++ b/ddl/out/LambdaCube.PipelineSchema.cs @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:11.805936000000Z +// 2016-11-10T16:02:38.214442000000Z using System; using System.Linq; diff --git a/ddl/out/LambdaCube.PipelineSchema.hpp b/ddl/out/LambdaCube.PipelineSchema.hpp index 6731aab..b49c2c5 100644 --- a/ddl/out/LambdaCube.PipelineSchema.hpp +++ b/ddl/out/LambdaCube.PipelineSchema.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:11.805936000000Z +// 2016-11-10T16:02:38.214442000000Z #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 0f9f5ef..bb966e4 100644 --- a/ddl/out/LambdaCube.PipelineSchema.hs +++ b/ddl/out/LambdaCube.PipelineSchema.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-11-10T15:07:11.805936000000Z +-- 2016-11-10T16:02:38.214442000000Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module LambdaCube.PipelineSchema where diff --git a/ddl/out/LambdaCube.PipelineSchema.purs b/ddl/out/LambdaCube.PipelineSchema.purs index dcea325..24d728a 100644 --- a/ddl/out/LambdaCube.PipelineSchema.purs +++ b/ddl/out/LambdaCube.PipelineSchema.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-11-10T15:07:11.805936000000Z +-- 2016-11-10T16:02:38.214442000000Z module LambdaCube.PipelineSchema where import Prelude diff --git a/ddl/out/LambdaCube.PipelineSchema.swift b/ddl/out/LambdaCube.PipelineSchema.swift index 9e760ec..a168206 100644 --- a/ddl/out/LambdaCube.PipelineSchema.swift +++ b/ddl/out/LambdaCube.PipelineSchema.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:11.805936000000Z +// 2016-11-10T16:02:38.214442000000Z enum StreamType { case Attribute_Word diff --git a/ddl/out/LambdaCube.PipelineSchema2.hpp b/ddl/out/LambdaCube.PipelineSchema2.hpp index 6a8665b..4c577d6 100644 --- a/ddl/out/LambdaCube.PipelineSchema2.hpp +++ b/ddl/out/LambdaCube.PipelineSchema2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:11.805936000000Z +// 2016-11-10T16:02:38.214442000000Z #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 34aaf21..e3c8ff2 100644 --- a/ddl/out/LambdaCube.TypeInfo.cpp +++ b/ddl/out/LambdaCube.TypeInfo.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:11.972496000000Z +// 2016-11-10T16:02:38.361054000000Z #include "LambdaCube.TypeInfo.hpp" template<> json toJSON>(std::shared_ptr &v) { @@ -140,6 +140,7 @@ template<> json toJSON>(std::shared_ptr_0); obj["arg1"] = toJSON(tv->_1); obj["arg2"] = toJSON(tv->_2); + obj["arg3"] = toJSON(tv->_3); } break; case ::CompileResult::tag::Compiled: @@ -163,9 +164,10 @@ template<> std::shared_ptr fromJSON tv(new data::CompileError()); - tv->_0 = fromJSON(W>>(), obj["arg0"]); - tv->_1 = fromJSON(W>>(), obj["arg1"]); - tv->_2 = fromJSON(W>>(), obj["arg2"]); + tv->_0 = fromJSON(W(), obj["arg0"]); + tv->_1 = fromJSON(W>>(), obj["arg1"]); + tv->_2 = fromJSON(W>>(), obj["arg2"]); + tv->_3 = fromJSON(W>>(), obj["arg3"]); return tv; } else if (tag == "Compiled") { diff --git a/ddl/out/LambdaCube.TypeInfo.cs b/ddl/out/LambdaCube.TypeInfo.cs index c58ec62..3997aab 100644 --- a/ddl/out/LambdaCube.TypeInfo.cs +++ b/ddl/out/LambdaCube.TypeInfo.cs @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:11.972496000000Z +// 2016-11-10T16:02:38.361054000000Z using System; using System.Linq; @@ -77,9 +77,10 @@ namespace LambdaCube.TypeInfo { namespace data { public class CompileError : LambdaCube.TypeInfo.CompileResult { - public List _0; - public List _1; - public List _2; + public string _0; + public List _1; + public List _2; + public List _3; public CompileError() { tag = LambdaCube.TypeInfo.CompileResult.Tag.CompileError; } }; public class Compiled : LambdaCube.TypeInfo.CompileResult { @@ -171,9 +172,10 @@ namespace LambdaCube.TypeInfo { switch (tag) { case "CompileError": { data.CompileError tv = new data.CompileError(); - tv._0 = (List)fromJSON(Type.Array_TypeInfo,obj["arg0"]); - tv._1 = (List)fromJSON(Type.Array_WarningInfo,obj["arg1"]); - tv._2 = (List)fromJSON(Type.Array_ErrorInfo,obj["arg2"]); + tv._0 = (string)fromJSON(Type.String,obj["arg0"]); + tv._1 = (List)fromJSON(Type.Array_TypeInfo,obj["arg1"]); + tv._2 = (List)fromJSON(Type.Array_WarningInfo,obj["arg2"]); + tv._3 = (List)fromJSON(Type.Array_ErrorInfo,obj["arg3"]); return tv; } case "Compiled": { @@ -261,6 +263,7 @@ namespace LambdaCube.TypeInfo { obj["arg0"] = toJSON(tv._0); obj["arg1"] = toJSON(tv._1); obj["arg2"] = toJSON(tv._2); + obj["arg3"] = toJSON(tv._3); } break; case CompileResult.Tag.Compiled: diff --git a/ddl/out/LambdaCube.TypeInfo.hpp b/ddl/out/LambdaCube.TypeInfo.hpp index 441e00e..2aabf59 100644 --- a/ddl/out/LambdaCube.TypeInfo.hpp +++ b/ddl/out/LambdaCube.TypeInfo.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:11.972496000000Z +// 2016-11-10T16:02:38.361054000000Z #ifndef HEADER_LambdaCube.TypeInfo_H #define HEADER_LambdaCube.TypeInfo_H @@ -76,9 +76,10 @@ class CompileResult { namespace data { class CompileError : public ::CompileResult { public: - std::vector> _0; - std::vector> _1; - std::vector> _2; + String _0; + std::vector> _1; + std::vector> _2; + std::vector> _3; CompileError() { tag = tag::CompileError; } }; class Compiled : public ::CompileResult { diff --git a/ddl/out/LambdaCube.TypeInfo.hs b/ddl/out/LambdaCube.TypeInfo.hs index 9632fff..5195f98 100644 --- a/ddl/out/LambdaCube.TypeInfo.hs +++ b/ddl/out/LambdaCube.TypeInfo.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-11-10T15:07:11.972496000000Z +-- 2016-11-10T16:02:38.361054000000Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module LambdaCube.TypeInfo where @@ -52,7 +52,7 @@ data ErrorInfo deriving (Show, Eq, Ord) data CompileResult - = CompileError (Vector TypeInfo) (Vector WarningInfo) (Vector ErrorInfo) + = CompileError String (Vector TypeInfo) (Vector WarningInfo) (Vector ErrorInfo) | Compiled String String Pipeline (Vector TypeInfo) (Vector WarningInfo) deriving (Show, Eq, Ord) @@ -149,14 +149,14 @@ instance FromJSON ErrorInfo where instance ToJSON CompileResult where toJSON v = case v of - CompileError arg0 arg1 arg2 -> object [ "tag" .= ("CompileError" :: Text), "arg0" .= arg0, "arg1" .= arg1, "arg2" .= arg2] + CompileError arg0 arg1 arg2 arg3 -> object [ "tag" .= ("CompileError" :: Text), "arg0" .= arg0, "arg1" .= arg1, "arg2" .= arg2, "arg3" .= arg3] Compiled arg0 arg1 arg2 arg3 arg4 -> object [ "tag" .= ("Compiled" :: Text), "arg0" .= arg0, "arg1" .= arg1, "arg2" .= arg2, "arg3" .= arg3, "arg4" .= arg4] instance FromJSON CompileResult where parseJSON (Object obj) = do tag <- obj .: "tag" case tag :: Text of - "CompileError" -> CompileError <$> obj .: "arg0" <*> obj .: "arg1" <*> obj .: "arg2" + "CompileError" -> CompileError <$> obj .: "arg0" <*> obj .: "arg1" <*> obj .: "arg2" <*> obj .: "arg3" "Compiled" -> Compiled <$> obj .: "arg0" <*> obj .: "arg1" <*> obj .: "arg2" <*> obj .: "arg3" <*> obj .: "arg4" parseJSON _ = mzero diff --git a/ddl/out/LambdaCube.TypeInfo.purs b/ddl/out/LambdaCube.TypeInfo.purs index db22d59..51911f2 100644 --- a/ddl/out/LambdaCube.TypeInfo.purs +++ b/ddl/out/LambdaCube.TypeInfo.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-11-10T15:07:11.972496000000Z +-- 2016-11-10T16:02:38.361054000000Z module LambdaCube.TypeInfo where import Prelude @@ -51,7 +51,7 @@ data ErrorInfo data CompileResult - = CompileError (Array TypeInfo) (Array WarningInfo) (Array ErrorInfo) + = CompileError String (Array TypeInfo) (Array WarningInfo) (Array ErrorInfo) | Compiled String String Pipeline (Array TypeInfo) (Array WarningInfo) @@ -126,6 +126,7 @@ instance decodeJsonWarningInfo :: DecodeJson WarningInfo where { wRange:wRange , wText:wText } + _ -> unsafeCrashWith "decodeJson @ WarningInfo" instance encodeJsonErrorInfo :: EncodeJson ErrorInfo where encodeJson v = case v of @@ -147,10 +148,11 @@ instance decodeJsonErrorInfo :: DecodeJson ErrorInfo where { eRange:eRange , eText:eText } + _ -> unsafeCrashWith "decodeJson @ ErrorInfo" instance encodeJsonCompileResult :: EncodeJson CompileResult where encodeJson v = case v of - CompileError arg0 arg1 arg2 -> "tag" := "CompileError" ~> "arg0" := arg0 ~> "arg1" := arg1 ~> "arg2" := arg2 ~> jsonEmptyObject + CompileError arg0 arg1 arg2 arg3 -> "tag" := "CompileError" ~> "arg0" := arg0 ~> "arg1" := arg1 ~> "arg2" := arg2 ~> "arg3" := arg3 ~> jsonEmptyObject Compiled arg0 arg1 arg2 arg3 arg4 -> "tag" := "Compiled" ~> "arg0" := arg0 ~> "arg1" := arg1 ~> "arg2" := arg2 ~> "arg3" := arg3 ~> "arg4" := arg4 ~> jsonEmptyObject instance decodeJsonCompileResult :: DecodeJson CompileResult where @@ -158,11 +160,7 @@ instance decodeJsonCompileResult :: DecodeJson CompileResult where obj <- decodeJson json tag <- obj .? "tag" case tag of - "CompileError" -> CompileError <$> obj .? "arg0" <*> obj .? "arg1" <*> obj .? "arg2" -<<<<<<< f4af737a0d4a1fd3b3c6babc2c119129df34f77d - "Compiled" -> Compiled <$> obj .? "arg0" <*> obj .? "arg1" <*> obj .? "arg2" <*> obj .? "arg3" - _ -> unsafeCrashWith "decodeJson @ CompileResult" -======= + "CompileError" -> CompileError <$> obj .? "arg0" <*> obj .? "arg1" <*> obj .? "arg2" <*> obj .? "arg3" "Compiled" -> Compiled <$> obj .? "arg0" <*> obj .? "arg1" <*> obj .? "arg2" <*> obj .? "arg3" <*> obj .? "arg4" ->>>>>>> update type info to include warnings + _ -> unsafeCrashWith "decodeJson @ CompileResult" diff --git a/ddl/out/LambdaCube.TypeInfo.swift b/ddl/out/LambdaCube.TypeInfo.swift index 6083382..209a718 100644 --- a/ddl/out/LambdaCube.TypeInfo.swift +++ b/ddl/out/LambdaCube.TypeInfo.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:11.972496000000Z +// 2016-11-10T16:02:38.361054000000Z enum Range { case Range(Range_Data) @@ -36,7 +36,7 @@ enum ErrorInfo { } enum CompileResult { - case CompileError(Array,Array,Array) + case CompileError(String,Array,Array,Array) case Compiled(String,String,Pipeline,Array,Array) } @@ -143,8 +143,8 @@ extension ErrorInfo { extension CompileResult { var toJSON : [String: AnyObject] { switch self { - case .CompileError(let arg0, let arg1, let arg2): - return [ "tag" : "CompileError", "arg0" : arg0.toJSON, "arg1" : arg1.toJSON, "arg2" : arg2.toJSON] + case .CompileError(let arg0, let arg1, let arg2, let arg3): + return [ "tag" : "CompileError", "arg0" : arg0.toJSON, "arg1" : arg1.toJSON, "arg2" : arg2.toJSON, "arg3" : arg3.toJSON] case .Compiled(let arg0, let arg1, let arg2, let arg3, let arg4): return [ "tag" : "Compiled", "arg0" : arg0.toJSON, "arg1" : arg1.toJSON, "arg2" : arg2.toJSON, "arg3" : arg3.toJSON, "arg4" : arg4.toJSON] } diff --git a/ddl/out/LambdaCube.TypeInfo2.hpp b/ddl/out/LambdaCube.TypeInfo2.hpp index b8f77a1..72928fd 100644 --- a/ddl/out/LambdaCube.TypeInfo2.hpp +++ b/ddl/out/LambdaCube.TypeInfo2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:11.972496000000Z +// 2016-11-10T16:02:38.361054000000Z #ifndef HEADER_LambdaCube.TypeInfo_H #define HEADER_LambdaCube.TypeInfo_H @@ -69,9 +69,10 @@ public: namespace data { class CompileError { public: - std::vector> _0; - std::vector> _1; - std::vector> _2; + String _0; + std::vector> _1; + std::vector> _2; + std::vector> _3; }; class Compiled { public: diff --git a/ddl/out/TestData.cpp b/ddl/out/TestData.cpp index 58db58d..23087dc 100644 --- a/ddl/out/TestData.cpp +++ b/ddl/out/TestData.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:12.061252000000Z +// 2016-11-10T16:02:38.461930000000Z #include "TestData.hpp" template<> json toJSON>(std::shared_ptr &v) { diff --git a/ddl/out/TestData.cs b/ddl/out/TestData.cs index 42bfbff..a4a87dc 100644 --- a/ddl/out/TestData.cs +++ b/ddl/out/TestData.cs @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:12.061252000000Z +// 2016-11-10T16:02:38.461930000000Z using System; using System.Linq; diff --git a/ddl/out/TestData.hpp b/ddl/out/TestData.hpp index 1045578..4bac54f 100644 --- a/ddl/out/TestData.hpp +++ b/ddl/out/TestData.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:12.061252000000Z +// 2016-11-10T16:02:38.461930000000Z #ifndef HEADER_TestData_H #define HEADER_TestData_H diff --git a/ddl/out/TestData.hs b/ddl/out/TestData.hs index f2c6101..a64eeee 100644 --- a/ddl/out/TestData.hs +++ b/ddl/out/TestData.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-11-10T15:07:12.061252000000Z +-- 2016-11-10T16:02:38.461930000000Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module TestData where diff --git a/ddl/out/TestData.purs b/ddl/out/TestData.purs index 7d3e82a..05ad341 100644 --- a/ddl/out/TestData.purs +++ b/ddl/out/TestData.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-11-10T15:07:12.061252000000Z +-- 2016-11-10T16:02:38.461930000000Z module TestData where import Prelude diff --git a/ddl/out/TestData.swift b/ddl/out/TestData.swift index aef2069..90a225b 100644 --- a/ddl/out/TestData.swift +++ b/ddl/out/TestData.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:12.061252000000Z +// 2016-11-10T16:02:38.461930000000Z enum ClientInfo { case ClientInfo(ClientInfo_Data) diff --git a/ddl/out/TestData2.hpp b/ddl/out/TestData2.hpp index 462b05f..799bb04 100644 --- a/ddl/out/TestData2.hpp +++ b/ddl/out/TestData2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:12.061252000000Z +// 2016-11-10T16:02:38.461930000000Z #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 5da0b75..9f0f25a 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/ArrayValue.java b/ddl/out/java/LambdaCube/IR/ArrayValue.java index dbc7ebf..682845b 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Backend.java b/ddl/out/java/LambdaCube/IR/Backend.java index b0c76ca..2610af2 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/BlendEquation.java b/ddl/out/java/LambdaCube/IR/BlendEquation.java index b866f91..348836f 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Blending.java b/ddl/out/java/LambdaCube/IR/Blending.java index 3483aa7..ca10e02 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/BlendingFactor.java b/ddl/out/java/LambdaCube/IR/BlendingFactor.java index 8ecccc9..7e83d77 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/ClearImage.java b/ddl/out/java/LambdaCube/IR/ClearImage.java index a4e2dcf..bc5d23b 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/ColorArity.java b/ddl/out/java/LambdaCube/IR/ColorArity.java index 2e38368..c966cab 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Command.java b/ddl/out/java/LambdaCube/IR/Command.java index e960d62..cd0f035 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/ComparisonFunction.java b/ddl/out/java/LambdaCube/IR/ComparisonFunction.java index e99d736..cb1eac0 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/CullMode.java b/ddl/out/java/LambdaCube/IR/CullMode.java index 24498ae..06c89f7 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/EdgeMode.java b/ddl/out/java/LambdaCube/IR/EdgeMode.java index e06e665..f8dec4e 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/FetchPrimitive.java b/ddl/out/java/LambdaCube/IR/FetchPrimitive.java index ab90181..3733776 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Filter.java b/ddl/out/java/LambdaCube/IR/Filter.java index 0fcf88a..ea58f95 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/FragmentOperation.java b/ddl/out/java/LambdaCube/IR/FragmentOperation.java index 897b656..6692d7c 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/FrontFace.java b/ddl/out/java/LambdaCube/IR/FrontFace.java index 7ad6264..91e82e1 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/ImageRef.java b/ddl/out/java/LambdaCube/IR/ImageRef.java index 4eef01b..530c33a 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/ImageSemantic.java b/ddl/out/java/LambdaCube/IR/ImageSemantic.java index 255167c..9dc4467 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/InputType.java b/ddl/out/java/LambdaCube/IR/InputType.java index a1a927a..3e2804b 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/JSON.java b/ddl/out/java/LambdaCube/IR/JSON.java index b9ec62f..31dc9d1 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/LogicOperation.java b/ddl/out/java/LambdaCube/IR/LogicOperation.java index 1239717..5150762 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/MipMap.java b/ddl/out/java/LambdaCube/IR/MipMap.java index fbce936..4cac08d 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/OutputPrimitive.java b/ddl/out/java/LambdaCube/IR/OutputPrimitive.java index 6320101..a1c6d61 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Parameter.java b/ddl/out/java/LambdaCube/IR/Parameter.java index ca518b9..4cd32dd 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Pipeline.java b/ddl/out/java/LambdaCube/IR/Pipeline.java index b7e2d87..c93d999 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/PointSize.java b/ddl/out/java/LambdaCube/IR/PointSize.java index b9c9bd0..c933f1c 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/PointSpriteCoordOrigin.java b/ddl/out/java/LambdaCube/IR/PointSpriteCoordOrigin.java index f7cc8d0..f1d4d00 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/PolygonMode.java b/ddl/out/java/LambdaCube/IR/PolygonMode.java index 9cc38f9..c6d5624 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/PolygonOffset.java b/ddl/out/java/LambdaCube/IR/PolygonOffset.java index f8706b2..a5492bd 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Program.java b/ddl/out/java/LambdaCube/IR/Program.java index da78920..274f805 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/ProvokingVertex.java b/ddl/out/java/LambdaCube/IR/ProvokingVertex.java index 055fab5..fe3150d 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/RasterContext.java b/ddl/out/java/LambdaCube/IR/RasterContext.java index ebb815b..13ebd17 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/RenderTarget.java b/ddl/out/java/LambdaCube/IR/RenderTarget.java index 3a80f7c..3abb4fc 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/SamplerDescriptor.java b/ddl/out/java/LambdaCube/IR/SamplerDescriptor.java index a26574d..de17298 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Slot.java b/ddl/out/java/LambdaCube/IR/Slot.java index 79b3696..c6428c3 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/StencilOperation.java b/ddl/out/java/LambdaCube/IR/StencilOperation.java index 6ce9b3f..1cb2a4a 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/StencilOps.java b/ddl/out/java/LambdaCube/IR/StencilOps.java index 33ec375..5de12f1 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/StencilTest.java b/ddl/out/java/LambdaCube/IR/StencilTest.java index 0678931..0942fd1 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/StencilTests.java b/ddl/out/java/LambdaCube/IR/StencilTests.java index 823b9e8..5f9c1e7 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/StreamData.java b/ddl/out/java/LambdaCube/IR/StreamData.java index d63dc08..a46d9e1 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/TargetItem.java b/ddl/out/java/LambdaCube/IR/TargetItem.java index 45b58d1..144393f 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/TextureDataType.java b/ddl/out/java/LambdaCube/IR/TextureDataType.java index a345db7..6cbd419 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/TextureDescriptor.java b/ddl/out/java/LambdaCube/IR/TextureDescriptor.java index cbcddce..a802048 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/TextureType.java b/ddl/out/java/LambdaCube/IR/TextureType.java index aa742e1..fe6ebea 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Value.java b/ddl/out/java/LambdaCube/IR/Value.java index e9fc6be..5229e53 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-11-10T15:07:10.798971000000Z +// 2016-11-10T16:02:37.496440000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/Mesh/JSON.java b/ddl/out/java/LambdaCube/Mesh/JSON.java index 0b29f5b..8b413ed 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-11-10T15:07:11.866163000000Z +// 2016-11-10T16:02:38.260630000000Z package LambdaCube.Mesh; diff --git a/ddl/out/java/LambdaCube/Mesh/Mesh.java b/ddl/out/java/LambdaCube/Mesh/Mesh.java index 271bf0b..2680756 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-11-10T15:07:11.866163000000Z +// 2016-11-10T16:02:38.260630000000Z package LambdaCube.Mesh; diff --git a/ddl/out/java/LambdaCube/Mesh/MeshAttribute.java b/ddl/out/java/LambdaCube/Mesh/MeshAttribute.java index 9d06b72..3e60b1a 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-11-10T15:07:11.866163000000Z +// 2016-11-10T16:02:38.260630000000Z package LambdaCube.Mesh; diff --git a/ddl/out/java/LambdaCube/Mesh/MeshPrimitive.java b/ddl/out/java/LambdaCube/Mesh/MeshPrimitive.java index 974d8ce..9af5530 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-11-10T15:07:11.866163000000Z +// 2016-11-10T16:02:38.260630000000Z package LambdaCube.Mesh; diff --git a/ddl/out/java/LambdaCube/PipelineSchema/JSON.java b/ddl/out/java/LambdaCube/PipelineSchema/JSON.java index 5051614..a6ac40a 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-11-10T15:07:11.805936000000Z +// 2016-11-10T16:02:38.214442000000Z package LambdaCube.PipelineSchema; diff --git a/ddl/out/java/LambdaCube/PipelineSchema/ObjectArraySchema.java b/ddl/out/java/LambdaCube/PipelineSchema/ObjectArraySchema.java index 97e9ac2..adc2ec7 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-11-10T15:07:11.805936000000Z +// 2016-11-10T16:02:38.214442000000Z package LambdaCube.PipelineSchema; diff --git a/ddl/out/java/LambdaCube/PipelineSchema/PipelineSchema.java b/ddl/out/java/LambdaCube/PipelineSchema/PipelineSchema.java index 9553424..0c8b12b 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-11-10T15:07:11.805936000000Z +// 2016-11-10T16:02:38.214442000000Z package LambdaCube.PipelineSchema; diff --git a/ddl/out/java/LambdaCube/PipelineSchema/StreamType.java b/ddl/out/java/LambdaCube/PipelineSchema/StreamType.java index 42f388e..e1d6db6 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-11-10T15:07:11.805936000000Z +// 2016-11-10T16:02:38.214442000000Z package LambdaCube.PipelineSchema; diff --git a/ddl/out/java/LambdaCube/TypeInfo/CompileResult.java b/ddl/out/java/LambdaCube/TypeInfo/CompileResult.java index cf66ce9..1fd0ca4 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-11-10T15:07:11.972496000000Z +// 2016-11-10T16:02:38.361054000000Z package LambdaCube.TypeInfo; @@ -17,9 +17,10 @@ public class CompileResult { public Tag tag; public class CompileError_ extends CompileResult { - public ArrayList _0; - public ArrayList _1; - public ArrayList _2; + public String _0; + public ArrayList _1; + public ArrayList _2; + public ArrayList _3; public CompileError_() { tag = CompileResult.Tag.CompileError; } } public class Compiled_ extends CompileResult { diff --git a/ddl/out/java/LambdaCube/TypeInfo/ErrorInfo.java b/ddl/out/java/LambdaCube/TypeInfo/ErrorInfo.java index a59fc81..c5ac7f5 100644 --- a/ddl/out/java/LambdaCube/TypeInfo/ErrorInfo.java +++ b/ddl/out/java/LambdaCube/TypeInfo/ErrorInfo.java @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:11.972496000000Z +// 2016-11-10T16:02:38.361054000000Z package LambdaCube.TypeInfo; diff --git a/ddl/out/java/LambdaCube/TypeInfo/JSON.java b/ddl/out/java/LambdaCube/TypeInfo/JSON.java index 458656c..5c64e4f 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-11-10T15:07:11.972496000000Z +// 2016-11-10T16:02:38.361054000000Z package LambdaCube.TypeInfo; @@ -117,9 +117,10 @@ public class JSON { switch (tag) { case "CompileError": { CompileResult.CompileError_ tv = new CompileResult().new CompileError_(); - tv._0 = (ArrayList)fromJSON(Type.Array_TypeInfo,obj.get("arg0")); - tv._1 = (ArrayList)fromJSON(Type.Array_WarningInfo,obj.get("arg1")); - tv._2 = (ArrayList)fromJSON(Type.Array_ErrorInfo,obj.get("arg2")); + tv._0 = (String)fromJSON(Type.String,obj.get("arg0")); + tv._1 = (ArrayList)fromJSON(Type.Array_TypeInfo,obj.get("arg1")); + tv._2 = (ArrayList)fromJSON(Type.Array_WarningInfo,obj.get("arg2")); + tv._3 = (ArrayList)fromJSON(Type.Array_ErrorInfo,obj.get("arg3")); return tv; } case "Compiled": { @@ -210,9 +211,10 @@ public class JSON { obj.put("tag", "CompileError"); { CompileResult.CompileError_ tv = (CompileResult.CompileError_)v; - obj.put("arg0", toJSON(Type.Array_TypeInfo,tv._0)); - obj.put("arg1", toJSON(Type.Array_WarningInfo,tv._1)); - obj.put("arg2", toJSON(Type.Array_ErrorInfo,tv._2)); + obj.put("arg0", toJSON(Type.String,tv._0)); + obj.put("arg1", toJSON(Type.Array_TypeInfo,tv._1)); + obj.put("arg2", toJSON(Type.Array_WarningInfo,tv._2)); + obj.put("arg3", toJSON(Type.Array_ErrorInfo,tv._3)); } break; case Compiled: diff --git a/ddl/out/java/LambdaCube/TypeInfo/Range.java b/ddl/out/java/LambdaCube/TypeInfo/Range.java index e5db6f2..7860793 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-11-10T15:07:11.972496000000Z +// 2016-11-10T16:02:38.361054000000Z package LambdaCube.TypeInfo; diff --git a/ddl/out/java/LambdaCube/TypeInfo/TypeInfo.java b/ddl/out/java/LambdaCube/TypeInfo/TypeInfo.java index 9cf2ec4..c02ab61 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-11-10T15:07:11.972496000000Z +// 2016-11-10T16:02:38.361054000000Z package LambdaCube.TypeInfo; diff --git a/ddl/out/java/LambdaCube/TypeInfo/WarningInfo.java b/ddl/out/java/LambdaCube/TypeInfo/WarningInfo.java index a6be28f..7b83623 100644 --- a/ddl/out/java/LambdaCube/TypeInfo/WarningInfo.java +++ b/ddl/out/java/LambdaCube/TypeInfo/WarningInfo.java @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-11-10T15:07:11.972496000000Z +// 2016-11-10T16:02:38.361054000000Z package LambdaCube.TypeInfo; diff --git a/ddl/out/java/TestData/ClientInfo.java b/ddl/out/java/TestData/ClientInfo.java index 53bba37..ee305dc 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-11-10T15:07:12.061252000000Z +// 2016-11-10T16:02:38.461930000000Z package TestData; diff --git a/ddl/out/java/TestData/Frame.java b/ddl/out/java/TestData/Frame.java index c75409f..e3e4d33 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-11-10T15:07:12.061252000000Z +// 2016-11-10T16:02:38.461930000000Z package TestData; diff --git a/ddl/out/java/TestData/FrameResult.java b/ddl/out/java/TestData/FrameResult.java index 5f9a11e..55879b1 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-11-10T15:07:12.061252000000Z +// 2016-11-10T16:02:38.461930000000Z package TestData; diff --git a/ddl/out/java/TestData/JSON.java b/ddl/out/java/TestData/JSON.java index 8bc4e2a..c31ff31 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-11-10T15:07:12.061252000000Z +// 2016-11-10T16:02:38.461930000000Z package TestData; diff --git a/ddl/out/java/TestData/PipelineInfo.java b/ddl/out/java/TestData/PipelineInfo.java index 1ab0bce..f75a8c5 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-11-10T15:07:12.061252000000Z +// 2016-11-10T16:02:38.461930000000Z package TestData; diff --git a/ddl/out/java/TestData/RenderJob.java b/ddl/out/java/TestData/RenderJob.java index 016e531..28660fe 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-11-10T15:07:12.061252000000Z +// 2016-11-10T16:02:38.461930000000Z package TestData; diff --git a/ddl/out/java/TestData/RenderJobResult.java b/ddl/out/java/TestData/RenderJobResult.java index 236198a..e9d6410 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-11-10T15:07:12.061252000000Z +// 2016-11-10T16:02:38.461930000000Z package TestData; diff --git a/ddl/out/java/TestData/Scene.java b/ddl/out/java/TestData/Scene.java index 50da7cc..420946c 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-11-10T15:07:12.061252000000Z +// 2016-11-10T16:02:38.461930000000Z package TestData; -- cgit v1.2.3