Update test 38.

8 files changed, 1300 insertions, 873 deletions

diff --git a/test/test09-03.txt b/test/test09-03.txt
index a656669..0d99ec9 100644
--- a/test/test09-03.txt
+++ b/test/test09-03.txt
@@ -640,17 +640,17 @@ integer_cst 0: ptr2,
 bind_expr : ptr1, ptr2, 
 cleanup_point_expr : ptr1, ptr2, 
 decl_expr : ptr1, ptr2, 
-var_decl k: k, ptr1, ptr2, 
-var_decl k: k, ptr1, ptr2, 
-integer_cst 32: k, ptr1, ptr2, 
-integer_cst 0: k, ptr1, ptr2, 
-integer_type : k, ptr1, ptr2, 
-type_decl int: k, ptr1, ptr2, 
-integer_cst 32: k, ptr1, ptr2, 
-integer_cst -2147483648: k, ptr1, ptr2, 
-integer_cst 2147483647: k, ptr1, ptr2, 
-block : k, ptr1, ptr2, 
-var_decl k: k, ptr1, ptr2, 
+var_decl k: ptr1, ptr2, 
+var_decl k: ptr1, ptr2, 
+integer_cst 32: ptr1, ptr2, 
+integer_cst 0: ptr1, ptr2, 
+integer_type : ptr1, ptr2, 
+type_decl int: ptr1, ptr2, 
+integer_cst 32: ptr1, ptr2, 
+integer_cst -2147483648: ptr1, ptr2, 
+integer_cst 2147483647: ptr1, ptr2, 
+block : ptr1, ptr2, 
+var_decl k: ptr1, ptr2, 
 cleanup_point_expr : 
 expr_stmt : 
 convert_expr : 
@@ -665,48 +665,48 @@ integer_cst -2147483648:
 integer_cst 2147483647: 
 integer_cst 64: 
 integer_cst 100: 
-block : k, ptr1, ptr2, 
-block : k, ptr1, ptr2, 
-var_decl k: k, ptr1, ptr2, 
-cleanup_point_expr : k, ptr1, ptr2, 
-expr_stmt : k, ptr1, ptr2, 
-convert_expr : k, ptr1, ptr2, 
-modify_expr : k, ptr1, ptr2, 
+block : ptr1, ptr2, 
+block : ptr1, ptr2, 
+var_decl k: ptr1, ptr2, 
+cleanup_point_expr : ptr1, ptr2, 
+expr_stmt : ptr1, ptr2, 
+convert_expr : ptr1, ptr2, 
+modify_expr : ptr1, ptr2, 
 test09.cpp: In member function 'void Object1::func10(int*, int*)':
 test09.cpp:139:20: warning: Using parameter 'ptr1' without checking for null pointer
          *ptr1 = 200;
                     ^
-indirect_ref : k, ptr1, ptr2, 
-parm_decl ptr1: k, ptr1, ptr2, 
-pointer_type : k, ptr1, ptr2, 
-integer_type : k, ptr1, ptr2, 
-type_decl int: k, ptr1, ptr2, 
-integer_cst 32: k, ptr1, ptr2, 
-integer_cst -2147483648: k, ptr1, ptr2, 
-integer_cst 2147483647: k, ptr1, ptr2, 
-integer_cst 64: k, ptr1, ptr2, 
-integer_cst 200: k, ptr1, ptr2, 
-cleanup_point_expr : k, ptr1, ptr2, 
-expr_stmt : k, ptr1, ptr2, 
-convert_expr : k, ptr1, ptr2, 
-modify_expr : k, ptr1, ptr2, 
+indirect_ref : ptr1, ptr2, 
+parm_decl ptr1: ptr1, ptr2, 
+pointer_type : ptr1, ptr2, 
+integer_type : ptr1, ptr2, 
+type_decl int: ptr1, ptr2, 
+integer_cst 32: ptr1, ptr2, 
+integer_cst -2147483648: ptr1, ptr2, 
+integer_cst 2147483647: ptr1, ptr2, 
+integer_cst 64: ptr1, ptr2, 
+integer_cst 200: ptr1, ptr2, 
+cleanup_point_expr : ptr1, ptr2, 
+expr_stmt : ptr1, ptr2, 
+convert_expr : ptr1, ptr2, 
+modify_expr : ptr1, ptr2, 
 test09.cpp:140:20: warning: Using parameter 'ptr2' without checking for null pointer
          *ptr2 = 300;
                     ^
-indirect_ref : k, ptr1, ptr2, 
-parm_decl ptr2: k, ptr1, ptr2, 
-pointer_type : k, ptr1, ptr2, 
-integer_type : k, ptr1, ptr2, 
-type_decl int: k, ptr1, ptr2, 
-integer_cst 32: k, ptr1, ptr2, 
-integer_cst -2147483648: k, ptr1, ptr2, 
-integer_cst 2147483647: k, ptr1, ptr2, 
-integer_cst 64: k, ptr1, ptr2, 
-integer_cst 300: k, ptr1, ptr2, 
+indirect_ref : ptr1, ptr2, 
+parm_decl ptr2: ptr1, ptr2, 
+pointer_type : ptr1, ptr2, 
+integer_type : ptr1, ptr2, 
+type_decl int: ptr1, ptr2, 
+integer_cst 32: ptr1, ptr2, 
+integer_cst -2147483648: ptr1, ptr2, 
+integer_cst 2147483647: ptr1, ptr2, 
+integer_cst 64: ptr1, ptr2, 
+integer_cst 300: ptr1, ptr2, 
+block : ptr1, ptr2, 
 block : ptr1, ptr2, 
-block : k, ptr1, ptr2, 
-block : k, ptr1, ptr2, 
-var_decl k: k, ptr1, ptr2, 
+block : ptr1, ptr2, 
+var_decl k: ptr1, ptr2, 
 function_decl func11: 
 bind_expr : ptr1, ptr2, 
 statement_list : ptr1, ptr2, 
diff --git a/test/test21-03.txt b/test/test21-03.txt
index b0562d8..f8a4428 100644
--- a/test/test21-03.txt
+++ b/test/test21-03.txt
@@ -4435,137 +4435,137 @@ bind_expr : ptr1,
 statement_list : ptr1, 
 cleanup_point_expr : ptr1, 
 decl_expr : ptr1, 
-var_decl tmpvar: ptr1, tmpvar, 
-decl_expr : ptr1, tmpvar, 
-var_decl ptr2: ptr1, ptr2, tmpvar, 
-integer_cst 64: ptr1, ptr2, tmpvar, 
-parm_decl ptr1: ptr1, ptr2, tmpvar, 
-pointer_type : ptr1, ptr2, tmpvar, 
-void_type : ptr1, ptr2, tmpvar, 
-type_decl void: ptr1, ptr2, tmpvar, 
-integer_cst 64: ptr1, ptr2, tmpvar, 
-pointer_type : ptr1, ptr2, tmpvar, 
-record_type : ptr1, ptr2, tmpvar, 
-type_decl Data1: ptr1, ptr2, tmpvar, 
-field_decl val: ptr1, ptr2, tmpvar, 
-integer_cst 32: ptr1, ptr2, tmpvar, 
-type_decl Data1: ptr1, ptr2, tmpvar, 
-if_stmt : ptr1, ptr2, tmpvar, 
-eq_expr : ptr1, ptr2, tmpvar, 
-parm_decl ptr1: ptr1, ptr2, tmpvar, 
-pointer_type : ptr1, ptr2, tmpvar, 
-void_type : ptr1, ptr2, tmpvar, 
-type_decl void: ptr1, ptr2, tmpvar, 
-integer_cst 64: ptr1, ptr2, tmpvar, 
-integer_cst 0: ptr1, ptr2, tmpvar, 
-return_expr : ptr1, ptr2, tmpvar, 
-init_expr : ptr1, ptr2, tmpvar, 
-result_decl : ptr1, ptr2, tmpvar, 
-integer_type : ptr1, ptr2, tmpvar, 
-type_decl int: ptr1, ptr2, tmpvar, 
-integer_cst 32: ptr1, ptr2, tmpvar, 
-integer_cst -2147483648: ptr1, ptr2, tmpvar, 
-integer_cst 2147483647: ptr1, ptr2, tmpvar, 
-integer_cst 32: ptr1, ptr2, tmpvar, 
-integer_cst 0: ptr1, ptr2, tmpvar, 
-if_stmt : ptr1, ptr2, tmpvar, 
-ne_expr : ptr1, ptr2, tmpvar, 
-component_ref : tmpvar, 
-indirect_ref : tmpvar, 
-var_decl ptr2: tmpvar, 
-field_decl val: tmpvar, 
-integer_cst 32: tmpvar, 
-integer_cst 0: tmpvar, 
-return_expr : tmpvar, 
-init_expr : tmpvar, 
-result_decl : tmpvar, 
-integer_type : tmpvar, 
-type_decl int: tmpvar, 
-integer_cst 32: tmpvar, 
-integer_cst -2147483648: tmpvar, 
-integer_cst 2147483647: tmpvar, 
-integer_cst 32: tmpvar, 
-integer_cst 3: tmpvar, 
-return_expr : ptr1, ptr2, tmpvar, 
-init_expr : tmpvar, 
-result_decl : tmpvar, 
-integer_type : tmpvar, 
-type_decl int: tmpvar, 
-integer_cst 32: tmpvar, 
-integer_cst -2147483648: tmpvar, 
-integer_cst 2147483647: tmpvar, 
-integer_cst 32: tmpvar, 
-integer_cst 0: tmpvar, 
 var_decl tmpvar: ptr1, 
-integer_cst 32: tmpvar, 
-integer_cst 0: tmpvar, 
-integer_type : tmpvar, 
-type_decl int: tmpvar, 
-integer_cst 32: tmpvar, 
-integer_cst -2147483648: tmpvar, 
-integer_cst 2147483647: tmpvar, 
-block : ptr1, tmpvar, 
-var_decl tmpvar: tmpvar, 
-var_decl ptr2: tmpvar, 
+decl_expr : ptr1, 
+var_decl ptr2: ptr1, ptr2, 
+integer_cst 64: ptr1, ptr2, 
+parm_decl ptr1: ptr1, ptr2, 
+pointer_type : ptr1, ptr2, 
+void_type : ptr1, ptr2, 
+type_decl void: ptr1, ptr2, 
+integer_cst 64: ptr1, ptr2, 
+pointer_type : ptr1, ptr2, 
+record_type : ptr1, ptr2, 
+type_decl Data1: ptr1, ptr2, 
+field_decl val: ptr1, ptr2, 
+integer_cst 32: ptr1, ptr2, 
+type_decl Data1: ptr1, ptr2, 
+if_stmt : ptr1, ptr2, 
+eq_expr : ptr1, ptr2, 
+parm_decl ptr1: ptr1, ptr2, 
+pointer_type : ptr1, ptr2, 
+void_type : ptr1, ptr2, 
+type_decl void: ptr1, ptr2, 
+integer_cst 64: ptr1, ptr2, 
+integer_cst 0: ptr1, ptr2, 
+return_expr : ptr1, ptr2, 
+init_expr : ptr1, ptr2, 
+result_decl : ptr1, ptr2, 
+integer_type : ptr1, ptr2, 
+type_decl int: ptr1, ptr2, 
+integer_cst 32: ptr1, ptr2, 
+integer_cst -2147483648: ptr1, ptr2, 
+integer_cst 2147483647: ptr1, ptr2, 
+integer_cst 32: ptr1, ptr2, 
+integer_cst 0: ptr1, ptr2, 
+if_stmt : ptr1, ptr2, 
+ne_expr : ptr1, ptr2, 
+component_ref : 
+indirect_ref : 
+var_decl ptr2: 
+field_decl val: 
+integer_cst 32: 
+integer_cst 0: 
+return_expr : 
+init_expr : 
+result_decl : 
+integer_type : 
+type_decl int: 
+integer_cst 32: 
+integer_cst -2147483648: 
+integer_cst 2147483647: 
+integer_cst 32: 
+integer_cst 3: 
+return_expr : ptr1, ptr2, 
+init_expr : 
+result_decl : 
+integer_type : 
+type_decl int: 
+integer_cst 32: 
+integer_cst -2147483648: 
+integer_cst 2147483647: 
+integer_cst 32: 
+integer_cst 0: 
+var_decl tmpvar: ptr1, 
+integer_cst 32: 
+integer_cst 0: 
+integer_type : 
+type_decl int: 
+integer_cst 32: 
+integer_cst -2147483648: 
+integer_cst 2147483647: 
+block : ptr1, 
+var_decl tmpvar: 
+var_decl ptr2: 
 function_decl func2: 
 bind_expr : ptr1, 
 statement_list : ptr1, 
 cleanup_point_expr : ptr1, 
 decl_expr : ptr1, 
