gobject-introspection 2.0.2-x86-mingw32 → 2.0.3-x86-mingw32

data/vendor/local/lib/gobject-introspection/giscanner/sectionparser.py

@@ -18,24 +18,29 @@
 #
 
 import re
-import sys
+from . import ast
+from .utils import to_underscores
 
-class SectionFile(object):
+
+class SectionsFile(object):
     def __init__(self, sections):
         self.sections = sections
 
+
 class Section(object):
     def __init__(self):
         self.file = None
         self.title = None
-        self.main_subsection = Subsection(None)
+        self.includes = None
         self.subsections = []
 
+
 class Subsection(object):
     def __init__(self, name):
         self.name = name
         self.symbols = []
 
+
 def parse_sections_file(lines):
     sections = []
     current_section = None
@@ -50,29 +55,98 @@ def parse_sections_file(lines):
         if line == "<SECTION>":
             current_section = Section()
             sections.append(current_section)
-            current_subsection = current_section.main_subsection
+            current_subsection = Subsection(None)
+            current_section.subsections.append(current_subsection)
             continue
 
         if line == "</SECTION>":
             current_section = None
             continue
 
-        match = re.match(line, r"<FILE>(?P<contents>.*)</FILE>")
+        match = re.match(r"<FILE>(?P<contents>.*)</FILE>", line)
         if match:
             current_section.file = match.groupdict['contents']
             continue
 
-        match = re.match(line, r"<TITLE>(?P<contents>.*)</TITLE>")
+        match = re.match(r"<TITLE>(?P<contents>.*)</TITLE>", line)
         if match:
             current_section.title = match.groupdict['contents']
             continue
 
-        match = re.match(line, r"<SUBSECTION (?P<name>).*>")
+        match = re.match(r"<INCLUDE>(?P<contents>.*)</INCLUDE>", line)
         if match:
-            current_subsection = Section(match.groupdict['name'])
+            current_section.includes = match.groupdict['contents']
+            continue
+
+        match = re.match(r"<SUBSECTION(?: (?P<name>.*))?>", line)
+        if match:
+            current_subsection = Subsection(match.groupdict.get('name', None))
             current_section.subsections.append(current_subsection)
             continue
 
+        if line.startswith("<") and line.endswith(">"):
+            # Other directive to gtk-doc, not a symbol.
+            continue
+
         current_subsection.symbols.append(line)
 
-    return SectionFile(sections)
+    return SectionsFile(sections)
+
+
+def write_sections_file(f, sections_file):
+    for section in sections_file.sections:
+        f.write("\n<SECTION>\n")
+        if section.file is not None:
+            f.write("<FILE>%s</FILE>\n" % (section.file, ))
+        if section.title is not None:
+            f.write("<TITLE>%s</TITLE>\n" % (section.title, ))
+        if section.includes is not None:
+            f.write("<INCLUDE>%s</INCLUDE>\n" % (section.includes, ))
+
+        is_first_subsection = True
+        for subsection in section.subsections:
+            if subsection.name is not None:
+                f.write("<SUBSECTION %s>\n" % (subsection.name, ))
+            elif not is_first_subsection:
+                f.write("\n<SUBSECTION>\n")
+
+            is_first_subsection = False
+
+            for symbol in subsection.symbols:
+                f.write(symbol + "\n")
+
+
+def generate_sections_file(transformer):
+    ns = transformer.namespace
+
+    sections = []
+
+    def new_section(file_, title):
+        section = Section()
+        section.file = file_
+        section.title = title
+        section.subsections.append(Subsection(None))
+        sections.append(section)
+        return section
+
+    def append_symbol(section, sym):
+        section.subsections[0].symbols.append(sym)
+
+    general_section = new_section("main", "Main")
+
+    for node in ns.itervalues():
+        if isinstance(node, ast.Function):
+            append_symbol(general_section, node.symbol)
+        elif isinstance(node, (ast.Class, ast.Interface)):
+            gtype_name = node.gtype_name
+            file_name = to_underscores(gtype_name).replace('_', '-').lower()
+            section = new_section(file_name, gtype_name)
+            append_symbol(section, gtype_name)
+            append_symbol(section, node.glib_type_struct.target_giname.replace('.', ''))
+
+            for meth in node.methods:
+                append_symbol(section, meth.symbol)
+            for meth in node.static_methods:
+                append_symbol(section, meth.symbol)
+
+    return SectionsFile(sections)

