update: respond to comments:

  1. merge error
  2. change error name

Author: cstml

lambda-buffers-compiler/src/LambdaBuffers/Compiler/KindCheck.hs

@@ -217,7 +217,7 @@ tyDef2Context curModName tyDef@(P.TyDef tyName _ _) = do
     associateName v t = do
       maps <- get @(M.Map Variable P.TyName)
       case maps M.!? v of
-        Just otherTyName -> throwError . PT.CompReaderError $ PT.MultipleDeclaration otherTyName t
+        Just otherTyName -> throwError . PT.CompKindCheckError $ PT.MultipleTyDefError otherTyName t
         Nothing -> modify (M.insert v t)
 
 {- | Converts the Proto Module name to a local modname - dropping the

lambda-buffers-compiler/src/LambdaBuffers/Compiler/ProtoCompat.hs

@@ -529,6 +529,10 @@ instance IsMessage P.KindCheckError KindCheckError where
             <$> fromProto (err ^. P.tyName)
             <*> fromProto (err ^. P.inferredKind)
             <*> fromProto (err ^. P.definedKind)
+        P.KindCheckError'MultipleTyDefError' err ->
+          MultipleTyDefError
+            <$> fromProto (err ^. P.declaration1)
+            <*> fromProto (err ^. P.declaration2)
       Nothing -> throwProtoError EmptyField
 
   toProto = \case
@@ -549,30 +553,20 @@ instance IsMessage P.KindCheckError KindCheckError where
         & (P.inconsistentTypeError . P.tyName) .~ toProto name
         & (P.inconsistentTypeError . P.inferredKind) .~ toProto ki
         & (P.inconsistentTypeError . P.definedKind) .~ toProto kd
-
-instance IsMessage P.ReaderError ReaderError where
-  fromProto rErr = case rErr ^. P.maybe'readerError of
-    Just x -> case x of
-      P.ReaderError'MultipleDeclarationError' err -> MultipleDeclaration <$> fromProto (err ^. P.declaration1) <*> fromProto (err ^. P.declaration2)
-    Nothing -> throwProtoError EmptyField
-
-  toProto = \case
-    MultipleDeclaration d1 d2 ->
+    MultipleTyDefError d1 d2 ->
       defMessage
-        & (P.multipleDeclarationError . P.declaration1) .~ toProto d1
-        & (P.multipleDeclarationError . P.declaration2) .~ toProto d2
+        & (P.multipleTyDefError . P.declaration1) .~ toProto d1
+        & (P.multipleTyDefError . P.declaration2) .~ toProto d2
 
 instance IsMessage P.CompilerError CompilerError where
   fromProto cErr = case cErr ^. P.maybe'compilerError of
     Just x -> case x of
       P.CompilerError'KindCheckError err -> CompKindCheckError <$> fromProto err
       P.CompilerError'InternalError err -> InternalError <$> fromProto (err ^. P.internalError)
-      P.CompilerError'ReaderError err -> CompReaderError <$> fromProto err
     Nothing -> throwProtoError EmptyField
 
   toProto = \case
     CompKindCheckError err -> defMessage & P.kindCheckError .~ toProto err
-    CompReaderError err -> defMessage & P.readerError .~ toProto err
     InternalError err -> defMessage & (P.internalError . P.internalError) .~ toProto err
 
 instance IsMessage P.CompilerResult CompilerResult where

lambda-buffers-compiler/src/LambdaBuffers/Compiler/ProtoCompat/Types.hs

@@ -1,7 +1,11 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
 {-# OPTIONS_GHC -Wno-redundant-constraints #-}
+{-# OPTIONS_GHC -fconstraint-solver-iterations=0 #-}
 
+{- | this is needed so the deriving via can generate Arbitrary instances for
+ data definitions with more than 4 constructors
+-}
 module LambdaBuffers.Compiler.ProtoCompat.Types (
   ClassDef (..),
   ClassName (..),
@@ -41,7 +45,6 @@ module LambdaBuffers.Compiler.ProtoCompat.Types (
   TyRef (..),
   TyVar (..),
   VarName (..),
-  ReaderError (..),
   module VARS,
 ) where
 
@@ -286,23 +289,15 @@ data KindCheckError
     RecursiveKindError TyName
   | -- | The following type has the wrong.
     InconsistentTypeError TyName Kind Kind
+  | -- | The following type@(TyName) was redeclared here@(TyName).
+    MultipleTyDefError TyName TyName
   deriving stock (Show, Eq, Ord, Generic)
   deriving (Arbitrary) via GenericArbitrary KindCheckError
 instance Exception KindCheckError
 
-{- | Reader errors are validation errors which are not directly tied to the kind
- checking.
--}
-data ReaderError
-  = -- | The following type@(TyName) was redeclared here@(TyName).
-    MultipleDeclaration TyName TyName
-  deriving stock (Show, Eq, Ord, Generic)
-  deriving (Arbitrary) via GenericArbitrary ReaderError
-
 -- | All the compiler errors.
 data CompilerError
   = CompKindCheckError KindCheckError
-  | CompReaderError ReaderError
   | InternalError Text
   deriving stock (Show, Eq, Ord, Generic)
   deriving (Arbitrary) via GenericArbitrary CompilerError

lambda-buffers-proto/compiler.proto

@@ -532,26 +532,19 @@ message KindCheckError {
     Kind defined_kind = 3;
   }
 
+  // A tydef was defined multiple times.
+  message MultipleTyDefError {
+    TyName declaration_1 = 1;
+    TyName declaration_2 = 2;
+  }
+
   // The types of inference errors.
   oneof kind_check_error {
     UnboundTermError unbound_term_error = 1;
     ImpossibleUnificationError unification_error = 2;
     RecursiveKindError recursive_subs_error = 3;
     InconsistentTypeError inconsistent_type_error = 4;
-  }
-}
-
-// Error relating to the content read by the compiler.
-message ReaderError {
-
-  // A tydef was defined multiple times.
-  message MultipleDeclarationError {
-    TyName declaration_1 = 1;
-    TyName declaration_2 = 2;
-  }
-
-  oneof reader_error {
-    MultipleDeclarationError multiple_declaration_error = 1;
+    MultipleTyDefError multiple_tydef_error = 5;
   }
 }
 
@@ -561,9 +554,7 @@ message CompilerError {
   // Reason why the compilation failed.
   oneof compiler_error {
     KindCheckError kind_check_error = 1;
-    ReaderError reader_error = 2;
     InternalError internal_error = 3;
-
   }
 }