Refactor script/expression related code to multiple modules

3 files changed, 4 insertions, 1 deletions

diff --git a/src/Parser/Core.hs b/src/Parser/Core.hs
index 5fb2139..abd8b96 100644
--- a/src/Parser/Core.hs
+++ b/src/Parser/Core.hs
@@ -17,6 +17,8 @@ import Text.Megaparsec.Char
 import qualified Text.Megaparsec.Char.Lexer as L
 
 import Network ()
+import Script.Expr
+import Script.Module
 import Test
 
 newtype TestParser a = TestParser (StateT TestParserState (ParsecT CustomTestError TestStream IO) a)
diff --git a/src/Parser/Expr.hs b/src/Parser/Expr.hs
index da137af..5d60973 100644
--- a/src/Parser/Expr.hs
+++ b/src/Parser/Expr.hs
@@ -39,8 +39,8 @@ import Text.Regex.TDFA qualified as RE
 import Text.Regex.TDFA.Text qualified as RE
 
 import Parser.Core
+import Script.Expr
 import Script.Expr.Class
-import Test
 
 reservedWords :: [ Text ]
 reservedWords =
diff --git a/src/Parser/Statement.hs b/src/Parser/Statement.hs
index 97ae4fc..dd5832d 100644
--- a/src/Parser/Statement.hs
+++ b/src/Parser/Statement.hs
@@ -22,6 +22,7 @@ import Network (Network, Node)
 import Parser.Core
 import Parser.Expr
 import Process (Process)
+import Script.Expr
 import Script.Expr.Class
 import Test
 import Util