Update test 22. Update test results.

1 files changed, 129 insertions, 129 deletions

diff --git a/test/test07-05.txt b/test/test07-05.txt
index a7e41a6..d308ba0 100644
--- a/test/test07-05.txt
+++ b/test/test07-05.txt
@@ -489,23 +489,6 @@ eh_spec_block : ,
 statement_list : , 
 function_decl __convert_from_v: 
 bind_expr : __fmt, __out, 
-var_decl __old: __fmt, __out, 
-integer_cst 64: __fmt, __out, 
-pointer_type : __fmt, __out, 
-type_decl __c_locale: __fmt, __out, 
-record_type : __fmt, __out, 
-type_decl __locale_struct: __fmt, __out, 
-field_decl __locales: __fmt, __out, 
-integer_cst 832: __fmt, __out, 
-field_decl __ctype_b: __fmt, __out, 
-integer_cst 64: __fmt, __out, 
-field_decl __ctype_tolower: __fmt, __out, 
-integer_cst 64: __fmt, __out, 
-field_decl __ctype_toupper: __fmt, __out, 
-integer_cst 64: __fmt, __out, 
-field_decl __names: __fmt, __out, 
-integer_cst 832: __fmt, __out, 
-type_decl __locale_struct: __fmt, __out, 
 statement_list : __fmt, __out, 
 decl_expr : __fmt, __out, 
 var_decl __old: __fmt, __out, 
@@ -639,6 +622,23 @@ integer_cst -2147483648: __fmt, __out,
 integer_cst 2147483647: __fmt, __out, 
 integer_cst 32: __fmt, __out, 
 var_decl __ret: __fmt, __out, 
+var_decl __old: __fmt, __out, 
+integer_cst 64: __fmt, __out, 
+pointer_type : __fmt, __out, 
+type_decl __c_locale: __fmt, __out, 
+record_type : __fmt, __out, 
+type_decl __locale_struct: __fmt, __out, 
+field_decl __locales: __fmt, __out, 
+integer_cst 832: __fmt, __out, 
+field_decl __ctype_b: __fmt, __out, 
+integer_cst 64: __fmt, __out, 
+field_decl __ctype_tolower: __fmt, __out, 
+integer_cst 64: __fmt, __out, 
+field_decl __ctype_toupper: __fmt, __out, 
+integer_cst 64: __fmt, __out, 
+field_decl __names: __fmt, __out, 
+integer_cst 832: __fmt, __out, 
+type_decl __locale_struct: __fmt, __out, 
 block : __fmt, __out, 
 var_decl __old: __fmt, __out, 
 var_decl __args: __fmt, __out, 
@@ -1685,22 +1685,6 @@ integer_cst 32: __mem,
 integer_cst 4: __mem, 
 function_decl __exchange_and_add_single: 
 bind_expr : __mem, 
-var_decl __result: __mem, 
-integer_cst 32: __mem, 
-indirect_ref : __mem, 
-parm_decl __mem: __mem, 
-pointer_type : __mem, 
-integer_type : __mem, 
-type_decl _Atomic_word: __mem, 
-integer_cst 32: __mem, 
-integer_cst -2147483648: __mem, 
-integer_cst 2147483647: __mem, 
-integer_cst 64: __mem, 
-integer_type : __mem, 
-type_decl _Atomic_word: __mem, 
-integer_cst 32: __mem, 
-integer_cst -2147483648: __mem, 
-integer_cst 2147483647: __mem, 
 statement_list : __mem, 
 decl_expr : __mem, 
 var_decl __result: __mem, 
@@ -1744,6 +1728,22 @@ integer_cst -2147483648: __mem,
 integer_cst 2147483647: __mem, 
 integer_cst 32: __mem, 
 var_decl __result: __mem, 
+var_decl __result: __mem, 
+integer_cst 32: __mem, 
+indirect_ref : __mem, 
+parm_decl __mem: __mem, 
+pointer_type : __mem, 
+integer_type : __mem, 
+type_decl _Atomic_word: __mem, 
+integer_cst 32: __mem, 
+integer_cst -2147483648: __mem, 
+integer_cst 2147483647: __mem, 
+integer_cst 64: __mem, 
+integer_type : __mem, 
+type_decl _Atomic_word: __mem, 
+integer_cst 32: __mem, 
+integer_cst -2147483648: __mem, 
+integer_cst 2147483647: __mem, 
 block : __mem, 
 var_decl __result: __mem, 
 function_decl __atomic_add_single: 
