From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35008) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwyZV-0001NL-D6 for qemu-devel@nongnu.org; Wed, 10 Jul 2013 13:52:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UwyZT-0004gW-MC for qemu-devel@nongnu.org; Wed, 10 Jul 2013 13:52:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48309) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwyZT-0004g9-E0 for qemu-devel@nongnu.org; Wed, 10 Jul 2013 13:52:55 -0400 From: Luiz Capitulino Date: Wed, 10 Jul 2013 13:52:43 -0400 Message-Id: <1373478767-20965-3-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1373478767-20965-1-git-send-email-lcapitulino@redhat.com> References: <1373478767-20965-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PULL 2/6] qapi.py: Avoid code duplication List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com From: Kevin Wolf 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 Reviewed-by: Michael Roth Signed-off-by: Luiz Capitulino --- 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