Split module parsing and types out better

smol-backend/test/Test/Helpers.hs

@@ -31,6 +31,7 @@ import qualified Data.Set.NonEmpty as NES
 import Data.Text (Text)
 import Smol.Core
 import Smol.Core.Modules.FromParts
+import Smol.Core.Modules.Parser
 import Smol.Core.Modules.Types.Module
 import Smol.Core.Typecheck.FromParsedExpr
 

smol-backend/test/Test/IR/IRSpec.hs

@@ -14,11 +14,11 @@ import qualified Smol.Backend.Compile.RunLLVM as Run
 import Smol.Backend.IR.FromExpr.Expr
 import Smol.Backend.IR.ToLLVM.ToLLVM
 import Smol.Core.Modules.FromParts
+import Smol.Core.Modules.Parser (parseModuleAndFormatError)
 import Smol.Core.Modules.ResolveDeps
 import Smol.Core.Modules.Typecheck
 import Smol.Core.Modules.Types
 import Smol.Core.Modules.Types.ModuleError
-import Smol.Core.Parser (parseModuleAndFormatError)
 import Smol.Core.Typecheck.Typeclass.Types
 import Smol.Core.Types
 import Test.BuiltInTypes

smol-core/smol-core.cabal

@@ -75,6 +75,7 @@ library
     Smol.Core.Modules.FromParts
     Smol.Core.Modules.Helpers
     Smol.Core.Modules.Interpret
+    Smol.Core.Modules.Parser
     Smol.Core.Modules.PrettyPrint
     Smol.Core.Modules.ResolveDeps
     Smol.Core.Modules.RunTests
@@ -86,7 +87,6 @@ library
     Smol.Core.Modules.Types.Module
     Smol.Core.Modules.Types.ModuleError
     Smol.Core.Modules.Types.ModuleItem
-    Smol.Core.Modules.Types.ModuleName
     Smol.Core.Modules.Types.Test
     Smol.Core.Modules.Types.TestName
     Smol.Core.Modules.Types.TopLevelExpression
@@ -95,7 +95,6 @@ library
     Smol.Core.Parser.DataType
     Smol.Core.Parser.Expr
     Smol.Core.Parser.Identifiers
-    Smol.Core.Parser.Module
     Smol.Core.Parser.Op
     Smol.Core.Parser.Pattern
     Smol.Core.Parser.Primitives
@@ -148,6 +147,7 @@ library
     Smol.Core.Types.DataType
     Smol.Core.Types.Expr
     Smol.Core.Types.Identifier
+    Smol.Core.Types.ModuleName
     Smol.Core.Types.Op
     Smol.Core.Types.ParseDep
     Smol.Core.Types.Pattern
@@ -173,9 +173,9 @@ test-suite smol-core-tests
   other-modules:
     Test.BuiltInTypes
     Test.Helpers
-    Test.Interpreter.InterpreterSpec
     Test.Modules.FromPartsSpec
     Test.Modules.InterpreterSpec
+    Test.Modules.ParserSpec
     Test.Modules.ResolveDepsSpec
     Test.Modules.RunTestsSpec
     Test.Modules.TypecheckSpec

smol-core/src/Smol/Core/Parser/Module.hs → smol-core/src/Smol/Core/Modules/Parser.hs

@@ -1,27 +1,47 @@
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE OverloadedStrings #-}
 
-module Smol.Core.Parser.Module
+module Smol.Core.Modules.Parser
   ( moduleParser,
+    parseModule,
+    parseModuleAndFormatError,
   )
 where
 
+import Data.Bifunctor (first)
 import qualified Data.List.NonEmpty as NE
 import Data.Text (Text)
+import qualified Data.Text as T
 import Data.Void
 import Smol.Core.Modules.Types.ModuleItem
+import Smol.Core.Modules.Types.TestName
 import Smol.Core.Parser.DataType (dataTypeParser)
 import Smol.Core.Parser.Expr
 import Smol.Core.Parser.Identifiers
+import Smol.Core.Parser.Primitives (textPrim)
 import Smol.Core.Parser.Shared
 import Smol.Core.Parser.Type
 import Smol.Core.Parser.Typeclass
 import Smol.Core.Typecheck.Typeclass.Types
 import Smol.Core.Types
 import Text.Megaparsec hiding (parseTest)
