a1cbf8d · rowtype-yoga/purescript-native

git.iko.soy/rowtype-yoga/purescript-native

on golang help sign in

Merge pull request #1419 from epost/master

a1cbf8dPhil Freeman11 years ago

src/Language/PureScript.hs+1−1

compare with golang

unifiedsplit

@@ -28,7 +28,7 @@ import Data.Version (Version)

28import Language.PureScript.AST as P

29import Language.PureScript.Comments as P

30import Language.PureScript.Environment as P

31−import Language.PureScript.Errors as P

31+import Language.PureScript.Errors as P hiding (indent)

32import Language.PureScript.Kinds as P

33import Language.PureScript.Linter as P

34import Language.PureScript.Make as P

src/Language/PureScript/Errors.hs+59−8

@@ -50,6 +50,9 @@ import Language.PureScript.Kinds

50import qualified Text.PrettyPrint.Boxes as Box

52import qualified Text.Parsec as P

53+import qualified Text.Parsec.Error as PE

54+import Text.Parsec.Error (Message(..))

55+import Data.List (nub)

54-- |

57-- |

55-- A type of error messages

58-- A type of error messages

@@ -412,7 +415,7 @@ prettyPrintSingleError full level e = prettyPrintErrorMessage <$> onTypesInError

412 ]

415 ]

413 goSimple (ErrorParsingExterns err) =

416 goSimple (ErrorParsingExterns err) =

414 paras [ lineWithLevel "parsing externs files: "

417 paras [ lineWithLevel "parsing externs files: "

415− , indent . line . show $ err

418+ , indent . prettyPrintParseError $ err

416 ]

419 ]

417 goSimple (ErrorParsingFFIModule path) =

420 goSimple (ErrorParsingFFIModule path) =

418 paras [ line "Unable to parse module from FFI file: "

421 paras [ line "Unable to parse module from FFI file: "

@@ -420,7 +423,7 @@ prettyPrintSingleError full level e = prettyPrintErrorMessage <$> onTypesInError

420 ]

423 ]

421 goSimple (ErrorParsingModule err) =

424 goSimple (ErrorParsingModule err) =

422 paras [ line "Unable to parse module: "

425 paras [ line "Unable to parse module: "

423− , indent . line . show $ err

426+ , indent . prettyPrintParseError $ err

424 ]

427 ]

425 goSimple (MissingFFIModule mn) =

428 goSimple (MissingFFIModule mn) =

426 line $ "Missing FFI implementations for module " ++ show mn

429 line $ "Missing FFI implementations for module " ++ show mn

@@ -722,9 +725,6 @@ prettyPrintSingleError full level e = prettyPrintErrorMessage <$> onTypesInError

722 ]

725 ]

723 go (SimpleErrorWrapper sem) = goSimple sem

726 go (SimpleErrorWrapper sem) = goSimple sem

724

727

725− line :: String -> Box.Box

726− line = Box.text

727−

728 lineWithLevel :: String -> Box.Box

729 lineWithLevel text = line $ show level ++ " " ++ text

730

@@ -742,9 +742,6 @@ prettyPrintSingleError full level e = prettyPrintErrorMessage <$> onTypesInError

742 paras :: [Box.Box] -> Box.Box

743 paras = Box.vcat Box.left

744

745− indent :: Box.Box -> Box.Box

746− indent = Box.moveRight 2

747−

748 -- |

745 -- |

749 -- Pretty print and export declaration

746 -- Pretty print and export declaration

750 --

747 --

@@ -822,6 +819,60 @@ prettyPrintMultipleErrorsWith level _ intro full (MultipleErrors es) = do

822 , Box.vsep 1 Box.left result

819 , Box.vsep 1 Box.left result

823 ]

820 ]

824

821

822+-- | Pretty print a Parsec ParseError as a Box

823+prettyPrintParseError :: P.ParseError -> Box.Box

824+prettyPrintParseError = (prettyPrintParseErrorMessages "or" "unknown parse error" "expecting" "unexpected" "end of input") . PE.errorMessages

825+

826+-- |

827+-- Pretty print ParseError detail messages.

828+--

829+-- Adapted from 'Text.Parsec.Error.showErrorMessages', see <https://github.com/aslatter/parsec/blob/v3.1.9/Text/Parsec/Error.hs#L173>.

830+--

831+prettyPrintParseErrorMessages :: String -> String -> String -> String -> String -> [Message] -> Box.Box

832+prettyPrintParseErrorMessages msgOr msgUnknown msgExpecting msgUnExpected msgEndOfInput msgs

833+ | null msgs = Box.text msgUnknown

