xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Wei Liu <wei.liu2@citrix.com>
To: xen-devel@lists.xen.org
Cc: Wei Liu <wei.liu2@citrix.com>,
	ian.jackson@eu.citrix.com, ian.campbell@citrix.com
Subject: [PATCH RFC V2 07/10] libxl/gentypes.py: generate JSON object for keyed-union discriminator
Date: Thu, 17 Apr 2014 12:13:08 +0100	[thread overview]
Message-ID: <1397733191-31892-8-git-send-email-wei.liu2@citrix.com> (raw)
In-Reply-To: <1397733191-31892-1-git-send-email-wei.liu2@citrix.com>

Parser relies on the discriminator to go to correct branch.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 tools/libxl/gentypes.py |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/libxl/gentypes.py b/tools/libxl/gentypes.py
index 61a2b3d..8d7183a 100644
--- a/tools/libxl/gentypes.py
+++ b/tools/libxl/gentypes.py
@@ -229,6 +229,11 @@ def libxl_C_type_gen_json(ty, v, indent = "    ", parent = None):
                 s += "        goto out;\n"
             s += "    break;\n"
         s += "}\n"
+        s += "s = yajl_gen_string(hand, (const unsigned char *)\"%s\", sizeof(\"%s\")-1);\n" \
+             % (ty.keyvar.name, ty.keyvar.name)
+        s += "if (s != yajl_gen_status_ok)\n"
+        s += "    goto out;\n"
+        s += libxl_C_type_gen_json(ty.keyvar.type, (parent + ty.keyvar.name), indent, parent)
     elif isinstance(ty, idl.Struct) and (parent is None or ty.json_gen_fn is None):
         s += "s = yajl_gen_map_open(hand);\n"
         s += "if (s != yajl_gen_status_ok)\n"
-- 
1.7.10.4

  parent reply	other threads:[~2014-04-17 11:13 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-17 11:13 [PATCH RFC V2 00/10] xl/libxl: JSON infrastructure and new "xl-json" format Wei Liu
2014-04-17 11:13 ` [PATCH RFC V2 01/10] libxl IDL: rename json_fn to json_gen_fn Wei Liu
2014-04-17 11:13 ` [PATCH RFC V2 02/10] libxl_json: introduce libx__object_from_json Wei Liu
2014-04-22 14:49   ` Ian Campbell
2014-04-17 11:13 ` [PATCH RFC V2 03/10] libxl_internal: make JSON_* types bit-field Wei Liu
2014-04-22 14:50   ` Ian Campbell
2014-04-17 11:13 ` [PATCH RFC V2 04/10] libxl_internal: introduce libxl__json_object_is_{null, number, double} Wei Liu
2014-04-17 11:13 ` [PATCH RFC V2 05/10] libxl_json: introduce parser functions for builtin types Wei Liu
2014-04-22 15:09   ` Ian Campbell
2014-04-23 10:01     ` Wei Liu
2014-04-23 10:12       ` Ian Campbell
2014-04-23 10:19         ` Wei Liu
2014-04-23 10:31           ` Ian Campbell
2014-04-23 10:42             ` Wei Liu
2014-04-23 11:14               ` Wei Liu
2014-04-23 11:41                 ` Ian Campbell
2014-04-23 12:00                   ` Wei Liu
2014-04-24 15:28             ` Ian Jackson
2014-04-23 15:20       ` Wei Liu
2014-04-24 15:29         ` Ian Jackson
2014-04-17 11:13 ` [PATCH RFC V2 06/10] libxl_json: allow basic JSON type objects generation Wei Liu
2014-04-22 15:22   ` Ian Campbell
2014-04-23 10:15     ` Wei Liu
2014-04-23 10:30       ` Ian Campbell
2014-04-23 10:36         ` Wei Liu
2014-04-23 11:39           ` Ian Campbell
2014-04-17 11:13 ` Wei Liu [this message]
2014-04-22 15:27   ` [PATCH RFC V2 07/10] libxl/gentypes.py: generate JSON object for keyed-union discriminator Ian Campbell
2014-04-22 15:32     ` Wei Liu
2014-04-17 11:13 ` [PATCH RFC V2 08/10] libxl IDL: generate code to parse libxl__json_object to libxl_FOO struct Wei Liu
2014-04-22 15:46   ` Ian Campbell
2014-04-22 15:54     ` Wei Liu
2014-04-22 16:01       ` Ian Campbell
2014-04-22 16:12         ` Wei Liu
2014-04-17 11:13 ` [PATCH RFC V2 09/10] libxl/gentest.py: test JSON parser Wei Liu
2014-04-22 15:47   ` Ian Campbell
2014-04-22 15:49     ` Wei Liu
2014-04-22 15:58       ` Ian Campbell
2014-04-17 11:13 ` [PATCH RFC V2 10/10] xl: introduce "xl-json" format Wei Liu
2014-04-19  8:35   ` Wei Liu
2014-04-22 10:15     ` Ian Campbell
2014-04-22 10:25       ` Wei Liu
2014-04-22 10:33         ` Ian Campbell
2014-04-22 13:50           ` Ian Jackson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1397733191-31892-8-git-send-email-wei.liu2@citrix.com \
    --to=wei.liu2@citrix.com \
    --cc=ian.campbell@citrix.com \
    --cc=ian.jackson@eu.citrix.com \
    --cc=xen-devel@lists.xen.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).