data/vendor/local/lib/gobject-introspection/giscanner/shlibs.py

@@ -26,6 +26,7 @@ import subprocess
 
 from .utils import get_libtool_command, extract_libtool_shlib
 
+
 # For .la files, the situation is easy.
 def _resolve_libtool(options, binary, libraries):
     shlibs = []
@@ -36,6 +37,7 @@ def _resolve_libtool(options, binary, libraries):
 
     return shlibs
 
+
 # Assume ldd output is something vaguely like
 #
 #  libpangoft2-1.0.so.0 => /usr/lib/libpangoft2-1.0.so.0 (0x006c1000)
@@ -51,6 +53,7 @@ def _ldd_library_pattern(library_name):
     return re.compile("(?<![A-Za-z0-9_-])(lib*%s[^A-Za-z0-9_-][^\s\(\)]*)"
                       % re.escape(library_name))
 
+
 # This is a what we do for non-la files. We assume that we are on an
 # ELF-like system where ldd exists and the soname extracted with ldd is
 # a filename that can be opened with dlopen().
@@ -68,7 +71,7 @@ def _resolve_non_libtool(options, binary, libraries):
     if not libraries:
         return []
 
-    if os.name == 'OpenBSD':
+    if platform.platform().startswith('OpenBSD'):
         # Hack for OpenBSD when using the ports' libtool which uses slightly
         # different directories to store the libraries in. So rewite binary.args[0]
         # by inserting '.libs/'.
@@ -118,6 +121,7 @@ def _resolve_non_libtool(options, binary, libraries):
 
     return shlibs
 
+
 # We want to resolve a set of library names (the <foo> of -l<foo>)
 # against a library to find the shared library name. The shared
 # library name is suppose to be what you pass to dlopen() (or

data/vendor/local/lib/gobject-introspection/giscanner/sourcescanner.py

@@ -32,6 +32,10 @@ with LibtoolImporter(None, None):
     else:
         from giscanner._giscanner import SourceScanner as CSourceScanner
 
+HEADER_EXTS = ['.h', '.hpp', '.hxx']
+SOURCE_EXTS = ['.c', '.cpp', '.cc', '.cxx']
+ALL_EXTS = SOURCE_EXTS + HEADER_EXTS
+
 (CSYMBOL_TYPE_INVALID,
  CSYMBOL_TYPE_ELLIPSIS,
  CSYMBOL_TYPE_CONST,
@@ -89,8 +93,7 @@ def symbol_type_name(symbol_type):
         CSYMBOL_TYPE_UNION: 'union',
         CSYMBOL_TYPE_ENUM: 'enum',
         CSYMBOL_TYPE_TYPEDEF: 'typedef',
-        CSYMBOL_TYPE_MEMBER: 'member',
-        }.get(symbol_type)
+        CSYMBOL_TYPE_MEMBER: 'member'}.get(symbol_type)
 
 
 def ctype_name(ctype):
@@ -104,8 +107,7 @@ def ctype_name(ctype):
         CTYPE_ENUM: 'enum',
         CTYPE_POINTER: 'pointer',
         CTYPE_ARRAY: 'array',
-        CTYPE_FUNCTION: 'function',
-        }.get(ctype)
+        CTYPE_FUNCTION: 'function'}.get(ctype)
 
 
 class SourceType(object):
@@ -241,8 +243,7 @@ class SourceScanner(object):
 
         headers = []
         for filename in filenames:
