Added install instructions

README.md

@@ -10,4 +10,15 @@ cherry> (+ 2 3 4)
 9
 ```
 
+## Instructions
+```
+# apt install haskell-stack
+$ git clone https://git.fai.su/Suguivy/cherry-lisp
+$ cd cherry-lisp
+# stack upgrade
+$ stack build
+$ stack install
+$ cherry
+```
+
 Work in progress...

cherry-lisp.cabal

@@ -28,4 +28,5 @@ executable cherry
 
   build-depends:       base >= 4.7 && < 5,
                        containers,
-                       parsec
+                       parsec,
+                       haskeline

src/Main.hs

@@ -3,24 +3,22 @@ module Main where
 import Evaluator
 import ExprParser
 import Text.Parsec.Error
-import Data.Either
+import Control.Monad
-import System.IO
+import Data.Maybe
+import System.Console.Haskeline
 
 main :: IO ()
 main = do
-  putStrLn ""
+  putStrLn logo
-  putLogo
+  runInputT defaultSettings loop
-  putStrLn ""
+  where loop = do
-  cycle
+          line <- getInputLine "cherry> "
-  where cycle = do
+          unless (isNothing line) $ do
-          putPrompt
+            let r = readEval $ fromJust line
-          hFlush stdout
+            outputStrLn $ case r of
-          s <- getLine
+              Right res -> res
-          let r = readEval s
+              Left err -> show err
-          putStrLn $ case r of
+            loop
-            (Right res) -> res
-            (Left err) -> show err
-          cycle
 
 readEval :: String -> Either ParseError String
 readEval s = do
@@ -28,8 +26,5 @@ readEval s = do
   let result = eval expr
   return $ show result
 
-putLogo :: IO ()
+logo :: String
-putLogo = putStr . concat $ map (++"\n") ["  /\\", " |  \\", " @   @"]
+logo = unlines ["","  /\\", " |  \\", " @   @",""]
-
-putPrompt :: IO ()
-putPrompt = putStr "chery> "

stack.yaml

@@ -34,7 +34,8 @@ packages:
 # These entries can reference officially published versions as well as
 # forks / in-progress versions pinned to a git hash. For example:
 #
-# extra-deps:
+extra-deps:
+#- readline-1.0.3.0
 # - acme-missiles-0.3
 # - git: https://github.com/commercialhaskell/stack.git
 #   commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a