replace '@l:c' with '(line l, col c)'

Author: safareli

src/Data/Formatter/Parser/Utils.purs

@@ -21,7 +21,7 @@ runP ∷ ∀ s a. PS.StringLike s ⇒ Parser s a → s → Either String a
 runP p s = lmap printError $ runParser s (p <* PS.eof)
 
 printError ∷ ParseError → String
-printError err = parseErrorMessage err  <> "@" <> (printPosition $ parseErrorPosition err)
+printError err = parseErrorMessage err  <> " " <> (printPosition $ parseErrorPosition err)
 
 printPosition ∷ Position → String
-printPosition (Position {line, column}) = show line <> ":" <> show column
+printPosition (Position {line, column}) = "(line " <> show line <> ", col " <>show column <> ")"

test/src/DateTime.purs

@@ -52,7 +52,7 @@ datetimeTest = describe "Data.Formatter.DateTime" do
 
   describe "hour 24" do
     it "24 hour and more then 0 time component" $ do
-      let err = (Left "When hour is 24, other time components must be 0@1:24")
+      let err = (Left "When hour is 24, other time components must be 0 (line 1, col 24)")
       shouldEqual (FDT.unformatDateTime "YYYY-DD-MM HH:mm:ss:SSS" "0000-01-01 24:00:00:001") err
       shouldEqual (FDT.unformatDateTime "YYYY-DD-MM HH:mm:ss:SSS" "0000-01-01 24:00:01:000") err
       shouldEqual (FDT.unformatDateTime "YYYY-DD-MM HH:mm:ss:SSS" "0000-01-01 24:01:00:000") err
@@ -79,7 +79,7 @@ datetimeTest = describe "Data.Formatter.DateTime" do
       _.str
      "shouldn't parse"
       invalidDateformats
-      (\f → (FDT.parseFormatString f.str) `shouldEqual` (Left $ "Expected EOF@" <> f.pos))
+      (\f → (FDT.parseFormatString f.str) `shouldEqual` (Left $ "Expected EOF " <> f.pos))
 
   forAll
     (\a → a.format <> " | " <> a.date)
@@ -116,9 +116,9 @@ dates =
 
 invalidDateformats ∷ Array { str ∷ String , pos ∷ String }
 invalidDateformats =
