tweak CompileResult type

lambdacube3d · Feb 26, 2016 · 2eb7cc7 · 2eb7cc7
1 parent 5ea5e05
commit 2eb7cc7
Show file tree

Hide file tree

Showing 31 changed files with 50 additions and 46 deletions.
diff --git a/ddl/Definitions.hs b/ddl/Definitions.hs
@@ -474,7 +474,7 @@ typeInfo = do
       ]
 
   data_ "CompileResult" $ do
-    const_ "CompileError" [Array "TypeInfo", Array "TypeInfo"]
+    const_ "CompileError" [Array "Range", String, Array "TypeInfo"]
     const_ "Compiled"     [String, "Pipeline", Array "TypeInfo"]
 
 pipelineSchema = do

diff --git a/ddl/out/LambdaCube.IR.cpp b/ddl/out/LambdaCube.IR.cpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:29:11.442441000000Z
+// 2016-02-26T11:37:22.233668000000Z
 
 #include "LambdaCube.IR.hpp"
 template<> json toJSON<std::shared_ptr<ArrayValue>>(std::shared_ptr<ArrayValue> &v) {

diff --git a/ddl/out/LambdaCube.IR.hpp b/ddl/out/LambdaCube.IR.hpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:29:11.442441000000Z
+// 2016-02-26T11:37:22.233668000000Z
 
 #ifndef HEADER_LambdaCube.IR_H
 #define HEADER_LambdaCube.IR_H

diff --git a/ddl/out/LambdaCube.IR.hs b/ddl/out/LambdaCube.IR.hs
@@ -1,5 +1,5 @@
 -- generated file, do not modify!
--- 2016-02-26T11:29:11.442441000000Z
+-- 2016-02-26T11:37:22.233668000000Z
 
 {-# LANGUAGE OverloadedStrings, RecordWildCards #-}
 module LambdaCube.IR where

diff --git a/ddl/out/LambdaCube.IR.purs b/ddl/out/LambdaCube.IR.purs
@@ -1,5 +1,5 @@
 -- generated file, do not modify!
--- 2016-02-26T11:29:11.442441000000Z
+-- 2016-02-26T11:37:22.233668000000Z
 
 module LambdaCube.IR where
 import Prelude

diff --git a/ddl/out/LambdaCube.IR.swift b/ddl/out/LambdaCube.IR.swift
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:29:11.442441000000Z
+// 2016-02-26T11:37:22.233668000000Z
 
 typealias StreamName = Int
 

diff --git a/ddl/out/LambdaCube.IR2.hpp b/ddl/out/LambdaCube.IR2.hpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:29:11.442441000000Z
+// 2016-02-26T11:37:22.233668000000Z
 
 #ifndef HEADER_LambdaCube.IR_H
 #define HEADER_LambdaCube.IR_H

diff --git a/ddl/out/LambdaCube.Mesh.cpp b/ddl/out/LambdaCube.Mesh.cpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:29:11.794796000000Z
+// 2016-02-26T11:37:22.580893000000Z
 
 #include "LambdaCube.Mesh.hpp"
 template<> json toJSON<std::shared_ptr<MeshAttribute>>(std::shared_ptr<MeshAttribute> &v) {

diff --git a/ddl/out/LambdaCube.Mesh.hpp b/ddl/out/LambdaCube.Mesh.hpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:29:11.794796000000Z
+// 2016-02-26T11:37:22.580893000000Z
 
 #ifndef HEADER_LambdaCube.Mesh_H
 #define HEADER_LambdaCube.Mesh_H

diff --git a/ddl/out/LambdaCube.Mesh.hs b/ddl/out/LambdaCube.Mesh.hs
@@ -1,5 +1,5 @@
 -- generated file, do not modify!
--- 2016-02-26T11:29:11.794796000000Z
+-- 2016-02-26T11:37:22.580893000000Z
 
 {-# LANGUAGE OverloadedStrings, RecordWildCards #-}
 module LambdaCube.Mesh where

diff --git a/ddl/out/LambdaCube.Mesh.purs b/ddl/out/LambdaCube.Mesh.purs
@@ -1,5 +1,5 @@
 -- generated file, do not modify!
--- 2016-02-26T11:29:11.794796000000Z
+-- 2016-02-26T11:37:22.580893000000Z
 
 module LambdaCube.Mesh where
 import Prelude

diff --git a/ddl/out/LambdaCube.Mesh.swift b/ddl/out/LambdaCube.Mesh.swift
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:29:11.794796000000Z
+// 2016-02-26T11:37:22.580893000000Z
 
 enum MeshAttribute {
   case A_Float(Array<Float>)

diff --git a/ddl/out/LambdaCube.Mesh2.hpp b/ddl/out/LambdaCube.Mesh2.hpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:29:11.794796000000Z
+// 2016-02-26T11:37:22.580893000000Z
 
 #ifndef HEADER_LambdaCube.Mesh_H
 #define HEADER_LambdaCube.Mesh_H

diff --git a/ddl/out/LambdaCube.PipelineSchema.cpp b/ddl/out/LambdaCube.PipelineSchema.cpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:29:11.775644000000Z
+// 2016-02-26T11:37:22.561871000000Z
 
 #include "LambdaCube.PipelineSchema.hpp"
 template<> json toJSON<std::shared_ptr<StreamType>>(std::shared_ptr<StreamType> &v) {

diff --git a/ddl/out/LambdaCube.PipelineSchema.hpp b/ddl/out/LambdaCube.PipelineSchema.hpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:29:11.775644000000Z
+// 2016-02-26T11:37:22.561871000000Z
 
 #ifndef HEADER_LambdaCube.PipelineSchema_H
 #define HEADER_LambdaCube.PipelineSchema_H

diff --git a/ddl/out/LambdaCube.PipelineSchema.hs b/ddl/out/LambdaCube.PipelineSchema.hs
@@ -1,5 +1,5 @@
 -- generated file, do not modify!
--- 2016-02-26T11:29:11.775644000000Z
+-- 2016-02-26T11:37:22.561871000000Z
 
 {-# LANGUAGE OverloadedStrings, RecordWildCards #-}
 module LambdaCube.PipelineSchema where

diff --git a/ddl/out/LambdaCube.PipelineSchema.purs b/ddl/out/LambdaCube.PipelineSchema.purs
@@ -1,5 +1,5 @@
 -- generated file, do not modify!
--- 2016-02-26T11:29:11.775644000000Z
+-- 2016-02-26T11:37:22.561871000000Z
 
 module LambdaCube.PipelineSchema where
 import Prelude

diff --git a/ddl/out/LambdaCube.PipelineSchema.swift b/ddl/out/LambdaCube.PipelineSchema.swift
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:29:11.775644000000Z
+// 2016-02-26T11:37:22.561871000000Z
 
 enum StreamType {
   case Attribute_Word

diff --git a/ddl/out/LambdaCube.PipelineSchema2.hpp b/ddl/out/LambdaCube.PipelineSchema2.hpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:29:11.775644000000Z
+// 2016-02-26T11:37:22.561871000000Z
 
 #ifndef HEADER_LambdaCube.PipelineSchema_H
 #define HEADER_LambdaCube.PipelineSchema_H

diff --git a/ddl/out/LambdaCube.TypeInfo.cpp b/ddl/out/LambdaCube.TypeInfo.cpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:29:11.823283000000Z
+// 2016-02-26T11:37:22.609565000000Z
 
 #include "LambdaCube.TypeInfo.hpp"
 template<> json toJSON<std::shared_ptr<Range>>(std::shared_ptr<Range> &v) {
@@ -77,6 +77,7 @@ template<> json toJSON<std::shared_ptr<CompileResult>>(std::shared_ptr<CompileRe
         std::shared_ptr<data::CompileError> tv = std::static_pointer_cast<data::CompileError>(v);
         obj["arg0"] = toJSON(tv->_0);
         obj["arg1"] = toJSON(tv->_1);
+        obj["arg2"] = toJSON(tv->_2);
       }
       break;
     case ::CompileResult::tag::Compiled:
@@ -98,8 +99,9 @@ template<> std::shared_ptr<CompileResult> fromJSON<std::shared_ptr<CompileResult
   if (tag == "CompileError") {
     tagType = ::CompileResult::tag::CompileError;
     std::shared_ptr<data::CompileError> tv(new data::CompileError());
-    tv->_0 = fromJSON(W<std::vector<std::shared_ptr<::TypeInfo>>>(), obj["arg0"]);
-    tv->_1 = fromJSON(W<std::vector<std::shared_ptr<::TypeInfo>>>(), obj["arg1"]);
+    tv->_0 = fromJSON(W<std::vector<std::shared_ptr<::Range>>>(), obj["arg0"]);
+    tv->_1 = fromJSON(W<String>(), obj["arg1"]);
+    tv->_2 = fromJSON(W<std::vector<std::shared_ptr<::TypeInfo>>>(), obj["arg2"]);
     return tv;
   }
   else if (tag == "Compiled") {

diff --git a/ddl/out/LambdaCube.TypeInfo.hpp b/ddl/out/LambdaCube.TypeInfo.hpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:29:11.823283000000Z
+// 2016-02-26T11:37:22.609565000000Z
 
 #ifndef HEADER_LambdaCube.TypeInfo_H
 #define HEADER_LambdaCube.TypeInfo_H
@@ -48,8 +48,9 @@ class CompileResult {
 namespace data { 
   class CompileError : public ::CompileResult {
     public:
-      std::vector<std::shared_ptr<::TypeInfo>> _0;
-      std::vector<std::shared_ptr<::TypeInfo>> _1;
+      std::vector<std::shared_ptr<::Range>> _0;
+      String _1;
+      std::vector<std::shared_ptr<::TypeInfo>> _2;
       CompileError() { tag = tag::CompileError; }
   };
   class Compiled : public ::CompileResult {

diff --git a/ddl/out/LambdaCube.TypeInfo.hs b/ddl/out/LambdaCube.TypeInfo.hs
@@ -1,5 +1,5 @@
 -- generated file, do not modify!
--- 2016-02-26T11:29:11.823283000000Z
+-- 2016-02-26T11:37:22.609565000000Z
 
 {-# LANGUAGE OverloadedStrings, RecordWildCards #-}
 module LambdaCube.TypeInfo where
@@ -36,7 +36,7 @@ data TypeInfo
   deriving (Show, Eq, Ord)
 
 data CompileResult
-  = CompileError (Vector TypeInfo) (Vector TypeInfo)
+  = CompileError (Vector Range) String (Vector TypeInfo)
   | Compiled String Pipeline (Vector TypeInfo)
   deriving (Show, Eq, Ord)
 
@@ -91,14 +91,14 @@ instance FromJSON TypeInfo where
 
 instance ToJSON CompileResult where
   toJSON v = case v of
-    CompileError arg0 arg1 -> object [ "tag" .= ("CompileError" :: Text), "arg0" .= arg0, "arg1" .= arg1]
+    CompileError arg0 arg1 arg2 -> object [ "tag" .= ("CompileError" :: Text), "arg0" .= arg0, "arg1" .= arg1, "arg2" .= arg2]
     Compiled arg0 arg1 arg2 -> object [ "tag" .= ("Compiled" :: Text), "arg0" .= arg0, "arg1" .= arg1, "arg2" .= arg2]
 
 instance FromJSON CompileResult where
   parseJSON (Object obj) = do
     tag <- obj .: "tag"
     case tag :: Text of
-      "CompileError" -> CompileError <$> obj .: "arg0" <*> obj .: "arg1"
+      "CompileError" -> CompileError <$> obj .: "arg0" <*> obj .: "arg1" <*> obj .: "arg2"
       "Compiled" -> Compiled <$> obj .: "arg0" <*> obj .: "arg1" <*> obj .: "arg2"
   parseJSON _ = mzero
 
diff --git a/ddl/out/LambdaCube.TypeInfo.purs b/ddl/out/LambdaCube.TypeInfo.purs
@@ -1,5 +1,5 @@
 -- generated file, do not modify!
--- 2016-02-26T11:29:11.823283000000Z
+-- 2016-02-26T11:37:22.609565000000Z
 
 module LambdaCube.TypeInfo where
 import Prelude
@@ -35,7 +35,7 @@ data TypeInfo
 
 
 data CompileResult
-  = CompileError (Array TypeInfo) (Array TypeInfo)
+  = CompileError (Array Range) String (Array TypeInfo)
   | Compiled String Pipeline (Array TypeInfo)
 
 
@@ -90,14 +90,14 @@ instance decodeJsonTypeInfo :: DecodeJson TypeInfo where
 
 instance encodeJsonCompileResult :: EncodeJson CompileResult where
   encodeJson v = case v of
-    CompileError arg0 arg1 -> "tag" := "CompileError" ~> "arg0" := arg0 ~> "arg1" := arg1 ~> jsonEmptyObject
+    CompileError arg0 arg1 arg2 -> "tag" := "CompileError" ~> "arg0" := arg0 ~> "arg1" := arg1 ~> "arg2" := arg2 ~> jsonEmptyObject
     Compiled arg0 arg1 arg2 -> "tag" := "Compiled" ~> "arg0" := arg0 ~> "arg1" := arg1 ~> "arg2" := arg2 ~> jsonEmptyObject
 
 instance decodeJsonCompileResult :: DecodeJson CompileResult where
   decodeJson json = do
     obj <- decodeJson json
     tag <- obj .? "tag"
     case tag of
-      "CompileError" -> CompileError <$> obj .? "arg0" <*> obj .? "arg1"
+      "CompileError" -> CompileError <$> obj .? "arg0" <*> obj .? "arg1" <*> obj .? "arg2"
       "Compiled" -> Compiled <$> obj .? "arg0" <*> obj .? "arg1" <*> obj .? "arg2"
 
diff --git a/ddl/out/LambdaCube.TypeInfo.swift b/ddl/out/LambdaCube.TypeInfo.swift
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:29:11.823283000000Z
+// 2016-02-26T11:37:22.609565000000Z
 
 enum Range {
   case Range(Range_Data)
@@ -20,7 +20,7 @@ enum TypeInfo {
 }
 
 enum CompileResult {
-  case CompileError(Array<TypeInfo>,Array<TypeInfo>)
+  case CompileError(Array<Range>,String,Array<TypeInfo>)
   case Compiled(String,Pipeline,Array<TypeInfo>)
 }
 
@@ -105,8 +105,8 @@ extension TypeInfo {
 extension CompileResult {
   var toJSON : [String: AnyObject] {
     switch self {
-      case .CompileError(let arg0, let arg1):
-        return [ "tag" : "CompileError", "arg0" : arg0.toJSON, "arg1" : arg1.toJSON]
+      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):
         return [ "tag" : "Compiled", "arg0" : arg0.toJSON, "arg1" : arg1.toJSON, "arg2" : arg2.toJSON]
     }

diff --git a/ddl/out/LambdaCube.TypeInfo2.hpp b/ddl/out/LambdaCube.TypeInfo2.hpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:29:11.823283000000Z
+// 2016-02-26T11:37:22.609565000000Z
 
 #ifndef HEADER_LambdaCube.TypeInfo_H
 #define HEADER_LambdaCube.TypeInfo_H
@@ -41,8 +41,9 @@ class TypeInfo {
 namespace data { 
   class CompileError {
   public: 
-    std::vector<std::shared_ptr<::TypeInfo>> _0;
-    std::vector<std::shared_ptr<::TypeInfo>> _1;
+    std::vector<std::shared_ptr<::Range>> _0;
+    String _1;
+    std::vector<std::shared_ptr<::TypeInfo>> _2;
   };
   class Compiled {
   public: 

diff --git a/ddl/out/TestData.cpp b/ddl/out/TestData.cpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:29:11.839781000000Z
+// 2016-02-26T11:37:22.627476000000Z
 
 #include "TestData.hpp"
 template<> json toJSON<std::shared_ptr<ClientInfo>>(std::shared_ptr<ClientInfo> &v) {

diff --git a/ddl/out/TestData.hpp b/ddl/out/TestData.hpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:29:11.839781000000Z
+// 2016-02-26T11:37:22.627476000000Z
 
 #ifndef HEADER_TestData_H
 #define HEADER_TestData_H

diff --git a/ddl/out/TestData.hs b/ddl/out/TestData.hs
@@ -1,5 +1,5 @@
 -- generated file, do not modify!
--- 2016-02-26T11:29:11.839781000000Z
+-- 2016-02-26T11:37:22.627476000000Z
 
 {-# LANGUAGE OverloadedStrings, RecordWildCards #-}
 module TestData where

diff --git a/ddl/out/TestData.purs b/ddl/out/TestData.purs
@@ -1,5 +1,5 @@
 -- generated file, do not modify!
--- 2016-02-26T11:29:11.839781000000Z
+-- 2016-02-26T11:37:22.627476000000Z
 
 module TestData where
 import Prelude

diff --git a/ddl/out/TestData.swift b/ddl/out/TestData.swift
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:29:11.839781000000Z
+// 2016-02-26T11:37:22.627476000000Z
 
 enum ClientInfo {
   case ClientInfo(ClientInfo_Data)

diff --git a/ddl/out/TestData2.hpp b/ddl/out/TestData2.hpp
@@ -1,5 +1,5 @@
 // generated file, do not modify!
-// 2016-02-26T11:29:11.839781000000Z
+// 2016-02-26T11:37:22.627476000000Z
 
 #ifndef HEADER_TestData_H
 #define HEADER_TestData_H