diff options
-rw-r--r-- | lisk.cabal | 3 | ||||
-rw-r--r-- | src/Parser.hs | 7 |
2 files changed, 7 insertions, 3 deletions
@@ -27,7 +27,8 @@ library | |||
27 | Parser, | 27 | Parser, |
28 | Evaluator, | 28 | Evaluator, |
29 | Operators, | 29 | Operators, |
30 | Error | 30 | Error.Base |
31 | Error.Pretty | ||
31 | 32 | ||
32 | executable lisk | 33 | executable lisk |
33 | default-language: Haskell2010 | 34 | default-language: Haskell2010 |
diff --git a/src/Parser.hs b/src/Parser.hs index 1242645..dc754d3 100644 --- a/src/Parser.hs +++ b/src/Parser.hs | |||
@@ -69,7 +69,10 @@ parseId = do | |||
69 | _ -> Id atom | 69 | _ -> Id atom |
70 | 70 | ||
71 | whiteSpace :: Parser () | 71 | whiteSpace :: Parser () |
72 | whiteSpace = skipMany1 space | 72 | whiteSpace = skipMany1 $ oneOf [' ', '\n'] |
73 | |||
74 | optionalWhiteSpace :: Parser () | ||
75 | optionalWhiteSpace = skipMany $ oneOf [' ', '\n'] | ||
73 | 76 | ||
74 | type Alias = String | 77 | type Alias = String |
75 | parseModifier :: Char -> Alias -> Parser Expr | 78 | parseModifier :: Char -> Alias -> Parser Expr |
@@ -98,7 +101,7 @@ parseLispValue = | |||
98 | x <- sepEndBy parseLispValue whiteSpace | 101 | x <- sepEndBy parseLispValue whiteSpace |
99 | spaces | 102 | spaces |
100 | t <- optionMaybe $ char '.' >> space >> parseLispValue | 103 | t <- optionMaybe $ char '.' >> space >> parseLispValue |
101 | spaces >> char ')' | 104 | optionalWhiteSpace >> char ')' |
102 | return $ maybe (List x) (DottedList x) t | 105 | return $ maybe (List x) (DottedList x) t |
103 | <?> "lisp value" | 106 | <?> "lisp value" |
104 | 107 | ||