eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve regex to adapt to flexible spaces

Browse source 
Signed-off-by: Yuto Takano <yuto.takano@arm.com>
This commit is contained in:
Yuto Takano 2021-08-06 16:56:52 +01:00
parent 5c1acf2735
commit 13ecd996fc
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
tests/scripts/check-names.py
View file

@ -320,16 +320,19 @@ class NameCheck(object):
state = 0 state = 0
with open(header_file, "r") as header: with open(header_file, "r") as header:
for line in header: for line in header:
if state is 0 and re.match(r"^(typedef )?enum {", line): # Match typedefs and brackets only when they are at the
# beginning of the line -- if they are indented, they might
# be sub-structures within structs, etc.
if state is 0 and re.match(r"^(typedef +)?enum +{", line):
state = 1 state = 1
elif state is 0 and re.match(r"^(typedef )?enum", line): elif state is 0 and re.match(r"^(typedef +)?enum", line):
state = 2 state = 2
elif state is 2 and re.match(r"^{", line): elif state is 2 and re.match(r"^{", line):
state = 1 state = 1
elif state is 1 and re.match(r"^}", line): elif state is 1 and re.match(r"^}", line):
state = 0 state = 0
elif state is 1 and not re.match(r"^#", line): elif state is 1 and not re.match(r" *#", line):
enum_const = re.match(r"^\s*(?P<enum_const>\w+)", line) enum_const = re.match(r" *(?P<enum_const>\w+)", line)
if enum_const: if enum_const:
enum_consts.append(Match( enum_consts.append(Match(
header_file, header_file,
@ -351,9 +354,9 @@ class NameCheck(object):
""" """
EXCLUDED_LINES = ( EXCLUDED_LINES = (
r"^(" r"^("
r"extern \"C\"|" r"extern +\"C\"|"
r"(typedef )?(struct|union|enum)( {)?$|" r"(typedef +)?(struct|union|enum)( *{)?$|"
r"};?$|" r"} *;?$|"
r"$|" r"$|"
r"//|" r"//|"
r"#" r"#"
@ -389,7 +392,7 @@ class NameCheck(object):
# This *might* be a function with its argument brackets on # This *might* be a function with its argument brackets on
# the next line, or a struct declaration, so keep note of it # the next line, or a struct declaration, so keep note of it
if re.match( if re.match(
r"(inline |static |typedef )*\w+ \w+$", r"(inline +|static +|typedef +)*\w+ +\w+$",
line): line):
previous_line = line previous_line = line
continue continue
@ -408,7 +411,7 @@ class NameCheck(object):
continue continue
identifier = re.search( identifier = re.search(
# Match something( # Match " something(" or " *something(". function calls.
r".* \**(\w+)\(|" r".* \**(\w+)\(|"
# Match (*something)( # Match (*something)(
r".*\( *\* *(\w+) *\) *\(|" r".*\( *\* *(\w+) *\) *\(|"