+import Text.Megaparsec.Char
 
 type Parser = Parsec Void Text
 
+type ParseErrorType = ParseErrorBundle Text Void
+
+parseAndFormat :: Parser a -> Text -> Either Text a
+parseAndFormat p = first (T.pack . errorBundlePretty) . parse (p <* eof) "repl"
+
+parseModule :: Text -> Either ParseErrorType [ModuleItem Annotation]
+parseModule = parse (space *> moduleParser <* eof) "repl"
+
+parseModuleAndFormatError :: Text -> Either Text [ModuleItem Annotation]
+parseModuleAndFormatError = parseAndFormat (space *> moduleParser <* eof)
+
+-------
+
 -- currently fails at the first hurdle
 -- since we can parse each thing separately, maybe
 -- we should be making each throw errors for later, but returning `mempty` so
@@ -181,3 +201,6 @@ parseClass = do
             tcFuncType = ty
           }
       )
+
+testNameParser :: Parser TestName
+testNameParser = myLexeme $ TestName <$> textPrim

smol-core/src/Smol/Core/Modules/Types.hs

@@ -1,7 +1,6 @@
 module Smol.Core.Modules.Types
   ( module Smol.Core.Modules.Types.Entity,
     module Smol.Core.Modules.Types.Module,
-    module Smol.Core.Modules.Types.ModuleName,
     module Smol.Core.Modules.Types.ModuleItem,
     module Smol.Core.Modules.Types.TestName,
     module Smol.Core.Modules.Types.DefIdentifier,
@@ -14,7 +13,6 @@ import Smol.Core.Modules.Types.DefIdentifier
 import Smol.Core.Modules.Types.Entity
 import Smol.Core.Modules.Types.Module
 import Smol.Core.Modules.Types.ModuleItem
-import Smol.Core.Modules.Types.ModuleName
 import Smol.Core.Modules.Types.Test
 import Smol.Core.Modules.Types.TestName
 import Smol.Core.Modules.Types.TopLevelExpression

smol-core/src/Smol/Core/Modules/Types/Entity.hs

@@ -9,10 +9,10 @@ module Smol.Core.Modules.Types.Entity where
 -- terrible, pls improve
 import Data.Aeson (FromJSON, FromJSONKey, ToJSON, ToJSONKey)
 import GHC.Generics (Generic)
-import Smol.Core.Modules.Types.ModuleName
 import Smol.Core.Printer
 import Smol.Core.Types.Constructor
 import Smol.Core.Types.Identifier
+import Smol.Core.Types.ModuleName
 import Smol.Core.Types.TypeName
 
 data Entity

smol-core/src/Smol/Core/Parser.hs

@@ -6,9 +6,7 @@ module Smol.Core.Parser
     parseExprAndFormatError,
     parseTypeAndFormatError,
     parseType,
-    parseModule,
     parseConstraint,
-    parseModuleAndFormatError,
     parseDataTypeAndFormatError,
     parseConstraintAndFormatError,
     ParseErrorType,
@@ -19,10 +17,8 @@ import Data.Bifunctor (first)
 import Data.Text (Text)
 import qualified Data.Text as T
 import Data.Void
-import Smol.Core.Modules.Types
 import Smol.Core.Parser.DataType (dataTypeParser)
 import Smol.Core.Parser.Expr
-import Smol.Core.Parser.Module
 import Smol.Core.Parser.Type
 import Smol.Core.Parser.Typeclass
 import Smol.Core.Typecheck.Types
@@ -46,15 +42,9 @@ parseExpr = parse (space *> expressionParser <* eof) "repl"
 parseExprAndFormatError :: Text -> Either Text ParserExpr
 parseExprAndFormatError = parseAndFormat (space *> expressionParser <* eof)
 
-parseModule :: Text -> Either ParseErrorType [ModuleItem Annotation]
-parseModule = parse (space *> moduleParser <* eof) "repl"
-
 parseConstraint :: Text -> Either ParseErrorType (Constraint ParseDep Annotation)
 parseConstraint = parse (space *> constraintParser <* eof) "repl"
 
-parseModuleAndFormatError :: Text -> Either Text [ModuleItem Annotation]
-parseModuleAndFormatError = parseAndFormat (space *> moduleParser <* eof)
-
 parseDataTypeAndFormatError :: Text -> Either Text (DataType ParseDep Annotation)
 parseDataTypeAndFormatError = parseAndFormat (space *> dataTypeParser <* eof)
 

smol-core/src/Smol/Core/Parser/Identifiers.hs

@@ -10,7 +10,6 @@ module Smol.Core.Parser.Identifiers
     typeNameParser,
     plainTypeNameParser,
     typeclassNameParser,
-    testNameParser,
   )
 where
 
