From: Ian Jackson <ian.jack...@eu.citrix.com>
This patch adds support for union members which have their own type name.
Signed-off-by: Ian Jackson <ian.jack...@eu.citrix.com>
---
This is a pre-requisite for the PVHv1 removal patch.
---
Cc: David Scott <d...@recoil.org>
Cc: Ian Jackson <ian.jack...@eu.citrix.com>
Cc: Wei Liu <wei.l...@citrix.com>
---
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)
--
2.10.1 (Apple Git-78)
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
