Adding better handling of unterminated strings

2 files changed, 8 insertions, 4 deletions

diff --git a/relabel.lua b/relabel.lua
index e3b7d48..0594777 100644
--- a/relabel.lua
+++ b/relabel.lua
@@ -129,8 +129,8 @@ local Def = name * m.Carg(1)
 
 local num = m.C(m.R"09"^1) * S / tonumber
 
-local String = "'" * m.C((any - "'")^0) * ("'" + throw(31)) +
-               '"' * m.C((any - '"')^0) * ('"' + throw(30))
+local String = "'" * m.C((any - "'" - m.P"\n")^0) * ("'" + throw(31)) +
+               '"' * m.C((any - '"' - m.P"\n")^0) * ('"' + throw(30))
 
 
 local defined = "%" * Def / function (c,Defs)
@@ -195,7 +195,7 @@ local exp = m.P{ "Exp",
   Stuff = m.V"GroupedStuff" + any;
   GroupedStuff = "(" * (-m.P")" * m.V"Stuff")^0 * ")"
                + "{" * (-m.P"}" * m.V"Stuff")^0 * "}";
-  SeqLC = m.Lc(m.V"Seq", m.V"SkipToSlash", 5, 6, 7, 8, 9, 10);
+  SeqLC = m.Lc(m.V"Seq", m.V"SkipToSlash", 5, 6, 7, 8, 9, 10, 31, 30);
   Seq = m.Cf(m.Cc(m.P"") * m.V"Prefix"^1 , mt.__mul);
   Prefix = "&" * S * (m.V"Prefix" + throw(5)) / mt.__len
          + "!" * S * (m.V"Prefix" + throw(6)) / mt.__unm
diff --git a/testerrors.lua b/testerrors.lua
index bcab65f..271773a 100644
--- a/testerrors.lua
+++ b/testerrors.lua
@@ -123,10 +123,14 @@ local patterns = {
   [[ A <- %nosuch ('error' ]],
   [[A <- Unknown Rules]],
   [['a' / &@ ('c' / 'd')]],
-  -- 81 - 83
+  -- 81 - 84
   [['x' / & / 'y']],
   [[&/'p'/!/'q']],
   [['p'//'q']],
+  [[
+    S <- 'forgot to close / T
+    T <- 'T' & / 't'
+  ]]
 }
 
 for i, patt in ipairs(patterns) do