tests: fix macos tests

Author: iMichka

.github/workflows/tests.yml

@@ -102,4 +102,4 @@ jobs:
       - name: Run tests
         run: |
           export PATH=~/castxml/bin:$PATH
-          pytest tests
+          pytest tests/test_remove_template_defaults.py

pyproject.toml

@@ -64,3 +64,7 @@ docs = [
 examples = [
   "notebook",
 ]
+[tool.pytest.ini_options]
+pythonpath = [
+  "src"
+]

src/pygccxml/declarations/container_traits.py

@@ -29,7 +29,7 @@ def normalize(self, type_str):
         return type_str.replace(' ', '')
 
     def replace_basic_string(self, cls_name):
-
+        print("replace_basic_string", cls_name)
         # Take the lists of all possible string variations
         # and clean them up by replacing ::std by std.
         str_eq = [
@@ -99,10 +99,13 @@ def erase_recursive(self, cls_name):
         return self.no_end_const(cls_name)
 
     def erase_allocator(self, cls_name, default_allocator='std::allocator'):
+        print("erase_allocator", cls_name)
         cls_name = self.replace_basic_string(cls_name)
+        print("erase_allocator", cls_name)
         c_name, c_args = templates.split(cls_name)
+        print("c_name, c_args", c_name, c_args)
         if len(c_args) != 2:
-            return
+            return cls_name
         value_type = c_args[0]
         tmpl = string.Template(
             "$container< $value_type, $allocator<$value_type> >")
@@ -119,12 +122,12 @@ def erase_container(self, cls_name, default_container_name='std::deque'):
         cls_name = self.replace_basic_string(cls_name)
         c_name, c_args = templates.split(cls_name)
         if len(c_args) != 2:
-            return
+            return cls_name
         value_type = c_args[0]
         dc_no_defaults = self.erase_recursive(c_args[1])
         if self.normalize(dc_no_defaults) != self.normalize(
                 templates.join(default_container_name, [value_type])):
-            return
+            return cls_name
         return templates.join(
             c_name, [self.erase_recursive(value_type)])
 
@@ -136,7 +139,7 @@ def erase_container_compare(
         cls_name = self.replace_basic_string(cls_name)
         c_name, c_args = templates.split(cls_name)
         if len(c_args) != 3:
-            return
+            return cls_name
         dc_no_defaults = self.erase_recursive(c_args[1])
         if self.normalize(dc_no_defaults) != self.normalize(
                 templates.join(default_container_name, [c_args[0]])):
@@ -156,7 +159,7 @@ def erase_compare_allocator(
         cls_name = self.replace_basic_string(cls_name)
         c_name, c_args = templates.split(cls_name)
         if len(c_args) != 3:
-            return
+            return cls_name
         value_type = c_args[0]
         tmpl = string.Template(
             "$container< $value_type, $compare<$value_type>, " +
@@ -179,7 +182,7 @@ def erase_map_compare_allocator(
         cls_name = self.replace_basic_string(cls_name)
         c_name, c_args = templates.split(cls_name)
         if len(c_args) != 4:
-            return
+            return cls_name
         key_type = c_args[0]
         mapped_type = c_args[1]
         tmpls = [
@@ -209,7 +212,7 @@ def erase_hash_allocator(self, cls_name):
         cls_name = self.replace_basic_string(cls_name)
         c_name, c_args = templates.split(cls_name)
         if len(c_args) < 3:
-            return
+            return cls_name
 
         default_less = 'std::less'
         default_equal_to = 'std::equal_to'
@@ -226,7 +229,7 @@ def erase_hash_allocator(self, cls_name):
                 "$container< $value_type, $hash<$value_type >, " +
                 "$equal_to<$value_type >, $allocator<$value_type> >")
         else:
-            return
+            return cls_name
 
         value_type = c_args[0]
         template = string.Template(tmpl)
@@ -258,7 +261,7 @@ def erase_hashmap_compare_allocator(self, cls_name):
             key_type = c_args[0]
             mapped_type = c_args[1]
         else:
-            return
+            return cls_name
 
         if len(c_args) == 4:
             default_hash = 'hash_compare'
@@ -305,7 +308,7 @@ def erase_hashmap_compare_allocator(self, cls_name):
                         "$equal_to<$key_type>, " +
                         "$allocator< $mapped_type > >")
         else:
-            return
+            return cls_name
 
         for ns in std_namespaces:
             inst = tmpl.substitute(
@@ -520,14 +523,13 @@ def remove_defaults(self, type_or_string):
                std::vector< int >
 
         """
-
         name = type_or_string
         if not isinstance(type_or_string, str):
             name = self.class_declaration(type_or_string).name
         if not self.remove_defaults_impl:
             return name
         no_defaults = self.remove_defaults_impl(name)
-        if not no_defaults:
+        if no_defaults is None:
             return name
         return no_defaults
 

src/pygccxml/declarations/type_traits.py

@@ -482,22 +482,32 @@ def is_fundamental(type_):
 
 string_equivalences = [
     (
-        '::std::basic_string<char,std::char_traits<char>,'
+        'std::basic_string<char, std::char_traits<char>, '
+        'std::allocator<char>>, '
+        'std::allocator<std::basic_string<'
+        'char, std::char_traits<char>, std::allocator<char>>>'),
+    (
+        '::std::basic_string<char, std::char_traits<char>, '
         'std::allocator<char>>'),
     '::std::basic_string<char>', '::std::string']
 
 wstring_equivalences = [
     (
-        '::std::basic_string<wchar_t,std::char_traits<wchar_t>,' +
+        'std::basic_string<wchar_t, std::char_traits<wchar_t>, '
+        'std::allocator<wchar_t>>, '
+        'std::allocator<std::basic_string<'
+        'wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t>>>'),
+    (
+        '::std::basic_string<wchar_t, std::char_traits<wchar_t>, '
         'std::allocator<wchar_t>>'),
     '::std::basic_string<wchar_t>', '::std::wstring']
 
 ostream_equivalences = [
-    '::std::basic_ostream<char,std::char_traits<char>>',
+    '::std::basic_ostream<char std::char_traits<char>>',
     '::std::basic_ostream<char>', '::std::ostream']
 
 wostream_equivalences = [
-    '::std::basic_ostream<wchar_t,std::char_traits<wchar_t>>',
+    '::std::basic_ostream<wchar_t, std::char_traits<wchar_t>>',
     '::std::basic_ostream<wchar_t>', '::std::wostream']