1 files changed, 257 insertions, 175 deletions

diff --git a/testerrors.lua b/testerrors.lua
index d39b8b9..1c5bb9f 100644
--- a/testerrors.lua
+++ b/testerrors.lua
@@ -23,6 +23,8 @@ function testerror(repatt, msg)
   end
 end
 
+-- testing NoPatt
+
 testerror([[~]], [[
 L1:C1: no pattern found
 ~
@@ -35,6 +37,8 @@ L1:C1: no pattern found
 ^
 ]])
 
+-- testing ExtraChars
+
 testerror([['p'~]], [[
 L1:C4: unexpected characters after the pattern
 'p'~
@@ -47,6 +51,8 @@ L1:C5: unexpected characters after the pattern
     ^
 ]])
 
+-- testing ExpPatt1
+
 testerror([['p' /{1}]], [[
 L1:C9: expected a pattern after '/' or the label(s)
 'p' /{1}
@@ -71,6 +77,8 @@ L1:C6: expected a pattern after '/' or the label(s)
      ^
 ]])
 
+-- testing ExpPatt2
+
 testerror([[&]], [[
 L1:C2: expected a pattern after '&'
 &
@@ -107,6 +115,8 @@ L1:C3: expected a pattern after '&'
   ^
 ]])
 
+-- testing ExpPatt3
+
 testerror([[!]], [[
 L1:C2: expected a pattern after '!'
 !
@@ -143,6 +153,107 @@ L1:C3: expected a pattern after '!'
   ^
 ]])
 
+-- testing ExpPatt4
+
+testerror([[()]], [[
+L1:C2: expected a pattern after '('
+()
+ ^
+]])
+
+testerror([[($$$)]], [[
+L1:C2: expected a pattern after '('
+($$$)
+ ^
+]])
+
+-- testing ExpPatt5
+
+testerror([[{: *** :}]], [[
+L1:C3: expected a pattern after ':'
+{: *** :}
+  ^
+]])
+
+testerror([[{:group: *** :}]], [[
+L1:C9: expected a pattern after ':'
+{:group: *** :}
+        ^
+]])
+
+testerror([[x <- {:x:}]], [[
+L1:C10: expected a pattern after ':'
+x <- {:x:}
+         ^
+]])
+
+-- testing ExpPatt6
+
+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 '{~'
+{~ ^_^ ~}
+  ^
+]])
+
+-- testing ExpPatt7
+
+testerror([[{||}]], [[
+L1:C3: expected a pattern after '{|'
+{||}
+  ^
+]])
+
+testerror([[{|@|}]], [[
+L1:C3: expected a pattern after '{|'
+{|@|}
+  ^
+]])
+
+-- testing ExpPatt8
+
+testerror([[S <-]], [[
+L1:C5: expected a pattern after '<-'
+S <-
+    ^
+]])
+
+testerror([[S <- 'p' T <-]], [[
+L1:C14: expected a pattern after '<-'
+S <- 'p' T <-
+             ^
+]])
+
+-- testing ExpPattOrClose
+
+testerror([[{0}]], [[
+L1:C2: expected a pattern or closing '}' after '{'
+{0}
+ ^
+]])
+
+testerror([[{ :'p': }]], [[
+L1:C2: expected a pattern or closing '}' after '{'
+{ :'p': }
+ ^
+]])
+
+-- testing ExpNum
+
 testerror([['p' ^ n]], [[
 L1:C6: expected a number after '^', '+' or '-' (no space)
 'p' ^ n
@@ -161,6 +272,8 @@ L1:C5: expected a number after '^', '+' or '-' (no space)
     ^
 ]])
 
