Update test 26, 35, 39. Update test results.

1 files changed, 377 insertions, 14 deletions

diff --git a/test/test24-03.txt b/test/test24-03.txt
index 0c0f8cf..a16662e 100644
--- a/test/test24-03.txt
+++ b/test/test24-03.txt
@@ -51,8 +51,26 @@ bind_expr : ptr1,
 statement_list : ptr1, 
 decl_expr : ptr1, 
 var_decl fptr2: fptr2, ptr1, 
+integer_cst 64: fptr2, ptr1, 
+pointer_type : fptr2, ptr1, 
+type_decl FuncPtr2: fptr2, ptr1, 
+function_type : fptr2, ptr1, 
+void_type : fptr2, ptr1, 
+type_decl void: fptr2, ptr1, 
+tree_list : fptr2, ptr1, 
+pointer_type : fptr2, ptr1, 
+tree_list : fptr2, ptr1, 
 call_expr : fptr2, ptr1, 
 var_decl fptr2: fptr2, ptr1, 
+integer_cst 64: fptr2, ptr1, 
+pointer_type : fptr2, ptr1, 
+type_decl FuncPtr2: fptr2, ptr1, 
+function_type : fptr2, ptr1, 
+void_type : fptr2, ptr1, 
+type_decl void: fptr2, ptr1, 
+tree_list : fptr2, ptr1, 
+pointer_type : fptr2, ptr1, 
+tree_list : fptr2, ptr1, 
 parm_decl ptr1: fptr2, ptr1, 
 pointer_type : fptr2, ptr1, 
 record_type : fptr2, ptr1, 
@@ -99,19 +117,62 @@ tree_list : fptr2, ptr1,
 void_type : fptr2, ptr1, 
 block : fptr2, ptr1, 
 var_decl fptr2: fptr2, ptr1, 
+integer_cst 64: fptr2, ptr1, 
+pointer_type : fptr2, ptr1, 
+type_decl FuncPtr2: fptr2, ptr1, 
+function_type : fptr2, ptr1, 
+void_type : fptr2, ptr1, 
+type_decl void: fptr2, ptr1, 
+tree_list : fptr2, ptr1, 
+pointer_type : fptr2, ptr1, 
+tree_list : fptr2, ptr1, 
 function_decl func3: 
 bind_expr : ptr1, 
 statement_list : ptr1, 
 decl_expr : ptr1, 
 var_decl data: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+record_type : data, ptr1, 
+identifier_node Data1: data, ptr1, 
+field_decl val: data, ptr1, 
+integer_cst 32: data, ptr1, 
+integer_type : data, ptr1, 
+field_decl ptrval: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+field_decl arr: data, ptr1, 
+integer_cst 96: data, ptr1, 
+array_type : data, ptr1, 
+field_decl fptr1: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+field_decl fptr2: data, ptr1, 
+integer_cst 192: data, ptr1, 
+array_type : data, ptr1, 
 call_expr : data, ptr1, 
 component_ref : data, ptr1, 
-test24.c: In function 'func3':
-test24.c:45:9: warning: Using variable 'data' without checking for null pointer
-     data->fptr1(ptr1);
-         ^
 indirect_ref : data, ptr1, 
 var_decl data: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+record_type : data, ptr1, 
+identifier_node Data1: data, ptr1, 
+field_decl val: data, ptr1, 
+integer_cst 32: data, ptr1, 
+integer_type : data, ptr1, 
+field_decl ptrval: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+field_decl arr: data, ptr1, 
+integer_cst 96: data, ptr1, 
+array_type : data, ptr1, 
+field_decl fptr1: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+field_decl fptr2: data, ptr1, 
+integer_cst 192: data, ptr1, 
+array_type : data, ptr1, 
 field_decl fptr1: data, ptr1, 
 integer_cst 64: data, ptr1, 
 pointer_type : data, ptr1, 
@@ -124,6 +185,11 @@ pointer_type : data, ptr1,
 record_type : data, ptr1, 
 tree_list : data, ptr1, 
 void_type : data, ptr1, 
+test24.c: In function 'func3':
+test24.c:45:5: warning: Using variable 'data' without checking for null pointer
+     data->fptr1(ptr1);
+     ^
+test24.c:45:5: warning: Using variable 'data->fptr1' without checking for null pointer
 parm_decl ptr1: data, ptr1, 
 pointer_type : data, ptr1, 
 record_type : data, ptr1, 
