Merge branch 'hotfix/v1.7.3'

Author: iMichka

.travis.yml

@@ -1,37 +1,109 @@
 language:
   - python
 
-python:
-  - "2.6"
-  - "2.7"
-  - "3.2"
-  - "3.3"
-  - "3.4"
-  - "3.5"
+matrix:
+  include:
+    - os: linux
+      python: 2.6
+      env: XML_GENERATOR="gccxml"
+    - os: linux
+      python: 2.7
+      env: XML_GENERATOR="gccxml"
+    - os: linux
+      python: 3.2
+      env: XML_GENERATOR="gccxml"
+    - os: linux
+      python: 3.3
+      env: XML_GENERATOR="gccxml"
+    - os: linux
+      python: 3.4
+      env: XML_GENERATOR="gccxml"
+    - os: linux
+      python: 3.5
+      env: XML_GENERATOR="gccxml"
+    - os: linux
+      python: 2.7
+      env: XML_GENERATOR="castxml"
+    - os: linux
+      python: 3.5
+      env: XML_GENERATOR="castxml"
+    - os: osx
+      osx_image: xcode7.2
+      language: generic
+      env:
+        - XML_GENERATOR="castxml"
+        - TRAVIS_PYTHON_VERSION="2"
+    - os: osx
+      osx_image: xcode7.2
+      language: generic
+      env:
+        - XML_GENERATOR="castxml"
+        - TRAVIS_PYTHON_VERSION="3"
+
 
 before_install:
-  # Install gccxml
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq gccxml
+ # OS X
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then travis_retry brew update; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ $TRAVIS_PYTHON_VERSION == 2 ]]; then brew install python; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ $TRAVIS_PYTHON_VERSION == 3 ]]; then brew install python3; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ $TRAVIS_PYTHON_VERSION == 3 ]]; then sudo ln -sf /usr/local/bin/pip3 /usr/local/bin/pip; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ $TRAVIS_PYTHON_VERSION == 3 ]]; then sudo ln -sf /usr/local/bin/python3 /usr/local/bin/python; fi
+
+  # Download castxml binaries
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+      if [ ! -e ${HOME}/castxml ]; then
+        curl https://midas3.kitware.com/midas/download/item/318762/castxml-macosx.tar.gz | tar zxf - -C ${HOME};
+      fi;
+    fi
+
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ $XML_GENERATOR == "castxml" ]]; then
+      if [ ! -e ${HOME}/castxml ]; then
+        wget -O - https://midas3.kitware.com/midas/download/item/318227/castxml-linux.tar.gz | tar zxf - -C ${HOME};
+      fi;
+    fi
+
+  # Add the castxml binary to the path
+  - if [[ $XML_GENERATOR == "castxml" ]]; then
+      export PATH=$PATH:~/castxml/bin/;
+    fi
+
+  # Setup gccxml for the gccxml builds on linux
+  - if [[ "$XML_GENERATOR" == "gccxml" ]]; then sudo apt-get update -qq; fi
+  - if [[ "$XML_GENERATOR" == "gccxml" ]]; then sudo apt-get install -qq gccxml; fi
+
   # Install pep8, needed by the unit tests
   - pip install pep8
+
   # Install coverage tools (On 3.2 the new coverage is broken, use an old one)
   # https://github.com/menegazzo/travispy/issues/20
-  - if [ $TRAVIS_PYTHON_VERSION == 3.2 ];
-    then pip install 'coverage<4.0'; else
-    pip install coverage;
+  - if [ $TRAVIS_PYTHON_VERSION == 3.2 ]; then
+      pip install 'coverage<4.0';
+    else
+      pip install coverage;
     fi
   - pip install coveralls
 
 install:
   - if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install unittest2; fi
 
 script:
+  - echo $TRAVIS_OS_NAME
+
   # Modify sitecustomize.py file for coverage. Allows to cover files run in a subprocess.
-  - touch "/home/travis/virtualenv/python${TRAVIS_PYTHON_VERSION}/lib/python${TRAVIS_PYTHON_VERSION}/sitecustomize.py"
-  - printf "import coverage\ncoverage.process_startup()\n" > "/home/travis/virtualenv/python${TRAVIS_PYTHON_VERSION}/lib/python${TRAVIS_PYTHON_VERSION}/sitecustomize.py"
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then touch "/home/travis/virtualenv/python${TRAVIS_PYTHON_VERSION}/lib/python${TRAVIS_PYTHON_VERSION}/sitecustomize.py"; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ $TRAVIS_PYTHON_VERSION == 2 ]]; then touch "/usr/local/lib/python2.7/site-packages/sitecustomize.py"; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ $TRAVIS_PYTHON_VERSION == 3 ]]; then touch "/usr/local/lib/python3.5/site-packages/sitecustomize.py"; fi
+
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]];
+    then printf "import coverage\ncoverage.process_startup()\n" > "/home/travis/virtualenv/python${TRAVIS_PYTHON_VERSION}/lib/python${TRAVIS_PYTHON_VERSION}/sitecustomize.py"; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ $TRAVIS_PYTHON_VERSION == 2 ]];
+    then printf "import coverage\ncoverage.process_startup()\n" > "/usr/local/lib/python2.7/site-packages/sitecustomize.py"; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ $TRAVIS_PYTHON_VERSION == 3 ]];
+    then printf "import coverage\ncoverage.process_startup()\n" > "/usr/local/lib/python3.5/site-packages/sitecustomize.py"; fi
+
   # Install pygccxml
   - python setup.py install
