@@ -52,7 +52,6 @@ import qualified Text.Parsec as P
52data SimpleErrorMessage
52data SimpleErrorMessage
53 = ErrorParsingExterns P.ParseError
53 = ErrorParsingExterns P.ParseError
54 | ErrorParsingFFIModule FilePath
54 | ErrorParsingFFIModule FilePath
55− | ErrorParsingPrelude P.ParseError
56 | ErrorParsingModule P.ParseError
55 | ErrorParsingModule P.ParseError
57 | MissingFFIModule ModuleName
56 | MissingFFIModule ModuleName
58 | MultipleFFIModules ModuleName [FilePath]
57 | MultipleFFIModules ModuleName [FilePath]
@@ -120,7 +119,6 @@ data SimpleErrorMessage
120 | TransitiveExportError DeclarationRef [DeclarationRef]
119 | TransitiveExportError DeclarationRef [DeclarationRef]
121 | ShadowedName Ident
120 | ShadowedName Ident
122 | WildcardInferredType Type
121 | WildcardInferredType Type
124 deriving (Show)
122 deriving (Show)
@@ -161,7 +159,6 @@ errorCode :: ErrorMessage -> String
161errorCode em = case unwrapErrorMessage em of
159errorCode em = case unwrapErrorMessage em of
162 (ErrorParsingExterns _) -> "ErrorParsingExterns"
160 (ErrorParsingExterns _) -> "ErrorParsingExterns"
163 (ErrorParsingFFIModule _) -> "ErrorParsingFFIModule"
161 (ErrorParsingFFIModule _) -> "ErrorParsingFFIModule"
164− (ErrorParsingPrelude _) -> "ErrorParsingPrelude"
165 (ErrorParsingModule _) -> "ErrorParsingModule"
162 (ErrorParsingModule _) -> "ErrorParsingModule"
166 MissingFFIModule{} -> "MissingFFIModule"
163 MissingFFIModule{} -> "MissingFFIModule"
167 MultipleFFIModules{} -> "MultipleFFIModules"
164 MultipleFFIModules{} -> "MultipleFFIModules"
@@ -229,7 +226,6 @@ errorCode em = case unwrapErrorMessage em of
229 (TransitiveExportError _ _) -> "TransitiveExportError"
226 (TransitiveExportError _ _) -> "TransitiveExportError"
230 (ShadowedName _) -> "ShadowedName"
227 (ShadowedName _) -> "ShadowedName"
231 (WildcardInferredType _) -> "WildcardInferredType"
228 (WildcardInferredType _) -> "WildcardInferredType"
232− PreludeNotPresent -> "PreludeNotPresent"
235-- A stack trace for an error
231-- A stack trace for an error
@@ -393,10 +389,6 @@ prettyPrintSingleError full e = prettyPrintErrorMessage <$> onTypesInErrorMessag
393 goSimple (MultipleFFIModules mn paths) =
389 goSimple (MultipleFFIModules mn paths) =
394 paras $ [ line $ "Multiple FFI implementations have been provided for module " ++ show mn ++ ": " ]
390 paras $ [ line $ "Multiple FFI implementations have been provided for module " ++ show mn ++ ": " ]
395 ++ map (indent . line) paths
391 ++ map (indent . line) paths
396− goSimple (ErrorParsingPrelude err) =
397− paras [ line "Error parsing prelude: "
398− , indent . line . show $ err
400 goSimple (InvalidExternsFile path) =
392 goSimple (InvalidExternsFile path) =
401 paras [ line "Externs file is invalid: "
393 paras [ line "Externs file is invalid: "
402 , indent . line $ path
394 , indent . line $ path
@@ -553,10 +545,6 @@ prettyPrintSingleError full e = prettyPrintErrorMessage <$> onTypesInErrorMessag
553 line $ "Name '" ++ show nm ++ "' was shadowed."
545 line $ "Name '" ++ show nm ++ "' was shadowed."
554 goSimple (WildcardInferredType ty) =
546 goSimple (WildcardInferredType ty) =
555 line $ "The wildcard type definition has the inferred type " ++ prettyPrintType ty
547 line $ "The wildcard type definition has the inferred type " ++ prettyPrintType ty
556− goSimple PreludeNotPresent =
557− paras [ line $ "There is no Prelude module loaded, and the --no-prelude option was not specified."
558− , line $ "You probably need to install the Prelude and other dependencies using Bower."
560 go (NotYetDefined names err) =
548 go (NotYetDefined names err) =
561 paras [ line $ "The following are not yet defined here: " ++ intercalate ", " (map show names) ++ ":"
549 paras [ line $ "The following are not yet defined here: " ++ intercalate ", " (map show names) ++ ":"
562 , indent $ go err
550 , indent $ go err