[test] Improve FileCheck's numeric-expression.txt

[thopre]

Summary

Various improvement for FileCheck's numeric-expression.txt test:

• remove unused values in USE DEF FMT IMPL MATCH section
• replace 14 literal for 0xe and 0xE to have example of hex literals
• rename variable to be more self-descriptive
• move CHECK as comment of the values being matched to help readability
• add conversion tests
• simplify test for use of several numeric variables by using existing variable
• adjust position of error message check to match the alignment of the error message wrt. the output matched by the previous check

[thopre]

Fix format of repositionned CHECK directive

[jdenny]

llvm/test/FileCheck/numeric-expression.txt

52–53

Is there any reason not to replace these comments with the check directives themselves?

[thopre]

llvm/test/FileCheck/numeric-expression.txt

52–53

I hadn't think of that but having tried it now it doesn't work. For instance the VAR3+1 check will match with the CHECK-NEXT in the comment of the previous line. I could adapt the value to avoid hex values A, C and E but that seems a bit fragile. What do you think?

[jdenny]

llvm/test/FileCheck/numeric-expression.txt

52–53

Ah. Could you append {{.*}} to each CHECK-NEXT pattern?

[thopre]

Move CHECK as comment of values being tested

llvm/test/FileCheck/numeric-expression.txt

52–53

Great idea!

[jhenderson]

LGTM, but please wait for @jdenny to confirm. Is there any particular reason for you not to make the same improvements, re. comments inline, on the other sets of tests?

[jdenny]

In D79820#2035779, @jhenderson wrote:

LGTM, but please wait for @jdenny to confirm.

Other than the comment I just added, this much LGTM as well.

Is there any particular reason for you not to make the same improvements, re. comments inline, on the other sets of tests?

Agreed.

llvm/test/FileCheck/numeric-expression.txt

53–70

Should DEF here be EXPL as in the next block?

[thopre]

Address review comments

[thopre]

In D79820#2036406, @jdenny wrote:

In D79820#2035779, @jhenderson wrote:

LGTM, but please wait for @jdenny to confirm.

Other than the comment I just added, this much LGTM as well.

Is there any particular reason for you not to make the same improvements, re. comments inline, on the other sets of tests?

Agreed.

I went a bit further and renamed the variable as suggested by James in D60390. I've also changed {{.*}} for {{^}} which is both shorter, less demanding of the regular expression engine and make directive naturally aligned instead of having to use whitespaces at the end. Do you approve those changes?

[thopre]

Simplify test for several variables

[jdenny]

llvm/test/FileCheck/numeric-expression.txt

156

For consistency with VAR42, should VAR4 become VAR31?

227–235

Can these checks be inlined like the others?

268–273

Can these checks be inlined?

287–294

Can these checks be inlined?

309–315

Can these checks be inlined?

[jdenny]

Ah! I reviewed a stale diff. Give me a bit to correct.

[jdenny]

llvm/test/FileCheck/numeric-expression.txt

156

Nevermind this.

Looks like this was the only additional change after the diff I reviewed.

[thopre]

llvm/test/FileCheck/numeric-expression.txt

227–235

I'm not too keen on it for 2 reasons:

• CONFLICT2 and CONFLICT3 are both for the foobar line so would have to be interleaved with the input, after foobar.
• having the CHECK on the same line as the input means they appear in the error message and makes the error message checking directives even longer

268–273

As above, when testing error message for CHECK directive I prefer to have them separated. Given how small is the example I don't think it's such a big deal.

287–294

Ditto.

309–315

Ditto.

[jdenny]

LGTM again.

llvm/test/FileCheck/numeric-expression.txt

227–235

Thanks for explaining. It doesn't seem important enough to me to debate further. Unless @jhenderson objects, let's move on.

[jhenderson]

LGTM, with a couple of nits.

llvm/test/FileCheck/numeric-expression.txt

12

I'm not sure I follow why in some cases, you've added {{^}}, but not in others. It looks like here for example, it's not needed.

17–19