@@ -190,17 +256,51 @@ pointer_type : data, ptr1,
 integer_type : data, ptr1, 
 block : data, ptr1, 
 var_decl data: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+record_type : data, ptr1, 
+identifier_node Data1: data, ptr1, 
+field_decl val: data, ptr1, 
+integer_cst 32: data, ptr1, 
+integer_type : data, ptr1, 
+field_decl ptrval: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+field_decl arr: data, ptr1, 
+integer_cst 96: data, ptr1, 
+array_type : data, ptr1, 
+field_decl fptr1: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+field_decl fptr2: data, ptr1, 
+integer_cst 192: data, ptr1, 
+array_type : data, ptr1, 
 function_decl func4: 
 bind_expr : ptr1, 
 statement_list : ptr1, 
 decl_expr : ptr1, 
 var_decl ptr2: ptr1, ptr2, 
+integer_cst 64: ptr1, ptr2, 
+pointer_type : ptr1, ptr2, 
+record_type : ptr1, ptr2, 
+identifier_node Data1: ptr1, ptr2, 
+field_decl val: ptr1, ptr2, 
+integer_cst 32: ptr1, ptr2, 
+integer_type : ptr1, ptr2, 
+field_decl ptrval: ptr1, ptr2, 
+integer_cst 64: ptr1, ptr2, 
+pointer_type : ptr1, ptr2, 
+field_decl arr: ptr1, ptr2, 
+integer_cst 96: ptr1, ptr2, 
+array_type : ptr1, ptr2, 
+field_decl fptr1: ptr1, ptr2, 
+integer_cst 64: ptr1, ptr2, 
+pointer_type : ptr1, ptr2, 
+field_decl fptr2: ptr1, ptr2, 
+integer_cst 192: ptr1, ptr2, 
+array_type : ptr1, ptr2, 
 call_expr : ptr1, ptr2, 
 component_ref : ptr1, ptr2, 
-test24.c: In function 'func4':
-test24.c:51:9: warning: Using parameter 'ptr1' without checking for null pointer
-     ptr1->fptr1(ptr2);
-         ^
 indirect_ref : ptr1, ptr2, 
 parm_decl ptr1: ptr1, ptr2, 
 pointer_type : ptr1, ptr2, 
@@ -246,7 +346,31 @@ pointer_type : ptr1, ptr2,
 record_type : ptr1, ptr2, 
 tree_list : ptr1, ptr2, 
 void_type : ptr1, ptr2, 
+test24.c: In function 'func4':
+test24.c:51:5: warning: Using variable 'ptr1' without checking for null pointer
+     ptr1->fptr1(ptr2);
+     ^
+test24.c:51:5: warning: Using variable 'ptr1->fptr1' without checking for null pointer
 var_decl ptr2: ptr1, ptr2, 
+integer_cst 64: ptr1, ptr2, 
+pointer_type : ptr1, ptr2, 
+record_type : ptr1, ptr2, 
+identifier_node Data1: ptr1, ptr2, 
+field_decl val: ptr1, ptr2, 
+integer_cst 32: ptr1, ptr2, 
+integer_type : ptr1, ptr2, 
+field_decl ptrval: ptr1, ptr2, 
+integer_cst 64: ptr1, ptr2, 
+pointer_type : ptr1, ptr2, 
+field_decl arr: ptr1, ptr2, 
+integer_cst 96: ptr1, ptr2, 
+array_type : ptr1, ptr2, 
+field_decl fptr1: ptr1, ptr2, 
+integer_cst 64: ptr1, ptr2, 
+pointer_type : ptr1, ptr2, 
+field_decl fptr2: ptr1, ptr2, 
+integer_cst 192: ptr1, ptr2, 
+array_type : ptr1, ptr2, 
 var_decl ptr2: ptr1, 
 integer_cst 64: ptr1, ptr2, 
 pointer_type : ptr1, ptr2, 
@@ -281,22 +405,80 @@ pointer_type : ptr1, ptr2,
 integer_type : ptr1, ptr2, 
 block : ptr1, ptr2, 
 var_decl ptr2: ptr1, ptr2, 
