Haskell: steps 4-6. Line editing. Simpler fn calls.

1 files changed, 14 insertions, 12 deletions

diff --git a/haskell/Reader.hs b/haskell/Reader.hs
index 04381f4..8def91c 100644
--- a/haskell/Reader.hs
+++ b/haskell/Reader.hs
@@ -4,14 +4,22 @@ where
 
 import Text.ParserCombinators.Parsec (
     Parser, parse, space, char, digit, letter,
-    (<|>), oneOf, noneOf, many, many1, skipMany1, sepEndBy)
+    (<|>), oneOf, noneOf, many, many1, skipMany, skipMany1, sepEndBy)
 import qualified Data.Map as Map
 import Control.Monad (liftM)
 
 import Types
 
 spaces :: Parser ()
-spaces = skipMany1 (oneOf ", ")
+spaces = skipMany1 (oneOf ", \n")
+
+comment :: Parser ()
+comment = do
+    char ';'
+    skipMany (noneOf "\r\n")
+
+ignored :: Parser ()
+ignored = skipMany (spaces <|> comment)
 
 symbol :: Parser Char
 symbol = oneOf "!#$%&|*+-/:<=>?@^_~"
@@ -61,34 +69,28 @@ read_atom =  read_number
 read_list :: Parser MalVal
 read_list = do
     char '('
-    x <- sepEndBy read_form spaces
+    x <- sepEndBy read_form ignored
     char ')'
     return $ MalList x
 
 read_vector :: Parser MalVal
 read_vector = do
     char '['
-    x <- sepEndBy read_form spaces
+    x <- sepEndBy read_form ignored
     char ']'
     return $ MalVector x
 
--- TODO: propagate error properly
-_pairs [x] = error "Odd number of element for hashmap"
-_pairs [] = []
-_pairs (MalString x:y:xs) = (x,y):_pairs xs
-_pairs (MalKeyword x:y:xs) = ("\x029e" ++ x,y):_pairs xs
-
 read_hash_map :: Parser MalVal
 read_hash_map = do
     char '{'
-    x <- sepEndBy read_form spaces
+    x <- sepEndBy read_form ignored
     char '}'
     return $ MalHashMap $ Map.fromList $ _pairs x
 
 
 read_form :: Parser MalVal
 read_form =  do
-    many spaces
+    ignored
     x <- read_atom <|> read_list <|> read_vector <|> read_hash_map
     return $ x