Fixed tests

Author: gnumonik

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

@@ -3,13 +3,17 @@
 
 module LambdaBuffers.Compiler.TypeClassCheck (detectSuperclassCycles, detectSuperclassCycles') where
 
+import Control.Lens.Combinators (view)
 import Control.Lens.Operators ((^.))
 import Data.Generics.Labels ()
 import Data.List (foldl')
 import Data.Map qualified as M
 import Data.Text (Text)
 import LambdaBuffers.Compiler.ProtoCompat.Types (
   ClassDef (),
+  ForeignClassRef (ForeignClassRef),
+  LocalClassRef (LocalClassRef),
+  TyClassRef (ForeignCI, LocalCI),
  )
 import Prettyprinter (
   Doc,
@@ -30,7 +34,11 @@ detectSuperclassCycles' = detectCycles . mkClassGraph . map defToClassInfo
     defToClassInfo :: ClassDef -> ClassInfo
     defToClassInfo cd =
       ClassInfo (cd ^. #className . #name) $
-        map (\x -> x ^. #className . #name) (cd ^. #supers)
+        map (extractName . view #classRef) (cd ^. #supers)
+      where
+        extractName = \case
+          LocalCI (LocalClassRef nm _) -> nm ^. #name
+          ForeignCI (ForeignClassRef nm _ _) -> nm ^. #name
 
     mkClassGraph :: [ClassInfo] -> M.Map Text [Text]
     mkClassGraph = foldl' (\acc (ClassInfo nm sups) -> M.insert nm sups acc) M.empty

lambda-buffers-compiler/test/Test/KindCheck.hs

@@ -100,6 +100,7 @@ modMaybe =
         ]
     , P.classDefs = mempty
     , P.instances = mempty
+    , P.imports = mempty
     , P.sourceInfo = esi
     }
 

lambda-buffers-compiler/test/Test/TypeClassCheck.hs

@@ -9,7 +9,7 @@ import LambdaBuffers.Compiler.ProtoCompat (IsMessage (fromProto))
 import LambdaBuffers.Compiler.ProtoCompat.Types qualified as ProtoCompat
 import LambdaBuffers.Compiler.TypeClassCheck (detectSuperclassCycles')
 import Proto.Compiler (ClassDef, Constraint, Kind, Kind'KindRef (Kind'KIND_REF_TYPE))
-import Proto.Compiler_Fields (argKind, argName, arguments, classArgs, className, kindRef, name, supers, tyVar, varName)
+import Proto.Compiler_Fields (argKind, argName, arguments, classArgs, className, classRef, kindRef, localClassRef, name, supers, tyVar, varName)
 import Test.Tasty (TestTree, testGroup)
 import Test.Tasty.HUnit (assertFailure, testCase, (@?=))
 
@@ -53,7 +53,7 @@ mkclass nm sups =
 constraint :: Text -> Constraint
 constraint nm =
   defMessage
-    & className . name .~ nm
+    & classRef . localClassRef . className . name .~ nm
     & arguments .~ [defMessage & tyVar . varName . name .~ "a"]
 
 cycles :: [ClassDef]