Index: src/tests/.expect/32/KRfunctions.txt =================================================================== --- src/tests/.expect/32/KRfunctions.txt (revision ca278c1dcaea1b69d773c4948fb76ebdfccbc0a6) +++ src/tests/.expect/32/KRfunctions.txt (revision b10c621c395e6371e800c981a9269356098a495f) @@ -34,5 +34,5 @@ ((void)((*___dst__R2sS_1).__i__i_1=___src__2sS_1.__i__i_1)); ((void)___constructor__F_R2sS2sS_autogen___1((&___ret__2sS_1), ___src__2sS_1)); - return ((struct S )___ret__2sS_1); + return ___ret__2sS_1; } static inline void ___constructor__F_R2sSi_autogen___1(struct S *___dst__R2sS_1, signed int __i__i_1){ @@ -65,5 +65,5 @@ signed int *__x__FPi_ii__2(signed int __anonymous_object2, signed int __anonymous_object3); ((void)(___retval_f10__PFPi_ii__1=__x__FPi_ii__2) /* ?{} */); - return ((signed int *(*)(signed int __x__i_1, signed int __y__i_1))___retval_f10__PFPi_ii__1); + return ___retval_f10__PFPi_ii__1; } signed int (*__f11__FPA0i_iPiPi__1(signed int __a__i_1, signed int *__b__Pi_1, signed int *__c__Pi_1))[]{ Index: src/tests/.expect/32/attributes.txt =================================================================== --- src/tests/.expect/32/attributes.txt (revision ca278c1dcaea1b69d773c4948fb76ebdfccbc0a6) +++ src/tests/.expect/32/attributes.txt (revision b10c621c395e6371e800c981a9269356098a495f) @@ -24,5 +24,5 @@ struct __anonymous0 ___ret__13s__anonymous0_1; ((void)___constructor__F_R13s__anonymous013s__anonymous0_autogen___1((&___ret__13s__anonymous0_1), ___src__13s__anonymous0_1)); - return ((struct __anonymous0 )___ret__13s__anonymous0_1); + return ___ret__13s__anonymous0_1; } __attribute__ ((unused)) struct Agn1; @@ -42,5 +42,5 @@ struct Agn2 ___ret__5sAgn2_1; ((void)___constructor__F_R5sAgn25sAgn2_autogen___1((&___ret__5sAgn2_1), ___src__5sAgn2_1)); - return ((struct Agn2 )___ret__5sAgn2_1); + return ___ret__5sAgn2_1; } enum __attribute__ ((unused)) __anonymous1 { @@ -114,5 +114,5 @@ ((void)((*___dst__R4sFdl_1).__f9__Pi_1=___src__4sFdl_1.__f9__Pi_1)); ((void)___constructor__F_R4sFdl4sFdl_autogen___1((&___ret__4sFdl_1), ___src__4sFdl_1)); - return ((struct Fdl )___ret__4sFdl_1); + return ___ret__4sFdl_1; } static inline void ___constructor__F_R4sFdli_autogen___1(struct Fdl *___dst__R4sFdl_1, signed int __f1__i_1){ @@ -301,5 +301,5 @@ ((void)((*___dst__R13s__anonymous4_2).__i__i_2=___src__13s__anonymous4_2.__i__i_2)); ((void)___constructor__F_R13s__anonymous413s__anonymous4_autogen___2((&___ret__13s__anonymous4_2), ___src__13s__anonymous4_2)); - return ((struct __anonymous4 )___ret__13s__anonymous4_2); + return ___ret__13s__anonymous4_2; } inline void ___constructor__F_R13s__anonymous4i_autogen___2(struct __anonymous4 *___dst__R13s__anonymous4_2, signed int __i__i_2){ @@ -320,5 +320,5 @@ enum __anonymous5 ___ret__13e__anonymous5_2; ((void)(___ret__13e__anonymous5_2=((*___dst__R13e__anonymous5_2)=___src__13e__anonymous5_2)) /* ?{} */); - return ((enum __anonymous5 )___ret__13e__anonymous5_2); + return ___ret__13e__anonymous5_2; } ((void)sizeof(enum __anonymous5 )); @@ -350,4 +350,4 @@ struct Vad ___ret__4sVad_1; ((void)___constructor__F_R4sVad4sVad_autogen___1((&___ret__4sVad_1), ___src__4sVad_1)); - return ((struct Vad )___ret__4sVad_1); -} + return ___ret__4sVad_1; +} Index: src/tests/.expect/32/declarationSpecifier.txt =================================================================== --- src/tests/.expect/32/declarationSpecifier.txt (revision ca278c1dcaea1b69d773c4948fb76ebdfccbc0a6) +++ src/tests/.expect/32/declarationSpecifier.txt (revision b10c621c395e6371e800c981a9269356098a495f) @@ -33,5 +33,5 @@ ((void)((*___dst__R13s__anonymous0_1).__i__i_1=___src__13s__anonymous0_1.__i__i_1)); ((void)___constructor__F_R13s__anonymous013s__anonymous0_autogen___1((&___ret__13s__anonymous0_1), ___src__13s__anonymous0_1)); - return ((struct __anonymous0 )___ret__13s__anonymous0_1); + return ___ret__13s__anonymous0_1; } static inline void ___constructor__F_R13s__anonymous0i_autogen___1(struct __anonymous0 *___dst__R13s__anonymous0_1, signed int __i__i_1){ @@ -59,5 +59,5 @@ ((void)((*___dst__R13s__anonymous1_1).__i__i_1=___src__13s__anonymous1_1.__i__i_1)); ((void)___constructor__F_R13s__anonymous113s__anonymous1_autogen___1((&___ret__13s__anonymous1_1), ___src__13s__anonymous1_1)); - return ((struct __anonymous1 )___ret__13s__anonymous1_1); + return ___ret__13s__anonymous1_1; } static inline void ___constructor__F_R13s__anonymous1i_autogen___1(struct __anonymous1 *___dst__R13s__anonymous1_1, signed int __i__i_1){ @@ -85,5 +85,5 @@ ((void)((*___dst__R13s__anonymous2_1).__i__i_1=___src__13s__anonymous2_1.__i__i_1)); ((void)___constructor__F_R13s__anonymous213s__anonymous2_autogen___1((&___ret__13s__anonymous2_1), ___src__13s__anonymous2_1)); - return ((struct __anonymous2 )___ret__13s__anonymous2_1); + return ___ret__13s__anonymous2_1; } static inline void ___constructor__F_R13s__anonymous2i_autogen___1(struct __anonymous2 *___dst__R13s__anonymous2_1, signed int __i__i_1){ @@ -111,5 +111,5 @@ ((void)((*___dst__R13s__anonymous3_1).__i__i_1=___src__13s__anonymous3_1.__i__i_1)); ((void)___constructor__F_R13s__anonymous313s__anonymous3_autogen___1((&___ret__13s__anonymous3_1), ___src__13s__anonymous3_1)); - return ((struct __anonymous3 )___ret__13s__anonymous3_1); + return ___ret__13s__anonymous3_1; } static inline void ___constructor__F_R13s__anonymous3i_autogen___1(struct __anonymous3 *___dst__R13s__anonymous3_1, signed int __i__i_1){ @@ -137,5 +137,5 @@ ((void)((*___dst__R13s__anonymous4_1).__i__i_1=___src__13s__anonymous4_1.__i__i_1)); ((void)___constructor__F_R13s__anonymous413s__anonymous4_autogen___1((&___ret__13s__anonymous4_1), ___src__13s__anonymous4_1)); - return ((struct __anonymous4 )___ret__13s__anonymous4_1); + return ___ret__13s__anonymous4_1; } static inline void ___constructor__F_R13s__anonymous4i_autogen___1(struct __anonymous4 *___dst__R13s__anonymous4_1, signed int __i__i_1){ @@ -163,5 +163,5 @@ ((void)((*___dst__R13s__anonymous5_1).__i__i_1=___src__13s__anonymous5_1.__i__i_1)); ((void)___constructor__F_R13s__anonymous513s__anonymous5_autogen___1((&___ret__13s__anonymous5_1), ___src__13s__anonymous5_1)); - return ((struct __anonymous5 )___ret__13s__anonymous5_1); + return ___ret__13s__anonymous5_1; } static inline void ___constructor__F_R13s__anonymous5i_autogen___1(struct __anonymous5 *___dst__R13s__anonymous5_1, signed int __i__i_1){ @@ -189,5 +189,5 @@ ((void)((*___dst__R13s__anonymous6_1).__i__i_1=___src__13s__anonymous6_1.__i__i_1)); ((void)___constructor__F_R13s__anonymous613s__anonymous6_autogen___1((&___ret__13s__anonymous6_1), ___src__13s__anonymous6_1)); - return ((struct __anonymous6 )___ret__13s__anonymous6_1); + return ___ret__13s__anonymous6_1; } static inline void ___constructor__F_R13s__anonymous6i_autogen___1(struct __anonymous6 *___dst__R13s__anonymous6_1, signed int __i__i_1){ @@ -215,5 +215,5 @@ ((void)((*___dst__R13s__anonymous7_1).__i__i_1=___src__13s__anonymous7_1.__i__i_1)); ((void)___constructor__F_R13s__anonymous713s__anonymous7_autogen___1((&___ret__13s__anonymous7_1), ___src__13s__anonymous7_1)); - return ((struct __anonymous7 )___ret__13s__anonymous7_1); + return ___ret__13s__anonymous7_1; } static inline void ___constructor__F_R13s__anonymous7i_autogen___1(struct __anonymous7 *___dst__R13s__anonymous7_1, signed int __i__i_1){ @@ -249,5 +249,5 @@ ((void)((*___dst__R13s__anonymous8_1).__i__s_1=___src__13s__anonymous8_1.__i__s_1)); ((void)___constructor__F_R13s__anonymous813s__anonymous8_autogen___1((&___ret__13s__anonymous8_1), ___src__13s__anonymous8_1)); - return ((struct __anonymous8 )___ret__13s__anonymous8_1); + return ___ret__13s__anonymous8_1; } static inline void ___constructor__F_R13s__anonymous8s_autogen___1(struct __anonymous8 *___dst__R13s__anonymous8_1, signed short int __i__s_1){ @@ -275,5 +275,5 @@ ((void)((*___dst__R13s__anonymous9_1).__i__s_1=___src__13s__anonymous9_1.__i__s_1)); ((void)___constructor__F_R13s__anonymous913s__anonymous9_autogen___1((&___ret__13s__anonymous9_1), ___src__13s__anonymous9_1)); - return ((struct __anonymous9 )___ret__13s__anonymous9_1); + return ___ret__13s__anonymous9_1; } static inline void ___constructor__F_R13s__anonymous9s_autogen___1(struct __anonymous9 *___dst__R13s__anonymous9_1, signed short int __i__s_1){ @@ -301,5 +301,5 @@ ((void)((*___dst__R14s__anonymous10_1).__i__s_1=___src__14s__anonymous10_1.__i__s_1)); ((void)___constructor__F_R14s__anonymous1014s__anonymous10_autogen___1((&___ret__14s__anonymous10_1), ___src__14s__anonymous10_1)); - return ((struct __anonymous10 )___ret__14s__anonymous10_1); + return ___ret__14s__anonymous10_1; } static inline void ___constructor__F_R14s__anonymous10s_autogen___1(struct __anonymous10 *___dst__R14s__anonymous10_1, signed short int __i__s_1){ @@ -327,5 +327,5 @@ ((void)((*___dst__R14s__anonymous11_1).__i__s_1=___src__14s__anonymous11_1.__i__s_1)); ((void)___constructor__F_R14s__anonymous1114s__anonymous11_autogen___1((&___ret__14s__anonymous11_1), ___src__14s__anonymous11_1)); - return ((struct __anonymous11 )___ret__14s__anonymous11_1); + return ___ret__14s__anonymous11_1; } static inline void ___constructor__F_R14s__anonymous11s_autogen___1(struct __anonymous11 *___dst__R14s__anonymous11_1, signed short int __i__s_1){ @@ -353,5 +353,5 @@ ((void)((*___dst__R14s__anonymous12_1).__i__s_1=___src__14s__anonymous12_1.__i__s_1)); ((void)___constructor__F_R14s__anonymous1214s__anonymous12_autogen___1((&___ret__14s__anonymous12_1), ___src__14s__anonymous12_1)); - return ((struct __anonymous12 )___ret__14s__anonymous12_1); + return ___ret__14s__anonymous12_1; } static inline void ___constructor__F_R14s__anonymous12s_autogen___1(struct __anonymous12 *___dst__R14s__anonymous12_1, signed short int __i__s_1){ @@ -379,5 +379,5 @@ ((void)((*___dst__R14s__anonymous13_1).__i__s_1=___src__14s__anonymous13_1.__i__s_1)); ((void)___constructor__F_R14s__anonymous1314s__anonymous13_autogen___1((&___ret__14s__anonymous13_1), ___src__14s__anonymous13_1)); - return ((struct __anonymous13 )___ret__14s__anonymous13_1); + return ___ret__14s__anonymous13_1; } static inline void ___constructor__F_R14s__anonymous13s_autogen___1(struct __anonymous13 *___dst__R14s__anonymous13_1, signed short int __i__s_1){ @@ -405,5 +405,5 @@ ((void)((*___dst__R14s__anonymous14_1).__i__s_1=___src__14s__anonymous14_1.__i__s_1)); ((void)___constructor__F_R14s__anonymous1414s__anonymous14_autogen___1((&___ret__14s__anonymous14_1), ___src__14s__anonymous14_1)); - return ((struct __anonymous14 )___ret__14s__anonymous14_1); + return ___ret__14s__anonymous14_1; } static inline void ___constructor__F_R14s__anonymous14s_autogen___1(struct __anonymous14 *___dst__R14s__anonymous14_1, signed short int __i__s_1){ @@ -431,5 +431,5 @@ ((void)((*___dst__R14s__anonymous15_1).__i__s_1=___src__14s__anonymous15_1.__i__s_1)); ((void)___constructor__F_R14s__anonymous1514s__anonymous15_autogen___1((&___ret__14s__anonymous15_1), ___src__14s__anonymous15_1)); - return ((struct __anonymous15 )___ret__14s__anonymous15_1); + return ___ret__14s__anonymous15_1; } static inline void ___constructor__F_R14s__anonymous15s_autogen___1(struct __anonymous15 *___dst__R14s__anonymous15_1, signed short int __i__s_1){ @@ -473,5 +473,5 @@ ((void)((*___dst__R14s__anonymous16_1).__i__i_1=___src__14s__anonymous16_1.__i__i_1)); ((void)___constructor__F_R14s__anonymous1614s__anonymous16_autogen___1((&___ret__14s__anonymous16_1), ___src__14s__anonymous16_1)); - return ((struct __anonymous16 )___ret__14s__anonymous16_1); + return ___ret__14s__anonymous16_1; } static inline void ___constructor__F_R14s__anonymous16i_autogen___1(struct __anonymous16 *___dst__R14s__anonymous16_1, signed int __i__i_1){ @@ -499,5 +499,5 @@ ((void)((*___dst__R14s__anonymous17_1).__i__i_1=___src__14s__anonymous17_1.__i__i_1)); ((void)___constructor__F_R14s__anonymous1714s__anonymous17_autogen___1((&___ret__14s__anonymous17_1), ___src__14s__anonymous17_1)); - return ((struct __anonymous17 )___ret__14s__anonymous17_1); + return ___ret__14s__anonymous17_1; } static inline void ___constructor__F_R14s__anonymous17i_autogen___1(struct __anonymous17 *___dst__R14s__anonymous17_1, signed int __i__i_1){ @@ -525,5 +525,5 @@ ((void)((*___dst__R14s__anonymous18_1).__i__i_1=___src__14s__anonymous18_1.__i__i_1)); ((void)___constructor__F_R14s__anonymous1814s__anonymous18_autogen___1((&___ret__14s__anonymous18_1), ___src__14s__anonymous18_1)); - return ((struct __anonymous18 )___ret__14s__anonymous18_1); + return ___ret__14s__anonymous18_1; } static inline void ___constructor__F_R14s__anonymous18i_autogen___1(struct __anonymous18 *___dst__R14s__anonymous18_1, signed int __i__i_1){ @@ -551,5 +551,5 @@ ((void)((*___dst__R14s__anonymous19_1).__i__i_1=___src__14s__anonymous19_1.__i__i_1)); ((void)___constructor__F_R14s__anonymous1914s__anonymous19_autogen___1((&___ret__14s__anonymous19_1), ___src__14s__anonymous19_1)); - return ((struct __anonymous19 )___ret__14s__anonymous19_1); + return ___ret__14s__anonymous19_1; } static inline void ___constructor__F_R14s__anonymous19i_autogen___1(struct __anonymous19 *___dst__R14s__anonymous19_1, signed int __i__i_1){ @@ -577,5 +577,5 @@ ((void)((*___dst__R14s__anonymous20_1).__i__i_1=___src__14s__anonymous20_1.__i__i_1)); ((void)___constructor__F_R14s__anonymous2014s__anonymous20_autogen___1((&___ret__14s__anonymous20_1), ___src__14s__anonymous20_1)); - return ((struct __anonymous20 )___ret__14s__anonymous20_1); + return ___ret__14s__anonymous20_1; } static inline void ___constructor__F_R14s__anonymous20i_autogen___1(struct __anonymous20 *___dst__R14s__anonymous20_1, signed int __i__i_1){ @@ -603,5 +603,5 @@ ((void)((*___dst__R14s__anonymous21_1).__i__i_1=___src__14s__anonymous21_1.__i__i_1)); ((void)___constructor__F_R14s__anonymous2114s__anonymous21_autogen___1((&___ret__14s__anonymous21_1), ___src__14s__anonymous21_1)); - return ((struct __anonymous21 )___ret__14s__anonymous21_1); + return ___ret__14s__anonymous21_1; } static inline void ___constructor__F_R14s__anonymous21i_autogen___1(struct __anonymous21 *___dst__R14s__anonymous21_1, signed int __i__i_1){ @@ -629,5 +629,5 @@ ((void)((*___dst__R14s__anonymous22_1).__i__i_1=___src__14s__anonymous22_1.__i__i_1)); ((void)___constructor__F_R14s__anonymous2214s__anonymous22_autogen___1((&___ret__14s__anonymous22_1), ___src__14s__anonymous22_1)); - return ((struct __anonymous22 )___ret__14s__anonymous22_1); + return ___ret__14s__anonymous22_1; } static inline void ___constructor__F_R14s__anonymous22i_autogen___1(struct __anonymous22 *___dst__R14s__anonymous22_1, signed int __i__i_1){ @@ -655,5 +655,5 @@ ((void)((*___dst__R14s__anonymous23_1).__i__i_1=___src__14s__anonymous23_1.__i__i_1)); ((void)___constructor__F_R14s__anonymous2314s__anonymous23_autogen___1((&___ret__14s__anonymous23_1), ___src__14s__anonymous23_1)); - return ((struct __anonymous23 )___ret__14s__anonymous23_1); + return ___ret__14s__anonymous23_1; } static inline void ___constructor__F_R14s__anonymous23i_autogen___1(struct __anonymous23 *___dst__R14s__anonymous23_1, signed int __i__i_1){ @@ -672,7 +672,7 @@ __attribute__ ((unused)) signed int ___retval_main__i_1; ((void)(___retval_main__i_1=((signed int )0)) /* ?{} */); - return ((signed int )___retval_main__i_1); + return ___retval_main__i_1; ((void)(___retval_main__i_1=0) /* ?{} */); - return ((signed int )___retval_main__i_1); + return ___retval_main__i_1; } static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return __main__Fi_iPPCc__1(argc, argv); } @@ -689,4 +689,4 @@ ((void)(___retval_main__i_1=(((void)(_tmp_cp_ret0=invoke_main(__argc__i_1, __argv__PPc_1, __envp__PPc_1))) , _tmp_cp_ret0)) /* ?{} */); ((void)(_tmp_cp_ret0) /* ^?{} */); - return ((signed int )___retval_main__i_1); -} + return ___retval_main__i_1; +} Index: src/tests/.expect/32/extension.txt =================================================================== --- src/tests/.expect/32/extension.txt (revision ca278c1dcaea1b69d773c4948fb76ebdfccbc0a6) +++ src/tests/.expect/32/extension.txt (revision b10c621c395e6371e800c981a9269356098a495f) @@ -38,5 +38,5 @@ ((void)((*___dst__R2sS_1).__c__i_1=___src__2sS_1.__c__i_1)); ((void)___constructor__F_R2sS2sS_autogen___1((&___ret__2sS_1), ___src__2sS_1)); - return ((struct S )___ret__2sS_1); + return ___ret__2sS_1; } static inline void ___constructor__F_R2sSi_autogen___1(struct S *___dst__R2sS_1, signed int __a__i_1){ @@ -71,5 +71,5 @@ ((void)__builtin_memcpy(((void *)___dst__R2uU_1), ((const void *)(&___src__2uU_1)), sizeof(union U ))); ((void)___constructor__F_R2uU2uU_autogen___1((&___ret__2uU_1), ___src__2uU_1)); - return ((union U )___ret__2uU_1); + return ___ret__2uU_1; } static inline void ___constructor__F_R2uUi_autogen___1(__attribute__ ((unused)) union U *___dst__R2uU_1, signed int __src__i_1){ Index: src/tests/.expect/32/gccExtensions.txt =================================================================== --- src/tests/.expect/32/gccExtensions.txt (revision ca278c1dcaea1b69d773c4948fb76ebdfccbc0a6) +++ src/tests/.expect/32/gccExtensions.txt (revision b10c621c395e6371e800c981a9269356098a495f) @@ -64,5 +64,5 @@ ((void)((*___dst__R2sS_2).__c__i_2=___src__2sS_2.__c__i_2)); ((void)___constructor__F_R2sS2sS_autogen___2((&___ret__2sS_2), ___src__2sS_2)); - return ((struct S )___ret__2sS_2); + return ___ret__2sS_2; } inline void ___constructor__F_R2sSi_autogen___2(struct S *___dst__R2sS_2, signed int __a__i_2){ @@ -114,5 +114,5 @@ ((void)((*___dst__R3ss2_2).__i__i_2=___src__3ss2_2.__i__i_2)); ((void)___constructor__F_R3ss23ss2_autogen___2((&___ret__3ss2_2), ___src__3ss2_2)); - return ((struct s2 )___ret__3ss2_2); + return ___ret__3ss2_2; } inline void ___constructor__F_R3ss2i_autogen___2(struct s2 *___dst__R3ss2_2, signed int __i__i_2){ @@ -135,5 +135,5 @@ ((void)((*___dst__R3ss3_2).__i__i_2=___src__3ss3_2.__i__i_2)); ((void)___constructor__F_R3ss33ss3_autogen___2((&___ret__3ss3_2), ___src__3ss3_2)); - return ((struct s3 )___ret__3ss3_2); + return ___ret__3ss3_2; } inline void ___constructor__F_R3ss3i_autogen___2(struct s3 *___dst__R3ss3_2, signed int __i__i_2){ @@ -158,5 +158,5 @@ ((void)((*___dst__R3ss4_2).__i__i_2=___src__3ss4_2.__i__i_2)); ((void)___constructor__F_R3ss43ss4_autogen___2((&___ret__3ss4_2), ___src__3ss4_2)); - return ((struct s4 )___ret__3ss4_2); + return ___ret__3ss4_2; } inline void ___constructor__F_R3ss4i_autogen___2(struct s4 *___dst__R3ss4_2, signed int __i__i_2){ @@ -169,7 +169,7 @@ signed int __m3__A0A0i_2[((unsigned int )10)][((unsigned int )10)]; ((void)(___retval_main__i_1=((signed int )0)) /* ?{} */); - return ((signed int )___retval_main__i_1); + return ___retval_main__i_1; ((void)(___retval_main__i_1=0) /* ?{} */); - return ((signed int )___retval_main__i_1); + return ___retval_main__i_1; } static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return __main__Fi_iPPCc__1(argc, argv); } @@ -186,4 +186,4 @@ ((void)(___retval_main__i_1=(((void)(_tmp_cp_ret0=invoke_main(__argc__i_1, __argv__PPc_1, __envp__PPc_1))) , _tmp_cp_ret0)) /* ?{} */); ((void)(_tmp_cp_ret0) /* ^?{} */); - return ((signed int )___retval_main__i_1); + return ___retval_main__i_1; } Index: src/tests/.expect/32/literals.txt =================================================================== --- src/tests/.expect/32/literals.txt (revision ca278c1dcaea1b69d773c4948fb76ebdfccbc0a6) +++ src/tests/.expect/32/literals.txt (revision b10c621c395e6371e800c981a9269356098a495f) @@ -77,5 +77,5 @@ ((void)((*___dst__R16s_Istream_cstrUC_1).__s__Pc_1=___src__16s_Istream_cstrUC_1.__s__Pc_1)); ((void)___constructor__F_R16s_Istream_cstrUC16s_Istream_cstrUC_autogen___1((&___ret__16s_Istream_cstrUC_1), ___src__16s_Istream_cstrUC_1)); - return ((struct _Istream_cstrUC )___ret__16s_Istream_cstrUC_1); + return ___ret__16s_Istream_cstrUC_1; } static inline void ___constructor__F_R16s_Istream_cstrUCPc_autogen___1(struct _Istream_cstrUC *___dst__R16s_Istream_cstrUC_1, char *__s__Pc_1){ @@ -109,5 +109,5 @@ ((void)((*___dst__R15s_Istream_cstrC_1).__size__i_1=___src__15s_Istream_cstrC_1.__size__i_1)); ((void)___constructor__F_R15s_Istream_cstrC15s_Istream_cstrC_autogen___1((&___ret__15s_Istream_cstrC_1), ___src__15s_Istream_cstrC_1)); - return ((struct _Istream_cstrC )___ret__15s_Istream_cstrC_1); + return ___ret__15s_Istream_cstrC_1; } static inline void ___constructor__F_R15s_Istream_cstrCPc_autogen___1(struct _Istream_cstrC *___dst__R15s_Istream_cstrC_1, char *__s__Pc_1){ @@ -230,5 +230,5 @@ ((void)___constructor__F_R9sofstream9sofstream_autogen___1((&___ret__9sofstream_1), ___src__9sofstream_1)); - return ((struct ofstream )___ret__9sofstream_1); + return ___ret__9sofstream_1; } static inline void ___constructor__F_R9sofstreamPv_autogen___1(struct ofstream *___dst__R9sofstream_1, void *__file__Pv_1){ @@ -437,5 +437,5 @@ ((void)((*___dst__R9sifstream_1).__file__Pv_1=___src__9sifstream_1.__file__Pv_1)); ((void)___constructor__F_R9sifstream9sifstream_autogen___1((&___ret__9sifstream_1), ___src__9sifstream_1)); - return ((struct ifstream )___ret__9sifstream_1); + return ___ret__9sifstream_1; } static inline void ___constructor__F_R9sifstreamPv_autogen___1(struct ifstream *___dst__R9sifstream_1, void *__file__Pv_1){ @@ -1363,5 +1363,5 @@ ((void)L"a" "b" "c"); ((void)(___retval_main__i_1=0) /* ?{} */); - return ((signed int )___retval_main__i_1); + return ___retval_main__i_1; } static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return __main__Fi___1(); } @@ -1378,4 +1378,4 @@ ((void)(___retval_main__i_1=(((void)(_tmp_cp_ret0=invoke_main(__argc__i_1, __argv__PPc_1, __envp__PPc_1))) , _tmp_cp_ret0)) /* ?{} */); ((void)(_tmp_cp_ret0) /* ^?{} */); - return ((signed int )___retval_main__i_1); -} + return ___retval_main__i_1; +} Index: src/tests/.expect/64/KRfunctions.txt =================================================================== --- src/tests/.expect/64/KRfunctions.txt (revision ca278c1dcaea1b69d773c4948fb76ebdfccbc0a6) +++ src/tests/.expect/64/KRfunctions.txt (revision b10c621c395e6371e800c981a9269356098a495f) @@ -34,5 +34,5 @@ ((void)((*___dst__R2sS_1).__i__i_1=___src__2sS_1.__i__i_1)); ((void)___constructor__F_R2sS2sS_autogen___1((&___ret__2sS_1), ___src__2sS_1)); - return ((struct S )___ret__2sS_1); + return ___ret__2sS_1; } static inline void ___constructor__F_R2sSi_autogen___1(struct S *___dst__R2sS_1, signed int __i__i_1){ @@ -65,5 +65,5 @@ signed int *__x__FPi_ii__2(signed int __anonymous_object2, signed int __anonymous_object3); ((void)(___retval_f10__PFPi_ii__1=__x__FPi_ii__2) /* ?{} */); - return ((signed int *(*)(signed int __x__i_1, signed int __y__i_1))___retval_f10__PFPi_ii__1); + return ___retval_f10__PFPi_ii__1; } signed int (*__f11__FPA0i_iPiPi__1(signed int __a__i_1, signed int *__b__Pi_1, signed int *__c__Pi_1))[]{ Index: src/tests/.expect/64/attributes.txt =================================================================== --- src/tests/.expect/64/attributes.txt (revision ca278c1dcaea1b69d773c4948fb76ebdfccbc0a6) +++ src/tests/.expect/64/attributes.txt (revision b10c621c395e6371e800c981a9269356098a495f) @@ -24,5 +24,5 @@ struct __anonymous0 ___ret__13s__anonymous0_1; ((void)___constructor__F_R13s__anonymous013s__anonymous0_autogen___1((&___ret__13s__anonymous0_1), ___src__13s__anonymous0_1)); - return ((struct __anonymous0 )___ret__13s__anonymous0_1); + return ___ret__13s__anonymous0_1; } __attribute__ ((unused)) struct Agn1; @@ -42,5 +42,5 @@ struct Agn2 ___ret__5sAgn2_1; ((void)___constructor__F_R5sAgn25sAgn2_autogen___1((&___ret__5sAgn2_1), ___src__5sAgn2_1)); - return ((struct Agn2 )___ret__5sAgn2_1); + return ___ret__5sAgn2_1; } enum __attribute__ ((unused)) __anonymous1 { @@ -114,5 +114,5 @@ ((void)((*___dst__R4sFdl_1).__f9__Pi_1=___src__4sFdl_1.__f9__Pi_1)); ((void)___constructor__F_R4sFdl4sFdl_autogen___1((&___ret__4sFdl_1), ___src__4sFdl_1)); - return ((struct Fdl )___ret__4sFdl_1); + return ___ret__4sFdl_1; } static inline void ___constructor__F_R4sFdli_autogen___1(struct Fdl *___dst__R4sFdl_1, signed int __f1__i_1){ @@ -301,5 +301,5 @@ ((void)((*___dst__R13s__anonymous4_2).__i__i_2=___src__13s__anonymous4_2.__i__i_2)); ((void)___constructor__F_R13s__anonymous413s__anonymous4_autogen___2((&___ret__13s__anonymous4_2), ___src__13s__anonymous4_2)); - return ((struct __anonymous4 )___ret__13s__anonymous4_2); + return ___ret__13s__anonymous4_2; } inline void ___constructor__F_R13s__anonymous4i_autogen___2(struct __anonymous4 *___dst__R13s__anonymous4_2, signed int __i__i_2){ @@ -320,5 +320,5 @@ enum __anonymous5 ___ret__13e__anonymous5_2; ((void)(___ret__13e__anonymous5_2=((*___dst__R13e__anonymous5_2)=___src__13e__anonymous5_2)) /* ?{} */); - return ((enum __anonymous5 )___ret__13e__anonymous5_2); + return ___ret__13e__anonymous5_2; } ((void)sizeof(enum __anonymous5 )); @@ -350,4 +350,4 @@ struct Vad ___ret__4sVad_1; ((void)___constructor__F_R4sVad4sVad_autogen___1((&___ret__4sVad_1), ___src__4sVad_1)); - return ((struct Vad )___ret__4sVad_1); -} + return ___ret__4sVad_1; +} Index: src/tests/.expect/64/declarationSpecifier.txt =================================================================== --- src/tests/.expect/64/declarationSpecifier.txt (revision ca278c1dcaea1b69d773c4948fb76ebdfccbc0a6) +++ src/tests/.expect/64/declarationSpecifier.txt (revision b10c621c395e6371e800c981a9269356098a495f) @@ -33,5 +33,5 @@ ((void)((*___dst__R13s__anonymous0_1).__i__i_1=___src__13s__anonymous0_1.__i__i_1)); ((void)___constructor__F_R13s__anonymous013s__anonymous0_autogen___1((&___ret__13s__anonymous0_1), ___src__13s__anonymous0_1)); - return ((struct __anonymous0 )___ret__13s__anonymous0_1); + return ___ret__13s__anonymous0_1; } static inline void ___constructor__F_R13s__anonymous0i_autogen___1(struct __anonymous0 *___dst__R13s__anonymous0_1, signed int __i__i_1){ @@ -59,5 +59,5 @@ ((void)((*___dst__R13s__anonymous1_1).__i__i_1=___src__13s__anonymous1_1.__i__i_1)); ((void)___constructor__F_R13s__anonymous113s__anonymous1_autogen___1((&___ret__13s__anonymous1_1), ___src__13s__anonymous1_1)); - return ((struct __anonymous1 )___ret__13s__anonymous1_1); + return ___ret__13s__anonymous1_1; } static inline void ___constructor__F_R13s__anonymous1i_autogen___1(struct __anonymous1 *___dst__R13s__anonymous1_1, signed int __i__i_1){ @@ -85,5 +85,5 @@ ((void)((*___dst__R13s__anonymous2_1).__i__i_1=___src__13s__anonymous2_1.__i__i_1)); ((void)___constructor__F_R13s__anonymous213s__anonymous2_autogen___1((&___ret__13s__anonymous2_1), ___src__13s__anonymous2_1)); - return ((struct __anonymous2 )___ret__13s__anonymous2_1); + return ___ret__13s__anonymous2_1; } static inline void ___constructor__F_R13s__anonymous2i_autogen___1(struct __anonymous2 *___dst__R13s__anonymous2_1, signed int __i__i_1){ @@ -111,5 +111,5 @@ ((void)((*___dst__R13s__anonymous3_1).__i__i_1=___src__13s__anonymous3_1.__i__i_1)); ((void)___constructor__F_R13s__anonymous313s__anonymous3_autogen___1((&___ret__13s__anonymous3_1), ___src__13s__anonymous3_1)); - return ((struct __anonymous3 )___ret__13s__anonymous3_1); + return ___ret__13s__anonymous3_1; } static inline void ___constructor__F_R13s__anonymous3i_autogen___1(struct __anonymous3 *___dst__R13s__anonymous3_1, signed int __i__i_1){ @@ -137,5 +137,5 @@ ((void)((*___dst__R13s__anonymous4_1).__i__i_1=___src__13s__anonymous4_1.__i__i_1)); ((void)___constructor__F_R13s__anonymous413s__anonymous4_autogen___1((&___ret__13s__anonymous4_1), ___src__13s__anonymous4_1)); - return ((struct __anonymous4 )___ret__13s__anonymous4_1); + return ___ret__13s__anonymous4_1; } static inline void ___constructor__F_R13s__anonymous4i_autogen___1(struct __anonymous4 *___dst__R13s__anonymous4_1, signed int __i__i_1){ @@ -163,5 +163,5 @@ ((void)((*___dst__R13s__anonymous5_1).__i__i_1=___src__13s__anonymous5_1.__i__i_1)); ((void)___constructor__F_R13s__anonymous513s__anonymous5_autogen___1((&___ret__13s__anonymous5_1), ___src__13s__anonymous5_1)); - return ((struct __anonymous5 )___ret__13s__anonymous5_1); + return ___ret__13s__anonymous5_1; } static inline void ___constructor__F_R13s__anonymous5i_autogen___1(struct __anonymous5 *___dst__R13s__anonymous5_1, signed int __i__i_1){ @@ -189,5 +189,5 @@ ((void)((*___dst__R13s__anonymous6_1).__i__i_1=___src__13s__anonymous6_1.__i__i_1)); ((void)___constructor__F_R13s__anonymous613s__anonymous6_autogen___1((&___ret__13s__anonymous6_1), ___src__13s__anonymous6_1)); - return ((struct __anonymous6 )___ret__13s__anonymous6_1); + return ___ret__13s__anonymous6_1; } static inline void ___constructor__F_R13s__anonymous6i_autogen___1(struct __anonymous6 *___dst__R13s__anonymous6_1, signed int __i__i_1){ @@ -215,5 +215,5 @@ ((void)((*___dst__R13s__anonymous7_1).__i__i_1=___src__13s__anonymous7_1.__i__i_1)); ((void)___constructor__F_R13s__anonymous713s__anonymous7_autogen___1((&___ret__13s__anonymous7_1), ___src__13s__anonymous7_1)); - return ((struct __anonymous7 )___ret__13s__anonymous7_1); + return ___ret__13s__anonymous7_1; } static inline void ___constructor__F_R13s__anonymous7i_autogen___1(struct __anonymous7 *___dst__R13s__anonymous7_1, signed int __i__i_1){ @@ -249,5 +249,5 @@ ((void)((*___dst__R13s__anonymous8_1).__i__s_1=___src__13s__anonymous8_1.__i__s_1)); ((void)___constructor__F_R13s__anonymous813s__anonymous8_autogen___1((&___ret__13s__anonymous8_1), ___src__13s__anonymous8_1)); - return ((struct __anonymous8 )___ret__13s__anonymous8_1); + return ___ret__13s__anonymous8_1; } static inline void ___constructor__F_R13s__anonymous8s_autogen___1(struct __anonymous8 *___dst__R13s__anonymous8_1, signed short int __i__s_1){ @@ -275,5 +275,5 @@ ((void)((*___dst__R13s__anonymous9_1).__i__s_1=___src__13s__anonymous9_1.__i__s_1)); ((void)___constructor__F_R13s__anonymous913s__anonymous9_autogen___1((&___ret__13s__anonymous9_1), ___src__13s__anonymous9_1)); - return ((struct __anonymous9 )___ret__13s__anonymous9_1); + return ___ret__13s__anonymous9_1; } static inline void ___constructor__F_R13s__anonymous9s_autogen___1(struct __anonymous9 *___dst__R13s__anonymous9_1, signed short int __i__s_1){ @@ -301,5 +301,5 @@ ((void)((*___dst__R14s__anonymous10_1).__i__s_1=___src__14s__anonymous10_1.__i__s_1)); ((void)___constructor__F_R14s__anonymous1014s__anonymous10_autogen___1((&___ret__14s__anonymous10_1), ___src__14s__anonymous10_1)); - return ((struct __anonymous10 )___ret__14s__anonymous10_1); + return ___ret__14s__anonymous10_1; } static inline void ___constructor__F_R14s__anonymous10s_autogen___1(struct __anonymous10 *___dst__R14s__anonymous10_1, signed short int __i__s_1){ @@ -327,5 +327,5 @@ ((void)((*___dst__R14s__anonymous11_1).__i__s_1=___src__14s__anonymous11_1.__i__s_1)); ((void)___constructor__F_R14s__anonymous1114s__anonymous11_autogen___1((&___ret__14s__anonymous11_1), ___src__14s__anonymous11_1)); - return ((struct __anonymous11 )___ret__14s__anonymous11_1); + return ___ret__14s__anonymous11_1; } static inline void ___constructor__F_R14s__anonymous11s_autogen___1(struct __anonymous11 *___dst__R14s__anonymous11_1, signed short int __i__s_1){ @@ -353,5 +353,5 @@ ((void)((*___dst__R14s__anonymous12_1).__i__s_1=___src__14s__anonymous12_1.__i__s_1)); ((void)___constructor__F_R14s__anonymous1214s__anonymous12_autogen___1((&___ret__14s__anonymous12_1), ___src__14s__anonymous12_1)); - return ((struct __anonymous12 )___ret__14s__anonymous12_1); + return ___ret__14s__anonymous12_1; } static inline void ___constructor__F_R14s__anonymous12s_autogen___1(struct __anonymous12 *___dst__R14s__anonymous12_1, signed short int __i__s_1){ @@ -379,5 +379,5 @@ ((void)((*___dst__R14s__anonymous13_1).__i__s_1=___src__14s__anonymous13_1.__i__s_1)); ((void)___constructor__F_R14s__anonymous1314s__anonymous13_autogen___1((&___ret__14s__anonymous13_1), ___src__14s__anonymous13_1)); - return ((struct __anonymous13 )___ret__14s__anonymous13_1); + return ___ret__14s__anonymous13_1; } static inline void ___constructor__F_R14s__anonymous13s_autogen___1(struct __anonymous13 *___dst__R14s__anonymous13_1, signed short int __i__s_1){ @@ -405,5 +405,5 @@ ((void)((*___dst__R14s__anonymous14_1).__i__s_1=___src__14s__anonymous14_1.__i__s_1)); ((void)___constructor__F_R14s__anonymous1414s__anonymous14_autogen___1((&___ret__14s__anonymous14_1), ___src__14s__anonymous14_1)); - return ((struct __anonymous14 )___ret__14s__anonymous14_1); + return ___ret__14s__anonymous14_1; } static inline void ___constructor__F_R14s__anonymous14s_autogen___1(struct __anonymous14 *___dst__R14s__anonymous14_1, signed short int __i__s_1){ @@ -431,5 +431,5 @@ ((void)((*___dst__R14s__anonymous15_1).__i__s_1=___src__14s__anonymous15_1.__i__s_1)); ((void)___constructor__F_R14s__anonymous1514s__anonymous15_autogen___1((&___ret__14s__anonymous15_1), ___src__14s__anonymous15_1)); - return ((struct __anonymous15 )___ret__14s__anonymous15_1); + return ___ret__14s__anonymous15_1; } static inline void ___constructor__F_R14s__anonymous15s_autogen___1(struct __anonymous15 *___dst__R14s__anonymous15_1, signed short int __i__s_1){ @@ -473,5 +473,5 @@ ((void)((*___dst__R14s__anonymous16_1).__i__i_1=___src__14s__anonymous16_1.__i__i_1)); ((void)___constructor__F_R14s__anonymous1614s__anonymous16_autogen___1((&___ret__14s__anonymous16_1), ___src__14s__anonymous16_1)); - return ((struct __anonymous16 )___ret__14s__anonymous16_1); + return ___ret__14s__anonymous16_1; } static inline void ___constructor__F_R14s__anonymous16i_autogen___1(struct __anonymous16 *___dst__R14s__anonymous16_1, signed int __i__i_1){ @@ -499,5 +499,5 @@ ((void)((*___dst__R14s__anonymous17_1).__i__i_1=___src__14s__anonymous17_1.__i__i_1)); ((void)___constructor__F_R14s__anonymous1714s__anonymous17_autogen___1((&___ret__14s__anonymous17_1), ___src__14s__anonymous17_1)); - return ((struct __anonymous17 )___ret__14s__anonymous17_1); + return ___ret__14s__anonymous17_1; } static inline void ___constructor__F_R14s__anonymous17i_autogen___1(struct __anonymous17 *___dst__R14s__anonymous17_1, signed int __i__i_1){ @@ -525,5 +525,5 @@ ((void)((*___dst__R14s__anonymous18_1).__i__i_1=___src__14s__anonymous18_1.__i__i_1)); ((void)___constructor__F_R14s__anonymous1814s__anonymous18_autogen___1((&___ret__14s__anonymous18_1), ___src__14s__anonymous18_1)); - return ((struct __anonymous18 )___ret__14s__anonymous18_1); + return ___ret__14s__anonymous18_1; } static inline void ___constructor__F_R14s__anonymous18i_autogen___1(struct __anonymous18 *___dst__R14s__anonymous18_1, signed int __i__i_1){ @@ -551,5 +551,5 @@ ((void)((*___dst__R14s__anonymous19_1).__i__i_1=___src__14s__anonymous19_1.__i__i_1)); ((void)___constructor__F_R14s__anonymous1914s__anonymous19_autogen___1((&___ret__14s__anonymous19_1), ___src__14s__anonymous19_1)); - return ((struct __anonymous19 )___ret__14s__anonymous19_1); + return ___ret__14s__anonymous19_1; } static inline void ___constructor__F_R14s__anonymous19i_autogen___1(struct __anonymous19 *___dst__R14s__anonymous19_1, signed int __i__i_1){ @@ -577,5 +577,5 @@ ((void)((*___dst__R14s__anonymous20_1).__i__i_1=___src__14s__anonymous20_1.__i__i_1)); ((void)___constructor__F_R14s__anonymous2014s__anonymous20_autogen___1((&___ret__14s__anonymous20_1), ___src__14s__anonymous20_1)); - return ((struct __anonymous20 )___ret__14s__anonymous20_1); + return ___ret__14s__anonymous20_1; } static inline void ___constructor__F_R14s__anonymous20i_autogen___1(struct __anonymous20 *___dst__R14s__anonymous20_1, signed int __i__i_1){ @@ -603,5 +603,5 @@ ((void)((*___dst__R14s__anonymous21_1).__i__i_1=___src__14s__anonymous21_1.__i__i_1)); ((void)___constructor__F_R14s__anonymous2114s__anonymous21_autogen___1((&___ret__14s__anonymous21_1), ___src__14s__anonymous21_1)); - return ((struct __anonymous21 )___ret__14s__anonymous21_1); + return ___ret__14s__anonymous21_1; } static inline void ___constructor__F_R14s__anonymous21i_autogen___1(struct __anonymous21 *___dst__R14s__anonymous21_1, signed int __i__i_1){ @@ -629,5 +629,5 @@ ((void)((*___dst__R14s__anonymous22_1).__i__i_1=___src__14s__anonymous22_1.__i__i_1)); ((void)___constructor__F_R14s__anonymous2214s__anonymous22_autogen___1((&___ret__14s__anonymous22_1), ___src__14s__anonymous22_1)); - return ((struct __anonymous22 )___ret__14s__anonymous22_1); + return ___ret__14s__anonymous22_1; } static inline void ___constructor__F_R14s__anonymous22i_autogen___1(struct __anonymous22 *___dst__R14s__anonymous22_1, signed int __i__i_1){ @@ -655,5 +655,5 @@ ((void)((*___dst__R14s__anonymous23_1).__i__i_1=___src__14s__anonymous23_1.__i__i_1)); ((void)___constructor__F_R14s__anonymous2314s__anonymous23_autogen___1((&___ret__14s__anonymous23_1), ___src__14s__anonymous23_1)); - return ((struct __anonymous23 )___ret__14s__anonymous23_1); + return ___ret__14s__anonymous23_1; } static inline void ___constructor__F_R14s__anonymous23i_autogen___1(struct __anonymous23 *___dst__R14s__anonymous23_1, signed int __i__i_1){ @@ -672,7 +672,7 @@ __attribute__ ((unused)) signed int ___retval_main__i_1; ((void)(___retval_main__i_1=((signed int )0)) /* ?{} */); - return ((signed int )___retval_main__i_1); + return ___retval_main__i_1; ((void)(___retval_main__i_1=0) /* ?{} */); - return ((signed int )___retval_main__i_1); + return ___retval_main__i_1; } static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return __main__Fi_iPPCc__1(argc, argv); } @@ -689,4 +689,4 @@ ((void)(___retval_main__i_1=(((void)(_tmp_cp_ret0=invoke_main(__argc__i_1, __argv__PPc_1, __envp__PPc_1))) , _tmp_cp_ret0)) /* ?{} */); ((void)(_tmp_cp_ret0) /* ^?{} */); - return ((signed int )___retval_main__i_1); -} + return ___retval_main__i_1; +} Index: src/tests/.expect/64/extension.txt =================================================================== --- src/tests/.expect/64/extension.txt (revision ca278c1dcaea1b69d773c4948fb76ebdfccbc0a6) +++ src/tests/.expect/64/extension.txt (revision b10c621c395e6371e800c981a9269356098a495f) @@ -38,5 +38,5 @@ ((void)((*___dst__R2sS_1).__c__i_1=___src__2sS_1.__c__i_1)); ((void)___constructor__F_R2sS2sS_autogen___1((&___ret__2sS_1), ___src__2sS_1)); - return ((struct S )___ret__2sS_1); + return ___ret__2sS_1; } static inline void ___constructor__F_R2sSi_autogen___1(struct S *___dst__R2sS_1, signed int __a__i_1){ @@ -71,5 +71,5 @@ ((void)__builtin_memcpy(((void *)___dst__R2uU_1), ((const void *)(&___src__2uU_1)), sizeof(union U ))); ((void)___constructor__F_R2uU2uU_autogen___1((&___ret__2uU_1), ___src__2uU_1)); - return ((union U )___ret__2uU_1); + return ___ret__2uU_1; } static inline void ___constructor__F_R2uUi_autogen___1(__attribute__ ((unused)) union U *___dst__R2uU_1, signed int __src__i_1){ Index: src/tests/.expect/64/gccExtensions.txt =================================================================== --- src/tests/.expect/64/gccExtensions.txt (revision ca278c1dcaea1b69d773c4948fb76ebdfccbc0a6) +++ src/tests/.expect/64/gccExtensions.txt (revision b10c621c395e6371e800c981a9269356098a495f) @@ -64,5 +64,5 @@ ((void)((*___dst__R2sS_2).__c__i_2=___src__2sS_2.__c__i_2)); ((void)___constructor__F_R2sS2sS_autogen___2((&___ret__2sS_2), ___src__2sS_2)); - return ((struct S )___ret__2sS_2); + return ___ret__2sS_2; } inline void ___constructor__F_R2sSi_autogen___2(struct S *___dst__R2sS_2, signed int __a__i_2){ @@ -114,5 +114,5 @@ ((void)((*___dst__R3ss2_2).__i__i_2=___src__3ss2_2.__i__i_2)); ((void)___constructor__F_R3ss23ss2_autogen___2((&___ret__3ss2_2), ___src__3ss2_2)); - return ((struct s2 )___ret__3ss2_2); + return ___ret__3ss2_2; } inline void ___constructor__F_R3ss2i_autogen___2(struct s2 *___dst__R3ss2_2, signed int __i__i_2){ @@ -135,5 +135,5 @@ ((void)((*___dst__R3ss3_2).__i__i_2=___src__3ss3_2.__i__i_2)); ((void)___constructor__F_R3ss33ss3_autogen___2((&___ret__3ss3_2), ___src__3ss3_2)); - return ((struct s3 )___ret__3ss3_2); + return ___ret__3ss3_2; } inline void ___constructor__F_R3ss3i_autogen___2(struct s3 *___dst__R3ss3_2, signed int __i__i_2){ @@ -158,5 +158,5 @@ ((void)((*___dst__R3ss4_2).__i__i_2=___src__3ss4_2.__i__i_2)); ((void)___constructor__F_R3ss43ss4_autogen___2((&___ret__3ss4_2), ___src__3ss4_2)); - return ((struct s4 )___ret__3ss4_2); + return ___ret__3ss4_2; } inline void ___constructor__F_R3ss4i_autogen___2(struct s4 *___dst__R3ss4_2, signed int __i__i_2){ @@ -169,7 +169,7 @@ signed int __m3__A0A0i_2[((unsigned long int )10)][((unsigned long int )10)]; ((void)(___retval_main__i_1=((signed int )0)) /* ?{} */); - return ((signed int )___retval_main__i_1); + return ___retval_main__i_1; ((void)(___retval_main__i_1=0) /* ?{} */); - return ((signed int )___retval_main__i_1); + return ___retval_main__i_1; } static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return __main__Fi_iPPCc__1(argc, argv); } @@ -186,4 +186,4 @@ ((void)(___retval_main__i_1=(((void)(_tmp_cp_ret0=invoke_main(__argc__i_1, __argv__PPc_1, __envp__PPc_1))) , _tmp_cp_ret0)) /* ?{} */); ((void)(_tmp_cp_ret0) /* ^?{} */); - return ((signed int )___retval_main__i_1); + return ___retval_main__i_1; } Index: src/tests/.expect/64/literals.txt =================================================================== --- src/tests/.expect/64/literals.txt (revision ca278c1dcaea1b69d773c4948fb76ebdfccbc0a6) +++ src/tests/.expect/64/literals.txt (revision b10c621c395e6371e800c981a9269356098a495f) @@ -77,5 +77,5 @@ ((void)((*___dst__R16s_Istream_cstrUC_1).__s__Pc_1=___src__16s_Istream_cstrUC_1.__s__Pc_1)); ((void)___constructor__F_R16s_Istream_cstrUC16s_Istream_cstrUC_autogen___1((&___ret__16s_Istream_cstrUC_1), ___src__16s_Istream_cstrUC_1)); - return ((struct _Istream_cstrUC )___ret__16s_Istream_cstrUC_1); + return ___ret__16s_Istream_cstrUC_1; } static inline void ___constructor__F_R16s_Istream_cstrUCPc_autogen___1(struct _Istream_cstrUC *___dst__R16s_Istream_cstrUC_1, char *__s__Pc_1){ @@ -109,5 +109,5 @@ ((void)((*___dst__R15s_Istream_cstrC_1).__size__i_1=___src__15s_Istream_cstrC_1.__size__i_1)); ((void)___constructor__F_R15s_Istream_cstrC15s_Istream_cstrC_autogen___1((&___ret__15s_Istream_cstrC_1), ___src__15s_Istream_cstrC_1)); - return ((struct _Istream_cstrC )___ret__15s_Istream_cstrC_1); + return ___ret__15s_Istream_cstrC_1; } static inline void ___constructor__F_R15s_Istream_cstrCPc_autogen___1(struct _Istream_cstrC *___dst__R15s_Istream_cstrC_1, char *__s__Pc_1){ @@ -230,5 +230,5 @@ ((void)___constructor__F_R9sofstream9sofstream_autogen___1((&___ret__9sofstream_1), ___src__9sofstream_1)); - return ((struct ofstream )___ret__9sofstream_1); + return ___ret__9sofstream_1; } static inline void ___constructor__F_R9sofstreamPv_autogen___1(struct ofstream *___dst__R9sofstream_1, void *__file__Pv_1){ @@ -437,5 +437,5 @@ ((void)((*___dst__R9sifstream_1).__file__Pv_1=___src__9sifstream_1.__file__Pv_1)); ((void)___constructor__F_R9sifstream9sifstream_autogen___1((&___ret__9sifstream_1), ___src__9sifstream_1)); - return ((struct ifstream )___ret__9sifstream_1); + return ___ret__9sifstream_1; } static inline void ___constructor__F_R9sifstreamPv_autogen___1(struct ifstream *___dst__R9sifstream_1, void *__file__Pv_1){ @@ -1363,5 +1363,5 @@ ((void)L"a" "b" "c"); ((void)(___retval_main__i_1=0) /* ?{} */); - return ((signed int )___retval_main__i_1); + return ___retval_main__i_1; } static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return __main__Fi___1(); } @@ -1378,4 +1378,4 @@ ((void)(___retval_main__i_1=(((void)(_tmp_cp_ret0=invoke_main(__argc__i_1, __argv__PPc_1, __envp__PPc_1))) , _tmp_cp_ret0)) /* ?{} */); ((void)(_tmp_cp_ret0) /* ^?{} */); - return ((signed int )___retval_main__i_1); -} + return ___retval_main__i_1; +} Index: src/tests/.expect/boundedBuffer.txt =================================================================== --- src/tests/.expect/boundedBuffer.txt (revision ca278c1dcaea1b69d773c4948fb76ebdfccbc0a6) +++ (revision ) @@ -1,1 +1,0 @@ -total:500000 Index: src/tests/.expect/concurrent/boundedBuffer.txt =================================================================== --- src/tests/.expect/concurrent/boundedBuffer.txt (revision b10c621c395e6371e800c981a9269356098a495f) +++ src/tests/.expect/concurrent/boundedBuffer.txt (revision b10c621c395e6371e800c981a9269356098a495f) @@ -0,0 +1,1 @@ +total:500000 Index: src/tests/.expect/concurrent/fmtLines.txt =================================================================== --- src/tests/.expect/concurrent/fmtLines.txt (revision b10c621c395e6371e800c981a9269356098a495f) +++ src/tests/.expect/concurrent/fmtLines.txt (revision b10c621c395e6371e800c981a9269356098a495f) @@ -0,0 +1,78 @@ +// / / Cf oral l Ve rsio +n 1. 0.0 Copy righ t (C +) 20 17 U nive rsit y of + Wat erlo o/// / Th e co +nten ts o f th is f ile +are cove red unde r th +e li cenc e ag reem ent +in t he// fil e "L ICEN +CE" dist ribu ted with + Cfo rall .// // f mtLi +nes. cc - - // // Auth +or : P eter + A. Buhr // C reat ed O +n : Su n Se p 17 + 21: 56:1 5 20 17// Las +t Mo difi ed B y : Pete +r A. Buh r// Last Mod +ifie d On : M on S ep 1 +8 11 :35: 57 2 017/ / Up +date Cou nt : 31/ +/ #i nclu de < fstr eam> +#inc lude +coro utin e Fo rmat { c +har ch; // + use d fo r co mmun icat +ion int g, b ; + // g loba l be caus +e us ed i n de stru ctor +};vo id ? {}( Form at & + fmt ) { resu me( +fmt ); // s +tart cor outi ne}v oid +^?{} ( Fo rmat & f mt ) + { if ( f mt.g != +0 || fmt .b ! = 0 ) so +ut | end l;}v oid main +( Fo rmat & f mt ) { f +or ( ;; ) { + // for as m any char +acte rs for ( fm t.g += 0; fmt .g < 5; fmt. +g += 1 ) { // g roup +s of 5 b lock s for +( fm t.b = 0; fmt .b < + 4; fmt. b += 1 ) { / +/ bl ocks of 4 ch arac +ters for ( ;; ) { + / / fo r ne wlin +e ch arac ters sus +pend (); if ( fmt +.ch != ' \n' ) br eak; + // ign ore newl ine + } // for s out +| fm t.ch ; // p +rint cha ract er } / +/ fo r sout | " "; + // p rint blo +ck s epar ator } // f +or sout | e ndl; + // prin t gr oup +sepa rato r } // f or} +// m ainv oid prt( For +mat & fm t, c har ch ) + { fm t.ch = c h; + re sume ( fm t ); } // + prt int main () { For +mat fmt; cha r ch ; fo +r ( ;; ) { sin | ch +; / / re ad o +ne c hara cter i f ( +eof( sin ) ) bre ak; + // eof ? prt( + fmt , ch ); } // for +} // mai n// Loca l Va +riab les: /// / ta b-wi +dth: 4 / /// comp ile- +comm and: "cf a fm tLin +es.c " // // E nd: // Index: src/tests/.expect/concurrent/matrixSum.txt =================================================================== --- src/tests/.expect/concurrent/matrixSum.txt (revision b10c621c395e6371e800c981a9269356098a495f) +++ src/tests/.expect/concurrent/matrixSum.txt (revision b10c621c395e6371e800c981a9269356098a495f) @@ -0,0 +1,1 @@ +10000 Index: src/tests/.expect/concurrent/pingpong.txt =================================================================== --- src/tests/.expect/concurrent/pingpong.txt (revision b10c621c395e6371e800c981a9269356098a495f) +++ src/tests/.expect/concurrent/pingpong.txt (revision b10c621c395e6371e800c981a9269356098a495f) @@ -0,0 +1,40 @@ +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong Index: src/tests/.expect/concurrent/prodcons.txt =================================================================== --- src/tests/.expect/concurrent/prodcons.txt (revision b10c621c395e6371e800c981a9269356098a495f) +++ src/tests/.expect/concurrent/prodcons.txt (revision b10c621c395e6371e800c981a9269356098a495f) @@ -0,0 +1,33 @@ +47 88 +47 88 + $1 + $1 +1 +68 24 + # 1 +68 24 + $2 + $2 +2 +58 18 + # 2 +58 18 + $3 + $3 +3 +55 82 + # 3 +55 82 + $4 + $4 +4 +60 87 + # 4 +60 87 + $5 + $5 +5 + # 5 +cons stops +prod stops +main stops Index: src/tests/.expect/fmtLines.txt =================================================================== --- src/tests/.expect/fmtLines.txt (revision ca278c1dcaea1b69d773c4948fb76ebdfccbc0a6) +++ (revision ) @@ -1,78 +1,0 @@ -// / / Cf oral l Ve rsio -n 1. 0.0 Copy righ t (C -) 20 17 U nive rsit y of - Wat erlo o/// / Th e co -nten ts o f th is f ile -are cove red unde r th -e li cenc e ag reem ent -in t he// fil e "L ICEN -CE" dist ribu ted with - Cfo rall .// // f mtLi -nes. cc - - // // Auth -or : P eter - A. Buhr // C reat ed O -n : Su n Se p 17 - 21: 56:1 5 20 17// Las -t Mo difi ed B y : Pete -r A. Buh r// Last Mod -ifie d On : M on S ep 1 -8 11 :35: 57 2 017/ / Up -date Cou nt : 31/ -/ #i nclu de < fstr eam> -#inc lude -coro utin e Fo rmat { c -har ch; // - use d fo r co mmun icat -ion int g, b ; - // g loba l be caus -e us ed i n de stru ctor -};vo id ? {}( Form at & - fmt ) { resu me( -fmt ); // s -tart cor outi ne}v oid -^?{} ( Fo rmat & f mt ) - { if ( f mt.g != -0 || fmt .b ! = 0 ) so -ut | end l;}v oid main -( Fo rmat & f mt ) { f -or ( ;; ) { - // for as m any char -acte rs for ( fm t.g -= 0; fmt .g < 5; fmt. -g += 1 ) { // g roup -s of 5 b lock s for -( fm t.b = 0; fmt .b < - 4; fmt. b += 1 ) { / -/ bl ocks of 4 ch arac -ters for ( ;; ) { - / / fo r ne wlin -e ch arac ters sus -pend (); if ( fmt -.ch != ' \n' ) br eak; - // ign ore newl ine - } // for s out -| fm t.ch ; // p -rint cha ract er } / -/ fo r sout | " "; - // p rint blo -ck s epar ator } // f -or sout | e ndl; - // prin t gr oup -sepa rato r } // f or} -// m ainv oid prt( For -mat & fm t, c har ch ) - { fm t.ch = c h; - re sume ( fm t ); } // - prt int main () { For -mat fmt; cha r ch ; fo -r ( ;; ) { sin | ch -; / / re ad o -ne c hara cter i f ( -eof( sin ) ) bre ak; - // eof ? prt( - fmt , ch ); } // for -} // mai n// Loca l Va -riab les: /// / ta b-wi -dth: 4 / /// comp ile- -comm and: "cf a fm tLin -es.c " // // E nd: // Index: src/tests/.expect/matrixSum.txt =================================================================== --- src/tests/.expect/matrixSum.txt (revision ca278c1dcaea1b69d773c4948fb76ebdfccbc0a6) +++ (revision ) @@ -1,1 +1,0 @@ -10000 Index: src/tests/.expect/pingpong.txt =================================================================== --- src/tests/.expect/pingpong.txt (revision ca278c1dcaea1b69d773c4948fb76ebdfccbc0a6) +++ (revision ) @@ -1,40 +1,0 @@ -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong Index: src/tests/.expect/prodcons.txt =================================================================== --- src/tests/.expect/prodcons.txt (revision ca278c1dcaea1b69d773c4948fb76ebdfccbc0a6) +++ (revision ) @@ -1,33 +1,0 @@ -47 88 -47 88 - $1 - $1 -1 -68 24 - # 1 -68 24 - $2 - $2 -2 -58 18 - # 2 -58 18 - $3 - $3 -3 -55 82 - # 3 -55 82 - $4 - $4 -4 -60 87 - # 4 -60 87 - $5 - $5 -5 - # 5 -cons stops -prod stops -main stops Index: src/tests/.expect/references.txt =================================================================== --- src/tests/.expect/references.txt (revision ca278c1dcaea1b69d773c4948fb76ebdfccbc0a6) +++ src/tests/.expect/references.txt (revision b10c621c395e6371e800c981a9269356098a495f) @@ -2,4 +2,6 @@ 12 12 1 12 12 1 1 +13 1 12 +14 14 Default constructing a Y Copy constructing a Y Index: src/tests/Makefile.am =================================================================== --- src/tests/Makefile.am (revision ca278c1dcaea1b69d773c4948fb76ebdfccbc0a6) +++ src/tests/Makefile.am (revision b10c621c395e6371e800c981a9269356098a495f) @@ -11,6 +11,6 @@ ## Created On : Sun May 31 09:08:15 2015 ## Last Modified By : Peter A. Buhr -## Last Modified On : Mon Sep 11 16:17:16 2017 -## Update Count : 45 +## Last Modified On : Tue Oct 10 14:04:40 2017 +## Update Count : 47 ############################################################################### @@ -22,21 +22,25 @@ concurrent = yes quick_test += coroutine thread monitor -concurrent_test = \ - coroutine \ - thread \ - monitor \ - multi-monitor \ - preempt \ - sched-int-block \ - sched-int-disjoint \ - sched-int-wait \ - sched-ext-barge \ - sched-ext-dtor \ - sched-ext-else \ - sched-ext-parse \ - sched-ext-recurse \ - sched-ext-statment \ +concurrent_test = \ + coroutine \ + fmtLines \ + pingpong \ + prodcons \ + thread \ + matrixSum \ + monitor \ + multi-monitor \ + boundedBuffer \ + preempt \ + sched-int-block \ + sched-int-disjoint \ + sched-int-wait \ + sched-ext-barge \ + sched-ext-dtor \ + sched-ext-else \ + sched-ext-parse \ + sched-ext-recurse \ + sched-ext-statment \ sched-ext-when - else concurrent=no Index: src/tests/Makefile.in =================================================================== --- src/tests/Makefile.in (revision ca278c1dcaea1b69d773c4948fb76ebdfccbc0a6) +++ src/tests/Makefile.in (revision b10c621c395e6371e800c981a9269356098a495f) @@ -321,18 +321,23 @@ @BUILD_CONCURRENCY_FALSE@concurrent_test = @BUILD_CONCURRENCY_TRUE@concurrent_test = \ -@BUILD_CONCURRENCY_TRUE@ coroutine \ -@BUILD_CONCURRENCY_TRUE@ thread \ -@BUILD_CONCURRENCY_TRUE@ monitor \ -@BUILD_CONCURRENCY_TRUE@ multi-monitor \ -@BUILD_CONCURRENCY_TRUE@ preempt \ -@BUILD_CONCURRENCY_TRUE@ sched-int-block \ -@BUILD_CONCURRENCY_TRUE@ sched-int-disjoint \ -@BUILD_CONCURRENCY_TRUE@ sched-int-wait \ -@BUILD_CONCURRENCY_TRUE@ sched-ext-barge \ -@BUILD_CONCURRENCY_TRUE@ sched-ext-dtor \ -@BUILD_CONCURRENCY_TRUE@ sched-ext-else \ -@BUILD_CONCURRENCY_TRUE@ sched-ext-parse \ -@BUILD_CONCURRENCY_TRUE@ sched-ext-recurse \ -@BUILD_CONCURRENCY_TRUE@ sched-ext-statment \ +@BUILD_CONCURRENCY_TRUE@ coroutine \ +@BUILD_CONCURRENCY_TRUE@ fmtLines \ +@BUILD_CONCURRENCY_TRUE@ pingpong \ +@BUILD_CONCURRENCY_TRUE@ prodcons \ +@BUILD_CONCURRENCY_TRUE@ thread \ +@BUILD_CONCURRENCY_TRUE@ matrixSum \ +@BUILD_CONCURRENCY_TRUE@ monitor \ +@BUILD_CONCURRENCY_TRUE@ multi-monitor \ +@BUILD_CONCURRENCY_TRUE@ boundedBuffer \ +@BUILD_CONCURRENCY_TRUE@ preempt \ +@BUILD_CONCURRENCY_TRUE@ sched-int-block \ +@BUILD_CONCURRENCY_TRUE@ sched-int-disjoint \ +@BUILD_CONCURRENCY_TRUE@ sched-int-wait \ +@BUILD_CONCURRENCY_TRUE@ sched-ext-barge \ +@BUILD_CONCURRENCY_TRUE@ sched-ext-dtor \ +@BUILD_CONCURRENCY_TRUE@ sched-ext-else \ +@BUILD_CONCURRENCY_TRUE@ sched-ext-parse \ +@BUILD_CONCURRENCY_TRUE@ sched-ext-recurse \ +@BUILD_CONCURRENCY_TRUE@ sched-ext-statment \ @BUILD_CONCURRENCY_TRUE@ sched-ext-when Index: src/tests/references.c =================================================================== --- src/tests/references.c (revision ca278c1dcaea1b69d773c4948fb76ebdfccbc0a6) +++ src/tests/references.c (revision b10c621c395e6371e800c981a9269356098a495f) @@ -37,4 +37,8 @@ int * toptr( int & r ) { return &r; } +void changeRef( int & r ) { + r++; +} + int main() { int x = 123456, *p1 = &x, **p2 = &p1, ***p3 = &p2, @@ -43,5 +47,5 @@ **p3 = &x; // change p1 *p3 = &p1; // change p2 - int y, z, & ar[3] = { x, y, z }; // initialize array of references + int y = 0, z = 11, & ar[3] = { x, y, z }; // initialize array of references // test that basic reference properties are true - r1 should be an alias for x @@ -52,4 +56,11 @@ // test that functions using basic references work printf("%d %d %d %d\n", toref(&x), toref(p1), toptr(r1) == toptr(x), toptr(r1) == &x); + + changeRef( x ); + changeRef( y ); + changeRef( z ); + printf("%d %d %d\n", x, y, z); + changeRef( r1 ); + printf("%d %d\n", r1, x); // test that reference members are not implicitly constructed/destructed/assigned