@@ -20,9 +19,6 @@ import Data.Set (Set)
 import qualified Data.Set as S
 import Data.Text (Text)
 import Data.Void
-import Smol.Core.Modules.Types.ModuleName
-import Smol.Core.Modules.Types.TestName
-import Smol.Core.Parser.Primitives (textPrim)
 import Smol.Core.Parser.Shared
 import Smol.Core.Typecheck.Typeclass.Types
 import Smol.Core.Types
@@ -190,8 +186,3 @@ withNamespace p = do
   myString "."
   a <- p
   pure (a, mName)
-
------
-
-testNameParser :: Parser TestName
-testNameParser = myLexeme $ TestName <$> textPrim

smol-core/src/Smol/Core/Types.hs

@@ -6,6 +6,7 @@ module Smol.Core.Types
     module Smol.Core.Types.Op,
     module Smol.Core.Types.Expr,
     module Smol.Core.Types.Identifier,
+    module Smol.Core.Types.ModuleName,
     module Smol.Core.Types.ParseDep,
     module Smol.Core.Types.Pattern,
     module Smol.Core.Types.Prim,
@@ -22,6 +23,7 @@ import Smol.Core.Types.Constructor
 import Smol.Core.Types.DataType
 import Smol.Core.Types.Expr
 import Smol.Core.Types.Identifier
+import Smol.Core.Types.ModuleName
 import Smol.Core.Types.Op
 import Smol.Core.Types.ParseDep
 import Smol.Core.Types.Pattern

smol-core/src/Smol/Core/Modules/Types/ModuleName.hs → smol-core/src/Smol/Core/Types/ModuleName.hs

@@ -3,7 +3,7 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE OverloadedStrings #-}
 
