|
 |
e84a35 |
From e602b653c191e18cbb63db6526aac77c368ed70b Mon Sep 17 00:00:00 2001
|
|
|
e84a35 |
From: Daniel Martin <consume.noise@gmail.com>
|
|
|
e84a35 |
Date: Mon, 13 May 2013 23:33:04 +0200
|
|
|
e84a35 |
Subject: [PATCH] c_client.py: Handle multiple expr. in a bitcase
|
|
|
e84a35 |
|
|
|
e84a35 |
Adopt a change from xcbgen. With that modification the expression in a
|
|
|
e84a35 |
bitcase became a list of expressions to support multiple <enumref> in a
|
|
|
e84a35 |
<bitcase>.
|
|
|
e84a35 |
|
|
|
e84a35 |
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
|
|
|
e84a35 |
Signed-off-by: Peter Harris <pharris@opentext.com>
|
|
|
e84a35 |
---
|
|
|
e84a35 |
src/c_client.py | 18 ++++++++++++++----
|
|
|
e84a35 |
1 file changed, 14 insertions(+), 4 deletions(-)
|
|
|
e84a35 |
|
|
|
e84a35 |
diff --git a/src/c_client.py b/src/c_client.py
|
|
|
e84a35 |
index ec66223..942e78a 100644
|
|
|
e84a35 |
--- a/src/c_client.py
|
|
|
e84a35 |
+++ b/src/c_client.py
|
|
|
e84a35 |
@@ -687,10 +687,20 @@ def _c_serialize_helper_switch(context, self, complex_name,
|
|
|
e84a35 |
switch_expr = _c_accessor_get_expr(self.expr, None)
|
|
|
e84a35 |
|
|
|
e84a35 |
for b in self.bitcases:
|
|
|
e84a35 |
- bitcase_expr = _c_accessor_get_expr(b.type.expr, None)
|
|
|
e84a35 |
- code_lines.append(' if(%s & %s) {' % (switch_expr, bitcase_expr))
|
|
|
e84a35 |
-# code_lines.append(' printf("switch %s: entering bitcase section %s (mask=%%%%d)...\\n", %s);' %
|
|
|
e84a35 |
-# (self.name[-1], b.type.name[-1], bitcase_expr))
|
|
|
e84a35 |
+ len_expr = len(b.type.expr)
|
|
|
e84a35 |
+ for n, expr in enumerate(b.type.expr):
|
|
|
e84a35 |
+ bitcase_expr = _c_accessor_get_expr(expr, None)
|
|
|
e84a35 |
+ # only one <enumref> in the <bitcase>
|
|
|
e84a35 |
+ if len_expr == 1:
|
|
|
e84a35 |
+ code_lines.append(' if(%s & %s) {' % (switch_expr, bitcase_expr))
|
|
|
e84a35 |
+ # multiple <enumref> in the <bitcase>
|
|
|
e84a35 |
+ elif n == 0: # first
|
|
|
e84a35 |
+ code_lines.append(' if((%s & %s) ||' % (switch_expr, bitcase_expr))
|
|
|
e84a35 |
+ elif len_expr == (n + 1): # last
|
|
|
e84a35 |
+ code_lines.append(' (%s & %s)) {' % (switch_expr, bitcase_expr))
|
|
|
e84a35 |
+ else: # between first and last
|
|
|
e84a35 |
+ code_lines.append(' (%s & %s) ||' % (switch_expr, bitcase_expr))
|
|
|
e84a35 |
+
|
|
|
e84a35 |
b_prefix = prefix
|
|
|
e84a35 |
if b.type.has_name:
|
|
|
e84a35 |
b_prefix = prefix + [(b.c_field_name, '.', b.type)]
|
|
|
e84a35 |
--
|
|
|
e84a35 |
2.1.0
|
|
|
e84a35 |
|