RB12-051 Bindings for GIOChannel, GPollFD, GSpawn have been added

Change-Id: If42dcc556229e398edb68a052072a9e5e540d2a6

Author: ogorodnik

contrib/adaformat.py

@@ -781,6 +781,14 @@ def convert_from_c(self):
                 self.cparam,      # name of C type for out parameters
                 c)                # convert from previous line to Ada type
 
+    def record_field_type(self, pkg=None):
+        if self.isArray and self.array_fixed_size is not None:
+            return "%s (1 .. %s)" % (
+                self.as_ada_param(pkg=pkg),
+                self.array_fixed_size)
+        else:
+            return self.as_c_param(pkg=pkg)
+
 
 class AdaNaming(object):
 
@@ -925,6 +933,9 @@ def type(self, name="", cname=None, pkg=None, isArray=False,
         elif name in ("array_of_gdouble", ):
             t = AdaTypeArray("gdouble")
             isArray = True
+        elif name in ("array_of_gchar", ):
+            t = AdaTypeArray("gchar")
+            isArray = True
         elif cname == "void":
             return None
         elif name == "utf8" or cname == "gchar*" or cname == "char*":
@@ -1348,11 +1359,13 @@ def as_call(self, pkg, lang="ada", value=None):
 
 class Parameter(Local_Var):
     __slots__ = ["name", "type", "default", "aliased", "mode", "doc",
-                 "ada_binding", "for_function", "is_temporary_variable"]
+                 "ada_binding", "for_function", "is_temporary_variable",
+                 "c_mode", "ownership", "is_caller_allocates"]
 
     def __init__(self, name, type, default="", doc="", mode="in",
                  for_function=False, ada_binding=True,
-                 is_temporary_variable=False):
+                 is_temporary_variable=False, c_mode="in", ownership="none",
+                 is_caller_allocates=False):
         """
            'mode' is the mode for the Ada subprogram, and is automatically
               converted when generating a subprogram as a direct C import.
@@ -1367,6 +1380,13 @@ def __init__(self, name, type, default="", doc="", mode="in",
            :param is_temporary_variable: True if this parameter represents a
               local variable. In this case, we can sometimes avoid creating
               other such variables, a minor optimization.
+
+           :param 'c_mode' is the original mode of parameter in C
+
+           :param 'ownership' means that caller should free memory if 'full'
+
+           :param is_caller_allocates: True if memory for the parameter should
+              be allocated by method caller
         """
         assert mode in ("in", "out", "in out", "not null access",
                         "access"), "Incorrect mode: %s" % mode
@@ -1377,6 +1397,9 @@ def __init__(self, name, type, default="", doc="", mode="in",
         self.ada_binding = ada_binding
         self.for_function = for_function
         self.is_temporary_variable = is_temporary_variable
+        self.c_mode = c_mode
+        self.ownership = ownership
+        self.is_caller_allocates = is_caller_allocates
 
     def _type(self, lang, pkg):
         mode = self.mode

contrib/binding.py

@@ -449,7 +449,23 @@ def c_params(self, localvars, code):
             n = p.name
             is_temporary = False
 
-            if self.returns is not None and p.mode != "in" and p.ada_binding:
+            # Restore original mode only for arrays now
+            # because generator is not adopted for c_mode = p.c_mod and
+            # generates incorrect code for example for instance parameters
+            c_mode = p.mode
+            if p.type.isArray and p.c_mode == "out" \
+               and p.is_caller_allocates:
+                # C expects an allocated array like for "in out" mode
+                # so we will pass an address of buffer's first element
+                # and do not expect allocation in C
+                c_mode = "in"
+
+            # Pass the array as is, without creating temporary variable
+            as_array = p.type.isArray and p.is_caller_allocates \
+                and p.c_mode in ("in", "in out", "out")
+
+            if self.returns is not None and p.mode != "in" and p.ada_binding \
+               and as_array is False:
                 n = "Acc_%s" % p.name
                 var = Local_Var(
                     name=n,
@@ -476,11 +492,14 @@ def c_params(self, localvars, code):
             # end up with Interfaces.C.Strings.chars_ptr=""
 
             result.append(Parameter(
-                name=n, mode=p.mode, type=p.type,
+                name=n, mode=c_mode, type=p.type,
                 for_function=self.returns is not None,
                 default=p.default if not p.ada_binding else None,
                 is_temporary_variable=is_temporary,
-                ada_binding=p.ada_binding))
+                ada_binding=p.ada_binding,
+                c_mode=p.c_mode,
+                ownership=p.ownership,
+                is_caller_allocates=p.is_caller_allocates))
 
         return result
 
@@ -645,17 +664,25 @@ def _parameters(self, c, gtkmethod, pkg):
             assert direction in ("in", "out", "inout", "access"), \
                 "Invalid value for direction: '%s'" % direction
 
+            is_allocated = (gtkparam.get_caller_allocates() or
+                            p.get("caller-allocates", None)) == "1"
+
+            ownership = (gtkparam.get_transfer_ownership() or
+                         p.get("transfer-ownership", "none")) == "full"
+
             if direction == "inout":
-                mode = "in out"
+                c_mode = "in out"
             elif direction in ("out", "access"):
-                mode = direction
+                c_mode = direction
             elif type.is_ptr:
-                mode = "in out"
+                c_mode = "in out"
             else:
-                mode = "in"
+                c_mode = "in"
 
             if is_function and direction not in ("in", "access"):
                 mode = "access"
+            else:
+                mode = c_mode
 
             doc = _get_clean_doc(p)
             if doc:
@@ -667,7 +694,10 @@ def _parameters(self, c, gtkmethod, pkg):
                           mode=mode,
                           default=default,
                           ada_binding=ada_binding,
-                          doc=doc))
+                          doc=doc,
+                          c_mode=c_mode,
+                          ownership=ownership,
+                          is_caller_allocates=is_allocated))
 
         return result