Swap to using an unorded set

Modified the tests to not assume the order of the functions.

For precise tests no further changes are required since if
the removal failed, there will be a label before the call to be jumped to.

For the no-match tests, no further changes are required since the
goto statements are being verified to be all the there.

For the approx tests, we need to verify that
the other case statements aren't present in the GOTO program to be sure
that the FP removal has been successful. As such, the other case
statements are added to the exclude section.

Author: thk123

regression/goto-analyzer/approx-array-variable-const-fp/test.desc

@@ -3,9 +3,15 @@ main.c
 --show-goto-functions --verbosity 10 --pointer-check
 
 ^Removing function pointers and virtual functions$
-^\s*IF fp_tbl\[(signed long int)i\] == f2 THEN GOTO 1$
-^\s*IF fp_tbl\[(signed long int)i\] == f3 THEN GOTO 2$
-^\s*IF fp_tbl\[(signed long int)i\] == f4 THEN GOTO 3$
+^\s*IF fp_tbl\[(signed long int)i\] == f2 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f3 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f4 THEN GOTO [0-9]$
 ^SIGNAL=0$
 --
+^\s*IF fp_tbl\[(signed long int)i\] == f1 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f5 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f6 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f7 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f8 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f9 THEN GOTO [0-9]$
 ^warning: ignoring

regression/goto-analyzer/approx-const-fp-array-variable-cast-const-fp/test.desc

@@ -3,9 +3,15 @@ main.c
 --show-goto-functions --verbosity 10 --pointer-check
 
 ^Removing function pointers and virtual functions$
-^\s*IF fp == f2 THEN GOTO 1$
-^\s*IF fp == f3 THEN GOTO 2$
-^\s*IF fp == f4 THEN GOTO 3$
+^\s*IF fp == f2 THEN GOTO [0-9]$
+^\s*IF fp == f3 THEN GOTO [0-9]$
+^\s*IF fp == f4 THEN GOTO [0-9]$
 ^SIGNAL=0$
 --
 ^warning: ignoring
+^\s*IF fp_tbl\[(signed long int)i\] == f1 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f5 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f6 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f7 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f8 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f9 THEN GOTO [0-9]$

regression/goto-analyzer/approx-const-fp-array-variable-const-fp-with-null/test.desc

@@ -3,9 +3,15 @@ main.c
 --show-goto-functions --verbosity 10 --pointer-check
 
 ^Removing function pointers and virtual functions$
-^\s*IF fp == f2 THEN GOTO 1$
-^\s*IF fp == f3 THEN GOTO 2$
-^\s*IF fp == f4 THEN GOTO 3$
+^\s*IF fp == f2 THEN GOTO [0-9]$
+^\s*IF fp == f3 THEN GOTO [0-9]$
+^\s*IF fp == f4 THEN GOTO [0-9]$
 ^SIGNAL=0$
 --
 ^warning: ignoring
+^\s*IF fp_tbl\[(signed long int)i\] == f1 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f5 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f6 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f7 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f8 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f9 THEN GOTO [0-9]$

regression/goto-analyzer/approx-const-fp-array-variable-const-fp/test.desc

@@ -3,9 +3,15 @@ main.c
 --show-goto-functions --verbosity 10 --pointer-check
 
 ^Removing function pointers and virtual functions$
-^\s*IF fp == f2 THEN GOTO 1$
-^\s*IF fp == f3 THEN GOTO 2$
-^\s*IF fp == f4 THEN GOTO 3$
+^\s*IF fp == f2 THEN GOTO [0-9]$
+^\s*IF fp == f3 THEN GOTO [0-9]$
+^\s*IF fp == f4 THEN GOTO [0-9]$
 ^SIGNAL=0$
 --
 ^warning: ignoring
+^\s*IF fp_tbl\[(signed long int)i\] == f1 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f5 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f6 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f7 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f8 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f9 THEN GOTO [0-9]$

regression/goto-analyzer/approx-const-fp-array-variable-const-pointer-const-struct-non-const-fp/test.desc

@@ -3,9 +3,15 @@ main.c
 --show-goto-functions --verbosity 10 --pointer-check
 
 ^Removing function pointers and virtual functions$
