Update test 25. Update test results.

1 files changed, 109 insertions, 109 deletions

diff --git a/test/test22-03.txt b/test/test22-03.txt
index 2b8fa3c..c7e7d04 100644
--- a/test/test22-03.txt
+++ b/test/test22-03.txt
@@ -2290,31 +2290,31 @@ cleanup_point_expr :
 expr_stmt : 
 convert_expr : 
 modify_expr : 
-component_ref : this->__do_it, 
-indirect_ref : this->__do_it, 
-parm_decl this: this->__do_it, 
-pointer_type : this->__do_it, 
-record_type : this->__do_it, 
-type_decl __pthread_cleanup_class: this->__do_it, 
-field_decl __cancel_routine: this->__do_it, 
-integer_cst 64: this->__do_it, 
-field_decl __cancel_arg: this->__do_it, 
-integer_cst 64: this->__do_it, 
-field_decl __do_it: this->__do_it, 
-integer_cst 32: this->__do_it, 
-field_decl __cancel_type: this->__do_it, 
-integer_cst 32: this->__do_it, 
-type_decl __pthread_cleanup_class: this->__do_it, 
-integer_cst 64: this->__do_it, 
-field_decl __do_it: this->__do_it, 
-integer_cst 32: this->__do_it, 
-parm_decl __newval: this->__do_it, 
-integer_type : this->__do_it, 
-type_decl int: this->__do_it, 
-integer_cst 32: this->__do_it, 
-integer_cst -2147483648: this->__do_it, 
-integer_cst 2147483647: this->__do_it, 
-integer_cst 32: this->__do_it, 
+component_ref : 
+indirect_ref : 
+parm_decl this: 
+pointer_type : 
+record_type : 
+type_decl __pthread_cleanup_class: 
+field_decl __cancel_routine: 
+integer_cst 64: 
+field_decl __cancel_arg: 
+integer_cst 64: 
+field_decl __do_it: 
+integer_cst 32: 
+field_decl __cancel_type: 
+integer_cst 32: 
+type_decl __pthread_cleanup_class: 
+integer_cst 64: 
+field_decl __do_it: 
+integer_cst 32: 
+parm_decl __newval: 
+integer_type : 
+type_decl int: 
+integer_cst 32: 
+integer_cst -2147483648: 
+integer_cst 2147483647: 
+integer_cst 32: 
 function_decl __defer: 
 cleanup_point_expr : 
 expr_stmt : 
@@ -3776,27 +3776,27 @@ cleanup_point_expr : __x, this->_M_p,
 expr_stmt : __x, this->_M_p, 
 convert_expr : __x, this->_M_p, 
 init_expr : __x, this->_M_p, 
-component_ref : __x, this->_M_mask, this->_M_p, 
-indirect_ref : __x, this->_M_mask, this->_M_p, 
-parm_decl this: __x, this->_M_mask, this->_M_p, 
-pointer_type : __x, this->_M_mask, this->_M_p, 
-record_type : __x, this->_M_mask, this->_M_p, 
-type_decl _Bit_reference: __x, this->_M_mask, this->_M_p, 
-field_decl _M_p: __x, this->_M_mask, this->_M_p, 
-integer_cst 64: __x, this->_M_mask, this->_M_p, 
-field_decl _M_mask: __x, this->_M_mask, this->_M_p, 
-integer_cst 64: __x, this->_M_mask, this->_M_p, 
-type_decl _Bit_reference: __x, this->_M_mask, this->_M_p, 
-integer_cst 64: __x, this->_M_mask, this->_M_p, 
-field_decl _M_mask: __x, this->_M_mask, this->_M_p, 
-integer_cst 64: __x, this->_M_mask, this->_M_p, 
-parm_decl __y: __x, this->_M_mask, this->_M_p, 
-integer_type : __x, this->_M_mask, this->_M_p, 
-type_decl _Bit_type: __x, this->_M_mask, this->_M_p, 
-integer_cst 64: __x, this->_M_mask, this->_M_p, 
-integer_cst 0: __x, this->_M_mask, this->_M_p, 
-integer_cst : __x, this->_M_mask, this->_M_p, 
-integer_cst 64: __x, this->_M_mask, this->_M_p, 
+component_ref : __x, this->_M_p, 
+indirect_ref : __x, this->_M_p, 
+parm_decl this: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+record_type : __x, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_mask: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_mask: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+parm_decl __y: __x, this->_M_p, 
+integer_type : __x, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+integer_cst 0: __x, this->_M_p, 
+integer_cst : __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
 block : __x, 
 function_decl __base_ctor : 
 bind_expr : __x, 