Nit: throughout, in most places you've used two spaces before the start of the comment, but on this line at least, you've used 1. Probably you should be consistent. I have a marginal preference for 1, but don't mind 2 if it looks better to you.

[thopre]

llvm/test/FileCheck/numeric-expression.txt

12

I missed a few. Fixed now. In most cases it's not needed but adding them now means if the line is changed the test will still pass. Also it's nicer visually since it keeps everything aligned and consistent.

17–19

Sorry, I sticked to 2 because it was less work and it separates the CHECK better from the input values.

[thopre]

Address comments

llvm/test/FileCheck/numeric-expression.txt

 RUN: FileCheck --input-file %s %s
 
 ; We use CHECK-NEXT directives to force a match on all lines with digits.
 
 ; Numeric variable definition with default matching format without spaces.
-DEF DEFAULT FMT NO SPC
-10
-CHECK-LABEL: DEF DEFAULT FMT NO SPC
-CHECK-NEXT: [[#VAR1:]]
+DEF DEFAULT FMT NO SPC  // CHECK-LABEL: DEF DEFAULT FMT NO SPC
+10  // CHECK-NEXT: {{^}}[[#UNSI:]]
 
 ; Numeric variable definition with default matching format with different
 ; spacing.
-DEF DEFAULT FMT SPC
-11
-11
-11
-CHECK-LABEL: DEF DEFAULT FMT SPC
-CHECK-NEXT: [[# VAR1a:]]
-CHECK-NEXT: [[# VAR1b :]]
-CHECK-NEXT: [[# VAR1c : ]]
+DEF DEFAULT FMT SPC  // CHECK-LABEL: DEF DEFAULT FMT SPC
+11  // CHECK-NEXT: {{^}}[[# UNSIa:]]
+11  // CHECK-NEXT: {{^}}[[# UNSIb :]]
+11  // CHECK-NEXT: {{^}}[[# UNSIc : ]]
 
 ; Numeric variable redefinition.
-REDEF NO SPC
-11
-CHECK-LABEL: REDEF
-CHECK-NEXT: [[#VAR1:]]
+REDEF NO SPC  // CHECK-LABEL: REDEF
+11  // CHECK-NEXT: {{^}}[[#UNSI:]]
 
 ; Numeric variable definition with explicit matching format.
-DEF FMT
-c
-D
-CHECK-LABEL: DEF FMT
-CHECK-NEXT: [[#%x,VAR2:]]
-CHECK-NEXT: [[#%X,VAR3:]]
+DEF FMT  // CHECK-LABEL: DEF FMT
+c  // CHECK-NEXT: {{^}}[[#%x,LHEX:]]
+D  // CHECK-NEXT: {{^}}[[#%X,UHEX:]]
 
 ; Numeric variable definition with explicit matching format with different
 ; spacing.
-DEF FMT SPC
-c
-CHECK-LABEL: DEF FMT SPC
-CHECK-NEXT: [[# %x , VAR2a : ]]
+DEF FMT SPC  // CHECK-LABEL: DEF FMT SPC
+c  // CHECK-NEXT: {{^}}[[# %x , LHEXa : ]]
 
 ; Numeric variable definition with unsupported matching format.
 RUN: %ProtectFileCheckOutput \
 RUN: not FileCheck --check-prefixes ERR,INVALID-FMT-SPEC1 --input-file %s %s 2>&1 \
 RUN:   | FileCheck --check-prefix INVALID-FMT-SPEC-MSG1 --strict-whitespace %s
 RUN: %ProtectFileCheckOutput \
 RUN: not FileCheck --check-prefixes ERR,INVALID-FMT-SPEC2 --input-file %s %s 2>&1 \
 RUN:   | FileCheck --check-prefix INVALID-FMT-SPEC-MSG2 --strict-whitespace %s
 
 DEF INVALID FMT
 INVVAR1=a
 INVVAR2=11
 ERR-LABEL: DEF INVALID FMT
 INVALID-FMT-SPEC1-NEXT: INVVAR1=[[#%c,INVVAR1:]]
 INVALID-FMT-SPEC2-NEXT: INVVAR2=[[#%hhd,INVVAR2:]]
 INVALID-FMT-SPEC-MSG1: numeric-expression.txt:[[#@LINE-2]]:37: error: invalid format specifier in expression
 INVALID-FMT-SPEC-MSG1-NEXT: {{I}}NVALID-FMT-SPEC1-NEXT: INVVAR1={{\[\[#%c,INVVAR1:\]\]}}
 INVALID-FMT-SPEC-MSG1-NEXT:    {{^}}                                    ^{{$}}
 INVALID-FMT-SPEC-MSG2: numeric-expression.txt:[[#@LINE-4]]:37: error: invalid format specifier in expression
 INVALID-FMT-SPEC-MSG2-NEXT: {{I}}NVALID-FMT-SPEC2-NEXT: INVVAR2={{\[\[#%hhd,INVVAR2:\]\]}}
 INVALID-FMT-SPEC-MSG2-NEXT:    {{^}}                                    ^{{$}}
 
 ; Numeric expressions in explicit matching format and default matching rule using
 ; variables defined on other lines without spaces.
-USE DEF FMT IMPL MATCH
-11
-12
-10
-c
-d
-b
-1a
-D
-E
-C
-1B
-11
-11
-11
-c
-c
-c
-c
-c
-CHECK-LABEL: USE DEF FMT IMPL MATCH
-CHECK-NEXT: [[#%u,VAR1]]
-CHECK-NEXT: [[#%u,VAR1+1]]
-CHECK-NEXT: [[#%u,VAR1-1]]
-CHECK-NEXT: [[#%x,VAR2]]
-CHECK-NEXT: [[#%x,VAR2+1]]
-CHECK-NEXT: [[#%x,VAR2-1]]
-CHECK-NEXT: [[#%x,VAR2+14]]
-CHECK-NEXT: [[#%X,VAR3]]
-CHECK-NEXT: [[#%X,VAR3+1]]
-CHECK-NEXT: [[#%X,VAR3-1]]
-CHECK-NEXT: [[#%X,VAR3+14]]
-CHECK-NEXT: [[#%u,VAR1a]]
-CHECK-NEXT: [[#%u,VAR1b]]
-CHECK-NEXT: [[#%u,VAR1c]]
-CHECK-NEXT: [[#%x,VAR2a]]
+USE EXPL FMT IMPL MATCH  // CHECK-LABEL: USE EXPL FMT IMPL MATCH
+11  // CHECK-NEXT: {{^}}[[#%u,UNSI]]
+12  // CHECK-NEXT: {{^}}[[#%u,UNSI+1]]
+10  // CHECK-NEXT: {{^}}[[#%u,UNSI-1]]
+c   // CHECK-NEXT: {{^}}[[#%x,LHEX]]
+d   // CHECK-NEXT: {{^}}[[#%x,LHEX+1]]
+b   // CHECK-NEXT: {{^}}[[#%x,LHEX-1]]
+1a  // CHECK-NEXT: {{^}}[[#%x,LHEX+0xe]]
+1a  // CHECK-NEXT: {{^}}[[#%x,LHEX+0xE]]
+D   // CHECK-NEXT: {{^}}[[#%X,UHEX]]
+E   // CHECK-NEXT: {{^}}[[#%X,UHEX+1]]
+C   // CHECK-NEXT: {{^}}[[#%X,UHEX-1]]
+1B  // CHECK-NEXT: {{^}}[[#%X,UHEX+0xe]]
+1B  // CHECK-NEXT: {{^}}[[#%X,UHEX+0xE]]
+11  // CHECK-NEXT: {{^}}[[#%u,UNSIa]]
+11  // CHECK-NEXT: {{^}}[[#%u,UNSIb]]
+11  // CHECK-NEXT: {{^}}[[#%u,UNSIc]]
+c   // CHECK-NEXT: {{^}}[[#%x,LHEXa]]
 
 ; Numeric expressions in explicit matching format and default matching rule using
 ; variables defined on other lines with different spacing.
-USE EXPL FMT IMPL MATCH SPC
-11
-11
-11
-12
-12
-12
-12
-12
-12
-10
-10
-10
-10
-10
-10
-CHECK-LABEL: USE EXPL FMT IMPL MATCH SPC
-CHECK-NEXT: [[#%u, VAR1]]
-CHECK-NEXT: [[# %u, VAR1]]
-CHECK-NEXT: [[# %u, VAR1 ]]
-CHECK-NEXT: [[#%u, VAR1+1]]
-CHECK-NEXT: [[# %u, VAR1+1]]
-CHECK-NEXT: [[# %u , VAR1+1]]
-CHECK-NEXT: [[# %u , VAR1 +1]]
-CHECK-NEXT: [[# %u , VAR1 + 1]]
-CHECK-NEXT: [[# %u , VAR1 + 1 ]]
-CHECK-NEXT: [[#%u, VAR1-1]]
-CHECK-NEXT: [[# %u, VAR1-1]]
-CHECK-NEXT: [[# %u , VAR1-1]]
-CHECK-NEXT: [[# %u , VAR1 -1]]
-CHECK-NEXT: [[# %u , VAR1 - 1]]
-CHECK-NEXT: [[# %u , VAR1 - 1 ]]
+USE EXPL FMT IMPL MATCH SPC  // CHECK-LABEL: USE EXPL FMT IMPL MATCH SPC
+11  // CHECK-NEXT: {{^}}[[#%u, UNSI]]
+11  // CHECK-NEXT: {{^}}[[# %u, UNSI]]
+11  // CHECK-NEXT: {{^}}[[# %u, UNSI ]]
+12  // CHECK-NEXT: {{^}}[[#%u, UNSI+1]]
+12  // CHECK-NEXT: {{^}}[[# %u, UNSI+1]]
+12  // CHECK-NEXT: {{^}}[[# %u , UNSI+1]]
+12  // CHECK-NEXT: {{^}}[[# %u , UNSI +1]]
+12  // CHECK-NEXT: {{^}}[[# %u , UNSI + 1]]
+12  // CHECK-NEXT: {{^}}[[# %u , UNSI + 1 ]]
+10  // CHECK-NEXT: {{^}}[[#%u, UNSI-1]]
+10  // CHECK-NEXT: {{^}}[[# %u, UNSI-1]]
+10  // CHECK-NEXT: {{^}}[[# %u , UNSI-1]]
+10  // CHECK-NEXT: {{^}}[[# %u , UNSI -1]]
+10  // CHECK-NEXT: {{^}}[[# %u , UNSI - 1]]
+10  // CHECK-NEXT: {{^}}[[# %u , UNSI - 1 ]]
 
 ; Numeric expressions in implicit matching format and default matching rule using
 ; variables defined on other lines.
-USE IMPL FMT IMPL MATCH
-11
-12
-10
-c
-d
-b
-1a
-D
-E
-C
-1B
-CHECK-LABEL: USE IMPL FMT IMPL MATCH
-CHECK-NEXT: [[#VAR1]]
-CHECK-NEXT: [[#VAR1+1]]
-CHECK-NEXT: [[#VAR1-1]]
-CHECK-NEXT: [[#VAR2]]
-CHECK-NEXT: [[#VAR2+1]]
-CHECK-NEXT: [[#VAR2-1]]
-CHECK-NEXT: [[#VAR2+14]]
-CHECK-NEXT: [[#VAR3]]
-CHECK-NEXT: [[#VAR3+1]]
-CHECK-NEXT: [[#VAR3-1]]
-CHECK-NEXT: [[#VAR3+14]]
+USE IMPL FMT IMPL MATCH  // CHECK-LABEL: USE IMPL FMT IMPL MATCH
+11  // CHECK-NEXT: {{^}}[[#UNSI]]
+12  // CHECK-NEXT: {{^}}[[#UNSI+1]]
+10  // CHECK-NEXT: {{^}}[[#UNSI-1]]
+c   // CHECK-NEXT: {{^}}[[#LHEX]]
+d   // CHECK-NEXT: {{^}}[[#LHEX+1]]
+b   // CHECK-NEXT: {{^}}[[#LHEX-1]]
+1a  // CHECK-NEXT: {{^}}[[#LHEX+0xe]]
+1a  // CHECK-NEXT: {{^}}[[#LHEX+0xE]]
+D   // CHECK-NEXT: {{^}}[[#UHEX]]
+E   // CHECK-NEXT: {{^}}[[#UHEX+1]]
+C   // CHECK-NEXT: {{^}}[[#UHEX-1]]
+1B  // CHECK-NEXT: {{^}}[[#UHEX+0xe]]
+1B  // CHECK-NEXT: {{^}}[[#UHEX+0xE]]
 
 ; Numeric expressions using variables defined on other lines and an immediate
 ; interpreted as an unsigned value.
 ; Note: 9223372036854775819 = 0x8000000000000000 + 11
 USE IMPL FMT IMPL MATCH UNSIGNED IMM
 9223372036854775819
 CHECK-LABEL: USE IMPL FMT IMPL MATCH UNSIGNED IMM
-CHECK-NEXT: [[#VAR1+0x8000000000000000]]
+CHECK-NEXT: [[#UNSI+0x8000000000000000]]
 
 ; Numeric expressions with matching format overriding the implicit format of
 ; variables defined on other lines.
-USE CONV FMT IMPL MATCH
-b
-B
-12
-13
-CHECK-LABEL: USE CONV FMT IMPL MATCH
-CHECK-NEXT: [[# %x, VAR1]]
-CHECK-NEXT: [[# %X, VAR1]]
-CHECK-NEXT: [[# %u, VAR2]]
-CHECK-NEXT: [[# %u, VAR3]]
+USE CONV FMT IMPL MATCH  // CHECK-LABEL: USE CONV FMT IMPL MATCH
+b   // CHECK-NEXT: {{^}}[[# %x, UNSI]]
+B   // CHECK-NEXT: {{^}}[[# %X, UNSI]]
+12  // CHECK-NEXT: {{^}}[[# %u, LHEX]]
+C   // CHECK-NEXT: {{^}}[[# %X, LHEX]]
+13  // CHECK-NEXT: {{^}}[[# %u, UHEX]]
+d   // CHECK-NEXT: {{^}}[[# %x, UHEX]]
 
 ; Conflicting implicit format.
 RUN: %ProtectFileCheckOutput \
 RUN: not FileCheck --check-prefixes CHECK,FMT-CONFLICT1 --input-file %s %s 2>&1 \
 RUN:   | FileCheck --strict-whitespace --check-prefix FMT-CONFLICT1-MSG %s
 RUN: %ProtectFileCheckOutput \
 RUN: not FileCheck --check-prefixes CHECK,FMT-CONFLICT2 --input-file %s %s 2>&1 \
 RUN:   | FileCheck --strict-whitespace --check-prefix FMT-CONFLICT2-MSG %s
 
 VAR USE IMPL FMT CONFLICT
 23
 FMT-CONFLICT1-LABEL: VAR USE IMPL FMT CONFLICT
-FMT-CONFLICT1-NEXT: [[#VAR1 + VAR2]]
-FMT-CONFLICT1-MSG: numeric-expression.txt:[[#@LINE-1]]:24: error: implicit format conflict between 'VAR1' (%u) and 'VAR2' (%x), need an explicit format specifier
-FMT-CONFLICT1-MSG-NEXT: {{F}}MT-CONFLICT1-NEXT: {{\[\[#VAR1 \+ VAR2\]\]}}
+FMT-CONFLICT1-NEXT: [[#UNSI + LHEX]]
+FMT-CONFLICT1-MSG: numeric-expression.txt:[[#@LINE-1]]:24: error: implicit format conflict between 'UNSI' (%u) and 'LHEX' (%x), need an explicit format specifier
+FMT-CONFLICT1-MSG-NEXT: {{F}}MT-CONFLICT1-NEXT: {{\[\[#UNSI \+ LHEX\]\]}}
 FMT-CONFLICT1-MSG-NEXT: {{^                       \^$}}
 
 VAR USE IMPL FMT CONFLICT COMPLEX
 34
 FMT-CONFLICT2-LABEL: VAR USE IMPL FMT CONFLICT
-FMT-CONFLICT2-NEXT: [[#VAR1 + VAR1a + VAR2]]
-FMT-CONFLICT2-MSG: numeric-expression.txt:[[#@LINE-1]]:24: error: implicit format conflict between 'VAR1 + VAR1a' (%u) and 'VAR2' (%x), need an explicit format specifier
-FMT-CONFLICT2-MSG-NEXT: {{F}}MT-CONFLICT2-NEXT: {{\[\[#VAR1 \+ VAR1a \+ VAR2\]\]}}
+FMT-CONFLICT2-NEXT: [[#UNSI + UNSIa + LHEX]]
+FMT-CONFLICT2-MSG: numeric-expression.txt:[[#@LINE-1]]:24: error: implicit format conflict between 'UNSI + UNSIa' (%u) and 'LHEX' (%x), need an explicit format specifier
+FMT-CONFLICT2-MSG-NEXT: {{F}}MT-CONFLICT2-NEXT: {{\[\[#UNSI \+ UNSIa \+ LHEX\]\]}}
 FMT-CONFLICT2-MSG-NEXT: {{^                       \^$}}
 
 ; Explicitly specified format can override conflicting implicit formats.
-VAR USE IMPL OVERRIDE FMT CONFLICT
-23
-CHECK-LABEL: VAR USE IMPL OVERRIDE FMT CONFLICT
-CHECK-NEXT: [[# %u, VAR1 + VAR2]]
+VAR USE IMPL OVERRIDE FMT CONFLICT  // CHECK-LABEL: VAR USE IMPL OVERRIDE FMT CONFLICT
+23  // CHECK-NEXT: {{^}}[[# %u, UNSI + LHEX]]
 
 ; Numeric expressions using more than one variable defined on other lines.
-USE MULTI VAR
-31
-42
-CHECK-LABEL: USE MULTI VAR
-CHECK-NEXT: [[#VAR4:]]
-CHECK-NEXT: [[#VAR1+VAR4]]
+USE MULTI VAR  // CHECK-LABEL: USE MULTI VAR
+22  // CHECK-NEXT: {{^}}[[#UNSI+UNSIa]]
 
 ; Numeric expression using a variable defined from a numeric expression.
-DEF EXPR GOOD MATCH
-42
-41
-; CHECK-LABEL: DEF EXPR GOOD MATCH
-; CHECK-NEXT: [[# VAR42:VAR1+31]]
-; CHECK-NEXT: [[# VAR42-1]]
+DEF EXPR GOOD MATCH  // CHECK-LABEL: DEF EXPR GOOD MATCH
+42  // CHECK-NEXT: {{^}}[[# VAR42:UNSI+31]]
+41  // CHECK-NEXT: {{^}}[[# VAR42-1]]
 
 ; Empty numeric expression.
-EMPTY NUM EXPR
-foo 104 bar
-CHECK-LABEL: EMPTY NUM EXPR
-CHECK-NEXT: foo [[#]] bar
+EMPTY NUM EXPR  // CHECK-LABEL: EMPTY NUM EXPR
+foo 104 bar  // CHECK-NEXT: {{^}}foo [[#]] bar
 
 ; Numeric expression using undefined variables.
 RUN: %ProtectFileCheckOutput \
 RUN: not FileCheck --check-prefix UNDEF-USE --input-file %s %s 2>&1 \
 RUN:   | FileCheck --strict-whitespace --check-prefix UNDEF-USE-MSG %s
 
 UNDEF VAR USE
 UNDEFVAR: 11

 RUN: not FileCheck -DSTRVAR=foobar --check-prefixes CONFLICT,CONFLICT4 \
 RUN:               --input-file %s %s 2>&1 \
 RUN:   | FileCheck --strict-whitespace --check-prefix INPUT-NUM-CONFLICT %s
 RUN: %ProtectFileCheckOutput \
 RUN: not FileCheck -DSTRVAR=foobar -D#STRVAR=42 --check-prefix CONFLICT \
 RUN:               --input-file %s %s 2>&1 \
 RUN:   | FileCheck --strict-whitespace --check-prefix CLI-NUM-CONFLICT %s
 
 STRVAR NUMVAR CONFLICT
 redef1 42
 foobar
 redef2 42
 CONFLICT-LABEL: STRVAR NUMVAR CONFLICT
 CONFLICT1-NEXT: redef1 [[#NUMVAR:]]
 CONFLICT2: [[NUMVAR:foo.*]]
 CONFLICT3: [[STRVAR:foo.*]]
 CONFLICT4: redef2 [[#STRVAR:]]
 INPUT-STR-CONFLICT: numeric-expression.txt:[[#@LINE-3]]:14: error: numeric variable with name 'NUMVAR' already exists
 INPUT-STR-CONFLICT-NEXT: {{C}}ONFLICT2: {{\[\[NUMVAR:foo\.\*\]\]}}
 INPUT-STR-CONFLICT-NEXT:    {{^}}             ^{{$}}
 CLI-STR-CONFLICT: Global defines:2:19: error: numeric variable with name 'NUMVAR' already exists
 CLI-STR-CONFLICT-NEXT:      Global define #2: NUMVAR=foobar
 CLI-STR-CONFLICT-NEXT: {{^}}                  ^{{$}}
 INPUT-NUM-CONFLICT: numeric-expression.txt:[[#@LINE-7]]:22: error: string variable with name 'STRVAR' already exists
  INPUT-NUM-CONFLICT-NEXT: CONFLICT4: redef2 {{\[\[#STRVAR:\]\]}}

 BIGVAL-MSG-NEXT: {{^}}        ^{{$}}
 
 ; Verify that when a variable is set to an expression the expression is still
 ; checked.
 RUN: %ProtectFileCheckOutput \
 RUN: not FileCheck --check-prefix DEF-EXPR-FAIL --input-file %s %s 2>&1 \
 RUN:   | FileCheck --strict-whitespace --check-prefix DEF-EXPR-FAIL-MSG %s
 
 DEF EXPR WRONG MATCH
 20
 43
 DEF-EXPR-FAIL-LABEL: DEF EXPR WRONG MATCH
 DEF-EXPR-FAIL-NEXT: [[# VAR20:]]
 DEF-EXPR-FAIL-NEXT: [[# VAR42: VAR20+22]]
 DEF-EXPR-FAIL-MSG: numeric-expression.txt:[[#@LINE-1]]:21: error: {{D}}EF-EXPR-FAIL-NEXT: is not on the line after the previous match
 DEF-EXPR-FAIL-MSG-NEXT: {{D}}EF-EXPR-FAIL-NEXT: {{\[\[# VAR42: VAR20\+22\]\]}}
 DEF-EXPR-FAIL-MSG-NEXT:   {{^}}                    ^{{$}}
 
 ; Verify that using a numeric variable defined on the same line (whether from
 ; input or from an expression) is rejected.
 RUN: %ProtectFileCheckOutput \
 RUN: not FileCheck --check-prefix SAME-LINE-USE1 --input-file %s %s 2>&1 \
 RUN:   | FileCheck --strict-whitespace --check-prefix SAME-LINE-USE-MSG1 %s
 RUN: %ProtectFileCheckOutput \
 RUN: not FileCheck --check-prefix SAME-LINE-USE2 --input-file %s %s 2>&1 \
 RUN:   | FileCheck --strict-whitespace --check-prefix SAME-LINE-USE-MSG2 %s
 
 SAME LINE USE
 3
 4 5
 SAME-LINE-USE1-LABEL: SAME LINE USE
 SAME-LINE-USE1-NEXT: [[#]]
-SAME-LINE-USE1-NEXT: [[#VAR1:]] [[#VAR1+1]]
-SAME-LINE-USE-MSG1: numeric-expression.txt:[[#@LINE-1]]:36: error: numeric variable 'VAR1' defined earlier in the same CHECK directive
-SAME-LINE-USE-MSG1-NEXT: {{S}}AME-LINE-USE1-NEXT: {{\[\[#VAR1:\]\] \[\[#VAR1\+1\]\]}}
+SAME-LINE-USE1-NEXT: [[#UNSI:]] [[#UNSI+1]]
+SAME-LINE-USE-MSG1: numeric-expression.txt:[[#@LINE-1]]:36: error: numeric variable 'UNSI' defined earlier in the same CHECK directive
+SAME-LINE-USE-MSG1-NEXT: {{S}}AME-LINE-USE1-NEXT: {{\[\[#UNSI:\]\] \[\[#UNSI\+1\]\]}}
 SAME-LINE-USE-MSG1-NEXT:        {{^}}                                   ^{{$}}
 
 SAME-LINE-USE2-LABEL: SAME LINE USE
-SAME-LINE-USE2-NEXT: [[#VAR1:]]
-SAME-LINE-USE2-NEXT: [[#VAR2:VAR1+1]] [[#VAR2+1]]
-SAME-LINE-USE-MSG2: numeric-expression.txt:[[#@LINE-1]]:42: error: numeric variable 'VAR2' defined earlier in the same CHECK directive
-SAME-LINE-USE-MSG2-NEXT: {{S}}AME-LINE-USE2-NEXT: {{\[\[#VAR2:VAR1\+1\]\] \[\[#VAR2\+1\]\]}}
-SAME-LINE-USE-MSG2-NEXT:        {{^}}                                         ^{{$}}
+SAME-LINE-USE2-NEXT: [[#UNSI:]]
+SAME-LINE-USE2-NEXT: [[#UNSI2:UNSI+1]] [[#UNSI2+1]]
+SAME-LINE-USE-MSG2: numeric-expression.txt:[[#@LINE-1]]:43: error: numeric variable 'UNSI2' defined earlier in the same CHECK directive
+SAME-LINE-USE-MSG2-NEXT: {{S}}AME-LINE-USE2-NEXT: {{\[\[#UNSI2:UNSI\+1\]\] \[\[#UNSI2\+1\]\]}}
+SAME-LINE-USE-MSG2-NEXT:        {{^}}                                          ^{{$}}
 
 ; Invalid change of format in variable redefinition.
 RUN: %ProtectFileCheckOutput \
 RUN: not FileCheck --check-prefix REDEF-NEW-FMT --input-file %s %s 2>&1 \
 RUN:   | FileCheck --strict-whitespace --check-prefix REDEF-NEW-FMT-MSG %s
 
 VAR REDEF FMT CHANGE
 22
 DC
 REDEF-NEW-FMT-LABEL: VAR REDEF FMT CHANGE
-REDEF-NEW-FMT-NEXT: [[#VAR1:]]
-REDEF-NEW-FMT-NEXT: [[#%X,VAR1:]]
+REDEF-NEW-FMT-NEXT: [[#UNSI:]]
+REDEF-NEW-FMT-NEXT: [[#%X,UNSI:]]
 REDEF-NEW-FMT-MSG: numeric-expression.txt:[[#@LINE-1]]:31: error: format different from previous variable definition
-REDEF-NEW-FMT-MSG-NEXT: {{R}}EDEF-NEW-FMT-NEXT: {{\[\[#%X,VAR1:\]\]}}
-REDEF-NEW-FMT-MSG-NEXT: {{^                              \^$}}
+REDEF-NEW-FMT-MSG-NEXT: {{R}}EDEF-NEW-FMT-NEXT: {{\[\[#%X,UNSI:\]\]}}
+REDEF-NEW-FMT-MSG-NEXT:    {{^}}                              ^{{$}}