-var_decl attempts: attempts, ptr1, 
-decl_expr : attempts, ptr1, 
-var_decl ptr2: attempts, ptr1, ptr2, 
-integer_cst 64: attempts, ptr1, ptr2, 
-parm_decl ptr1: attempts, ptr1, ptr2, 
-pointer_type : attempts, ptr1, ptr2, 
-void_type : attempts, ptr1, ptr2, 
-type_decl void: attempts, ptr1, ptr2, 
-integer_cst 64: attempts, ptr1, ptr2, 
-pointer_type : attempts, ptr1, ptr2, 
-record_type : attempts, ptr1, ptr2, 
-type_decl Data1: attempts, ptr1, ptr2, 
-field_decl val: attempts, ptr1, ptr2, 
-integer_cst 32: attempts, ptr1, ptr2, 
-type_decl Data1: attempts, ptr1, ptr2, 
-if_stmt : attempts, ptr1, ptr2, 
-eq_expr : attempts, ptr1, ptr2, 
-var_decl ptr2: attempts, ptr1, ptr2, 
-integer_cst 0: attempts, ptr1, ptr2, 
-return_expr : attempts, ptr1, ptr2, 
-init_expr : attempts, ptr1, ptr2, 
-result_decl : attempts, ptr1, ptr2, 
-integer_type : attempts, ptr1, ptr2, 
-type_decl int: attempts, ptr1, ptr2, 
-integer_cst 32: attempts, ptr1, ptr2, 
-integer_cst -2147483648: attempts, ptr1, ptr2, 
-integer_cst 2147483647: attempts, ptr1, ptr2, 
-integer_cst 32: attempts, ptr1, ptr2, 
-integer_cst 0: attempts, ptr1, ptr2, 
-decl_expr : attempts, ptr1, ptr2, 
-var_decl outFilename: attempts, 
-integer_cst 32: attempts, 
-component_ref : attempts, 
-indirect_ref : attempts, 
-var_decl ptr2: attempts, 
-field_decl val: attempts, 
-integer_cst 32: attempts, 
-integer_type : attempts, 
-type_decl int: attempts, 
-integer_cst 32: attempts, 
-integer_cst -2147483648: attempts, 
-integer_cst 2147483647: attempts, 
 var_decl attempts: ptr1, 
-integer_cst 32: attempts, 
-integer_cst 0: attempts, 
-integer_type : attempts, 
-type_decl int: attempts, 
-integer_cst 32: attempts, 
-integer_cst -2147483648: attempts, 
-integer_cst 2147483647: attempts, 
-block : attempts, ptr1, 
-var_decl attempts: attempts, 
-var_decl ptr2: attempts, 
-var_decl outFilename: attempts, 
+decl_expr : ptr1, 
+var_decl ptr2: ptr1, ptr2, 
+integer_cst 64: ptr1, ptr2, 
+parm_decl ptr1: ptr1, ptr2, 
+pointer_type : ptr1, ptr2, 
+void_type : ptr1, ptr2, 
+type_decl void: ptr1, ptr2, 
+integer_cst 64: ptr1, ptr2, 
+pointer_type : ptr1, ptr2, 
+record_type : ptr1, ptr2, 
+type_decl Data1: ptr1, ptr2, 
+field_decl val: ptr1, ptr2, 
+integer_cst 32: ptr1, ptr2, 
+type_decl Data1: ptr1, ptr2, 
+if_stmt : ptr1, ptr2, 
+eq_expr : ptr1, ptr2, 
+var_decl ptr2: ptr1, ptr2, 
+integer_cst 0: ptr1, ptr2, 
+return_expr : ptr1, ptr2, 
+init_expr : ptr1, ptr2, 
+result_decl : ptr1, ptr2, 
+integer_type : ptr1, ptr2, 
+type_decl int: ptr1, ptr2, 
+integer_cst 32: ptr1, ptr2, 
+integer_cst -2147483648: ptr1, ptr2, 
+integer_cst 2147483647: ptr1, ptr2, 
+integer_cst 32: ptr1, ptr2, 
+integer_cst 0: ptr1, ptr2, 
+decl_expr : ptr1, ptr2, 
+var_decl outFilename: 
+integer_cst 32: 
+component_ref : 
+indirect_ref : 
+var_decl ptr2: 
+field_decl val: 
+integer_cst 32: 
+integer_type : 
+type_decl int: 
+integer_cst 32: 
+integer_cst -2147483648: 
+integer_cst 2147483647: 
+var_decl attempts: ptr1, 
+integer_cst 32: 
+integer_cst 0: 
+integer_type : 
+type_decl int: 
+integer_cst 32: 
+integer_cst -2147483648: 
+integer_cst 2147483647: 
+block : ptr1, 
+var_decl attempts: 
+var_decl ptr2: 
+var_decl outFilename: 
 function_decl func3: 
 bind_expr : ptr1, 
 statement_list : ptr1, 
diff --git a/test/test26-03.txt b/test/test26-03.txt
index 23e7c1c..35c1bba 100644
--- a/test/test26-03.txt
+++ b/test/test26-03.txt
@@ -1219,210 +1219,210 @@ bind_expr : __s1, __s2,
 statement_list : __s1, __s2, 
 cleanup_point_expr : __s1, __s2, 
 decl_expr : __s1, __s2, 
-var_decl __i: __i, __s1, __s2, 
-for_stmt : __i, __s1, __s2, 
-cleanup_point_expr : __i, __s1, __s2, 
-convert_expr : __i, __s1, __s2, 
-preincrement_expr : __i, __s1, __s2, 
-var_decl __i: __i, __s1, __s2, 
-integer_cst 1: __i, __s1, __s2, 
-lt_expr : __i, __s1, __s2, 
-var_decl __i: __i, __s1, __s2, 
-parm_decl __n: __i, __s1, __s2, 
-integer_type : __i, __s1, __s2, 
-type_decl size_t: __i, __s1, __s2, 
-integer_cst 64: __i, __s1, __s2, 
-integer_cst 0: __i, __s1, __s2, 
-integer_cst : __i, __s1, __s2, 
-integer_cst 64: __i, __s1, __s2, 
-if_stmt : __i, __s1, __s2, 
-cleanup_point_expr : __i, __s1, __s2, 
-call_expr : __i, __s1, __s2, 
-addr_expr : __i, __s1, __s2, 
-function_decl lt: __i, __s1, __s2, 
-pointer_plus_expr : __i, __s1, __s2, 
-parm_decl __s1: __i, __s1, __s2, 
-pointer_type : __i, __s1, __s2, 
-integer_type : __i, __s1, __s2, 
-type_decl char_type: __i, __s1, __s2, 
-integer_cst 16: __i, __s1, __s2, 
-integer_cst 0: __i, __s1, __s2, 
-integer_cst 65535: __i, __s1, __s2, 
-integer_cst 64: __i, __s1, __s2, 
-mult_expr : __i, __s1, __s2, 
-var_decl __i: __i, __s1, __s2, 
-integer_cst 2: __i, __s1, __s2, 
-pointer_plus_expr : __i, __s1, __s2, 
-parm_decl __s2: __i, __s1, __s2, 
-pointer_type : __i, __s1, __s2, 
-integer_type : __i, __s1, __s2, 
-type_decl char_type: __i, __s1, __s2, 
-integer_cst 16: __i, __s1, __s2, 
-integer_cst 0: __i, __s1, __s2, 
-integer_cst 65535: __i, __s1, __s2, 
-integer_cst 64: __i, __s1, __s2, 
-mult_expr : __i, __s1, __s2, 
-var_decl __i: __i, __s1, __s2, 
-integer_cst 2: __i, __s1, __s2, 
-return_expr : __i, __s1, __s2, 
-init_expr : __i, __s1, __s2, 
-result_decl : __i, __s1, __s2, 
-integer_type : __i, __s1, __s2, 
-type_decl int: __i, __s1, __s2, 
-integer_cst 32: __i, __s1, __s2, 
-integer_cst -2147483648: __i, __s1, __s2, 
-integer_cst 2147483647: __i, __s1, __s2, 
-integer_cst 32: __i, __s1, __s2, 
-integer_cst -1: __i, __s1, __s2, 
-if_stmt : __i, __s1, __s2, 
-cleanup_point_expr : __i, __s1, __s2, 
-call_expr : __i, __s1, __s2, 
-addr_expr : __i, __s1, __s2, 
-function_decl lt: __i, __s1, __s2, 
-pointer_plus_expr : __i, __s1, __s2, 
-parm_decl __s2: __i, __s1, __s2, 
-pointer_type : __i, __s1, __s2, 
-integer_type : __i, __s1, __s2, 
-type_decl char_type: __i, __s1, __s2, 
-integer_cst 16: __i, __s1, __s2, 
-integer_cst 0: __i, __s1, __s2, 
-integer_cst 65535: __i, __s1, __s2, 
-integer_cst 64: __i, __s1, __s2, 
-mult_expr : __i, __s1, __s2, 
-var_decl __i: __i, __s1, __s2, 
-integer_cst 2: __i, __s1, __s2, 
-pointer_plus_expr : __i, __s1, __s2, 
-parm_decl __s1: __i, __s1, __s2, 
-pointer_type : __i, __s1, __s2, 
-integer_type : __i, __s1, __s2, 
-type_decl char_type: __i, __s1, __s2, 
-integer_cst 16: __i, __s1, __s2, 
-integer_cst 0: __i, __s1, __s2, 
-integer_cst 65535: __i, __s1, __s2, 
-integer_cst 64: __i, __s1, __s2, 
-mult_expr : __i, __s1, __s2, 
-var_decl __i: __i, __s1, __s2, 
-integer_cst 2: __i, __s1, __s2, 
-return_expr : __i, __s1, __s2, 
-init_expr : __i, __s1, __s2, 
-result_decl : __i, __s1, __s2, 
-integer_type : __i, __s1, __s2, 
-type_decl int: __i, __s1, __s2, 
-integer_cst 32: __i, __s1, __s2, 
-integer_cst -2147483648: __i, __s1, __s2, 
-integer_cst 2147483647: __i, __s1, __s2, 
-integer_cst 32: __i, __s1, __s2, 
-integer_cst 1: __i, __s1, __s2, 
 var_decl __i: __s1, __s2, 
