From 5b8cdd582f309b10f9be5b08991965528f5d6fa0 Mon Sep 17 00:00:00 2001 From: Stanislav Pankevich Date: Thu, 21 Nov 2019 21:13:22 +0100 Subject: [PATCH] Refactoring: strip whitespaces "globally" --- src/FileCheck | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/FileCheck b/src/FileCheck index e88cc1d..5a3358f 100755 --- a/src/FileCheck +++ b/src/FileCheck @@ -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) @@ -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, @@ -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,