Skip to content

Refactoring: strip whitespaces "globally" #20

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

Merged
stanislaw merged 1 commit into from
Nov 21, 2019
Merged

Refactoring: strip whitespaces "globally" #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 4 additions & 6 deletions src/FileCheck
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ checks = []
with open(check_file) as f:
for line_idx, line in enumerate(f):
line = line.rstrip()

if not args.strict_whitespace:
line = re.sub("\\s+", ' ', line).strip()

check_match = re.search('; CHECK: (.*)', line)
if check_match:
check_expression = check_match.group(1)
Expand All @@ -80,9 +84,6 @@ with open(check_file) as f:
if check_expression != regex_line:
match_type = MatchType.REGEX
check_expression = regex_line
else:
if not args.strict_whitespace:
check_expression = re.sub("\\s+", ' ', check_expression).strip()

check = Check(check_type=CheckType.CHECK,
match_type=match_type,
Expand All @@ -105,9 +106,6 @@ with open(check_file) as f:
if check_expression != regex_line:
match_type = MatchType.REGEX
check_expression = regex_line
else:
if not args.strict_whitespace:
check_expression = re.sub("\\s+", ' ', check_expression).strip()

check = Check(check_type=CheckType.CHECK_NOT,
match_type=match_type,
Expand Down