Merge branch 'hotfix/v1.8.5'

Author: iMichka

CHANGELOG.md

@@ -1,6 +1,17 @@
 Changes
 =======
 
+Version 1.8.5
+-------------
+
+1. Fix multiple calls to ``` __hash__()``` (#70)
+
+2. ```Static``` and ```extern``` qualifiers are now no more treated as equivalents
+    in the type_qualifiers class (for ```CastXML```).
+    The old behaviour is kept for ```GCC-XML``` (```static == extern```).
+
+3. Fix for ```declarations.is_noncopyable``` when used on a ```pointer_t```.
+
 Version 1.8.4
 -------------
 

pygccxml/__init__.py

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

pygccxml/declarations/calldef.py

@@ -264,12 +264,12 @@ def __eq__(self, other):
 
     def __hash__(self):
         if "GCC" in utils.xml_generator:
-            return (super.__hash__(self) ^
+            return (super(calldef_t, self).__hash__() ^
                     hash(self.return_type) ^
                     hash(self.demangled_name))
         elif "CastXML" in utils.xml_generator:
             # No demangled name with castxml. Use the normal name.
-            return (super.__hash__(self) ^
+            return (super(calldef_t, self).__hash__() ^
                     hash(self.return_type) ^
                     hash(self.name))
 

pygccxml/declarations/calldef_members.py

@@ -64,7 +64,7 @@ def __eq__(self, other):
             and self.has_const == other.has_const
 
     def __hash__(self):
-        return super.__hash__(self)
+        return super(member_calldef_t, self).__hash__()
 
     @property
     def virtuality(self):

pygccxml/declarations/cpptypes.py

@@ -924,18 +924,20 @@ class type_qualifiers_t(object):
 
     """contains additional information about type: mutable, static, extern"""
 
-    def __init__(self, has_static=False, has_mutable=False):
+    def __init__(self, has_static=False, has_mutable=False, has_extern=False):
         self._has_static = has_static
+        self._has_extern = has_extern
         self._has_mutable = has_mutable
 
     def __eq__(self, other):
         if not isinstance(other, type_qualifiers_t):
             return False
         return self.has_static == other.has_static \
+            and self.has_extern == other.has_extern \
             and self.has_mutable == other.has_mutable
 
     def __hash__(self):
-        return super.__hash__(self)
+        return super(type_qualifiers_t, self).__hash__()
 
     def __ne__(self, other):
         return not self.__eq__(other)
@@ -944,6 +946,7 @@ def __lt__(self, other):
         if not isinstance(other, type_qualifiers_t):
             return object.__lt__(self, other)
         return self.has_static < other.has_static \
+            and self.has_extern < other.has_extern \
             and self.has_mutable < other.has_mutable
 
     @property
@@ -956,12 +959,11 @@ def has_static(self, has_static):
 
     @property
     def has_extern(self):
-        """synonym to static"""
-        return self.has_static
+        return self._has_extern
 
     @has_extern.setter
     def has_extern(self, has_extern):
-        self.has_static = has_extern
+        self._has_extern = has_extern
 
     @property
     def has_mutable(self):

pygccxml/declarations/enumeration.py

@@ -47,7 +47,7 @@ def __eq__(self, other):
         return self.values == other.values
 
     def __hash__(self):
-        return super.__hash__(self)
+        return super(enumeration_t, self).__hash__()
 
     def _get__cmp__items(self):
         """implementation details"""

pygccxml/declarations/scopedef.py

@@ -228,7 +228,7 @@ def __eq__(self, other):
         # return self_decls == other_decls
 
     def __hash__(self):
-        return super.__hash__(self)
+        return super(scopedef_t, self).__hash__()
 
     def _get_declarations_impl(self):
         raise NotImplementedError()

pygccxml/declarations/type_traits_classes.py

@@ -56,6 +56,7 @@ class declaration_xxx_traits(object):
         - get reference to the declaration
     """
     sequence = [
+        type_traits.remove_pointer,
         type_traits.remove_alias,
         type_traits.remove_cv,
         type_traits.remove_declarated]

pygccxml/declarations/typedef.py

@@ -44,7 +44,7 @@ def __eq__(self, other):
         return self.decl_type == other.decl_type
 
     def __hash__(self):
-        return super.__hash__(self)
+        return super(typedef_t, self).__hash__()
 
     @property
     def type(self):

pygccxml/declarations/variable.py

@@ -61,7 +61,7 @@ def __eq__(self, other):
             and self.bits == other.bits
 
     def __hash__(self):
-        return super.__hash__(self)
+        return super(variable_t, self).__hash__()
 
     @property
     def type(self):