-            if (filename.endswith('.c') or filename.endswith('.cpp') or
-                filename.endswith('.cc') or filename.endswith('.cxx')):
+            if os.path.splitext(filename)[1] in SOURCE_EXTS:
                 filename = os.path.abspath(filename)
                 self._scanner.lex_filename(filename)
             else:
@@ -263,7 +264,7 @@ class SourceScanner(object):
         return self._scanner.get_comments()
 
     def dump(self):
-        print '-'*30
+        print '-' * 30
         for symbol in self._scanner.get_symbols():
             print symbol.ident, symbol.base_type.name, symbol.type
 
@@ -275,19 +276,17 @@ class SourceScanner(object):
 
         defines = ['__GI_SCANNER__']
         undefs = []
-        cpp_exec = os.environ.get('CC', 'cc').split()
-        # The Microsoft compiler/preprocessor (cl) does not accept
-        # source input from stdin (the '-' flag), so we need
-        # some help from gcc from MinGW/Cygwin or so.
-        # Note that the generated dumper program is
-        # still built and linked by Visual C++.
-        if 'cl' in cpp_exec:
-            cpp_args = 'gcc'.split()
-        else:
-            cpp_args = cpp_exec
+        cpp_args = os.environ.get('CC', 'cc').split()  # support CC="ccache gcc"
+        if 'cl' in cpp_args:
+            # The Microsoft compiler/preprocessor (cl) does not accept
+            # source input from stdin (the '-' flag), so we need
+            # some help from gcc from MinGW/Cygwin or so.
+            # Note that the generated dumper program is
+            # still built and linked by Visual C++.
+            cpp_args = ['gcc']
         cpp_args += ['-E', '-C', '-I.', '-']
-
         cpp_args += self._cpp_options
+
         proc = subprocess.Popen(cpp_args,
                                 stdin=subprocess.PIPE,
                                 stdout=subprocess.PIPE)
@@ -303,8 +302,8 @@ class SourceScanner(object):
             proc.stdin.write('#include <%s>\n' % (filename, ))
         proc.stdin.close()
 
-        tmp = tempfile.mktemp()
-        fp = open(tmp, 'w+')
+        tmp_fd, tmp_name = tempfile.mkstemp()
+        fp = os.fdopen(tmp_fd, 'w+b')
         while True:
             data = proc.stdout.read(4096)
             if data is None:
@@ -321,4 +320,4 @@ class SourceScanner(object):
 
         self._scanner.parse_file(fp.fileno())
         fp.close()
-        os.unlink(tmp)
+        os.unlink(tmp_name)

data/vendor/local/lib/gobject-introspection/giscanner/testcodegen.py

@@ -27,12 +27,14 @@ DEFAULT_C_VALUES = {ast.TYPE_ANY: 'NULL',
                     ast.TYPE_FILENAME: '""',
                     ast.TYPE_GTYPE: 'g_object_get_type ()'}
 
+
 def get_default_for_typeval(typeval):
     default = DEFAULT_C_VALUES.get(typeval)
     if default:
         return default
     return "0"
 
+
 def uscore_from_type(typeval):
     if typeval.target_fundamental:
         return typeval.target_fundamental.replace(' ', '_')
@@ -41,6 +43,7 @@ def uscore_from_type(typeval):
     else:
         assert False, typeval
 
+
 class EverythingCodeGenerator(object):
 
     def __init__(self, out_h_filename, out_c_filename):

data/vendor/local/lib/gobject-introspection/giscanner/transformer.py

@@ -34,6 +34,7 @@ from .sourcescanner import (
     CSYMBOL_TYPE_MEMBER, CSYMBOL_TYPE_ELLIPSIS, CSYMBOL_TYPE_CONST,
     TYPE_QUALIFIER_CONST, TYPE_QUALIFIER_VOLATILE)
 
+
 class TransformerException(Exception):
     pass
 
@@ -54,10 +55,9 @@ class Transformer(object):
         self._namespace = namespace
         self._pkg_config_packages = set()
         self._typedefs_ns = {}
