[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/6] qapi/error.py: move QAPIParseError to parser.py
From: |
John Snow |
Subject: |
[PATCH 3/6] qapi/error.py: move QAPIParseError to parser.py |
Date: |
Tue, 22 Sep 2020 17:21:12 -0400 |
Signed-off-by: John Snow <jsnow@redhat.com>
---
scripts/qapi/error.py | 12 ------------
scripts/qapi/parser.py | 14 +++++++++++++-
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/scripts/qapi/error.py b/scripts/qapi/error.py
index 47f266f33d..ab6a0f6271 100644
--- a/scripts/qapi/error.py
+++ b/scripts/qapi/error.py
@@ -38,17 +38,5 @@ def __str__(self) -> str:
return f"{loc}: {self.msg}"
-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]:
- if ch == '\t':
- col = (col + 7) % 8 + 1
- else:
- col += 1
- super().__init__(parser.info, msg, col)
-
-
class QAPISemError(QAPISourceError):
"""Error class for semantic QAPI errors."""
diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py
index cb2595ce60..7e7eda9ed9 100644
--- a/scripts/qapi/parser.py
+++ b/scripts/qapi/parser.py
@@ -18,10 +18,22 @@
import re
from collections import OrderedDict
-from .error import QAPIError, QAPIParseError, QAPISemError
+from .error import QAPIError, QAPISourceError, QAPISemError
from .source import QAPISourceInfo
+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]:
+ if ch == '\t':
+ col = (col + 7) % 8 + 1
+ else:
+ col += 1
+ super().__init__(parser.info, msg, col)
+
+
class QAPIDocError(QAPIError):
"""Documentation parsing error."""
--
2.26.2
- [PATCH 0/6] qapi: static typing conversion, pt4, John Snow, 2020/09/22
- [PATCH 1/6] qapi/error.py: refactor error classes, John Snow, 2020/09/22
- [PATCH 2/6] qapi/parser.py: remove parser context from QAPIDoc, John Snow, 2020/09/22
- [PATCH 5/6] qapi/error.py: enable mypy checks, John Snow, 2020/09/22
- [PATCH 3/6] qapi/error.py: move QAPIParseError to parser.py,
John Snow <=
- [PATCH 6/6] qapi/error.py: enable pylint checks, John Snow, 2020/09/22
- [PATCH 4/6] qapi/parser.py: refactor QAPIParseError, John Snow, 2020/09/22