Updating re grammar so only one label can be thrownrelabel-recovery

2 files changed, 7 insertions, 11 deletions

diff --git a/relabel.lua b/relabel.lua
index 9fc4b01..cda24d0 100644
--- a/relabel.lua
+++ b/relabel.lua
@@ -322,7 +322,9 @@ local exp = m.P{ "Exp",
               labels["MisTerm1"], labels["MisTerm2"])
           + m.Lc(Class, pointAtStart, labels["MisClose8"])
           + defined
-          + "%" * expect(m.V"Labels", "ExpNameOrLab") / mm.T
+          + "%" * expect(m.P"{", "ExpNameOrLab")
+            * expect(S * m.V"Label", "ExpLab1")
+            * expect(S * "}", "MisClose7") / mm.T
           + "{:" * (name * ":" + m.Cc(nil)) * expect(m.V"Exp", "ExpPatt5")
             * expect(S * ":}", "MisClose2")
             / function (n, p) return mm.Cg(p, n) end
diff --git a/testrelabelparser.lua b/testrelabelparser.lua
index 1c5bb9f..af13baf 100644
--- a/testrelabelparser.lua
+++ b/testrelabelparser.lua
@@ -374,12 +374,6 @@ L1:C13: expected a label after the comma
             ^
 ]])
 
-testerror([[%{ a,,b,,c }]], [[
-L1:C6: expected a label after the comma
-%{ a,,b,,c }
-     ^
-]])
-
 -- testing ExpNameOrLab
 
 testerror([[% s]], [[
@@ -477,9 +471,9 @@ L1:C8: missing closing '>'
 -- testing MisClose7
 
 testerror([['{' %{ a, b '}']], [[
-L1:C12: missing closing '}'
+L1:C9: missing closing '}'
 '{' %{ a, b '}'
-           ^
+        ^
 ]])
 
 -- testing MisClose8
@@ -647,9 +641,9 @@ L1:C14: expected at least one label after '{'
 L1:C26: expected a pattern after '!'
   A <- 'A' /{'lab'} B / !
                          ^
-L3:C15: missing closing '}'
+L3:C11: missing closing '}'
   B <- %{1, 2 3} 'b' / '6' & / 'B'
-              ^
+          ^
 L3:C29: expected a pattern after '&'
   B <- %{1, 2 3} 'b' / '6' & / 'B'
                             ^