+integer_cst 64: ptr1, ptr2, 
+pointer_type : ptr1, ptr2, 
+record_type : ptr1, ptr2, 
+identifier_node Data1: ptr1, ptr2, 
+field_decl val: ptr1, ptr2, 
+integer_cst 32: ptr1, ptr2, 
+integer_type : ptr1, ptr2, 
+field_decl ptrval: ptr1, ptr2, 
+integer_cst 64: ptr1, ptr2, 
+pointer_type : ptr1, ptr2, 
+field_decl arr: ptr1, ptr2, 
+integer_cst 96: ptr1, ptr2, 
+array_type : ptr1, ptr2, 
+field_decl fptr1: ptr1, ptr2, 
+integer_cst 64: ptr1, ptr2, 
+pointer_type : ptr1, ptr2, 
+field_decl fptr2: ptr1, ptr2, 
+integer_cst 192: ptr1, ptr2, 
+array_type : ptr1, ptr2, 
 function_decl func5: 
 bind_expr : ptr1, 
 statement_list : ptr1, 
 decl_expr : ptr1, 
 var_decl data: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+record_type : data, ptr1, 
+identifier_node Data1: data, ptr1, 
+field_decl val: data, ptr1, 
+integer_cst 32: data, ptr1, 
+integer_type : data, ptr1, 
+field_decl ptrval: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+field_decl arr: data, ptr1, 
+integer_cst 96: data, ptr1, 
+array_type : data, ptr1, 
+field_decl fptr1: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+field_decl fptr2: data, ptr1, 
+integer_cst 192: data, ptr1, 
+array_type : data, ptr1, 
 call_expr : data, ptr1, 
 array_ref : data, ptr1, 
+test24.c: In function 'func5':
+test24.c:58:5: warning: Using variable 'data' without checking for null pointer
+     (*data->fptr2[1])(ptr1);
+     ^
+test24.c:58:5: warning: Using variable 'data->fptr2' without checking for null pointer
 integer_cst 0: data, ptr1, 
 integer_cst 8: data, ptr1, 
 component_ref : data, ptr1, 
-test24.c: In function 'func5':
-test24.c:58:11: warning: Using variable 'data' without checking for null pointer
-     (*data->fptr2[1])(ptr1);
-           ^
 indirect_ref : data, ptr1, 
 var_decl data: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+record_type : data, ptr1, 
+identifier_node Data1: data, ptr1, 
+field_decl val: data, ptr1, 
+integer_cst 32: data, ptr1, 
+integer_type : data, ptr1, 
+field_decl ptrval: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+field_decl arr: data, ptr1, 
+integer_cst 96: data, ptr1, 
+array_type : data, ptr1, 
+field_decl fptr1: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+field_decl fptr2: data, ptr1, 
+integer_cst 192: data, ptr1, 
+array_type : data, ptr1, 
 field_decl fptr2: data, ptr1, 
 integer_cst 192: data, ptr1, 
 array_type : data, ptr1, 
@@ -315,9 +497,9 @@ integer_cst 64: data, ptr1,
 integer_cst 0: data, ptr1, 
 integer_cst 2: data, ptr1, 
 integer_cst 1: data, ptr1, 
+test24.c:58:5: warning: Using variable 'data' without checking for null pointer
+test24.c:58:5: warning: Using variable 'data->fptr2' without checking for null pointer
 test24.c:58:5: warning: Using parameter 'ptr1' without checking for null pointer
-     (*data->fptr2[1])(ptr1);
-     ^
 parm_decl ptr1: data, ptr1, 
 pointer_type : data, ptr1, 
 record_type : data, ptr1, 
@@ -384,11 +566,49 @@ pointer_type : data, ptr1,
 integer_type : data, ptr1, 
 block : data, ptr1, 
 var_decl data: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+record_type : data, ptr1, 
+identifier_node Data1: data, ptr1, 
+field_decl val: data, ptr1, 
+integer_cst 32: data, ptr1, 
+integer_type : data, ptr1, 
+field_decl ptrval: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+field_decl arr: data, ptr1, 
+integer_cst 96: data, ptr1, 
+array_type : data, ptr1, 
+field_decl fptr1: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+field_decl fptr2: data, ptr1, 
+integer_cst 192: data, ptr1, 
+array_type : data, ptr1, 
 function_decl func6: 
 bind_expr : ptr1, 
 statement_list : ptr1, 
 decl_expr : ptr1, 
 var_decl data: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+record_type : data, ptr1, 
