Skip to content

Fix false positive for unused include #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
catenacyber wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix false positive for unused include #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
19a93e7
Fix false positive for unused include
catenacyber Jun 20, 2022
f37791e
use array dimensions
catenacyber Jul 7, 2022
b9b09cd
use type in function arguments
catenacyber Jul 7, 2022
815d29b
Allows the use of macros in struct fields
catenacyber Jul 26, 2022
b3f97df
use enum values
catenacyber Jul 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions cpp/ast.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
FUNCTION_ATTRIBUTE = 0x20
FUNCTION_UNKNOWN_ANNOTATION = 0x40
FUNCTION_THROW = 0x80
FUNCTION_INSIDE_STRUCT_MACRO = 0x100


class ParseError(Exception):
Expand Down Expand Up @@ -230,7 +231,15 @@ class Enum(_GenericDeclaration):

def __init__(self, start, end, name, fields, namespace):
_GenericDeclaration.__init__(self, start, end, name, namespace)
self.fields = fields
field = True
self.fields = []
for f in fields:
if f.name == ",":
field = True
elif field and f.name[0] != '#':
self.fields.append(VariableDeclaration(f.start, f.end, f.name, name, None, namespace))
field = False
# else = 1 : skip

def is_definition(self):
return True
Expand Down Expand Up @@ -372,7 +381,7 @@ def __str__(self):
suffix += '&'
if self.pointer:
suffix += '*'
if self.array:
if self.array is not None:
suffix += '[]'
return self._type_string_helper(suffix)

Expand Down Expand Up @@ -416,7 +425,7 @@ def to_type(self, tokens):
"""
result = []
name_tokens = []
reference = pointer = array = False
reference = pointer = False
inside_array = False
empty_array = True
templated_tokens = []
Expand All @@ -438,7 +447,7 @@ def add_type():
templated_types = self.to_type(templated_tokens)
result.append(Type(name_tokens[0].start, name_tokens[-1].end,
name, templated_types, modifiers,
reference, pointer, array))
reference, pointer, None))
del name_tokens[:]
del templated_tokens[:]

Expand Down Expand Up @@ -560,7 +569,7 @@ def add_parameter():
if type_name:
parameter_type = Type(first_token.start, first_token.end,
type_name, templated_types, modifiers,
reference, pointer, False)
reference, pointer, None)
p = Parameter(first_token.start, end, name,
parameter_type, default)
result.append(p)
Expand Down Expand Up @@ -616,7 +625,10 @@ def create_return_type(self, return_type_seq):
names = [n.name for n in other_tokens]
reference = '&' in names
pointer = '*' in names
array = '[' in names
if '[' in names:
array = True
else:
array = None
return Type(start, end, name, templated_types, modifiers,
reference, pointer, array)

Expand Down Expand Up @@ -687,6 +699,11 @@ def _create_variable(self, pos_token, name, type_name, type_modifiers,
reference = '&' in ref_pointer_name_seq
pointer = '*' in ref_pointer_name_seq
array = '[' in ref_pointer_name_seq
if '[' in ref_pointer_name_seq:
array = ref_pointer_name_seq[ref_pointer_name_seq.index('[')+1]
else:
array = None

var_type = Type(pos_token.start, pos_token.end, type_name,
templated_types, type_modifiers,
reference, pointer, array)
Expand Down
23 changes: 20 additions & 3 deletions cpp/find_warnings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,12 @@ def __init__(self, filename, ast_list):
def _get_exported_symbols(self):
if not self.ast_list:
return {}
return dict([(n.name, n) for n in self.ast_list if n.is_exportable()])
r = dict([(n.name, n) for n in self.ast_list if n.is_exportable()])
for n in self.ast_list:
if isinstance(n, ast.Enum):
for f in n.fields:
r[f.name] = f
return r


def is_header_file(filename):
Expand Down Expand Up @@ -328,13 +333,18 @@ def _add_variable(node, namespace, reference=False):
# variable value.
_add_use(obj.name, namespace)
_add_use(node, namespace)
if isinstance(obj.array, str):
_add_use(obj.array, namespace)
# This needs to recurse when the node is a templated type.
_add_template_use(obj.name,
obj.templated_types,
namespace,
reference)

def _process_function(function, namespace):
if function.modifiers & ast.FUNCTION_INSIDE_STRUCT_MACRO:
_add_use(function.name, namespace)
return
reference = function.body is None
if function.return_type:
return_type = function.return_type
Expand Down Expand Up @@ -362,7 +372,7 @@ def _process_function(function, namespace):
p.default[0].name != 'nullptr'
):
_add_use(node.name, namespace)
elif node.reference or node.pointer or reference:
elif node.reference:
_add_reference(node.name, namespace)
else:
_add_use(node.name, namespace)
Expand Down Expand Up @@ -409,6 +419,8 @@ def _process_types(nodes, namespace):
for node in nodes:
if isinstance(node, ast.Type):
_add_variable(node, namespace)
elif isinstance(node, ast.Struct):
return node.body

# Iterate through the source AST/tokens, marking each symbols use.
ast_seq = [self.ast_list]
Expand All @@ -425,7 +437,12 @@ def _process_types(nodes, namespace):
_process_function_body(node, namespace)
elif isinstance(node, ast.Typedef):
namespace = namespace_stack + node.namespace
_process_types(node.alias, namespace)
b = _process_types(node.alias, namespace)
if b is not None:
for e in b:
if isinstance(e, ast.Function):
e.modifiers |= ast.FUNCTION_INSIDE_STRUCT_MACRO
ast_seq.append(b)
elif isinstance(node, ast.Friend):
expr = node.expr
namespace = namespace_stack + node.namespace
Expand Down