Revisited parser interface

1 files changed, 13 insertions, 5 deletions

diff --git a/src/Micro/Parser.hs b/src/Micro/Parser.hs
index ea4873e..45ba44d 100644
--- a/src/Micro/Parser.hs
+++ b/src/Micro/Parser.hs
@@ -1,4 +1,9 @@
-module Micro.Parser where
+module Micro.Parser
+  ( Micro.Parser.parse,
+    parseFromFile,
+    parseFromString,
+  )
+where
 
 import Control.Monad.Identity (Identity)
 import Data.Maybe (isJust)
@@ -217,7 +222,10 @@ program = do
 parse :: Parser [Expr]
 parse = program
 
-parseFromFile :: Parsec String () a -> FilePath -> IO (Either ParseError a)
-parseFromFile p fname = do
-  input <- readFile fname
-  return (runParser p () fname input)
+parseFromFile :: FilePath -> IO (Either ParseError [Expr])
+parseFromFile filename = do
+  input <- readFile filename
+  return $ runParser (scan Micro.Parser.parse) () filename input
+
+parseFromString :: String -> Either ParseError [Expr]
+parseFromString input = runParser (scan Micro.Parser.parse) () "-" input