-^\s*IF fp == f2 THEN GOTO 1$
-^\s*IF fp == f3 THEN GOTO 2$
-^\s*IF fp == f4 THEN GOTO 3$
+^\s*IF fp == f2 THEN GOTO [0-9]$
+^\s*IF fp == f3 THEN GOTO [0-9]$
+^\s*IF fp == f4 THEN GOTO [0-9]$
 ^SIGNAL=0$
 --
 ^warning: ignoring
+^\s*IF fp_tbl\[(signed long int)i\] == f1 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f5 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f6 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f7 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f8 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f9 THEN GOTO [0-9]$

regression/goto-analyzer/approx-const-fp-array-variable-const-struct-non-const-fp/test.desc

@@ -3,9 +3,15 @@ main.c
 --show-goto-functions --verbosity 10 --pointer-check
 
 ^Removing function pointers and virtual functions$
-^\s*IF fp == f2 THEN GOTO 1$
-^\s*IF fp == f3 THEN GOTO 2$
-^\s*IF fp == f4 THEN GOTO 3$
+^\s*IF fp == f2 THEN GOTO [0-9]$
+^\s*IF fp == f3 THEN GOTO [0-9]$
+^\s*IF fp == f4 THEN GOTO [0-9]$
 ^SIGNAL=0$
 --
 ^warning: ignoring
+^\s*IF fp_tbl\[(signed long int)i\] == f1 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f5 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f6 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f7 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f8 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f9 THEN GOTO [0-9]$

regression/goto-analyzer/approx-const-fp-array-variable-invalid-cast-const-fp/test.desc

@@ -3,9 +3,15 @@ main.c
 --show-goto-functions --verbosity 10 --pointer-check
 
 ^Removing function pointers and virtual functions$
-^\s*IF fp == (void (\*)(void))f2 THEN GOTO 1$
-^\s*IF fp == (void (\*)(void))f3 THEN GOTO 2$
-^\s*IF fp == (void (\*)(void))f4 THEN GOTO 3$
+^\s*IF fp == (void (\*)(void))f2 THEN GOTO [0-9]$
+^\s*IF fp == (void (\*)(void))f3 THEN GOTO [0-9]$
+^\s*IF fp == (void (\*)(void))f4 THEN GOTO [0-9]$
 ^SIGNAL=0$
 --
 ^warning: ignoring
+^\s*IF fp_tbl\[(signed long int)i\] == f1 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f5 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f6 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f7 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f8 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[(signed long int)i\] == f9 THEN GOTO [0-9]$

regression/goto-analyzer/no-match-const-fp-array-literal-const-fp-run-time/test.desc

@@ -3,15 +3,15 @@ main.c
 --show-goto-functions --verbosity 10 --pointer-check
 
 ^Removing function pointers and virtual functions$
-^\s*IF fp == f1 THEN GOTO 1$
-^\s*IF fp == f2 THEN GOTO 2$
-^\s*IF fp == f3 THEN GOTO 3$
-^\s*IF fp == f4 THEN GOTO 4$
-^\s*IF fp == f5 THEN GOTO 5$
-^\s*IF fp == f6 THEN GOTO 6$
-^\s*IF fp == f7 THEN GOTO 7$
-^\s*IF fp == f8 THEN GOTO 8$
-^\s*IF fp == f9 THEN GOTO 9$
+^\s*IF fp == f1 THEN GOTO [0-9]$
+^\s*IF fp == f2 THEN GOTO [0-9]$
+^\s*IF fp == f3 THEN GOTO [0-9]$
+^\s*IF fp == f4 THEN GOTO [0-9]$
+^\s*IF fp == f5 THEN GOTO [0-9]$
+^\s*IF fp == f6 THEN GOTO [0-9]$
+^\s*IF fp == f7 THEN GOTO [0-9]$
+^\s*IF fp == f8 THEN GOTO [0-9]$
+^\s*IF fp == f9 THEN GOTO [0-9]$
 ^SIGNAL=0$
 --
 ^warning: ignoring

regression/goto-analyzer/no-match-const-fp-array-literal-non-const-fp-run-time/test.desc

@@ -3,15 +3,15 @@ main.c
 --show-goto-functions --verbosity 10 --pointer-check
 
 ^Removing function pointers and virtual functions$
