Enough to use all Geb: import Juvix.Compiler.Backend.Geb qualified as…

… Geb
anoma · Feb 8, 2023 · 016cadd · 016cadd
1 parent 7798c1d
commit 016cadd
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 10 deletions.
diff --git a/app/Commands/Dev/Geb/Repl.hs b/app/Commands/Dev/Geb/Repl.hs
@@ -8,11 +8,7 @@ import Commands.Dev.Geb.Repl.Colors
 import Commands.Dev.Geb.Repl.Options
 import Control.Exception (throwIO)
 import Control.Monad.State.Strict qualified as State
-import Juvix.Compiler.Backend.Geb.Evaluator qualified as Geb
-import Juvix.Compiler.Backend.Geb.Language qualified as Geb
-import Juvix.Compiler.Backend.Geb.Pretty qualified as Geb
-import Juvix.Compiler.Backend.Geb.Translation.FromSource qualified as Geb
-import Juvix.Compiler.Backend.Geb.Translation.FromSource.Analysis.Inference qualified as Geb
+import Juvix.Compiler.Backend.Geb qualified as Geb
 import Juvix.Data.Error.GenericError qualified as Error
 import Juvix.Extra.Version
 import Juvix.Prelude.Pretty qualified as P
@@ -98,8 +94,7 @@ runCommand _opts = do
       reloadFile _ = do
         mentryPoint <- State.gets (fmap (^. replContextEntryPoint) . (^. replStateContext))
         case mentryPoint of
-          Just entryPoint -> do
-            loadEntryPoint entryPoint
+          Just entryPoint -> loadEntryPoint entryPoint
           Nothing -> liftIO . putStrLn $ pack noFileLoadedMsg
 
       pSomeFile :: String -> SomeBase File

diff --git a/src/Juvix/Compiler/Backend/Geb.hs b/src/Juvix/Compiler/Backend/Geb.hs
@@ -1,4 +1,14 @@
-module Juvix.Compiler.Backend.Geb (module Juvix.Compiler.Backend.Geb.Language, module Juvix.Compiler.Backend.Geb.Translation) where
+module Juvix.Compiler.Backend.Geb
+  ( module Juvix.Compiler.Backend.Geb.Language,
+    module Juvix.Compiler.Backend.Geb.Translation,
+    module Juvix.Compiler.Backend.Geb.Evaluator,
+    module Juvix.Compiler.Backend.Geb.Pretty,
+    module Juvix.Compiler.Backend.Geb.Translation.FromSource.Analysis.Inference,
+  )
+where
 
+import Juvix.Compiler.Backend.Geb.Evaluator
 import Juvix.Compiler.Backend.Geb.Language
+import Juvix.Compiler.Backend.Geb.Pretty hiding (group, list)
 import Juvix.Compiler.Backend.Geb.Translation
+import Juvix.Compiler.Backend.Geb.Translation.FromSource.Analysis.Inference
diff --git a/src/Juvix/Compiler/Backend/Geb/Data/Context.hs b/src/Juvix/Compiler/Backend/Geb/Data/Context.hs
@@ -6,4 +6,4 @@ where
 
 import Juvix.Compiler.Core.Data.BinderList
 
-type Context a = BinderList a
+type Context a = BinderList a
diff --git a/src/Juvix/Compiler/Backend/Geb/Translation.hs b/src/Juvix/Compiler/Backend/Geb/Translation.hs
@@ -1,12 +1,14 @@
 module Juvix.Compiler.Backend.Geb.Translation
   ( module Juvix.Compiler.Backend.Geb.Translation,
     module Juvix.Compiler.Backend.Geb.Translation.FromCore,
+    module Juvix.Compiler.Backend.Geb.Translation.FromSource,
   )
 where
 
 import Juvix.Compiler.Backend.Geb.Language
 import Juvix.Compiler.Backend.Geb.Pretty
-import Juvix.Compiler.Backend.Geb.Translation.FromCore
+import Juvix.Compiler.Backend.Geb.Translation.FromCore hiding (Env)
+import Juvix.Compiler.Backend.Geb.Translation.FromSource
 
 newtype Result = Result
   { _resultCode :: Text

diff --git a/src/Juvix/Compiler/Backend/Geb/Translation/FromSource.hs b/src/Juvix/Compiler/Backend/Geb/Translation/FromSource.hs
@@ -11,6 +11,16 @@ import Juvix.Parser.Error
 import Juvix.Prelude
 import Text.Megaparsec qualified as P
 
+fromSource ::
+  Member (Error ParserError) r =>
+  Path Abs File ->
+  Text ->
+  Sem r Geb.Expression
+fromSource fileName input =
+  case runParser fileName input of
+    Left err -> throw err
+    Right gebTerm -> pure gebTerm
+
 runParser ::
   Path Abs File ->
   Text ->
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,4 @@ where

		import Juvix.Compiler.Core.Data.BinderList

		type Context a = BinderList a
		type Context a = BinderList a