Updating examples to use the recovery operator

3 files changed, 43 insertions, 41 deletions

diff --git a/examples/listId2Rec2.lua b/examples/listId2Rec2.lua
index a347a5b..ab8f1dd 100644
--- a/examples/listId2Rec2.lua
+++ b/examples/listId2Rec2.lua
@@ -41,8 +41,8 @@ end
 local grec = m.P{
   "S",
   S = m.Rec(m.Rec(g, m.V"ErrComma", errComma), m.V"ErrId", errId),
-  ErrComma = record(errComma) * sync(-m.P(1) + id),
-        ErrId = record(errId) * sync(-m.P(1) + ",")
+  ErrComma = record(errComma) * sync(id),
+        ErrId = record(errId) * sync(m.P",")
 }
 
 
diff --git a/examples/listId2Rec2Cap.lua b/examples/listId2Rec2Cap.lua
index f9fc2bd..1c22c88 100644
--- a/examples/listId2Rec2Cap.lua
+++ b/examples/listId2Rec2Cap.lua
@@ -45,8 +45,8 @@ end
 local grec = m.P{
   "S",
   S = m.Rec(m.Rec(g, m.V"ErrComma", errComma), m.V"ErrId", errId),
-  ErrComma = record(errComma) * sync(-m.P(1) + id),
-        ErrId = record(errId) * sync(-m.P(1) + ",") * defaultValue() 
+  ErrComma = record(errComma) * sync(id),
+        ErrId = record(errId) * sync(m.P",") * defaultValue(), 
 }
 
 
diff --git a/examples/recoveryFabio.lua b/examples/recoveryRecCap.lua
index f16c9e7..c1b3a53 100644
--- a/examples/recoveryFabio.lua
+++ b/examples/recoveryRecCap.lua
@@ -1,14 +1,13 @@
-local lpeg = require"lpeglabelrec"
+local m = require"lpeglabelrec"
+local re = require"relabelrec"
 
-local R, S, P, V = lpeg.R, lpeg.S, lpeg.P, lpeg.V
-local C, Cc, Ct, Cmt = lpeg.C, lpeg.Cc, lpeg.Ct, lpeg.Cmt
-local T, Rec = lpeg.T, lpeg.Rec
+local R, S, P, V = m.R, m.S, m.P, m.V
+local C, Cc, Ct, Cmt = m.C, m.Cc, m.Ct, m.Cmt
+local T, Rec = m.T, m.Rec
 
 local labels = {
-  {"NoExp",     "no expression found"},
-  {"Extra",     "extra characters found after the expression"},
-  {"ExpTerm",   "expected a term after the operator"},
-  {"ExpExp",    "expected an expression after the parenthesis"},
+  {"ExpTermFirst",  "expected an expression"},
+  {"ExpTermOp",   "expected a term after the operator"},
   {"MisClose",  "missing a closing ')' after the expression"},
 }
 
@@ -21,17 +20,14 @@ local function labelindex(labname)
   error("could not find label: " .. labname)
 end
 
-local errors = {}
+local errors, subject
 
 local function expect(patt, labname, recpatt)
   local i = labelindex(labname)
-  function recorderror(input, pos)
-    table.insert(errors, {i, pos})
-    return true
-  end
   return patt + T(i)
 end
 
+
 local num = R("09")^1 / tonumber
 local op = S("+-")
 
@@ -51,19 +47,16 @@ end
 
 local g = P {
         "Exp",
-        Exp = Ct(V"Operand" * (C(op) * V"Operand")^0) / compute,
-        Operand = expect(V"Term", "ExpTerm"),
+        Exp = Ct(V"OperandFirst" * (C(op) * V"Operand")^0) / compute,
+        OperandFirst = expect(V"Term", "ExpTermFirst"),
+        Operand = expect(V"Term", "ExpTermOp"),
         Term = num + V"Group",
-        Group = "(" *  V"InnerExp" * expect(")", "MisClose", "");
-  InnerExp = expect(V"Exp", "ExpExp", (P(1) - ")")^0 * Cc(0));
-
+        Group = "(" * V"Exp" * expect(")", "MisClose"),
 }
 
-local subject, errors
-
 function recorderror(pos, lab)
         local line, col = re.calcline(subject, pos)
-        table.insert(errors, { line = line, col = col, msg = terror[lab] })
+        table.insert(errors, { line = line, col = col, msg = labels[lab][2] })
 end
 
 function record (labname)
@@ -74,34 +67,35 @@ function sync (p)
         return (-p * m.P(1))^0
 end
 
-function defaultValue ()
-        return m.Cc"NONE" 
+function defaultValue (p)
+        return p or m.Cc(0) 
 end
 
 local recg = P {
         "S",
-        S = Rec(m.V"A", Cc(0), labelindex("ExpTerm")), -- default value is 0
-        A = Rec(m.V"B", Cc(0), labelindex("ExpExp")),
-        B = Rec(m.V"Sg", Cc(0), labelindex("InnerExp")),
-        Sg = Rec(g, Cc(0), labelindex("MisClose")),
-        ErrExpTerm = record(labelindex("ExpTerm")) * sync() * defaultValue()
+        S = Rec(V"A", V"ErrExpTermFirst", labelindex("ExpTermFirst")), -- default value is 0
+        A = Rec(V"Sg", V"ErrExpTermOp", labelindex("ExpTermOp")),
+        Sg = Rec(g, V"ErrMisClose", labelindex("MisClose")),
+        ErrExpTermFirst = record("ExpTermFirst") * sync(op + ")") * defaultValue(),
+        ErrExpTermOp = record("ExpTermOp") * sync(op + ")") * defaultValue(),
+        ErrMisClose = record("MisClose") * sync(P")") * defaultValue(m.P""),
 }
  
                 
 local function eval(input)
+        errors = {}
+        subject = input
   local result, label, suffix = recg:match(input)
-  if #errors == 0 then
-    return result
-  else
+  if #errors > 0 then
     local out = {}
     for i, err in ipairs(errors) do
-      local pos = err[2]
-      local msg = labels[err[1]][2]
+      local pos = err.col
+      local msg = err.msg
       table.insert(out, "syntax error: " .. msg .. " (at index " .. pos .. ")")
     end
-    errors = {}
-    return nil, table.concat(out, "\n")
+    print(table.concat(out, "\n"))
   end
+        return result   
 end
 
 print(eval "90-70*5")
@@ -113,7 +107,15 @@ print(eval "2+")
 print(eval "-2")
 --> 0 - 2 
 
-
 print(eval "1+3+-9")
---> 1 + 3 + 0 - 9
+--> 1 + 3 + [0] - 9
+
+print(eval "1+()3+")
+--> 1 + ([0]) [+] 3 + [0]
+
+print(eval "8-(2+)-5")
+--> 8 - (2 + [0]) - 5 
+
+print(eval "()")
 
+print(eval "")