-^\s*IF fp == f1 THEN GOTO 1$
-^\s*IF fp == f2 THEN GOTO 2$
-^\s*IF fp == f3 THEN GOTO 3$
-^\s*IF fp == f4 THEN GOTO 4$
-^\s*IF fp == f5 THEN GOTO 5$
-^\s*IF fp == f6 THEN GOTO 6$
-^\s*IF fp == f7 THEN GOTO 7$
-^\s*IF fp == f8 THEN GOTO 8$
-^\s*IF fp == f9 THEN GOTO 9$
+^\s*IF fp == f1 THEN GOTO [0-9]$
+^\s*IF fp == f2 THEN GOTO [0-9]$
+^\s*IF fp == f3 THEN GOTO [0-9]$
+^\s*IF fp == f4 THEN GOTO [0-9]$
+^\s*IF fp == f5 THEN GOTO [0-9]$
+^\s*IF fp == f6 THEN GOTO [0-9]$
+^\s*IF fp == f7 THEN GOTO [0-9]$
+^\s*IF fp == f8 THEN GOTO [0-9]$
+^\s*IF fp == f9 THEN GOTO [0-9]$
 ^SIGNAL=0$
 --
 ^warning: ignoring

regression/goto-analyzer/no-match-const-fp-array-literal-non-const-fp/test.desc

@@ -3,15 +3,15 @@ main.c
 --show-goto-functions --verbosity 10 --pointer-check
 
 ^Removing function pointers and virtual functions$
-^\s*IF fp2 == f1 THEN GOTO 1$
-^\s*IF fp2 == f2 THEN GOTO 2$
-^\s*IF fp2 == f3 THEN GOTO 3$
-^\s*IF fp2 == f4 THEN GOTO 4$
-^\s*IF fp2 == f5 THEN GOTO 5$
-^\s*IF fp2 == f6 THEN GOTO 6$
-^\s*IF fp2 == f7 THEN GOTO 7$
-^\s*IF fp2 == f8 THEN GOTO 8$
-^\s*IF fp2 == f9 THEN GOTO 9$
+^\s*IF fp2 == f1 THEN GOTO [0-9]$
+^\s*IF fp2 == f2 THEN GOTO [0-9]$
+^\s*IF fp2 == f3 THEN GOTO [0-9]$
+^\s*IF fp2 == f4 THEN GOTO [0-9]$
+^\s*IF fp2 == f5 THEN GOTO [0-9]$
+^\s*IF fp2 == f6 THEN GOTO [0-9]$
+^\s*IF fp2 == f7 THEN GOTO [0-9]$
+^\s*IF fp2 == f8 THEN GOTO [0-9]$
+^\s*IF fp2 == f9 THEN GOTO [0-9]$
 ^SIGNAL=0$
 --
 ^warning: ignoring

regression/goto-analyzer/no-match-const-fp-array-non-const-fp/test.desc

@@ -3,15 +3,15 @@ main.c
 --show-goto-functions --verbosity 10 --pointer-check
 
 ^Removing function pointers and virtual functions$
-^\s*IF fp2 == f1 THEN GOTO 1$
-^\s*IF fp2 == f2 THEN GOTO 2$
-^\s*IF fp2 == f3 THEN GOTO 3$
-^\s*IF fp2 == f4 THEN GOTO 4$
-^\s*IF fp2 == f5 THEN GOTO 5$
-^\s*IF fp2 == f6 THEN GOTO 6$
-^\s*IF fp2 == f7 THEN GOTO 7$
-^\s*IF fp2 == f8 THEN GOTO 8$
-^\s*IF fp2 == f9 THEN GOTO 9$
+^\s*IF fp2 == f1 THEN GOTO [0-9]$
+^\s*IF fp2 == f2 THEN GOTO [0-9]$
+^\s*IF fp2 == f3 THEN GOTO [0-9]$
+^\s*IF fp2 == f4 THEN GOTO [0-9]$
+^\s*IF fp2 == f5 THEN GOTO [0-9]$
+^\s*IF fp2 == f6 THEN GOTO [0-9]$
+^\s*IF fp2 == f7 THEN GOTO [0-9]$
+^\s*IF fp2 == f8 THEN GOTO [0-9]$
+^\s*IF fp2 == f9 THEN GOTO [0-9]$
 ^SIGNAL=0$
 --
 ^warning: ignoring

regression/goto-analyzer/no-match-const-fp-const-pointer-non-const-struct-const-fp/test.desc

@@ -3,15 +3,15 @@ main.c
 --show-goto-functions --verbosity 10 --pointer-check
 
 ^Removing function pointers and virtual functions$