834+ | otherwise = Box.vcat Box.left $ map Box.text $ clean [showSysUnExpect,showUnExpect,showExpect,showMessages]

835+

836+ where

837+ (sysUnExpect,msgs1) = span ((SysUnExpect "") ==) msgs

838+ (unExpect,msgs2) = span ((UnExpect "") ==) msgs1

839+ (expect,messages) = span ((Expect "") ==) msgs2

840+

841+ showExpect = showMany msgExpecting expect

842+ showUnExpect = showMany msgUnExpected unExpect

843+ showSysUnExpect | not (null unExpect) ||

844+ null sysUnExpect = ""

845+ | null firstMsg = msgUnExpected ++ " " ++ msgEndOfInput

846+ | otherwise = msgUnExpected ++ " " ++ firstMsg

847+ where

848+ firstMsg = PE.messageString (head sysUnExpect)

849+

850+ showMessages = showMany "" messages

851+

852+ -- helpers

853+ showMany pre msgs' = case clean (map PE.messageString msgs') of

854+ [] -> ""

855+ ms | null pre -> commasOr ms

856+ | otherwise -> pre ++ " " ++ commasOr ms

857+

858+ commasOr [] = ""

859+ commasOr [m] = m

860+ commasOr ms = commaSep (init ms) ++ " " ++ msgOr ++ " " ++ last ms

861+

862+ commaSep = separate ", " . clean

863+

864+ separate _ [] = ""

865+ separate _ [m] = m

866+ separate sep (m:ms) = m ++ sep ++ separate sep ms

867+

868+ clean = nub . filter (not . null)

869+

870+indent :: Box.Box -> Box.Box

871+indent = Box.moveRight 2

872+

873+line :: String -> Box.Box

874+line = Box.text

875+

825renderBox :: Box.Box -> String

876renderBox :: Box.Box -> String

826renderBox = unlines . map trimEnd . lines . Box.render

877renderBox = unlines . map trimEnd . lines . Box.render

827 where

878 where

src/Language/PureScript/Parser/Declarations.hs+11−5

@@ -64,8 +64,6 @@ withSourceSpan f p = do

64 end <- P.getPosition

65 let sp = SourceSpan (P.sourceName start) (toSourcePos start) (toSourcePos end)

66 return $ f sp comments x

67− where

68− toSourcePos pos = SourcePos (P.sourceLine pos) (P.sourceColumn pos)

70kindedIdent :: TokenParser (String, Maybe Kind)

68kindedIdent :: TokenParser (String, Maybe Kind)

71kindedIdent = (, Nothing) <$> identifier

69kindedIdent = (, Nothing) <$> identifier

@@ -287,8 +285,6 @@ parseModule = do

287 end <- P.getPosition

285 end <- P.getPosition

288 let ss = SourceSpan (P.sourceName start) (toSourcePos start) (toSourcePos end)

286 let ss = SourceSpan (P.sourceName start) (toSourcePos start) (toSourcePos end)

289 return $ Module ss comments name decls exports

287 return $ Module ss comments name decls exports

290− where

291− toSourcePos pos = SourcePos (P.sourceLine pos) (P.sourceColumn pos)

292

288

293-- |

289-- |

294-- Parse a collection of modules

290-- Parse a collection of modules

@@ -304,10 +300,20 @@ parseModulesFromFiles toFilePath input = do

304 return $ collect modules

300 return $ collect modules

305 where

301 where

306 wrapError :: Either P.ParseError a -> m a

302 wrapError :: Either P.ParseError a -> m a

307− wrapError = either (throwError . errorMessage . ErrorParsingModule) return

303+ wrapError = either (throwError . MultipleErrors . pure . toPositionedError) return

308 collect :: [(k, [v])] -> [(k, v)]

304 collect :: [(k, [v])] -> [(k, v)]

309 collect vss = [ (k, v) | (k, vs) <- vss, v <- vs ]

305 collect vss = [ (k, v) | (k, vs) <- vss, v <- vs ]

310

306

307+toPositionedError :: P.ParseError -> ErrorMessage

308+toPositionedError perr = PositionedError (SourceSpan name start end) (SimpleErrorWrapper (ErrorParsingModule perr))

309+ where

310+ name = (P.sourceName . P.errorPos) perr

311+ start = (toSourcePos . P.errorPos) perr

312+ end = start

313+

314+toSourcePos :: P.SourcePos -> SourcePos

315+toSourcePos pos = SourcePos (P.sourceLine pos) (P.sourceColumn pos)

316+

311-- |

317-- |

312-- Parse a collection of modules

318-- Parse a collection of modules

313--

319--