Merge pull request #5807 from martin-cs/refactor/process_goto_program

Refactor process_goto_program so that all tools use common processing code

Author: tautschnig

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF fp_tbl\[.*i\] == f2 THEN GOTO [0-9]$
 ^\s*IF fp_tbl\[.*i\] == f3 THEN GOTO [0-9]$
 ^\s*IF fp_tbl\[.*i\] == f4 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF fp == f2 THEN GOTO [0-9]$
 ^\s*IF fp == f3 THEN GOTO [0-9]$
 ^\s*IF fp == f4 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF fp == f2 THEN GOTO [0-9]$
 ^\s*IF fp == f3 THEN GOTO [0-9]$
 ^\s*IF fp == f4 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF fp == f2 THEN GOTO [0-9]$
 ^\s*IF fp == f3 THEN GOTO [0-9]$
 ^\s*IF fp == f4 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF fp == f2 THEN GOTO [0-9]$
 ^\s*IF fp == f3 THEN GOTO [0-9]$
 ^\s*IF fp == f4 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF fp == f2 THEN GOTO [0-9]$
 ^\s*IF fp == f3 THEN GOTO [0-9]$
 ^\s*IF fp == f4 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF fp == \(.*\)f2 THEN GOTO [0-9]$
 ^\s*IF fp == \(.*\)f3 THEN GOTO [0-9]$
 ^\s*IF fp == \(.*\)f4 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF fp == f2 THEN GOTO [0-9]$
 ^\s*IF fp == f3 THEN GOTO [0-9]$
 ^\s*IF fp == f4 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*ASSERT FALSE // invalid function pointer$
 ^EXIT=0$
 ^SIGNAL=0$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF \*fp == f1 THEN GOTO [0-9]$
 ^\s*IF \*fp == f2 THEN GOTO [0-9]$
 ^\s*IF \*fp == f3 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF fp == f1 THEN GOTO [0-9]$
 ^\s*IF fp == f2 THEN GOTO [0-9]$
 ^\s*IF fp == f3 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF fp == f1 THEN GOTO [0-9]$
 ^\s*IF fp == f2 THEN GOTO [0-9]$
 ^\s*IF fp == f3 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF fp2 == f1 THEN GOTO [0-9]$
 ^\s*IF fp2 == f2 THEN GOTO [0-9]$
 ^\s*IF fp2 == f3 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF fp2 == f1 THEN GOTO [0-9]$
 ^\s*IF fp2 == f2 THEN GOTO [0-9]$
 ^\s*IF fp2 == f3 THEN GOTO [0-9]$

regression/goto-analyzer/no-match-const-fp-binary-op-const-lost/test.desc

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF fp == f1 THEN GOTO [0-9]$
 ^\s*IF fp == f2 THEN GOTO [0-9]$
 ^\s*IF fp == f3 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF \*fp == f1 THEN GOTO [0-9]$
 ^\s*IF \*fp == f2 THEN GOTO [0-9]$
 ^\s*IF \*fp == f3 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF \*fp == f1 THEN GOTO [0-9]$
 ^\s*IF \*fp == f2 THEN GOTO [0-9]$
 ^\s*IF \*fp == f3 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF fp == f1 THEN GOTO [0-9]$
 ^\s*IF fp == f2 THEN GOTO [0-9]$
 ^\s*IF fp == f3 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*ASSERT FALSE // invalid function pointer$
 ^EXIT=0$
 ^SIGNAL=0$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF fp == f1 THEN GOTO [0-9]$
 ^\s*IF fp == f2 THEN GOTO [0-9]$
 ^\s*IF fp == f3 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*ASSERT FALSE // invalid function pointer$
 replacing function pointer by 9 possible targets
 ^EXIT=0$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF fp == f1 THEN GOTO [0-9]$
 ^\s*IF fp == f2 THEN GOTO [0-9]$
 ^\s*IF fp == f3 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*ASSERT FALSE // invalid function pointer$
 replacing function pointer by 9 possible targets
 ^EXIT=0$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\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]$

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

