c1fe331 · rowtype-yoga/purescript-native

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

Merge pull request #1037 from hdgarrood/srclocs-show

Better Show instance for SourcePos/SourceSpan

commitc1fe3314e6bed7b6e41cddc90bfc2c91ce1d58ec authorPhil Freeman <paf31@cantab.net> dateTue 7 Apr 2015, 13:45 (12 years ago) parent062b5a5 18bd86b

2 files changed+12−7

compare with golang

unifiedsplit

src/Language/PureScript/AST/SourcePos.hs+11−6 src/Language/PureScript/Errors.hs+1−1

src/Language/PureScript/AST/SourcePos.hs+11−6

@@ -30,10 +30,12 @@ data SourcePos = SourcePos

3030 -- Column number

3131 --

3232 , sourcePosColumn :: Int

33− } deriving (Eq, D.Data, D.Typeable)

33+ } deriving (Eq, Show, D.Data, D.Typeable)

3434

35−instance Show SourcePos where

36− show sp = "line " ++ show (sourcePosLine sp) ++ ", column " ++ show (sourcePosColumn sp)

35+displaySourcePos :: SourcePos -> String

36+displaySourcePos sp =

37+ "line " ++ show (sourcePosLine sp) ++

38+ ", column " ++ show (sourcePosColumn sp)

3739

3840data SourceSpan = SourceSpan

3941 { -- |

@@ -47,7 +49,10 @@ data SourceSpan = SourceSpan

4749 -- End of the span

4850 --

4951 , spanEnd :: SourcePos

50− } deriving (Eq, D.Data, D.Typeable)

52+ } deriving (Eq, Show, D.Data, D.Typeable)

5153

52−instance Show SourceSpan where

53− show sp = spanName sp ++ " " ++ show (spanStart sp) ++ " - " ++ show (spanEnd sp)

54+displaySourceSpan :: SourceSpan -> String

55+displaySourceSpan sp =

56+ spanName sp ++ " " ++

57+ displaySourcePos (spanStart sp) ++ " - " ++

58+ displaySourcePos (spanEnd sp)

src/Language/PureScript/Errors.hs+1−1

@@ -439,7 +439,7 @@ prettyPrintSingleError full e = prettyPrintErrorMessage (if full then e else sim

439439 go (ErrorInForeignImport nm err) = paras [ line $ "Error in foreign import " ++ show nm ++ ":"

440440 , go err

441441 ]

442− go (PositionedError pos err) = paras [ line $ "Error at " ++ show pos ++ ":"

442+ go (PositionedError span err) = paras [ line $ "Error at " ++ displaySourceSpan span ++ ":"

443443 , indent $ go err

444444 ]

445445