-^\s*IF fp == f1 THEN GOTO 1$
-^\s*IF fp == f2 THEN GOTO 2$
-^\s*IF fp == f3 THEN GOTO 3$
-^\s*IF fp == f4 THEN GOTO 4$
-^\s*IF fp == f5 THEN GOTO 5$
-^\s*IF fp == f6 THEN GOTO 6$
-^\s*IF fp == f7 THEN GOTO 7$
-^\s*IF fp == f8 THEN GOTO 8$
-^\s*IF fp == f9 THEN GOTO 9$
+^\s*IF fp == f1 THEN GOTO [0-9]$
+^\s*IF fp == f2 THEN GOTO [0-9]$
+^\s*IF fp == f3 THEN GOTO [0-9]$
+^\s*IF fp == f4 THEN GOTO [0-9]$
+^\s*IF fp == f5 THEN GOTO [0-9]$
+^\s*IF fp == f6 THEN GOTO [0-9]$
+^\s*IF fp == f7 THEN GOTO [0-9]$
+^\s*IF fp == f8 THEN GOTO [0-9]$
+^\s*IF fp == f9 THEN GOTO [0-9]$
 ^SIGNAL=0$
 --
 ^warning: ignoring

regression/goto-analyzer/no-match-const-fp-dereference-non-const-pointer-const-fp/test.desc

@@ -3,15 +3,15 @@ main.c
 --show-goto-functions --verbosity 10 --pointer-check
 
 ^Removing function pointers and virtual functions$
-^\s*IF final_fp == f1 THEN GOTO 1$
-^\s*IF final_fp == f2 THEN GOTO 2$
-^\s*IF final_fp == f3 THEN GOTO 3$
-^\s*IF final_fp == f4 THEN GOTO 4$
-^\s*IF final_fp == f5 THEN GOTO 5$
-^\s*IF final_fp == f6 THEN GOTO 6$
-^\s*IF final_fp == f7 THEN GOTO 7$
-^\s*IF final_fp == f8 THEN GOTO 8$
-^\s*IF final_fp == f9 THEN GOTO 9$
+^\s*IF final_fp == f1 THEN GOTO [0-9]$
+^\s*IF final_fp == f2 THEN GOTO [0-9]$
+^\s*IF final_fp == f3 THEN GOTO [0-9]$
+^\s*IF final_fp == f4 THEN GOTO [0-9]$
+^\s*IF final_fp == f5 THEN GOTO [0-9]$
+^\s*IF final_fp == f6 THEN GOTO [0-9]$
+^\s*IF final_fp == f7 THEN GOTO [0-9]$
+^\s*IF final_fp == f8 THEN GOTO [0-9]$
+^\s*IF final_fp == f9 THEN GOTO [0-9]$
 ^SIGNAL=0$
 --
 ^warning: ignoring

regression/goto-analyzer/no-match-const-fp-dynamic-array-non-const-fp/test.desc

@@ -3,15 +3,15 @@ main.c
 --show-goto-functions --verbosity 10 --pointer-check
 
 ^Removing function pointers and virtual functions$
-^\s*IF fp == f1 THEN GOTO 1$
-^\s*IF fp == f2 THEN GOTO 2$
-^\s*IF fp == f3 THEN GOTO 3$
-^\s*IF fp == f4 THEN GOTO 4$
-^\s*IF fp == f5 THEN GOTO 5$
-^\s*IF fp == f6 THEN GOTO 6$
-^\s*IF fp == f7 THEN GOTO 7$
-^\s*IF fp == f8 THEN GOTO 8$
-^\s*IF fp == f9 THEN GOTO 9$
+^\s*IF fp == f1 THEN GOTO [0-9]$
+^\s*IF fp == f2 THEN GOTO [0-9]$
+^\s*IF fp == f3 THEN GOTO [0-9]$
+^\s*IF fp == f4 THEN GOTO [0-9]$
+^\s*IF fp == f5 THEN GOTO [0-9]$
+^\s*IF fp == f6 THEN GOTO [0-9]$
+^\s*IF fp == f7 THEN GOTO [0-9]$
+^\s*IF fp == f8 THEN GOTO [0-9]$
+^\s*IF fp == f9 THEN GOTO [0-9]$
 ^SIGNAL=0$
 --
 ^warning: ignoring

regression/goto-analyzer/no-match-const-fp-non-const-fp-direct-assignment/test.desc