@@ -1,16 +1,16 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
-^\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]$
+^Removal of function pointers and virtual functions$
+^\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]+$
 ^EXIT=0$
 ^SIGNAL=0$
 --

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF fp2 == f1 THEN GOTO [0-9]$
 ^\s*IF fp2 == f2 THEN GOTO [0-9]$
 ^\s*IF fp2 == f3 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF fp == f1 THEN GOTO [0-9]$
 ^\s*IF fp == f2 THEN GOTO [0-9]$
 ^\s*IF fp == f3 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF fp == f1 THEN GOTO [0-9]$
 ^\s*IF fp == f2 THEN GOTO [0-9]$
 ^\s*IF fp == f3 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF fp == f1 THEN GOTO [0-9]$
 ^\s*IF fp == f2 THEN GOTO [0-9]$
 ^\s*IF fp == f3 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*ASSERT FALSE // invalid function pointer$
 function func: replacing function pointer by 0 possible targets
 ^EXIT=0$

regression/goto-analyzer/no-match-const-fp-ternerary-op-const-lost/test.desc

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF fp == f1 THEN GOTO [0-9]$
 ^\s*IF fp == f2 THEN GOTO [0-9]$
 ^\s*IF fp == f3 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF container_pointer->fp == f1 THEN GOTO [0-9]$
 ^\s*IF container_pointer->fp == f2 THEN GOTO [0-9]$
 ^\s*IF container_pointer->fp == f3 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF pts->go == f1 THEN GOTO [0-9]$
 ^\s*IF pts->go == f2 THEN GOTO [0-9]$
 ^\s*IF pts->go == f3 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*ASSERT FALSE // invalid function pointer$
 ^EXIT=0$
 ^SIGNAL=0$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF \*container_ptr->fp_tbl\[.*1\] == f1 THEN GOTO [0-9]$
 ^\s*IF \*container_ptr->fp_tbl\[.*1\] == f2 THEN GOTO [0-9]$
 ^\s*IF \*container_ptr->fp_tbl\[.*1\] == f3 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF \*container_container\.container == f1 THEN GOTO [0-9]$
 ^\s*IF \*container_container\.container == f2 THEN GOTO [0-9]$
 ^\s*IF \*container_container\.container == f3 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF \*container_container\.container == f1 THEN GOTO [0-9]$
 ^\s*IF \*container_container\.container == f2 THEN GOTO [0-9]$
 ^\s*IF \*container_container\.container == f3 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF fp2 == f1 THEN GOTO [0-9]$
 ^\s*IF fp2 == f2 THEN GOTO [0-9]$
 ^\s*IF fp2 == f3 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF fp == f1 THEN GOTO [0-9]$
 ^\s*IF fp == f2 THEN GOTO [0-9]$
 ^\s*IF fp == f3 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF fp == f1 THEN GOTO [0-9]$
 ^\s*IF fp == f2 THEN GOTO [0-9]$
 ^\s*IF fp == f3 THEN GOTO [0-9]$

regression/goto-analyzer/no-match-parameter-fp/test.desc

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF fp == f1 THEN GOTO [0-9]$
 ^\s*IF fp == f2 THEN GOTO [0-9]$
 ^\s*IF fp == f3 THEN GOTO [0-9]$

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

@@ -1,7 +1,7 @@
 CORE
 main.c
 --show-goto-functions --pointer-check
-^Removing function pointers and virtual functions$
+^Removal of function pointers and virtual functions$
 ^\s*IF container_ptr->fp_tbl\[.*1\] == f1 THEN GOTO [0-9]$
 ^\s*IF container_ptr->fp_tbl\[.*1\] == f2 THEN GOTO [0-9]$
 ^\s*IF container_ptr->fp_tbl\[.*1\] == f3 THEN GOTO [0-9]$