Attachment 87990 Details for Bug 59024 – [cleanup] codegen: factor out copy_into_gvalue

[patch] [cleanup] codegen: factor out copy_into_gvalue

0002-codegen-factor-out-copy_into_gvalue.patch (text/plain), 6.27 KB, created by Simon McVittie on 2013-10-22 15:00:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-10-22 15:00:02 UTC

Size: 6.27 KB

patch

obsolete

>From 9f3b46140808f11f42c3289ba8e34ee52786cbf1 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 21 Oct 2013 16:50:53 +0100
>Subject: [PATCH 02/16] codegen: factor out copy_into_gvalue
>
>---
> tools/glib-client-gen.py | 68 +++++-------------------------------------------
> tools/libglibcodegen.py  | 23 ++++++++++++++++
> 2 files changed, 29 insertions(+), 62 deletions(-)
>
>diff --git a/tools/glib-client-gen.py b/tools/glib-client-gen.py
>index 7d67c71..a0fecf0 100644
>--- a/tools/glib-client-gen.py
>+++ b/tools/glib-client-gen.py
>@@ -28,8 +28,8 @@ import xml.dom.minidom
> from getopt import gnu_getopt
> 
> from libtpcodegen import file_set_contents, key_by_name, u
>-from libglibcodegen import Signature, type_to_gtype, \
>-        get_docstring, xml_escape, get_deprecated
>+from libglibcodegen import (Signature, type_to_gtype,
>+        get_docstring, xml_escape, get_deprecated, copy_into_gvalue)
> 
> 
> NS_TP = "http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
>@@ -205,36 +205,8 @@ class Generator(object):
>                 self.b('  g_value_unset (args->values + %d);' % i)
>                 self.b('  g_value_init (args->values + %d, %s);' % (i, gtype))
> 
>-                if gtype == 'G_TYPE_STRING':
>-                    self.b('  g_value_set_string (args->values + %d, %s);'
>-                           % (i, name))
>-                elif marshaller == 'BOXED':
>-                    self.b('  g_value_set_boxed (args->values + %d, %s);'
>-                           % (i, name))
>-                elif gtype == 'G_TYPE_UCHAR':
>-                    self.b('  g_value_set_uchar (args->values + %d, %s);'
>-                           % (i, name))
>-                elif gtype == 'G_TYPE_BOOLEAN':
>-                    self.b('  g_value_set_boolean (args->values + %d, %s);'
>-                           % (i, name))
>-                elif gtype == 'G_TYPE_INT':
>-                    self.b('  g_value_set_int (args->values + %d, %s);'
>-                           % (i, name))
>-                elif gtype == 'G_TYPE_UINT':
>-                    self.b('  g_value_set_uint (args->values + %d, %s);'
>-                           % (i, name))
>-                elif gtype == 'G_TYPE_INT64':
>-                    self.b('  g_value_set_int (args->values + %d, %s);'
>-                           % (i, name))
>-                elif gtype == 'G_TYPE_UINT64':
>-                    self.b('  g_value_set_uint64 (args->values + %d, %s);'
>-                           % (i, name))
>-                elif gtype == 'G_TYPE_DOUBLE':
>-                    self.b('  g_value_set_double (args->values + %d, %s);'
>-                           % (i, name))
>-                else:
>-                    assert False, ("Don't know how to put %s in a GValue"
>-                                   % gtype)
>+                self.b('  ' + copy_into_gvalue('args->values + %d' % i,
>+                    gtype, marshaller, name))
>                 self.b('')
> 
>             self.b('  tp_proxy_signal_connection_v0_take_results (sc, args);')
>@@ -573,36 +545,8 @@ class Generator(object):
>                 self.b('  g_value_unset (args->values + %d);' % i)
>                 self.b('  g_value_init (args->values + %d, %s);' % (i, gtype))
> 
>-                if gtype == 'G_TYPE_STRING':
>-                    self.b('  g_value_take_string (args->values + %d, %s);'
>-                           % (i, name))
>-                elif marshaller == 'BOXED':
>-                    self.b('  g_value_take_boxed (args->values + %d, %s);'
>-                            % (i, name))
>-                elif gtype == 'G_TYPE_UCHAR':
>-                    self.b('  g_value_set_uchar (args->values + %d, %s);'
>-                            % (i, name))
>-                elif gtype == 'G_TYPE_BOOLEAN':
>-                    self.b('  g_value_set_boolean (args->values + %d, %s);'
>-                            % (i, name))
>-                elif gtype == 'G_TYPE_INT':
>-                    self.b('  g_value_set_int (args->values + %d, %s);'
>-                            % (i, name))
>-                elif gtype == 'G_TYPE_UINT':
>-                    self.b('  g_value_set_uint (args->values + %d, %s);'
>-                            % (i, name))
>-                elif gtype == 'G_TYPE_INT64':
>-                    self.b('  g_value_set_int (args->values + %d, %s);'
>-                            % (i, name))
>-                elif gtype == 'G_TYPE_UINT64':
>-                    self.b('  g_value_set_uint (args->values + %d, %s);'
>-                            % (i, name))
>-                elif gtype == 'G_TYPE_DOUBLE':
>-                    self.b('  g_value_set_double (args->values + %d, %s);'
>-                            % (i, name))
>-                else:
>-                    assert False, ("Don't know how to put %s in a GValue"
>-                                   % gtype)
>+                self.b('  ' + copy_into_gvalue('args->values + %d' % i,
>+                    gtype, marshaller, name))
> 
>             self.b('  tp_proxy_pending_call_v0_take_results (user_data, '
>                    'NULL, args);')
>diff --git a/tools/libglibcodegen.py b/tools/libglibcodegen.py
>index 6cd1a62..0b703a5 100644
>--- a/tools/libglibcodegen.py
>+++ b/tools/libglibcodegen.py
>@@ -170,3 +170,26 @@ def type_to_gtype(s):
> 
>     # we just don't know ..
>     raise Exception("don't know the GType for " + s)
>+
>+
>+def copy_into_gvalue(gvaluep, gtype, marshaller, name):
>+    if gtype == 'G_TYPE_STRING':
>+        return 'g_value_set_string (%s, %s);' % (gvaluep, name)
>+    elif marshaller == 'BOXED':
>+        return 'g_value_set_boxed (%s, %s);' % (gvaluep, name)
>+    elif gtype == 'G_TYPE_UCHAR':
>+        return 'g_value_set_uchar (%s, %s);' % (gvaluep, name)
>+    elif gtype == 'G_TYPE_BOOLEAN':
>+        return 'g_value_set_boolean (%s, %s);' % (gvaluep, name)
>+    elif gtype == 'G_TYPE_INT':
>+        return 'g_value_set_int (%s, %s);' % (gvaluep, name)
>+    elif gtype == 'G_TYPE_UINT':
>+        return 'g_value_set_uint (%s, %s);' % (gvaluep, name)
>+    elif gtype == 'G_TYPE_INT64':
>+        return 'g_value_set_int (%s, %s);' % (gvaluep, name)
>+    elif gtype == 'G_TYPE_UINT64':
>+        return 'g_value_set_uint64 (%s, %s);' % (gvaluep, name)
>+    elif gtype == 'G_TYPE_DOUBLE':
>+        return 'g_value_set_double (%s, %s);' % (gvaluep, name)
>+    else:
>+        raise AssertionError("Don't know how to put %s in a GValue" % gtype)
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 59024: 87989 | 87990 | 87991 | 87992 | 87993 | 87994 | 87995

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.