-  [ { str: "YY-h-dddd HH:mm Z", pos: "1:4" }
-  , { str: "YYYY-MM-DD M", pos: "1:12" }
-  , { str: "YYYYM", pos: "1:5" }
+  [ { str: "YY-h-dddd HH:mm Z", pos: "(line 1, col 4)" }
+  , { str: "YYYY-MM-DD M", pos: "(line 1, col 12)" }
+  , { str: "YYYYM", pos: "(line 1, col 5)" }
   ]
 
 dateformats ∷ Array { str ∷ String , lossless ∷ Boolean, format ∷ FDT.Formatter }

test/src/Interval.purs

@@ -59,50 +59,50 @@ durations =
 
 invalidDurations ∷ Array { err ∷ String, str ∷ String}
 invalidDurations =
-  [ { err: errInvalidISO "Hour" <> "1:13", str: "P1DT1.5H0M1S" }
-  , { err: errInvalidISO "Year" <> "1:10", str: "P1.5Y0.5M" }
-  , { err: errInvalidISO "Year" <> "1:8", str: "P1.5Y1M" }
-  , { err: errInvalidISO "Month" <> "1:12", str: "P1.5MT10.5S" }
-  , { err: errInvalidComponent <> "1:2", str: "P" }
-  , { err: errInvalidComponent <> "1:2", str: "PW" }
-  , { err: errInvalidComponent <> "1:2", str: "PD" }
-  , { err: errNoTimeComponent <> "1:3", str: "PT" }
-  , { err: errNoTimeComponent <> "1:3", str: "PTH" }
-  , { err: errNoTimeComponent <> "1:5", str: "P1YT" }
-  , { err: errPrefix <> "1:1", str: "" }
-  , { err: errPrefix <> "1:1", str: "T" }
-  , { err: errPrefix <> "1:1", str: "~P1Y" }
-  , { err: errPrefix <> "1:1", str: ".P1Y" }
-  , { err: errEOF <> "1:4", str: "P1Y1W" }
+  [ { err: errInvalidISO "Hour" <> "(line 1, col 13)", str: "P1DT1.5H0M1S" }
+  , { err: errInvalidISO "Year" <> "(line 1, col 10)", str: "P1.5Y0.5M" }
+  , { err: errInvalidISO "Year" <> "(line 1, col 8)", str: "P1.5Y1M" }
+  , { err: errInvalidISO "Month" <> "(line 1, col 12)", str: "P1.5MT10.5S" }
+  , { err: errInvalidComponent <> "(line 1, col 2)", str: "P" }
+  , { err: errInvalidComponent <> "(line 1, col 2)", str: "PW" }
+  , { err: errInvalidComponent <> "(line 1, col 2)", str: "PD" }
+  , { err: errNoTimeComponent <> "(line 1, col 3)", str: "PT" }
+  , { err: errNoTimeComponent <> "(line 1, col 3)", str: "PTH" }
+  , { err: errNoTimeComponent <> "(line 1, col 5)", str: "P1YT" }
+  , { err: errPrefix <> "(line 1, col 1)", str: "" }
+  , { err: errPrefix <> "(line 1, col 1)", str: "T" }
+  , { err: errPrefix <> "(line 1, col 1)", str: "~P1Y" }
+  , { err: errPrefix <> "(line 1, col 1)", str: ".P1Y" }
+  , { err: errEOF <> "(line 1, col 4)", str: "P1Y1W" }
   ]
   where
-  errInvalidComponent = "Must contain valid duration components@"
-  errPrefix = "Expected \"P\"@"
-  errEOF = "Expected EOF@"
+  errInvalidComponent = "Must contain valid duration components "
+  errPrefix = "Expected \"P\" "
+  errEOF = "Expected EOF "
   errInvalidISO c =
     "Extracted Duration is not valid ISO duration " <>
-    "(Invalid usage of Fractional value at component `" <> c <> "`)@"
-  errNoTimeComponent = "None of valid duration components ([\"H\",\"M\",\"S\"]) were present@"
+    "(Invalid usage of Fractional value at component `" <> c <> "`) "
+  errNoTimeComponent = "None of valid duration components ([\"H\",\"M\",\"S\"]) were present "
 
 invalidIntervals ∷ Array {err ∷ String, str ∷ String}
 invalidIntervals =
-  [ { err: "Expected \"P\"@1:1", str: "2007-03-01T13:00:00ZP1Y2M10DT2H30M" }
-  , { err: "Expected \"P\"@1:1", str: "2007-03-01T13:00:00Z-P1Y2M10D" }
-  , { err: "Expected \"P\"@1:1", str: "2007-03-01T13:00:00Z~P1Y2M10D" }
-  , { err: "Expected EOF@1:15", str: "P1Y2M10DT2H30M2007-03-01T13:00:00Z" }
-  , { err: "Expected EOF@1:9", str: "P1Y2M10D-2007-03-01T13:00:00Z" }
-  , { err: "Expected EOF@1:9", str: "P1Y2M10D~2007-03-01T13:00:00Z" }
-  , { err: "Expected \"P\"@1:1", str: "2007-03-01T13:00:00Z2008-05-11T15:30:00Z" }
-  , { err: "Expected \"P\"@1:1", str: "2007-03-01T13:00:00Z-2008-05-11T15:30:00Z" }
-  , { err: "Expected \"P\"@1:1", str: "2007-03-01T13:00:00Z~2008-05-11T15:30:00Z" }
-  , { err: "Expected \"P\"@1:1", str: "2007-03-01T13:00:00Z/" }
-  , { err: "Expected \"P\"@1:1", str: "2007-03-01T13:00:00Z/P" }
-  , { err: "Expected \"P\"@1:1", str: "2007-03-01T13:00:00Z/PT" }
-  , { err: "Expected \"P\"@1:1", str: "2007-03-01T13:00:00Z/2010-0-09" }
-  , { err: "Expected \"P\"@1:1", str: "2007-03-01T13:00:00Z/2010-05-09T103012+0400" }
-  , { err: "Expected \"P\"@1:1", str: "2007-03-01T13:00:00Z/2014-W15-02T10:11:12Z" }
-  , { err: "Expected EOF@1:9", str: "P1Y2M10D/P1Y2M10D" }
-  , { err: "Expected EOF@1:8", str: "P1Y0.5M/P1Y0.5M" }
+  [ { err: "Expected \"P\" (line 1, col 1)", str: "2007-03-01T13:00:00ZP1Y2M10DT2H30M" }
+  , { err: "Expected \"P\" (line 1, col 1)", str: "2007-03-01T13:00:00Z-P1Y2M10D" }
+  , { err: "Expected \"P\" (line 1, col 1)", str: "2007-03-01T13:00:00Z~P1Y2M10D" }
+  , { err: "Expected EOF (line 1, col 15)", str: "P1Y2M10DT2H30M2007-03-01T13:00:00Z" }
+  , { err: "Expected EOF (line 1, col 9)", str: "P1Y2M10D-2007-03-01T13:00:00Z" }
+  , { err: "Expected EOF (line 1, col 9)", str: "P1Y2M10D~2007-03-01T13:00:00Z" }
+  , { err: "Expected \"P\" (line 1, col 1)", str: "2007-03-01T13:00:00Z2008-05-11T15:30:00Z" }
+  , { err: "Expected \"P\" (line 1, col 1)", str: "2007-03-01T13:00:00Z-2008-05-11T15:30:00Z" }
+  , { err: "Expected \"P\" (line 1, col 1)", str: "2007-03-01T13:00:00Z~2008-05-11T15:30:00Z" }
+  , { err: "Expected \"P\" (line 1, col 1)", str: "2007-03-01T13:00:00Z/" }
+  , { err: "Expected \"P\" (line 1, col 1)", str: "2007-03-01T13:00:00Z/P" }
+  , { err: "Expected \"P\" (line 1, col 1)", str: "2007-03-01T13:00:00Z/PT" }
+  , { err: "Expected \"P\" (line 1, col 1)", str: "2007-03-01T13:00:00Z/2010-0-09" }
+  , { err: "Expected \"P\" (line 1, col 1)", str: "2007-03-01T13:00:00Z/2010-05-09T103012+0400" }
+  , { err: "Expected \"P\" (line 1, col 1)", str: "2007-03-01T13:00:00Z/2014-W15-02T10:11:12Z" }
+  , { err: "Expected EOF (line 1, col 9)", str: "P1Y2M10D/P1Y2M10D" }
+  , { err: "Expected EOF (line 1, col 8)", str: "P1Y0.5M/P1Y0.5M" }
   ]
 
 recurrences ∷ Array { str ∷ String, rec ∷ Maybe Int }