Integrate InfoLess

Author: bladyjoker

lambda-buffers-codegen/lambda-buffers-codegen.cabal

@@ -129,6 +129,7 @@ test-suite tests
   build-depends:
     , base                        >=4.16
     , containers                  >=0.6
+    , data-default                >=0.7
     , lambda-buffers-codegen
     , lambda-buffers-compiler     >=0.1
     , lambda-buffers-compiler-pb  >=0.1

lambda-buffers-codegen/src/LambdaBuffers/Codegen/Haskell/Config.hs

@@ -3,11 +3,11 @@ module LambdaBuffers.Codegen.Haskell.Config (QTyName, QClassName, Config (..), o
 import Control.Lens (makeLenses)
 import Data.Map (Map)
 import LambdaBuffers.Codegen.Haskell.Syntax qualified as H
+import LambdaBuffers.Compiler.ProtoCompat.InfoLess qualified as PC
 import LambdaBuffers.Compiler.ProtoCompat.Types qualified as PC
 
--- FIXME(bladyjoker): Must be InfoLess.
-type QTyName = (PC.ModuleName, PC.TyName)
-type QClassName = (PC.ModuleName, PC.ClassName)
+type QTyName = (PC.InfoLess PC.ModuleName, PC.InfoLess PC.TyName)
+type QClassName = (PC.InfoLess PC.ModuleName, PC.InfoLess PC.ClassName)
 
 data Config = MkConfig
   { _opaques :: Map QTyName (H.CabalPackageName, H.ModuleName, H.TyName)

lambda-buffers-codegen/src/LambdaBuffers/Codegen/Haskell/Print.hs

@@ -9,6 +9,7 @@ import Data.Set (Set)
 import Data.Set qualified as Set
 import Data.Text qualified as Text
 import LambdaBuffers.Codegen.Haskell.Syntax qualified as H
+import LambdaBuffers.Compiler.ProtoCompat.InfoLess qualified as PC
 import LambdaBuffers.Compiler.ProtoCompat.Types qualified as PC
 import Prettyprinter (Doc, Pretty (pretty), align, colon, comma, concatWith, dot, encloseSep, equals, group, lbrace, line, lparen, parens, pipe, rbrace, rparen, sep, space, squote, surround, vsep, (<+>))
 
@@ -61,13 +62,13 @@ type Maybe = Prelude.Maybe
 printTyDefOpaque :: PC.TyName -> (H.CabalPackageName, H.ModuleName, H.TyName) -> Doc a
 printTyDefOpaque tyN hsTyRef = "type" <+> printTyName tyN <+> equals <+> printHsTyRef hsTyRef
 
-printHsTyRef :: (H.CabalPackageName, H.ModuleName, H.TyName) -> Doc a
+printHsTyRef :: H.QTyName -> Doc a
 printHsTyRef (_, H.MkModuleName hsModName, H.MkTyName hsTyName) = pretty hsModName <> dot <> pretty hsTyName
 
 -- | Used to distinguish from Opaques.
 newtype NonOpaqueTyBody = Sum PC.Sum
 
-printTyDefNonOpaque :: PC.TyName -> Map PC.VarName PC.TyArg -> NonOpaqueTyBody -> Doc a
+printTyDefNonOpaque :: PC.TyName -> Map (PC.InfoLess PC.VarName) PC.TyArg -> NonOpaqueTyBody -> Doc a
 printTyDefNonOpaque tyN args body =
   let argsDoc = sep (printTyArg <$> toList args) -- FIXME(bladyjoker): OMap on Constructors
       (keyword, bodyDoc) = printTyBody tyN body

lambda-buffers-codegen/src/LambdaBuffers/Codegen/Haskell/PrintM.hs

@@ -19,6 +19,7 @@ import Data.Text qualified as Text
 import LambdaBuffers.Codegen.Haskell.Config (Config, opaques)
 import LambdaBuffers.Codegen.Haskell.Print qualified as Print
 import LambdaBuffers.Codegen.Haskell.Syntax qualified as H
+import LambdaBuffers.Compiler.ProtoCompat.InfoLess qualified as PC
 import LambdaBuffers.Compiler.ProtoCompat.Types (Module, TyAbs (TyAbs), TyBody (OpaqueI, SumI), TyDef)
 import LambdaBuffers.Compiler.ProtoCompat.Types qualified as PC
 import Prettyprinter (Doc)
@@ -102,8 +103,7 @@ goTyAbs :: MonadPrint m => TyAbs -> m ()
 goTyAbs (TyAbs _ (OpaqueI _) _) = do
   cfg <- askConfig
   (currentModuleName, currentTyDef) <- askTyDefCtx
-  -- FIXME(bladyjoker): Must be infoLess.
-  qhTyRef <- case Map.lookup (currentModuleName, currentTyDef ^. #tyName) (cfg ^. opaques) of
+  qhTyRef <- case Map.lookup (PC.mkInfoLess currentModuleName, PC.mkInfoLess $ currentTyDef ^. #tyName) (cfg ^. opaques) of
     Nothing -> throwError $ "TODO(bladyjoker): Opaque not configured" <> show (currentTyDef ^. #tyName)
     Just qhsTyRef -> return qhsTyRef
   exportTy (H.fromLbTyName (currentTyDef ^. #tyName))

lambda-buffers-codegen/test/Test/LambdaBuffers/Codegen/Haskell.hs

@@ -8,11 +8,12 @@ import Data.Text (Text)
 import Data.Traversable (for)
 import LambdaBuffers.Codegen.Haskell.Config (Config (MkConfig))
 import LambdaBuffers.Codegen.Haskell.Syntax qualified as H
-import LambdaBuffers.Compiler.ProtoCompat.Types (ModuleName (ModuleName), ModuleNamePart (ModuleNamePart), TyName (TyName))
+import LambdaBuffers.Compiler.ProtoCompat.InfoLess qualified as PC
 import LambdaBuffers.Compiler.ProtoCompat.Types qualified as PC
 import Proto.Compiler qualified as P
 import Proto.Compiler_Fields qualified as P
 
+import Data.Default (Default (def))
 import LambdaBuffers.Codegen.Haskell.Config qualified as H
 import LambdaBuffers.Codegen.Haskell.PrintM qualified as H
 import LambdaBuffers.Compiler.ProtoCompat.FromProto qualified as PC
@@ -54,22 +55,22 @@ testConfig =
     ( Map.fromList
         [
           (
-            ( PC.ModuleName [PC.ModuleNamePart "TestMod" PC.defSourceInfo] PC.defSourceInfo
-            , PC.TyName "I8" PC.defSourceInfo
+            ( PC.mkInfoLess $ PC.ModuleName [PC.ModuleNamePart "TestMod" def] def
+            , PC.mkInfoLess $ PC.TyName "I8" def
             )
           , (H.MkCabalPackageName "base", H.MkModuleName "Data.Int", H.MkTyName "Int8")
           )
         ,
           (
-            ( PC.ModuleName [PC.ModuleNamePart "TestMod2" PC.defSourceInfo] PC.defSourceInfo
-            , PC.TyName "I16" PC.defSourceInfo
+            ( PC.mkInfoLess $ PC.ModuleName [PC.ModuleNamePart "TestMod2" def] def
+            , PC.mkInfoLess $ PC.TyName "I16" def
             )
           , (H.MkCabalPackageName "base", H.MkModuleName "Data.Int", H.MkTyName "Int16")
           )
         ,
           (
-            ( ModuleName [ModuleNamePart "TestMod" PC.defSourceInfo] PC.defSourceInfo
-            , TyName "Set" PC.defSourceInfo
+            ( PC.mkInfoLess $ PC.ModuleName [PC.ModuleNamePart "TestMod" def] def
+            , PC.mkInfoLess $ PC.TyName "Set" def
             )
           , (H.MkCabalPackageName "containers", H.MkModuleName "Data.Set", H.MkTyName "Set")
           )