Updating documentantion and polishing examples

4 files changed, 67 insertions, 68 deletions

diff --git a/examples/expRec.lua b/examples/expRec.lua
index c5cbcca..5c5fd7d 100644
--- a/examples/expRec.lua
+++ b/examples/expRec.lua
@@ -1,10 +1,6 @@
 local m = require"lpeglabelrec"
 local re = require"relabelrec"
 
-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 = {
   {"ExpTermFirst",  "expected an expression"},
   {"ExpTermOp",   "expected a term after the operator"},
@@ -22,14 +18,14 @@ end
 
 local errors, subject
 
-local function expect(patt, labname, recpatt)
+local function expect(patt, labname)
   local i = labelindex(labname)
-  return patt + T(i)
+  return patt + m.T(i)
 end
 
 
-local num = R("09")^1 / tonumber
-local op = S("+-")
+local num = m.R("09")^1 / tonumber
+local op = m.S("+-")
 
 local function compute(tokens)
   local result = tokens[1]
@@ -45,13 +41,13 @@ local function compute(tokens)
   return result
 end
 
-local g = P {
+local g = m.P {
         "Exp",
-        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"Exp" * expect(")", "MisClose"),
+        Exp = m.Ct(m.V"OperandFirst" * (m.C(op) * m.V"Operand")^0) / compute,
+        OperandFirst = expect(m.V"Term", "ExpTermFirst"),
+        Operand = expect(m.V"Term", "ExpTermOp"),
+        Term = num + m.V"Group",
+        Group = "(" * m.V"Exp" * expect(")", "MisClose"),
 }
 
 function recorderror(pos, lab)
@@ -71,22 +67,23 @@ function defaultValue (p)
         return p or m.Cc(1000) 
 end
 
-local recg = P {
+local grec = m.P {
         "S",
-        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")),
+        S = m.Rec(m.V"A", m.V"ErrExpTermFirst", labelindex("ExpTermFirst")), -- default value is 0
+        A = m.Rec(m.V"Sg", m.V"ErrExpTermOp", labelindex("ExpTermOp")),
+        Sg = m.Rec(g, m.V"ErrMisClose", labelindex("MisClose")),
         ErrExpTermFirst = record("ExpTermFirst") * sync(op + ")") * defaultValue(),
         ErrExpTermOp = record("ExpTermOp") * sync(op + ")") * defaultValue(),
-        ErrMisClose = record("MisClose") * sync(P")") * defaultValue(m.P""),
+        ErrMisClose = record("MisClose") * sync(m.P")") * defaultValue(m.P""),
 }
- 
-                
+               
 local function eval(input)
         errors = {}
+        io.write("Input: ", input, "\n")
         subject = input
-  local result, label, suffix = recg:match(input)
-  if #errors > 0 then
+  local result, label, suffix = grec:match(input)
+  io.write("Syntactic errors found: " .. #errors, "\n")
+        if #errors > 0 then
     local out = {}
     for i, err in ipairs(errors) do
       local pos = err.col
@@ -95,13 +92,14 @@ local function eval(input)
     end
     print(table.concat(out, "\n"))
   end
+        io.write("Result = ")
         return result   
 end
 
-print(eval "90-70*5")
+print(eval "90-70-(5)+3")
 --> 20
 
-print(eval "2+")
+print(eval "15+")
 --> 2 + 0
 
 print(eval "-2")
@@ -126,3 +124,5 @@ print(eval "1+(")
 
 print(eval "3)")
 
+print(eval "11+())3")
+
diff --git a/examples/expRecAut.lua b/examples/expRecAut.lua
index e098078..f870d73 100644
--- a/examples/expRecAut.lua
+++ b/examples/expRecAut.lua
@@ -1,12 +1,8 @@
 local m = require"lpeglabelrec"
 local re = require"relabelrec"
 
-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 num = R("09")^1 / tonumber
-local op = S("+-")
+local num = m.R("09")^1 / tonumber
+local op = m.S("+-")
 
 local labels = {}
 local nlabels = 0
@@ -27,7 +23,7 @@ local errors, subject
 
 local function expect(patt, labname)
   local i = labels[labname].id
-  return patt + T(i)
+  return patt + m.T(i)
 end
 
 local function compute(tokens)
@@ -44,13 +40,13 @@ local function compute(tokens)
   return result
 end
 
-local g = P {
+local g = m.P {
         "Exp",
-        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"Exp" * expect(")", "MisClose"),
+        Exp = m.Ct(m.V"OperandFirst" * (m.C(op) * m.V"Operand")^0) / compute,
+        OperandFirst = expect(m.V"Term", "ExpTermFirst"),
+        Operand = expect(m.V"Term", "ExpTermOp"),
+        Term = num + m.V"Group",
+        Group = "(" * m.V"Exp" * expect(")", "MisClose"),
 }
 
 function recorderror(pos, lab)
@@ -70,27 +66,18 @@ function defaultValue (p)
         return p or m.Cc(1000) 
 end
 
-local recg2 = g
+local grec = g * expect(m.P(-1), "Extra")
 for k, v in pairs(labels) do
-        recg2 = Rec(recg2, record(k) * sync(v.psync) * v.pcap, v.id)
+        grec = m.Rec(grec, record(k) * sync(v.psync) * v.pcap, v.id)
 end
 
-local recg = P {
-        "S",
-        S = Rec(V"A", V"ErrExpTermFirst", labels["ExpTermFirst"].id), -- default value is 0
-        A = Rec(V"Sg", V"ErrExpTermOp", labels["ExpTermOp"].id),
-        Sg = Rec(g, V"ErrMisClose", labels["MisClose"].id),
-        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 = {}
+        io.write("Input: ", input, "\n")
         subject = input
-  local result, label, suffix = recg2:match(input)
-  if #errors > 0 then
+  local result, label, suffix = grec:match(input)
+  io.write("Syntactic errors found: " .. #errors, "\n")
+        if #errors > 0 then
     local out = {}
     for i, err in ipairs(errors) do
       local pos = err.col
@@ -99,13 +86,14 @@ local function eval(input)
     end
     print(table.concat(out, "\n"))
   end
+        io.write("Result = ")
         return result   
 end
 
-print(eval "90-70*5")
---> 20
+print(eval "90-70-(5)+3")
+--> 18
 
-print(eval "2+")
+print(eval "15+")
 --> 2 + 0
 
 print(eval "-2")
@@ -130,3 +118,5 @@ print(eval "1+(")
 
 print(eval "3)")
 
+print(eval "11+()3")
+--> 1 + ([0]) [+] 3 + [0]
diff --git a/examples/listId2Rec2.lua b/examples/listId2Rec2.lua
index ab8f1dd..c6705dd 100644
--- a/examples/listId2Rec2.lua
+++ b/examples/listId2Rec2.lua
@@ -56,7 +56,7 @@ function mymatch (g, s)
         local msg = "Error at line " .. err.line .. " (col " .. err.col .. "): " .. err.msg
       table.insert(out,  msg)
     end
-    return nil, table.concat(out, "\n")
+    return nil, table.concat(out, "\n") .. "\n"
   end
   return r
 end
diff --git a/examples/listIdRe2.lua b/examples/listIdRe2.lua
index 070bcdb..6bab6ba 100644
--- a/examples/listIdRe2.lua
+++ b/examples/listIdRe2.lua
@@ -19,7 +19,7 @@ re.setlabels(labels)
 local g = re.compile[[
   S      <- Id List
   List   <- !.  /  Comma Id List
-  Id     <- Sp [a-z]+ / %{errId}
+  Id     <- Sp {[a-z]+} / %{errId}
   Comma  <- Sp ',' / %{errComma}
   Sp     <- %s*
 ]]
@@ -38,25 +38,34 @@ end
 
 local grec = re.compile(
   "S         <- %g //{errComma} ErrComma //{errId} ErrId" .. "\n" ..
-  "ErrComma  <-  ('' -> 'errComma' => recorderror) " .. sync('!. / [a-z]+') .. "\n" ..
-        "ErrId     <-  ('' -> 'errId' => recorderror) (!(!. / ',') .)*"
-        , {g = g, recorderror  = recorderror})
+  "ErrComma  <-  ('' -> 'errComma' => recorderror) " .. sync('[a-z]+') .. "\n" ..
+        "ErrId     <-  ('' -> 'errId' => recorderror) " .. sync('","') .. "-> default" 
+        , {g = g, recorderror  = recorderror, default = "NONE"})
 
 function mymatch (g, s)
         errors = {}
-        local r, e, sfail = g:match(s)
+        subject = s     
+        io.write("Input: ", s, "\n")
+        local r = { g:match(s) }
+        io.write("Captures (separated by ';'): ")
+        for k, v in pairs(r) do
+                io.write(v .. "; ")
+        end
+        io.write("\nSyntactic errors found: " .. #errors)
         if #errors > 0 then
+                io.write("\n")
                 local out = {}
     for i, err in ipairs(errors) do
         local msg = "Error at line " .. err.line .. " (col " .. err.col .. "): " .. err.msg
       table.insert(out,  msg)
     end
-    return nil, table.concat(out, "\n")
+    io.write(table.concat(out, "\n"))
   end
-  return r
+        print("\n")
+        return r
 end
   
-print(mymatch(grec, "one,two"))
-print(mymatch(grec, "one two three"))
-print(mymatch(grec, "1,\n two, \n3,"))
-print(mymatch(grec, "one\n two123, \nthree,"))
+mymatch(grec, "one,two")
+mymatch(grec, "one two three")
+mymatch(grec, "1,\n two, \n3,")
+mymatch(grec, "one\n two123, \nthree,")