tests: fix macos test

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

@@ -30,6 +30,8 @@ def normalize(self, type_str):
 
     def replace_basic_string(self, cls_name):
 
+        print("START replace_basic_string", cls_name)
+
         # Take the lists of all possible string variations
         # and clean them up by replacing ::std by std.
         str_eq = [
@@ -44,11 +46,18 @@ def replace_basic_string(self, cls_name):
             "std::string": [v for v in str_eq if not v == "std::string"],
             "std::wstring": [v for v in wstr_eq if not v == "std::wstring"]}
 
+        print("string ------")
+        for k, v in strings.items():
+            print(k, v)
+        print("string ------")
+
         new_name = cls_name
         for short_name, long_names in strings.items():
             for lname in long_names:
                 new_name = new_name.replace(lname, short_name)
 
+        print("END replace_basic_string", new_name)
+
         return new_name
 
     def decorated_call_prefix(self, cls_name, text, doit):
@@ -99,8 +108,11 @@ 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)
         c_name, c_args = templates.split(cls_name)
+        print("erase_allocator c_name", c_name)
+        print("erase_allocator c_args", c_args)
         if len(c_args) != 2:
             return
         value_type = c_args[0]
@@ -520,15 +532,19 @@ def remove_defaults(self, type_or_string):
                std::vector< int >
 
         """
-
+        print("remove_defaults START")
         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)
+        print("remove_defaults name", name)
+        print("remove_defaults no_defaults", no_defaults)
         if not no_defaults:
+            print("remove_defaults return name", name)
             return name
+        print("remove_defaults return no_defaults", no_defaults)
         return no_defaults
 
 

src/pygccxml/declarations/type_traits.py

@@ -482,22 +482,27 @@ 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::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']