-module Smol.Core.Modules.Types.ModuleName
+module Smol.Core.Types.ModuleName
   ( ModuleName (..),
     getModuleName,
     validModuleName,

smol-core/src/Smol/Core/Types/ParseDep.hs

@@ -13,8 +13,8 @@ where
 import Data.Aeson (FromJSON, ToJSON)
 import Data.String
 import GHC.Generics (Generic)
-import Smol.Core.Modules.Types.ModuleName
 import Smol.Core.Printer
+import Smol.Core.Types.ModuleName
 
 ---------------------------
 

smol-core/test/Main.hs

@@ -5,6 +5,7 @@ import qualified Test.Interpreter.InterpreterSpec
 import qualified Test.Modules.CheckSpec
 import qualified Test.Modules.FromPartsSpec
 import qualified Test.Modules.InterpreterSpec
+import qualified Test.Modules.ParserSpec
 import qualified Test.Modules.PrettyPrintSpec
 import qualified Test.Modules.ResolveDepsSpec
 import qualified Test.Modules.RunTestsSpec
@@ -29,12 +30,13 @@ main = hspec $ parallel $ do
   Test.Typecheck.TypeclassSpec.spec
   Test.Typecheck.ToDictionaryPassingSpec.spec
   Test.ParserSpec.spec
-  Test.Interpreter.InterpreterSpec.spec
   Test.Modules.CheckSpec.spec
   Test.Modules.FromPartsSpec.spec
   Test.Modules.InterpreterSpec.spec
   Test.Modules.PrettyPrintSpec.spec
   Test.Modules.ResolveDepsSpec.spec
   Test.Modules.RunTestsSpec.spec
   Test.Modules.TypecheckSpec.spec
+  Test.Modules.ParserSpec.spec
   Test.TransformSpec.spec
+  Test.Interpreter.InterpreterSpec.spec

smol-core/test/Test/Helpers.hs

@@ -58,6 +58,7 @@ import Data.Text (Text)
 import qualified Data.Text as T
 import Smol.Core
 import Smol.Core.Modules.FromParts
+import Smol.Core.Modules.Parser
 import Smol.Core.Modules.ResolveDeps
 import Smol.Core.Modules.Typecheck
 import Smol.Core.Modules.Types.Module

smol-core/test/Test/Interpreter/InterpreterSpec.hs

@@ -2,16 +2,11 @@
 
 module Test.Interpreter.InterpreterSpec (spec) where
 
-import Control.Monad (void)
-import Control.Monad.Reader
 import Data.Foldable (traverse_)
 import Data.Text (Text)
 import Smol.Core
 import Smol.Core.Interpreter.Types.Stack
-import Smol.Core.Modules.Types.Module
 import Smol.Core.Typecheck.FromParsedExpr
-import Smol.Core.Typecheck.Typecheck (typecheck)
-import Smol.Core.Typecheck.Typeclass
 import Test.Helpers
 import Test.Hspec
 
@@ -29,31 +24,6 @@ discardLeft :: (Show e) => Either e a -> a
 discardLeft (Left e) = error (show e)
 discardLeft (Right a) = a
 
-runDictEnv :: ReaderT PassDictEnv m a -> m a
-runDictEnv = flip runReaderT emptyPassDictEnv
-
--- | typecheck, resolve typeclasses, interpret, profit
-doInterpret :: Text -> Expr ResolvedDep ()
-doInterpret input =
-  let dictEnv =
-        ToDictEnv
-          { tdeClasses = tceClasses typecheckEnv,
-            tdeInstances = fmap void <$> moInstances testModule,
-            tdeVars = mempty
-          }
-   in case typecheck typecheckEnv (fromParsedExpr (unsafeParseExpr input)) of
-        Right (_constraints, typedExpr) ->
-          fmap edAnnotation
-            . discardLeft
-            . interpret mempty
-            . addEmptyStackFrames
-            . void
-            . discardLeft
-            . runDictEnv
-            . passDictionaries dictEnv mempty
-            $ typedExpr
-        Left e -> error (show e)
-
 spec :: Spec
 spec = do
   describe "InterpreterSpec" $ do
@@ -81,18 +51,3 @@ spec = do
                 `shouldBe` fromParsedExpr (unsafeParseExpr expect)
         )
         cases
-
-    -- not sure this is the way
-    describe "interpret with typeclasses" $ do
-      let cases =
-            [ ("equals (1 : Int) (1 : Int)", "True"), -- use Eq Int
-              ("equals (2 : Int) (1 : Int)", "False"), -- use Eq Int
-              ("equals ((1 : Int),(1 : Int)) ((1 : Int), (2 : Int))", "False") -- use Eq (a,b) and Eq Int
-            ]
-      traverse_
-        ( \(input, expect) ->
-            it (show input <> " = " <> show expect) $ do
-              doInterpret input
-                `shouldBe` fromParsedExpr (unsafeParseExpr expect)
-        )
-        cases

smol-core/test/Test/Modules/CheckSpec.hs

@@ -15,6 +15,7 @@ import Data.Text (Text)
 import qualified Data.Text.Encoding as T
 import Smol.Core
 import Smol.Core.Modules.Check
+import Smol.Core.Modules.Parser
 import Smol.Core.Modules.RunTests
 import Smol.Core.Modules.Types.ModuleError
 import Test.Hspec

smol-core/test/Test/Modules/InterpreterSpec.hs

@@ -9,6 +9,7 @@ import qualified Error.Diagnose as Diag
 import Smol.Core
 import Smol.Core.Modules.Check
 import Smol.Core.Modules.Interpret
+import Smol.Core.Modules.Parser
 import Smol.Core.Modules.Types.DefIdentifier
 import Smol.Core.Modules.Types.ModuleError
 import Smol.Core.Typecheck.FromParsedExpr