Skip to content

Commit 762a820

Browse files
iMichkaiMichka
committed
test
1 parent de5c0e4 commit 762a820

File tree

9 files changed

+192
-163
lines changed

9 files changed

+192
-163
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,4 +102,4 @@ jobs:
102102
- name: Run tests
103103
run: |
104104
export PATH=~/castxml/bin:$PATH
105-
pytest tests
105+
pytest tests/test_remove_template_defaults.py

‎src/pygccxml/declarations/container_traits.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ def normalize(self, type_str):
3030

3131
def replace_basic_string(self, cls_name):
3232

33+
print("replace_basic_string", cls_name)
34+
3335
# Take the lists of all possible string variations
3436
# and clean them up by replacing ::std by std.
3537
str_eq = [

‎src/pygccxml/declarations/pattern_parser.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,11 @@ def join(self, name, args, arg_separator=None):
192192
args = [_f for _f in args if _f]
193193

194194
if not args:
195-
args_str = ' '
195+
args_str = ''
196196
elif len(args) == 1:
197-
args_str = ' ' + args[0] + ' '
197+
args_str = '' + args[0] + ''
198198
else:
199-
args_str = ' ' + arg_separator.join(args) + ' '
199+
args_str = '' + arg_separator.join(args) + ''
200200

201201
return ''.join([name, self.__begin, args_str, self.__end])
202202

‎src/pygccxml/declarations/type_traits.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -481,9 +481,9 @@ def is_fundamental(type_):
481481

482482

483483
string_equivalences = [
484-
(
485-
'::std::basic_string<char,std::char_traits<char>,'
486-
'std::allocator<char>>'),
484+
'::std::basic_string<char,std::char_traits<char>,std::allocator<char>>,\
485+
std::allocator<std::basic_string<char,std::char_traits<char>,std::allocator<char>>'
486+
'::std::basic_string<char,std::char_traits<char>,std::allocator<char>>',
487487
'::std::basic_string<char>', '::std::string']
488488

489489
wstring_equivalences = [

‎src/pygccxml/parser/patcher.py‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,32 @@ def remove_spaces_from_template_names(decls):
314314
after hash<std::vector<int>>
315315
"""
316316
for decl in decls:
317+
# if "v_int" in decl.name:
318+
# print("------")
319+
# print(
320+
# decl.decl_type,
321+
# type(decl.decl_type),
322+
# decl.decl_type.declaration.name)
323+
# if "vector" in decl.name:
324+
# print("------")
325+
# print("vvvvvvv", decl, decl.name)
317326
decl.name = decl.name.replace(" >", ">").replace("< ", "<")
318327
decl.partial_name = \
319328
decl.partial_name.replace(" >", ">").replace("< ", "<")
329+
if isinstance(decl, declarations.typedef_t) and \
330+
isinstance(decl.decl_type, declarations.declarated_t):
331+
decl.decl_type.declaration.name = fix_spaces(
332+
decl.decl_type.declaration.name)
333+
decl.decl_type.declaration.partial_name = fix_spaces(
334+
decl.decl_type.declaration.partial_name)
335+
# if "v_int" in decl.name:
336+
# print(
337+
# decl.decl_type,
338+
# type(decl.decl_type),
339+
# decl.decl_type.declaration.name)
340+
# if "vector" in decl.name:
341+
# print("vvvvvvv", decl, decl.name)
342+
343+
344+
def fix_spaces(val):
345+
return val.replace(" >", ">").replace("< ", "<")

‎tests/test_pattern_parser.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ def test_split():
6666
6767
"""
6868

69-
p1 = "std::vector<char, std::allocator<char> >"
70-
p2 = "std::vector<int, std::allocator<int> >"
69+
p1 = "std::vector<char, std::allocator<char>>"
70+
p2 = "std::vector<int, std::allocator<int>>"
7171
args_list = [
7272
"const std::basic_string<char> &", "const int &", "const double &"]
7373

‎tests/test_remove_template_defaults.py‎

Lines changed: 140 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -44,142 +44,143 @@ def test_vector(global_ns):
4444
v_v_int = global_ns.typedef('v_v_int')
4545
assert 'vector<std::vector<int>>' == \
4646
v_traits.remove_defaults(v_v_int)
47-
48-
49-
def test_list(global_ns):
50-
l_int = global_ns.typedef('l_int')
51-
l_traits = declarations.list_traits
52-
assert 'list<int>' == l_traits.remove_defaults(l_int)
53-
l_wstring = global_ns.typedef('l_wstring')
54-
assert 'list<std::wstring>' == l_traits.remove_defaults(l_wstring)
55-
56-
57-
def test_deque(global_ns):
58-
d_v_int = global_ns.typedef('d_v_int')
59-
d_v_traits = declarations.deque_traits
60-
assert 'deque<std::vector<int>>' == \
61-
d_v_traits.remove_defaults(d_v_int)
62-
d_l_string = global_ns.typedef('d_l_string')
63-
assert 'deque<std::list<std::string>>' == \
64-
d_v_traits.remove_defaults(d_l_string)
65-
66-
67-
def test_queue(global_ns):
68-
q_int = global_ns.typedef('q_int')
69-
q_traits = declarations.queue_traits
70-
assert 'queue<int>' == q_traits.remove_defaults(q_int)
71-
q_string = global_ns.typedef('q_string')
72-
assert 'queue<std::string>' == q_traits.remove_defaults(q_string)
73-
74-
75-
def test_priority_queue(global_ns):
76-
pq_int = global_ns.typedef('pq_int')
77-
pq_traits = declarations.priority_queue_traits
78-
assert 'priority_queue<int>' == pq_traits.remove_defaults(pq_int)
79-
pq_string = global_ns.typedef('pq_string')
80-
assert 'priority_queue<std::string>' == \
81-
pq_traits.remove_defaults(pq_string)
82-
83-
84-
def test_set(global_ns):
85-
s_v_int = global_ns.typedef('s_v_int')
86-
assert 'set<std::vector<int>>' == \
87-
declarations.set_traits.remove_defaults(s_v_int)
88-
s_string = global_ns.typedef('s_string')
89-
assert 'set<std::string>' == \
90-
declarations.set_traits.remove_defaults(s_string)
91-
92-
93-
def test_multiset(global_ns):
94-
ms_v_int = global_ns.typedef('ms_v_int')
95-
ms_v_traits = declarations.multiset_traits
96-
assert 'multiset<std::vector<int>>' == \
97-
ms_v_traits.remove_defaults(ms_v_int)
98-
ms_string = global_ns.typedef('ms_string')
99-
assert 'multiset<std::string>' == \
100-
ms_v_traits.remove_defaults(ms_string)
101-
102-
103-
def test_map(global_ns):
104-
m_i2d = global_ns.typedef('m_i2d')
105-
assert 'map<int, double>' == \
106-
declarations.map_traits.remove_defaults(m_i2d)
107-
m_wstr2d = global_ns.typedef('m_wstr2d')
108-
assert 'map<std::wstring, double>' == \
109-
declarations.map_traits.remove_defaults(m_wstr2d)
110-
m_v_i2m_wstr2d = global_ns.typedef('m_v_i2m_wstr2d')
111-
m = 'map<const std::vector<int>, std::map<std::wstring, double>>'
112-
assert m == declarations.map_traits.remove_defaults(m_v_i2m_wstr2d)
113-
114-
115-
def test_multimap(global_ns):
116-
mm_i2d = global_ns.typedef('mm_i2d')
117-
mm_traits = declarations.multimap_traits
118-
assert 'multimap<int, double>' == mm_traits.remove_defaults(mm_i2d)
119-
mm_wstr2d = global_ns.typedef('mm_wstr2d')
120-
assert 'multimap<const std::wstring, double>' == \
121-
mm_traits.remove_defaults(mm_wstr2d)
122-
mm_v_i2mm_wstr2d = global_ns.typedef('mm_v_i2mm_wstr2d')
123-
assert ('multimap<const std::vector<int>, ' +
124-
'const std::multimap<const std::wstring, double>>') == \
125-
mm_traits.remove_defaults(mm_v_i2mm_wstr2d)
126-
127-
128-
def test_hash_set(global_ns):
129-
hs_v_int = global_ns.typedef('hs_v_int')
130-
hs_traits = declarations.unordered_set_traits
131-
name = 'unordered_set'
132-
assert (name + '<std::vector<int>>') == \
133-
hs_traits.remove_defaults(hs_v_int), \
134-
hs_traits.remove_defaults(hs_v_int)
135-
hs_string = global_ns.typedef('hs_string')
136-
assert (name + '<std::string>') == \
137-
hs_traits.remove_defaults(hs_string)
138-
139-
140-
def test_hash_multiset(global_ns):
141-
mhs_v_int = global_ns.typedef('mhs_v_int')
142-
mhs_traits = declarations.unordered_multiset_traits
143-
name = 'unordered_multiset'
144-
assert (name + '<std::vector<int>>') == \
145-
mhs_traits.remove_defaults(mhs_v_int)
146-
mhs_string = global_ns.typedef('mhs_string')
147-
assert (name + '<std::string>') == \
148-
mhs_traits.remove_defaults(mhs_string)
149-
150-
151-
def test_hash_map(global_ns):
152-
hm_i2d = global_ns.typedef('hm_i2d')
153-
hm_traits = declarations.unordered_map_traits
154-
name = 'unordered_map'
155-
assert (name + '<int, double>') == \
156-
hm_traits.remove_defaults(hm_i2d)
157-
hm_wstr2d = global_ns.typedef('hm_wstr2d')
158-
assert (name + '<std::wstring, double>') == \
159-
hm_traits.remove_defaults(hm_wstr2d)
160-
161-
162-
def test_hash_multimap(global_ns):
163-
hmm_i2d = global_ns.typedef('hmm_i2d')
164-
hmm_traits = declarations.unordered_multimap_traits
165-
name = 'unordered_multimap'
166-
assert (name + '<int, double>') == \
167-
hmm_traits.remove_defaults(hmm_i2d)
168-
hmm_wstr2d = global_ns.typedef('hmm_wstr2d')
169-
assert (name + '<const std::wstring, double>') == \
170-
hmm_traits.remove_defaults(hmm_wstr2d)
171-
172-
hmm_v_i2mm_wstr2d = global_ns.typedef('hmm_v_i2mm_wstr2d')
173-
174-
hmm_traits_value = hmm_traits.remove_defaults(hmm_v_i2mm_wstr2d)
175-
176-
possible_values = (
177-
name + '<const std::vector<int>, ' +
178-
'const __gnu_cxx::' + name + '<const std::wstring, double>>',
179-
name + '<const std::vector<int>, ' +
180-
'const std::' + utils.get_tr1(hmm_traits_value) + name +
181-
'<const std::wstring, double>>',
182-
name + '<const std::vector<int>, ' +
183-
'const stdext::' + name + '<const std::wstring, double>>')
184-
185-
assert hmm_traits_value in possible_values, hmm_traits_value
47+
raise
48+
49+
50+
# def test_list(global_ns):
51+
# l_int = global_ns.typedef('l_int')
52+
# l_traits = declarations.list_traits
53+
# assert 'list<int>' == l_traits.remove_defaults(l_int)
54+
# l_wstring = global_ns.typedef('l_wstring')
55+
# assert 'list<std::wstring>' == l_traits.remove_defaults(l_wstring)
56+
57+
58+
# def test_deque(global_ns):
59+
# d_v_int = global_ns.typedef('d_v_int')
60+
# d_v_traits = declarations.deque_traits
61+
# assert 'deque<std::vector<int>>' == \
62+
# d_v_traits.remove_defaults(d_v_int)
63+
# d_l_string = global_ns.typedef('d_l_string')
64+
# assert 'deque<std::list<std::string>>' == \
65+
# d_v_traits.remove_defaults(d_l_string)
66+
67+
68+
# def test_queue(global_ns):
69+
# q_int = global_ns.typedef('q_int')
70+
# q_traits = declarations.queue_traits
71+
# assert 'queue<int>' == q_traits.remove_defaults(q_int)
72+
# q_string = global_ns.typedef('q_string')
73+
# assert 'queue<std::string>' == q_traits.remove_defaults(q_string)
74+
75+
76+
# def test_priority_queue(global_ns):
77+
# pq_int = global_ns.typedef('pq_int')
78+
# pq_traits = declarations.priority_queue_traits
79+
# assert 'priority_queue<int>' == pq_traits.remove_defaults(pq_int)
80+
# pq_string = global_ns.typedef('pq_string')
81+
# assert 'priority_queue<std::string>' == \
82+
# pq_traits.remove_defaults(pq_string)
83+
84+
85+
# def test_set(global_ns):
86+
# s_v_int = global_ns.typedef('s_v_int')
87+
# assert 'set<std::vector<int>>' == \
88+
# declarations.set_traits.remove_defaults(s_v_int)
89+
# s_string = global_ns.typedef('s_string')
90+
# assert 'set<std::string>' == \
91+
# declarations.set_traits.remove_defaults(s_string)
92+
93+
94+
# def test_multiset(global_ns):
95+
# ms_v_int = global_ns.typedef('ms_v_int')
96+
# ms_v_traits = declarations.multiset_traits
97+
# assert 'multiset<std::vector<int>>' == \
98+
# ms_v_traits.remove_defaults(ms_v_int)
99+
# ms_string = global_ns.typedef('ms_string')
100+
# assert 'multiset<std::string>' == \
101+
# ms_v_traits.remove_defaults(ms_string)
102+
103+
104+
# def test_map(global_ns):
105+
# m_i2d = global_ns.typedef('m_i2d')
106+
# assert 'map<int, double>' == \
107+
# declarations.map_traits.remove_defaults(m_i2d)
108+
# m_wstr2d = global_ns.typedef('m_wstr2d')
109+
# assert 'map<std::wstring, double>' == \
110+
# declarations.map_traits.remove_defaults(m_wstr2d)
111+
# m_v_i2m_wstr2d = global_ns.typedef('m_v_i2m_wstr2d')
112+
# m = 'map<const std::vector<int>, std::map<std::wstring, double>>'
113+
# assert m == declarations.map_traits.remove_defaults(m_v_i2m_wstr2d)
114+
115+
116+
# def test_multimap(global_ns):
117+
# mm_i2d = global_ns.typedef('mm_i2d')
118+
# mm_traits = declarations.multimap_traits
119+
# assert 'multimap<int, double>' == mm_traits.remove_defaults(mm_i2d)
120+
# mm_wstr2d = global_ns.typedef('mm_wstr2d')
121+
# assert 'multimap<const std::wstring, double>' == \
122+
# mm_traits.remove_defaults(mm_wstr2d)
123+
# mm_v_i2mm_wstr2d = global_ns.typedef('mm_v_i2mm_wstr2d')
124+
# assert ('multimap<const std::vector<int>, ' +
125+
# 'const std::multimap<const std::wstring, double>>') == \
126+
# mm_traits.remove_defaults(mm_v_i2mm_wstr2d)
127+
128+
129+
# def test_hash_set(global_ns):
130+
# hs_v_int = global_ns.typedef('hs_v_int')
131+
# hs_traits = declarations.unordered_set_traits
132+
# name = 'unordered_set'
133+
# assert (name + '<std::vector<int>>') == \
134+
# hs_traits.remove_defaults(hs_v_int), \
135+
# hs_traits.remove_defaults(hs_v_int)
136+
# hs_string = global_ns.typedef('hs_string')
137+
# assert (name + '<std::string>') == \
138+
# hs_traits.remove_defaults(hs_string)
139+
140+
141+
# def test_hash_multiset(global_ns):
142+
# mhs_v_int = global_ns.typedef('mhs_v_int')
143+
# mhs_traits = declarations.unordered_multiset_traits
144+
# name = 'unordered_multiset'
145+
# assert (name + '<std::vector<int>>') == \
146+
# mhs_traits.remove_defaults(mhs_v_int)
147+
# mhs_string = global_ns.typedef('mhs_string')
148+
# assert (name + '<std::string>') == \
149+
# mhs_traits.remove_defaults(mhs_string)
150+
151+
152+
# def test_hash_map(global_ns):
153+
# hm_i2d = global_ns.typedef('hm_i2d')
154+
# hm_traits = declarations.unordered_map_traits
155+
# name = 'unordered_map'
156+
# assert (name + '<int, double>') == \
157+
# hm_traits.remove_defaults(hm_i2d)
158+
# hm_wstr2d = global_ns.typedef('hm_wstr2d')
159+
# assert (name + '<std::wstring, double>') == \
160+
# hm_traits.remove_defaults(hm_wstr2d)
161+
162+
163+
# def test_hash_multimap(global_ns):
164+
# hmm_i2d = global_ns.typedef('hmm_i2d')
165+
# hmm_traits = declarations.unordered_multimap_traits
166+
# name = 'unordered_multimap'
167+
# assert (name + '<int, double>') == \
168+
# hmm_traits.remove_defaults(hmm_i2d)
169+
# hmm_wstr2d = global_ns.typedef('hmm_wstr2d')
170+
# assert (name + '<const std::wstring, double>') == \
171+
# hmm_traits.remove_defaults(hmm_wstr2d)
172+
173+
# hmm_v_i2mm_wstr2d = global_ns.typedef('hmm_v_i2mm_wstr2d')
174+
175+
# hmm_traits_value = hmm_traits.remove_defaults(hmm_v_i2mm_wstr2d)
176+
177+
# possible_values = (
178+
# name + '<const std::vector<int>, ' +
179+
# 'const __gnu_cxx::' + name + '<const std::wstring, double>>',
180+
# name + '<const std::vector<int>, ' +
181+
# 'const std::' + utils.get_tr1(hmm_traits_value) + name +
182+
# '<const std::wstring, double>>',
183+
# name + '<const std::vector<int>, ' +
184+
# 'const stdext::' + name + '<const std::wstring, double>>')
185+
186+
# assert hmm_traits_value in possible_values, hmm_traits_value

0 commit comments

Comments
 (0)