+
   # Run the tests with coverage
   - coverage run unittests/test_all.py
   # Combine multiple .coverage files (we have multiple files because some scripts were run in a subprocess).

docs/conf.py

@@ -53,9 +53,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = 'v1.7.2'
+version = 'v1.7.3'
 # The full version, including alpha/beta/rc tags.
-release = 'v1.7.2'
+release = 'v1.7.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/examples/variables/example.py

@@ -22,7 +22,7 @@
 ns = global_namespace.namespace("ns")
 
 # The variables() method will return a list of variables.
-# We know that he c variable is the third one in the list:
+# We know that the c variable is the third one in the list:
 c = ns.variables()[2]
 print("My name is: " + c.name)
 print("My type is: " + str(c.type))

docs/history.rst

@@ -11,6 +11,47 @@ to python 3 (keeping it compatible with python 2).
 In Mai 2014, Michka Popoff and the Insight Software Consortium revived pygccxml
 by setting up a git repositery on github, hosted along with gccxml.
 
+Version 1.7.3
+-------------
+
+1. Addition of an is_union() method in the type_traits module.
+
+2. type_traits.smart_pointer_traits will now classify std::shared_ptr as a
+   smart pointer (only boost::shared_ptr was recognized before)
+
+3. Fix a regression in undname_creator_t.format_argtypes
+
+4. C++xx flags are now correctly passed to CastXML. Allowed flags are:
+   "-std=c++98", "-std=c++03", "-std=c++11", "-std=c++14", "-std=c++1z"
+   Thanks to Mark Moll for the fix.
+
+5. Add better support for "typedef (class|struct) {} foo;" syntax when using
+   CastXML. GCCXML did not recognize the typedef. Fetching these
+   declarations can now be done with: .typedef("foo") or .class_("foo").
+
+6. Add support for the future llvm 3.9. As in release v1.7.1, new structs and
+   typedefs are now exposed by llvm, which broke pyplusplus.
+   In this case these are ```__NSConstantString_tag``` and ```__NSConstantString```.
+   The two declarations are now hidden from the declarations tree, but can still
+   be generated by using the ``config.flags = ["f1"]`` option.
+
+7. Multiple fixes to adapt default arguments in functions for py++. Using the
+   latest version of CastXML is recommended. This makes sure default arguments
+   for function parameters are correctly defined, so that py++ can process them.
+
+8. Fix for exception when using castxml + gcc5 + std=c++11 and maps.
+
+9. Removed unittest2 dependency for testing with python 2.6
+
+10. Testing: test with std::tr1 unordered containers for gcc >= 4.4.7 and castxml
+
+11. Cosmetic fix for generator name printed to stdout when launching unit tests
+
+12. Fix simple typo in example.py comment
+
+Thanks to the following people for their contribution to this release:
+Mark Moll, Ashish Sadanandan, Mark Oates
+
 Version 1.7.2
 -------------
 

pygccxml/__init__.py

@@ -40,4 +40,4 @@
 # TODO:
 # 1. Add "explicit" property for constructors
 
-__version__ = 'v1.7.2'
+__version__ = 'v1.7.3'

pygccxml/binary_parsers/undname.py

@@ -187,8 +187,9 @@ def format_argtypes(self, argtypes, hint):
                 # ugly hack, later, I will replace ', ' with ',', so single
                 # space will still exist
                 argsep = ',  '
-            return argsep.join(map(self.__format_type_as_undecorated(
-                type_, True, hint), argtypes))
+            return argsep.join(
+                map(lambda type_: self.__format_type_as_undecorated(
+                    type_, True, hint), argtypes))
 
     def format_calldef(self, calldef, hint):
         calldef_type = calldef.function_type()

pygccxml/declarations/__init__.py

@@ -18,6 +18,7 @@
 from .scopedef import scopedef_t
 from .enumeration import enumeration_t
 from .namespace import namespace_t
+from .typedef import typedef_t
 
 from .class_declaration import class_t
 from .class_declaration import CLASS_TYPES
@@ -26,8 +27,6 @@
 from .class_declaration import class_declaration_t
 from .class_declaration import class_types
 
