Updating re grammar so only one label can be thrown

2 files changed, 5 insertions, 9 deletions

diff --git a/relabel.lua b/relabel.lua
index 7fe8645..b541dec 100644
--- a/relabel.lua
+++ b/relabel.lua
@@ -264,7 +264,9 @@ local exp = m.P{ "Exp",
           + String / mm.P
           + Class
           + 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 46e01ee..1f1a8cf 100644
--- a/testrelabelparser.lua
+++ b/testrelabelparser.lua
@@ -371,12 +371,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]], [[
@@ -468,9 +462,9 @@ L1:C8: missing closing '>'
 -- testing MisClose7
 
 testerror([['{' %{ a, b '}']], [[
-L1:C12: missing closing '}'
+L1:C9: missing closing '}'
 '{' %{ a, b '}'
-           ^
+        ^
 ]])
 
 -- testing MisClose8