@@ -3831,27 +3831,27 @@ cleanup_point_expr : __x, this->_M_p,
 expr_stmt : __x, this->_M_p, 
 convert_expr : __x, this->_M_p, 
 init_expr : __x, this->_M_p, 
-component_ref : __x, this->_M_mask, this->_M_p, 
-indirect_ref : __x, this->_M_mask, this->_M_p, 
-parm_decl this: __x, this->_M_mask, this->_M_p, 
-pointer_type : __x, this->_M_mask, this->_M_p, 
-record_type : __x, this->_M_mask, this->_M_p, 
-type_decl _Bit_reference: __x, this->_M_mask, this->_M_p, 
-field_decl _M_p: __x, this->_M_mask, this->_M_p, 
-integer_cst 64: __x, this->_M_mask, this->_M_p, 
-field_decl _M_mask: __x, this->_M_mask, this->_M_p, 
-integer_cst 64: __x, this->_M_mask, this->_M_p, 
-type_decl _Bit_reference: __x, this->_M_mask, this->_M_p, 
-integer_cst 64: __x, this->_M_mask, this->_M_p, 
-field_decl _M_mask: __x, this->_M_mask, this->_M_p, 
-integer_cst 64: __x, this->_M_mask, this->_M_p, 
-parm_decl __y: __x, this->_M_mask, this->_M_p, 
-integer_type : __x, this->_M_mask, this->_M_p, 
-type_decl _Bit_type: __x, this->_M_mask, this->_M_p, 
-integer_cst 64: __x, this->_M_mask, this->_M_p, 
-integer_cst 0: __x, this->_M_mask, this->_M_p, 
-integer_cst : __x, this->_M_mask, this->_M_p, 
-integer_cst 64: __x, this->_M_mask, this->_M_p, 
+component_ref : __x, this->_M_p, 
+indirect_ref : __x, this->_M_p, 
+parm_decl this: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+record_type : __x, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_mask: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_mask: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+parm_decl __y: __x, this->_M_p, 
+integer_type : __x, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+integer_cst 0: __x, this->_M_p, 
+integer_cst : __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
 block : __x, 
 function_decl __comp_ctor : 
 statement_list : __x, 
@@ -4336,27 +4336,27 @@ cleanup_point_expr : __x, this->_M_p,
 expr_stmt : __x, this->_M_p, 
 convert_expr : __x, this->_M_p, 
 init_expr : __x, this->_M_p, 
