[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/6] qapi.py: Avoid code duplication
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 2/6] qapi.py: Avoid code duplication |
Date: |
Wed, 10 Jul 2013 13:52:43 -0400 |
From: Kevin Wolf <address@hidden>
The code that interprets the read JSON expression and appends types to
the respective global variables was duplicated. We can avoid that by
splitting off the part that reads from the file.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
scripts/qapi.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 02ad668..3139994 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -78,10 +78,8 @@ def parse(tokens):
def evaluate(string):
return parse(map(lambda x: x, tokenize(string)))[0]
-def parse_schema(fp):
- exprs = []
+def get_expr(fp):
expr = ''
- expr_eval = None
for line in fp:
if line.startswith('#') or line == '\n':
@@ -90,18 +88,20 @@ def parse_schema(fp):
if line.startswith(' '):
expr += line
elif expr:
- expr_eval = evaluate(expr)
- if expr_eval.has_key('enum'):
- add_enum(expr_eval['enum'])
- elif expr_eval.has_key('union'):
- add_enum('%sKind' % expr_eval['union'])
- exprs.append(expr_eval)
+ yield expr
expr = line
else:
expr += line
if expr:
+ yield expr
+
+def parse_schema(fp):
+ exprs = []
+
+ for expr in get_expr(fp):
expr_eval = evaluate(expr)
+
if expr_eval.has_key('enum'):
add_enum(expr_eval['enum'])
elif expr_eval.has_key('union'):
--
1.8.1.4
- [Qemu-devel] [PULL 0/6] QMP queue, Luiz Capitulino, 2013/07/10
- [Qemu-devel] [PULL 1/6] qemu-char: Fix ringbuf option size, Luiz Capitulino, 2013/07/10
- [Qemu-devel] [PULL 2/6] qapi.py: Avoid code duplication,
Luiz Capitulino <=
- [Qemu-devel] [PULL 4/6] qapi-schema: Use BlockdevSnapshot type for blockdev-snapshot-sync, Luiz Capitulino, 2013/07/10
- [Qemu-devel] [PULL 3/6] qapi.py: Allow top-level type reference for command definitions, Luiz Capitulino, 2013/07/10
- [Qemu-devel] [PULL 5/6] qapi-schema: Use existing type for drive-backup arguments, Luiz Capitulino, 2013/07/10
- [Qemu-devel] [PULL 6/6] add timestamp to error_report(), Luiz Capitulino, 2013/07/10