-from .typedef import typedef_t
-
 from .cpptypes import type_t
 from .cpptypes import dummy_type_t
 from .cpptypes import unknown_t

pygccxml/declarations/type_traits.py

@@ -365,8 +365,15 @@ def is_fundamental(type):
             (cpptypes.volatile_t, cpptypes.const_t))
 
 
-class declaration_xxx_traits(object):
+def is_union(type_):
+    """returns True if type represents a C++ union"""
+    if not is_class(type_):
+        return False
+    decl = class_traits.get_declaration(type_)
+    return decl.class_type == class_declaration.CLASS_TYPES.UNION
+
 
+class declaration_xxx_traits(object):
     """this class implements the functionality needed for convenient work with
     declaration classes
 
@@ -1166,24 +1173,28 @@ class smart_pointer_traits(object):
     @staticmethod
     def is_smart_pointer(type_):
         """returns True, if type represents instantiation of
-        `boost::shared_ptr`, False otherwise"""
+        `boost::shared_ptr` or `std::shared_ptr`, False otherwise"""
         type_ = remove_alias(type_)
         type_ = remove_cv(type_)
         type_ = remove_declarated(type_)
         if not isinstance(type_,
                           (class_declaration.class_declaration_t,
                            class_declaration.class_t)):
             return False
-        if not impl_details.is_defined_in_xxx('boost', type_):
+        if not (impl_details.is_defined_in_xxx('boost', type_) or
+                impl_details.is_defined_in_xxx('std', type_)):
             return False
-        return type_.decl_string.startswith('::boost::shared_ptr<')
+        return type_.decl_string.startswith('::boost::shared_ptr<') or \
+            type_.decl_string.startswith('::std::shared_ptr<')
 
     @staticmethod
     def value_type(type_):
-        """returns reference to `boost::shared_ptr` value type"""
+        """returns reference to `boost::shared_ptr` \
+        or `std::shared_ptr` value type"""
         if not smart_pointer_traits.is_smart_pointer(type_):
             raise TypeError(
-                'Type "%s" is not instantiation of boost::shared_ptr' %
+                'Type "%s" is not an instantiation of \
+                boost::shared_ptr or std::shared_ptr' %
                 type_.decl_string)
         return internal_type_traits.get_by_name(type_, "value_type")
 

pygccxml/parser/patcher.py

@@ -3,6 +3,7 @@
 # Distributed under the Boost Software License, Version 1.0.
 # See http://www.boost.org/LICENSE_1_0.txt
 
+import re
 from pygccxml import utils
 from pygccxml import declarations
 
@@ -44,14 +45,18 @@ def __is_unqualified_enum(self, func, arg):
         if not declarations.is_enum(type_):
             return False
         enum_type = declarations.enum_declaration(type_)
-        return enum_type.has_value_name(arg.default_value)
+        # GCCXML does not qualify an enum value in the default argument
+        # but CastXML does. Split the default value and use only the
+        # enum value for fixing it.
+        return enum_type.has_value_name(
+            arg.default_value.split('::')[-1])
 
     def __fix_unqualified_enum(self, func, arg):
         type_ = declarations.remove_reference(declarations.remove_cv(arg.type))
         enum_type = declarations.enum_declaration(type_)
         return self.__join_names(
             enum_type.parent.decl_string,
-            arg.default_value)
+            arg.default_value.split('::')[-1])
 
     def __is_invalid_integral(self, func, arg):
         type_ = declarations.remove_reference(declarations.remove_cv(arg.type))
@@ -102,6 +107,27 @@ def __fix_invalid_integral(self, func, arg):
                                        arg.default_value))
             else:
                 parent = parent.parent
+
+        # check if we have an unqualified integral constant
+        # only do patching in cases where we have a bare variable name
+        c_var = re.compile("[a-z_][a-z0-9_]*", re.IGNORECASE)
+        m = c_var.match(arg.default_value)
+        if m:
+            parent = func.parent
+            while parent:
+                try:
+                    found = parent.variable(arg.default_value,
+                                            recursive=False)
+                except declarations.matcher.declaration_not_found_t:
+                    # ignore exceptions if a match is not found
+                    found = None
+                if found:
+                    if declarations.is_fundamental(arg.type):
+                        return "%s" % self.__join_names(
+                                        found.parent.decl_string,
+                                        arg.default_value)
+                parent = parent.parent
+
         return arg.default_value
 
     def __find_enum(self, scope, default_value):

pygccxml/parser/project_reader.py

@@ -521,6 +521,10 @@ def _relink_declarated_types(self, leaved_classes, declarated_types):
                 else:
 
                     name = decl_wrapper_type.declaration._name
+                    if name == "":
+                        # Happens with gcc5, castxml + std=c++11
+                        # See issue #45
+                        continue
                     if name.startswith("__vmi_class_type_info_pseudo"):
                         continue
                     if name == "rebind<std::__tree_node" + \