Fix things, matrix action

.github/workflows/lint-haskell.yml

@@ -20,6 +20,7 @@ jobs:
             builder/**/*.hs
             smol-backend/**/*.hs
             smol-core/**/*.hs
+            smol-modules/**/*.hs
             smol-repl/**/*.hs
             smol-wasm/**/*.hs
 
@@ -36,6 +37,6 @@ jobs:
       - name: "Run HLint"
         uses: rwe/actions-hlint-run@v2
         with:
-          path: '["builder/", "smol-backend/", "smol-core/", "smol-repl/", "smol-wasm/"]'
+          path: '["builder/", "smol-backend/", "smol-core/", "smol-modules/", "smol-repl/", "smol-wasm/"]'
           fail-on: warning
 

.github/workflows/smol-haskell.yml

@@ -4,31 +4,24 @@ on:
   push:
     branches:
       - trunk
-    paths:
-      - "smol-backend/**"
-      - "smol-core/**"
-      - "smol-repl/**"
-      - "smol-wasm/**"
-      - "vendored/**"
-      - "cabal.project"
-      - "cabal.project.freeze"
 
   pull_request:
     branches:
       - trunk
-    paths:
-      - "smol-backend/**"
-      - "smol-core/**"
-      - "smol-repl/**"
-      - "smol-wasm/**"
-      - "vendored/**"
-      - "cabal.project"
-      - "cabal.project.freeze"
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    example_matrix:
+      strategy:
+        matrix:
+          command:
+            - "make test-smol"
+            - "make test-smol-backend"
+            - "make test-smol-wasm"
+            - "make test-smol-modules"
+            - "make build-smol-repl"
 
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
@@ -52,14 +45,6 @@ jobs:
           ghc-version: '9.6.3'
           cabal-version: '3.10.1.0'
 
-      - name: Test smol 
-        run: make test-smol
-
-      - name: Test smol backend
-        run: make test-smol-backend
-
-      - name: Test smol wasm
-        run: make test-smol-wasm
+      - name: Test!
+        run: ${{ matrix.command }}
 
-      - name: Build smol repl
-        run: make build-smol-repl

Makefile

@@ -61,6 +61,10 @@ test-smol:
 test-smol-backend:
 	cabal run smol-backend:test:smol-backend-tests
 
+.PHONY: test-smol-modules
+test-smol-modules:
+	cabal run smol-modules:test:smol-modules-tests
+
 .PHONY: test-smol-wasm
 test-smol-wasm:
 	cabal run smol-wasm:test:smol-wasm-tests

smol-backend/smol-backend.cabal

@@ -41,6 +41,7 @@ common shared
     , mtl
     , process
     , smol-core
+    , smol-modules
     , string-conversions
     , text
     , unix

smol-backend/src/Smol/Backend/IR/FromExpr/Expr.hs

@@ -28,7 +28,6 @@ import Smol.Backend.IR.IRExpr
 import Smol.Backend.Types.GetPath
 import Smol.Backend.Types.PatternPredicate
 import Smol.Core.Helpers
-import Smol.Core.Modules.Types (Module (..), TopLevelExpression (..))
 import Smol.Core.Typecheck (flattenConstructorApplication, getTypeAnnotation)
 import Smol.Core.Typecheck.Shared (getExprAnnotation)
 import Smol.Core.Types.Constructor
@@ -40,6 +39,7 @@ import Smol.Core.Types.Prim
 import Smol.Core.Types.ResolvedDep
 import Smol.Core.Types.Type
 import Smol.Core.Types.TypeName
+import Smol.Modules.Types (Module (..), TopLevelExpression (..))
 
 irPrintInt :: IRExtern
 irPrintInt =

smol-backend/test/Test/Helpers.hs

@@ -30,10 +30,10 @@ import qualified Data.Sequence as Seq
 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
+import Smol.Modules.FromParts
+import Smol.Modules.Parser
+import Smol.Modules.Types.Module
 
 tyBool :: (Monoid ann) => Type dep ann
 tyBool = TPrim mempty TPBool

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

@@ -13,14 +13,14 @@ import qualified LLVM.AST as LLVM
 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.Typecheck.Typeclass.Types
 import Smol.Core.Types
+import Smol.Modules.FromParts
+import Smol.Modules.Parser (parseModuleAndFormatError)
+import Smol.Modules.ResolveDeps
+import Smol.Modules.Typecheck
+import Smol.Modules.Types
+import Smol.Modules.Types.ModuleError
 import Test.BuiltInTypes
 import Test.Hspec
 import Test.IR.Samples

smol-core/src/Smol/Core/Typecheck/Typeclass/Helpers.hs

@@ -27,7 +27,6 @@ import qualified Data.Map.Strict as M
 import Data.Maybe (listToMaybe, mapMaybe)
 import Data.Monoid
 import qualified Data.Set as S
-import Smol.Core.Helpers
 import Smol.Core.TypeUtils
 import Smol.Core.Typecheck.Shared
 import Smol.Core.Typecheck.Substitute

smol-core/test/Test/Helpers.hs

@@ -55,7 +55,6 @@ import Smol.Core
 import Smol.Core.Typecheck.FromParsedExpr
 import Test.BuiltInTypes (builtInTypes)
 
-
 getRight :: (Show e) => Either e a -> a
 getRight (Right a) = a
 getRight (Left e) = error (show e)