-integer_cst 64: __i, __s1, __s2, 
-integer_cst 0: __i, __s1, __s2, 
-integer_type : __i, __s1, __s2, 
-type_decl size_t: __i, __s1, __s2, 
-integer_cst 64: __i, __s1, __s2, 
-integer_cst 0: __i, __s1, __s2, 
-integer_cst : __i, __s1, __s2, 
-block : __i, __s1, __s2, 
-var_decl __i: __i, __s1, __s2, 
-return_expr : __i, __s1, __s2, 
-init_expr : __i, __s1, __s2, 
-result_decl : __i, __s1, __s2, 
-integer_type : __i, __s1, __s2, 
-type_decl int: __i, __s1, __s2, 
-integer_cst 32: __i, __s1, __s2, 
-integer_cst -2147483648: __i, __s1, __s2, 
-integer_cst 2147483647: __i, __s1, __s2, 
-integer_cst 32: __i, __s1, __s2, 
-integer_cst 0: __i, __s1, __s2, 
+for_stmt : __s1, __s2, 
+cleanup_point_expr : __s1, __s2, 
+convert_expr : __s1, __s2, 
+preincrement_expr : __s1, __s2, 
+var_decl __i: __s1, __s2, 
+integer_cst 1: __s1, __s2, 
+lt_expr : __s1, __s2, 
+var_decl __i: __s1, __s2, 
+parm_decl __n: __s1, __s2, 
+integer_type : __s1, __s2, 
+type_decl size_t: __s1, __s2, 
+integer_cst 64: __s1, __s2, 
+integer_cst 0: __s1, __s2, 
+integer_cst : __s1, __s2, 
+integer_cst 64: __s1, __s2, 
+if_stmt : __s1, __s2, 
+cleanup_point_expr : __s1, __s2, 
+call_expr : __s1, __s2, 
+addr_expr : __s1, __s2, 
+function_decl lt: __s1, __s2, 
+pointer_plus_expr : __s1, __s2, 
+parm_decl __s1: __s1, __s2, 
+pointer_type : __s1, __s2, 
+integer_type : __s1, __s2, 
+type_decl char_type: __s1, __s2, 
+integer_cst 16: __s1, __s2, 
+integer_cst 0: __s1, __s2, 
+integer_cst 65535: __s1, __s2, 
+integer_cst 64: __s1, __s2, 
+mult_expr : __s1, __s2, 
+var_decl __i: __s1, __s2, 
+integer_cst 2: __s1, __s2, 
+pointer_plus_expr : __s1, __s2, 
+parm_decl __s2: __s1, __s2, 
+pointer_type : __s1, __s2, 
+integer_type : __s1, __s2, 
+type_decl char_type: __s1, __s2, 
+integer_cst 16: __s1, __s2, 
+integer_cst 0: __s1, __s2, 
+integer_cst 65535: __s1, __s2, 
+integer_cst 64: __s1, __s2, 
+mult_expr : __s1, __s2, 
+var_decl __i: __s1, __s2, 
+integer_cst 2: __s1, __s2, 
+return_expr : __s1, __s2, 
+init_expr : __s1, __s2, 
+result_decl : __s1, __s2, 
+integer_type : __s1, __s2, 
+type_decl int: __s1, __s2, 
+integer_cst 32: __s1, __s2, 
+integer_cst -2147483648: __s1, __s2, 
+integer_cst 2147483647: __s1, __s2, 
+integer_cst 32: __s1, __s2, 
+integer_cst -1: __s1, __s2, 
+if_stmt : __s1, __s2, 
+cleanup_point_expr : __s1, __s2, 
+call_expr : __s1, __s2, 
+addr_expr : __s1, __s2, 
+function_decl lt: __s1, __s2, 
+pointer_plus_expr : __s1, __s2, 
+parm_decl __s2: __s1, __s2, 
+pointer_type : __s1, __s2, 
+integer_type : __s1, __s2, 
+type_decl char_type: __s1, __s2, 
+integer_cst 16: __s1, __s2, 
+integer_cst 0: __s1, __s2, 
+integer_cst 65535: __s1, __s2, 
+integer_cst 64: __s1, __s2, 
+mult_expr : __s1, __s2, 
+var_decl __i: __s1, __s2, 
+integer_cst 2: __s1, __s2, 
+pointer_plus_expr : __s1, __s2, 
+parm_decl __s1: __s1, __s2, 
+pointer_type : __s1, __s2, 
+integer_type : __s1, __s2, 
+type_decl char_type: __s1, __s2, 
+integer_cst 16: __s1, __s2, 
+integer_cst 0: __s1, __s2, 
+integer_cst 65535: __s1, __s2, 
+integer_cst 64: __s1, __s2, 
+mult_expr : __s1, __s2, 
+var_decl __i: __s1, __s2, 
+integer_cst 2: __s1, __s2, 
+return_expr : __s1, __s2, 
+init_expr : __s1, __s2, 
+result_decl : __s1, __s2, 
+integer_type : __s1, __s2, 
+type_decl int: __s1, __s2, 
+integer_cst 32: __s1, __s2, 
+integer_cst -2147483648: __s1, __s2, 
+integer_cst 2147483647: __s1, __s2, 
+integer_cst 32: __s1, __s2, 
+integer_cst 1: __s1, __s2, 
+var_decl __i: __s1, __s2, 
+integer_cst 64: __s1, __s2, 
+integer_cst 0: __s1, __s2, 
+integer_type : __s1, __s2, 
+type_decl size_t: __s1, __s2, 
+integer_cst 64: __s1, __s2, 
+integer_cst 0: __s1, __s2, 
+integer_cst : __s1, __s2, 
+block : __s1, __s2, 
+var_decl __i: __s1, __s2, 
+return_expr : __s1, __s2, 
+init_expr : __s1, __s2, 
+result_decl : __s1, __s2, 
+integer_type : __s1, __s2, 
+type_decl int: __s1, __s2, 
+integer_cst 32: __s1, __s2, 
+integer_cst -2147483648: __s1, __s2, 
+integer_cst 2147483647: __s1, __s2, 
+integer_cst 32: __s1, __s2, 
+integer_cst 0: __s1, __s2, 
 block : __s1, __s2, 
-block : __i, __s1, __s2, 
-var_decl __i: __i, __s1, __s2, 
+block : __s1, __s2, 
+var_decl __i: __s1, __s2, 
 function_decl length: 
 bind_expr : __s, 
 statement_list : __s, 
 cleanup_point_expr : __s, 
 decl_expr : __s, 
-var_decl __i: __i, __s, 
-while_stmt : __i, __s, 
-cleanup_point_expr : __i, __s, 
-truth_not_expr : __i, __s, 
-call_expr : __i, __s, 
-addr_expr : __i, __s, 
-function_decl eq: __i, __s, 
-pointer_plus_expr : __i, __s, 
-parm_decl __s: __i, __s, 
-pointer_type : __i, __s, 
-integer_type : __i, __s, 
-type_decl char_type: __i, __s, 
-integer_cst 16: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst 65535: __i, __s, 
-integer_cst 64: __i, __s, 
-mult_expr : __i, __s, 
-var_decl __i: __i, __s, 
-integer_cst 2: __i, __s, 
-addr_expr : __i, __s, 
-target_expr : __i, __s, 
-var_decl : __i, __s, 
-integer_cst 16: __i, __s, 
-integer_type : __i, __s, 
-type_decl char_type: __i, __s, 
-integer_cst 16: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst 65535: __i, __s, 
-integer_cst 0: __i, __s, 
-cleanup_point_expr : __i, __s, 
-expr_stmt : __i, __s, 
-convert_expr : __i, __s, 
-preincrement_expr : __i, __s, 
-var_decl __i: __i, __s, 
-integer_cst 1: __i, __s, 
-cleanup_point_expr : __i, __s, 
-truth_not_expr : __i, __s, 
-call_expr : __i, __s, 
-addr_expr : __i, __s, 
-function_decl eq: __i, __s, 
-pointer_plus_expr : __i, __s, 
-parm_decl __s: __i, __s, 
-pointer_type : __i, __s, 
-integer_type : __i, __s, 
-type_decl char_type: __i, __s, 
-integer_cst 16: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst 65535: __i, __s, 
-integer_cst 64: __i, __s, 
-mult_expr : __i, __s, 
-var_decl __i: __i, __s, 
-integer_cst 2: __i, __s, 
-addr_expr : __i, __s, 
-target_expr : __i, __s, 
-var_decl : __i, __s, 
-integer_cst 16: __i, __s, 
-integer_type : __i, __s, 
-type_decl char_type: __i, __s, 
-integer_cst 16: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst 65535: __i, __s, 
-integer_cst 0: __i, __s, 
-return_expr : __i, __s, 
-init_expr : __i, __s, 
-result_decl : __i, __s, 
-integer_type : __i, __s, 
-type_decl size_t: __i, __s, 
-integer_cst 64: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst : __i, __s, 
-integer_cst 64: __i, __s, 
-var_decl __i: __i, __s, 
 var_decl __i: __s, 
-integer_cst 64: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_type : __i, __s, 
-type_decl size_t: __i, __s, 
-integer_cst 64: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst : __i, __s, 
-block : __i, __s, 
-var_decl __i: __i, __s, 
+while_stmt : __s, 
+cleanup_point_expr : __s, 
+truth_not_expr : __s, 
+call_expr : __s, 
+addr_expr : __s, 
+function_decl eq: __s, 
+pointer_plus_expr : __s, 
+parm_decl __s: __s, 
+pointer_type : __s, 
+integer_type : __s, 
+type_decl char_type: __s, 
+integer_cst 16: __s, 
+integer_cst 0: __s, 
+integer_cst 65535: __s, 
+integer_cst 64: __s, 
+mult_expr : __s, 
+var_decl __i: __s, 
+integer_cst 2: __s, 
+addr_expr : __s, 
+target_expr : __s, 
+var_decl : __s, 
+integer_cst 16: __s, 
+integer_type : __s, 
+type_decl char_type: __s, 
+integer_cst 16: __s, 
+integer_cst 0: __s, 
+integer_cst 65535: __s, 
+integer_cst 0: __s, 
+cleanup_point_expr : __s, 
+expr_stmt : __s, 
+convert_expr : __s, 
+preincrement_expr : __s, 
+var_decl __i: __s, 
+integer_cst 1: __s, 
+cleanup_point_expr : __s, 
+truth_not_expr : __s, 
+call_expr : __s, 
+addr_expr : __s, 
+function_decl eq: __s, 
+pointer_plus_expr : __s, 
+parm_decl __s: __s, 
+pointer_type : __s, 
+integer_type : __s, 
+type_decl char_type: __s, 
+integer_cst 16: __s, 
+integer_cst 0: __s, 
+integer_cst 65535: __s, 
+integer_cst 64: __s, 
+mult_expr : __s, 
+var_decl __i: __s, 
+integer_cst 2: __s, 
+addr_expr : __s, 
+target_expr : __s, 
+var_decl : __s, 
+integer_cst 16: __s, 
+integer_type : __s, 
+type_decl char_type: __s, 
+integer_cst 16: __s, 
+integer_cst 0: __s, 
+integer_cst 65535: __s, 
+integer_cst 0: __s, 
+return_expr : __s, 
+init_expr : __s, 
+result_decl : __s, 
+integer_type : __s, 
+type_decl size_t: __s, 
+integer_cst 64: __s, 
+integer_cst 0: __s, 
+integer_cst : __s, 
+integer_cst 64: __s, 
+var_decl __i: __s, 
+var_decl __i: __s, 
+integer_cst 64: __s, 
+integer_cst 0: __s, 
+integer_type : __s, 
+type_decl size_t: __s, 
+integer_cst 64: __s, 
+integer_cst 0: __s, 
+integer_cst : __s, 
+block : __s, 
+var_decl __i: __s, 
 function_decl find: 
 bind_expr : __s, 
 statement_list : __s, 
