git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Start on parser module.
0863539joneshf
psci/Main.hs+6−21
compare with golang
unifiedsplit
@@ -36,11 +36,13 @@ import System.Environment.XDG.BaseDir
36import System.FilePath ((</>), isPathSeparator)
36import System.FilePath ((</>), isPathSeparator)
37import System.Process
37import System.Process
38
38
39+import qualified Parser
40+
39import qualified Data.Map as M
41import qualified Data.Map as M
40import qualified Language.PureScript as P
42import qualified Language.PureScript as P
41import qualified Paths_purescript as Paths
43import qualified Paths_purescript as Paths
42import qualified System.IO.UTF8 as U (readFile)
44import qualified System.IO.UTF8 as U (readFile)
43−import qualified Text.Parsec as Parsec (Parsec, eof, try)
45+import qualified Text.Parsec as Parsec (try)
44
46
45-- |
47-- |
46-- The PSCI state.
48-- The PSCI state.
@@ -115,7 +117,7 @@ getPreludeFilename = Paths.getDataFileName "prelude/prelude.purs"
115-- Loads a file for use with imports.
117-- Loads a file for use with imports.
116--
118--
117loadModule :: FilePath -> IO (Either String [P.Module])
119loadModule :: FilePath -> IO (Either String [P.Module])
118−loadModule = fmap (either (Left . show) Right . P.runIndentParser "" P.parseModules) . U.readFile
120+loadModule = fmap (either (Left . show) Right . Parser.parseModules) . U.readFile
119
121
120-- |
122-- |
121-- Expands tilde in path.
123-- Expands tilde in path.
@@ -233,23 +235,6 @@ handleTypeOf value (PSCI imports loadedModules lets) = do
233 Just (ty, _) -> outputStrLn . P.prettyPrintType $ ty
235 Just (ty, _) -> outputStrLn . P.prettyPrintType $ ty
234 Nothing -> outputStrLn "Could not find type"
236 Nothing -> outputStrLn "Could not find type"
235
237
236−-- Parser helpers
237−
238−-- |
239−-- Parser for our PSCI version of @let@.
240−-- This is essentially let from do-notation.
241−-- However, since we don't support the @Eff@ monad, we actually want the normal @let@.
242−--
243−parseLet :: Parsec.Parsec String P.ParseState (P.Value -> P.Value)
244−parseLet = P.Let <$> (P.reserved "let" *> P.indented *> P.parseBinder)
245− <*> (P.indented *> P.reservedOp "=" *> P.parseValue)
246−
247−-- |
248−-- Parser for any other valid expression.
249−--
250−parseExpression :: Parsec.Parsec String P.ParseState P.Value
251−parseExpression = P.whiteSpace *> P.parseValue <* Parsec.eof
252−
253-- Commands
238-- Commands
254
239
255-- |
240-- |
@@ -258,7 +243,7 @@ parseExpression = P.whiteSpace *> P.parseValue <* Parsec.eof
258handleCommand :: Command -> StateT PSCI (InputT IO) ()
243handleCommand :: Command -> StateT PSCI (InputT IO) ()
259handleCommand Empty = return ()
244handleCommand Empty = return ()
260handleCommand (Expression ls) =
245handleCommand (Expression ls) =
261− case P.runIndentParser "" (Left <$> Parsec.try parseLet <|> Right <$> parseExpression) (unlines ls) of
246+ case Parser.psciParser (Left <$> Parsec.try Parser.parseLet <|> Right <$> Parser.parseExpression) (unlines ls) of
262 Left err -> inputTToState $ outputStrLn (show err)
247 Left err -> inputTToState $ outputStrLn (show err)
263 Right (Left l) -> modify (updateLets l)
248 Right (Left l) -> modify (updateLets l)
264 Right (Right decl) -> get >>= inputTToState . handleDeclaration decl
249 Right (Right decl) -> get >>= inputTToState . handleDeclaration decl
@@ -275,7 +260,7 @@ handleCommand Reload = do
275 (Right prelude) <- ioToState $ loadModule =<< getPreludeFilename
260 (Right prelude) <- ioToState $ loadModule =<< getPreludeFilename
276 put (PSCI defaultImports prelude [])
261 put (PSCI defaultImports prelude [])
277handleCommand (TypeOf expr) =
262handleCommand (TypeOf expr) =
278− case P.runIndentParser "" parseExpression expr of
263+ case Parser.psciParser Parser.parseExpression expr of
279 Left err -> inputTToState $ outputStrLn (show err)
264 Left err -> inputTToState $ outputStrLn (show err)
280 Right expr' -> get >>= inputTToState . handleTypeOf expr'
265 Right expr' -> get >>= inputTToState . handleTypeOf expr'
281handleCommand _ = outputTStrLn "Unknown command"
266handleCommand _ = outputTStrLn "Unknown command"
psci/Parser.hsnew file+50
@@ -0,0 +1,50 @@
1+-----------------------------------------------------------------------------
2+--
3+-- Module : Parser
4+-- Copyright : (c) Phil Freeman 2014
5+-- License : MIT
6+--
7+-- Maintainer : Phil Freeman <paf31@cantab.net>
8+-- Stability : experimental
9+-- Portability :
10+--
11+-- |
12+-- Parser for PSCI.
13+--
14+-----------------------------------------------------------------------------
15+
16+module Parser where
17+
18+import Control.Applicative
19+
20+import Text.Parsec
21+
22+import qualified Language.PureScript as P
23+
24+-- |
25+-- Parser for PSCI.
26+-- This is really just a wrapper around 'Language.PureScript.runIndentParser'
27+--
28+psciParser :: Parsec String P.ParseState a -> String -> Either ParseError a
29+psciParser = P.runIndentParser ""
30+
31+-- |
32+-- Parses modules
33+--
34+parseModules :: String -> Either ParseError [P.Module]
35+parseModules = psciParser P.parseModules
36+
37+-- |
38+-- Parser for our PSCI version of @let@.
39+-- This is essentially let from do-notation.
40+-- However, since we don't support the @Eff@ monad, we actually want the normal @let@.
41+--
42+parseLet :: Parsec String P.ParseState (P.Value -> P.Value)
43+parseLet = P.Let <$> (P.reserved "let" *> P.indented *> P.parseBinder)
44+ <*> (P.indented *> P.reservedOp "=" *> P.parseValue)
45+
46+-- |
47+-- Parser for any other valid expression.
48+--
49+parseExpression :: Parsec String P.ParseState P.Value
50+parseExpression = P.whiteSpace *> P.parseValue <* eof