Skip to content

Commit

Permalink
qapi/error: Repurpose QAPIError as an abstract base exception class
Browse files Browse the repository at this point in the history
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 <[email protected]>
Message-Id: <[email protected]>
Reviewed-by: Markus Armbruster <[email protected]>
Signed-off-by: Markus Armbruster <[email protected]>
  • Loading branch information
jnsnow authored and Markus Armbruster committed Apr 30, 2021
1 parent e81718c commit 46f4946
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
3 changes: 2 additions & 1 deletion docs/sphinx/qapidoc.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
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
Expand Down
11 changes: 9 additions & 2 deletions scripts/qapi/error.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -27,7 +32,8 @@ def __str__(self):
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]:
Expand All @@ -38,6 +44,7 @@ def __init__(self, parser, msg):
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)
5 changes: 3 additions & 2 deletions scripts/qapi/schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
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

Expand Down Expand Up @@ -875,7 +875,8 @@ def _def_entity(self, ent):
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))
Expand Down

0 comments on commit 46f4946

Please sign in to comment.