@@ -1430,94 +1430,94 @@ bind_expr : __s,
 statement_list : __s, 
 cleanup_point_expr : __s, 
 decl_expr : __s, 
-var_decl __i: __i, __s, 
-for_stmt : __i, __s, 
-cleanup_point_expr : __i, __s, 
-convert_expr : __i, __s, 
-preincrement_expr : __i, __s, 
-var_decl __i: __i, __s, 
-integer_cst 1: __i, __s, 
-lt_expr : __i, __s, 
-var_decl __i: __i, __s, 
-parm_decl __n: __i, __s, 
-integer_type : __i, __s, 
-type_decl size_t: __i, __s, 
-integer_cst 64: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst : __i, __s, 
-integer_cst 64: __i, __s, 
-if_stmt : __i, __s, 
-cleanup_point_expr : __i, __s, 
-call_expr : __i, __s, 
-addr_expr : __i, __s, 
-function_decl eq: __i, __s, 
-pointer_plus_expr : __i, __s, 
-parm_decl __s: __i, __s, 
-pointer_type : __i, __s, 
-integer_type : __i, __s, 
-type_decl char_type: __i, __s, 
-integer_cst 16: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst 65535: __i, __s, 
-integer_cst 64: __i, __s, 
-mult_expr : __i, __s, 
-var_decl __i: __i, __s, 
-integer_cst 2: __i, __s, 
-convert_expr : __i, __s, 
-parm_decl __a: __i, __s, 
-reference_type : __i, __s, 
-integer_type : __i, __s, 
-type_decl char_type: __i, __s, 
-integer_cst 16: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst 65535: __i, __s, 
-integer_cst 64: __i, __s, 
-return_expr : __i, __s, 
-init_expr : __i, __s, 
-result_decl : __i, __s, 
-pointer_type : __i, __s, 
-integer_type : __i, __s, 
-type_decl char_type: __i, __s, 
-integer_cst 16: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst 65535: __i, __s, 
-integer_cst 64: __i, __s, 
-pointer_plus_expr : __i, __s, 
-parm_decl __s: __i, __s, 
-pointer_type : __i, __s, 
-integer_type : __i, __s, 
-type_decl char_type: __i, __s, 
-integer_cst 16: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst 65535: __i, __s, 
-integer_cst 64: __i, __s, 
-mult_expr : __i, __s, 
-var_decl __i: __i, __s, 
-integer_cst 2: __i, __s, 
 var_decl __i: __s, 
-integer_cst 64: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_type : __i, __s, 
-type_decl size_t: __i, __s, 
-integer_cst 64: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst : __i, __s, 
-block : __i, __s, 
-var_decl __i: __i, __s, 
-return_expr : __i, __s, 
-init_expr : __i, __s, 
-result_decl : __i, __s, 
-pointer_type : __i, __s, 
-integer_type : __i, __s, 
-type_decl char_type: __i, __s, 
-integer_cst 16: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst 65535: __i, __s, 
-integer_cst 64: __i, __s, 
-integer_cst 0: __i, __s, 
+for_stmt : __s, 
+cleanup_point_expr : __s, 
+convert_expr : __s, 
+preincrement_expr : __s, 
+var_decl __i: __s, 
+integer_cst 1: __s, 
+lt_expr : __s, 
+var_decl __i: __s, 
+parm_decl __n: __s, 
+integer_type : __s, 
+type_decl size_t: __s, 
+integer_cst 64: __s, 
+integer_cst 0: __s, 
+integer_cst : __s, 
+integer_cst 64: __s, 
+if_stmt : __s, 
+cleanup_point_expr : __s, 
+call_expr : __s, 
+addr_expr : __s, 
+function_decl eq: __s, 
+pointer_plus_expr : __s, 
+parm_decl __s: __s, 
+pointer_type : __s, 
+integer_type : __s, 
+type_decl char_type: __s, 
+integer_cst 16: __s, 
+integer_cst 0: __s, 
+integer_cst 65535: __s, 
+integer_cst 64: __s, 
+mult_expr : __s, 
+var_decl __i: __s, 
+integer_cst 2: __s, 
+convert_expr : __s, 
+parm_decl __a: __s, 
+reference_type : __s, 
+integer_type : __s, 
+type_decl char_type: __s, 
+integer_cst 16: __s, 
+integer_cst 0: __s, 
+integer_cst 65535: __s, 
+integer_cst 64: __s, 
+return_expr : __s, 
+init_expr : __s, 
+result_decl : __s, 
+pointer_type : __s, 
+integer_type : __s, 
+type_decl char_type: __s, 
+integer_cst 16: __s, 
+integer_cst 0: __s, 
+integer_cst 65535: __s, 
+integer_cst 64: __s, 
+pointer_plus_expr : __s, 
+parm_decl __s: __s, 
+pointer_type : __s, 
+integer_type : __s, 
+type_decl char_type: __s, 
+integer_cst 16: __s, 
+integer_cst 0: __s, 
+integer_cst 65535: __s, 
+integer_cst 64: __s, 
+mult_expr : __s, 
+var_decl __i: __s, 
+integer_cst 2: __s, 
+var_decl __i: __s, 
+integer_cst 64: __s, 
+integer_cst 0: __s, 
+integer_type : __s, 
+type_decl size_t: __s, 
+integer_cst 64: __s, 
+integer_cst 0: __s, 
+integer_cst : __s, 
 block : __s, 
-block : __i, __s, 
-var_decl __i: __i, __s, 
+var_decl __i: __s, 
+return_expr : __s, 
+init_expr : __s, 
+result_decl : __s, 
+pointer_type : __s, 
+integer_type : __s, 
+type_decl char_type: __s, 
+integer_cst 16: __s, 
+integer_cst 0: __s, 
+integer_cst 65535: __s, 
+integer_cst 64: __s, 
+integer_cst 0: __s, 
+block : __s, 
+block : __s, 
+var_decl __i: __s, 
 function_decl move: 
 cleanup_point_expr : __s1, __s2, 
 return_expr : __s1, __s2, 
@@ -1607,78 +1607,78 @@ bind_expr : __s,
 statement_list : __s, 
 cleanup_point_expr : __s, 
 decl_expr : __s, 
-var_decl __i: __i, __s, 
-for_stmt : __i, __s, 
-cleanup_point_expr : __i, __s, 
-convert_expr : __i, __s, 
-preincrement_expr : __i, __s, 
-var_decl __i: __i, __s, 
-integer_cst 1: __i, __s, 
-lt_expr : __i, __s, 
-var_decl __i: __i, __s, 
-parm_decl __n: __i, __s, 
-integer_type : __i, __s, 
-type_decl size_t: __i, __s, 
-integer_cst 64: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst : __i, __s, 
-integer_cst 64: __i, __s, 
-cleanup_point_expr : __i, __s, 
-expr_stmt : __i, __s, 
-call_expr : __i, __s, 
-addr_expr : __i, __s, 
-function_decl assign: __i, __s, 
-pointer_plus_expr : __i, __s, 
-parm_decl __s: __i, __s, 
-pointer_type : __i, __s, 
-integer_type : __i, __s, 
-type_decl char_type: __i, __s, 
-integer_cst 16: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst 65535: __i, __s, 
-integer_cst 64: __i, __s, 
-mult_expr : __i, __s, 
-var_decl __i: __i, __s, 
-integer_cst 2: __i, __s, 
-addr_expr : __i, __s, 
-parm_decl __a: __i, __s, 
-integer_type : __i, __s, 
-type_decl int: __i, __s, 
-integer_cst 32: __i, __s, 
-integer_cst -2147483648: __i, __s, 
-integer_cst 2147483647: __i, __s, 
-integer_cst 16: __i, __s, 
 var_decl __i: __s, 
-integer_cst 64: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_type : __i, __s, 
-type_decl size_t: __i, __s, 
-integer_cst 64: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst : __i, __s, 
-block : __i, __s, 
-var_decl __i: __i, __s, 
-return_expr : __i, __s, 
-init_expr : __i, __s, 
-result_decl : __i, __s, 
-pointer_type : __i, __s, 
-integer_type : __i, __s, 
-type_decl char_type: __i, __s, 
-integer_cst 16: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst 65535: __i, __s, 
-integer_cst 64: __i, __s, 
-parm_decl __s: __i, __s, 
-pointer_type : __i, __s, 
-integer_type : __i, __s, 
-type_decl char_type: __i, __s, 
-integer_cst 16: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst 65535: __i, __s, 
-integer_cst 64: __i, __s, 
+for_stmt : __s, 
+cleanup_point_expr : __s, 
+convert_expr : __s, 
+preincrement_expr : __s, 
+var_decl __i: __s, 
+integer_cst 1: __s, 
+lt_expr : __s, 
+var_decl __i: __s, 
+parm_decl __n: __s, 
+integer_type : __s, 
+type_decl size_t: __s, 
+integer_cst 64: __s, 
+integer_cst 0: __s, 
+integer_cst : __s, 
+integer_cst 64: __s, 
+cleanup_point_expr : __s, 
+expr_stmt : __s, 
+call_expr : __s, 
+addr_expr : __s, 
+function_decl assign: __s, 
+pointer_plus_expr : __s, 
+parm_decl __s: __s, 
+pointer_type : __s, 
+integer_type : __s, 
+type_decl char_type: __s, 
+integer_cst 16: __s, 
+integer_cst 0: __s, 
+integer_cst 65535: __s, 
+integer_cst 64: __s, 
+mult_expr : __s, 
+var_decl __i: __s, 
+integer_cst 2: __s, 
+addr_expr : __s, 
+parm_decl __a: __s, 
+integer_type : __s, 
+type_decl int: __s, 
+integer_cst 32: __s, 
+integer_cst -2147483648: __s, 
+integer_cst 2147483647: __s, 
+integer_cst 16: __s, 
+var_decl __i: __s, 
+integer_cst 64: __s, 
+integer_cst 0: __s, 
+integer_type : __s, 
+type_decl size_t: __s, 
+integer_cst 64: __s, 
+integer_cst 0: __s, 
+integer_cst : __s, 
 block : __s, 
