@@ -152,7 +152,7 @@ def find_copy_constructor(type_):
152
152
return None
153
153
154
154
155
- def find_noncopyable_vars (type_ , already_visited_cls_vars = None ):
155
+ def find_noncopyable_vars (class_type , already_visited_cls_vars = None ):
156
156
"""
157
157
Returns list of all `noncopyable` variables.
158
158
@@ -161,18 +161,19 @@ def find_noncopyable_vars(type_, already_visited_cls_vars=None):
161
161
whatever variables pointing to classes have been found.
162
162
163
163
Args:
164
- type_ (declarations.class_t): the class to be searched.
164
+ class_type (declarations.class_t): the class to be searched.
165
165
already_visited_cls_vars (list): optional list of vars that should not
166
166
be checked a second time, to prevent infinite recursions.
167
167
168
168
Returns:
169
169
list: list of all `noncopyable` variables.
170
170
171
171
"""
172
- assert isinstance (type_ , class_declaration .class_t )
172
+
173
+ assert isinstance (class_type , class_declaration .class_t )
173
174
174
175
logger = utils .loggers .cxx_parser
175
- mvars = type_ .variables (
176
+ mvars = class_type .variables (
176
177
lambda v : not v .type_qualifiers .has_static ,
177
178
recursive = False ,
178
179
allow_empty = True )
@@ -187,25 +188,25 @@ def find_noncopyable_vars(type_, already_visited_cls_vars=None):
187
188
188
189
for mvar in mvars :
189
190
190
- type_ = type_traits .remove_reference (mvar .decl_type )
191
+ var_type = type_traits .remove_reference (mvar .decl_type )
191
192
192
- if type_traits .is_const (type_ ):
193
- no_const = type_traits .remove_const (type_ )
193
+ if type_traits .is_const (var_type ):
194
+ no_const = type_traits .remove_const (var_type )
194
195
if type_traits .is_fundamental (no_const ) or is_enum (no_const ):
195
196
logger .debug (
196
197
(message + "- fundamental or enum" ),
197
- type_ .decl_string )
198
+ var_type .decl_string )
198
199
noncopyable_vars .append (mvar )
199
200
if is_class (no_const ):
200
- logger .debug ((message + " - class" ), type_ .decl_string )
201
+ logger .debug ((message + " - class" ), var_type .decl_string )
201
202
noncopyable_vars .append (mvar )
202
203
if type_traits .is_array (no_const ):
203
- logger .debug ((message + " - array" ), type_ .decl_string )
204
+ logger .debug ((message + " - array" ), var_type .decl_string )
204
205
noncopyable_vars .append (mvar )
205
206
206
- if class_traits .is_my_case (type_ ):
207
+ if class_traits .is_my_case (var_type ):
207
208
208
- cls = class_traits .get_declaration (type_ )
209
+ cls = class_traits .get_declaration (var_type )
209
210
210
211
# Exclude classes that have already been visited.
211
212
if cls in already_visited_cls_vars :
@@ -215,12 +216,12 @@ def find_noncopyable_vars(type_, already_visited_cls_vars=None):
215
216
if is_noncopyable (cls , already_visited_cls_vars ):
216
217
logger .debug (
217
218
(message + " - class that is not copyable" ),
218
- type_ .decl_string )
219
+ var_type .decl_string )
219
220
noncopyable_vars .append (mvar )
220
221
221
222
logger .debug ((
222
223
"__contains_noncopyable_mem_var - %s - FALSE - doesn't " +
223
- "contain noncopyable members" ), type_ .decl_string )
224
+ "contain noncopyable members" ), class_type .decl_string )
224
225
225
226
return noncopyable_vars
226
227
0 commit comments