Merge branch 'hotfix/v1.9.1' into develop

Conflicts:
	CHANGELOG.md
	pygccxml/declarations/type_traits_classes.py

Author: iMichka

CHANGELOG.md

@@ -17,6 +17,20 @@ Version 2.0.0 (unreleased)
    `declarations.get_dependencies_from_decl(decl)` function from the
    `declarations` module, which returns the same result.
 
+Version 1.9.1
+-------------
+
+1. Fix bug in the ```find_noncopyable_vars``` method which wrongly returned
+   member variables of pointer type (#84)
+
+2. Fix bug in the ```smart_pointer_traits.value_type``` and
+   ```auto_pointer_traits.value_type``` methods which didn't find the expected
+   ```value_type``` declaration (#85)
+
+3. Fix bug in the ```smart_pointer_traits.is_smart_pointer``` and
+   ```auto_pointer_traits.is_smart_pointer``` methods which didn't properly
+   work (#85)
+
 Version 1.9.0
 -------------
 

pygccxml/__init__.py

@@ -41,4 +41,4 @@
 # TODO:
 # 1. Add "explicit" property for constructors
 
-__version__ = '1.9.0'
+__version__ = '1.9.1'

pygccxml/declarations/smart_pointer_traits.py

@@ -9,6 +9,7 @@
 from . import class_declaration_traits
 from . import class_traits
 from . import traits_impl_details
+from . import runtime_errors
 
 
 class internal_type_traits(object):
@@ -17,8 +18,8 @@ class internal_type_traits(object):
     # TODO: add exists function
     @staticmethod
     def get_by_name(type_, name):
-        if class_declaration_traits.is_my_case(type_):
-            cls = class_traits.declaration_class(type_)
+        if class_traits.is_my_case(type_):
+            cls = class_traits.get_declaration(type_)
             return type_traits.remove_declarated(
                 cls.typedef(name, recursive=False).decl_type)
         elif class_declaration_traits.is_my_case(type_):
@@ -72,7 +73,10 @@ def value_type(type_):
                 '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")
+        try:
+            return internal_type_traits.get_by_name(type_, "element_type")
+        except runtime_errors.declaration_not_found_t:
+            return _search_in_bases(type_)
 
 
 class auto_ptr_traits(object):
@@ -103,4 +107,23 @@ def value_type(type_):
             raise TypeError(
                 'Type "%s" is not instantiation of std::auto_ptr' %
                 type_.decl_string)
-        return internal_type_traits.get_by_name(type_, "element_type")
+        try:
+            return internal_type_traits.get_by_name(type_, "element_type")
+        except runtime_errors.declaration_not_found_t:
+            return _search_in_bases(type_)
+
+
+def _search_in_bases(type_):
+    """Implementation detail."""
+    found = False
+    for base_type in type_.declaration.bases:
+        try:
+            found = internal_type_traits.get_by_name(
+                base_type.related_class, "element_type")
+        except runtime_errors.declaration_not_found_t:
+            pass
+        if found:
+            return found
+    raise RuntimeError(
+        ("Unable to find 'element_type' declaration '%s'"
+         "in type '%s'.") % type_.decl_string)

pygccxml/declarations/type_traits_classes.py

@@ -208,7 +208,6 @@ def find_noncopyable_vars(class_type, already_visited_cls_vars=None):
             continue
 
         if class_traits.is_my_case(var_type):
-
             cls = class_traits.get_declaration(var_type)
 
             # Exclude classes that have already been visited.

unittests/test_smart_pointer.py

@@ -17,40 +17,93 @@ def __init__(self, *args):
         parser_test_case.parser_test_case_t.__init__(self, *args)
         self.header = "test_smart_pointer.hpp"
         self.config.cflags = "-std=c++11"
+        self.global_ns = None
 
-    def test_smart_pointer(self):
+    def setUp(self):
+        if self.config.xml_generator == "gccxml":
+            return
+        decls = parser.parse([self.header], self.config)
+        self.global_ns = declarations.get_global_namespace(decls)
+
+    def test_is_smart_pointer(self):
         """
-        Test code in the smart_pointer_traits module.
+        Test smart_pointer_traits.is_smart_pointer method.
 
         """
 
         if self.config.xml_generator == "gccxml":
             return
 
-        decls = parser.parse([self.header], self.config)
-        global_ns = declarations.get_global_namespace(decls)
-
         criteria = declarations.declaration_matcher(name="yes1")
-        decls = declarations.matcher.find(criteria, global_ns)
+        decls = declarations.matcher.find(criteria, self.global_ns)
         self.assertTrue(
             declarations.smart_pointer_traits.is_smart_pointer(
                 decls[0].decl_type))
 
+        criteria = declarations.declaration_matcher(name="no1")
+        decls = declarations.matcher.find(criteria, self.global_ns)
+        self.assertFalse(
+            declarations.smart_pointer_traits.is_smart_pointer(
+                decls[0].decl_type))
+
+        criteria = declarations.declaration_matcher(name="no2")
+        decls = declarations.matcher.find(criteria, self.global_ns)
+        self.assertFalse(
+            declarations.smart_pointer_traits.is_smart_pointer(
+                decls[0].decl_type))
+
+    def test_is_auto_pointer(self):
+        """
+        Test auto_ptr_traits.is_smart_pointer method.
+
+        """
+
+        if self.config.xml_generator == "gccxml":
+            return
+
         criteria = declarations.declaration_matcher(name="yes2")
-        decls = declarations.matcher.find(criteria, global_ns)
+        decls = declarations.matcher.find(criteria, self.global_ns)
         self.assertTrue(
             declarations.auto_ptr_traits.is_smart_pointer(decls[0].decl_type))
 
         criteria = declarations.declaration_matcher(name="no1")
-        decls = declarations.matcher.find(criteria, global_ns)
+        decls = declarations.matcher.find(criteria, self.global_ns)
         self.assertFalse(
             declarations.auto_ptr_traits.is_smart_pointer(decls[0].decl_type))
 
         criteria = declarations.declaration_matcher(name="no2")
-        decls = declarations.matcher.find(criteria, global_ns)
+        decls = declarations.matcher.find(criteria, self.global_ns)
         self.assertFalse(
             declarations.auto_ptr_traits.is_smart_pointer(decls[0].decl_type))
 
+    def test_smart_pointer_value_type(self):
+        """
+        Test smart_pointer_traits.value_type method.
+
+        """
+
+        if self.config.xml_generator == "gccxml":
+            return
+
+        criteria = declarations.declaration_matcher(name="yes1")
+        decls = declarations.matcher.find(criteria, self.global_ns)
+        vt = declarations.smart_pointer_traits.value_type(decls[0].decl_type)
+        self.assertIsInstance(vt, declarations.int_t)
+
+    def test_auto_pointer_value_type(self):
+        """
+        Test auto_pointer_traits.value_type method.
+
+        """
+
+        if self.config.xml_generator == "gccxml":
+            return
+
+        criteria = declarations.declaration_matcher(name="yes2")
+        decls = declarations.matcher.find(criteria, self.global_ns)
+        vt = declarations.auto_ptr_traits.value_type(decls[0].decl_type)
+        self.assertIsInstance(vt, declarations.double_t)
+
 
 def create_suite():
     suite = unittest.TestSuite()