Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-13 19:04:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Deal with multiline strings and tighten up syntax nit error messages.

Browse source
This commit is contained in:
Josh Matthews 2015-08-13 16:07:25 -04:00
parent e57a3888a5
commit 4e593280ff
1 changed files with 25 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

44
python/tidy.py
View file

@ -169,9 +169,17 @@ def check_rust(file_name, contents):
if not file_name.endswith(".rs") or file_name.endswith("properties.mako.rs"): if not file_name.endswith(".rs") or file_name.endswith("properties.mako.rs"):
raise StopIteration raise StopIteration
contents = contents.splitlines(True) contents = contents.splitlines(True)
merged_lines = ''
for idx, line in enumerate(contents): for idx, line in enumerate(contents):
# simplify the analisis # simplify the analisis
line = line.lstrip() line = line.strip()
if line.endswith('\\'):
merged_lines += line[:-1]
continue
elif merged_lines:
line = merged_lines + line
merged_lines = ''
# get rid of strings and chars because cases like regex expression # get rid of strings and chars because cases like regex expression
line = re.sub('".*?"|\'.*?\'', '', line) line = re.sub('".*?"|\'.*?\'', '', line)
@ -180,38 +188,36 @@ def check_rust(file_name, contents):
line = re.sub('//.*?$|/\*.*?$|^\*.*?$|^#.*?$', '', line) line = re.sub('//.*?$|/\*.*?$|^\*.*?$|^#.*?$', '', line)
match = re.search(r",[A-Za-z0-9]", line) match = re.search(r",[A-Za-z0-9]", line)
if match is not None: if match:
yield (idx + 1, "there should be a space following a comma") yield (idx + 1, "missing space after comma")
match = re.search(r"[A-Za-z0-9][\+\-/\*%=]", line) match = re.search(r"[A-Za-z0-9][\+\-/\*%=]", line)
if match is not None: if match:
yield (idx + 1, "there should be a space preceding an operator") yield (idx + 1, "missing space before an operator")
# * not included because of dereferencing and casting # * not included because of dereferencing and casting
# - not included because of unary negation # - not included because of unary negation
match = re.search(r"[\+/\%=][A-Za-z0-9]", line) match = re.search(r"[\+/\%=][A-Za-z0-9]", line)
if match is not None: if match:
yield (idx + 1, "there should be a space following an operator") yield (idx + 1, "missing space after an operator")
match = re.search(r"\)->", line) match = re.search(r"\)->", line)
if match is not None: if match:
yield (idx + 1, "there should be a space before -> in a function return type") yield (idx + 1, "missing space before ->")
match = re.search(r"->[A-Za-z]", line) match = re.search(r"->[A-Za-z]", line)
if match is not None: if match:
yield (idx + 1, "there should be a space after -> in a function return type") yield (idx + 1, "missing space after ->")
match = re.search(r" :", line) if line.find(" :") != -1:
if match is not None: yield (idx + 1, "extra space before :")
yield (idx + 1, "there should not be a space preceding a colon")
match = re.search(r"[A-Za-z0-9\)]{", line) match = re.search(r"[A-Za-z0-9\)]{", line)
if match is not None: if match:
yield (idx + 1, "there should be a space before an open brace") yield (idx + 1, "extra space before {")
match = re.search(r"^use", line) if line.startswith("use ") and "{" in line and "}" not in line:
if match is not None and "{" in line and "}" not in line: yield (idx + 1, "use statement spans multiple lines")
yield (idx + 1, "use statements should not span more than one line")
def check_webidl_spec(file_name, contents): def check_webidl_spec(file_name, contents):