Merge pull request #32 from mlabs-haskell/compiler/integrate-CLI-KindChecker

Kind Checker: CLI Integration

Author: cstml

lambda-buffers-compiler/app/LambdaBuffers/Compiler/Cli/Compile.hs

@@ -7,9 +7,13 @@ import Data.ProtoLens qualified as Pb
 import Data.ProtoLens.TextFormat qualified as PbText
 import Data.Text.Lazy qualified as Text
 import Data.Text.Lazy.IO qualified as Text
-import LambdaBuffers.Compiler.ProtoCompat (FromProtoErr (NamingError, ProtoError), IsMessage (fromProto, toProto))
+import LambdaBuffers.Compiler.KindCheck (check)
+import LambdaBuffers.Compiler.ProtoCompat (
+  FromProtoErr (NamingError, ProtoError),
+  IsMessage (fromProto, toProto),
+ )
 import LambdaBuffers.Compiler.ProtoCompat.Types qualified as ProtoCompat
-import Proto.Compiler (CompilerInput)
+import Proto.Compiler as ProtoLib (CompilerInput, CompilerOutput)
 import System.FilePath.Lens (extension)
 
 data CompileOpts = CompileOpts
@@ -20,6 +24,8 @@ data CompileOpts = CompileOpts
 
 makeLenses ''CompileOpts
 
+-- NOTE(cstml) - let's use Katip instead of print.
+
 -- | Compile LambdaBuffers modules
 compile :: CompileOpts -> IO ()
 compile opts = do
@@ -30,8 +36,8 @@ compile opts = do
       ProtoError pe -> print $ "Encountered a proto error " <> show pe
     Right compIn' -> do
       print @String "Successfully processed the CompilerInput"
-      writeCompilerOutput (opts ^. output) (toProto compIn')
-
+      let result = check compIn'
+      writeCompilerOutput (opts ^. output) (toProto result)
   return ()
 
 readCompilerInput :: FilePath -> IO CompilerInput
@@ -46,11 +52,10 @@ readCompilerInput fp = do
       return $ PbText.readMessageOrDie content
     _ -> error $ "Unknown CompilerInput format " <> ext
 
--- FIXME(bladyjoker): Do this properly when you figure out what the CompilerOutput is.
-writeCompilerOutput :: FilePath -> CompilerInput -> IO ()
-writeCompilerOutput fp co = do
+writeCompilerOutput :: FilePath -> ProtoLib.CompilerOutput -> IO ()
+writeCompilerOutput fp cr = do
   let ext = fp ^. extension
   case ext of
-    ".pb" -> BS.writeFile fp (Pb.encodeMessage co)
-    ".textproto" -> Text.writeFile fp (Text.pack . show $ PbText.pprintMessage co)
+    ".pb" -> BS.writeFile fp (Pb.encodeMessage cr)
+    ".textproto" -> Text.writeFile fp (Text.pack . show $ PbText.pprintMessage cr)
     _ -> error $ "Unknown CompilerOutput format " <> ext

lambda-buffers-compiler/app/Main.hs

@@ -23,8 +23,7 @@ import Options.Applicative (
   subparser,
  )
 
-newtype Command
-  = Compile CompileOpts
+newtype Command = Compile CompileOpts
 
 inputPathP :: Parser FilePath
 inputPathP =

lambda-buffers-compiler/lambda-buffers-compiler.cabal

@@ -38,6 +38,7 @@ common common-language
     DeriveTraversable
     DerivingStrategies
     DoAndIfThenElse
+    DuplicateRecordFields
     EmptyCase
     EmptyDataDecls
     EmptyDataDeriving
@@ -59,6 +60,7 @@ common common-language
     NamedFieldPuns
     NamedWildCards
     NumericUnderscores
+    OverloadedLabels
     OverloadedStrings
     PartialTypeSignatures
     PatternGuards
@@ -103,7 +105,9 @@ library
   exposed-modules:
     LambdaBuffers.Compiler.KindCheck
     LambdaBuffers.Compiler.KindCheck.Context
+    LambdaBuffers.Compiler.KindCheck.Derivation
     LambdaBuffers.Compiler.KindCheck.Inference
+    LambdaBuffers.Compiler.KindCheck.Judgement
     LambdaBuffers.Compiler.KindCheck.Kind
     LambdaBuffers.Compiler.KindCheck.Type
     LambdaBuffers.Compiler.KindCheck.Variable
@@ -114,6 +118,7 @@ library
 
   hs-source-dirs:  src
 
+-- note(cstml): should we name this something shorter? lb-cli?
 executable lambda-buffers-compiler-cli
   import:         common-language
   import:         common-imports
@@ -145,4 +150,10 @@ test-suite tests
 
   other-modules:
     Test.KindCheck
+    Test.Samples
+    Test.Samples.Proto.CompilerInput
+    Test.Samples.Proto.Helpers
+    Test.Samples.Proto.Module
+    Test.Samples.Proto.SourceInfo
+    Test.Samples.Proto.TyDef
     Test.TypeClassCheck