7b5cb4b · rowtype-yoga/purescript-native

git.iko.soy/rowtype-yoga/purescript-native

Merge pull request #860 from purescript/782

Better let bindings in psci, fix #782

commit7b5cb4b3481d1119509c9a26b4d941919c944e1f authorPhil Freeman <paf31@cantab.net> dateWed 11 Feb 2015, 09:02 (12 years ago) parent1099dd8 d64e060

3 files changed+11−11

compare with golang

unifiedsplit

psci/Commands.hs+1−1 psci/Main.hs+9−9 psci/Parser.hs+1−1

psci/Commands.hs+1−1

@@ -52,7 +52,7 @@ data Command

5252 -- |

5353 -- Binds a value to a name

5454 --

55− | Let (Expr -> Expr)

55+ | Let [Declaration]

5656 -- |

5757 -- Find the type of an expression

5858 --

psci/Main.hs+9−9

@@ -69,7 +69,7 @@ data PSCiState = PSCiState

6969 { psciImportedFilenames :: [FilePath]

7070 , psciImportedModuleNames :: [P.ModuleName]

7171 , psciLoadedModules :: [(Either P.RebuildPolicy FilePath, P.Module)]

72− , psciLetBindings :: [P.Expr -> P.Expr]

72+ , psciLetBindings :: [P.Declaration]

7373 }

7474

7575-- State helpers

@@ -95,8 +95,8 @@ updateModules modules st = st { psciLoadedModules = psciLoadedModules st ++ modu

9595-- |

9696-- Updates the state to have more let bindings.

9797--

98−updateLets :: (P.Expr -> P.Expr) -> PSCiState -> PSCiState

99−updateLets name st = st { psciLetBindings = name : psciLetBindings st }

98+updateLets :: [P.Declaration] -> PSCiState -> PSCiState

99+updateLets ds st = st { psciLetBindings = ds ++ psciLetBindings st }

100100

101101-- File helpers

102102-- |

@@ -358,13 +358,13 @@ createTemporaryModule exec PSCiState{psciImportedModuleNames = imports, psciLetB

358358 importDecl m = P.ImportDeclaration m P.Unqualified Nothing

359359 traceModule = P.ModuleName [P.ProperName "Debug", P.ProperName "Trace"]

360360 trace = P.Var (P.Qualified (Just traceModule) (P.Ident "print"))

361− itValue = foldl (\x f -> f x) val lets

362361 mainValue = P.App trace (P.Var (P.Qualified Nothing (P.Ident "it")))

363− itDecl = P.ValueDeclaration (P.Ident "it") P.Value [] $ Right itValue

362+ itDecl = P.ValueDeclaration (P.Ident "it") P.Value [] $ Right val

364363 mainDecl = P.ValueDeclaration (P.Ident "main") P.Value [] $ Right mainValue

365364 decls = if exec then [itDecl, mainDecl] else [itDecl]

366365 in

367− P.Module moduleName ((importDecl `map` imports) ++ decls) Nothing

366+ P.Module moduleName ((importDecl `map` imports) ++ lets ++ decls) Nothing

367+

368368

369369-- |

370370-- Makes a volatile module to hold a non-qualified type synonym for a fully-qualified data type declaration.

@@ -418,10 +418,10 @@ handleDeclaration val = do

418418-- Takes a let declaration and updates the environment, then run a make. If the declaration fails,

419419-- restore the pre-let environment.

420420--

421−handleLet :: (P.Expr -> P.Expr) -> PSCI ()

422−handleLet l = do

421+handleLet :: [P.Declaration] -> PSCI ()

422+handleLet ds = do

423423 st <- PSCI $ lift get

424− let st' = updateLets l st

424+ let st' = updateLets ds st

425425 let m = createTemporaryModule False st' (P.ObjectLiteral [])

426426 e <- psciIO . runMake $ P.make modulesDir options (psciLoadedModules st' ++ [(Left P.RebuildAlways, m)]) []

427427 case e of

psci/Parser.hs+1−1

@@ -76,7 +76,7 @@ parseCommand cmdString =

7676 -- we actually want the normal @let@.

7777 --

7878 psciLet :: P.TokenParser Command

79− psciLet = Let <$> (P.Let <$> (P.reserved "let" *> P.indented *> manyDecls))

79+ psciLet = Let <$> (P.reserved "let" *> P.indented *> manyDecls)

8080 where

8181 manyDecls :: P.TokenParser [P.Declaration]

8282 manyDecls = C.mark (many1 (C.same *> P.parseDeclaration))