git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Do not show file name in pattern match errors.
43623fenicodelpiano
src/Language/PureScript/AST/SourcePos.hs+6−2
compare with golang
unifiedsplit
@@ -57,11 +57,15 @@ data SourceSpan = SourceSpan
57 , spanEnd :: SourcePos
57 , spanEnd :: SourcePos
58 } deriving (Eq, Ord, Show, D.Data, D.Typeable)
58 } deriving (Eq, Ord, Show, D.Data, D.Typeable)
59
59
60+displayStartEndPos :: SourceSpan -> String
61+displayStartEndPos sp =
62+ displaySourcePos (spanStart sp) ++ " - " ++
63+ displaySourcePos (spanEnd sp)
64+
60displaySourceSpan :: SourceSpan -> String
65displaySourceSpan :: SourceSpan -> String
61displaySourceSpan sp =
66displaySourceSpan sp =
62 spanName sp ++ " " ++
67 spanName sp ++ " " ++
63− displaySourcePos (spanStart sp) ++ " - " ++
68+ displayStartEndPos sp
64− displaySourcePos (spanEnd sp)
65
69
66instance A.ToJSON SourceSpan where
70instance A.ToJSON SourceSpan where
67 toJSON SourceSpan{..} =
71 toJSON SourceSpan{..} =
src/Language/PureScript/CodeGen/JS.hs+1−1
@@ -274,7 +274,7 @@ moduleToJs (Module coms mn imps exps foreigns decls) foreign = do
274 failedPatternError names = JSUnary JSNew $ JSApp (JSVar "Error") [JSBinary Add (JSStringLiteral errorMessage) (JSArrayLiteral $ zipWith valueError names vals)]
274 failedPatternError names = JSUnary JSNew $ JSApp (JSVar "Error") [JSBinary Add (JSStringLiteral errorMessage) (JSArrayLiteral $ zipWith valueError names vals)]
275
275
276 errorMessage :: String
276 errorMessage :: String
277− errorMessage = "Failed pattern match" ++ maybe "" ((" at " ++) . displaySourceSpan) maybeSpan ++ ": "
277+ errorMessage = "Failed pattern match" ++ maybe "" (((" at " ++ runModuleName mn ++ " ") ++) . displayStartEndPos) maybeSpan ++ ": "
278
278
279 valueError :: String -> JS -> JS
279 valueError :: String -> JS -> JS
280 valueError _ l@(JSNumericLiteral _) = l
280 valueError _ l@(JSNumericLiteral _) = l