Adding function 'calcline' to relabel and updating documentation/examples

5 files changed, 49 insertions, 94 deletions

diff --git a/examples/listId1.lua b/examples/listId1.lua
index 12c0678..8976f5f 100644
--- a/examples/listId1.lua
+++ b/examples/listId1.lua
@@ -1,11 +1,5 @@
 local m = require'lpeglabel'
-
-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 re = require'relabel'
 
 local g = m.P{
   "S",
@@ -19,7 +13,7 @@ local g = m.P{
 function mymatch (g, s)
   local r, e, sfail = g:match(s)
   if not r then
-    local line, col = calcline(s, #s - #sfail)
+    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 .. "'"
@@ -35,4 +29,3 @@ end
 print(mymatch(g, "one,two"))
 print(mymatch(g, "one two"))
 print(mymatch(g, "one,\n two,\nthree,"))
-
diff --git a/examples/listId2.lua b/examples/listId2.lua
index 48157f1..509fda4 100644
--- a/examples/listId2.lua
+++ b/examples/listId2.lua
@@ -1,42 +1,36 @@
 local m = require'lpeglabel'
+local re = require'relabel'
 
 local terror = {}
 
 local function newError(s)
-        table.insert(terror, s)
-        return #terror
+  table.insert(terror, s)
+  return #terror
 end
 
 local errUndef = newError("undefined")
 local errId = newError("expecting an identifier")
 local errComma = newError("expecting ','")
 
-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 = m.P{
   "S",
   S = m.V"Id" * m.V"List",
   List = -m.P(1) + (m.V"Comma" + m.T(errComma)) * (m.V"Id" + m.T(errId)) * m.V"List",
   Id = m.V"Sp" * m.R'az'^1,
-        Comma = m.V"Sp" * ",",
-        Sp = m.S" \n\t"^0,
+  Comma = m.V"Sp" * ",",
+  Sp = m.S" \n\t"^0,
 }
 
 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 .. "): "
-                return r, msg .. terror[e] .. " before '" .. sfail .. "'"
-        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 .. "): "
+    return r, msg .. terror[e] .. " before '" .. sfail .. "'"
+  end
+  return r
 end
-        
+  
 print(mymatch(g, "one,two"))
 print(mymatch(g, "one two"))
 print(mymatch(g, "one,\n two,\nthree,"))
diff --git a/examples/listIdCatch.lua b/examples/listIdCatch.lua
index 3cbc834..5ad6f2d 100644
--- a/examples/listIdCatch.lua
+++ b/examples/listIdCatch.lua
@@ -3,43 +3,26 @@ local m = require'lpeglabel'
 local terror = {}
 
 local function newError(s)
-        table.insert(terror, s)
-        return #terror
+  table.insert(terror, s)
+  return #terror
 end
 
 local errUndef = newError("undefined")
 local errId = newError("expecting an identifier")
 local errComma = newError("expecting ','")
 
-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 = m.P{
   "S",
   S = m.Lc(m.Lc(m.V"Id" * m.V"List", m.V"ErrId", errId),
            m.V"ErrComma", errComma),
   List = -m.P(1) + (m.V"Comma" + m.T(errComma)) * (m.V"Id" + m.T(errId)) * m.V"List",
   Id = m.V"Sp" * m.R'az'^1,
-        Comma = m.V"Sp" * ",",
-        Sp = m.S" \n\t"^0,
-        ErrId = m.Cc(errId) / terror,
-        ErrComma = m.Cc(errComma) / terror
+  Comma = m.V"Sp" * ",",
+  Sp = m.S" \n\t"^0,
+  ErrId = m.Cc(errId) / terror,
+  ErrComma = m.Cc(errComma) / terror
 }
 
-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 .. "): "
-                return r, msg .. terror[e] .. " before '" .. sfail .. "'"
-        end
-        return r
-end
-
-print(mymatch(g, "one,two"))
-print(mymatch(g, "one two"))
-print(mymatch(g, "one,\n two,\nthree,"))
+print(m.match(g, "one,two"))
+print(m.match(g, "one two"))
+print(m.match(g, "one,\n two,\nthree,"))
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"))
diff --git a/examples/listIdRe2.lua b/examples/listIdRe2.lua
index ccb7ce5..fe30535 100644
--- a/examples/listIdRe2.lua
+++ b/examples/listIdRe2.lua
@@ -1,9 +1,9 @@
 local re = require 'relabel' 
 
 local errinfo = {
-        {"errUndef",  "undefined"},
-        {"errId",     "expecting an identifier"},
-        {"errComma",  "expecting ','"},
+  {"errUndef",  "undefined"},
+  {"errId",     "expecting an identifier"},
+  {"errComma",  "expecting ','"},
 }
 
 local errmsgs = {}
@@ -16,30 +16,22 @@ end
 
 re.setlabels(labels)
 
-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   <- !.  /  (',' /       %{errComma}) (Id / %{errId}) List
+  List   <- !.  /  (',' /  %{errComma}) (Id / %{errId}) 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 .. "): "
-                return r, msg .. errmsgs[e] .. " before '" .. sfail .. "'"
-        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 .. "): "
+    return r, msg .. errmsgs[e] .. " before '" .. sfail .. "'"
+  end
+  return r
 end
 
 print(mymatch(g, "one,two"))