-block : __i, __s, 
-var_decl __i: __i, __s, 
+var_decl __i: __s, 
+return_expr : __s, 
+init_expr : __s, 
+result_decl : __s, 
+pointer_type : __s, 
+integer_type : __s, 
+type_decl char_type: __s, 
+integer_cst 16: __s, 
+integer_cst 0: __s, 
+integer_cst 65535: __s, 
+integer_cst 64: __s, 
+parm_decl __s: __s, 
+pointer_type : __s, 
+integer_type : __s, 
+type_decl char_type: __s, 
+integer_cst 16: __s, 
+integer_cst 0: __s, 
+integer_cst 65535: __s, 
+integer_cst 64: __s, 
+block : __s, 
+block : __s, 
+var_decl __i: __s, 
 function_decl to_char_type: 
 must_not_throw_expr : 
 return_expr : 
@@ -1890,210 +1890,210 @@ bind_expr : __s1, __s2,
 statement_list : __s1, __s2, 
 cleanup_point_expr : __s1, __s2, 
 decl_expr : __s1, __s2, 
-var_decl __i: __i, __s1, __s2, 
-for_stmt : __i, __s1, __s2, 
-cleanup_point_expr : __i, __s1, __s2, 
-convert_expr : __i, __s1, __s2, 
-preincrement_expr : __i, __s1, __s2, 
-var_decl __i: __i, __s1, __s2, 
-integer_cst 1: __i, __s1, __s2, 
-lt_expr : __i, __s1, __s2, 
-var_decl __i: __i, __s1, __s2, 
-parm_decl __n: __i, __s1, __s2, 
-integer_type : __i, __s1, __s2, 
-type_decl size_t: __i, __s1, __s2, 
-integer_cst 64: __i, __s1, __s2, 
-integer_cst 0: __i, __s1, __s2, 
-integer_cst : __i, __s1, __s2, 
-integer_cst 64: __i, __s1, __s2, 
-if_stmt : __i, __s1, __s2, 
-cleanup_point_expr : __i, __s1, __s2, 
-call_expr : __i, __s1, __s2, 
-addr_expr : __i, __s1, __s2, 
-function_decl lt: __i, __s1, __s2, 
-pointer_plus_expr : __i, __s1, __s2, 
-parm_decl __s1: __i, __s1, __s2, 
-pointer_type : __i, __s1, __s2, 
-integer_type : __i, __s1, __s2, 
-type_decl char_type: __i, __s1, __s2, 
-integer_cst 32: __i, __s1, __s2, 
-integer_cst 0: __i, __s1, __s2, 
-integer_cst 4294967295: __i, __s1, __s2, 
-integer_cst 64: __i, __s1, __s2, 
-mult_expr : __i, __s1, __s2, 
-var_decl __i: __i, __s1, __s2, 
-integer_cst 4: __i, __s1, __s2, 
-pointer_plus_expr : __i, __s1, __s2, 
-parm_decl __s2: __i, __s1, __s2, 
-pointer_type : __i, __s1, __s2, 
-integer_type : __i, __s1, __s2, 
-type_decl char_type: __i, __s1, __s2, 
-integer_cst 32: __i, __s1, __s2, 
-integer_cst 0: __i, __s1, __s2, 
-integer_cst 4294967295: __i, __s1, __s2, 
-integer_cst 64: __i, __s1, __s2, 
-mult_expr : __i, __s1, __s2, 
-var_decl __i: __i, __s1, __s2, 
-integer_cst 4: __i, __s1, __s2, 
-return_expr : __i, __s1, __s2, 
-init_expr : __i, __s1, __s2, 
-result_decl : __i, __s1, __s2, 
-integer_type : __i, __s1, __s2, 
-type_decl int: __i, __s1, __s2, 
-integer_cst 32: __i, __s1, __s2, 
-integer_cst -2147483648: __i, __s1, __s2, 
-integer_cst 2147483647: __i, __s1, __s2, 
-integer_cst 32: __i, __s1, __s2, 
-integer_cst -1: __i, __s1, __s2, 
-if_stmt : __i, __s1, __s2, 
-cleanup_point_expr : __i, __s1, __s2, 
-call_expr : __i, __s1, __s2, 
-addr_expr : __i, __s1, __s2, 
-function_decl lt: __i, __s1, __s2, 
-pointer_plus_expr : __i, __s1, __s2, 
-parm_decl __s2: __i, __s1, __s2, 
-pointer_type : __i, __s1, __s2, 
-integer_type : __i, __s1, __s2, 
-type_decl char_type: __i, __s1, __s2, 
-integer_cst 32: __i, __s1, __s2, 
-integer_cst 0: __i, __s1, __s2, 
-integer_cst 4294967295: __i, __s1, __s2, 
-integer_cst 64: __i, __s1, __s2, 
-mult_expr : __i, __s1, __s2, 
-var_decl __i: __i, __s1, __s2, 
-integer_cst 4: __i, __s1, __s2, 
-pointer_plus_expr : __i, __s1, __s2, 
-parm_decl __s1: __i, __s1, __s2, 
-pointer_type : __i, __s1, __s2, 
-integer_type : __i, __s1, __s2, 
-type_decl char_type: __i, __s1, __s2, 
-integer_cst 32: __i, __s1, __s2, 
-integer_cst 0: __i, __s1, __s2, 
-integer_cst 4294967295: __i, __s1, __s2, 
-integer_cst 64: __i, __s1, __s2, 
-mult_expr : __i, __s1, __s2, 
-var_decl __i: __i, __s1, __s2, 
-integer_cst 4: __i, __s1, __s2, 
-return_expr : __i, __s1, __s2, 
-init_expr : __i, __s1, __s2, 
-result_decl : __i, __s1, __s2, 
-integer_type : __i, __s1, __s2, 
-type_decl int: __i, __s1, __s2, 
-integer_cst 32: __i, __s1, __s2, 
-integer_cst -2147483648: __i, __s1, __s2, 
-integer_cst 2147483647: __i, __s1, __s2, 
-integer_cst 32: __i, __s1, __s2, 
-integer_cst 1: __i, __s1, __s2, 
 var_decl __i: __s1, __s2, 
-integer_cst 64: __i, __s1, __s2, 
-integer_cst 0: __i, __s1, __s2, 
-integer_type : __i, __s1, __s2, 
-type_decl size_t: __i, __s1, __s2, 
-integer_cst 64: __i, __s1, __s2, 
-integer_cst 0: __i, __s1, __s2, 
-integer_cst : __i, __s1, __s2, 
-block : __i, __s1, __s2, 
-var_decl __i: __i, __s1, __s2, 
-return_expr : __i, __s1, __s2, 
-init_expr : __i, __s1, __s2, 
-result_decl : __i, __s1, __s2, 
-integer_type : __i, __s1, __s2, 
-type_decl int: __i, __s1, __s2, 
-integer_cst 32: __i, __s1, __s2, 
-integer_cst -2147483648: __i, __s1, __s2, 
-integer_cst 2147483647: __i, __s1, __s2, 
-integer_cst 32: __i, __s1, __s2, 
-integer_cst 0: __i, __s1, __s2, 
+for_stmt : __s1, __s2, 
+cleanup_point_expr : __s1, __s2, 
+convert_expr : __s1, __s2, 
+preincrement_expr : __s1, __s2, 
+var_decl __i: __s1, __s2, 
+integer_cst 1: __s1, __s2, 
+lt_expr : __s1, __s2, 
+var_decl __i: __s1, __s2, 
+parm_decl __n: __s1, __s2, 
+integer_type : __s1, __s2, 
+type_decl size_t: __s1, __s2, 
+integer_cst 64: __s1, __s2, 
+integer_cst 0: __s1, __s2, 
+integer_cst : __s1, __s2, 
+integer_cst 64: __s1, __s2, 
+if_stmt : __s1, __s2, 
+cleanup_point_expr : __s1, __s2, 
+call_expr : __s1, __s2, 
+addr_expr : __s1, __s2, 
+function_decl lt: __s1, __s2, 
+pointer_plus_expr : __s1, __s2, 
+parm_decl __s1: __s1, __s2, 
+pointer_type : __s1, __s2, 
+integer_type : __s1, __s2, 
+type_decl char_type: __s1, __s2, 
+integer_cst 32: __s1, __s2, 
+integer_cst 0: __s1, __s2, 
+integer_cst 4294967295: __s1, __s2, 
+integer_cst 64: __s1, __s2, 
+mult_expr : __s1, __s2, 
+var_decl __i: __s1, __s2, 
+integer_cst 4: __s1, __s2, 
+pointer_plus_expr : __s1, __s2, 
+parm_decl __s2: __s1, __s2, 
+pointer_type : __s1, __s2, 
+integer_type : __s1, __s2, 
+type_decl char_type: __s1, __s2, 
+integer_cst 32: __s1, __s2, 
+integer_cst 0: __s1, __s2, 
+integer_cst 4294967295: __s1, __s2, 
+integer_cst 64: __s1, __s2, 
+mult_expr : __s1, __s2, 
+var_decl __i: __s1, __s2, 
+integer_cst 4: __s1, __s2, 
+return_expr : __s1, __s2, 
+init_expr : __s1, __s2, 
+result_decl : __s1, __s2, 
+integer_type : __s1, __s2, 
+type_decl int: __s1, __s2, 
+integer_cst 32: __s1, __s2, 
+integer_cst -2147483648: __s1, __s2, 
+integer_cst 2147483647: __s1, __s2, 
+integer_cst 32: __s1, __s2, 
+integer_cst -1: __s1, __s2, 
+if_stmt : __s1, __s2, 
+cleanup_point_expr : __s1, __s2, 
+call_expr : __s1, __s2, 
+addr_expr : __s1, __s2, 
+function_decl lt: __s1, __s2, 
+pointer_plus_expr : __s1, __s2, 
+parm_decl __s2: __s1, __s2, 
+pointer_type : __s1, __s2, 
+integer_type : __s1, __s2, 
+type_decl char_type: __s1, __s2, 
+integer_cst 32: __s1, __s2, 
+integer_cst 0: __s1, __s2, 
+integer_cst 4294967295: __s1, __s2, 
+integer_cst 64: __s1, __s2, 
+mult_expr : __s1, __s2, 
+var_decl __i: __s1, __s2, 
+integer_cst 4: __s1, __s2, 
+pointer_plus_expr : __s1, __s2, 
+parm_decl __s1: __s1, __s2, 
+pointer_type : __s1, __s2, 
+integer_type : __s1, __s2, 
+type_decl char_type: __s1, __s2, 
+integer_cst 32: __s1, __s2, 
+integer_cst 0: __s1, __s2, 
+integer_cst 4294967295: __s1, __s2, 
+integer_cst 64: __s1, __s2, 
+mult_expr : __s1, __s2, 
+var_decl __i: __s1, __s2, 
+integer_cst 4: __s1, __s2, 
+return_expr : __s1, __s2, 
+init_expr : __s1, __s2, 
+result_decl : __s1, __s2, 
+integer_type : __s1, __s2, 
+type_decl int: __s1, __s2, 
+integer_cst 32: __s1, __s2, 
+integer_cst -2147483648: __s1, __s2, 
+integer_cst 2147483647: __s1, __s2, 
+integer_cst 32: __s1, __s2, 
+integer_cst 1: __s1, __s2, 
+var_decl __i: __s1, __s2, 
+integer_cst 64: __s1, __s2, 
+integer_cst 0: __s1, __s2, 
+integer_type : __s1, __s2, 
+type_decl size_t: __s1, __s2, 
+integer_cst 64: __s1, __s2, 
+integer_cst 0: __s1, __s2, 
+integer_cst : __s1, __s2, 
+block : __s1, __s2, 
+var_decl __i: __s1, __s2, 
+return_expr : __s1, __s2, 
+init_expr : __s1, __s2, 
+result_decl : __s1, __s2, 
+integer_type : __s1, __s2, 
+type_decl int: __s1, __s2, 
+integer_cst 32: __s1, __s2, 
+integer_cst -2147483648: __s1, __s2, 
+integer_cst 2147483647: __s1, __s2, 
+integer_cst 32: __s1, __s2, 
+integer_cst 0: __s1, __s2, 
+block : __s1, __s2, 
 block : __s1, __s2, 
