Improving error reporting on end of lines

2 files changed, 7 insertions, 1 deletions

diff --git a/relabel.lua b/relabel.lua
index b0a6efc..797e094 100644
--- a/relabel.lua
+++ b/relabel.lua
@@ -347,9 +347,14 @@ local pattern = S * m.Cg(m.Cc(false), "G") * expect(exp, "NoPatt") / mm.P
 
 local function lineno (s, i)
   if i == 1 then return 1, 1 end
+  local adjust = 0
+  if s:sub(i,i) == '\n' then
+    i = i-1
+    adjust = 1 
+  end
   local rest, num = s:sub(1,i):gsub("[^\n]*\n", "")
   local r = #rest
-  return 1 + num, r ~= 0 and r or 1
+  return 1 + num, (r ~= 0 and r or 1) + adjust
 end
 
 local function compile (p, defs)
diff --git a/testerrors.lua b/testerrors.lua
index fbf5cc9..6e9c83e 100644
--- a/testerrors.lua
+++ b/testerrors.lua
@@ -148,6 +148,7 @@ local patterns = {
   ]],
   [[
     A <- 'A' /{'lab'} B / !
+    
     B <- %{1, 2 3} 'b' / '6' & / 'B'
   ]]
 }