update: internal error

Author: cstml

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

@@ -1,8 +1,3 @@
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE OverloadedLabels #-}
-{-# LANGUAGE RecordWildCards #-}
-{-# LANGUAGE TemplateHaskell #-}
-
 module LambdaBuffers.Compiler.KindCheck (
   -- * Kindchecking functions.
   check,
@@ -59,7 +54,6 @@ import LambdaBuffers.Compiler.ProtoCompat.Types qualified as P (
   KindRefType (KType),
   KindType (KindArrow, KindRef),
   LocalRef,
-  MiscError (ImpossibleError),
   Module,
   ModuleName,
   Product (..),
@@ -181,7 +175,7 @@ runKindCheck = reinterpret $ \case
       InferRecursiveSubstitutionErr _ ->
         throwError . P.CompKindCheckError $ P.RecursiveKindError $ tyDef2TyName td
       InferImpossibleErr t ->
-        throwError . P.CompMiscError $ P.ImpossibleError t
+        throwError . P.InternalError $ t
 
     var2VarName = \case
       LocalRef n -> P.VarName n emptySourceInfo

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

@@ -1,4 +1,3 @@
-{-# LANGUAGE OverloadedLabels #-}
 {-# OPTIONS_GHC -Wno-missing-import-lists #-}
 {-# OPTIONS_GHC -Wno-redundant-constraints #-}
 
@@ -551,25 +550,16 @@ instance IsMessage P.KindCheckError KindCheckError where
         & (P.inconsistentTypeError . P.inferredKind) .~ toProto ki
         & (P.inconsistentTypeError . P.definedKind) .~ toProto kd
 
-instance IsMessage P.InternalError MiscError where
-  fromProto kce = case kce ^. P.maybe'internalError of
-    Just x -> case x of
-      P.InternalError'ImpossibleError' err -> ImpossibleError <$> fromProto (err ^. P.msg)
-    Nothing -> throwProtoError EmptyField
-
-  toProto = \case
-    ImpossibleError err -> defMessage & (P.impossibleError . P.msg) .~ toProto err
-
 instance IsMessage P.CompilerError CompilerError where
-  fromProto err = case err ^. P.maybe'compilerError of
+  fromProto cErr = case cErr ^. P.maybe'compilerError of
     Just x -> case x of
-      P.CompilerError'CompKindCheckError kcerr -> CompKindCheckError <$> fromProto kcerr
-      P.CompilerError'CompMiscError miscerr -> CompMiscError <$> fromProto miscerr
+      P.CompilerError'KindCheckError err -> CompKindCheckError <$> fromProto err
+      P.CompilerError'InternalError err -> InternalError <$> fromProto (err ^. P.internalError)
     Nothing -> throwProtoError EmptyField
 
   toProto = \case
-    CompKindCheckError kcerr -> defMessage & P.compKindCheckError .~ toProto kcerr
-    CompMiscError miscerr -> defMessage & P.compMiscError .~ toProto miscerr
+    CompKindCheckError err -> defMessage & P.kindCheckError .~ toProto err
+    InternalError err -> defMessage & (P.internalError . P.internalError) .~ toProto err
 
 instance IsMessage P.CompilerResult CompilerResult where
   fromProto c =

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

@@ -3,7 +3,6 @@
 
 module LambdaBuffers.Compiler.ProtoCompat.Types (
   ClassDef (..),
-  MiscError (..),
   ClassName (..),
   CompilerError (..),
   CompilerInput (..),
@@ -219,10 +218,6 @@ newtype CompilerInput = CompilerInput {modules :: [Module]}
   deriving stock (Show, Eq, Ord, Generic)
   deriving newtype (Monoid, Semigroup)
 
-newtype MiscError = ImpossibleError Text
-  deriving stock (Show, Eq, Ord, Generic)
-instance Exception MiscError
-
 data KindCheckError
   = -- | The following term is unbound in the following type definition.
     UnboundTermError TyName VarName
@@ -237,7 +232,7 @@ instance Exception KindCheckError
 
 data CompilerError
   = CompKindCheckError KindCheckError
-  | CompMiscError MiscError
+  | InternalError Text
   deriving stock (Show, Eq, Ord, Generic)
 
 data CompilerResult = CompilerResult

lambda-buffers-proto/compiler.proto

@@ -492,15 +492,7 @@ message CompilerInput {
 
 // Internal errors.
 message InternalError {
-
-  // This should never happen.
-  message ImpossibleError {
-    string msg = 1;
-  }
-
-  oneof internal_error {
-    ImpossibleError impossible_error = 1;
-  }
+  string internal_error = 1;
 }
 
 // Kindchecker errors.
@@ -554,8 +546,8 @@ message CompilerError {
 
   // Reason why the compilation failed.
   oneof compiler_error {
-    KindCheckError comp_kind_check_error = 1;
-    InternalError comp_misc_error = 2;
+    KindCheckError kind_check_error = 1;
+    InternalError internal_error = 2;
   }
 }