test: debug

Author: iMichka

Diff for: pyproject.toml

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

Diff for: src/pygccxml/declarations/container_traits.py

@@ -38,7 +38,9 @@ def __init__(self, unordered_maps_and_sets):
     def normalize(self, type_str):
         return type_str.replace(' ', '')
 
-    def replace_basic_string(self, cls_name):
+    @staticmethod
+    def replace_basic_string(cls_name):
+        print("replace_basic_string 1", cls_name)
         strings = {
             "std::string": string_equivalences,
             "std::wstring": wstring_equivalences
@@ -48,7 +50,7 @@ def replace_basic_string(self, cls_name):
         for short_name, long_names in strings.items():
             for lname in long_names:
                 new_name = new_name.replace(lname, short_name)
-
+        print("replace_basic_string 2", new_name)
         return new_name
 
     def decorated_call_prefix(self, cls_name, text, doit):
@@ -118,6 +120,7 @@ def erase_allocator(self, cls_name, default_allocator='std::allocator'):
     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)
+        print("erase_container", cls_name, c_name)
         if len(c_args) != 2:
             return
         value_type = c_args[0]
@@ -521,12 +524,17 @@ def remove_defaults(self, type_or_string):
         """
 
         name = type_or_string
+        print("remove_defaults 1", name)
         if not isinstance(type_or_string, str):
             name = self.class_declaration(type_or_string).name
+        print("remove_defaults 2", name)
+        name = defaults_eraser.replace_basic_string(name)
         if not self.remove_defaults_impl:
             return name
         no_defaults = self.remove_defaults_impl(name)
+        print("remove_defaults no_defaults 3", no_defaults)
         if not no_defaults:
+            print("remove_defaults RETURN", name)
             return name
         return no_defaults
 

Diff for: tests/test_remove_template_defaults.py

@@ -4,21 +4,17 @@
 # See http://www.boost.org/LICENSE_1_0.txt
 
 import platform
-import logging
 import pytest
 
 from . import autoconfig
 
 from pygccxml import parser
 from pygccxml import declarations
-from pygccxml import utils
 
 TEST_FILES = [
     'remove_template_defaults.hpp'
 ]
 
-utils.loggers.set_level(logging.DEBUG)
-
 
 @pytest.fixture
 def global_ns():
@@ -48,140 +44,140 @@ def test_vector(global_ns):
         v_traits.remove_defaults(v_v_int)
 
 
-def test_list(global_ns):
-    l_int = global_ns.typedef('l_int')
-    l_traits = declarations.list_traits
-    assert 'list<int>' == l_traits.remove_defaults(l_int)
-    l_wstring = global_ns.typedef('l_wstring')
-    assert 'list<std::wstring>' == l_traits.remove_defaults(l_wstring)
-
-
-def test_deque(global_ns):
-    d_v_int = global_ns.typedef('d_v_int')
-    d_v_traits = declarations.deque_traits
-    assert 'deque<std::vector<int>>' == \
-        d_v_traits.remove_defaults(d_v_int)
-    d_l_string = global_ns.typedef('d_l_string')
-    assert 'deque<std::list<std::string>>' == \
-        d_v_traits.remove_defaults(d_l_string)
-
-
-def test_queue(global_ns):
-    q_int = global_ns.typedef('q_int')
-    q_traits = declarations.queue_traits
-    assert 'queue<int>' == q_traits.remove_defaults(q_int)
-    q_string = global_ns.typedef('q_string')
-    assert 'queue<std::string>' == q_traits.remove_defaults(q_string)
-
-
-def test_priority_queue(global_ns):
-    pq_int = global_ns.typedef('pq_int')
-    pq_traits = declarations.priority_queue_traits
-    assert 'priority_queue<int>' == pq_traits.remove_defaults(pq_int)
-    pq_string = global_ns.typedef('pq_string')
-    assert 'priority_queue<std::string>' == \
-        pq_traits.remove_defaults(pq_string)
-
-
-def test_set(global_ns):
-    s_v_int = global_ns.typedef('s_v_int')
-    assert 'set<std::vector<int>>' == \
-        declarations.set_traits.remove_defaults(s_v_int)
-    s_string = global_ns.typedef('s_string')
-    assert 'set<std::string>' == \
-        declarations.set_traits.remove_defaults(s_string)
-
-
-def test_multiset(global_ns):
-    ms_v_int = global_ns.typedef('ms_v_int')
-    ms_v_traits = declarations.multiset_traits
-    assert 'multiset<std::vector<int>>' == \
-        ms_v_traits.remove_defaults(ms_v_int)
-    ms_string = global_ns.typedef('ms_string')
-    assert 'multiset<std::string>' == \
-        ms_v_traits.remove_defaults(ms_string)
-
-
-def test_map(global_ns):
-    m_i2d = global_ns.typedef('m_i2d')
-    assert 'map<int, double>' == \
-        declarations.map_traits.remove_defaults(m_i2d)
-    m_wstr2d = global_ns.typedef('m_wstr2d')
-    assert 'map<std::wstring, double>' == \
-        declarations.map_traits.remove_defaults(m_wstr2d)
-    m_v_i2m_wstr2d = global_ns.typedef('m_v_i2m_wstr2d')
-    m = 'map<const std::vector<int>, std::map<std::wstring, double>>'
-    assert m == declarations.map_traits.remove_defaults(m_v_i2m_wstr2d)
-
-
-def test_multimap(global_ns):
-    mm_i2d = global_ns.typedef('mm_i2d')
-    mm_traits = declarations.multimap_traits
-    assert 'multimap<int, double>' == mm_traits.remove_defaults(mm_i2d)
-    mm_wstr2d = global_ns.typedef('mm_wstr2d')
-    assert 'multimap<const std::wstring, double>' == \
-        mm_traits.remove_defaults(mm_wstr2d)
-    mm_v_i2mm_wstr2d = global_ns.typedef('mm_v_i2mm_wstr2d')
-    assert ('multimap<const std::vector<int>, ' +
-            'const std::multimap<const std::wstring, double>>') == \
-        mm_traits.remove_defaults(mm_v_i2mm_wstr2d)
-
-
-def test_hash_set(global_ns):
-    hs_v_int = global_ns.typedef('hs_v_int')
-    hs_traits = declarations.unordered_set_traits
-    name = 'unordered_set'
-    assert (name + '<std::vector<int>>') == \
-        hs_traits.remove_defaults(hs_v_int), \
-        hs_traits.remove_defaults(hs_v_int)
-    hs_string = global_ns.typedef('hs_string')
-    assert (name + '<std::string>') == \
-        hs_traits.remove_defaults(hs_string)
-
-
-def test_hash_multiset(global_ns):
-    mhs_v_int = global_ns.typedef('mhs_v_int')
-    mhs_traits = declarations.unordered_multiset_traits
-    name = 'unordered_multiset'
-    assert (name + '<std::vector<int>>') == \
-        mhs_traits.remove_defaults(mhs_v_int)
-    mhs_string = global_ns.typedef('mhs_string')
-    assert (name + '<std::string>') == \
-        mhs_traits.remove_defaults(mhs_string)
-
-
-def test_hash_map(global_ns):
-    hm_i2d = global_ns.typedef('hm_i2d')
-    hm_traits = declarations.unordered_map_traits
-    name = 'unordered_map'
-    assert (name + '<int, double>') == \
-        hm_traits.remove_defaults(hm_i2d)
-    hm_wstr2d = global_ns.typedef('hm_wstr2d')
-    assert (name + '<std::wstring, double>') == \
-        hm_traits.remove_defaults(hm_wstr2d)
-
-
-def test_hash_multimap(global_ns):
-    hmm_i2d = global_ns.typedef('hmm_i2d')
-    hmm_traits = declarations.unordered_multimap_traits
-    name = 'unordered_multimap'
-    assert (name + '<int, double>') == \
-        hmm_traits.remove_defaults(hmm_i2d)
-    hmm_wstr2d = global_ns.typedef('hmm_wstr2d')
-    assert (name + '<const std::wstring, double>') == \
-        hmm_traits.remove_defaults(hmm_wstr2d)
-
-    hmm_v_i2mm_wstr2d = global_ns.typedef('hmm_v_i2mm_wstr2d')
-
-    hmm_traits_value = hmm_traits.remove_defaults(hmm_v_i2mm_wstr2d)
-
-    possible_values = (
-        name + '<const std::vector<int>, ' +
-        'const __gnu_cxx::' + name + '<const std::wstring, double>>',
-        name + '<const std::vector<int>, ' +
-        'const std::' + utils.get_tr1(hmm_traits_value) + name +
-        '<const std::wstring, double>>',
-        name + '<const std::vector<int>, ' +
-        'const stdext::' + name + '<const std::wstring, double>>')
-
-    assert hmm_traits_value in possible_values, hmm_traits_value
+# def test_list(global_ns):
+#     l_int = global_ns.typedef('l_int')
+#     l_traits = declarations.list_traits
+#     assert 'list<int>' == l_traits.remove_defaults(l_int)
+#     l_wstring = global_ns.typedef('l_wstring')
+#     assert 'list<std::wstring>' == l_traits.remove_defaults(l_wstring)
+
+
+# def test_deque(global_ns):
+#     d_v_int = global_ns.typedef('d_v_int')
+#     d_v_traits = declarations.deque_traits
+#     assert 'deque<std::vector<int>>' == \
+#         d_v_traits.remove_defaults(d_v_int)
+#     d_l_string = global_ns.typedef('d_l_string')
+#     assert 'deque<std::list<std::string>>' == \
+#         d_v_traits.remove_defaults(d_l_string)
+
+
+# def test_queue(global_ns):
+#     q_int = global_ns.typedef('q_int')
+#     q_traits = declarations.queue_traits
+#     assert 'queue<int>' == q_traits.remove_defaults(q_int)
+#     q_string = global_ns.typedef('q_string')
+#     assert 'queue<std::string>' == q_traits.remove_defaults(q_string)
+
+
+# def test_priority_queue(global_ns):
+#     pq_int = global_ns.typedef('pq_int')
+#     pq_traits = declarations.priority_queue_traits
+#     assert 'priority_queue<int>' == pq_traits.remove_defaults(pq_int)
+#     pq_string = global_ns.typedef('pq_string')
+#     assert 'priority_queue<std::string>' == \
+#         pq_traits.remove_defaults(pq_string)
+
+
+# def test_set(global_ns):
+#     s_v_int = global_ns.typedef('s_v_int')
+#     assert 'set<std::vector<int>>' == \
+#         declarations.set_traits.remove_defaults(s_v_int)
+#     s_string = global_ns.typedef('s_string')
+#     assert 'set<std::string>' == \
+#         declarations.set_traits.remove_defaults(s_string)
+
+
+# def test_multiset(global_ns):
+#     ms_v_int = global_ns.typedef('ms_v_int')
+#     ms_v_traits = declarations.multiset_traits
+#     assert 'multiset<std::vector<int>>' == \
+#         ms_v_traits.remove_defaults(ms_v_int)
+#     ms_string = global_ns.typedef('ms_string')
+#     assert 'multiset<std::string>' == \
+#         ms_v_traits.remove_defaults(ms_string)
+
+
+# def test_map(global_ns):
+#     m_i2d = global_ns.typedef('m_i2d')
+#     assert 'map<int, double>' == \
+#         declarations.map_traits.remove_defaults(m_i2d)
+#     m_wstr2d = global_ns.typedef('m_wstr2d')
+#     assert 'map<std::wstring, double>' == \
+#         declarations.map_traits.remove_defaults(m_wstr2d)
+#     m_v_i2m_wstr2d = global_ns.typedef('m_v_i2m_wstr2d')
+#     m = 'map<const std::vector<int>, std::map<std::wstring, double>>'
+#     assert m == declarations.map_traits.remove_defaults(m_v_i2m_wstr2d)
+
+
+# def test_multimap(global_ns):
+#     mm_i2d = global_ns.typedef('mm_i2d')
+#     mm_traits = declarations.multimap_traits
+#     assert 'multimap<int, double>' == mm_traits.remove_defaults(mm_i2d)
+#     mm_wstr2d = global_ns.typedef('mm_wstr2d')
+#     assert 'multimap<const std::wstring, double>' == \
+#         mm_traits.remove_defaults(mm_wstr2d)
+#     mm_v_i2mm_wstr2d = global_ns.typedef('mm_v_i2mm_wstr2d')
+#     assert ('multimap<const std::vector<int>, ' +
+#             'const std::multimap<const std::wstring, double>>') == \
+#         mm_traits.remove_defaults(mm_v_i2mm_wstr2d)
+
+
+# def test_hash_set(global_ns):
+#     hs_v_int = global_ns.typedef('hs_v_int')
+#     hs_traits = declarations.unordered_set_traits
+#     name = 'unordered_set'
+#     assert (name + '<std::vector<int>>') == \
+#         hs_traits.remove_defaults(hs_v_int), \
+#         hs_traits.remove_defaults(hs_v_int)
+#     hs_string = global_ns.typedef('hs_string')
+#     assert (name + '<std::string>') == \
+#         hs_traits.remove_defaults(hs_string)
+
+
+# def test_hash_multiset(global_ns):
+#     mhs_v_int = global_ns.typedef('mhs_v_int')
+#     mhs_traits = declarations.unordered_multiset_traits
+#     name = 'unordered_multiset'
+#     assert (name + '<std::vector<int>>') == \
+#         mhs_traits.remove_defaults(mhs_v_int)
+#     mhs_string = global_ns.typedef('mhs_string')
+#     assert (name + '<std::string>') == \
+#         mhs_traits.remove_defaults(mhs_string)
+
+
+# def test_hash_map(global_ns):
+#     hm_i2d = global_ns.typedef('hm_i2d')
+#     hm_traits = declarations.unordered_map_traits
+#     name = 'unordered_map'
+#     assert (name + '<int, double>') == \
+#         hm_traits.remove_defaults(hm_i2d)
+#     hm_wstr2d = global_ns.typedef('hm_wstr2d')
+#     assert (name + '<std::wstring, double>') == \
+#         hm_traits.remove_defaults(hm_wstr2d)
+
+
+# def test_hash_multimap(global_ns):
+#     hmm_i2d = global_ns.typedef('hmm_i2d')
+#     hmm_traits = declarations.unordered_multimap_traits
+#     name = 'unordered_multimap'
+#     assert (name + '<int, double>') == \
+#         hmm_traits.remove_defaults(hmm_i2d)
+#     hmm_wstr2d = global_ns.typedef('hmm_wstr2d')
+#     assert (name + '<const std::wstring, double>') == \
+#         hmm_traits.remove_defaults(hmm_wstr2d)
+
+#     hmm_v_i2mm_wstr2d = global_ns.typedef('hmm_v_i2mm_wstr2d')
+
+#     hmm_traits_value = hmm_traits.remove_defaults(hmm_v_i2mm_wstr2d)
+
+#     possible_values = (
+#         name + '<const std::vector<int>, ' +
+#         'const __gnu_cxx::' + name + '<const std::wstring, double>>',
+#         name + '<const std::vector<int>, ' +
+#         'const std::' + utils.get_tr1(hmm_traits_value) + name +
+#         '<const std::wstring, double>>',
+#         name + '<const std::vector<int>, ' +
+#         'const stdext::' + name + '<const std::wstring, double>>')
+
+#     assert hmm_traits_value in possible_values, hmm_traits_value