@@ -2,15 +2,15 @@ CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
 ^Removing function pointers and virtual functions$
-^\s*IF fp2 == f1 THEN GOTO 1$
-^\s*IF fp2 == f2 THEN GOTO 2$
-^\s*IF fp2 == f3 THEN GOTO 3$
-^\s*IF fp2 == f4 THEN GOTO 4$
-^\s*IF fp2 == f5 THEN GOTO 5$
-^\s*IF fp2 == f6 THEN GOTO 6$
-^\s*IF fp2 == f7 THEN GOTO 7$
-^\s*IF fp2 == f8 THEN GOTO 8$
-^\s*IF fp2 == f9 THEN GOTO 9$
+^\s*IF fp2 == f1 THEN GOTO [0-9]$
+^\s*IF fp2 == f2 THEN GOTO [0-9]$
+^\s*IF fp2 == f3 THEN GOTO [0-9]$
+^\s*IF fp2 == f4 THEN GOTO [0-9]$
+^\s*IF fp2 == f5 THEN GOTO [0-9]$
+^\s*IF fp2 == f6 THEN GOTO [0-9]$
+^\s*IF fp2 == f7 THEN GOTO [0-9]$
+^\s*IF fp2 == f8 THEN GOTO [0-9]$
+^\s*IF fp2 == f9 THEN GOTO [0-9]$
 ^SIGNAL=0$
 --
 ^warning: ignoring

regression/goto-analyzer/no-match-const-fp-non-const-pointer-non-const-struct-const-fp/test.desc

@@ -3,15 +3,15 @@ main.c
 --show-goto-functions --verbosity 10 --pointer-check
 
 ^Removing function pointers and virtual functions$
-^\s*IF fp == f1 THEN GOTO 1$
-^\s*IF fp == f2 THEN GOTO 2$
-^\s*IF fp == f3 THEN GOTO 3$
-^\s*IF fp == f4 THEN GOTO 4$
-^\s*IF fp == f5 THEN GOTO 5$
-^\s*IF fp == f6 THEN GOTO 6$
-^\s*IF fp == f7 THEN GOTO 7$
-^\s*IF fp == f8 THEN GOTO 8$
-^\s*IF fp == f9 THEN GOTO 9$
+^\s*IF fp == f1 THEN GOTO [0-9]$
+^\s*IF fp == f2 THEN GOTO [0-9]$
+^\s*IF fp == f3 THEN GOTO [0-9]$
+^\s*IF fp == f4 THEN GOTO [0-9]$
+^\s*IF fp == f5 THEN GOTO [0-9]$
+^\s*IF fp == f6 THEN GOTO [0-9]$
+^\s*IF fp == f7 THEN GOTO [0-9]$
+^\s*IF fp == f8 THEN GOTO [0-9]$
+^\s*IF fp == f9 THEN GOTO [0-9]$
 ^SIGNAL=0$
 --
 ^warning: ignoring

regression/goto-analyzer/no-match-const-fp-non-const-struct-const-fp/test.desc

@@ -3,15 +3,15 @@ main.c
 --show-goto-functions --verbosity 10 --pointer-check
 
 ^Removing function pointers and virtual functions$
-^\s*IF fp == f1 THEN GOTO 1$
-^\s*IF fp == f2 THEN GOTO 2$
-^\s*IF fp == f3 THEN GOTO 3$
-^\s*IF fp == f4 THEN GOTO 4$
-^\s*IF fp == f5 THEN GOTO 5$
-^\s*IF fp == f6 THEN GOTO 6$
-^\s*IF fp == f7 THEN GOTO 7$
-^\s*IF fp == f8 THEN GOTO 8$
-^\s*IF fp == f9 THEN GOTO 9$
+^\s*IF fp == f1 THEN GOTO [0-9]$
+^\s*IF fp == f2 THEN GOTO [0-9]$
+^\s*IF fp == f3 THEN GOTO [0-9]$
+^\s*IF fp == f4 THEN GOTO [0-9]$
+^\s*IF fp == f5 THEN GOTO [0-9]$
+^\s*IF fp == f6 THEN GOTO [0-9]$
+^\s*IF fp == f7 THEN GOTO [0-9]$
+^\s*IF fp == f8 THEN GOTO [0-9]$
+^\s*IF fp == f9 THEN GOTO [0-9]$
 ^SIGNAL=0$
 --
 ^warning: ignoring