Merge remote-tracking branch 'origin/bladyjoker/compiler-class-check' into bladyjoker/compiler-class-check

Author: bladyjoker

lambda-buffers-frontend/resources/run.sh

@@ -1,3 +1,4 @@
+#!/bin/sh
 function lbf {
    cabal run lbf -- $@
 }

lambda-buffers-frontend/src/LambdaBuffers/Frontend.hs

@@ -17,7 +17,7 @@ import Data.Text.IO qualified as Text
 import Data.Traversable (for)
 import LambdaBuffers.Frontend.PPrint ()
 import LambdaBuffers.Frontend.Parsec qualified as Parsec
-import LambdaBuffers.Frontend.Syntax (Constructor (Constructor), Import (Import, importInfo, importModuleName), Module (moduleImports, moduleName, moduleTyDefs), ModuleAlias (ModuleAlias), ModuleName (ModuleName), ModuleNamePart (ModuleNamePart), Product (Product), SourceInfo (SourceInfo), SourcePos (SourcePos), Ty (TyApp, TyRef', TyVar), TyBody (Opaque, Sum), TyDef (TyDef, tyBody, tyDefInfo, tyName), TyName (TyName), TyRef (TyRef))
+import LambdaBuffers.Frontend.Syntax (Constructor (Constructor), Import (Import, importInfo, importModuleName), Module (moduleImports, moduleName, moduleTyDefs), ModuleAlias (ModuleAlias), ModuleName (ModuleName), ModuleNamePart (ModuleNamePart), Product (Product), SourceInfo, Ty (TyApp, TyRef', TyVar), TyBody (Opaque, Sum), TyDef (TyDef, tyBody, tyDefInfo, tyName), TyName (TyName), TyRef (TyRef), defSourceInfo)
 import Prettyprinter (Doc, LayoutOptions (layoutPageWidth), PageWidth (Unbounded), Pretty (pretty), defaultLayoutOptions, layoutPretty, (<+>))
 import Prettyprinter.Render.String (renderShowS)
 import System.Directory (findFiles)
@@ -77,10 +77,9 @@ type FrontendT m a = MonadIO m => ReaderT FrontRead (StateT FrontState (ExceptT
 -- | Run a Frontend compilation action on a "lbf" file, return the entire compilation closure or a frontend error.
 runFrontend :: MonadIO m => [FilePath] -> FilePath -> m (Either FrontendError FrontendResult)
 runFrontend importPaths modFp = do
-  let stM = runReaderT (processFile modFp) (FrontRead (ModuleName [] (SourceInfo "" (SourcePos 0 0) (SourcePos 0 0))) [] importPaths)
+  let stM = runReaderT (processFile modFp) (FrontRead (ModuleName [] defSourceInfo) [] importPaths)
       exM = runStateT stM (FrontState mempty)
       ioM = runExceptT exM
-  _ <- ioM
   fmap (FrontendResult . importedModules . snd) <$> ioM
 
 throwE' :: FrontendError -> FrontendT m a

lambda-buffers-frontend/src/LambdaBuffers/Frontend/Syntax.hs

@@ -18,6 +18,7 @@ module LambdaBuffers.Frontend.Syntax (
   ClassName (..),
   SourceInfo (..),
   SourcePos (..),
+  defSourceInfo,
 ) where
 
 import Data.Text (Text)
@@ -96,3 +97,6 @@ data SourcePos = SourcePos
   , column :: Int
   }
   deriving stock (Eq, Ord, Show)
+
+defSourceInfo :: SourceInfo
+defSourceInfo = SourceInfo "" (SourcePos 0 0) (SourcePos 0 0)