Fix parse error reporting for CGPM schema/analysis languages.

Author: riastradh-probcomp

src/metamodels/cgpm_analyze/parse.py

@@ -47,8 +47,10 @@ def parse(tokens):
         if len(semantics.context) > 10:
             semantics.context.pop(0)
         parser.feed(token)
-    if semantics.failed or semantics.errors:
-        raise BQLParseError('\n'.join(semantics.errors))
+    if semantics.errors:
+        raise BQLParseError(semantics.errors)
+    if semantics.failed:
+        raise BQLParseError(['parse failed mysteriously'])
     assert semantics.phrases is not None
     return semantics.phrases
 
@@ -83,6 +85,8 @@ def parse_failed(self):
 
     def syntax_error(self, (token, text)):
         if token == -1:         # error
+            self.errors.append('Bad token: %r' % (text,))
+        else:
             self.errors.append("Syntax error near [%s] after [%s]" % (
                 text, ' '.join([str(t) for (_t, t) in self.context[:-1]])))
 

src/metamodels/cgpm_schema/parse.py

@@ -51,8 +51,10 @@ def parse(tokenses):
         if len(semantics.context) > 10:
             semantics.context.pop(0)
         parser.feed(token)
-    if semantics.failed or semantics.errors:
-        raise BQLParseError('\n'.join(semantics.errors))
+    if semantics.errors:
+        raise BQLParseError(semantics.errors)
+    if semantics.failed:
+        raise BQLParseError(['parse failed mysteriously'])
     assert semantics.schema is not None
     return semantics.schema
 
@@ -108,6 +110,8 @@ def parse_failed(self):
 
     def syntax_error(self, (token, text)):
         if token == -1:         # error
+            self.errors.append('Bad token: %r' % (text,))
+        else:
             self.errors.append("Syntax error near [%s] after [%s]" % (
                 text, ' '.join([str(t) for (_t, t) in self.context[:-1]])))