From 246cc8b8ef6ae0d486fc82c3b28502c21af738bf Mon Sep 17 00:00:00 2001 From: Csaba Hruska Date: Thu, 10 Nov 2016 16:11:29 +0100 Subject: update type info to include warnings --- ddl/Definitions.hs | 16 ++- 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 | 72 ++++++++++++- ddl/out/LambdaCube.TypeInfo.cs | 116 +++++++++++++++++++-- ddl/out/LambdaCube.TypeInfo.hpp | 37 ++++++- ddl/out/LambdaCube.TypeInfo.hs | 68 +++++++++++- ddl/out/LambdaCube.TypeInfo.purs | 68 +++++++++++- ddl/out/LambdaCube.TypeInfo.swift | 50 ++++++++- ddl/out/LambdaCube.TypeInfo2.hpp | 37 ++++++- 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 | 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 +- .../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 +- .../PipelineSchema/ObjectArraySchema.java | 2 +- .../LambdaCube/PipelineSchema/PipelineSchema.java | 2 +- .../java/LambdaCube/PipelineSchema/StreamType.java | 2 +- .../java/LambdaCube/TypeInfo/CompileResult.java | 9 +- ddl/out/java/LambdaCube/TypeInfo/ErrorInfo.java | 24 +++++ ddl/out/java/LambdaCube/TypeInfo/JSON.java | 109 ++++++++++++++++--- ddl/out/java/LambdaCube/TypeInfo/Range.java | 2 +- ddl/out/java/LambdaCube/TypeInfo/TypeInfo.java | 2 +- ddl/out/java/LambdaCube/TypeInfo/WarningInfo.java | 24 +++++ 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, 662 insertions(+), 150 deletions(-) create mode 100644 ddl/out/java/LambdaCube/TypeInfo/ErrorInfo.java create mode 100644 ddl/out/java/LambdaCube/TypeInfo/WarningInfo.java diff --git a/ddl/Definitions.hs b/ddl/Definitions.hs index 9e08cc9..847078c 100644 --- a/ddl/Definitions.hs +++ b/ddl/Definitions.hs @@ -474,9 +474,21 @@ typeInfo = do , "text" #:: String ] + data_ "WarningInfo" $ do + constR_ "WarningInfo" + [ "wRange" #:: "Range" + , "wText" #:: String + ] + + data_ "ErrorInfo" $ do + constR_ "ErrorInfo" + [ "eRange" #:: "Range" + , "eText" #:: String + ] + data_ "CompileResult" $ do - const_ "CompileError" [Array "Range", String, Array "TypeInfo"] - const_ "Compiled" [String, String, "Pipeline", Array "TypeInfo"] + const_ "CompileError" [Array "TypeInfo", Array "WarningInfo", Array "ErrorInfo"] + const_ "Compiled" [String, String, "Pipeline", Array "TypeInfo", Array "WarningInfo"] pipelineSchema = do data_ "StreamType" $ do diff --git a/ddl/out/LambdaCube.IR.cpp b/ddl/out/LambdaCube.IR.cpp index 9504b00..0d9c312 100644 --- a/ddl/out/LambdaCube.IR.cpp +++ b/ddl/out/LambdaCube.IR.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z #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 1edf01f..cd00b46 100644 --- a/ddl/out/LambdaCube.IR.cs +++ b/ddl/out/LambdaCube.IR.cs @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z using System; using System.Linq; diff --git a/ddl/out/LambdaCube.IR.hpp b/ddl/out/LambdaCube.IR.hpp index f1c548b..4b4560e 100644 --- a/ddl/out/LambdaCube.IR.hpp +++ b/ddl/out/LambdaCube.IR.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z #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 a69131c..3aaf6eb 100644 --- a/ddl/out/LambdaCube.IR.hs +++ b/ddl/out/LambdaCube.IR.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-09-15T19:44:47.624123918Z +-- 2016-11-10T15:07:10.798971000000Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module LambdaCube.IR where diff --git a/ddl/out/LambdaCube.IR.purs b/ddl/out/LambdaCube.IR.purs index 644bd3a..b159581 100644 --- a/ddl/out/LambdaCube.IR.purs +++ b/ddl/out/LambdaCube.IR.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-09-15T19:44:47.624123918Z +-- 2016-11-10T15:07:10.798971000000Z module LambdaCube.IR where import Prelude diff --git a/ddl/out/LambdaCube.IR.swift b/ddl/out/LambdaCube.IR.swift index 9c4063d..6ce13f5 100644 --- a/ddl/out/LambdaCube.IR.swift +++ b/ddl/out/LambdaCube.IR.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z typealias StreamName = Int diff --git a/ddl/out/LambdaCube.IR2.hpp b/ddl/out/LambdaCube.IR2.hpp index 2acaffa..36eee3a 100644 --- a/ddl/out/LambdaCube.IR2.hpp +++ b/ddl/out/LambdaCube.IR2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z #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 12ed2d5..3810028 100644 --- a/ddl/out/LambdaCube.Mesh.cpp +++ b/ddl/out/LambdaCube.Mesh.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-09-15T19:44:48.078244539Z +// 2016-11-10T15:07:11.866163000000Z #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 c535e9e..825e571 100644 --- a/ddl/out/LambdaCube.Mesh.cs +++ b/ddl/out/LambdaCube.Mesh.cs @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-09-15T19:44:48.078244539Z +// 2016-11-10T15:07:11.866163000000Z using System; using System.Linq; diff --git a/ddl/out/LambdaCube.Mesh.hpp b/ddl/out/LambdaCube.Mesh.hpp index d2671ef..f5c7fab 100644 --- a/ddl/out/LambdaCube.Mesh.hpp +++ b/ddl/out/LambdaCube.Mesh.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-09-15T19:44:48.078244539Z +// 2016-11-10T15:07:11.866163000000Z #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 bc49bb0..c2c4ac1 100644 --- a/ddl/out/LambdaCube.Mesh.hs +++ b/ddl/out/LambdaCube.Mesh.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-09-15T19:44:48.078244539Z +-- 2016-11-10T15:07:11.866163000000Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module LambdaCube.Mesh where diff --git a/ddl/out/LambdaCube.Mesh.purs b/ddl/out/LambdaCube.Mesh.purs index 696cdb3..d06934b 100644 --- a/ddl/out/LambdaCube.Mesh.purs +++ b/ddl/out/LambdaCube.Mesh.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-09-15T19:44:48.078244539Z +-- 2016-11-10T15:07:11.866163000000Z module LambdaCube.Mesh where import Prelude diff --git a/ddl/out/LambdaCube.Mesh.swift b/ddl/out/LambdaCube.Mesh.swift index d54e9f0..ce778fd 100644 --- a/ddl/out/LambdaCube.Mesh.swift +++ b/ddl/out/LambdaCube.Mesh.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-09-15T19:44:48.078244539Z +// 2016-11-10T15:07:11.866163000000Z enum MeshAttribute { case A_Float(Array) diff --git a/ddl/out/LambdaCube.Mesh2.hpp b/ddl/out/LambdaCube.Mesh2.hpp index 9ad0e46..33e91e0 100644 --- a/ddl/out/LambdaCube.Mesh2.hpp +++ b/ddl/out/LambdaCube.Mesh2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-09-15T19:44:48.078244539Z +// 2016-11-10T15:07:11.866163000000Z #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 857c910..a3bdb7f 100644 --- a/ddl/out/LambdaCube.PipelineSchema.cpp +++ b/ddl/out/LambdaCube.PipelineSchema.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-09-15T19:44:48.052942639Z +// 2016-11-10T15:07:11.805936000000Z #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 c75d548..a069bc3 100644 --- a/ddl/out/LambdaCube.PipelineSchema.cs +++ b/ddl/out/LambdaCube.PipelineSchema.cs @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-09-15T19:44:48.052942639Z +// 2016-11-10T15:07:11.805936000000Z using System; using System.Linq; diff --git a/ddl/out/LambdaCube.PipelineSchema.hpp b/ddl/out/LambdaCube.PipelineSchema.hpp index 2242eb4..6731aab 100644 --- a/ddl/out/LambdaCube.PipelineSchema.hpp +++ b/ddl/out/LambdaCube.PipelineSchema.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-09-15T19:44:48.052942639Z +// 2016-11-10T15:07:11.805936000000Z #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 ef3c40d..0f9f5ef 100644 --- a/ddl/out/LambdaCube.PipelineSchema.hs +++ b/ddl/out/LambdaCube.PipelineSchema.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-09-15T19:44:48.052942639Z +-- 2016-11-10T15:07:11.805936000000Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module LambdaCube.PipelineSchema where diff --git a/ddl/out/LambdaCube.PipelineSchema.purs b/ddl/out/LambdaCube.PipelineSchema.purs index 167193e..dcea325 100644 --- a/ddl/out/LambdaCube.PipelineSchema.purs +++ b/ddl/out/LambdaCube.PipelineSchema.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-09-15T19:44:48.052942639Z +-- 2016-11-10T15:07:11.805936000000Z module LambdaCube.PipelineSchema where import Prelude diff --git a/ddl/out/LambdaCube.PipelineSchema.swift b/ddl/out/LambdaCube.PipelineSchema.swift index 36575bc..9e760ec 100644 --- a/ddl/out/LambdaCube.PipelineSchema.swift +++ b/ddl/out/LambdaCube.PipelineSchema.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-09-15T19:44:48.052942639Z +// 2016-11-10T15:07:11.805936000000Z enum StreamType { case Attribute_Word diff --git a/ddl/out/LambdaCube.PipelineSchema2.hpp b/ddl/out/LambdaCube.PipelineSchema2.hpp index 2ace7d9..6a8665b 100644 --- a/ddl/out/LambdaCube.PipelineSchema2.hpp +++ b/ddl/out/LambdaCube.PipelineSchema2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-09-15T19:44:48.052942639Z +// 2016-11-10T15:07:11.805936000000Z #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 51c897d..34aaf21 100644 --- a/ddl/out/LambdaCube.TypeInfo.cpp +++ b/ddl/out/LambdaCube.TypeInfo.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-09-15T19:44:48.120020034Z +// 2016-11-10T15:07:11.972496000000Z #include "LambdaCube.TypeInfo.hpp" template<> json toJSON>(std::shared_ptr &v) { @@ -68,6 +68,68 @@ template<> std::shared_ptr fromJSON>(W json toJSON>(std::shared_ptr &v) { + json obj({}); + switch (v->tag) { + case ::WarningInfo::tag::WarningInfo: + obj["tag"] = "WarningInfo"; + { + std::shared_ptr tv = std::static_pointer_cast(v); + obj["wRange"] = toJSON(tv->wRange); + obj["wText"] = toJSON(tv->wText); + } + break; + } + return obj; +} + +template<> std::shared_ptr fromJSON>(W> v, json &obj) { + enum ::WarningInfo::tag tagType; + std::string tag = obj["tag"]; + if (tag == "WarningInfo") { + tagType = ::WarningInfo::tag::WarningInfo; + std::shared_ptr tv(new data::WarningInfo()); + tv->wRange = fromJSON(W>(), obj["wRange"]); + tv->wText = fromJSON(W(), obj["wText"]); + return tv; + } + else throw "unknown constructor: " + tag; + std::shared_ptr<::WarningInfo> o(new ::WarningInfo()); + o->tag = tagType; + return o; +} + +template<> json toJSON>(std::shared_ptr &v) { + json obj({}); + switch (v->tag) { + case ::ErrorInfo::tag::ErrorInfo: + obj["tag"] = "ErrorInfo"; + { + std::shared_ptr tv = std::static_pointer_cast(v); + obj["eRange"] = toJSON(tv->eRange); + obj["eText"] = toJSON(tv->eText); + } + break; + } + return obj; +} + +template<> std::shared_ptr fromJSON>(W> v, json &obj) { + enum ::ErrorInfo::tag tagType; + std::string tag = obj["tag"]; + if (tag == "ErrorInfo") { + tagType = ::ErrorInfo::tag::ErrorInfo; + std::shared_ptr tv(new data::ErrorInfo()); + tv->eRange = fromJSON(W>(), obj["eRange"]); + tv->eText = fromJSON(W(), obj["eText"]); + return tv; + } + else throw "unknown constructor: " + tag; + std::shared_ptr<::ErrorInfo> o(new ::ErrorInfo()); + o->tag = tagType; + return o; +} + template<> json toJSON>(std::shared_ptr &v) { json obj({}); switch (v->tag) { @@ -88,6 +150,7 @@ template<> json toJSON>(std::shared_ptr_1); obj["arg2"] = toJSON(tv->_2); obj["arg3"] = toJSON(tv->_3); + obj["arg4"] = toJSON(tv->_4); } break; } @@ -100,9 +163,9 @@ 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"]); return tv; } else if (tag == "Compiled") { @@ -112,6 +175,7 @@ template<> std::shared_ptr fromJSON_1 = fromJSON(W(), obj["arg1"]); tv->_2 = fromJSON(W>(), obj["arg2"]); tv->_3 = fromJSON(W>>(), obj["arg3"]); + tv->_4 = fromJSON(W>>(), obj["arg4"]); return tv; } else throw "unknown constructor: " + tag; diff --git a/ddl/out/LambdaCube.TypeInfo.cs b/ddl/out/LambdaCube.TypeInfo.cs index f0a6253..c58ec62 100644 --- a/ddl/out/LambdaCube.TypeInfo.cs +++ b/ddl/out/LambdaCube.TypeInfo.cs @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-09-15T19:44:48.120020034Z +// 2016-11-10T15:07:11.972496000000Z using System; using System.Linq; @@ -39,6 +39,34 @@ namespace LambdaCube.TypeInfo { public TypeInfo() { tag = LambdaCube.TypeInfo.TypeInfo.Tag.TypeInfo; } }; } + public class WarningInfo { + public enum Tag { + WarningInfo + }; + public Tag tag; + }; + + namespace data { + public class WarningInfo : LambdaCube.TypeInfo.WarningInfo { + public global::LambdaCube.TypeInfo.Range wRange; + public string wText; + public WarningInfo() { tag = LambdaCube.TypeInfo.WarningInfo.Tag.WarningInfo; } + }; + } + public class ErrorInfo { + public enum Tag { + ErrorInfo + }; + public Tag tag; + }; + + namespace data { + public class ErrorInfo : LambdaCube.TypeInfo.ErrorInfo { + public global::LambdaCube.TypeInfo.Range eRange; + public string eText; + public ErrorInfo() { tag = LambdaCube.TypeInfo.ErrorInfo.Tag.ErrorInfo; } + }; + } public class CompileResult { public enum Tag { CompileError, @@ -49,9 +77,9 @@ namespace LambdaCube.TypeInfo { namespace data { public class CompileError : LambdaCube.TypeInfo.CompileResult { - public List _0; - public string _1; - public List _2; + public List _0; + public List _1; + public List _2; public CompileError() { tag = LambdaCube.TypeInfo.CompileResult.Tag.CompileError; } }; public class Compiled : LambdaCube.TypeInfo.CompileResult { @@ -59,6 +87,7 @@ namespace LambdaCube.TypeInfo { public string _1; public global::LambdaCube.TypeInfo.Pipeline _2; public List _3; + public List _4; public Compiled() { tag = LambdaCube.TypeInfo.CompileResult.Tag.Compiled; } }; } @@ -67,12 +96,15 @@ namespace LambdaCube.TypeInfo { public enum Type { Int, String, - Array_Range, + Array_ErrorInfo, Array_TypeInfo, + Array_WarningInfo, CompileResult, + ErrorInfo, Pipeline, Range, - TypeInfo + TypeInfo, + WarningInfo } public class Loader { @@ -80,8 +112,9 @@ namespace LambdaCube.TypeInfo { switch (type) { case Type.Int: return (int)obj; case Type.String: return (string)obj; - case Type.Array_Range: return ((JArray)obj).Select(x => (global::LambdaCube.TypeInfo.Range)fromJSON (Type.Range, x)).ToList(); + case Type.Array_ErrorInfo: return ((JArray)obj).Select(x => (global::LambdaCube.TypeInfo.ErrorInfo)fromJSON (Type.ErrorInfo, x)).ToList(); case Type.Array_TypeInfo: return ((JArray)obj).Select(x => (global::LambdaCube.TypeInfo.TypeInfo)fromJSON (Type.TypeInfo, x)).ToList(); + case Type.Array_WarningInfo: return ((JArray)obj).Select(x => (global::LambdaCube.TypeInfo.WarningInfo)fromJSON (Type.WarningInfo, x)).ToList(); case Type.Range: { string tag = (string)obj["tag"]; @@ -109,14 +142,38 @@ namespace LambdaCube.TypeInfo { default: throw new Exception("unknown constructor: " + tag); } } + case Type.WarningInfo: { + string tag = (string)obj["tag"]; + switch (tag) { + case "WarningInfo": { + data.WarningInfo tv = new data.WarningInfo(); + tv.wRange = (global::LambdaCube.TypeInfo.Range)fromJSON(Type.Range,obj["wRange"]); + tv.wText = (string)fromJSON(Type.String,obj["wText"]); + return tv; + } + default: throw new Exception("unknown constructor: " + tag); + } + } + case Type.ErrorInfo: { + string tag = (string)obj["tag"]; + switch (tag) { + case "ErrorInfo": { + data.ErrorInfo tv = new data.ErrorInfo(); + tv.eRange = (global::LambdaCube.TypeInfo.Range)fromJSON(Type.Range,obj["eRange"]); + tv.eText = (string)fromJSON(Type.String,obj["eText"]); + return tv; + } + default: throw new Exception("unknown constructor: " + tag); + } + } case Type.CompileResult: { string tag = (string)obj["tag"]; switch (tag) { case "CompileError": { data.CompileError tv = new data.CompileError(); - tv._0 = (List)fromJSON(Type.Array_Range,obj["arg0"]); - tv._1 = (string)fromJSON(Type.String,obj["arg1"]); - tv._2 = (List)fromJSON(Type.Array_TypeInfo,obj["arg2"]); + 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"]); return tv; } case "Compiled": { @@ -125,6 +182,7 @@ namespace LambdaCube.TypeInfo { tv._1 = (string)fromJSON(Type.String,obj["arg1"]); tv._2 = (global::LambdaCube.TypeInfo.Pipeline)fromJSON(Type.Pipeline,obj["arg2"]); tv._3 = (List)fromJSON(Type.Array_TypeInfo,obj["arg3"]); + tv._4 = (List)fromJSON(Type.Array_WarningInfo,obj["arg4"]); return tv; } default: throw new Exception("unknown constructor: " + tag); @@ -165,6 +223,34 @@ namespace LambdaCube.TypeInfo { } return obj; } + public static JToken toJSON(WarningInfo v) { + var obj = new JObject(); + switch (v.tag) { + case WarningInfo.Tag.WarningInfo: + obj["tag"] = "WarningInfo"; + { + var tv = (data.WarningInfo)v; + obj["wRange"] = toJSON(tv.wRange); + obj["wText"] = toJSON(tv.wText); + } + break; + } + return obj; + } + public static JToken toJSON(ErrorInfo v) { + var obj = new JObject(); + switch (v.tag) { + case ErrorInfo.Tag.ErrorInfo: + obj["tag"] = "ErrorInfo"; + { + var tv = (data.ErrorInfo)v; + obj["eRange"] = toJSON(tv.eRange); + obj["eText"] = toJSON(tv.eText); + } + break; + } + return obj; + } public static JToken toJSON(CompileResult v) { var obj = new JObject(); switch (v.tag) { @@ -185,6 +271,7 @@ namespace LambdaCube.TypeInfo { obj["arg1"] = toJSON(tv._1); obj["arg2"] = toJSON(tv._2); obj["arg3"] = toJSON(tv._3); + obj["arg4"] = toJSON(tv._4); } break; } @@ -193,7 +280,7 @@ namespace LambdaCube.TypeInfo { public static JToken toJSON(int v) { return new JValue(v); } public static JToken toJSON(string v) { return new JValue(v); } - public static JToken toJSON(List v) { + public static JToken toJSON(List v) { var obj = new JArray(); foreach (var i in v) { obj.Add(toJSON(i)); @@ -207,5 +294,12 @@ namespace LambdaCube.TypeInfo { } return obj; } + public static JToken toJSON(List v) { + var obj = new JArray(); + foreach (var i in v) { + obj.Add(toJSON(i)); + } + return obj; + } } } diff --git a/ddl/out/LambdaCube.TypeInfo.hpp b/ddl/out/LambdaCube.TypeInfo.hpp index 28bc52f..441e00e 100644 --- a/ddl/out/LambdaCube.TypeInfo.hpp +++ b/ddl/out/LambdaCube.TypeInfo.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-09-15T19:44:48.120020034Z +// 2016-11-10T15:07:11.972496000000Z #ifndef HEADER_LambdaCube.TypeInfo_H #define HEADER_LambdaCube.TypeInfo_H @@ -38,6 +38,34 @@ namespace data { TypeInfo() { tag = tag::TypeInfo; } }; } +class WarningInfo { + public: + enum class tag { + WarningInfo + } tag; +}; +namespace data { + class WarningInfo : public ::WarningInfo { + public: + std::shared_ptr<::Range> wRange; + String wText; + WarningInfo() { tag = tag::WarningInfo; } + }; +} +class ErrorInfo { + public: + enum class tag { + ErrorInfo + } tag; +}; +namespace data { + class ErrorInfo : public ::ErrorInfo { + public: + std::shared_ptr<::Range> eRange; + String eText; + ErrorInfo() { tag = tag::ErrorInfo; } + }; +} class CompileResult { public: enum class tag { @@ -48,9 +76,9 @@ class CompileResult { namespace data { class CompileError : public ::CompileResult { public: - std::vector> _0; - String _1; - std::vector> _2; + std::vector> _0; + std::vector> _1; + std::vector> _2; CompileError() { tag = tag::CompileError; } }; class Compiled : public ::CompileResult { @@ -59,6 +87,7 @@ namespace data { String _1; std::shared_ptr<::Pipeline> _2; std::vector> _3; + std::vector> _4; Compiled() { tag = tag::Compiled; } }; } diff --git a/ddl/out/LambdaCube.TypeInfo.hs b/ddl/out/LambdaCube.TypeInfo.hs index 03346b6..9632fff 100644 --- a/ddl/out/LambdaCube.TypeInfo.hs +++ b/ddl/out/LambdaCube.TypeInfo.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-09-15T19:44:48.120020034Z +-- 2016-11-10T15:07:11.972496000000Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module LambdaCube.TypeInfo where @@ -35,9 +35,25 @@ data TypeInfo deriving (Show, Eq, Ord) +data WarningInfo + = WarningInfo + { wRange :: Range + , wText :: String + } + + deriving (Show, Eq, Ord) + +data ErrorInfo + = ErrorInfo + { eRange :: Range + , eText :: String + } + + deriving (Show, Eq, Ord) + data CompileResult - = CompileError (Vector Range) String (Vector TypeInfo) - | Compiled String String Pipeline (Vector TypeInfo) + = CompileError (Vector TypeInfo) (Vector WarningInfo) (Vector ErrorInfo) + | Compiled String String Pipeline (Vector TypeInfo) (Vector WarningInfo) deriving (Show, Eq, Ord) @@ -89,16 +105,58 @@ instance FromJSON TypeInfo where } parseJSON _ = mzero +instance ToJSON WarningInfo where + toJSON v = case v of + WarningInfo{..} -> object + [ "tag" .= ("WarningInfo" :: Text) + , "wRange" .= wRange + , "wText" .= wText + ] + +instance FromJSON WarningInfo where + parseJSON (Object obj) = do + tag <- obj .: "tag" + case tag :: Text of + "WarningInfo" -> do + wRange <- obj .: "wRange" + wText <- obj .: "wText" + pure $ WarningInfo + { wRange = wRange + , wText = wText + } + parseJSON _ = mzero + +instance ToJSON ErrorInfo where + toJSON v = case v of + ErrorInfo{..} -> object + [ "tag" .= ("ErrorInfo" :: Text) + , "eRange" .= eRange + , "eText" .= eText + ] + +instance FromJSON ErrorInfo where + parseJSON (Object obj) = do + tag <- obj .: "tag" + case tag :: Text of + "ErrorInfo" -> do + eRange <- obj .: "eRange" + eText <- obj .: "eText" + pure $ ErrorInfo + { eRange = eRange + , eText = eText + } + parseJSON _ = mzero + instance ToJSON CompileResult where toJSON v = case v of CompileError arg0 arg1 arg2 -> object [ "tag" .= ("CompileError" :: Text), "arg0" .= arg0, "arg1" .= arg1, "arg2" .= arg2] - Compiled arg0 arg1 arg2 arg3 -> object [ "tag" .= ("Compiled" :: 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" - "Compiled" -> Compiled <$> 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 eee3d0c..db22d59 100644 --- a/ddl/out/LambdaCube.TypeInfo.purs +++ b/ddl/out/LambdaCube.TypeInfo.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-09-15T19:44:48.120020034Z +-- 2016-11-10T15:07:11.972496000000Z module LambdaCube.TypeInfo where import Prelude @@ -36,9 +36,23 @@ data TypeInfo } +data WarningInfo + = WarningInfo + { wRange :: Range + , wText :: String + } + + +data ErrorInfo + = ErrorInfo + { eRange :: Range + , eText :: String + } + + data CompileResult - = CompileError (Array Range) String (Array TypeInfo) - | Compiled String String Pipeline (Array TypeInfo) + = CompileError (Array TypeInfo) (Array WarningInfo) (Array ErrorInfo) + | Compiled String String Pipeline (Array TypeInfo) (Array WarningInfo) @@ -92,10 +106,52 @@ instance decodeJsonTypeInfo :: DecodeJson TypeInfo where } _ -> unsafeCrashWith "decodeJson @ TypeInfo" +instance encodeJsonWarningInfo :: EncodeJson WarningInfo where + encodeJson v = case v of + WarningInfo r -> + "tag" := "WarningInfo" ~> + "wRange" := r.wRange ~> + "wText" := r.wText ~> + jsonEmptyObject + +instance decodeJsonWarningInfo :: DecodeJson WarningInfo where + decodeJson json = do + obj <- decodeJson json + tag <- obj .? "tag" + case tag of + "WarningInfo" -> do + wRange <- obj .? "wRange" + wText <- obj .? "wText" + pure $ WarningInfo + { wRange:wRange + , wText:wText + } + +instance encodeJsonErrorInfo :: EncodeJson ErrorInfo where + encodeJson v = case v of + ErrorInfo r -> + "tag" := "ErrorInfo" ~> + "eRange" := r.eRange ~> + "eText" := r.eText ~> + jsonEmptyObject + +instance decodeJsonErrorInfo :: DecodeJson ErrorInfo where + decodeJson json = do + obj <- decodeJson json + tag <- obj .? "tag" + case tag of + "ErrorInfo" -> do + eRange <- obj .? "eRange" + eText <- obj .? "eText" + pure $ ErrorInfo + { eRange:eRange + , eText:eText + } + instance encodeJsonCompileResult :: EncodeJson CompileResult where encodeJson v = case v of CompileError arg0 arg1 arg2 -> "tag" := "CompileError" ~> "arg0" := arg0 ~> "arg1" := arg1 ~> "arg2" := arg2 ~> jsonEmptyObject - Compiled arg0 arg1 arg2 arg3 -> "tag" := "Compiled" ~> "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 decodeJson json = do @@ -103,6 +159,10 @@ instance decodeJsonCompileResult :: DecodeJson CompileResult where 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" +======= + "Compiled" -> Compiled <$> obj .? "arg0" <*> obj .? "arg1" <*> obj .? "arg2" <*> obj .? "arg3" <*> obj .? "arg4" +>>>>>>> update type info to include warnings diff --git a/ddl/out/LambdaCube.TypeInfo.swift b/ddl/out/LambdaCube.TypeInfo.swift index 9304b97..6083382 100644 --- a/ddl/out/LambdaCube.TypeInfo.swift +++ b/ddl/out/LambdaCube.TypeInfo.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-09-15T19:44:48.120020034Z +// 2016-11-10T15:07:11.972496000000Z enum Range { case Range(Range_Data) @@ -19,9 +19,25 @@ enum TypeInfo { } } +enum WarningInfo { + case WarningInfo(WarningInfo_Data) + struct WarningInfo_Data { + var wRange : Range + var wText : String + } +} + +enum ErrorInfo { + case ErrorInfo(ErrorInfo_Data) + struct ErrorInfo_Data { + var eRange : Range + var eText : String + } +} + enum CompileResult { - case CompileError(Array,String,Array) - case Compiled(String,String,Pipeline,Array) + case CompileError(Array,Array,Array) + case Compiled(String,String,Pipeline,Array,Array) } @@ -102,13 +118,35 @@ extension TypeInfo { } } } +extension WarningInfo { + var toJSON : [String: AnyObject] { + switch self { + case .WarningInfo(let v): + return [ "tag" : "WarningInfo" + , "wRange" : v.wRange.toJSON + , "wText" : v.wText.toJSON + ] + } + } +} +extension ErrorInfo { + var toJSON : [String: AnyObject] { + switch self { + case .ErrorInfo(let v): + return [ "tag" : "ErrorInfo" + , "eRange" : v.eRange.toJSON + , "eText" : v.eText.toJSON + ] + } + } +} 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 .Compiled(let arg0, let arg1, let arg2, let arg3): - return [ "tag" : "Compiled", "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] } } } @@ -132,6 +170,8 @@ enum Type { case Map(Type,Type) case Range case TypeInfo + case WarningInfo + case ErrorInfo case CompileResult } diff --git a/ddl/out/LambdaCube.TypeInfo2.hpp b/ddl/out/LambdaCube.TypeInfo2.hpp index ba80ca0..b8f77a1 100644 --- a/ddl/out/LambdaCube.TypeInfo2.hpp +++ b/ddl/out/LambdaCube.TypeInfo2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-09-15T19:44:48.120020034Z +// 2016-11-10T15:07:11.972496000000Z #ifndef HEADER_LambdaCube.TypeInfo_H #define HEADER_LambdaCube.TypeInfo_H @@ -38,12 +38,40 @@ public: } tag; std::shared_ptr TypeInfo; }; +namespace data { + class WarningInfo { + public: + std::shared_ptr<::Range> wRange; + String wText; + }; +} +class WarningInfo { +public: + enum class tag { + WarningInfo + } tag; + std::shared_ptr WarningInfo; +}; +namespace data { + class ErrorInfo { + public: + std::shared_ptr<::Range> eRange; + String eText; + }; +} +class ErrorInfo { +public: + enum class tag { + ErrorInfo + } tag; + std::shared_ptr ErrorInfo; +}; namespace data { class CompileError { public: - std::vector> _0; - String _1; - std::vector> _2; + std::vector> _0; + std::vector> _1; + std::vector> _2; }; class Compiled { public: @@ -51,6 +79,7 @@ namespace data { String _1; std::shared_ptr<::Pipeline> _2; std::vector> _3; + std::vector> _4; }; } class CompileResult { diff --git a/ddl/out/TestData.cpp b/ddl/out/TestData.cpp index 6a686a9..58db58d 100644 --- a/ddl/out/TestData.cpp +++ b/ddl/out/TestData.cpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-09-15T19:44:48.147167874Z +// 2016-11-10T15:07:12.061252000000Z #include "TestData.hpp" template<> json toJSON>(std::shared_ptr &v) { diff --git a/ddl/out/TestData.cs b/ddl/out/TestData.cs index 3c4b2bf..42bfbff 100644 --- a/ddl/out/TestData.cs +++ b/ddl/out/TestData.cs @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-09-15T19:44:48.147167874Z +// 2016-11-10T15:07:12.061252000000Z using System; using System.Linq; diff --git a/ddl/out/TestData.hpp b/ddl/out/TestData.hpp index c66e828..1045578 100644 --- a/ddl/out/TestData.hpp +++ b/ddl/out/TestData.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-09-15T19:44:48.147167874Z +// 2016-11-10T15:07:12.061252000000Z #ifndef HEADER_TestData_H #define HEADER_TestData_H diff --git a/ddl/out/TestData.hs b/ddl/out/TestData.hs index e2a85a3..f2c6101 100644 --- a/ddl/out/TestData.hs +++ b/ddl/out/TestData.hs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-09-15T19:44:48.147167874Z +-- 2016-11-10T15:07:12.061252000000Z {-# LANGUAGE OverloadedStrings, RecordWildCards #-} module TestData where diff --git a/ddl/out/TestData.purs b/ddl/out/TestData.purs index 2ac59b8..7d3e82a 100644 --- a/ddl/out/TestData.purs +++ b/ddl/out/TestData.purs @@ -1,5 +1,5 @@ -- generated file, do not modify! --- 2016-09-15T19:44:48.147167874Z +-- 2016-11-10T15:07:12.061252000000Z module TestData where import Prelude diff --git a/ddl/out/TestData.swift b/ddl/out/TestData.swift index 3fe771a..aef2069 100644 --- a/ddl/out/TestData.swift +++ b/ddl/out/TestData.swift @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-09-15T19:44:48.147167874Z +// 2016-11-10T15:07:12.061252000000Z enum ClientInfo { case ClientInfo(ClientInfo_Data) diff --git a/ddl/out/TestData2.hpp b/ddl/out/TestData2.hpp index d39d5fa..462b05f 100644 --- a/ddl/out/TestData2.hpp +++ b/ddl/out/TestData2.hpp @@ -1,5 +1,5 @@ // generated file, do not modify! -// 2016-09-15T19:44:48.147167874Z +// 2016-11-10T15:07:12.061252000000Z #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 5f788e2..5da0b75 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/ArrayValue.java b/ddl/out/java/LambdaCube/IR/ArrayValue.java index d21bd4f..dbc7ebf 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Backend.java b/ddl/out/java/LambdaCube/IR/Backend.java index 513f8c0..b0c76ca 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/BlendEquation.java b/ddl/out/java/LambdaCube/IR/BlendEquation.java index 3f9ee93..b866f91 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Blending.java b/ddl/out/java/LambdaCube/IR/Blending.java index aee35f5..3483aa7 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/BlendingFactor.java b/ddl/out/java/LambdaCube/IR/BlendingFactor.java index d7bdefb..8ecccc9 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/ClearImage.java b/ddl/out/java/LambdaCube/IR/ClearImage.java index d3a55e0..a4e2dcf 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/ColorArity.java b/ddl/out/java/LambdaCube/IR/ColorArity.java index be2380b..2e38368 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Command.java b/ddl/out/java/LambdaCube/IR/Command.java index 7a3947a..e960d62 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/ComparisonFunction.java b/ddl/out/java/LambdaCube/IR/ComparisonFunction.java index 6040a6a..e99d736 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/CullMode.java b/ddl/out/java/LambdaCube/IR/CullMode.java index ac060b7..24498ae 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/EdgeMode.java b/ddl/out/java/LambdaCube/IR/EdgeMode.java index 40418c1..e06e665 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/FetchPrimitive.java b/ddl/out/java/LambdaCube/IR/FetchPrimitive.java index d7fc693..ab90181 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Filter.java b/ddl/out/java/LambdaCube/IR/Filter.java index 2333f6b..0fcf88a 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/FragmentOperation.java b/ddl/out/java/LambdaCube/IR/FragmentOperation.java index 885e2be..897b656 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/FrontFace.java b/ddl/out/java/LambdaCube/IR/FrontFace.java index da9347b..7ad6264 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/ImageRef.java b/ddl/out/java/LambdaCube/IR/ImageRef.java index 0173d9c..4eef01b 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/ImageSemantic.java b/ddl/out/java/LambdaCube/IR/ImageSemantic.java index 4706288..255167c 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/InputType.java b/ddl/out/java/LambdaCube/IR/InputType.java index f66a1d5..a1a927a 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/JSON.java b/ddl/out/java/LambdaCube/IR/JSON.java index 89ec1ef..b9ec62f 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/LogicOperation.java b/ddl/out/java/LambdaCube/IR/LogicOperation.java index 568c08c..1239717 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/MipMap.java b/ddl/out/java/LambdaCube/IR/MipMap.java index 24be83e..fbce936 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/OutputPrimitive.java b/ddl/out/java/LambdaCube/IR/OutputPrimitive.java index d5f88d2..6320101 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Parameter.java b/ddl/out/java/LambdaCube/IR/Parameter.java index 6a74e24..ca518b9 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Pipeline.java b/ddl/out/java/LambdaCube/IR/Pipeline.java index e0c06ba..b7e2d87 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/PointSize.java b/ddl/out/java/LambdaCube/IR/PointSize.java index 2231d43..b9c9bd0 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/PointSpriteCoordOrigin.java b/ddl/out/java/LambdaCube/IR/PointSpriteCoordOrigin.java index b4983f5..f7cc8d0 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/PolygonMode.java b/ddl/out/java/LambdaCube/IR/PolygonMode.java index e341e7f..9cc38f9 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/PolygonOffset.java b/ddl/out/java/LambdaCube/IR/PolygonOffset.java index 4a7d12d..f8706b2 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Program.java b/ddl/out/java/LambdaCube/IR/Program.java index b64d543..da78920 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/ProvokingVertex.java b/ddl/out/java/LambdaCube/IR/ProvokingVertex.java index 946cb1a..055fab5 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/RasterContext.java b/ddl/out/java/LambdaCube/IR/RasterContext.java index 4a131cb..ebb815b 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/RenderTarget.java b/ddl/out/java/LambdaCube/IR/RenderTarget.java index c2b4d78..3a80f7c 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/SamplerDescriptor.java b/ddl/out/java/LambdaCube/IR/SamplerDescriptor.java index 4649eee..a26574d 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Slot.java b/ddl/out/java/LambdaCube/IR/Slot.java index a881be7..79b3696 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/StencilOperation.java b/ddl/out/java/LambdaCube/IR/StencilOperation.java index 1c270dd..6ce9b3f 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/StencilOps.java b/ddl/out/java/LambdaCube/IR/StencilOps.java index 8408016..33ec375 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/StencilTest.java b/ddl/out/java/LambdaCube/IR/StencilTest.java index 3adddc2..0678931 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/StencilTests.java b/ddl/out/java/LambdaCube/IR/StencilTests.java index e08a07f..823b9e8 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/StreamData.java b/ddl/out/java/LambdaCube/IR/StreamData.java index 2e821a5..d63dc08 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/TargetItem.java b/ddl/out/java/LambdaCube/IR/TargetItem.java index b602b56..45b58d1 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/TextureDataType.java b/ddl/out/java/LambdaCube/IR/TextureDataType.java index 0d889d8..a345db7 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/TextureDescriptor.java b/ddl/out/java/LambdaCube/IR/TextureDescriptor.java index 368e8f0..cbcddce 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/TextureType.java b/ddl/out/java/LambdaCube/IR/TextureType.java index 451ad52..aa742e1 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/IR/Value.java b/ddl/out/java/LambdaCube/IR/Value.java index 294a4db..e9fc6be 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-09-15T19:44:47.624123918Z +// 2016-11-10T15:07:10.798971000000Z package LambdaCube.IR; diff --git a/ddl/out/java/LambdaCube/Mesh/JSON.java b/ddl/out/java/LambdaCube/Mesh/JSON.java index a52ea1f..0b29f5b 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-09-15T19:44:48.078244539Z +// 2016-11-10T15:07:11.866163000000Z package LambdaCube.Mesh; diff --git a/ddl/out/java/LambdaCube/Mesh/Mesh.java b/ddl/out/java/LambdaCube/Mesh/Mesh.java index d5a649f..271bf0b 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-09-15T19:44:48.078244539Z +// 2016-11-10T15:07:11.866163000000Z package LambdaCube.Mesh; diff --git a/ddl/out/java/LambdaCube/Mesh/MeshAttribute.java b/ddl/out/java/LambdaCube/Mesh/MeshAttribute.java index 68fa1bc..9d06b72 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-09-15T19:44:48.078244539Z +// 2016-11-10T15:07:11.866163000000Z package LambdaCube.Mesh; diff --git a/ddl/out/java/LambdaCube/Mesh/MeshPrimitive.java b/ddl/out/java/LambdaCube/Mesh/MeshPrimitive.java index 116cf4a..974d8ce 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-09-15T19:44:48.078244539Z +// 2016-11-10T15:07:11.866163000000Z package LambdaCube.Mesh; diff --git a/ddl/out/java/LambdaCube/PipelineSchema/JSON.java b/ddl/out/java/LambdaCube/PipelineSchema/JSON.java index fd2a905..5051614 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-09-15T19:44:48.052942639Z +// 2016-11-10T15:07:11.805936000000Z package LambdaCube.PipelineSchema; diff --git a/ddl/out/java/LambdaCube/PipelineSchema/ObjectArraySchema.java b/ddl/out/java/LambdaCube/PipelineSchema/ObjectArraySchema.java index 6ed3627..97e9ac2 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-09-15T19:44:48.052942639Z +// 2016-11-10T15:07:11.805936000000Z package LambdaCube.PipelineSchema; diff --git a/ddl/out/java/LambdaCube/PipelineSchema/PipelineSchema.java b/ddl/out/java/LambdaCube/PipelineSchema/PipelineSchema.java index 39fb6eb..9553424 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-09-15T19:44:48.052942639Z +// 2016-11-10T15:07:11.805936000000Z package LambdaCube.PipelineSchema; diff --git a/ddl/out/java/LambdaCube/PipelineSchema/StreamType.java b/ddl/out/java/LambdaCube/PipelineSchema/StreamType.java index debbb01..42f388e 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-09-15T19:44:48.052942639Z +// 2016-11-10T15:07:11.805936000000Z package LambdaCube.PipelineSchema; diff --git a/ddl/out/java/LambdaCube/TypeInfo/CompileResult.java b/ddl/out/java/LambdaCube/TypeInfo/CompileResult.java index 91653b5..cf66ce9 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-09-15T19:44:48.120020034Z +// 2016-11-10T15:07:11.972496000000Z package LambdaCube.TypeInfo; @@ -17,9 +17,9 @@ public class CompileResult { public Tag tag; public class CompileError_ extends CompileResult { - public ArrayList _0; - public String _1; - public ArrayList _2; + public ArrayList _0; + public ArrayList _1; + public ArrayList _2; public CompileError_() { tag = CompileResult.Tag.CompileError; } } public class Compiled_ extends CompileResult { @@ -27,6 +27,7 @@ public class CompileResult { public String _1; public Pipeline _2; public ArrayList _3; + public ArrayList _4; public Compiled_() { tag = CompileResult.Tag.Compiled; } } } diff --git a/ddl/out/java/LambdaCube/TypeInfo/ErrorInfo.java b/ddl/out/java/LambdaCube/TypeInfo/ErrorInfo.java new file mode 100644 index 0000000..a59fc81 --- /dev/null +++ b/ddl/out/java/LambdaCube/TypeInfo/ErrorInfo.java @@ -0,0 +1,24 @@ +// generated file, do not modify! +// 2016-11-10T15:07:11.972496000000Z + +package LambdaCube.TypeInfo; + +import java.util.ArrayList; +import java.util.HashMap; +import RT.*; + +import LambdaCube.IR.*; + +public class ErrorInfo { + public enum Tag { + ErrorInfo + } + public Tag tag; + + public class ErrorInfo_ extends ErrorInfo { + public Range eRange; + public String eText; + public ErrorInfo_() { tag = ErrorInfo.Tag.ErrorInfo; } + } +} + diff --git a/ddl/out/java/LambdaCube/TypeInfo/JSON.java b/ddl/out/java/LambdaCube/TypeInfo/JSON.java index e13fa63..458656c 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-09-15T19:44:48.120020034Z +// 2016-11-10T15:07:11.972496000000Z package LambdaCube.TypeInfo; @@ -17,23 +17,26 @@ public class JSON { public enum Type { Int, String, - Array_Range, + Array_ErrorInfo, Array_TypeInfo, + Array_WarningInfo, CompileResult, + ErrorInfo, Pipeline, Range, - TypeInfo + TypeInfo, + WarningInfo } public static Object fromJSON(Type type, Object rawObj) throws JSONException, Exception { switch (type) { case Int: return ((Number)rawObj).intValue(); case String: return (String)rawObj; - case Array_Range: { + case Array_ErrorInfo: { JSONArray obj = (JSONArray)rawObj; - ArrayList v = new ArrayList (); + ArrayList v = new ArrayList (); for (int i = 0; i < obj.length(); i++) { - v.add((Range)fromJSON (Type.Range, obj.get(i))); + v.add((ErrorInfo)fromJSON (Type.ErrorInfo, obj.get(i))); } return v; } @@ -45,6 +48,14 @@ public class JSON { } return v; } + case Array_WarningInfo: { + JSONArray obj = (JSONArray)rawObj; + ArrayList v = new ArrayList (); + for (int i = 0; i < obj.length(); i++) { + v.add((WarningInfo)fromJSON (Type.WarningInfo, obj.get(i))); + } + return v; + } case Range: { JSONObject obj = (JSONObject)rawObj; @@ -74,15 +85,41 @@ public class JSON { default: throw new Exception("unknown constructor: " + tag); } } + case WarningInfo: { + JSONObject obj = (JSONObject)rawObj; + String tag = obj.getString("tag"); + switch (tag) { + case "WarningInfo": { + WarningInfo.WarningInfo_ tv = new WarningInfo().new WarningInfo_(); + tv.wRange = (Range)fromJSON(Type.Range,obj.get("wRange")); + tv.wText = (String)fromJSON(Type.String,obj.get("wText")); + return tv; + } + default: throw new Exception("unknown constructor: " + tag); + } + } + case ErrorInfo: { + JSONObject obj = (JSONObject)rawObj; + String tag = obj.getString("tag"); + switch (tag) { + case "ErrorInfo": { + ErrorInfo.ErrorInfo_ tv = new ErrorInfo().new ErrorInfo_(); + tv.eRange = (Range)fromJSON(Type.Range,obj.get("eRange")); + tv.eText = (String)fromJSON(Type.String,obj.get("eText")); + return tv; + } + default: throw new Exception("unknown constructor: " + tag); + } + } case CompileResult: { JSONObject obj = (JSONObject)rawObj; String tag = obj.getString("tag"); switch (tag) { case "CompileError": { CompileResult.CompileError_ tv = new CompileResult().new CompileError_(); - tv._0 = (ArrayList)fromJSON(Type.Array_Range,obj.get("arg0")); - tv._1 = (String)fromJSON(Type.String,obj.get("arg1")); - tv._2 = (ArrayList)fromJSON(Type.Array_TypeInfo,obj.get("arg2")); + 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")); return tv; } case "Compiled": { @@ -91,6 +128,7 @@ public class JSON { tv._1 = (String)fromJSON(Type.String,obj.get("arg1")); tv._2 = (Pipeline)fromJSON(Type.Pipeline,obj.get("arg2")); tv._3 = (ArrayList)fromJSON(Type.Array_TypeInfo,obj.get("arg3")); + tv._4 = (ArrayList)fromJSON(Type.Array_WarningInfo,obj.get("arg4")); return tv; } default: throw new Exception("unknown constructor: " + tag); @@ -134,6 +172,36 @@ public class JSON { } return obj; } + case WarningInfo: { + WarningInfo v = (WarningInfo)rawObj; + JSONObject obj = new JSONObject(); + switch (v.tag) { + case WarningInfo: + obj.put("tag", "WarningInfo"); + { + WarningInfo.WarningInfo_ tv = (WarningInfo.WarningInfo_)v; + obj.put("wRange", toJSON(Type.Range,tv.wRange)); + obj.put("wText", toJSON(Type.String,tv.wText)); + } + break; + } + return obj; + } + case ErrorInfo: { + ErrorInfo v = (ErrorInfo)rawObj; + JSONObject obj = new JSONObject(); + switch (v.tag) { + case ErrorInfo: + obj.put("tag", "ErrorInfo"); + { + ErrorInfo.ErrorInfo_ tv = (ErrorInfo.ErrorInfo_)v; + obj.put("eRange", toJSON(Type.Range,tv.eRange)); + obj.put("eText", toJSON(Type.String,tv.eText)); + } + break; + } + return obj; + } case CompileResult: { CompileResult v = (CompileResult)rawObj; JSONObject obj = new JSONObject(); @@ -142,9 +210,9 @@ public class JSON { obj.put("tag", "CompileError"); { CompileResult.CompileError_ tv = (CompileResult.CompileError_)v; - obj.put("arg0", toJSON(Type.Array_Range,tv._0)); - obj.put("arg1", toJSON(Type.String,tv._1)); - obj.put("arg2", toJSON(Type.Array_TypeInfo,tv._2)); + 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)); } break; case Compiled: @@ -155,6 +223,7 @@ public class JSON { obj.put("arg1", toJSON(Type.String,tv._1)); obj.put("arg2", toJSON(Type.Pipeline,tv._2)); obj.put("arg3", toJSON(Type.Array_TypeInfo,tv._3)); + obj.put("arg4", toJSON(Type.Array_WarningInfo,tv._4)); } break; } @@ -163,11 +232,11 @@ public class JSON { case Int: { return rawObj; } case String: { return rawObj; } - case Array_Range: { - ArrayList v = (ArrayList)rawObj; + case Array_ErrorInfo: { + ArrayList v = (ArrayList)rawObj; JSONArray obj = new JSONArray(); - for(Range i : v) { - obj.put(toJSON(Type.Range,i)); + for(ErrorInfo i : v) { + obj.put(toJSON(Type.ErrorInfo,i)); } return obj; } @@ -179,6 +248,14 @@ public class JSON { } return obj; } + case Array_WarningInfo: { + ArrayList v = (ArrayList)rawObj; + JSONArray obj = new JSONArray(); + for(WarningInfo i : v) { + obj.put(toJSON(Type.WarningInfo,i)); + } + return obj; + } } throw new Exception("unknown type"); } diff --git a/ddl/out/java/LambdaCube/TypeInfo/Range.java b/ddl/out/java/LambdaCube/TypeInfo/Range.java index 8c63d75..e5db6f2 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-09-15T19:44:48.120020034Z +// 2016-11-10T15:07:11.972496000000Z package LambdaCube.TypeInfo; diff --git a/ddl/out/java/LambdaCube/TypeInfo/TypeInfo.java b/ddl/out/java/LambdaCube/TypeInfo/TypeInfo.java index 8e86f07..9cf2ec4 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-09-15T19:44:48.120020034Z +// 2016-11-10T15:07:11.972496000000Z package LambdaCube.TypeInfo; diff --git a/ddl/out/java/LambdaCube/TypeInfo/WarningInfo.java b/ddl/out/java/LambdaCube/TypeInfo/WarningInfo.java new file mode 100644 index 0000000..a6be28f --- /dev/null +++ b/ddl/out/java/LambdaCube/TypeInfo/WarningInfo.java @@ -0,0 +1,24 @@ +// generated file, do not modify! +// 2016-11-10T15:07:11.972496000000Z + +package LambdaCube.TypeInfo; + +import java.util.ArrayList; +import java.util.HashMap; +import RT.*; + +import LambdaCube.IR.*; + +public class WarningInfo { + public enum Tag { + WarningInfo + } + public Tag tag; + + public class WarningInfo_ extends WarningInfo { + public Range wRange; + public String wText; + public WarningInfo_() { tag = WarningInfo.Tag.WarningInfo; } + } +} + diff --git a/ddl/out/java/TestData/ClientInfo.java b/ddl/out/java/TestData/ClientInfo.java index 0b78ff0..53bba37 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-09-15T19:44:48.147167874Z +// 2016-11-10T15:07:12.061252000000Z package TestData; diff --git a/ddl/out/java/TestData/Frame.java b/ddl/out/java/TestData/Frame.java index 1fe44d9..c75409f 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-09-15T19:44:48.147167874Z +// 2016-11-10T15:07:12.061252000000Z package TestData; diff --git a/ddl/out/java/TestData/FrameResult.java b/ddl/out/java/TestData/FrameResult.java index 03f6eca..5f9a11e 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-09-15T19:44:48.147167874Z +// 2016-11-10T15:07:12.061252000000Z package TestData; diff --git a/ddl/out/java/TestData/JSON.java b/ddl/out/java/TestData/JSON.java index ce9772c..8bc4e2a 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-09-15T19:44:48.147167874Z +// 2016-11-10T15:07:12.061252000000Z package TestData; diff --git a/ddl/out/java/TestData/PipelineInfo.java b/ddl/out/java/TestData/PipelineInfo.java index 4b0f537..1ab0bce 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-09-15T19:44:48.147167874Z +// 2016-11-10T15:07:12.061252000000Z package TestData; diff --git a/ddl/out/java/TestData/RenderJob.java b/ddl/out/java/TestData/RenderJob.java index dfcb76c..016e531 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-09-15T19:44:48.147167874Z +// 2016-11-10T15:07:12.061252000000Z package TestData; diff --git a/ddl/out/java/TestData/RenderJobResult.java b/ddl/out/java/TestData/RenderJobResult.java index e9b0352..236198a 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-09-15T19:44:48.147167874Z +// 2016-11-10T15:07:12.061252000000Z package TestData; diff --git a/ddl/out/java/TestData/Scene.java b/ddl/out/java/TestData/Scene.java index 1a37243..50da7cc 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-09-15T19:44:48.147167874Z +// 2016-11-10T15:07:12.061252000000Z package TestData; -- cgit v1.2.3