Updating the examples since lpeglabel now returns an error position instead of a string and p^lab is syntatic sugar

6 files changed, 34 insertions, 21 deletions

diff --git a/examples/farthest.lua b/examples/farthest.lua
index 692390f..9cbe03d 100644
--- a/examples/farthest.lua
+++ b/examples/farthest.lua
@@ -1,14 +1,27 @@
 local m = require'lpeglabel'
 
 function matchPrint(p, s)
-        local r, lab, sfail = p:match(s)
-        print("r: ", r, "lab: ", lab, "sfail: ", sfail)
+        local r, lab, errpos = p:match(s)
+        print("r: ", r, "lab: ", lab, "errpos: ", errpos)
+end
+
+function getSub (s, i)
+        if i then return s:sub(i) else return nil end
+end
+
+function matchPrint2(p, s)
+        local r, lab, ifail = p:match(s)
+        print("r: ", r, "lab: ", lab, "sfail: ", getSub(s, ifail))
 end
 
 local p = m.P"a"^0 * m.P"b" + m.P"c"
-matchPrint(p, "abc")  --> r:    3       lab:    nil     sfail:  nil
-matchPrint(p, "c")    --> r:    2       lab:    nil     sfail:  nil
-matchPrint(p, "aac")  --> r:    nil     lab:    0       sfail:  c
-matchPrint(p, "xxc")  --> r:    nil     lab:    0       sfail:  xxc
+matchPrint(p, "abc")  --> r: 3    lab: nil  errpos: nil
+matchPrint(p, "c")    --> r: 2    lab: nil  errpos: nil
+matchPrint(p, "aac")  --> r: nil        lab: 0    errpos: 3
+matchPrint(p, "xxc")  --> r: nil        lab: 0    errpos: 1
 
 
+matchPrint2(p, "abc")  --> r:   3       lab:    nil     sfail:  nil
+matchPrint2(p, "c")    --> r:   2       lab:    nil     sfail:  nil
+matchPrint2(p, "aac")  --> r:   nil     lab:    0       sfail:  c
+matchPrint2(p, "xxc")  --> r:   nil     lab:    0       sfail:  xxc
diff --git a/examples/listId1.lua b/examples/listId1.lua
index b7943c1..9bba783 100644
--- a/examples/listId1.lua
+++ b/examples/listId1.lua
@@ -13,14 +13,14 @@ local g = m.P{
 }
 
 function mymatch (g, s)
-  local r, e, sfail = g:match(s)
+  local r, e, pos = g:match(s)
   if not r then
-    local line, col = re.calcline(s, #s - #sfail)
+    local line, col = re.calcline(s, pos)
     local msg = "Error at line " .. line .. " (col " .. col .. ")"
     if e == 1 then
-      return r, msg .. ": expecting an identifier before '" .. sfail .. "'"
+      return r, msg .. ": expecting an identifier before '" .. s:sub(pos) .. "'"
     elseif e == 2 then
-      return r, msg .. ": expecting ',' before '" .. sfail .. "'"
+      return r, msg .. ": expecting ',' before '" .. s:sub(pos) .. "'"
     else
       return r, msg
     end
diff --git a/examples/listId2.lua b/examples/listId2.lua
index 3ee89da..592dae3 100644
--- a/examples/listId2.lua
+++ b/examples/listId2.lua
@@ -25,11 +25,11 @@ local g = m.P{
 
 
 function mymatch (g, s)
-  local r, e, sfail = g:match(s)
+  local r, e, pos = g:match(s)
   if not r then
-    local line, col = re.calcline(s, #s - #sfail)
+    local line, col = re.calcline(s, pos)
     local msg = "Error at line " .. line .. " (col " .. col .. "): "
-    return r, msg .. terror[e] .. " before '" .. sfail .. "'"
+    return r, msg .. terror[e] .. " before '" .. s:sub(pos) .. "'"
   end
   return r
 end
diff --git a/examples/listIdRe1.lua b/examples/listIdRe1.lua
index 3098c66..d60706a 100644
--- a/examples/listIdRe1.lua
+++ b/examples/listIdRe1.lua
@@ -9,14 +9,14 @@ local g = re.compile[[
 ]]
 
 function mymatch (g, s)
-  local r, e, sfail = g:match(s)
+  local r, e, pos = g:match(s)
   if not r then
-    local line, col = re.calcline(s, #s - #sfail)
+    local line, col = re.calcline(s, pos)
     local msg = "Error at line " .. line .. " (col " .. col .. ")"
     if e == 1 then
-      return r, msg .. ": expecting an identifier before '" .. sfail .. "'"
+      return r, msg .. ": expecting an identifier before '" .. s:sub(pos) .. "'"
     elseif e == 2 then
-      return r, msg .. ": expecting ',' before '" .. sfail .. "'"
+      return r, msg .. ": expecting ',' before '" .. s:sub(pos) .. "'"
     else
       return r, msg
     end
diff --git a/examples/tiny.lua b/examples/tiny.lua
index 734536c..cc718e7 100644
--- a/examples/tiny.lua
+++ b/examples/tiny.lua
@@ -90,9 +90,9 @@ local g = re.compile[[
 
 
 local function mymatch(g, s)
-        local r, e, sfail = g:match(s)
+        local r, e, pos = g:match(s)
   if not r then
-    local line, col = re.calcline(s, #s - #sfail)
+    local line, col = re.calcline(s, pos)
     local msg = "Error at line " .. line .. " (col " .. col .. "): "
                 return r, msg .. terror[e].msg
         end 
diff --git a/examples/typedlua/tlparser.lua b/examples/typedlua/tlparser.lua
index a301fa6..2ede2eb 100644
--- a/examples/typedlua/tlparser.lua
+++ b/examples/typedlua/tlparser.lua
@@ -226,9 +226,9 @@ end
 function tlparser.parse (subject, filename, strict, integer)
   local errorinfo = {}
   lpeg.setmaxstack(1000)
-  local ast, label, suffix = lpeg.match(G, subject, nil, errorinfo, strict, integer)
+  local ast, label, pos = lpeg.match(G, subject, nil, errorinfo, strict, integer)
   if not ast then
-    local line, col = lineno(subject, string.len(subject) - string.len(suffix))
+    local line, col = lineno(subject, pos)
     local error_msg = string.format("%s:%d:%d: ", filename, line, col)
     if label ~= 0 then
       error_msg = error_msg .. tlerror.errors[label].msg