-block : __i, __s1, __s2, 
-var_decl __i: __i, __s1, __s2, 
+var_decl __i: __s1, __s2, 
 function_decl length: 
 bind_expr : __s, 
 statement_list : __s, 
 cleanup_point_expr : __s, 
 decl_expr : __s, 
-var_decl __i: __i, __s, 
-while_stmt : __i, __s, 
-cleanup_point_expr : __i, __s, 
-truth_not_expr : __i, __s, 
-call_expr : __i, __s, 
-addr_expr : __i, __s, 
-function_decl eq: __i, __s, 
-pointer_plus_expr : __i, __s, 
-parm_decl __s: __i, __s, 
-pointer_type : __i, __s, 
-integer_type : __i, __s, 
-type_decl char_type: __i, __s, 
-integer_cst 32: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst 4294967295: __i, __s, 
-integer_cst 64: __i, __s, 
-mult_expr : __i, __s, 
-var_decl __i: __i, __s, 
-integer_cst 4: __i, __s, 
-addr_expr : __i, __s, 
-target_expr : __i, __s, 
-var_decl : __i, __s, 
-integer_cst 32: __i, __s, 
-integer_type : __i, __s, 
-type_decl char_type: __i, __s, 
-integer_cst 32: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst 4294967295: __i, __s, 
-integer_cst 0: __i, __s, 
-cleanup_point_expr : __i, __s, 
-expr_stmt : __i, __s, 
-convert_expr : __i, __s, 
-preincrement_expr : __i, __s, 
-var_decl __i: __i, __s, 
-integer_cst 1: __i, __s, 
-cleanup_point_expr : __i, __s, 
-truth_not_expr : __i, __s, 
-call_expr : __i, __s, 
-addr_expr : __i, __s, 
-function_decl eq: __i, __s, 
-pointer_plus_expr : __i, __s, 
-parm_decl __s: __i, __s, 
-pointer_type : __i, __s, 
-integer_type : __i, __s, 
-type_decl char_type: __i, __s, 
-integer_cst 32: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst 4294967295: __i, __s, 
-integer_cst 64: __i, __s, 
-mult_expr : __i, __s, 
-var_decl __i: __i, __s, 
-integer_cst 4: __i, __s, 
-addr_expr : __i, __s, 
-target_expr : __i, __s, 
-var_decl : __i, __s, 
-integer_cst 32: __i, __s, 
-integer_type : __i, __s, 
-type_decl char_type: __i, __s, 
-integer_cst 32: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst 4294967295: __i, __s, 
-integer_cst 0: __i, __s, 
-return_expr : __i, __s, 
-init_expr : __i, __s, 
-result_decl : __i, __s, 
-integer_type : __i, __s, 
-type_decl size_t: __i, __s, 
-integer_cst 64: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst : __i, __s, 
-integer_cst 64: __i, __s, 
-var_decl __i: __i, __s, 
 var_decl __i: __s, 
-integer_cst 64: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_type : __i, __s, 
-type_decl size_t: __i, __s, 
-integer_cst 64: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst : __i, __s, 
-block : __i, __s, 
-var_decl __i: __i, __s, 
+while_stmt : __s, 
+cleanup_point_expr : __s, 
+truth_not_expr : __s, 
+call_expr : __s, 
+addr_expr : __s, 
+function_decl eq: __s, 
+pointer_plus_expr : __s, 
+parm_decl __s: __s, 
+pointer_type : __s, 
+integer_type : __s, 
+type_decl char_type: __s, 
+integer_cst 32: __s, 
+integer_cst 0: __s, 
+integer_cst 4294967295: __s, 
+integer_cst 64: __s, 
+mult_expr : __s, 
+var_decl __i: __s, 
+integer_cst 4: __s, 
+addr_expr : __s, 
+target_expr : __s, 
+var_decl : __s, 
+integer_cst 32: __s, 
+integer_type : __s, 
+type_decl char_type: __s, 
+integer_cst 32: __s, 
+integer_cst 0: __s, 
+integer_cst 4294967295: __s, 
+integer_cst 0: __s, 
+cleanup_point_expr : __s, 
+expr_stmt : __s, 
+convert_expr : __s, 
+preincrement_expr : __s, 
+var_decl __i: __s, 
+integer_cst 1: __s, 
+cleanup_point_expr : __s, 
+truth_not_expr : __s, 
+call_expr : __s, 
+addr_expr : __s, 
+function_decl eq: __s, 
+pointer_plus_expr : __s, 
+parm_decl __s: __s, 
+pointer_type : __s, 
+integer_type : __s, 
+type_decl char_type: __s, 
+integer_cst 32: __s, 
+integer_cst 0: __s, 
+integer_cst 4294967295: __s, 
+integer_cst 64: __s, 
+mult_expr : __s, 
+var_decl __i: __s, 
+integer_cst 4: __s, 
+addr_expr : __s, 
+target_expr : __s, 
+var_decl : __s, 
+integer_cst 32: __s, 
+integer_type : __s, 
+type_decl char_type: __s, 
+integer_cst 32: __s, 
+integer_cst 0: __s, 
+integer_cst 4294967295: __s, 
+integer_cst 0: __s, 
+return_expr : __s, 
+init_expr : __s, 
+result_decl : __s, 
+integer_type : __s, 
+type_decl size_t: __s, 
+integer_cst 64: __s, 
+integer_cst 0: __s, 
+integer_cst : __s, 
+integer_cst 64: __s, 
+var_decl __i: __s, 
+var_decl __i: __s, 
+integer_cst 64: __s, 
+integer_cst 0: __s, 
+integer_type : __s, 
+type_decl size_t: __s, 
+integer_cst 64: __s, 
+integer_cst 0: __s, 
+integer_cst : __s, 
+block : __s, 
+var_decl __i: __s, 
 function_decl find: 
 bind_expr : __s, 
 statement_list : __s, 
@@ -2101,94 +2101,94 @@ bind_expr : __s,
 statement_list : __s, 
 cleanup_point_expr : __s, 
 decl_expr : __s, 
-var_decl __i: __i, __s, 
-for_stmt : __i, __s, 
-cleanup_point_expr : __i, __s, 
-convert_expr : __i, __s, 
-preincrement_expr : __i, __s, 
-var_decl __i: __i, __s, 
-integer_cst 1: __i, __s, 
-lt_expr : __i, __s, 
-var_decl __i: __i, __s, 
-parm_decl __n: __i, __s, 
-integer_type : __i, __s, 
-type_decl size_t: __i, __s, 
-integer_cst 64: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst : __i, __s, 
-integer_cst 64: __i, __s, 
-if_stmt : __i, __s, 
-cleanup_point_expr : __i, __s, 
-call_expr : __i, __s, 
-addr_expr : __i, __s, 
-function_decl eq: __i, __s, 
-pointer_plus_expr : __i, __s, 
-parm_decl __s: __i, __s, 
-pointer_type : __i, __s, 
-integer_type : __i, __s, 
-type_decl char_type: __i, __s, 
-integer_cst 32: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst 4294967295: __i, __s, 
-integer_cst 64: __i, __s, 
-mult_expr : __i, __s, 
-var_decl __i: __i, __s, 
-integer_cst 4: __i, __s, 
-convert_expr : __i, __s, 
-parm_decl __a: __i, __s, 
-reference_type : __i, __s, 
-integer_type : __i, __s, 
-type_decl char_type: __i, __s, 
-integer_cst 32: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst 4294967295: __i, __s, 
-integer_cst 64: __i, __s, 
-return_expr : __i, __s, 
-init_expr : __i, __s, 
-result_decl : __i, __s, 
-pointer_type : __i, __s, 
-integer_type : __i, __s, 
-type_decl char_type: __i, __s, 
-integer_cst 32: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst 4294967295: __i, __s, 
-integer_cst 64: __i, __s, 
-pointer_plus_expr : __i, __s, 
-parm_decl __s: __i, __s, 
-pointer_type : __i, __s, 
-integer_type : __i, __s, 
-type_decl char_type: __i, __s, 
-integer_cst 32: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst 4294967295: __i, __s, 
-integer_cst 64: __i, __s, 
-mult_expr : __i, __s, 
-var_decl __i: __i, __s, 
-integer_cst 4: __i, __s, 
 var_decl __i: __s, 
-integer_cst 64: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_type : __i, __s, 
-type_decl size_t: __i, __s, 
-integer_cst 64: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst : __i, __s, 
-block : __i, __s, 
-var_decl __i: __i, __s, 
-return_expr : __i, __s, 
-init_expr : __i, __s, 
-result_decl : __i, __s, 
-pointer_type : __i, __s, 
-integer_type : __i, __s, 
-type_decl char_type: __i, __s, 
-integer_cst 32: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst 4294967295: __i, __s, 
-integer_cst 64: __i, __s, 
-integer_cst 0: __i, __s, 
+for_stmt : __s, 
+cleanup_point_expr : __s, 
+convert_expr : __s, 
+preincrement_expr : __s, 
+var_decl __i: __s, 
+integer_cst 1: __s, 
+lt_expr : __s, 
+var_decl __i: __s, 
+parm_decl __n: __s, 
+integer_type : __s, 
+type_decl size_t: __s, 
+integer_cst 64: __s, 
+integer_cst 0: __s, 
+integer_cst : __s, 
+integer_cst 64: __s, 
+if_stmt : __s, 
+cleanup_point_expr : __s, 
+call_expr : __s, 
+addr_expr : __s, 
+function_decl eq: __s, 
+pointer_plus_expr : __s, 
+parm_decl __s: __s, 
+pointer_type : __s, 
+integer_type : __s, 
+type_decl char_type: __s, 
+integer_cst 32: __s, 
+integer_cst 0: __s, 
+integer_cst 4294967295: __s, 
+integer_cst 64: __s, 
+mult_expr : __s, 
+var_decl __i: __s, 
+integer_cst 4: __s, 
+convert_expr : __s, 
+parm_decl __a: __s, 
+reference_type : __s, 
+integer_type : __s, 
+type_decl char_type: __s, 
+integer_cst 32: __s, 
+integer_cst 0: __s, 
+integer_cst 4294967295: __s, 
+integer_cst 64: __s, 
+return_expr : __s, 
+init_expr : __s, 
+result_decl : __s, 
+pointer_type : __s, 
+integer_type : __s, 
+type_decl char_type: __s, 
+integer_cst 32: __s, 
+integer_cst 0: __s, 
+integer_cst 4294967295: __s, 
+integer_cst 64: __s, 
+pointer_plus_expr : __s, 
+parm_decl __s: __s, 
+pointer_type : __s, 
+integer_type : __s, 
+type_decl char_type: __s, 
+integer_cst 32: __s, 
+integer_cst 0: __s, 
+integer_cst 4294967295: __s, 
+integer_cst 64: __s, 
+mult_expr : __s, 
+var_decl __i: __s, 
+integer_cst 4: __s, 
+var_decl __i: __s, 
+integer_cst 64: __s, 
+integer_cst 0: __s, 
+integer_type : __s, 
+type_decl size_t: __s, 
+integer_cst 64: __s, 
+integer_cst 0: __s, 
+integer_cst : __s, 
 block : __s, 
