Adding error recovery to some missing closing tokens

2 files changed, 12 insertions, 2 deletions

diff --git a/relabel.lua b/relabel.lua
index 1ded6b2..2cdf1ad 100644
--- a/relabel.lua
+++ b/relabel.lua
@@ -34,6 +34,10 @@ local function throw(label)
   return m.Cmt("", record) * m.T(label)
 end
 
+local ignore = m.Cmt(any, function (input, pos)
+  return errors[#errors][2], mm.P""
+end)
+
 -- Pre-defined names
 local Predef = { nl = m.P"\n" }
 local tlabels = {}
@@ -186,7 +190,7 @@ local exp = m.P{ "Exp",
   Prefix = "&" * S * (m.V"Prefix" + throw(5)) / mt.__len
          + "!" * S * (m.V"Prefix" + throw(6)) / mt.__unm
          + m.V"Suffix";
-  Suffix = m.Cf(m.V"Primary" * S *
+  Suffix = m.Cf(m.V"PrimaryLC" * S *
           ( ( m.P"+" * m.Cc(1, mt.__pow)
             + m.P"*" * m.Cc(0, mt.__pow)
             + m.P"?" * m.Cc(-1, mt.__pow)
@@ -202,6 +206,7 @@ local exp = m.P{ "Exp",
             + "=>" * S * (m.Cg(Def / getdef * m.Cc(m.Cmt)) + throw(10))
             ) * S
           )^0, function (a,b,f) return f(a,b) end );
+  PrimaryLC = m.Lc(m.V"Primary", ignore, 12, 15, 18, 20, 25, 29, 33);
   Primary = "(" * (m.V"Exp" + throw(11)) * (")" + throw(12))
             + String / mm.P
             + Class
diff --git a/testerrors.lua b/testerrors.lua
index 7ffcd04..dff35df 100644
--- a/testerrors.lua
+++ b/testerrors.lua
@@ -102,7 +102,12 @@ local patterns = {
   -- 71-73
   [['a'/{1}'b'/'c']],
   [[x <- {:x:}]],
-  [[&'p'/&/!/'p'^'q']]
+  [[&'p'/&/!/'p'^'q']],
+  [[
+    A <- 'a' (B 'b'
+    B <- 'x' / !
+    C <- 'c'
+  ]]
 }
 
 for i, patt in ipairs(patterns) do