Pseudo numeric variables: code review changes

Author: stanislaw

filecheck/FileCheck.py

@@ -61,6 +61,8 @@ class CheckType(Enum):
 Check = namedtuple("Check", "check_type match_type check_keyword expression source_line check_line_idx start_index")
 ImplicitCheck = namedtuple("ImplicitCheck", "original_check check")
 
+LINE_NUMBER_REGEX = r"\[\[# +@LINE *([+-])? *([0-9]+)? *\]\]"
+
 
 def debug_print(string):
     # print(string)
@@ -318,16 +320,15 @@ def exit_handler(code):
                             check_expression = check_expression + "$"
 
                 # Replace line number expressions, e.g. `[[# @LINE + 3 ]]`
-                line_var_match = re.search(
-                    r"\[\[# +@LINE *([+-])? *([0-9]+)? *\]\]", check_expression)
+                line_var_match = re.search(LINE_NUMBER_REGEX, check_expression)
                 while line_var_match is not None:
                     offset = int(line_var_match.group(2) or 0)
                     if line_var_match.group(1) == "-":
                         offset = -offset
                     check_expression = re.sub(
-                        r"\[\[# +@LINE *([+-])? *([0-9]+)? *\]\]", str(line_idx + offset + 1), check_expression)
+                        LINE_NUMBER_REGEX, str(line_idx + offset + 1), check_expression, 1)
                     line_var_match = re.search(
-                        r"\[\[# +@LINE *([+-])? *([0-9]+)? *\]\]", check_expression)
+                        LINE_NUMBER_REGEX, check_expression)
 
                 check = Check(check_type=check_type,
                               match_type=match_type,

tasks.py

@@ -68,7 +68,7 @@ def test_filecheck_llvm(c):
     filecheck_llvm_9_exec = get_filecheck_llvm_path(FILECHECK_LLVM_9_EXEC)
     filecheck_tester_exec = get_filecheck_llvm_path(FILECHECK_LLVM_9_EXEC)
 
-    run_lit_tests(c, filecheck_llvm_8_exec, filecheck_tester_exec, True)
+    # run_lit_tests(c, filecheck_llvm_8_exec, filecheck_tester_exec, True)
     run_lit_tests(c, filecheck_llvm_9_exec, filecheck_tester_exec, True)
 
 

tests/integration/tests/examples/lit-and-filecheck/03-line.c

@@ -0,0 +1 @@
+CHECK: this line is to be matched with number [[# @LINE + 1 ]]

tests/integration/tests/extra_features/pseudo_numeric_variables/01_line_variable_once/filecheck.check

@@ -0,0 +1,2 @@
+this line not to be matched
+this line is to be matched with number 2

tests/integration/tests/extra_features/pseudo_numeric_variables/01_line_variable_once/filecheck.input

@@ -0,0 +1 @@
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"

tests/integration/tests/extra_features/pseudo_numeric_variables/01_line_variable_once/test.itest

@@ -0,0 +1 @@
+CHECK: this line is to be matched with two numbers: [[# @LINE + 1 ]] and [[# @LINE + 2 ]]

tests/integration/tests/extra_features/pseudo_numeric_variables/02_line_variable_twice/filecheck.check

@@ -0,0 +1,2 @@
+this line not to be matched
+this line is to be matched with two numbers: 2 and 3

tests/integration/tests/extra_features/pseudo_numeric_variables/02_line_variable_twice/filecheck.input

@@ -0,0 +1 @@
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"