-block : __i, __s, 
-var_decl __i: __i, __s, 
+var_decl __i: __s, 
+return_expr : __s, 
+init_expr : __s, 
+result_decl : __s, 
+pointer_type : __s, 
+integer_type : __s, 
+type_decl char_type: __s, 
+integer_cst 32: __s, 
+integer_cst 0: __s, 
+integer_cst 4294967295: __s, 
+integer_cst 64: __s, 
+integer_cst 0: __s, 
+block : __s, 
+block : __s, 
+var_decl __i: __s, 
 function_decl move: 
 cleanup_point_expr : __s1, __s2, 
 return_expr : __s1, __s2, 
@@ -2278,78 +2278,78 @@ bind_expr : __s,
 statement_list : __s, 
 cleanup_point_expr : __s, 
 decl_expr : __s, 
-var_decl __i: __i, __s, 
-for_stmt : __i, __s, 
-cleanup_point_expr : __i, __s, 
-convert_expr : __i, __s, 
-preincrement_expr : __i, __s, 
-var_decl __i: __i, __s, 
-integer_cst 1: __i, __s, 
-lt_expr : __i, __s, 
-var_decl __i: __i, __s, 
-parm_decl __n: __i, __s, 
-integer_type : __i, __s, 
-type_decl size_t: __i, __s, 
-integer_cst 64: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst : __i, __s, 
-integer_cst 64: __i, __s, 
-cleanup_point_expr : __i, __s, 
-expr_stmt : __i, __s, 
-call_expr : __i, __s, 
-addr_expr : __i, __s, 
-function_decl assign: __i, __s, 
-pointer_plus_expr : __i, __s, 
-parm_decl __s: __i, __s, 
-pointer_type : __i, __s, 
-integer_type : __i, __s, 
-type_decl char_type: __i, __s, 
-integer_cst 32: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst 4294967295: __i, __s, 
-integer_cst 64: __i, __s, 
-mult_expr : __i, __s, 
-var_decl __i: __i, __s, 
-integer_cst 4: __i, __s, 
-addr_expr : __i, __s, 
-parm_decl __a: __i, __s, 
-integer_type : __i, __s, 
-type_decl char_type: __i, __s, 
-integer_cst 32: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst 4294967295: __i, __s, 
-integer_cst 32: __i, __s, 
 var_decl __i: __s, 
-integer_cst 64: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_type : __i, __s, 
-type_decl size_t: __i, __s, 
-integer_cst 64: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst : __i, __s, 
-block : __i, __s, 
-var_decl __i: __i, __s, 
-return_expr : __i, __s, 
-init_expr : __i, __s, 
-result_decl : __i, __s, 
-pointer_type : __i, __s, 
-integer_type : __i, __s, 
-type_decl char_type: __i, __s, 
-integer_cst 32: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst 4294967295: __i, __s, 
-integer_cst 64: __i, __s, 
-parm_decl __s: __i, __s, 
-pointer_type : __i, __s, 
-integer_type : __i, __s, 
-type_decl char_type: __i, __s, 
-integer_cst 32: __i, __s, 
-integer_cst 0: __i, __s, 
-integer_cst 4294967295: __i, __s, 
-integer_cst 64: __i, __s, 
+for_stmt : __s, 
+cleanup_point_expr : __s, 
+convert_expr : __s, 
+preincrement_expr : __s, 
+var_decl __i: __s, 
+integer_cst 1: __s, 
+lt_expr : __s, 
+var_decl __i: __s, 
+parm_decl __n: __s, 
+integer_type : __s, 
+type_decl size_t: __s, 
+integer_cst 64: __s, 
+integer_cst 0: __s, 
+integer_cst : __s, 
+integer_cst 64: __s, 
+cleanup_point_expr : __s, 
+expr_stmt : __s, 
+call_expr : __s, 
+addr_expr : __s, 
+function_decl assign: __s, 
+pointer_plus_expr : __s, 
+parm_decl __s: __s, 
+pointer_type : __s, 
+integer_type : __s, 
+type_decl char_type: __s, 
+integer_cst 32: __s, 
+integer_cst 0: __s, 
+integer_cst 4294967295: __s, 
+integer_cst 64: __s, 
+mult_expr : __s, 
+var_decl __i: __s, 
+integer_cst 4: __s, 
+addr_expr : __s, 
+parm_decl __a: __s, 
+integer_type : __s, 
+type_decl char_type: __s, 
+integer_cst 32: __s, 
+integer_cst 0: __s, 
+integer_cst 4294967295: __s, 
+integer_cst 32: __s, 
+var_decl __i: __s, 
+integer_cst 64: __s, 
+integer_cst 0: __s, 
+integer_type : __s, 
+type_decl size_t: __s, 
+integer_cst 64: __s, 
+integer_cst 0: __s, 
+integer_cst : __s, 
 block : __s, 
-block : __i, __s, 
-var_decl __i: __i, __s, 
+var_decl __i: __s, 
+return_expr : __s, 
+init_expr : __s, 
+result_decl : __s, 
+pointer_type : __s, 
+integer_type : __s, 
+type_decl char_type: __s, 
+integer_cst 32: __s, 
+integer_cst 0: __s, 
+integer_cst 4294967295: __s, 
+integer_cst 64: __s, 
+parm_decl __s: __s, 
+pointer_type : __s, 
+integer_type : __s, 
+type_decl char_type: __s, 
+integer_cst 32: __s, 
+integer_cst 0: __s, 
+integer_cst 4294967295: __s, 
+integer_cst 64: __s, 
+block : __s, 
+block : __s, 
+var_decl __i: __s, 
 function_decl to_char_type: 
 must_not_throw_expr : 
 return_expr : 
diff --git a/test/test38-01.txt b/test/test38-01.txt
index ee9bad5..557b3f2 100644
--- a/test/test38-01.txt
+++ b/test/test38-01.txt
@@ -10040,3 +10040,338 @@ function_decl func5 test38.cpp 398:10
   block - operand
    var_decl ptr1 test38.cpp 400:16 - block vars
    - isUsed: 1
