c458007 · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

minor cleanups

commitc45800716650aa8d1f0d975439c6be153baba59d authorHannes Mehnert <hannes@mehnert.org> dateMon 8 Apr 2013, 09:16 (14 years ago) parente0783ef

2 files changed+4−4

unifiedsplit

src/Idris/IdeSlave.hs+2−2

@@ -41,7 +41,7 @@ instance SExpable Int where

4141

4242instance (SExpable a) => SExpable (Maybe a) where

4343 toSExp Nothing = List [SymbolAtom "Nothing"]

44− toSExp (Just a) = List ((SymbolAtom "Just") : [toSExp a])

44+ toSExp (Just a) = List [SymbolAtom "Just", toSExp a]

4545

4646instance (SExpable a) => SExpable [a] where

4747 toSExp l = List (map toSExp l)

@@ -66,7 +66,7 @@ atom = do char ':'; x <- atomC; return x

6666

6767atomC = do string "True"; return (BoolAtom True)

6868 <|> do string "False"; return (BoolAtom False)

69− <|> do xs <- many (noneOf " \n\"()"); return (SymbolAtom xs)

69+ <|> do xs <- many (noneOf " \n\t\r\"()"); return (SymbolAtom xs)

7070

7171quotedChar = noneOf "\""

7272 <|> try (string "\\\"" >> return '"')

src/Idris/REPL.hs+2−2

@@ -82,7 +82,7 @@ repl orig mods

8282 repl orig mods

8383

8484-- | Run the IdeSlave

85−ideslave :: IState -> [FilePath] -> InputT Idris ()

85+ideslave :: IState -> [FilePath] -> Idris ()

8686ideslave orig mods

8787 = do x <- liftIO $ receiveMessage

8888 case x of

@@ -592,7 +592,7 @@ idrisMain opts =

592592 [] -> return ()

593593 (o:_) -> process "" (NewCompile o)

594594 when (runrepl && not idesl) $ runInputT replSettings $ repl ist inputs

595− when (idesl) $ runInputT replSettings $ ideslave ist inputs

595+ when (idesl) $ ideslave ist inputs

596596 ok <- noErrors

597597 when (not ok) $ liftIO (exitWith (ExitFailure 1))

598598 where