@@ -2650,22 +2650,6 @@ integer_cst : __it,
 integer_cst 64: __it, 
 function_decl __fill_a: 
 bind_expr : __first, __last, 
-var_decl __tmp: __first, __last, 
-integer_cst 32: __first, __last, 
-indirect_ref : __first, __last, 
-parm_decl __value: __first, __last, 
-reference_type : __first, __last, 
-integer_type : __first, __last, 
-type_decl int: __first, __last, 
-integer_cst 32: __first, __last, 
-integer_cst -2147483648: __first, __last, 
-integer_cst 2147483647: __first, __last, 
-integer_cst 64: __first, __last, 
-integer_type : __first, __last, 
-type_decl int: __first, __last, 
-integer_cst 32: __first, __last, 
-integer_cst -2147483648: __first, __last, 
-integer_cst 2147483647: __first, __last, 
 statement_list : __first, __last, 
 decl_expr : __first, __last, 
 var_decl __tmp: __first, __last, 
@@ -2713,6 +2697,22 @@ integer_cst 0: __first, __last,
 integer_cst : __first, __last, 
 integer_cst 64: __first, __last, 
 var_decl __tmp: __first, __last, 
+var_decl __tmp: __first, __last, 
+integer_cst 32: __first, __last, 
+indirect_ref : __first, __last, 
+parm_decl __value: __first, __last, 
+reference_type : __first, __last, 
+integer_type : __first, __last, 
+type_decl int: __first, __last, 
+integer_cst 32: __first, __last, 
+integer_cst -2147483648: __first, __last, 
+integer_cst 2147483647: __first, __last, 
+integer_cst 64: __first, __last, 
+integer_type : __first, __last, 
+type_decl int: __first, __last, 
+integer_cst 32: __first, __last, 
+integer_cst -2147483648: __first, __last, 
+integer_cst 2147483647: __first, __last, 
 block : __first, __last, 
 var_decl __tmp: __first, __last, 
 function_decl _S_empty_rep: 
@@ -2957,13 +2957,6 @@ integer_cst 64: __first, __last, __result,
 function_decl operator*: 
 function_decl _M_check_len: 
 bind_expr : __s, 
-var_decl __len: __s, 
-integer_cst 64: __s, 
-integer_type : __s, 
-type_decl size_type: __s, 
-integer_cst 64: __s, 
-integer_cst 0: __s, 
-integer_cst : __s, 
 statement_list : __s, 
 if_stmt : __s, 
 cleanup_point_expr : __s, 
@@ -3259,6 +3252,13 @@ type_decl difference_type: __s,
 type_decl allocator_type: __s, 
 integer_cst 64: __s, 
 var_decl __len: __s, 
+var_decl __len: __s, 
+integer_cst 64: __s, 
+integer_type : __s, 
+type_decl size_type: __s, 
+integer_cst 64: __s, 
+integer_cst 0: __s, 
+integer_cst : __s, 
 block : __s, 
 var_decl __len: __s, 
 function_decl begin: 
@@ -3442,7 +3442,6 @@ type_decl Struct1: __first, __last,
 integer_cst 64: __first, __last, 
 function_decl _M_deallocate: 
 bind_expr : __p, 
-type_decl _Tr: __p, 
 if_stmt : __p, 
 ne_expr : __p, 
 parm_decl __p: __p, 
@@ -3499,6 +3498,7 @@ integer_cst 64:
 integer_cst 0: 
 integer_cst : 
 integer_cst 64: 
+type_decl _Tr: __p, 
 block : __p, 
 function_decl __normal_iterator: 
 function_decl __base_ctor : 
@@ -3669,7 +3669,6 @@ type_decl Struct1: __p,
 integer_cst 64: __p, 
 function_decl _Destroy: 
 bind_expr : __first, __last, 
-type_decl _Value_type: __first, __last, 
 cleanup_point_expr : __first, __last, 
 expr_stmt : __first, __last, 
 call_expr : __first, __last, 