+function_decl func6 test38.cpp 528:10
+- isPublic: 1
+ method_type - function type
+  void_type - method return type
+   type_decl void <built-in> 0:0 - type name
+   - isAutogenerated: 1
+  record_type - method base type
+   type_decl Object1 test38.cpp 22:7 - type name
+   - isAutogenerated: 1
+   field_decl tmp1 test38.cpp 24:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   field_decl tmp2 test38.cpp 25:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   type_decl Object1 test38.cpp 23:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Object1 test38.cpp 22:7 - type name
+     - isAutogenerated: 1
+     field_decl tmp1 test38.cpp 24:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     field_decl tmp2 test38.cpp 25:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Object1 test38.cpp 23:1 - field
+     - isAutogenerated: 1
+   tree_list - chain
+    pointer_type - value
+     record_type - nested type
+      type_decl Data1 test38.cpp 3:8 - type name
+      - isAutogenerated: 1
+      field_decl val test38.cpp 5:9 - field
+      - signed
+       integer_cst 32 - decl size
+      field_decl ptrval test38.cpp 6:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      field_decl arr test38.cpp 7:14 - field
+      - signed
+       integer_cst 96 - decl size
+      type_decl Data1 test38.cpp 4:1 - field
+      - isAutogenerated: 1
+    tree_list - chain
+     void_type - value
+      type_decl void <built-in> 0:0 - type name
+      - isAutogenerated: 1
+ result_decl test38.cpp 529:5 - function result
+ - isAutogenerated: 1
+  void_type - result type
+   type_decl void <built-in> 0:0 - type name
+   - isAutogenerated: 1
+ parm_decl this test38.cpp 528:27 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Object1 test38.cpp 22:7 - type name
+    - isAutogenerated: 1
+    field_decl tmp1 test38.cpp 24:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl tmp2 test38.cpp 25:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Object1 test38.cpp 23:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ parm_decl ptr1 test38.cpp 528:23 - argument
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data1 test38.cpp 3:8 - type name
+    - isAutogenerated: 1
+    field_decl val test38.cpp 5:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test38.cpp 6:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl arr test38.cpp 7:14 - field
+    - signed
+     integer_cst 96 - decl size
+    type_decl Data1 test38.cpp 4:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ bind_expr test38.cpp 541:71 - code
+  var_decl start test38.cpp 530:23 - operand
+   integer_cst 64 - decl size
+   integer_cst 0 - initial
+   integer_type - var type
+   - precisionBits: 64
+   - unsigned
+    type_decl long unsigned int <built-in> 0:0 - type name
+    - isAutogenerated: 1
+    integer_cst 64 - type size
+    integer_cst 0 - min value
+  statement_list - operand
+   cleanup_point_expr test38.cpp 530:31 - statement
+    decl_expr test38.cpp 530:31 - operand
+     var_decl start test38.cpp 530:23 - operand
+   cleanup_point_expr test38.cpp 531:57 - statement
+    expr_stmt test38.cpp 531:57 - operand
+     call_expr test38.cpp 531:31 - expresssion
+      addr_expr - function
+       function_decl paranuckerInternalTest test38.cpp 20:6 - operand
+       - isExternal: 1
+       - isPublic: 1
+        function_type - function type
+         void_type - function return type
+      nop_expr - arg
+       addr_expr - operand
+        string_cst = - operand
+        - stringLength: 2
+      nop_expr - arg
+       addr_expr - operand
+        string_cst knownVars - operand
+        - stringLength: 10
+      nop_expr - arg
+       addr_expr - operand
+        string_cst ptr1 - operand
+        - stringLength: 5
+   cleanup_point_expr test38.cpp 532:60 - statement
+    expr_stmt test38.cpp 532:60 - operand
+     call_expr test38.cpp 532:31 - expresssion
+      addr_expr - function
+       function_decl paranuckerInternalTest test38.cpp 20:6 - operand
+       - isExternal: 1
+       - isPublic: 1
+        function_type - function type
+         void_type - function return type
+      nop_expr - arg
+       addr_expr - operand
+        string_cst = - operand
+        - stringLength: 2
+      nop_expr - arg
+       addr_expr - operand
+        string_cst knownNonNullVars - operand
+        - stringLength: 17
+      nop_expr - arg
+       addr_expr - operand
+        string_cst - operand
+        - stringLength: 1
+   cleanup_point_expr test38.cpp 533:57 - statement
+    expr_stmt test38.cpp 533:57 - operand
+     call_expr test38.cpp 533:31 - expresssion
+      addr_expr - function
+       function_decl paranuckerInternalTest test38.cpp 20:6 - operand
+       - isExternal: 1
+       - isPublic: 1
+        function_type - function type
+         void_type - function return type
+      nop_expr - arg
+       addr_expr - operand
+        string_cst = - operand
+        - stringLength: 2
+      nop_expr - arg
+       addr_expr - operand
+        string_cst knownNullVars - operand
+        - stringLength: 14
+      nop_expr - arg
+       addr_expr - operand
+        string_cst - operand
+        - stringLength: 1
+   cleanup_point_expr test38.cpp 534:65 - statement
+    expr_stmt test38.cpp 534:65 - operand
+     call_expr test38.cpp 534:31 - expresssion
+      addr_expr - function
+       function_decl paranuckerInternalTest test38.cpp 20:6 - operand
+       - isExternal: 1
+       - isPublic: 1
+        function_type - function type
+         void_type - function return type
+      nop_expr - arg
+       addr_expr - operand
+        string_cst = - operand
+        - stringLength: 2
+      nop_expr - arg
+       addr_expr - operand
+        string_cst needCheckNullVars - operand
+        - stringLength: 18
+      nop_expr - arg
+       addr_expr - operand
+        string_cst ptr1 - operand
+        - stringLength: 5
+   cleanup_point_expr test38.cpp 535:55 - statement
+    expr_stmt test38.cpp 535:55 - operand
+     call_expr test38.cpp 535:31 - expresssion
+      addr_expr - function
+       function_decl paranuckerInternalTest test38.cpp 20:6 - operand
+       - isExternal: 1
+       - isPublic: 1
+        function_type - function type
+         void_type - function return type
+      nop_expr - arg
+       addr_expr - operand
+        string_cst = - operand
+        - stringLength: 2
+      nop_expr - arg
+       addr_expr - operand
+        string_cst addNullVars - operand
+        - stringLength: 12
+      nop_expr - arg
+       addr_expr - operand
+        string_cst - operand
+        - stringLength: 1
+   cleanup_point_expr test38.cpp 536:58 - statement
+    expr_stmt test38.cpp 536:58 - operand
+     call_expr test38.cpp 536:31 - expresssion
+      addr_expr - function
+       function_decl paranuckerInternalTest test38.cpp 20:6 - operand
+       - isExternal: 1
+       - isPublic: 1
+        function_type - function type
+         void_type - function return type
+      nop_expr - arg
+       addr_expr - operand
+        string_cst = - operand
+        - stringLength: 2
+      nop_expr - arg
+       addr_expr - operand
+        string_cst removeNullVars - operand
+        - stringLength: 15
+      nop_expr - arg
+       addr_expr - operand
+        string_cst - operand
+        - stringLength: 1
+   cleanup_point_expr test38.cpp 537:61 - statement
+    expr_stmt test38.cpp 537:61 - operand
+     call_expr test38.cpp 537:31 - expresssion
+      addr_expr - function
+       function_decl paranuckerInternalTest test38.cpp 20:6 - operand
+       - isExternal: 1
+       - isPublic: 1
+        function_type - function type
+         void_type - function return type
+      nop_expr - arg
+       addr_expr - operand
+        string_cst = - operand
+        - stringLength: 2
+      nop_expr - arg
+       addr_expr - operand
+        string_cst removeNullVarsAll - operand
+        - stringLength: 18
+      nop_expr - arg
+       addr_expr - operand
+        string_cst - operand
+        - stringLength: 1
+   cleanup_point_expr test38.cpp 538:58 - statement
+    expr_stmt test38.cpp 538:58 - operand
+     call_expr test38.cpp 538:31 - expresssion
+      addr_expr - function
+       function_decl paranuckerInternalTest test38.cpp 20:6 - operand
+       - isExternal: 1
+       - isPublic: 1
+        function_type - function type
+         void_type - function return type
+      nop_expr - arg
+       addr_expr - operand
+        string_cst = - operand
+        - stringLength: 2
+      nop_expr - arg
+       addr_expr - operand
+        string_cst linkedVars - operand
+        - stringLength: 11
+      nop_expr - arg
+       addr_expr - operand
+        string_cst ptr1 - operand
+        - stringLength: 5
+   cleanup_point_expr test38.cpp 539:64 - statement
+    expr_stmt test38.cpp 539:64 - operand
+     call_expr test38.cpp 539:31 - expresssion
+      addr_expr - function
+       function_decl paranuckerInternalTest test38.cpp 20:6 - operand
+       - isExternal: 1
+       - isPublic: 1
+        function_type - function type
+         void_type - function return type
+      nop_expr - arg
+       addr_expr - operand
+        string_cst = - operand
+        - stringLength: 2
+      nop_expr - arg
+       addr_expr - operand
+        string_cst linkedVars - operand
+        - stringLength: 11
+      nop_expr - arg
+       addr_expr - operand
+        string_cst this->tmp1 - operand
+        - stringLength: 11
+   cleanup_point_expr test38.cpp 540:65 - statement
+    expr_stmt test38.cpp 540:65 - operand
+     call_expr test38.cpp 540:31 - expresssion
+      addr_expr - function
+       function_decl paranuckerInternalTest test38.cpp 20:6 - operand
+       - isExternal: 1
+       - isPublic: 1
+        function_type - function type
+         void_type - function return type
+      nop_expr - arg
+       addr_expr - operand
+        string_cst = - operand
+        - stringLength: 2
+      nop_expr - arg
+       addr_expr - operand
+        string_cst linkedReverseVars - operand
+        - stringLength: 18
+      nop_expr - arg
+       addr_expr - operand
+        string_cst ptr1 - operand
+        - stringLength: 5
+   cleanup_point_expr test38.cpp 541:71 - statement
+    expr_stmt test38.cpp 541:71 - operand
+     call_expr test38.cpp 541:31 - expresssion
+      addr_expr - function
+       function_decl paranuckerInternalTest test38.cpp 20:6 - operand
+       - isExternal: 1
+       - isPublic: 1
+        function_type - function type
+         void_type - function return type
+      nop_expr - arg
+       addr_expr - operand
+        string_cst = - operand
+        - stringLength: 2
+      nop_expr - arg
+       addr_expr - operand
+        string_cst linkedReverseVars - operand
+        - stringLength: 18
+      nop_expr - arg
+       addr_expr - operand
+        string_cst this->tmp1 - operand
+        - stringLength: 11
+  block - operand
+   var_decl start test38.cpp 530:23 - block vars
diff --git a/test/test38-02.txt b/test/test38-02.txt
index 92e7eef..ef7e3f5 100644
--- a/test/test38-02.txt
+++ b/test/test38-02.txt
@@ -6,3 +6,4 @@ func2:
 func3: 
 func4: 
 func5: 
+func6: pointer_type ptr1, 
diff --git a/test/test38-03.txt b/test/test38-03.txt
index 500aced..2e305b0 100644
--- a/test/test38-03.txt
+++ b/test/test38-03.txt
@@ -2584,3 +2584,74 @@ integer_cst 96: ptr1,
 type_decl Data1: ptr1, 
 block : ptr1, 
 var_decl ptr1: ptr1, 
+function_decl func6: 
+bind_expr : ptr1, 
+statement_list : ptr1, 
+cleanup_point_expr : ptr1, 
+decl_expr : ptr1, 
+var_decl start: ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+call_expr : ptr1, 
+addr_expr : ptr1, 
+function_decl paranuckerInternalTest: ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+call_expr : ptr1, 
+addr_expr : ptr1, 
+function_decl paranuckerInternalTest: ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+call_expr : ptr1, 
+addr_expr : ptr1, 
+function_decl paranuckerInternalTest: ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+call_expr : ptr1, 
+addr_expr : ptr1, 
+function_decl paranuckerInternalTest: ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+call_expr : ptr1, 
+addr_expr : ptr1, 
+function_decl paranuckerInternalTest: ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+call_expr : ptr1, 
+addr_expr : ptr1, 
+function_decl paranuckerInternalTest: ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+call_expr : ptr1, 
+addr_expr : ptr1, 
+function_decl paranuckerInternalTest: ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+call_expr : ptr1, 
+addr_expr : ptr1, 
+function_decl paranuckerInternalTest: ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+call_expr : ptr1, 
+addr_expr : ptr1, 
+function_decl paranuckerInternalTest: ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+call_expr : ptr1, 
+addr_expr : ptr1, 
+function_decl paranuckerInternalTest: ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+call_expr : ptr1, 
+addr_expr : ptr1, 
+function_decl paranuckerInternalTest: ptr1, 
+var_decl start: ptr1, 
+integer_cst 64: ptr1, 
+integer_cst 0: ptr1, 
+integer_type : ptr1, 
+type_decl long unsigned int: ptr1, 
+integer_cst 64: ptr1, 
+integer_cst 0: ptr1, 
+integer_cst : ptr1, 
+block : ptr1, 
+var_decl start: ptr1, 
diff --git a/test/test38-05.txt b/test/test38-05.txt
index 4418882..7787aa1 100644
--- a/test/test38-05.txt
+++ b/test/test38-05.txt
@@ -13,3 +13,7 @@ test38.cpp:412:14: warning: Useless variable check 'ptr1'. It already was checke
 test38.cpp:477:18: warning: Useless variable check 'ptr1'. It already was checked before
              if (!ptr1)
                   ^
+test38.cpp: In member function 'void Object1::func6(Data1*)':
+test38.cpp:530:23: warning: unused variable 'start' [-Wunused-variable]
+         unsigned long start = 0;
+                       ^
diff --git a/test/test38.cpp b/test/test38.cpp
index dff85e3..359c9c2 100644
--- a/test/test38.cpp
+++ b/test/test38.cpp
@@ -524,4 +524,20 @@ class Object1
         paranuckerInternalTest("=", "linkedReverseVars", "ptr1");
         paranuckerInternalTest("=", "linkedReverseVars", "this->tmp1");
     }
+
+    void func6(Data1 *ptr1)
+    {
+        unsigned long start = 0;
+        paranuckerInternalTest("=", "knownVars", "ptr1");
+        paranuckerInternalTest("=", "knownNonNullVars", "");
+        paranuckerInternalTest("=", "knownNullVars", "");
+        paranuckerInternalTest("=", "needCheckNullVars", "ptr1");
+        paranuckerInternalTest("=", "addNullVars", "");
+        paranuckerInternalTest("=", "removeNullVars", "");
+        paranuckerInternalTest("=", "removeNullVarsAll", "");
+        paranuckerInternalTest("=", "linkedVars", "ptr1");
+        paranuckerInternalTest("=", "linkedVars", "this->tmp1");
+        paranuckerInternalTest("=", "linkedReverseVars", "ptr1");
+        paranuckerInternalTest("=", "linkedReverseVars", "this->tmp1");
+    }
 };