+-- testing ExpCap
+
 testerror([['p' -> {]], [[
 L1:C7: expected a string, number, '{}' or name after '->'
 'p' -> {
@@ -185,6 +298,8 @@ L1:C7: expected a string, number, '{}' or name after '->'
       ^
 ]])
 
+-- testing ExpName1
+
 testerror([['p' =>]], [[
 L1:C7: expected the name of a rule after '=>'
 'p' =>
@@ -197,24 +312,76 @@ L1:C7: expected the name of a rule after '=>'
       ^
 ]])
 
-testerror([[()]], [[
-L1:C2: expected a pattern after '('
-()
+-- testing ExpName2
+
+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 '>'
+                              ^
+]])
+
+-- testing ExpName3
+
+testerror([[<>]], [[
+L1:C2: expected the name of a rule after '<' (no space)
+<>
  ^
 ]])
 
-testerror([[($$$)]], [[
-L1:C2: expected a pattern after '('
-($$$)
+testerror([[<123>]], [[
+L1:C2: expected the name of a rule after '<' (no space)
+<123>
  ^
 ]])
 
-testerror([[('p' ('q' / 'r')]], [[
-L1:C17: missing closing ')'
-('p' ('q' / 'r')
-                ^
+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>>
+ ^
 ]])
 
+-- testing ExpLab1
+
+testerror([['p' /{} 'q']], [[
+L1:C7: expected at least one label after '{'
+'p' /{} 'q'
+      ^
+]])
+
+testerror([[%{ 'label' }]], [[
+L1:C3: expected at least one label after '{'
+%{ 'label' }
+  ^
+]])
+
+-- testing ExpLab2
+
+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 }
+     ^
+]])
+
+-- testing ExpNameOrLab
+
 testerror([[% s]], [[
 L1:C2: expected a name or label after '%' (no space)
 % s
@@ -227,18 +394,29 @@ L1:C2: expected a name or label after '%' (no space)
  ^
 ]])
 
-testerror([[{: *** :}]], [[
-L1:C3: expected a pattern after ':'
-{: *** :}
-  ^
+-- testing ExpItem
+
+testerror([[
+"p" [
+abc
+] "q"  
+]], [[
+L1:C6: expected at least one item after '[' or '^'
+"p" [
+     ^
 ]])
 
-testerror([[{:group: *** :}]], [[
-L1:C9: expected a pattern after ':'
-{:group: *** :}
-        ^
+-- testing MisClose1
+
+testerror([[('p' ('q' / 'r')]], [[
+L1:C17: missing closing ')'
+('p' ('q' / 'r')
+                ^
 ]])
 
+-- testing MisClose2
+
+-- two errors are reported due to the ignore strategy
 testerror([[{: group: 'p' :}]], [[
 L1:C9: missing closing ':}'
 {: group: 'p' :}
@@ -254,38 +432,7 @@ 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 '{~'
-{~ ^_^ ~}
-  ^
-]])
+-- testing MisClose3
 
 testerror([['p' {~ ('q' 'r') / 's']], [[
 L1:C23: missing closing '~}'
@@ -293,47 +440,27 @@ L1:C23: missing closing '~}'
                       ^
 ]])
 
-testerror([[{0}]], [[
-L1:C2: expected a pattern or closing '}' after '{'
-{0}
- ^
-]])
+-- testing MisClose4
 
-testerror([[{ :'p': }]], [[
-L1:C2: expected a pattern or closing '}' after '{'
-{ :'p': }
- ^
+-- two errors are reported due to the ignore strategy
+testerror([['p' {| 'q' / 'r' }]], [[
+L1:C17: missing closing '|}'
+'p' {| 'q' / 'r' }
+                ^
+L1:C18: unexpected characters after the pattern
+'p' {| 'q' / 'r' }
+                 ^
 ]])
 
+-- testing MisClose5
+
 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>>
- ^
-]])
+-- testing MisClose6
 
 testerror([[<patt]], [[
 L1:C6: missing closing '>'
@@ -347,18 +474,16 @@ L1:C8: missing closing '>'
        ^
 ]])
 
-testerror([[S <-]], [[
-L1:C5: expected a pattern after '<-'
-S <-
-    ^
-]])
+-- testing MisClose7
 
-testerror([[S <- 'p' T <-]], [[
-L1:C14: expected a pattern after '<-'
-S <- 'p' T <-
-             ^
+testerror([['{' %{ a, b '}']], [[
+L1:C12: missing closing '}'
+'{' %{ a, b '}'
+           ^
 ]])
 
+-- testing MisClose8
+
 testerror([[[]], [[
 L1:C1: missing closing ']'
 [
@@ -389,41 +514,7 @@ 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...
-     ^
-]])
+-- testing MisTerm1
 
 testerror([['That is the question...]], [[
 L1:C1: missing terminating single quote
@@ -431,32 +522,16 @@ L1:C1: missing terminating single quote
 ^
 ]])
 
-testerror([[{||}]], [[
-L1:C3: expected a pattern after '{|'
-{||}
-  ^
-]])
+-- testing MisTerm2
 
-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([[Q <- "To be or not to be...]], [[
+L1:C6: missing terminating double quote
+Q <- "To be or not to be...
+     ^
 ]])
 
-testerror([[x <- {:x:}]], [[
-L1:C10: expected a pattern after ':'
-x <- {:x:}
-         ^
-]])
+-- testing error recovery, more complex grammars (multiline),
+-- and pointer positions in error recovery
 
 testerror([[&'p'/&/!/'p'^'q']], [[
 L1:C7: expected a pattern after '&'
@@ -483,32 +558,6 @@ L2:C15: expected a pattern after '!'
               ^
 ]])
 
-testerror([[
-  A <- %nosuch %def
-  A <- 'A again'
-  A <- 'and again'
-]], [[
-name 'nosuch' undefined
-]])
-
-testerror([[names not in grammar]], [[
-rule 'names' used outside a grammar
-]])
-
-testerror([[
-  A <- %nosuch %def
-  A <- 'A again'
-  A <- 'and again'
-]], [[
-name 'nosuch' undefined
-]])
-
-testerror([[ A <- %nosuch ('error' ]], [[
-L1:C23: missing closing ')'
- A <- %nosuch ('error'
-                      ^
-]])
-
 testerror([['a' / &@ ('c' / 'd')]], [[
 L1:C8: expected a pattern after '&'
 'a' / &@ ('c' / 'd')
@@ -568,6 +617,8 @@ L1:C12: missing closing ')'
            ^
 ]])
 
+-- an unfortunate second error exists because we don't know
+-- what's part of the quotation
 testerror([[
   X <- ('p / Q (R
     / S))
@@ -616,4 +667,35 @@ L1:C13: expected a pattern after '&'
             ^
 ]])
 
+-- testing non-syntax errors
+
+testerror([[
+  A <- %nosuch %def
+  A <- 'A again'
+  A <- 'and again'
+]], [[
+name 'nosuch' undefined
+]])
+
+testerror([[names not in grammar]], [[
+rule 'names' used outside a grammar
+]])
+
+testerror([[
+  A <- %nosuch %def
+  A <- 'A again'
+  A <- 'and again'
+]], [[
+name 'nosuch' undefined
+]])
+
+-- the non-syntax error should not be reported
+-- since there is a syntax error
+testerror([[ A <- %nosuch ('error' ]], [[
+L1:C23: missing closing ')'
+ A <- %nosuch ('error'
+                      ^
+]])
+
+
 print 'OK'