From patchwork Fri Mar 3 12:25:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 9602655 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A8493600CB for ; Fri, 3 Mar 2017 12:28:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 95C44285EC for ; Fri, 3 Mar 2017 12:28:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8631A285F7; Fri, 3 Mar 2017 12:28:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E78B9285EC for ; Fri, 3 Mar 2017 12:28:08 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjmHS-0002dX-GI; Fri, 03 Mar 2017 12:25:54 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjmHQ-0002dH-GP for xen-devel@lists.xenproject.org; Fri, 03 Mar 2017 12:25:52 +0000 Received: from [193.109.254.147] by server-3.bemta-6.messagelabs.com id 54/8E-27751-FC069B85; Fri, 03 Mar 2017 12:25:51 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprAIsWRWlGSWpSXmKPExsXitHRDpO75hJ0 RBh8bJC2+b5nM5MDocfjDFZYAxijWzLyk/IoE1ozuxmmsBe/5Kk7tb2FsYPzH1cXIySEh4C+x evYRRhCbTUBH4uLcnWxdjBwcIgIqErf3GoCEmQWyJDafbGYDsYUFPCUe7WxhB7FZgEoub77JA mLzClhKPDh6mAVipJ7EriO/WUFsTgEriZ0/14DFhYBqnv59D2UrSvTPe8AG0SsocXLmExaIXR ISB1+8YJ7AyDsLSWoWktQCRqZVjBrFqUVlqUW6hhZ6SUWZ6RkluYmZObqGBmZ6uanFxYnpqTm JScV6yfm5mxiBocMABDsYb24MOMQoycGkJMrLY7szQogvKT+lMiOxOCO+qDQntfgQowwHh5IE b008UE6wKDU9tSItMwcYxDBpCQ4eJRFeRpA0b3FBYm5xZjpE6hSjLsec2bvfMAmx5OXnpUqJ8 zqDFAmAFGWU5sGNgEXUJUZZKWFeRqCjhHgKUotyM0tQ5V8xinMwKgnzcoJM4cnMK4Hb9AroCC agI/xkwI4oSURISTUw2nis/sxZ5rX9+/yJP6+fu+HxXuDB5ri/Z+7L19xRCOyMb7n5v9tfce2 +6LumC1/s/hG7Y+4hDvGdB0Uye7ScT0S27xYU39Ji1rL6vKrytS8xjjdeekauWmHs+2XiIr8S NnkmvxOXHZXP1TXPtjvOWMyp/M1yOuNE/o0HZ7953lCwn2dx3uWaC0osxRmJhlrMRcWJAD+Py V+jAgAA X-Env-Sender: prvs=228436a49=roger.pau@citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1488543949!90057843!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 62795 invoked from network); 3 Mar 2017 12:25:51 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-6.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 3 Mar 2017 12:25:51 -0000 X-IronPort-AV: E=Sophos;i="5.35,237,1484006400"; d="scan'208";a="411192371" From: Roger Pau Monne To: Date: Fri, 3 Mar 2017 12:25:05 +0000 Message-ID: <20170303122508.87465-2-roger.pau@citrix.com> X-Mailer: git-send-email 2.10.1 (Apple Git-78) In-Reply-To: <20170303122508.87465-1-roger.pau@citrix.com> References: <20170303122508.87465-1-roger.pau@citrix.com> MIME-Version: 1.0 Cc: Wei Liu , Ian Jackson , David Scott Subject: [Xen-devel] [PATCH v3 1/4] ocaml/gen: fix ocaml type/code generator from IDL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Ian Jackson This patch adds support for union members which have their own type name. Signed-off-by: Ian Jackson Reviewed-by: Wei Liu Acked-by: David Scott --- This is a pre-requisite for the PVHv1 removal patch. --- Cc: David Scott Cc: Ian Jackson Cc: Wei Liu --- tools/ocaml/libs/xl/genwrap.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index 1c8ad81..9a65d73 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -155,7 +155,7 @@ def gen_ocaml_keyedunions(ty, interface, indent, parent = None): u.append("%s" % (f.name.capitalize())) elif isinstance(f.type, idl.Struct): if f.type.rawname is not None: - u.append("%s of %s" % (f.name.capitalize(), f.type.rawname.capitalize())) + u.append("%s of %s.t" % (f.name.capitalize(), f.type.rawname.capitalize())) elif f.type.has_fields(): u.append("%s of %s_%s" % (f.name.capitalize(), nparent, f.name)) else: @@ -325,7 +325,7 @@ def c_val(ty, c, o, indent="", parent = None): s += "\t\t case %d:\n" % (n) s += "\t\t %s = %s;\n" % (parent + ty.keyvar.name, f.enumname) (nparent,fexpr) = ty.member(c, f, False) - s += "%s" % c_val(f.type, fexpr, "Field(%s, 0)" % o, indent=indent+"\t\t ") + s += "%s" % c_val(f.type, fexpr, "Field(%s, 0)" % o, parent=nparent, indent=indent+"\t\t ") s += "break;\n" n += 1 s += "\t\t default: failwith_xl(ERROR_FAIL, \"variant handling bug %s%s (block)\"); break;\n" % (parent, ty.keyvar.name)