-component_ref : __x, this->_M_offset, this->_M_p, 
-indirect_ref : __x, this->_M_offset, this->_M_p, 
-parm_decl this: __x, this->_M_offset, this->_M_p, 
-pointer_type : __x, this->_M_offset, this->_M_p, 
-record_type : __x, this->_M_offset, this->_M_p, 
-type_decl _Bit_iterator_base: __x, this->_M_offset, this->_M_p, 
-field_decl _M_p: __x, this->_M_offset, this->_M_p, 
-integer_cst 64: __x, this->_M_offset, this->_M_p, 
-field_decl _M_offset: __x, this->_M_offset, this->_M_p, 
-integer_cst 32: __x, this->_M_offset, this->_M_p, 
-type_decl _Bit_iterator_base: __x, this->_M_offset, this->_M_p, 
-integer_cst 64: __x, this->_M_offset, this->_M_p, 
-field_decl _M_offset: __x, this->_M_offset, this->_M_p, 
-integer_cst 32: __x, this->_M_offset, this->_M_p, 
-parm_decl __y: __x, this->_M_offset, this->_M_p, 
-integer_type : __x, this->_M_offset, this->_M_p, 
-type_decl unsigned int: __x, this->_M_offset, this->_M_p, 
-integer_cst 32: __x, this->_M_offset, this->_M_p, 
-integer_cst 0: __x, this->_M_offset, this->_M_p, 
-integer_cst 4294967295: __x, this->_M_offset, this->_M_p, 
-integer_cst 32: __x, this->_M_offset, this->_M_p, 
+component_ref : __x, this->_M_p, 
+indirect_ref : __x, this->_M_p, 
+parm_decl this: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+record_type : __x, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_offset: __x, this->_M_p, 
+integer_cst 32: __x, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_offset: __x, this->_M_p, 
+integer_cst 32: __x, this->_M_p, 
+parm_decl __y: __x, this->_M_p, 
+integer_type : __x, this->_M_p, 
+type_decl unsigned int: __x, this->_M_p, 
+integer_cst 32: __x, this->_M_p, 
+integer_cst 0: __x, this->_M_p, 
+integer_cst 4294967295: __x, this->_M_p, 
+integer_cst 32: __x, this->_M_p, 
 block : __x, 
 function_decl __base_ctor : 
 bind_expr : __x, 
@@ -4407,27 +4407,27 @@ cleanup_point_expr : __x, this->_M_p,
 expr_stmt : __x, this->_M_p, 
 convert_expr : __x, this->_M_p, 
 init_expr : __x, this->_M_p, 
-component_ref : __x, this->_M_offset, this->_M_p, 
-indirect_ref : __x, this->_M_offset, this->_M_p, 
-parm_decl this: __x, this->_M_offset, this->_M_p, 
-pointer_type : __x, this->_M_offset, this->_M_p, 
-record_type : __x, this->_M_offset, this->_M_p, 
-type_decl _Bit_iterator_base: __x, this->_M_offset, this->_M_p, 
-field_decl _M_p: __x, this->_M_offset, this->_M_p, 
-integer_cst 64: __x, this->_M_offset, this->_M_p, 
-field_decl _M_offset: __x, this->_M_offset, this->_M_p, 
-integer_cst 32: __x, this->_M_offset, this->_M_p, 
-type_decl _Bit_iterator_base: __x, this->_M_offset, this->_M_p, 
-integer_cst 64: __x, this->_M_offset, this->_M_p, 
-field_decl _M_offset: __x, this->_M_offset, this->_M_p, 
-integer_cst 32: __x, this->_M_offset, this->_M_p, 
-parm_decl __y: __x, this->_M_offset, this->_M_p, 
-integer_type : __x, this->_M_offset, this->_M_p, 
-type_decl unsigned int: __x, this->_M_offset, this->_M_p, 
-integer_cst 32: __x, this->_M_offset, this->_M_p, 
-integer_cst 0: __x, this->_M_offset, this->_M_p, 
-integer_cst 4294967295: __x, this->_M_offset, this->_M_p, 
-integer_cst 32: __x, this->_M_offset, this->_M_p, 
+component_ref : __x, this->_M_p, 
+indirect_ref : __x, this->_M_p, 
+parm_decl this: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+record_type : __x, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_offset: __x, this->_M_p, 
+integer_cst 32: __x, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_offset: __x, this->_M_p, 
+integer_cst 32: __x, this->_M_p, 
+parm_decl __y: __x, this->_M_p, 
+integer_type : __x, this->_M_p, 
+type_decl unsigned int: __x, this->_M_p, 
+integer_cst 32: __x, this->_M_p, 
+integer_cst 0: __x, this->_M_p, 
+integer_cst 4294967295: __x, this->_M_p, 
+integer_cst 32: __x, this->_M_p, 
 block : __x, 
 function_decl __comp_ctor : 
 statement_list : __x,