update: nit nit

Author: cstml

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

@@ -39,7 +39,6 @@ import LambdaBuffers.Compiler.KindCheck.Inference (
  )
 import LambdaBuffers.Compiler.KindCheck.Inference qualified as I
 import LambdaBuffers.Compiler.KindCheck.Type (Type (App))
-import LambdaBuffers.Compiler.KindCheck.Type qualified as P
 import LambdaBuffers.Compiler.KindCheck.Variable (Variable (ForeignRef, LocalRef))
 import LambdaBuffers.Compiler.ProtoCompat (kind2ProtoKind)
 import LambdaBuffers.Compiler.ProtoCompat.Types qualified as P (

lambda-buffers-compiler/test/Test/Samples/Proto/Helpers.hs

@@ -39,10 +39,10 @@ _TupleI x =
       , P.sourceInfo = sourceInfo'empty
       }
 
-_Constructor :: P.ConstrName -> P.Product -> P.Constructor
+_Constructor :: Text -> P.Product -> P.Constructor
 _Constructor c f =
   P.Constructor
-    { P.constrName = c
+    { P.constrName = _ConstrName c
     , P.product = f
     }
 
@@ -53,19 +53,19 @@ _ConstrName x =
     , P.sourceInfo = sourceInfo'empty
     }
 
-_Sum :: [P.Constructor] -> P.TyBody
+_Sum :: [(Text, P.Product)] -> P.TyBody
 _Sum cs =
   P.SumI $
     P.Sum
-      { constructors = fromList cs
+      { constructors = fromList $ uncurry _Constructor <$> cs
       , sourceInfo = sourceInfo'empty
       }
 
-_TyAbs :: [P.TyArg] -> P.TyBody -> P.TyAbs
+_TyAbs :: [(Text, P.KindType)] -> [(Text, P.Product)] -> P.TyAbs
 _TyAbs args body =
   P.TyAbs
-    { P.tyArgs = args
-    , P.tyBody = body
+    { P.tyArgs = _TyArg <$> args
+    , P.tyBody = _Sum body
     , sourceInfo = sourceInfo'empty
     }
 

lambda-buffers-compiler/test/Test/Samples/Proto/TyDef.hs

@@ -2,12 +2,8 @@ module Test.Samples.Proto.TyDef (tyDef'maybe, tyDef'incoherent) where
 
 import LambdaBuffers.Compiler.ProtoCompat qualified as P
 import Test.Samples.Proto.Helpers (
-  _ConstrName,
-  _Constructor,
-  _Sum,
   _TupleI,
   _TyAbs,
-  _TyArg,
   _TyDef,
   _TyRefILocal,
   _TyVarI,
@@ -20,21 +16,21 @@ tyDef'maybe :: P.TyDef
 tyDef'maybe =
   _TyDef
     (_tyName "Maybe")
-    ( _TyAbs [_TyArg ("a", _Type)] $
-        _Sum
-          [ _Constructor (_ConstrName "Nothing") (_TupleI [])
-          , _Constructor (_ConstrName "Just") (_TupleI [_TyVarI "a"])
-          ]
+    ( _TyAbs
+        [("a", _Type)]
+        [ ("Nothing", _TupleI [])
+        , ("Just", _TupleI [_TyVarI "a"])
+        ]
     )
 
 -- | B a = B Maybe
 tyDef'incoherent :: P.TyDef
 tyDef'incoherent =
   _TyDef
     (_tyName "B")
-    ( _TyAbs [_TyArg ("a", _Type)] $
-        _Sum
-          [ _Constructor (_ConstrName "Nothing") (_TupleI [])
-          , _Constructor (_ConstrName "B") (_TupleI [_TyRefILocal "Maybe"])
-          ]
+    ( _TyAbs
+        [("a", _Type)]
+        [ ("Nothing", _TupleI [])
+        , ("B", _TupleI [_TyRefILocal "Maybe"])
+        ]
     )