qapi/error: Repurpose QAPIError as an abstract base exception class
Rename QAPIError to QAPISourceError, and then create a new QAPIError class that serves as the basis for all of our other custom exceptions, without specifying any class properties. This leaves QAPIError as a package-wide error class that's suitable for any current or future errors. (Right now, we don't have any errors that DON'T also want to specify a Source location, but this MAY change. In these cases, a common abstract ancestor would be desired.) Add docstrings to explain the intended function of each error class. Signed-off-by: John Snow <jsnow@redhat.com> Message-Id: <20210421192233.3542904-2-jsnow@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
parent
e81718c698
commit
46f49468c6
@ -34,7 +34,8 @@ from sphinx.errors import ExtensionError
|
||||
from sphinx.util.nodes import nested_parse_with_titles
|
||||
import sphinx
|
||||
from qapi.gen import QAPISchemaVisitor
|
||||
from qapi.schema import QAPIError, QAPISemError, QAPISchema
|
||||
from qapi.error import QAPIError, QAPISemError
|
||||
from qapi.schema import QAPISchema
|
||||
|
||||
|
||||
# Sphinx up to 1.6 uses AutodocReporter; 1.7 and later
|
||||
|
@ -13,6 +13,11 @@
|
||||
|
||||
|
||||
class QAPIError(Exception):
|
||||
"""Base class for all exceptions from the QAPI package."""
|
||||
|
||||
|
||||
class QAPISourceError(QAPIError):
|
||||
"""Error class for all exceptions identifying a source location."""
|
||||
def __init__(self, info, col, msg):
|
||||
Exception.__init__(self)
|
||||
self.info = info
|
||||
@ -27,7 +32,8 @@ class QAPIError(Exception):
|
||||
return loc + ': ' + self.msg
|
||||
|
||||
|
||||
class QAPIParseError(QAPIError):
|
||||
class QAPIParseError(QAPISourceError):
|
||||
"""Error class for all QAPI schema parsing errors."""
|
||||
def __init__(self, parser, msg):
|
||||
col = 1
|
||||
for ch in parser.src[parser.line_pos:parser.pos]:
|
||||
@ -38,6 +44,7 @@ class QAPIParseError(QAPIError):
|
||||
super().__init__(parser.info, col, msg)
|
||||
|
||||
|
||||
class QAPISemError(QAPIError):
|
||||
class QAPISemError(QAPISourceError):
|
||||
"""Error class for semantic QAPI errors."""
|
||||
def __init__(self, info, msg):
|
||||
super().__init__(info, None, msg)
|
||||
|
@ -20,7 +20,7 @@ import re
|
||||
from typing import Optional
|
||||
|
||||
from .common import POINTER_SUFFIX, c_name
|
||||
from .error import QAPIError, QAPISemError
|
||||
from .error import QAPISemError, QAPISourceError
|
||||
from .expr import check_exprs
|
||||
from .parser import QAPISchemaParser
|
||||
|
||||
@ -875,7 +875,8 @@ class QAPISchema:
|
||||
other_ent = self._entity_dict.get(ent.name)
|
||||
if other_ent:
|
||||
if other_ent.info:
|
||||
where = QAPIError(other_ent.info, None, "previous definition")
|
||||
where = QAPISourceError(other_ent.info, None,
|
||||
"previous definition")
|
||||
raise QAPISemError(
|
||||
ent.info,
|
||||
"'%s' is already defined\n%s" % (ent.name, where))
|
||||
|
Loading…
Reference in New Issue
Block a user