+identifier_node Data1: data, ptr1, 
+field_decl val: data, ptr1, 
+integer_cst 32: data, ptr1, 
+integer_type : data, ptr1, 
+field_decl ptrval: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+field_decl arr: data, ptr1, 
+integer_cst 96: data, ptr1, 
+array_type : data, ptr1, 
+field_decl fptr1: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+field_decl fptr2: data, ptr1, 
+integer_cst 192: data, ptr1, 
+array_type : data, ptr1, 
 call_expr : data, ptr1, 
 indirect_ref : data, ptr1, 
 pointer_plus_expr : data, ptr1, 
@@ -412,6 +632,25 @@ test24.c:64:5: warning: Using variable 'data' without checking for null pointer
      (*ptr1[1])(data);
      ^
 var_decl data: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+record_type : data, ptr1, 
+identifier_node Data1: data, ptr1, 
+field_decl val: data, ptr1, 
+integer_cst 32: data, ptr1, 
+integer_type : data, ptr1, 
+field_decl ptrval: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+field_decl arr: data, ptr1, 
+integer_cst 96: data, ptr1, 
+array_type : data, ptr1, 
+field_decl fptr1: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+field_decl fptr2: data, ptr1, 
+integer_cst 192: data, ptr1, 
+array_type : data, ptr1, 
 var_decl data: ptr1, 
 integer_cst 64: data, ptr1, 
 pointer_type : data, ptr1, 
@@ -446,6 +685,25 @@ pointer_type : data, ptr1,
 integer_type : data, ptr1, 
 block : data, ptr1, 
 var_decl data: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+record_type : data, ptr1, 
+identifier_node Data1: data, ptr1, 
+field_decl val: data, ptr1, 
+integer_cst 32: data, ptr1, 
+integer_type : data, ptr1, 
+field_decl ptrval: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+field_decl arr: data, ptr1, 
+integer_cst 96: data, ptr1, 
+array_type : data, ptr1, 
+field_decl fptr1: data, ptr1, 
+integer_cst 64: data, ptr1, 
+pointer_type : data, ptr1, 
+field_decl fptr2: data, ptr1, 
+integer_cst 192: data, ptr1, 
+array_type : data, ptr1, 
 function_decl test1: 
 bind_expr : w1, w2, 
 statement_list : w1, w2, 
@@ -455,6 +713,31 @@ bind_expr : w1, w2,
 statement_list : w1, w2, 
 decl_expr : w1, w2, 
 var_decl fptr: w1, w2, 
+integer_cst 64: w1, w2, 
+constructor : w1, w2, 
+array_type : w1, w2, 
+pointer_type : w1, w2, 
+function_type : w1, w2, 
+integer_type : w1, w2, 
+integer_type : w1, w2, 
+integer_cst 64: w1, w2, 
+integer_cst 0: w1, w2, 
+integer_cst 0: w1, w2, 
+integer_cst 0: w1, w2, 
+addr_expr : w1, w2, 
+function_decl test1: w1, w2, 
+bind_expr : w1, w2, 
+statement_list : w1, w2, 
+block : w1, w2, 
+array_type : w1, w2, 
+pointer_type : w1, w2, 
+function_type : w1, w2, 
+integer_type : w1, w2, 
+tree_list : w1, w2, 
+integer_type : w1, w2, 
+integer_cst 64: w1, w2, 
+integer_cst 0: w1, w2, 
+integer_cst 0: w1, w2, 
 decl_expr : w1, w2, 
 var_decl i: w1, w2, 
 integer_cst 32: w1, w2, 
@@ -465,6 +748,12 @@ integer_cst -2147483648: w1, w2,
 integer_cst 2147483647: w1, w2, 
 modify_expr : w1, w2, 
 var_decl i: w1, w2, 
+integer_cst 32: w1, w2, 
+integer_type : w1, w2, 
+type_decl int: w1, w2, 
+integer_cst 32: w1, w2, 
+integer_cst -2147483648: w1, w2, 
+integer_cst 2147483647: w1, w2, 
 integer_cst 0: w1, w2, 
 goto_expr : i, w1, w2, 
 label_expr : i, w1, w2, 
@@ -476,7 +765,38 @@ array_ref : i, w1, w2,
 integer_cst 0: i, w1, w2, 
 integer_cst 8: i, w1, w2, 
 var_decl fptr: i, w1, w2, 