-        self._parsed_includes = {} # <string namespace -> Namespace>
+        self._parsed_includes = {}  # <string namespace -> Namespace>
         self._includepaths = []
         self._passthrough_mode = False
-        self._annotations = {}
 
     def get_pkgconfig_packages(self):
         return self._pkg_config_packages
@@ -68,9 +68,6 @@ class Transformer(object):
     def set_passthrough_mode(self):
         self._passthrough_mode = True
 
-    def set_annotations(self, annotations):
-        self._annotations = annotations
-
     def _append_new_node(self, node):
         original = self._namespace.get(node.name)
         # Special case constants here; we allow duplication to sort-of
@@ -108,7 +105,7 @@ class Transformer(object):
             if not ns_compound:
                 ns_compound = self._namespace.get('_' + compound.name)
             if (not ns_compound and isinstance(compound, (ast.Record, ast.Union))
-                and len(compound.fields) == 0):
+            and len(compound.fields) == 0):
                 disguised = ast.Record(compound.name, typedef, disguised=True)
                 self._namespace.append(disguised)
             elif not ns_compound:
@@ -130,8 +127,8 @@ class Transformer(object):
     def register_include_uninstalled(self, include_path):
         basename = os.path.basename(include_path)
         if not basename.endswith('.gir'):
-            raise SystemExit(
-"Include path %r must be a filename path ending in .gir" % (include_path, ))
+            raise SystemExit("Include path %r must be a filename path "
+                             "ending in .gir" % (include_path, ))
         girname = basename[:-4]
         include = ast.Include.from_string(girname)
         if include in self._namespace.includes:
@@ -179,8 +176,7 @@ None."""
             path = os.path.join(d, girname)
             if os.path.exists(path):
                 return path
-        sys.stderr.write("Couldn't find include %r (search path: %r)\n"\
-                         % (girname, searchdirs))
+        sys.stderr.write("Couldn't find include %r (search path: %r)\n" % (girname, searchdirs))
         sys.exit(1)
 
     @classmethod
@@ -232,7 +228,7 @@ currently-scanned namespace is first."""
 
     def _split_c_string_for_namespace_matches(self, name, is_identifier=False):
         matches = []  # Namespaces which might contain this name
-        unprefixed_namespaces = [] # Namespaces with no prefix, last resort
+        unprefixed_namespaces = []  # Namespaces with no prefix, last resort
         for ns in self._iter_namespaces():
             if is_identifier:
                 prefixes = ns.identifier_prefixes
@@ -289,7 +285,7 @@ raise ValueError."""
             ident = ident[1:]
         try:
             matches = self.split_ctype_namespaces(ident)
-        except ValueError, e:
+        except ValueError as e:
             raise TransformerException(str(e))
         for ns, name in matches:
             if ns is self._namespace:
@@ -309,7 +305,7 @@ raise ValueError."""
             ident = ident[1:]
         try:
             (ns, name) = self.split_csymbol(ident)
