Use non-greedy match when matching for CHECK: lines

This implements some part of the #145.
mull-project · Jun 6, 2020 · 38b79b3 · 38b79b3
1 parent d866cd3
commit 38b79b3
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 2 deletions.
diff --git a/filecheck/FileCheck.py b/filecheck/FileCheck.py
@@ -264,11 +264,11 @@ def main():
             # 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(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(check_prefix, strict_whitespace_match)
                 check_match = re.search(check_regex, line)
                 check_type = CheckType.CHECK_NEXT
 

diff --git a/...commands/CHECK/one_string/positive-match/05-CHECK-two-times-matches-first/filecheck.check b/...commands/CHECK/one_string/positive-match/05-CHECK-two-times-matches-first/filecheck.check
@@ -0,0 +1 @@
+; CHECK:{{^.*filecheck.check:1:(9|10): error: CHECK: expected string not found in input$}}
diff --git a/...commands/CHECK/one_string/positive-match/05-CHECK-two-times-matches-first/filecheck.input b/...commands/CHECK/one_string/positive-match/05-CHECK-two-times-matches-first/filecheck.input
@@ -0,0 +1 @@
+A-very-long-path/filecheck.check:1:9: error: CHECK: expected string not found in input
diff --git a/...ck_commands/CHECK/one_string/positive-match/05-CHECK-two-times-matches-first/sample.itest b/...ck_commands/CHECK/one_string/positive-match/05-CHECK-two-times-matches-first/sample.itest
@@ -0,0 +1 @@
+; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
diff --git a/...ests/check_commands/CHECK/two_strings/04-wip-negative_match_second_string/filecheck.check b/...ests/check_commands/CHECK/two_strings/04-wip-negative_match_second_string/filecheck.check
@@ -0,0 +1,2 @@
+; CHECK: hello1
+; CHECK: foo
diff --git a/...ests/check_commands/CHECK/two_strings/04-wip-negative_match_second_string/filecheck.input b/...ests/check_commands/CHECK/two_strings/04-wip-negative_match_second_string/filecheck.input
@@ -0,0 +1,2 @@
+hello1
+hello2
diff --git a/...n/tests/check_commands/CHECK/two_strings/04-wip-negative_match_second_string/sample.itest b/...n/tests/check_commands/CHECK/two_strings/04-wip-negative_match_second_string/sample.itest
@@ -0,0 +1,12 @@
+; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
+
+; CHECK: {{.*filecheck.check:2:10: error: CHECK: expected string not found in input$}}
+; CHECK: {{^}}; CHECK: foo{{$}}
+; CHECK: {{^}}         ^{{$}}
+; CHECK: {{^<stdin>:.*:.*: note: scanning from here$}}
+; CHECK: hello2
+; CHECK: ^{{$}}
+; CHECK: {{^<stdin>:.*:.*: note: possible intended match here$}}
+; CHECK: hello2
+; CHECK: ^
+; CHECK-EMPTY:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		; CHECK:{{^.*filecheck.check:1:(9\|10): error: CHECK: expected string not found in input$}}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		A-very-long-path/filecheck.check:1:9: error: CHECK: expected string not found in input
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		; RUN: %cat "%S/filecheck.input" \| %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"