walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

addons/naming.py: Allow regular expression for private member variable names

This commit is contained in:
Daniel Marjamäki 2018-06-17 14:46:59 +02:00
parent fa8911a7d2
commit 2f23757c74
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/cppcheckdata.py
View File

@ -359,6 +359,7 @@ class Variable:
nameToken name token in variable declaration nameToken name token in variable declaration
typeStartToken start token of variable declaration typeStartToken start token of variable declaration
typeEndToken end token of variable declaration typeEndToken end token of variable declaration
access Global/Local/Namespace/Public/Protected/Public/Throw/Argument
isArgument Is this variable a function argument? isArgument Is this variable a function argument?
isArray Is this variable an array? isArray Is this variable an array?
isClass Is this variable a class or struct? isClass Is this variable a class or struct?
@ -378,6 +379,7 @@ class Variable:
typeStartToken = None typeStartToken = None
typeEndTokenId = None typeEndTokenId = None
typeEndToken = None typeEndToken = None
access = None
isArgument = False isArgument = False
isArray = False isArray = False
isClass = False isClass = False
@ -397,6 +399,7 @@ class Variable:
self.typeStartToken = None self.typeStartToken = None
self.typeEndTokenId = element.get('typeEndToken') self.typeEndTokenId = element.get('typeEndToken')
self.typeEndToken = None self.typeEndToken = None
self.access = element.get('access')
self.isArgument = element.get('isArgument') == 'true' self.isArgument = element.get('isArgument') == 'true'
self.isArray = element.get('isArray') == 'true' self.isArray = element.get('isArray') == 'true'
self.isClass = element.get('isClass') == 'true' self.isClass = element.get('isClass') == 'true'

11
addons/naming.py
View File

@ -12,10 +12,13 @@ import sys
import re import re
RE_VARNAME = None RE_VARNAME = None
RE_PRIVATE_MEMBER_VARIABLE = None
RE_FUNCTIONNAME = None RE_FUNCTIONNAME = None
for arg in sys.argv[1:]: for arg in sys.argv[1:]:
if arg[:6] == '--var=': if arg[:6] == '--var=':
RE_VARNAME = arg[6:] RE_VARNAME = arg[6:]
elif arg.startswith('--private-member-variable='):
RE_PRIVATE_MEMBER_VARIABLE = arg[arg.find('=')+1:]
elif arg[:11] == '--function=': elif arg[:11] == '--function=':
RE_FUNCTIONNAME = arg[11:] RE_FUNCTIONNAME = arg[11:]
@ -38,6 +41,14 @@ for arg in sys.argv[1:]:
if not res: if not res:
reportError(var.typeStartToken, 'style', 'Variable ' + reportError(var.typeStartToken, 'style', 'Variable ' +
var.nameToken.str + ' violates naming convention') var.nameToken.str + ' violates naming convention')
if RE_PRIVATE_MEMBER_VARIABLE:
for var in cfg.variables:
if (var.access is None) or var.access != 'Private':
continue
res = re.match(RE_PRIVATE_MEMBER_VARIABLE, var.nameToken.str)
if not res:
reportError(var.typeStartToken, 'style', 'Private member variable ' +
var.nameToken.str + ' violates naming convention')
if RE_FUNCTIONNAME: if RE_FUNCTIONNAME:
for scope in cfg.scopes: for scope in cfg.scopes:
if scope.type == 'Function': if scope.type == 'Function':