fix CHECK-NEXT to consume as few matches as possible

README.md

@@ -52,6 +52,7 @@ There are some features that are left out for now (e.g. [pseudo-numeric variable
   - [ ] MLIR/xDSL integration tests
 - **UX:**
   - [ ] Good error messages: I have some error messages, but could be a lot better
+  - [ ] Error messages for malformed regexes
 - **Infrastructure:**
   - [X] Formatting: black
   - [X] Pyright: Almost passes rn

filecheck/compiler.py

@@ -22,8 +22,6 @@ def compile_uops(
     expr: list[str] = []
     if check.name == "NEXT":
         expr.append(r"\n?[^\n]*")
-    elif check.name == "SAME":
-        expr.append("[^\n]*")
     elif check.name == "EMPTY":
         return CHECK_EMPTY_EXPR, dict()
 

filecheck/finput.py

@@ -61,23 +61,30 @@ def match(self, pattern: re.Pattern[str]) -> re.Match[str] | None:
         """
         Match (exactly from the current position)
         """
-        print(f"matching on {pattern}")
+        print(f"matching on r{repr(pattern.pattern)}")
         return pattern.match(self.content, pos=self.pos)
 
-    def find(self, pattern: re.Pattern[str]) -> re.Match[str] | None:
+    def find(
+        self, pattern: re.Pattern[str], this_line: bool = False
+    ) -> re.Match[str] | None:
         """
         Find the first occurance of a pattern, might be far away.
+
+        If this_line is given, match only until the next newline.
         """
-        print(f'searching for r"{pattern.pattern}"')
-        return pattern.search(self.content, pos=self.pos)
+        print(f"searching for r{repr(pattern.pattern)}")
+        endpos = self.content.find("\n", self.pos) if this_line else -1
+        if endpos == -1:
+            endpos = sys.maxsize
+        return pattern.search(self.content, pos=self.pos, endpos=endpos)
 
     def find_between(
         self, pattern: re.Pattern[str], start: int, end: int
     ) -> re.Match[str] | None:
         """
         Find the first occurance of a pattern, might be far away.
         """
-        print(f"searching for {pattern} in input[{start}:{end}]")
+        print(f"searching for r{repr(pattern.pattern)} in input[{start}:{end}]")
         return pattern.search(self.content, pos=start, endpos=end)
 
     def print_line_with_current_pos(self, pos_override: int | None = None):

filecheck/matcher.py

@@ -60,7 +60,7 @@ def run(self) -> int:
             "NOT": self.enqueue_not,
             "EMPTY": self.check_empty,
             "NEXT": self.match_immediately,
-            "SAME": self.match_immediately,
+            "SAME": self.match_eventually,
             "LABEL": self.check_label,
             "CHECK": self.match_eventually,
         }
@@ -204,7 +204,7 @@ def match_eventually(self, op: CheckOp):
         Uses file.find
         """
         pattern, repl = compile_uops(op, self.ctx.live_variables, self.opts)
-        if match := self.file.find(pattern):
+        if match := self.file.find(pattern, op.name == "SAME"):
             print(
                 f"matched: {op.check_line_repr()}, groups={match.groups()} mapping to {repl}"
             )

tests/filecheck/simple.test

@@ -17,3 +17,9 @@ SOME B C
 
 // CHECK-NOT: 404
 suffix
+
+test A val1 val2 val1 val2 val1
+// CHECK: test A
+// CHECK-SAME: val2
+// CHECK-SAME: val1
+// CHECK-SAME: val2