Updating examples to the new semantics

1 files changed, 20 insertions, 32 deletions

diff --git a/examples/listId2Rec2.lua b/examples/listId2Rec2.lua
index 3506095..09db5a6 100644
--- a/examples/listId2Rec2.lua
+++ b/examples/listId2Rec2.lua
@@ -1,51 +1,39 @@
 local m = require'lpeglabel'
 local re = require'relabel'
 
-local terror = {}
-
-local function newError(s)
-  table.insert(terror, s)
-  return #terror
-end
-
-local errUndef = newError("undefined")
-local errId = newError("expecting an identifier")
-local errComma = newError("expecting ','")
-
-local id = m.R'az'^1
-
-local g = m.P{
-  "S",
-  S = m.V"Id" * m.V"List",
-  List = -m.P(1) + m.V"Comma" * m.V"Id" * m.V"List",
-  Id = m.V"Sp" * id + m.T(errId),
-  Comma = m.V"Sp" * "," + m.T(errComma),
-  Sp = m.S" \n\t"^0,
+local terror = {
+  ErrId     =  "expecting an identifier",
+  ErrComma  =  "expecting ','"
 }
 
 local subject, errors
 
-function recorderror(pos, lab)
+local function recorderror(pos, lab)
         local line, col = re.calcline(subject, pos)
         table.insert(errors, { line = line, col = col, msg = terror[lab] })
 end
 
-function record (lab)
+local function record (lab)
         return (m.Cp() * m.Cc(lab)) / recorderror
 end
 
-function sync (p)
+local function sync (p)
         return (-p * m.P(1))^0
 end
 
-local grec = m.P{
+local id = m.R'az'^1
+
+local g = m.P{
   "S",
-  S = m.Rec(m.Rec(g, m.V"ErrComma", errComma), m.V"ErrId", errId),
-  ErrComma = record(errComma) * sync(id),
-        ErrId = record(errId) * sync(m.P",")
+  S = m.V"Id" * m.V"List",
+  List = -m.P(1) + m.V"Comma" * m.V"Id" * m.V"List",
+  Id = m.V"Sp" * id + m.T'ErrId',
+  Comma = m.V"Sp" * "," + m.T'ErrComma',
+  Sp = m.S" \n\t"^0,
+  ErrId = record('ErrId') * sync(m.P","),
+  ErrComma = record('ErrComma') * sync(id),
 }
 
-
 function mymatch (g, s)
         errors = {}
         subject = s     
@@ -61,7 +49,7 @@ function mymatch (g, s)
   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,"))
+print(mymatch(g, "one,two"))
+print(mymatch(g, "one two three"))
+print(mymatch(g, "1,\n two, \n3,"))
+print(mymatch(g, "one\n two123, \nthree,"))