+integer_cst 64: i, w1, w2, 
+constructor : i, w1, w2, 
+array_type : i, w1, w2, 
+pointer_type : i, w1, w2, 
+function_type : i, w1, w2, 
+integer_type : i, w1, w2, 
+integer_type : i, w1, w2, 
+integer_cst 64: i, w1, w2, 
+integer_cst 0: i, w1, w2, 
+integer_cst 0: i, w1, w2, 
+integer_cst 0: i, w1, w2, 
+addr_expr : i, w1, w2, 
+function_decl test1: i, w1, w2, 
+bind_expr : i, w1, w2, 
+statement_list : i, w1, w2, 
+block : i, w1, w2, 
+array_type : i, w1, w2, 
+pointer_type : i, w1, w2, 
+function_type : i, w1, w2, 
+integer_type : i, w1, w2, 
+tree_list : i, w1, w2, 
+integer_type : i, w1, w2, 
+integer_cst 64: i, w1, w2, 
+integer_cst 0: i, w1, w2, 
+integer_cst 0: i, w1, w2, 
 var_decl i: i, w1, w2, 
+integer_cst 32: i, w1, w2, 
+integer_type : i, w1, w2, 
+type_decl int: i, w1, w2, 
+integer_cst 32: i, w1, w2, 
+integer_cst -2147483648: i, w1, w2, 
+integer_cst 2147483647: i, w1, w2, 
 parm_decl w1: i, w1, w2, 
 pointer_type : i, w1, w2, 
 integer_type : i, w1, w2, 
@@ -497,12 +817,24 @@ integer_cst 0: i, w1, w2,
 goto_expr : i, w1, w2, 
 postincrement_expr : i, w1, w2, 
 var_decl i: i, w1, w2, 
+integer_cst 32: i, w1, w2, 
+integer_type : i, w1, w2, 
+type_decl int: i, w1, w2, 
+integer_cst 32: i, w1, w2, 
+integer_cst -2147483648: i, w1, w2, 
+integer_cst 2147483647: i, w1, w2, 
 integer_cst 1: i, w1, w2, 
 label_expr : i, w1, w2, 
 label_decl : i, w1, w2, 
 cond_expr : i, w1, w2, 
 le_expr : i, w1, w2, 
 var_decl i: i, w1, w2, 
+integer_cst 32: i, w1, w2, 
+integer_type : i, w1, w2, 
+type_decl int: i, w1, w2, 
+integer_cst 32: i, w1, w2, 
+integer_cst -2147483648: i, w1, w2, 
+integer_cst 2147483647: i, w1, w2, 
 integer_cst 9: i, w1, w2, 
 goto_expr : i, w1, w2, 
 goto_expr : i, w1, w2, 
@@ -552,7 +884,38 @@ integer_cst 0: i, w1, w2,
 integer_cst 0: i, w1, w2, 
 block : i, w1, w2, 
 var_decl fptr: i, w1, w2, 
+integer_cst 64: i, w1, w2, 
+constructor : i, w1, w2, 
+array_type : i, w1, w2, 
+pointer_type : i, w1, w2, 
+function_type : i, w1, w2, 
+integer_type : i, w1, w2, 
+integer_type : i, w1, w2, 
+integer_cst 64: i, w1, w2, 
+integer_cst 0: i, w1, w2, 
+integer_cst 0: i, w1, w2, 
+integer_cst 0: i, w1, w2, 
+addr_expr : i, w1, w2, 
+function_decl test1: i, w1, w2, 
+bind_expr : i, w1, w2, 
+statement_list : i, w1, w2, 
+block : i, w1, w2, 
+array_type : i, w1, w2, 
+pointer_type : i, w1, w2, 
+function_type : i, w1, w2, 
+integer_type : i, w1, w2, 
+tree_list : i, w1, w2, 
+integer_type : i, w1, w2, 
+integer_cst 64: i, w1, w2, 
+integer_cst 0: i, w1, w2, 
+integer_cst 0: i, w1, w2, 
 var_decl i: i, w1, w2, 
+integer_cst 32: i, w1, w2, 
+integer_type : i, w1, w2, 
+type_decl int: i, w1, w2, 
+integer_cst 32: i, w1, w2, 
+integer_cst -2147483648: i, w1, w2, 
+integer_cst 2147483647: i, w1, w2, 
 function_decl func8: 
 bind_expr : fptr, 
 call_expr : fptr,