Merge pull request mull-project#149 from tlively/is-part-of-word-check

Ignore check prefixes at the ends of words

Author: stanislaw

filecheck/FileCheck.py

@@ -138,6 +138,10 @@ class CheckResult(Enum):
     CHECK_NOT_WITHOUT_MATCH = 5
 
 
+# Allow check prefixes only at the beginnings of lines or after non-word characters.
+before_prefix = "^(.*?[^\w-])?"
+
+
 def check_line(line, current_check, match_full_lines):
     if current_check.check_type == CheckType.CHECK_EMPTY:
         if line != '':
@@ -281,17 +285,17 @@ def exit_handler(code):
             # CHECK and CHECK-NEXT
             strict_whitespace_match = "" if args.strict_whitespace and args.match_full_lines else " *"
 
-            check_regex = ".*?({}):{}(.*)".format(check_prefix, strict_whitespace_match)
+            check_regex = "{}({}):{}(.*)".format(before_prefix, check_prefix, strict_whitespace_match)
             check_match = re.search(check_regex, line)
             check_type = CheckType.CHECK
             if not check_match:
-                check_regex = ".*?({}-NEXT):{}(.*)".format(check_prefix, strict_whitespace_match)
+                check_regex = "{}({}-NEXT):{}(.*)".format(before_prefix, check_prefix, strict_whitespace_match)
                 check_match = re.search(check_regex, line)
                 check_type = CheckType.CHECK_NEXT
 
             if check_match:
-                check_keyword = check_match.group(1)
-                check_expression = check_match.group(2)
+                check_keyword = check_match.group(2)
+                check_expression = check_match.group(3)
                 if not (args.strict_whitespace and args.match_full_lines):
                     check_expression = check_expression.strip(' ')
 
@@ -309,18 +313,18 @@ def exit_handler(code):
                               expression=check_expression,
                               source_line=line,
                               check_line_idx=line_idx,
-                              start_index=check_match.start(2))
+                              start_index=check_match.start(3))
 
                 checks.append(check)
                 continue
 
-            check_not_regex = ".*({}-NOT):{}(.*)".format(check_prefix, strict_whitespace_match)
+            check_not_regex = "{}({}-NOT):{}(.*)".format(before_prefix, check_prefix, strict_whitespace_match)
             check_match = re.search(check_not_regex, line)
             if check_match:
                 match_type = MatchType.SUBSTRING
 
-                check_keyword = check_match.group(1)
-                check_expression = check_match.group(2)
+                check_keyword = check_match.group(2)
+                check_expression = check_match.group(3)
                 if not (args.strict_whitespace and args.match_full_lines):
                     check_expression = check_expression.strip(' ')
 
@@ -336,15 +340,15 @@ def exit_handler(code):
                               expression=check_expression,
                               source_line=line,
                               check_line_idx=line_idx,
-                              start_index=check_match.start(2))
+                              start_index=check_match.start(3))
 
                 checks.append(check)
                 continue
 
-            check_empty_regex = ".*({}-EMPTY):".format(check_prefix)
+            check_empty_regex = "{}({}-EMPTY):".format(before_prefix, check_prefix)
             check_match = re.search(check_empty_regex, line)
             if check_match:
-                check_keyword = check_match.group(1)
+                check_keyword = check_match.group(2)
 
                 check = Check(check_type=CheckType.CHECK_EMPTY,
                               match_type=MatchType.SUBSTRING,

tests/integration/tests/options/--check-prefix/04_common_suffix/filecheck.1.input

@@ -0,0 +1 @@
+string 1

tests/integration/tests/options/--check-prefix/04_common_suffix/filecheck.2.input

@@ -0,0 +1 @@
+string 2

tests/integration/tests/options/--check-prefix/04_common_suffix/filecheck.3.input

@@ -0,0 +1 @@
+string 3

tests/integration/tests/options/--check-prefix/04_common_suffix/filecheck.4.input

@@ -0,0 +1 @@
+string 4

tests/integration/tests/options/--check-prefix/04_common_suffix/filecheck.check

@@ -0,0 +1,4 @@
+; CHECK: string 1
+; OTHER-CHECK: string 2
+; ANOTHER-CHECK: string 3
+; YET_ANOTHER-CHECK: string 4

tests/integration/tests/options/--check-prefix/04_common_suffix/sample.itest

@@ -0,0 +1,8 @@
+; RUN: %cat "%S/filecheck.1.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix CHECK
+; RUN: %cat "%S/filecheck.2.input" | %expect_exit 1  %FILECHECK_EXEC "%S/filecheck.check" --check-prefix CHECK
+
+; RUN: %cat "%S/filecheck.2.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix OTHER-CHECK
+; RUN: %cat "%S/filecheck.3.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --check-prefix OTHER-CHECK
+
+; RUN: %cat "%S/filecheck.3.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix ANOTHER-CHECK
+; RUN: %cat "%S/filecheck.4.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --check-prefix ANOTHER-CHECK