summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilFreeman <>2013-11-03 22:44:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2013-11-03 22:44:00 (GMT)
commitfa11077347d9de7f045ad6d1eb52db3cdeb6f6b0 (patch)
treeaecf5f5b87334ba220153e4ce7a90ad83377c0d4
parentf4bc720caa8f6e1a5c8649971294ad622a788be3 (diff)
version 0.1.30.1.3
-rw-r--r--purescript.cabal2
-rw-r--r--src/Language/PureScript/Parser/Types.hs2
-rw-r--r--src/Language/PureScript/Pretty/Types.hs2
3 files changed, 3 insertions, 3 deletions
diff --git a/purescript.cabal b/purescript.cabal
index 2a3f6f5..32c518c 100644
--- a/purescript.cabal
+++ b/purescript.cabal
@@ -1,5 +1,5 @@
name: purescript
-version: 0.1.2
+version: 0.1.3
cabal-version: >=1.8
build-type: Simple
license: MIT
diff --git a/src/Language/PureScript/Parser/Types.hs b/src/Language/PureScript/Parser/Types.hs
index 9b67b04..016c866 100644
--- a/src/Language/PureScript/Parser/Types.hs
+++ b/src/Language/PureScript/Parser/Types.hs
@@ -84,7 +84,7 @@ parseRowEnding :: P.Parsec String ParseState Row
parseRowEnding = P.option REmpty (RowVar <$> (lexeme (indented *> P.char '|') *> indented *> identifier))
parseRow :: P.Parsec String ParseState Row
-parseRow = (fromList <$> (parseNameAndType `P.sepBy` (indented *> semi)) <*> parseRowEnding) P.<?> "row"
+parseRow = (fromList <$> (parseNameAndType `P.sepBy` (indented *> comma)) <*> parseRowEnding) P.<?> "row"
where
fromList :: [(String, Type)] -> Row -> Row
fromList [] r = r
diff --git a/src/Language/PureScript/Pretty/Types.hs b/src/Language/PureScript/Pretty/Types.hs
index f433961..8eb55ed 100644
--- a/src/Language/PureScript/Pretty/Types.hs
+++ b/src/Language/PureScript/Pretty/Types.hs
@@ -47,7 +47,7 @@ typeLiterals = Pattern $ A.Kleisli match
match _ = Nothing
prettyPrintRow :: Row -> String
-prettyPrintRow = (\(tys, tail) -> intercalate "; " (map (uncurry nameAndTypeToPs) tys) ++ tailToPs tail) . toList []
+prettyPrintRow = (\(tys, tail) -> intercalate ", " (map (uncurry nameAndTypeToPs) tys) ++ tailToPs tail) . toList []
where
nameAndTypeToPs :: String -> Type -> String
nameAndTypeToPs name ty = name ++ " :: " ++ prettyPrintType ty