Bug 1400283 - check_macroassembler_style.py: flake8 consistency r=nbp

MozReview-Commit-ID: 3J98Ni80BdW

--HG--
extra : rebase_source : 7a9b509c9b709efb5bb7a75c21a5bb826b652396
This commit is contained in:
Sylvestre Ledru 2017-09-15 18:14:41 +02:00
parent 74358fd669
commit 02eaf351ca

View File

@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
# This script checks that SpiderMonkey MacroAssembler methods are properly
# annotated.
#
@ -18,7 +18,7 @@
# MacroAssembler-inl.h for method definitions. The result of both scans are
# uniformized, and compared, to determine if the MacroAssembler.h header as
# proper methods annotations.
#----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
from __future__ import print_function
@ -30,10 +30,10 @@ import sys
from mozversioncontrol import get_repository_from_env
architecture_independent = set([ 'generic' ])
all_unsupported_architectures_names = set([ 'mips32', 'mips64', 'mips_shared' ])
all_architecture_names = set([ 'x86', 'x64', 'arm', 'arm64' ])
all_shared_architecture_names = set([ 'x86_shared', 'arm', 'arm64' ])
architecture_independent = set(['generic'])
all_unsupported_architectures_names = set(['mips32', 'mips64', 'mips_shared'])
all_architecture_names = set(['x86', 'x64', 'arm', 'arm64'])
all_shared_architecture_names = set(['x86_shared', 'arm', 'arm64'])
reBeforeArg = "(?<=[(,\s])"
reArgType = "(?P<type>[\w\s:*&]+)"
@ -42,7 +42,8 @@ reArgDefault = "(?P<default>(?:\s=[^,)]+)?)"
reAfterArg = "(?=[,)])"
reMatchArg = re.compile(reBeforeArg + reArgType + reArgName + reArgDefault + reAfterArg)
def get_normalized_signatures(signature, fileAnnot = None):
def get_normalized_signatures(signature, fileAnnot=None):
# Remove static
signature = signature.replace('static', '')
# Remove semicolon.
@ -88,18 +89,21 @@ def get_normalized_signatures(signature, fileAnnot = None):
inlinePrefx = ''
if inline:
inlinePrefx = 'inline '
signatures = [
{ 'arch': a, 'sig': inlinePrefx + signature }
signatures = [
{'arch': a, 'sig': inlinePrefx + signature}
for a in archs
]
return signatures
file_suffixes = set([
a.replace('_', '-') for a in
all_architecture_names.union(all_shared_architecture_names)
.union(all_unsupported_architectures_names)
])
def get_file_annotation(filename):
origFilename = filename
filename = filename.split('/')[-1]
@ -124,6 +128,7 @@ def get_file_annotation(filename):
'arch': arch.replace('-', '_')
}
def get_macroassembler_definitions(filename):
try:
fileAnnot = get_file_annotation(filename)
@ -147,7 +152,7 @@ def get_macroassembler_definitions(filename):
if line.startswith('{') or line.strip() == "{}":
if 'MacroAssembler::' in lines:
signatures.extend(get_normalized_signatures(lines, fileAnnot))
if line.strip() != "{}": # Empty declaration, no need to declare
if line.strip() != "{}": # Empty declaration, no need to declare
# a new code section
code_section = True
continue
@ -172,6 +177,7 @@ def get_macroassembler_definitions(filename):
return signatures
def get_macroassembler_declaration(filename):
style_section = False
lines = ''
@ -203,13 +209,15 @@ def get_macroassembler_declaration(filename):
return signatures
def append_signatures(d, sigs):
for s in sigs:
if s['sig'] not in d:
d[s['sig']] = []
d[s['sig']].append(s['arch']);
d[s['sig']].append(s['arch'])
return d
def generate_file_content(signatures):
output = []
for s in sorted(signatures.keys()):
@ -237,6 +245,7 @@ def generate_file_content(signatures):
output.append(' is defined in %s.cpp\n' % masm)
return output
def check_style():
# We read from the header file the signature of each function.
decls = dict() # type: dict(signature => ['x86', 'x64'])
@ -278,7 +287,7 @@ def main():
if ok:
print('TEST-PASS | check_macroassembler_style.py | ok')
else:
print('TEST-UNEXPECTED-FAIL | check_macroassembler_style.py | actual output does not match expected output; diff is above')
print('TEST-UNEXPECTED-FAIL | check_macroassembler_style.py | actual output does not match expected output; diff is above') # noqa: E501
sys.exit(0 if ok else 1)