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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Fix false positive for unused include by catenacyber · Pull Request #165 · myint/cppclean · GitHub
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Fix false positive for unused include by catenacyber · Pull Request #165 · myint/cppclean · GitHub
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Fix false positive for unused include by catenacyber · Pull Request #165 · myint/cppclean · GitHub
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Fix false positive for unused include by catenacyber · Pull Request #165 · myint/cppclean · GitHub
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Fix false positive for unused include by catenacyber · Pull Request #165 · myint/cppclean · GitHub
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
Fix false positive for unused include by catenacyber · Pull Request #165 · myint/cppclean · GitHub
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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