1 files changed, 14 insertions, 21 deletions

diff --git a/examples/listIdRe1.lua b/examples/listIdRe1.lua
index 361e53f..d092566 100644
--- a/examples/listIdRe1.lua
+++ b/examples/listIdRe1.lua
@@ -1,34 +1,27 @@
 local re = require 'relabel' 
 
-local function calcline (s, i)
-  if i == 1 then return 1, 1 end
-  local rest, line = s:sub(1,i):gsub("[^\n]*\n", "")
-  local col = #rest
-  return 1 + line, col ~= 0 and col or 1
-end
-
 local g = re.compile[[
   S      <- Id List
-  List   <- !.  /  (',' /       %{2}) (Id / %{1}) List
+  List   <- !.  /  (',' /  %{2}) (Id / %{1}) List
   Id     <- Sp [a-z]+
   Comma  <- Sp ','
   Sp     <- %s*
 ]]
 
 function mymatch (g, s)
-        local r, e, sfail = g:match(s)
-        if not r then
-                local line, col = calcline(s, #s - #sfail)
-                local msg = "Error at line " .. line .. " (col " .. col .. ")"
-                if e == 1 then
-        return r, msg .. ": expecting an identifier before '" .. sfail .. "'"
-        elseif e == 2 then
-        return r, msg .. ": expecting ',' before '" .. sfail .. "'"
-        else
-        return r, msg
-        end
-        end
-        return r
+  local r, e, sfail = g:match(s)
+  if not r then
+    local line, col = re.calcline(s, #s - #sfail)
+    local msg = "Error at line " .. line .. " (col " .. col .. ")"
+    if e == 1 then
+      return r, msg .. ": expecting an identifier before '" .. sfail .. "'"
+    elseif e == 2 then
+      return r, msg .. ": expecting ',' before '" .. sfail .. "'"
+    else
+      return r, msg
+    end
+  end
+  return r
 end
 
 print(mymatch(g, "one,two"))