@@ -3697,6 +3696,7 @@ field_decl num: __first, __last,
 integer_cst 32: __first, __last, 
 type_decl Struct1: __first, __last, 
 integer_cst 64: __first, __last, 
+type_decl _Value_type: __first, __last, 
 block : __first, __last, 
 function_decl deallocate: 
 cleanup_point_expr : __p, 
@@ -3820,7 +3820,6 @@ type_decl Struct1: __it,
 integer_cst 64: __it, 
 function_decl __copy_move_backward_a: 
 bind_expr : __first, __last, __result, 
-type_decl _ValueType1: __first, __last, __result, 
 statement_list : __first, __last, __result, 
 cleanup_point_expr : __first, __last, __result, 
 decl_expr : __first, __last, __result, 
@@ -3879,6 +3878,7 @@ field_decl num: __first, __last, __result,
 integer_cst 32: __first, __last, __result, 
 type_decl Struct1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
+type_decl _ValueType1: __first, __last, __result, 
 block : __first, __last, __result, 
 var_decl __simple: __first, __last, __result, 
 function_decl max_size: 
@@ -3947,7 +3947,6 @@ integer_cst : ,
 integer_cst 64: , 
 function_decl uninitialized_copy: 
 bind_expr : __first, __last, __result, 
-type_decl _ValueType1: __first, __last, __result, 
 statement_list : __first, __last, __result, 
 cleanup_point_expr : __first, __last, __result, 
 decl_expr : __first, __last, __result, 
@@ -4006,6 +4005,7 @@ field_decl num: __first, __last, __result,
 integer_cst 32: __first, __last, __result, 
 type_decl Struct1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
+type_decl _ValueType1: __first, __last, __result, 
 block : __first, __last, __result, 
 var_decl __assignable: __first, __last, __result, 
 function_decl __destroy: 
@@ -4030,40 +4030,6 @@ type_decl Struct1: __p,
 integer_cst 64: __p, 
 function_decl __copy_move_b: 
 bind_expr : __first, __last, __result, 
-var_decl _Num: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-exact_div_expr : __first, __last, __result, 
-minus_expr : __first, __last, __result, 
-convert_expr : __first, __last, __result, 
-parm_decl __last: __first, __last, __result, 
-pointer_type : __first, __last, __result, 
-pointer_type : __first, __last, __result, 
-record_type : __first, __last, __result, 
-type_decl Struct1: __first, __last, __result, 
-field_decl str: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-field_decl num: __first, __last, __result, 
-integer_cst 32: __first, __last, __result, 
-type_decl Struct1: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-convert_expr : __first, __last, __result, 
-parm_decl __first: __first, __last, __result, 
-pointer_type : __first, __last, __result, 
-pointer_type : __first, __last, __result, 
-record_type : __first, __last, __result, 
-type_decl Struct1: __first, __last, __result, 
-field_decl str: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-field_decl num: __first, __last, __result, 
-integer_cst 32: __first, __last, __result, 
-type_decl Struct1: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-integer_cst 8: __first, __last, __result, 
-integer_type : __first, __last, __result, 
-type_decl ptrdiff_t: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-integer_cst -0: __first, __last, __result, 
-integer_cst 4294967295: __first, __last, __result, 
 statement_list : __first, __last, __result, 
 decl_expr : __first, __last, __result, 
 var_decl _Num: __first, __last, __result, 
@@ -4137,6 +4103,40 @@ negate_expr : __first, __last, __result,
 mult_expr : __first, __last, __result, 
 var_decl _Num: __first, __last, __result, 
 integer_cst 8: __first, __last, __result, 
+var_decl _Num: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+exact_div_expr : __first, __last, __result, 
+minus_expr : __first, __last, __result, 
+convert_expr : __first, __last, __result, 
+parm_decl __last: __first, __last, __result, 
+pointer_type : __first, __last, __result, 
+pointer_type : __first, __last, __result, 
+record_type : __first, __last, __result, 
+type_decl Struct1: __first, __last, __result, 
+field_decl str: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+field_decl num: __first, __last, __result, 
+integer_cst 32: __first, __last, __result, 
+type_decl Struct1: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+convert_expr : __first, __last, __result, 
+parm_decl __first: __first, __last, __result, 
+pointer_type : __first, __last, __result, 
+pointer_type : __first, __last, __result, 
+record_type : __first, __last, __result, 
+type_decl Struct1: __first, __last, __result, 
+field_decl str: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+field_decl num: __first, __last, __result, 
+integer_cst 32: __first, __last, __result, 
+type_decl Struct1: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+integer_cst 8: __first, __last, __result, 
+integer_type : __first, __last, __result, 
+type_decl ptrdiff_t: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+integer_cst -0: __first, __last, __result, 
+integer_cst 4294967295: __first, __last, __result, 
 block : __first, __last, __result, 
 var_decl _Num: __first, __last, __result, 
 function_decl max_size: 