-        except ValueError, e:
+        except ValueError as e:
             raise TransformerException(str(e))
         if ns != self._namespace:
             raise TransformerException(
@@ -383,7 +379,7 @@ raise ValueError."""
                 # prefix.
                 try:
                     name = self._strip_symbol(child)
-                except TransformerException, e:
+                except TransformerException as e:
                     message.warn_symbol(symbol, e)
                     return None
             members.append(ast.Member(name.lower(),
@@ -393,7 +389,7 @@ raise ValueError."""
 
         try:
             enum_name = self.strip_identifier(symbol.ident)
-        except TransformerException, e:
+        except TransformerException as e:
             message.warn_symbol(symbol, e)
             return None
         if symbol.base_type.is_bitfield:
@@ -412,7 +408,7 @@ raise ValueError."""
         return_ = self._create_return(symbol.base_type.base_type)
         try:
             name = self._strip_symbol(symbol)
-        except TransformerException, e:
+        except TransformerException as e:
             message.warn_symbol(symbol, e)
             return None
         func = ast.Function(name, return_, parameters, False, symbol.ident)
@@ -506,8 +502,8 @@ raise ValueError."""
 
     def _create_member(self, symbol, parent_symbol=None):
         source_type = symbol.base_type
-        if (source_type.type == CTYPE_POINTER and
-            symbol.base_type.base_type.type == CTYPE_FUNCTION):
+        if (source_type.type == CTYPE_POINTER
+        and symbol.base_type.base_type.type == CTYPE_FUNCTION):
             node = self._create_callback(symbol, member=True)
         elif source_type.type == CTYPE_STRUCT and source_type.name is None:
             node = self._create_struct(symbol, anonymous=True)
@@ -523,8 +519,8 @@ raise ValueError."""
                 # to be able to properly calculate the size of the compound
                 # type (e.g. GValue) that contains this array, see
                 # <https://bugzilla.gnome.org/show_bug.cgi?id=657040>.
-                if (source_type.base_type.type == CTYPE_UNION and
-                    source_type.base_type.name is None):
+                if (source_type.base_type.type == CTYPE_UNION
+                and source_type.base_type.name is None):
                     synthesized_type = self._synthesize_union_type(symbol, parent_symbol)
                     ftype = ast.Array(None, synthesized_type, complete_ctype=complete_ctype)
                 else:
@@ -562,11 +558,9 @@ raise ValueError."""
 
     def _create_typedef(self, symbol):
         ctype = symbol.base_type.type
-        if (ctype == CTYPE_POINTER and
-            symbol.base_type.base_type.type == CTYPE_FUNCTION):
+        if (ctype == CTYPE_POINTER and symbol.base_type.base_type.type == CTYPE_FUNCTION):
             node = self._create_typedef_callback(symbol)
-        elif (ctype == CTYPE_POINTER and
-            symbol.base_type.base_type.type == CTYPE_STRUCT):
+        elif (ctype == CTYPE_POINTER and symbol.base_type.base_type.type == CTYPE_STRUCT):
             node = self._create_typedef_struct(symbol, disguised=True)
         elif ctype == CTYPE_STRUCT:
             node = self._create_typedef_struct(symbol)
@@ -580,7 +574,7 @@ raise ValueError."""
                        CTYPE_VOID):
             try:
                 name = self.strip_identifier(symbol.ident)
-            except TransformerException, e:
+            except TransformerException as e:
                 message.warn(e)
                 return None
             if symbol.base_type.name:
@@ -631,8 +625,7 @@ raise ValueError."""
         derefed_typename = canonical.replace('*', '')
 
         # Preserve "pointerness" of struct/union members
-        if (is_member and canonical.endswith('*') and
-            derefed_typename in ast.basic_type_names):
+        if (is_member and canonical.endswith('*') and derefed_typename in ast.basic_type_names):
             return 'gpointer'
         else:
             return derefed_typename
@@ -718,12 +711,11 @@ raise ValueError."""
 
         # Don't create constants for non-public things
         # http://bugzilla.gnome.org/show_bug.cgi?id=572790
-        if (symbol.source_filename is None or
-            not symbol.source_filename.endswith('.h')):
+        if (symbol.source_filename is None or not symbol.source_filename.endswith('.h')):
             return None
         try:
             name = self._strip_symbol(symbol)
-        except TransformerException, e:
+        except TransformerException as e:
             message.warn_symbol(symbol, e)
             return None
         if symbol.const_string is not None:
@@ -742,13 +734,13 @@ raise ValueError."""
                 if isinstance(target, ast.Type):
                     unaliased = target
             if unaliased == ast.TYPE_UINT64:
-                value = str(symbol.const_int % 2**64)
+                value = str(symbol.const_int % 2 ** 64)
             elif unaliased == ast.TYPE_UINT32:
-                value = str(symbol.const_int % 2**32)
+                value = str(symbol.const_int % 2 ** 32)
             elif unaliased == ast.TYPE_UINT16:
-                value = str(symbol.const_int % 2**16)
+                value = str(symbol.const_int % 2 ** 16)
             elif unaliased == ast.TYPE_UINT8:
-                value = str(symbol.const_int % 2**16)
+                value = str(symbol.const_int % 2 ** 16)
             else:
                 value = str(symbol.const_int)
         elif symbol.const_double is not None:
@@ -765,7 +757,7 @@ raise ValueError."""
     def _create_typedef_struct(self, symbol, disguised=False):
         try:
             name = self.strip_identifier(symbol.ident)
-        except TransformerException, e:
+        except TransformerException as e:
             message.warn_symbol(symbol, e)
             return None
         struct = ast.Record(name, symbol.ident, disguised=disguised)
@@ -777,7 +769,7 @@ raise ValueError."""
     def _create_typedef_union(self, symbol):
         try:
             name = self.strip_identifier(symbol.ident)
-        except TransformerException, e:
+        except TransformerException as e:
             message.warn(e)
             return None
         union = ast.Union(name, symbol.ident)
@@ -825,7 +817,7 @@ raise ValueError."""
                 else:
                     try:
                         name = self.strip_identifier(symbol.ident)
-                    except TransformerException, e:
+                    except TransformerException as e:
                         message.warn(e)
                         return None
                 compound = klass(name, symbol.ident)
@@ -846,8 +838,7 @@ raise ValueError."""
 
         # Mark the 'user_data' arguments
         for i, param in enumerate(parameters):
-            if (param.type.target_fundamental == 'gpointer' and
-                param.argname == 'user_data'):
+            if (param.type.target_fundamental == 'gpointer' and param.argname == 'user_data'):
                 param.closure_name = param.argname
 
         if member:
@@ -855,13 +846,13 @@ raise ValueError."""
         elif symbol.ident.find('_') > 0:
             try:
                 name = self._strip_symbol(symbol)
-            except TransformerException, e:
+            except TransformerException as e:
                 message.warn_symbol(symbol, e)
                 return None
         else:
             try:
                 name = self.strip_identifier(symbol.ident)
-            except TransformerException, e:
+            except TransformerException as e:
                 message.warn(e)
                 return None
         callback = ast.Callback(name, retval, parameters, False,

data/vendor/local/lib/gobject-introspection/giscanner/utils.py

@@ -22,7 +22,10 @@ import re
 import os
 import subprocess
 
+
 _debugflags = None
+
+
 def have_debug_flag(flag):
     """Check for whether a specific debugging feature is enabled.
 Well-known flags:
@@ -38,6 +41,7 @@ Well-known flags:
             _debugflags.remove('')
     return flag in _debugflags
 
+
 def break_on_debug_flag(flag):
     if have_debug_flag(flag):
         import pdb
@@ -69,8 +73,10 @@ def to_underscores_noprefix(name):
     name = _upperstr_pat2.sub(r'\1_\2', name)
     return name
 
+
 _libtool_pat = re.compile("dlname='([A-z0-9\.\-\+]+)'\n")
 
+
 def _extract_dlname_field(la_file):
     f = open(la_file)
     data = f.read()
@@ -81,6 +87,7 @@ def _extract_dlname_field(la_file):
     else:
         return None
 
+
 # Returns the name that we would pass to dlopen() the library
 # corresponding to this .la file
 def extract_libtool_shlib(la_file):
@@ -92,6 +99,7 @@ def extract_libtool_shlib(la_file):
     # a path rather than the raw dlname
     return os.path.basename(dlname)
 
+
 def extract_libtool(la_file):
     dlname = _extract_dlname_field(la_file)
     if dlname is None:
@@ -104,6 +112,7 @@ def extract_libtool(la_file):
     libname = libname.replace('.libs/.libs', '.libs')
     return libname
 
+
 # Returns arguments for invoking libtool, if applicable, otherwise None
 def get_libtool_command(options):
     libtool_infection = not options.nolibtool