1 files changed, 604 insertions, 155 deletions

diff --git a/testerrors.lua b/testerrors.lua
index 6e9c83e..afa80c6 100644
--- a/testerrors.lua
+++ b/testerrors.lua
@@ -1,161 +1,610 @@
 local re = require 'relabel'
 
-local npass, ntests = 0, 0
-
-function testerror(repatt)
-  ntests = ntests + 1
+function testerror(repatt, msg)
+  msg = msg:match("^%s*(.-)%s*$") -- trim
   local ok, err = pcall(function () re.compile(repatt) end)
-  
-  if ok then
-    print("FAIL", ntests)
-  else
-    npass = npass + 1
-    print("PASS", ntests, err)
-  end
+  assert(not ok)
+  err = err:match("^[^\n]*\n(.-)$") -- remove first line (filename)
+  err = err:gsub(" *\n", "\n") -- remove trailing spaces
+  -- if err ~= msg then
+  --   print(#err, #msg)
+  --   print('--')
+  --   print(err)
+  --   print('--')
+  --   print(msg)
+  --   print('--')
+  -- end
+  assert(err == msg)
 end
 
-local patterns = {
-  -- 1-5
-  [[~]],
-  [[???]],
-  [['p'~]],
-  [['p'?$?]],
-  [['p' /{1}]],
-  -- 6-10  
-  [['p' /{1} /{2} 'q']],
-  [['p' /]],
-  [['p' / / 'q']],
-  [[&]],
-  [[& / 'p']],
-  -- 11-15
-  [['p' &]],
-  [['p' / & / 'q']],
-  [[&&]],
-  [[!&]],
-  [[!]],
-  -- 16-20
-  [[! / 'p']],
-  [['p' !]],
-  [['p' / ! / 'q']],
-  [[!!]],
-  [[&!]],
-  -- 21-25
-  [['p' ^ n]],
-  [['p'^+(+1)]],
-  [['p'^-/'q']],
-  [['p' -> {]],
-  [['p' -> {'q'}]],
-  -- 26-30
-  [['p' -> / 'q']],
-  [['p' -> [0-9] ]],
-  [['p' =>]],
-  [['p' => 'q']],
-  [[()]],
-  -- 31-35
-  [[($$$)]],
-  [[('p' ('q' / 'r')]],
-  [[% s]],
-  [[% {1}]],
-  [[{: *** :}]],
-  -- 36-40
-  [[{:group: *** :}]],
-  [[{: group: 'p' :}]],
-  [[S <- {: 'p'  T <- 'q']],
-  [['<' {:tag: [a-z]+ :} '>' '<' = '>']],
-  [['<' {:tag: [a-z]+ :} '>' '<' = tag '>']],
-  -- 41-45
-  [[{~~}]],
-  [[{ {~ } ~}]],
-  [[{~ ^_^ ~}]],
-  [['p' {~ ('q' 'r') / 's']],
-  [[{0}]],
-  -- 46-50
-  [[{ :'p': }]],
-  [[{ 'p' ]],
-  [[<>]],
-  [[<123>]],
-  [[< hello >]],
-  -- 51-55
-  [[<<S>>]],
-  [[<patt]],
-  [[<insert your name here>]],
-  [[S <-]],
-  [[S <- 'p' T <-]],
-  -- 55-60
-  [[[]],
-  [[[^]],
-  [[[] ]],
-  [[[^]         ]],
-  [[[_-___-_|]],
-  -- 60-65
-  [['p' /{} 'q']],
-  [[%{ 'label' }]],
-  [['p' /{1,2,3,} 'q']],
-  [[%{ a,,b,,c }]],
-  [['{' %{ a, b '}']],
-  -- 65-70
-  [[Q <- "To be or not to be...]],
-  [['That is the question...]],
-  [[{||}]],
-  [[{|@|}]],
-  [['p' {| 'q' / 'r' }]],
-  -- 71-75
-  [['a'/{1}'b'/'c']], -- should not fail anymore
-  [[x <- {:x:}]],
-  [[&'p'/&/!/'p'^'q']],
-  [[
-    A <- 'a' (B 'b'
-    B <- 'x' / !
-    C <- 'c'
-  ]],
-  [[
-    A <- %nosuch %def
-    A <- 'A again'
-    A <- 'and again'
-  ]],
-  -- 76 - 80
-  [[names not in grammar]],
-  [[
-    A <- %nosuch %def
-    A <- 'A again'
-    A <- 'and again'
-  ]],
-  [[ A <- %nosuch ('error' ]],
-  [[A <- Unknown Rules]],
-  [['a' / &@ ('c' / 'd')]],
-  -- 81 - 85
-  [['x' / & / 'y']],
-  [[&/'p'/!/'q']],
-  [['p'//'q']],
-  [[
-    S <- 'forgot to close / T
-    T <- 'T' & / 't'
-  ]],
-  [[
-    S <- [a-z / T
-    T <- 'x' / & / 'y'
-  ]],
-  -- 86 - 88
-  [[
-    S <- ('p' -- comment
-  ]],
-  [[
-    X <- ('p / Q (R
-      / S))
-    Q <- 'q'
-    R <- 'r'
-    S <- 's'
-  ]],
-  [[
-    A <- 'A' /{'lab'} B / !
-    
-    B <- %{1, 2 3} 'b' / '6' & / 'B'
-  ]]
-}
-
-for i, patt in ipairs(patterns) do
-  testerror(patt)
-end
+testerror([[~]],[[
+L1:C1: no pattern found
+~
+^
+]])
+
+testerror([[???]], [[
+L1:C1: no pattern found
+???
+^
+]])
+
+testerror([['p'~]], [[
+L1:C4: unexpected characters after the pattern
+'p'~
+   ^
+]])
+
+testerror([['p'?$?]], [[
+L1:C5: unexpected characters after the pattern
+'p'?$?
+    ^
+]])
+
+testerror([['p' /{1}]], [[
+L1:C9: expected a pattern after '/' or the label(s)
+'p' /{1}
+        ^
+]])
+
+testerror([['p' /{1} /{2} 'q']], [[
+L1:C9: expected a pattern after '/' or the label(s)
+'p' /{1} /{2} 'q'
+        ^
+]])
+
+testerror([['p' /]], [[
+L1:C6: expected a pattern after '/' or the label(s)
+'p' /
+     ^
+]])
+
+testerror([['p' / / 'q']], [[
+L1:C6: expected a pattern after '/' or the label(s)
+'p' / / 'q'
+     ^
+]])
+
+testerror([[&]], [[
+L1:C2: expected a pattern after '&'
+&
+ ^
+]])
+
+testerror([[& / 'p']], [[
+L1:C2: expected a pattern after '&'
+& / 'p'
+ ^
+]])
+
+testerror([['p' &]], [[
+L1:C6: expected a pattern after '&'
+'p' &
+     ^
+]])
+
+testerror([['p' / & / 'q']], [[
+L1:C8: expected a pattern after '&'
+'p' / & / 'q'
+       ^
+]])
+
+testerror([[&&]], [[
+L1:C3: expected a pattern after '&'
+&&
+  ^
+]])
+
+testerror([[!&]], [[
+L1:C3: expected a pattern after '&'
+!&
+  ^
+]])
+
+testerror([[!]], [[
+L1:C2: expected a pattern after '!'
+!
+ ^
+]])
+
+testerror([[! / 'p']], [[
+L1:C2: expected a pattern after '!'
+! / 'p'
+ ^
+]])
+
+testerror([['p' !]], [[
+L1:C6: expected a pattern after '!'
+'p' !
+     ^
+]])
+
+testerror([['p' / ! / 'q']], [[
+L1:C8: expected a pattern after '!'
+'p' / ! / 'q'
+       ^
+]])
+
+testerror([[!!]], [[
+L1:C3: expected a pattern after '!'
+!!
+  ^
+]])
+
+testerror([[&!]], [[
+L1:C3: expected a pattern after '!'
+&!
+  ^
+]])
+
+testerror([['p' ^ n]], [[
+L1:C6: expected a number after '^', '+' or '-' (no space)
+'p' ^ n
+     ^
+]])
+
+testerror([['p'^+(+1)]], [[
+L1:C5: expected a number after '^', '+' or '-' (no space)
+'p'^+(+1)
+    ^
+]])
+
+testerror([['p'^-/'q']], [[
+L1:C5: expected a number after '^', '+' or '-' (no space)
+'p'^-/'q'
+    ^
+]])
+
+testerror([['p' -> {]], [[
+L1:C7: expected a string, number, '{}' or name after '->'
+'p' -> {
+      ^
+]])
+
+testerror([['p' -> {'q'}]], [[
+L1:C7: expected a string, number, '{}' or name after '->'
+'p' -> {'q'}
+      ^
+]])
+
+testerror([['p' -> / 'q']], [[
+L1:C7: expected a string, number, '{}' or name after '->'
+'p' -> / 'q'
+      ^
+]])
+
+testerror([['p' -> [0-9] ]], [[
+L1:C7: expected a string, number, '{}' or name after '->'
+'p' -> [0-9]
+      ^
+]])
+
+testerror([['p' =>]], [[
+L1:C7: expected the name of a rule after '=>'
+'p' =>
+      ^
+]])
+
+testerror([['p' => 'q']], [[
+L1:C7: expected the name of a rule after '=>'
+'p' => 'q'
+      ^
+]])
+
+testerror([[()]], [[
+L1:C2: expected a pattern after '('
+()
+ ^
+]])
+
+testerror([[($$$)]], [[
+L1:C2: expected a pattern after '('
+($$$)
+ ^
+]])
+
+testerror([[('p' ('q' / 'r')]], [[
+L1:C17: missing closing ')'
+('p' ('q' / 'r')
+                ^
+]])
+
+testerror([[% s]], [[
+L1:C2: expected a name or label after '%' (no space)
+% s
+ ^
+]])
+
+testerror([[% {1}]], [[
+L1:C2: expected a name or label after '%' (no space)
+% {1}
+ ^
+]])
+
+testerror([[{: *** :}]], [[
+L1:C3: expected a pattern after ':'
+{: *** :}
+  ^
+]])
+
+testerror([[{:group: *** :}]], [[
+L1:C9: expected a pattern after ':'
+{:group: *** :}
+        ^
+]])
+
+testerror([[{: group: 'p' :}]], [[
+L1:C9: missing closing ':}'
+{: group: 'p' :}
+        ^
+L1:C9: unexpected characters after the pattern
+{: group: 'p' :}
+        ^
+]])
+
+testerror([[S <- {: 'p'  T <- 'q']], [[
+L1:C12: missing closing ':}'
+S <- {: 'p'  T <- 'q'
+           ^
+]])
+
+testerror([['<' {:tag: [a-z]+ :} '>' '<' = '>']], [[
+L1:C31: expected the name of a rule after '=' (no space)
+'<' {:tag: [a-z]+ :} '>' '<' = '>'
+                              ^
+]])
+
+testerror([['<' {:tag: [a-z]+ :} '>' '<' = tag '>']], [[
+L1:C31: expected the name of a rule after '=' (no space)
+'<' {:tag: [a-z]+ :} '>' '<' = tag '>'
+                              ^
+]])
+
+testerror([[{~~}]], [[
+L1:C3: expected a pattern after '{~'
+{~~}
+  ^
+]])
+
+testerror([[{ {~ } ~}]], [[
+L1:C5: expected a pattern after '{~'
+{ {~ } ~}
+    ^
+L1:C10: missing closing '}'
+{ {~ } ~}
+         ^
+]])
+
+testerror([[{~ ^_^ ~}]], [[
+L1:C3: expected a pattern after '{~'
+{~ ^_^ ~}
+  ^
+]])
+
+testerror([['p' {~ ('q' 'r') / 's']], [[
+L1:C23: missing closing '~}'
+'p' {~ ('q' 'r') / 's'
+                      ^
+]])
 
-print()
-print("Tests passed: " .. npass .. "/" .. ntests)
+testerror([[{0}]], [[
+L1:C2: expected a pattern or closing '}' after '{'
+{0}
+ ^
+]])
+
+testerror([[{ :'p': }]], [[
+L1:C2: expected a pattern or closing '}' after '{'
+{ :'p': }
+ ^
+]])
+
+testerror([[{ 'p' ]], [[
+L1:C6: missing closing '}'
+{ 'p'
+     ^
+]])
+
+testerror([[<>]], [[
+L1:C2: expected the name of a rule after '<' (no space)
+<>
+ ^
+]])
+
+testerror([[<123>]], [[
+L1:C2: expected the name of a rule after '<' (no space)
+<123>
+ ^
+]])
+
+testerror([[< hello >]], [[
+L1:C2: expected the name of a rule after '<' (no space)
+< hello >
+ ^
+]])
+
+testerror([[<<S>>]], [[
+L1:C2: expected the name of a rule after '<' (no space)
+<<S>>
+ ^
+]])
+
+testerror([[<patt]], [[
+L1:C6: missing closing '>'
+<patt
+     ^
+]])
+
+testerror([[<insert your name here>]], [[
+L1:C8: missing closing '>'
+<insert your name here>
+       ^
+]])
+
+testerror([[S <-]], [[
+L1:C5: expected a pattern after '<-'
+S <-
+    ^
+]])
+
+testerror([[S <- 'p' T <-]], [[
+L1:C14: expected a pattern after '<-'
+S <- 'p' T <-
+             ^
+]])
+
+testerror([[[]], [[
+L1:C1: missing closing ']'
+[
+^
+]])
+
+testerror([[[^]], [[
+L1:C1: missing closing ']'
+[^
+^
+]])
+
+testerror([[[] ]], [[
+L1:C1: missing closing ']'
+[]
+^
+]])
+
+-- testerror([[[^]      ]], [[
+-- L1:C1: missing closing ']'
+-- [^]
+-- ^
+-- ]])
+
+testerror([[[_-___-_|]], [[
+L1:C1: missing closing ']'
+[_-___-_|
+^
+]])
+
+testerror([['p' /{} 'q']], [[
+L1:C7: expected at least one label after '{'
+'p' /{} 'q'
+      ^
+]])
+
+testerror([[%{ 'label' }]], [[
+L1:C3: expected at least one label after '{'
+%{ 'label' }
+  ^
+]])
+
+testerror([['p' /{1,2,3,} 'q']], [[
+L1:C13: expected a label after the comma
+'p' /{1,2,3,} 'q'
+            ^
+]])
+
+testerror([[%{ a,,b,,c }]], [[
+L1:C6: expected a label after the comma
+%{ a,,b,,c }
+     ^
+]])
+
+testerror([['{' %{ a, b '}']], [[
+L1:C12: missing closing '}'
+'{' %{ a, b '}'
+           ^
+]])
+
+testerror([[Q <- "To be or not to be...]], [[
+L1:C6: missing terminating double quote
+Q <- "To be or not to be...
+     ^
+]])
+
+testerror([['That is the question...]], [[
+L1:C1: missing terminating single quote
+'That is the question...
+^
+]])
+
+testerror([[{||}]], [[
+L1:C3: expected a pattern after '{|'
+{||}
+  ^
+]])
+
+testerror([[{|@|}]], [[
+L1:C3: expected a pattern after '{|'
+{|@|}
+  ^
+]])
+
+testerror([['p' {| 'q' / 'r' }]], [[
+L1:C17: missing closing '|}'
+'p' {| 'q' / 'r' }
+                ^
+L1:C18: unexpected characters after the pattern
+'p' {| 'q' / 'r' }
+                 ^
+]])
+
+testerror([[x <- {:x:}]], [[
+L1:C10: expected a pattern after ':'
+x <- {:x:}
+         ^
+]])
+
+testerror([[&'p'/&/!/'p'^'q']], [[
+L1:C7: expected a pattern after '&'
+&'p'/&/!/'p'^'q'
+      ^
+L1:C9: expected a pattern after '!'
+&'p'/&/!/'p'^'q'
+        ^
+L1:C14: expected a number after '^', '+' or '-' (no space)
+&'p'/&/!/'p'^'q'
+             ^
+]])
+
+testerror([[
+  A <- 'a' (B 'b'
+  B <- 'x' / !
+  C <- 'c'
+]],[[
+L1:C18: missing closing ')'
+  A <- 'a' (B 'b'
+                 ^
+L2:C15: expected a pattern after '!'
+  B <- 'x' / !
+              ^
+]])
+
+testerror([[
+  A <- %nosuch %def
+  A <- 'A again'
+  A <- 'and again'
+]],[[
+name 'nosuch' undefined
+name 'def' undefined
+'A' already defined as a rule
+'A' already defined as a rule
+]])
+
+testerror([[names not in grammar]], [[
+rule 'names' used outside a grammar
+rule 'not' used outside a grammar
+rule 'in' used outside a grammar
+rule 'grammar' used outside a grammar
+]])
+
+testerror([[
+  A <- %nosuch %def
+  A <- 'A again'
+  A <- 'and again'
+]],[[
+name 'nosuch' undefined
+name 'def' undefined
+'A' already defined as a rule
+'A' already defined as a rule
+]])
+
+testerror([[ A <- %nosuch ('error' ]], [[
+L1:C23: missing closing ')'
+ A <- %nosuch ('error'
+                      ^
+name 'nosuch' undefined
+]])
+
+-- testerror([[A <- Unknown Rules]], [[]])
+
+testerror([['a' / &@ ('c' / 'd')]], [[
+L1:C8: expected a pattern after '&'
+'a' / &@ ('c' / 'd')
+       ^
+]])
+
+testerror([['x' / & / 'y']], [[
+L1:C8: expected a pattern after '&'
+'x' / & / 'y'
+       ^
+]])
+
+testerror([[&/'p'/!/'q']], [[
+L1:C2: expected a pattern after '&'
+&/'p'/!/'q'
+ ^
+L1:C8: expected a pattern after '!'
+&/'p'/!/'q'
+       ^
+]])
+
+testerror([['p'//'q']], [[
+L1:C5: expected a pattern after '/' or the label(s)
+'p'//'q'
+    ^
+]])
+
+testerror([[
+  S <- 'forgot to close / T
+  T <- 'T' & / 't'
+]],[[
+L1:C8: missing terminating single quote
+  S <- 'forgot to close / T
+       ^
+L2:C13: expected a pattern after '&'
+  T <- 'T' & / 't'
+            ^
+]])
+
+testerror([[
+  S <- [a-z / T
+  T <- 'x' / & / 'y'
+]],[[
+L1:C8: missing closing ']'
+  S <- [a-z / T
+       ^
+L2:C15: expected a pattern after '&'
+  T <- 'x' / & / 'y'
+              ^
+]])
+
+testerror([[
+  S <- ('p' -- comment
+]],[[
+L1:C12: missing closing ')'
+  S <- ('p' -- comment
+           ^
+]])
+
+testerror([[
+  X <- ('p / Q (R
+    / S))
+  Q <- 'q'
+  R <- 'r'
+  S <- 's'
+]],[[
+L1:C9: missing terminating single quote
+  X <- ('p / Q (R
+        ^
+L2:C9: unexpected characters after the pattern
+    / S))
+        ^
+]])
+
+testerror([[
+  A <- 'A' /{'lab'} B / !
+  
+  B <- %{1, 2 3} 'b' / '6' & / 'B'
+]],[[
+L1:C14: expected at least one label after '{'
+  A <- 'A' /{'lab'} B / !
+             ^
+L1:C26: expected a pattern after '!'
+  A <- 'A' /{'lab'} B / !
+                         ^
+L3:C15: missing closing '}'
+  B <- %{1, 2 3} 'b' / '6' & / 'B'
+              ^
+]])
+
+  
+print 'OK'
+  
\ No newline at end of file