@@ -4310,7 +4310,6 @@ type_decl Struct1: __first, __last, __result,
 integer_cst 64: __first, __last, __result, 
 function_decl __copy_move_a: 
 bind_expr : __first, __last, __result, 
-type_decl _ValueTypeI: __first, __last, __result, 
 statement_list : __first, __last, __result, 
 cleanup_point_expr : __first, __last, __result, 
 decl_expr : __first, __last, __result, 
@@ -4369,44 +4368,11 @@ field_decl num: __first, __last, __result,
 integer_cst 32: __first, __last, __result, 
 type_decl Struct1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
+type_decl _ValueTypeI: __first, __last, __result, 
 block : __first, __last, __result, 
 var_decl __simple: __first, __last, __result, 
 function_decl __copy_m: 
 bind_expr : __first, __last, __result, 
-var_decl _Num: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-exact_div_expr : __first, __last, __result, 
-minus_expr : __first, __last, __result, 
-convert_expr : __first, __last, __result, 
-parm_decl __last: __first, __last, __result, 
-pointer_type : __first, __last, __result, 
-pointer_type : __first, __last, __result, 
-record_type : __first, __last, __result, 
-type_decl Struct1: __first, __last, __result, 
-field_decl str: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-field_decl num: __first, __last, __result, 
-integer_cst 32: __first, __last, __result, 
-type_decl Struct1: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-convert_expr : __first, __last, __result, 
-parm_decl __first: __first, __last, __result, 
-pointer_type : __first, __last, __result, 
-pointer_type : __first, __last, __result, 
-record_type : __first, __last, __result, 
-type_decl Struct1: __first, __last, __result, 
-field_decl str: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-field_decl num: __first, __last, __result, 
-integer_cst 32: __first, __last, __result, 
-type_decl Struct1: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-integer_cst 8: __first, __last, __result, 
-integer_type : __first, __last, __result, 
-type_decl ptrdiff_t: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-integer_cst -0: __first, __last, __result, 
-integer_cst 4294967295: __first, __last, __result, 
 statement_list : __first, __last, __result, 
 decl_expr : __first, __last, __result, 
 var_decl _Num: __first, __last, __result, 
@@ -4474,5 +4440,39 @@ integer_cst 64: __first, __last, __result,
 mult_expr : __first, __last, __result, 
 var_decl _Num: __first, __last, __result, 
 integer_cst 8: __first, __last, __result, 
+var_decl _Num: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+exact_div_expr : __first, __last, __result, 
+minus_expr : __first, __last, __result, 
+convert_expr : __first, __last, __result, 
+parm_decl __last: __first, __last, __result, 
+pointer_type : __first, __last, __result, 
+pointer_type : __first, __last, __result, 
+record_type : __first, __last, __result, 
+type_decl Struct1: __first, __last, __result, 
+field_decl str: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+field_decl num: __first, __last, __result, 
+integer_cst 32: __first, __last, __result, 
+type_decl Struct1: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+convert_expr : __first, __last, __result, 
+parm_decl __first: __first, __last, __result, 
+pointer_type : __first, __last, __result, 
+pointer_type : __first, __last, __result, 
+record_type : __first, __last, __result, 
+type_decl Struct1: __first, __last, __result, 
+field_decl str: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+field_decl num: __first, __last, __result, 
+integer_cst 32: __first, __last, __result, 
+type_decl Struct1: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+integer_cst 8: __first, __last, __result, 
+integer_type : __first, __last, __result, 
+type_decl ptrdiff_t: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+integer_cst -0: __first, __last, __result, 
+integer_cst 4294967295: __first, __last, __result, 
 block : __first, __last, __result, 
 var_decl _Num: __first, __last, __result,