Index: libcfa/prelude/prototypes.awk =================================================================== --- libcfa/prelude/prototypes.awk (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ libcfa/prelude/prototypes.awk (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -103,5 +103,4 @@ for ( prototype in prototypes ) { - # printf( "//\"%s\"\n", prototype ) if ( index( "BT_LAST", prototype ) == 1 ) { continue @@ -126,23 +125,21 @@ # generate function parameter types as macro - if ( index( prototype, "VAR" ) != 2 ) { # C-style empty parameters ? - for ( p = 0; length( prototype ) > 0; p += 1 ) { # until all parameters types are removed - sub( "_", "", prototype) # remove "_" - printf( ", ", type ) - temp = prototype - for ( t = 0; t < N; t += 1 ) { # find longest match - type = types[t]; - if ( index( prototype, type ) == 1 ) { # found match - printf( "BT_%s", type ) - sub( type, "", prototype ) - break; - } # if - } # for - if ( temp == prototype ) { # no match found for parameter in macro table - printf( "\n********** MISSING TYPE \"%s\" **********\n", prototype ) - exit 0 + for ( p = 0; length( prototype ) > 0; p += 1 ) { # until all parameters types are removed + sub( "_", "", prototype) # remove "_" + printf( ", ", type ) + temp = prototype + for ( t = 0; t < N; t += 1 ) { # find longest match + type = types[t]; + if ( index( prototype, type ) == 1 ) { # found match + printf( "BT_%s", type ) + sub( type, "", prototype ) + break; } # if } # for - } # if + if ( temp == prototype ) { # no match found for parameter in macro table + printf( "\n********** MISSING TYPE \"%s\" **********\n", prototype ) + exit 0 + } # if + } # for printf( ")\n" ) } # for Index: libcfa/src/concurrency/future.hfa =================================================================== --- libcfa/src/concurrency/future.hfa (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ libcfa/src/concurrency/future.hfa (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -88,5 +88,5 @@ if ( s.clause_status == 0p ) // poke in result so that woken threads do not need to reacquire any locks copy_T( result, *(((future_node(T) &)s).my_result) ); - + wake_one( waiters, s ); } @@ -146,5 +146,5 @@ } unlock( lock ); - + return [ret_val, false]; } @@ -154,5 +154,5 @@ // check if we can complete operation. If so race to establish winner in special OR case - if ( !s.park_counter && state != FUTURE_EMPTY ) { + if ( !s.park_counter && state != FUTURE_EMPTY ) { if ( !__make_select_node_available( s ) ) { // we didn't win the race so give up on registering unlock( lock ); @@ -180,5 +180,5 @@ return false; } - + bool on_selected( future(T) & this, select_node & node ) { return true; } } Index: src/CodeGen/CodeGenerator.cpp =================================================================== --- src/CodeGen/CodeGenerator.cpp (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ src/CodeGen/CodeGenerator.cpp (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -180,8 +180,10 @@ if ( 0 == decl->params.size() ) { - if ( decl->type->isVarArgs ) { + if ( !decl->type->isVarArgs ) { + acc << "(void)"; + } else if ( options.genC ) { acc << "()"; } else { - acc << "(void)"; + acc << "(...)"; } } else { Index: src/CodeGen/GenType.cpp =================================================================== --- src/CodeGen/GenType.cpp (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ src/CodeGen/GenType.cpp (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -168,8 +168,10 @@ if ( type->params.empty() ) { - if ( type->isVarArgs ) { + if ( !type->isVarArgs ) { + os << "(void)"; + } else if ( options.genC ) { os << "()"; } else { - os << "(void)"; + os << "(...)"; } } else { Index: src/Concurrency/Keywords.cpp =================================================================== --- src/Concurrency/Keywords.cpp (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ src/Concurrency/Keywords.cpp (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -1510,5 +1510,5 @@ ast::ptr MutexKeyword::generic_func = - new ast::FunctionType( ast::VariableArgs ); + new ast::FunctionType( ast::FixedArgs ); // -------------------------------------------------------------------------- Index: src/Concurrency/Waitfor.cpp =================================================================== --- src/Concurrency/Waitfor.cpp (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ src/Concurrency/Waitfor.cpp (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -302,5 +302,5 @@ const ast::ObjectDecl * monitors = declMonitors( out, clause ); ast::Type * fptr_t = new ast::PointerType( - new ast::FunctionType( ast::VariableArgs ) ); + new ast::FunctionType( ast::FixedArgs ) ); const ast::VariableExpr * variableExpr = Index: src/Parser/TypeData.cpp =================================================================== --- src/Parser/TypeData.cpp (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ src/Parser/TypeData.cpp (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -1541,9 +1541,19 @@ // The argument flag (is/is not var-args) of a computed property. -static ast::ArgumentFlag argumentFlag( const TypeData * td ) { +static ast::ArgumentFlag buildArgumentFlag( const TypeData * td ) { assert( td->kind == TypeData::Function ); - bool isVaArgs = !td->function.params || td->function.params->hasEllipsis; - return (isVaArgs) ? ast::VariableArgs : ast::FixedArgs; -} // argumentFlag + bool isVarArgs = !td->function.params || td->function.params->hasEllipsis; + return (isVarArgs) ? ast::VariableArgs : ast::FixedArgs; +} + + +// Wrapper to convert the void parameter into the empty explicit list. +static void buildParamList( DeclarationNode * decl, + std::vector> & params ) { + buildList( decl, params ); + if ( 1 == params.size() && params[0]->get_type()->isVoid() ) { + params.pop_back(); + } +} @@ -1562,5 +1572,5 @@ std::vector> params; std::vector> returns; - buildList( td->function.params, params ); + buildParamList( td->function.params, params ); buildForall( td->forall, forall ); // Functions do not store their assertions there anymore. @@ -1610,5 +1620,5 @@ std::move( attributes ), funcSpec, - argumentFlag( td ) + buildArgumentFlag( td ) ); buildList( td->function.withExprs, decl->withExprs ); @@ -1662,5 +1672,5 @@ assert( td->kind == TypeData::Function ); ast::FunctionType * ft = new ast::FunctionType( - argumentFlag( td ), + buildArgumentFlag( td ), buildQualifiers( td ) ); Index: src/Parser/parser.yy =================================================================== --- src/Parser/parser.yy (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ src/Parser/parser.yy (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -2889,5 +2889,5 @@ parameter_list_ellipsis_opt: // empty - { $$ = nullptr; } + { $$ = DeclarationNode::newFromTypeData( build_basic_type( TypeData::Void ) ); } | ELLIPSIS { $$ = nullptr; } Index: tests/.expect/KRfunctions.arm64.txt =================================================================== --- tests/.expect/KRfunctions.arm64.txt (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/.expect/KRfunctions.arm64.txt (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -98,5 +98,5 @@ __attribute__ ((unused)) signed int _X11_retval_f15i_1; } -const signed int _X4fredFi___1(){ +const signed int _X4fredFi___1(void){ __attribute__ ((unused)) const signed int _X12_retval_fredKi_1; signed int *(*_X1xFPi_ii__2)(signed int __param_0, signed int __param_1); Index: tests/.expect/KRfunctions.x64.txt =================================================================== --- tests/.expect/KRfunctions.x64.txt (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/.expect/KRfunctions.x64.txt (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -98,5 +98,5 @@ __attribute__ ((unused)) signed int _X11_retval_f15i_1; } -const signed int _X4fredFi___1(){ +const signed int _X4fredFi___1(void){ __attribute__ ((unused)) const signed int _X12_retval_fredKi_1; signed int *(*_X1xFPi_ii__2)(signed int __param_0, signed int __param_1); Index: tests/.expect/KRfunctions.x86.txt =================================================================== --- tests/.expect/KRfunctions.x86.txt (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/.expect/KRfunctions.x86.txt (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -98,5 +98,5 @@ __attribute__ ((unused)) signed int _X11_retval_f15i_1; } -const signed int _X4fredFi___1(){ +const signed int _X4fredFi___1(void){ __attribute__ ((unused)) const signed int _X12_retval_fredKi_1; signed int *(*_X1xFPi_ii__2)(signed int __param_0, signed int __param_1); Index: tests/.expect/attributes.arm64.txt =================================================================== --- tests/.expect/attributes.arm64.txt (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/.expect/attributes.arm64.txt (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -1,3 +1,3 @@ -signed int _X2laFi___1(){ +signed int _X2laFi___1(void){ __attribute__ ((unused)) signed int _X10_retval_lai_1; { @@ -1179,5 +1179,5 @@ } -__attribute__ ((unused)) signed int _X1fFi___1() asm ( "xyz" ); +__attribute__ ((unused)) signed int _X1fFi___1(void) asm ( "xyz" ); __attribute__ ((used,used)) const signed int _X3vd1Ki_1; __attribute__ ((used,unused)) const signed int _X3vd2Ki_1; @@ -1186,14 +1186,14 @@ __attribute__ ((used,used,used)) const signed int _X3vd5A0Ki_1[((unsigned long int )5)]; __attribute__ ((used,used,unused,used)) const signed int _X3vd6A0Ki_1[((unsigned long int )5)]; -__attribute__ ((used,used,used,used)) const signed int (*_X3vd7Fi___1)(); -__attribute__ ((used,used,unused,used,used)) const signed int (*_X3vd8Fi___1)(); -__attribute__ ((used,used,used,used)) const signed int (*_X3vd9Fi___1)(); -__attribute__ ((used,used,unused,used,used)) const signed int (*_X4vd10Fi___1)(); -__attribute__ ((unused,used)) signed int _X2f1Fi___1(); -__attribute__ ((unused)) signed int _X2f1Fi___1(){ +__attribute__ ((used,used,used,used)) const signed int (*_X3vd7Fi___1)(void); +__attribute__ ((used,used,unused,used,used)) const signed int (*_X3vd8Fi___1)(void); +__attribute__ ((used,used,used,used)) const signed int (*_X3vd9Fi___1)(void); +__attribute__ ((used,used,unused,used,used)) const signed int (*_X4vd10Fi___1)(void); +__attribute__ ((unused,used)) signed int _X2f1Fi___1(void); +__attribute__ ((unused)) signed int _X2f1Fi___1(void){ __attribute__ ((unused)) signed int _X10_retval_f1i_1; } -__attribute__ ((unused,unused,unused,used)) signed int **const _X2f2FPPi___1(); -__attribute__ ((unused,unused,unused)) signed int **const _X2f2FPPi___1(){ +__attribute__ ((unused,unused,unused,used)) signed int **const _X2f2FPPi___1(void); +__attribute__ ((unused,unused,unused)) signed int **const _X2f2FPPi___1(void){ __attribute__ ((unused)) signed int **const _X10_retval_f2KPPi_1; } @@ -1206,15 +1206,15 @@ __attribute__ ((unused)) signed int (*_X10_retval_f6PA0i_1)[]; } -__attribute__ ((unused,used,unused)) signed int (*_X2f7FFi_i____1())(signed int __param_0); -__attribute__ ((unused,unused)) signed int (*_X2f8FFi_i____1())(signed int __param_0){ +__attribute__ ((unused,used,unused)) signed int (*_X2f7FFi_i____1(void))(signed int __param_0); +__attribute__ ((unused,unused)) signed int (*_X2f8FFi_i____1(void))(signed int __param_0){ __attribute__ ((unused)) signed int (*_X10_retval_f8Fi_i__1)(signed int __param_0); } -__attribute__ ((unused,unused)) signed int (*_X2f9FFi_i____1())(signed int __param_0){ +__attribute__ ((unused,unused)) signed int (*_X2f9FFi_i____1(void))(signed int __param_0){ __attribute__ ((unused)) signed int (*_X10_retval_f9Fi_i__1)(signed int __param_0); } -__attribute__ ((unused,unused)) signed int (*_X3f10FFi_i____1())(signed int __param_0){ +__attribute__ ((unused,unused)) signed int (*_X3f10FFi_i____1(void))(signed int __param_0){ __attribute__ ((unused)) signed int (*_X11_retval_f10Fi_i__1)(signed int __param_0); } -signed int _X3vtrFi___1(){ +signed int _X3vtrFi___1(void){ __attribute__ ((unused)) signed int _X11_retval_vtri_1; __attribute__ ((unused,unused,used)) signed int _X2t1i_2; @@ -1223,6 +1223,6 @@ __attribute__ ((unused,unused,unused,unused,unused)) signed int **_X2t4A0PPi_2[((unsigned long int )5)]; __attribute__ ((unused,unused,unused,unused,unused,unused)) signed int **_X2t5A0PPi_2[((unsigned long int )5)]; - __attribute__ ((unused,unused,unused)) signed int _X2t6Fi___2(); - __attribute__ ((unused,unused,unused,unused)) signed int *_X2t6FPi___2(); + __attribute__ ((unused,unused,unused)) signed int _X2t6Fi___2(void); + __attribute__ ((unused,unused,unused,unused)) signed int *_X2t6FPi___2(void); } signed int _X4ipd1Fi_ii__1(__attribute__ ((unused,unused,unused)) signed int _X1pi_1, __attribute__ ((unused,unused,unused)) signed int _X1qi_1); @@ -1238,6 +1238,6 @@ __attribute__ ((unused)) signed int _X12_retval_ipd3i_1; } -signed int _X4ipd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)()); -signed int _X4ipd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)()){ +signed int _X4ipd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(void), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)(void)); +signed int _X4ipd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(void), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)(void)){ __attribute__ ((unused)) signed int _X12_retval_ipd4i_1; } @@ -1246,8 +1246,8 @@ signed int _X4tpr3Fi_Pi__1(__attribute__ ((unused,unused,unused)) signed int *_X3FooPi_1); signed int _X4tpr4Fi_Fi_Pi___1(__attribute__ ((unused,unused)) signed int (*__anonymous_object2)(signed int __param_0[((unsigned long int )5)])); -signed int _X4tpr5Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X3FooFi___1)()); -signed int _X4tpr6Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X3FooFi___1)()); +signed int _X4tpr5Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X3FooFi___1)(void)); +signed int _X4tpr6Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X3FooFi___1)(void)); signed int _X4tpr7Fi_Fi_Fi_i____1(__attribute__ ((unused,unused)) signed int (*__anonymous_object3)(signed int (*__param_0)(signed int __param_0))); -signed int _X2adFi___1(){ +signed int _X2adFi___1(void){ __attribute__ ((unused)) signed int _X10_retval_adi_1; __attribute__ ((used,unused)) signed int _X3ad1i_2; @@ -1256,5 +1256,5 @@ __attribute__ ((unused,unused,unused,unused,unused)) signed int (*_X3ad4PA0i_2)[((unsigned long int )10)]; __attribute__ ((unused,unused,unused,unused,used)) signed int _X3ad5i_2; - __attribute__ ((unused,unused,unused,unused,unused)) signed int _X3ad6Fi___2(); + __attribute__ ((unused,unused,unused,unused,unused)) signed int _X3ad6Fi___2(void); { ((void)sizeof(__attribute__ ((unused,unused)) signed int )); @@ -1274,5 +1274,5 @@ { - ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int ())); + ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int (void))); } @@ -1348,7 +1348,7 @@ signed int _X4apd2Fi_PPiPPi__1(__attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object6, __attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object7); signed int _X4apd3Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object8, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object9); -signed int _X4apd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object10)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object11)()); +signed int _X4apd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object10)(void), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object11)(void)); signed int _X4apd5Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object12)(signed int __param_0), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object13)(signed int __param_0)); -signed int _X4apd6Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object14)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object15)()); +signed int _X4apd6Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object14)(void), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object15)(void)); signed int _X4apd7Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object16)(__attribute__ ((unused)) signed int __param_0), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object17)(__attribute__ ((unused)) signed int __param_0)); struct Vad { Index: tests/.expect/attributes.x64.txt =================================================================== --- tests/.expect/attributes.x64.txt (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/.expect/attributes.x64.txt (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -1,3 +1,3 @@ -signed int _X2laFi___1(){ +signed int _X2laFi___1(void){ __attribute__ ((unused)) signed int _X10_retval_lai_1; { @@ -1179,5 +1179,5 @@ } -__attribute__ ((unused)) signed int _X1fFi___1() asm ( "xyz" ); +__attribute__ ((unused)) signed int _X1fFi___1(void) asm ( "xyz" ); __attribute__ ((used,used)) const signed int _X3vd1Ki_1; __attribute__ ((used,unused)) const signed int _X3vd2Ki_1; @@ -1186,14 +1186,14 @@ __attribute__ ((used,used,used)) const signed int _X3vd5A0Ki_1[((unsigned long int )5)]; __attribute__ ((used,used,unused,used)) const signed int _X3vd6A0Ki_1[((unsigned long int )5)]; -__attribute__ ((used,used,used,used)) const signed int (*_X3vd7Fi___1)(); -__attribute__ ((used,used,unused,used,used)) const signed int (*_X3vd8Fi___1)(); -__attribute__ ((used,used,used,used)) const signed int (*_X3vd9Fi___1)(); -__attribute__ ((used,used,unused,used,used)) const signed int (*_X4vd10Fi___1)(); -__attribute__ ((unused,used)) signed int _X2f1Fi___1(); -__attribute__ ((unused)) signed int _X2f1Fi___1(){ +__attribute__ ((used,used,used,used)) const signed int (*_X3vd7Fi___1)(void); +__attribute__ ((used,used,unused,used,used)) const signed int (*_X3vd8Fi___1)(void); +__attribute__ ((used,used,used,used)) const signed int (*_X3vd9Fi___1)(void); +__attribute__ ((used,used,unused,used,used)) const signed int (*_X4vd10Fi___1)(void); +__attribute__ ((unused,used)) signed int _X2f1Fi___1(void); +__attribute__ ((unused)) signed int _X2f1Fi___1(void){ __attribute__ ((unused)) signed int _X10_retval_f1i_1; } -__attribute__ ((unused,unused,unused,used)) signed int **const _X2f2FPPi___1(); -__attribute__ ((unused,unused,unused)) signed int **const _X2f2FPPi___1(){ +__attribute__ ((unused,unused,unused,used)) signed int **const _X2f2FPPi___1(void); +__attribute__ ((unused,unused,unused)) signed int **const _X2f2FPPi___1(void){ __attribute__ ((unused)) signed int **const _X10_retval_f2KPPi_1; } @@ -1206,15 +1206,15 @@ __attribute__ ((unused)) signed int (*_X10_retval_f6PA0i_1)[]; } -__attribute__ ((unused,used,unused)) signed int (*_X2f7FFi_i____1())(signed int __param_0); -__attribute__ ((unused,unused)) signed int (*_X2f8FFi_i____1())(signed int __param_0){ +__attribute__ ((unused,used,unused)) signed int (*_X2f7FFi_i____1(void))(signed int __param_0); +__attribute__ ((unused,unused)) signed int (*_X2f8FFi_i____1(void))(signed int __param_0){ __attribute__ ((unused)) signed int (*_X10_retval_f8Fi_i__1)(signed int __param_0); } -__attribute__ ((unused,unused)) signed int (*_X2f9FFi_i____1())(signed int __param_0){ +__attribute__ ((unused,unused)) signed int (*_X2f9FFi_i____1(void))(signed int __param_0){ __attribute__ ((unused)) signed int (*_X10_retval_f9Fi_i__1)(signed int __param_0); } -__attribute__ ((unused,unused)) signed int (*_X3f10FFi_i____1())(signed int __param_0){ +__attribute__ ((unused,unused)) signed int (*_X3f10FFi_i____1(void))(signed int __param_0){ __attribute__ ((unused)) signed int (*_X11_retval_f10Fi_i__1)(signed int __param_0); } -signed int _X3vtrFi___1(){ +signed int _X3vtrFi___1(void){ __attribute__ ((unused)) signed int _X11_retval_vtri_1; __attribute__ ((unused,unused,used)) signed int _X2t1i_2; @@ -1223,6 +1223,6 @@ __attribute__ ((unused,unused,unused,unused,unused)) signed int **_X2t4A0PPi_2[((unsigned long int )5)]; __attribute__ ((unused,unused,unused,unused,unused,unused)) signed int **_X2t5A0PPi_2[((unsigned long int )5)]; - __attribute__ ((unused,unused,unused)) signed int _X2t6Fi___2(); - __attribute__ ((unused,unused,unused,unused)) signed int *_X2t6FPi___2(); + __attribute__ ((unused,unused,unused)) signed int _X2t6Fi___2(void); + __attribute__ ((unused,unused,unused,unused)) signed int *_X2t6FPi___2(void); } signed int _X4ipd1Fi_ii__1(__attribute__ ((unused,unused,unused)) signed int _X1pi_1, __attribute__ ((unused,unused,unused)) signed int _X1qi_1); @@ -1238,6 +1238,6 @@ __attribute__ ((unused)) signed int _X12_retval_ipd3i_1; } -signed int _X4ipd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)()); -signed int _X4ipd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)()){ +signed int _X4ipd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(void), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)(void)); +signed int _X4ipd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(void), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)(void)){ __attribute__ ((unused)) signed int _X12_retval_ipd4i_1; } @@ -1246,8 +1246,8 @@ signed int _X4tpr3Fi_Pi__1(__attribute__ ((unused,unused,unused)) signed int *_X3FooPi_1); signed int _X4tpr4Fi_Fi_Pi___1(__attribute__ ((unused,unused)) signed int (*__anonymous_object2)(signed int __param_0[((unsigned long int )5)])); -signed int _X4tpr5Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X3FooFi___1)()); -signed int _X4tpr6Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X3FooFi___1)()); +signed int _X4tpr5Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X3FooFi___1)(void)); +signed int _X4tpr6Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X3FooFi___1)(void)); signed int _X4tpr7Fi_Fi_Fi_i____1(__attribute__ ((unused,unused)) signed int (*__anonymous_object3)(signed int (*__param_0)(signed int __param_0))); -signed int _X2adFi___1(){ +signed int _X2adFi___1(void){ __attribute__ ((unused)) signed int _X10_retval_adi_1; __attribute__ ((used,unused)) signed int _X3ad1i_2; @@ -1256,5 +1256,5 @@ __attribute__ ((unused,unused,unused,unused,unused)) signed int (*_X3ad4PA0i_2)[((unsigned long int )10)]; __attribute__ ((unused,unused,unused,unused,used)) signed int _X3ad5i_2; - __attribute__ ((unused,unused,unused,unused,unused)) signed int _X3ad6Fi___2(); + __attribute__ ((unused,unused,unused,unused,unused)) signed int _X3ad6Fi___2(void); { ((void)sizeof(__attribute__ ((unused,unused)) signed int )); @@ -1274,5 +1274,5 @@ { - ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int ())); + ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int (void))); } @@ -1348,7 +1348,7 @@ signed int _X4apd2Fi_PPiPPi__1(__attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object6, __attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object7); signed int _X4apd3Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object8, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object9); -signed int _X4apd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object10)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object11)()); +signed int _X4apd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object10)(void), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object11)(void)); signed int _X4apd5Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object12)(signed int __param_0), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object13)(signed int __param_0)); -signed int _X4apd6Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object14)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object15)()); +signed int _X4apd6Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object14)(void), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object15)(void)); signed int _X4apd7Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object16)(__attribute__ ((unused)) signed int __param_0), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object17)(__attribute__ ((unused)) signed int __param_0)); struct Vad { Index: tests/.expect/attributes.x86.txt =================================================================== --- tests/.expect/attributes.x86.txt (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/.expect/attributes.x86.txt (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -1,3 +1,3 @@ -signed int _X2laFi___1(){ +signed int _X2laFi___1(void){ __attribute__ ((unused)) signed int _X10_retval_lai_1; { @@ -1179,5 +1179,5 @@ } -__attribute__ ((unused)) signed int _X1fFi___1() asm ( "xyz" ); +__attribute__ ((unused)) signed int _X1fFi___1(void) asm ( "xyz" ); __attribute__ ((used,used)) const signed int _X3vd1Ki_1; __attribute__ ((used,unused)) const signed int _X3vd2Ki_1; @@ -1186,14 +1186,14 @@ __attribute__ ((used,used,used)) const signed int _X3vd5A0Ki_1[((unsigned int )5)]; __attribute__ ((used,used,unused,used)) const signed int _X3vd6A0Ki_1[((unsigned int )5)]; -__attribute__ ((used,used,used,used)) const signed int (*_X3vd7Fi___1)(); -__attribute__ ((used,used,unused,used,used)) const signed int (*_X3vd8Fi___1)(); -__attribute__ ((used,used,used,used)) const signed int (*_X3vd9Fi___1)(); -__attribute__ ((used,used,unused,used,used)) const signed int (*_X4vd10Fi___1)(); -__attribute__ ((unused,used)) signed int _X2f1Fi___1(); -__attribute__ ((unused)) signed int _X2f1Fi___1(){ +__attribute__ ((used,used,used,used)) const signed int (*_X3vd7Fi___1)(void); +__attribute__ ((used,used,unused,used,used)) const signed int (*_X3vd8Fi___1)(void); +__attribute__ ((used,used,used,used)) const signed int (*_X3vd9Fi___1)(void); +__attribute__ ((used,used,unused,used,used)) const signed int (*_X4vd10Fi___1)(void); +__attribute__ ((unused,used)) signed int _X2f1Fi___1(void); +__attribute__ ((unused)) signed int _X2f1Fi___1(void){ __attribute__ ((unused)) signed int _X10_retval_f1i_1; } -__attribute__ ((unused,unused,unused,used)) signed int **const _X2f2FPPi___1(); -__attribute__ ((unused,unused,unused)) signed int **const _X2f2FPPi___1(){ +__attribute__ ((unused,unused,unused,used)) signed int **const _X2f2FPPi___1(void); +__attribute__ ((unused,unused,unused)) signed int **const _X2f2FPPi___1(void){ __attribute__ ((unused)) signed int **const _X10_retval_f2KPPi_1; } @@ -1206,15 +1206,15 @@ __attribute__ ((unused)) signed int (*_X10_retval_f6PA0i_1)[]; } -__attribute__ ((unused,used,unused)) signed int (*_X2f7FFi_i____1())(signed int __param_0); -__attribute__ ((unused,unused)) signed int (*_X2f8FFi_i____1())(signed int __param_0){ +__attribute__ ((unused,used,unused)) signed int (*_X2f7FFi_i____1(void))(signed int __param_0); +__attribute__ ((unused,unused)) signed int (*_X2f8FFi_i____1(void))(signed int __param_0){ __attribute__ ((unused)) signed int (*_X10_retval_f8Fi_i__1)(signed int __param_0); } -__attribute__ ((unused,unused)) signed int (*_X2f9FFi_i____1())(signed int __param_0){ +__attribute__ ((unused,unused)) signed int (*_X2f9FFi_i____1(void))(signed int __param_0){ __attribute__ ((unused)) signed int (*_X10_retval_f9Fi_i__1)(signed int __param_0); } -__attribute__ ((unused,unused)) signed int (*_X3f10FFi_i____1())(signed int __param_0){ +__attribute__ ((unused,unused)) signed int (*_X3f10FFi_i____1(void))(signed int __param_0){ __attribute__ ((unused)) signed int (*_X11_retval_f10Fi_i__1)(signed int __param_0); } -signed int _X3vtrFi___1(){ +signed int _X3vtrFi___1(void){ __attribute__ ((unused)) signed int _X11_retval_vtri_1; __attribute__ ((unused,unused,used)) signed int _X2t1i_2; @@ -1223,6 +1223,6 @@ __attribute__ ((unused,unused,unused,unused,unused)) signed int **_X2t4A0PPi_2[((unsigned int )5)]; __attribute__ ((unused,unused,unused,unused,unused,unused)) signed int **_X2t5A0PPi_2[((unsigned int )5)]; - __attribute__ ((unused,unused,unused)) signed int _X2t6Fi___2(); - __attribute__ ((unused,unused,unused,unused)) signed int *_X2t6FPi___2(); + __attribute__ ((unused,unused,unused)) signed int _X2t6Fi___2(void); + __attribute__ ((unused,unused,unused,unused)) signed int *_X2t6FPi___2(void); } signed int _X4ipd1Fi_ii__1(__attribute__ ((unused,unused,unused)) signed int _X1pi_1, __attribute__ ((unused,unused,unused)) signed int _X1qi_1); @@ -1238,6 +1238,6 @@ __attribute__ ((unused)) signed int _X12_retval_ipd3i_1; } -signed int _X4ipd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)()); -signed int _X4ipd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)()){ +signed int _X4ipd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(void), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)(void)); +signed int _X4ipd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(void), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)(void)){ __attribute__ ((unused)) signed int _X12_retval_ipd4i_1; } @@ -1246,8 +1246,8 @@ signed int _X4tpr3Fi_Pi__1(__attribute__ ((unused,unused,unused)) signed int *_X3FooPi_1); signed int _X4tpr4Fi_Fi_Pi___1(__attribute__ ((unused,unused)) signed int (*__anonymous_object2)(signed int __param_0[((unsigned int )5)])); -signed int _X4tpr5Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X3FooFi___1)()); -signed int _X4tpr6Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X3FooFi___1)()); +signed int _X4tpr5Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X3FooFi___1)(void)); +signed int _X4tpr6Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X3FooFi___1)(void)); signed int _X4tpr7Fi_Fi_Fi_i____1(__attribute__ ((unused,unused)) signed int (*__anonymous_object3)(signed int (*__param_0)(signed int __param_0))); -signed int _X2adFi___1(){ +signed int _X2adFi___1(void){ __attribute__ ((unused)) signed int _X10_retval_adi_1; __attribute__ ((used,unused)) signed int _X3ad1i_2; @@ -1256,5 +1256,5 @@ __attribute__ ((unused,unused,unused,unused,unused)) signed int (*_X3ad4PA0i_2)[((unsigned int )10)]; __attribute__ ((unused,unused,unused,unused,used)) signed int _X3ad5i_2; - __attribute__ ((unused,unused,unused,unused,unused)) signed int _X3ad6Fi___2(); + __attribute__ ((unused,unused,unused,unused,unused)) signed int _X3ad6Fi___2(void); { ((void)sizeof(__attribute__ ((unused,unused)) signed int )); @@ -1274,5 +1274,5 @@ { - ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int ())); + ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int (void))); } @@ -1348,7 +1348,7 @@ signed int _X4apd2Fi_PPiPPi__1(__attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object6, __attribute__ ((unused,unused,unused,unused)) signed int **__anonymous_object7); signed int _X4apd3Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *__anonymous_object8, __attribute__ ((unused,unused,unused)) signed int *__anonymous_object9); -signed int _X4apd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object10)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object11)()); +signed int _X4apd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object10)(void), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object11)(void)); signed int _X4apd5Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object12)(signed int __param_0), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object13)(signed int __param_0)); -signed int _X4apd6Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object14)(), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object15)()); +signed int _X4apd6Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object14)(void), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object15)(void)); signed int _X4apd7Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object16)(__attribute__ ((unused)) signed int __param_0), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object17)(__attribute__ ((unused)) signed int __param_0)); struct Vad { Index: tests/.expect/castError.txt =================================================================== --- tests/.expect/castError.txt (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/.expect/castError.txt (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -21,10 +21,8 @@ Cost ( 1, 0, 0, 0, 0, 0, 0, 0 ): Explicit Cast of: Variable Expression: f: function - accepting unspecified arguments ... returning nothing ... with resolved type: pointer to function - accepting unspecified arguments ... returning nothing Index: tests/.expect/declarationSpecifier.arm64.txt =================================================================== --- tests/.expect/declarationSpecifier.arm64.txt (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/.expect/declarationSpecifier.arm64.txt (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -647,20 +647,20 @@ _Thread_local signed int _X3x37i_1; __thread signed int _X3x38i_1; -static inline volatile const signed int _X3f11Fi___1(); -static inline volatile const signed int _X3f12Fi___1(); -static inline volatile const signed int _X3f13Fi___1(); -static inline volatile const signed int _X3f14Fi___1(); -static inline volatile const signed int _X3f15Fi___1(); -static inline volatile const signed int _X3f16Fi___1(); -static inline volatile const signed int _X3f17Fi___1(); -static inline volatile const signed int _X3f18Fi___1(); -static inline volatile const signed short int _X3f21Fs___1(); -static inline volatile const signed short int _X3f22Fs___1(); -static inline volatile const signed short int _X3f23Fs___1(); -static inline volatile const signed short int _X3f24Fs___1(); -static inline volatile const signed short int _X3f25Fs___1(); -static inline volatile const signed short int _X3f26Fs___1(); -static inline volatile const signed short int _X3f27Fs___1(); -static inline volatile const signed short int _X3f28Fs___1(); +static inline volatile const signed int _X3f11Fi___1(void); +static inline volatile const signed int _X3f12Fi___1(void); +static inline volatile const signed int _X3f13Fi___1(void); +static inline volatile const signed int _X3f14Fi___1(void); +static inline volatile const signed int _X3f15Fi___1(void); +static inline volatile const signed int _X3f16Fi___1(void); +static inline volatile const signed int _X3f17Fi___1(void); +static inline volatile const signed int _X3f18Fi___1(void); +static inline volatile const signed short int _X3f21Fs___1(void); +static inline volatile const signed short int _X3f22Fs___1(void); +static inline volatile const signed short int _X3f23Fs___1(void); +static inline volatile const signed short int _X3f24Fs___1(void); +static inline volatile const signed short int _X3f25Fs___1(void); +static inline volatile const signed short int _X3f26Fs___1(void); +static inline volatile const signed short int _X3f27Fs___1(void); +static inline volatile const signed short int _X3f28Fs___1(void); struct __anonymous14 { signed int _X1ii_1; @@ -707,5 +707,5 @@ } -static inline volatile const struct __anonymous14 _X3f31FS13__anonymous14___1(); +static inline volatile const struct __anonymous14 _X3f31FS13__anonymous14___1(void); struct __anonymous15 { signed int _X1ii_1; @@ -752,5 +752,5 @@ } -static inline volatile const struct __anonymous15 _X3f32FS13__anonymous15___1(); +static inline volatile const struct __anonymous15 _X3f32FS13__anonymous15___1(void); struct __anonymous16 { signed int _X1ii_1; @@ -797,5 +797,5 @@ } -static inline volatile const struct __anonymous16 _X3f33FS13__anonymous16___1(); +static inline volatile const struct __anonymous16 _X3f33FS13__anonymous16___1(void); struct __anonymous17 { signed int _X1ii_1; @@ -842,5 +842,5 @@ } -static inline volatile const struct __anonymous17 _X3f34FS13__anonymous17___1(); +static inline volatile const struct __anonymous17 _X3f34FS13__anonymous17___1(void); struct __anonymous18 { signed int _X1ii_1; @@ -887,5 +887,5 @@ } -static inline volatile const struct __anonymous18 _X3f35FS13__anonymous18___1(); +static inline volatile const struct __anonymous18 _X3f35FS13__anonymous18___1(void); struct __anonymous19 { signed int _X1ii_1; @@ -932,5 +932,5 @@ } -static inline volatile const struct __anonymous19 _X3f36FS13__anonymous19___1(); +static inline volatile const struct __anonymous19 _X3f36FS13__anonymous19___1(void); struct __anonymous20 { signed int _X1ii_1; @@ -977,5 +977,5 @@ } -static inline volatile const struct __anonymous20 _X3f37FS13__anonymous20___1(); +static inline volatile const struct __anonymous20 _X3f37FS13__anonymous20___1(void); struct __anonymous21 { signed int _X1ii_1; @@ -1022,13 +1022,13 @@ } -static inline volatile const struct __anonymous21 _X3f38FS13__anonymous21___1(); -static inline volatile const signed short int _X3f41Fs___1(); -static inline volatile const signed short int _X3f42Fs___1(); -static inline volatile const signed short int _X3f43Fs___1(); -static inline volatile const signed short int _X3f44Fs___1(); -static inline volatile const signed short int _X3f45Fs___1(); -static inline volatile const signed short int _X3f46Fs___1(); -static inline volatile const signed short int _X3f47Fs___1(); -static inline volatile const signed short int _X3f48Fs___1(); +static inline volatile const struct __anonymous21 _X3f38FS13__anonymous21___1(void); +static inline volatile const signed short int _X3f41Fs___1(void); +static inline volatile const signed short int _X3f42Fs___1(void); +static inline volatile const signed short int _X3f43Fs___1(void); +static inline volatile const signed short int _X3f44Fs___1(void); +static inline volatile const signed short int _X3f45Fs___1(void); +static inline volatile const signed short int _X3f46Fs___1(void); +static inline volatile const signed short int _X3f47Fs___1(void); +static inline volatile const signed short int _X3f48Fs___1(void); signed int _X4mainFi_iPPKc__1(signed int _X4argci_1, const char **_X4argvPPKc_1){ __attribute__ ((unused)) signed int _X12_retval_maini_1; Index: tests/.expect/declarationSpecifier.x64.txt =================================================================== --- tests/.expect/declarationSpecifier.x64.txt (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/.expect/declarationSpecifier.x64.txt (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -647,20 +647,20 @@ _Thread_local signed int _X3x37i_1; __thread signed int _X3x38i_1; -static inline volatile const signed int _X3f11Fi___1(); -static inline volatile const signed int _X3f12Fi___1(); -static inline volatile const signed int _X3f13Fi___1(); -static inline volatile const signed int _X3f14Fi___1(); -static inline volatile const signed int _X3f15Fi___1(); -static inline volatile const signed int _X3f16Fi___1(); -static inline volatile const signed int _X3f17Fi___1(); -static inline volatile const signed int _X3f18Fi___1(); -static inline volatile const signed short int _X3f21Fs___1(); -static inline volatile const signed short int _X3f22Fs___1(); -static inline volatile const signed short int _X3f23Fs___1(); -static inline volatile const signed short int _X3f24Fs___1(); -static inline volatile const signed short int _X3f25Fs___1(); -static inline volatile const signed short int _X3f26Fs___1(); -static inline volatile const signed short int _X3f27Fs___1(); -static inline volatile const signed short int _X3f28Fs___1(); +static inline volatile const signed int _X3f11Fi___1(void); +static inline volatile const signed int _X3f12Fi___1(void); +static inline volatile const signed int _X3f13Fi___1(void); +static inline volatile const signed int _X3f14Fi___1(void); +static inline volatile const signed int _X3f15Fi___1(void); +static inline volatile const signed int _X3f16Fi___1(void); +static inline volatile const signed int _X3f17Fi___1(void); +static inline volatile const signed int _X3f18Fi___1(void); +static inline volatile const signed short int _X3f21Fs___1(void); +static inline volatile const signed short int _X3f22Fs___1(void); +static inline volatile const signed short int _X3f23Fs___1(void); +static inline volatile const signed short int _X3f24Fs___1(void); +static inline volatile const signed short int _X3f25Fs___1(void); +static inline volatile const signed short int _X3f26Fs___1(void); +static inline volatile const signed short int _X3f27Fs___1(void); +static inline volatile const signed short int _X3f28Fs___1(void); struct __anonymous14 { signed int _X1ii_1; @@ -707,5 +707,5 @@ } -static inline volatile const struct __anonymous14 _X3f31FS13__anonymous14___1(); +static inline volatile const struct __anonymous14 _X3f31FS13__anonymous14___1(void); struct __anonymous15 { signed int _X1ii_1; @@ -752,5 +752,5 @@ } -static inline volatile const struct __anonymous15 _X3f32FS13__anonymous15___1(); +static inline volatile const struct __anonymous15 _X3f32FS13__anonymous15___1(void); struct __anonymous16 { signed int _X1ii_1; @@ -797,5 +797,5 @@ } -static inline volatile const struct __anonymous16 _X3f33FS13__anonymous16___1(); +static inline volatile const struct __anonymous16 _X3f33FS13__anonymous16___1(void); struct __anonymous17 { signed int _X1ii_1; @@ -842,5 +842,5 @@ } -static inline volatile const struct __anonymous17 _X3f34FS13__anonymous17___1(); +static inline volatile const struct __anonymous17 _X3f34FS13__anonymous17___1(void); struct __anonymous18 { signed int _X1ii_1; @@ -887,5 +887,5 @@ } -static inline volatile const struct __anonymous18 _X3f35FS13__anonymous18___1(); +static inline volatile const struct __anonymous18 _X3f35FS13__anonymous18___1(void); struct __anonymous19 { signed int _X1ii_1; @@ -932,5 +932,5 @@ } -static inline volatile const struct __anonymous19 _X3f36FS13__anonymous19___1(); +static inline volatile const struct __anonymous19 _X3f36FS13__anonymous19___1(void); struct __anonymous20 { signed int _X1ii_1; @@ -977,5 +977,5 @@ } -static inline volatile const struct __anonymous20 _X3f37FS13__anonymous20___1(); +static inline volatile const struct __anonymous20 _X3f37FS13__anonymous20___1(void); struct __anonymous21 { signed int _X1ii_1; @@ -1022,13 +1022,13 @@ } -static inline volatile const struct __anonymous21 _X3f38FS13__anonymous21___1(); -static inline volatile const signed short int _X3f41Fs___1(); -static inline volatile const signed short int _X3f42Fs___1(); -static inline volatile const signed short int _X3f43Fs___1(); -static inline volatile const signed short int _X3f44Fs___1(); -static inline volatile const signed short int _X3f45Fs___1(); -static inline volatile const signed short int _X3f46Fs___1(); -static inline volatile const signed short int _X3f47Fs___1(); -static inline volatile const signed short int _X3f48Fs___1(); +static inline volatile const struct __anonymous21 _X3f38FS13__anonymous21___1(void); +static inline volatile const signed short int _X3f41Fs___1(void); +static inline volatile const signed short int _X3f42Fs___1(void); +static inline volatile const signed short int _X3f43Fs___1(void); +static inline volatile const signed short int _X3f44Fs___1(void); +static inline volatile const signed short int _X3f45Fs___1(void); +static inline volatile const signed short int _X3f46Fs___1(void); +static inline volatile const signed short int _X3f47Fs___1(void); +static inline volatile const signed short int _X3f48Fs___1(void); signed int _X4mainFi_iPPKc__1(signed int _X4argci_1, const char **_X4argvPPKc_1){ __attribute__ ((unused)) signed int _X12_retval_maini_1; Index: tests/.expect/declarationSpecifier.x86.txt =================================================================== --- tests/.expect/declarationSpecifier.x86.txt (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/.expect/declarationSpecifier.x86.txt (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -647,20 +647,20 @@ _Thread_local signed int _X3x37i_1; __thread signed int _X3x38i_1; -static inline volatile const signed int _X3f11Fi___1(); -static inline volatile const signed int _X3f12Fi___1(); -static inline volatile const signed int _X3f13Fi___1(); -static inline volatile const signed int _X3f14Fi___1(); -static inline volatile const signed int _X3f15Fi___1(); -static inline volatile const signed int _X3f16Fi___1(); -static inline volatile const signed int _X3f17Fi___1(); -static inline volatile const signed int _X3f18Fi___1(); -static inline volatile const signed short int _X3f21Fs___1(); -static inline volatile const signed short int _X3f22Fs___1(); -static inline volatile const signed short int _X3f23Fs___1(); -static inline volatile const signed short int _X3f24Fs___1(); -static inline volatile const signed short int _X3f25Fs___1(); -static inline volatile const signed short int _X3f26Fs___1(); -static inline volatile const signed short int _X3f27Fs___1(); -static inline volatile const signed short int _X3f28Fs___1(); +static inline volatile const signed int _X3f11Fi___1(void); +static inline volatile const signed int _X3f12Fi___1(void); +static inline volatile const signed int _X3f13Fi___1(void); +static inline volatile const signed int _X3f14Fi___1(void); +static inline volatile const signed int _X3f15Fi___1(void); +static inline volatile const signed int _X3f16Fi___1(void); +static inline volatile const signed int _X3f17Fi___1(void); +static inline volatile const signed int _X3f18Fi___1(void); +static inline volatile const signed short int _X3f21Fs___1(void); +static inline volatile const signed short int _X3f22Fs___1(void); +static inline volatile const signed short int _X3f23Fs___1(void); +static inline volatile const signed short int _X3f24Fs___1(void); +static inline volatile const signed short int _X3f25Fs___1(void); +static inline volatile const signed short int _X3f26Fs___1(void); +static inline volatile const signed short int _X3f27Fs___1(void); +static inline volatile const signed short int _X3f28Fs___1(void); struct __anonymous14 { signed int _X1ii_1; @@ -707,5 +707,5 @@ } -static inline volatile const struct __anonymous14 _X3f31FS13__anonymous14___1(); +static inline volatile const struct __anonymous14 _X3f31FS13__anonymous14___1(void); struct __anonymous15 { signed int _X1ii_1; @@ -752,5 +752,5 @@ } -static inline volatile const struct __anonymous15 _X3f32FS13__anonymous15___1(); +static inline volatile const struct __anonymous15 _X3f32FS13__anonymous15___1(void); struct __anonymous16 { signed int _X1ii_1; @@ -797,5 +797,5 @@ } -static inline volatile const struct __anonymous16 _X3f33FS13__anonymous16___1(); +static inline volatile const struct __anonymous16 _X3f33FS13__anonymous16___1(void); struct __anonymous17 { signed int _X1ii_1; @@ -842,5 +842,5 @@ } -static inline volatile const struct __anonymous17 _X3f34FS13__anonymous17___1(); +static inline volatile const struct __anonymous17 _X3f34FS13__anonymous17___1(void); struct __anonymous18 { signed int _X1ii_1; @@ -887,5 +887,5 @@ } -static inline volatile const struct __anonymous18 _X3f35FS13__anonymous18___1(); +static inline volatile const struct __anonymous18 _X3f35FS13__anonymous18___1(void); struct __anonymous19 { signed int _X1ii_1; @@ -932,5 +932,5 @@ } -static inline volatile const struct __anonymous19 _X3f36FS13__anonymous19___1(); +static inline volatile const struct __anonymous19 _X3f36FS13__anonymous19___1(void); struct __anonymous20 { signed int _X1ii_1; @@ -977,5 +977,5 @@ } -static inline volatile const struct __anonymous20 _X3f37FS13__anonymous20___1(); +static inline volatile const struct __anonymous20 _X3f37FS13__anonymous20___1(void); struct __anonymous21 { signed int _X1ii_1; @@ -1022,13 +1022,13 @@ } -static inline volatile const struct __anonymous21 _X3f38FS13__anonymous21___1(); -static inline volatile const signed short int _X3f41Fs___1(); -static inline volatile const signed short int _X3f42Fs___1(); -static inline volatile const signed short int _X3f43Fs___1(); -static inline volatile const signed short int _X3f44Fs___1(); -static inline volatile const signed short int _X3f45Fs___1(); -static inline volatile const signed short int _X3f46Fs___1(); -static inline volatile const signed short int _X3f47Fs___1(); -static inline volatile const signed short int _X3f48Fs___1(); +static inline volatile const struct __anonymous21 _X3f38FS13__anonymous21___1(void); +static inline volatile const signed short int _X3f41Fs___1(void); +static inline volatile const signed short int _X3f42Fs___1(void); +static inline volatile const signed short int _X3f43Fs___1(void); +static inline volatile const signed short int _X3f44Fs___1(void); +static inline volatile const signed short int _X3f45Fs___1(void); +static inline volatile const signed short int _X3f46Fs___1(void); +static inline volatile const signed short int _X3f47Fs___1(void); +static inline volatile const signed short int _X3f48Fs___1(void); signed int _X4mainFi_iPPKc__1(signed int _X4argci_1, const char **_X4argvPPKc_1){ __attribute__ ((unused)) signed int _X12_retval_maini_1; Index: tests/.expect/extension.arm64.txt =================================================================== --- tests/.expect/extension.arm64.txt (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/.expect/extension.arm64.txt (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -161,5 +161,5 @@ _X1BKM1E_1, }; -__extension__ signed int _X1fFi___1(); +__extension__ signed int _X1fFi___1(void); __extension__ signed int i; __extension__ signed int j; Index: tests/.expect/extension.x64.txt =================================================================== --- tests/.expect/extension.x64.txt (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/.expect/extension.x64.txt (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -161,5 +161,5 @@ _X1BKM1E_1, }; -__extension__ signed int _X1fFi___1(); +__extension__ signed int _X1fFi___1(void); __extension__ signed int i; __extension__ signed int j; Index: tests/.expect/extension.x86.txt =================================================================== --- tests/.expect/extension.x86.txt (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/.expect/extension.x86.txt (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -161,5 +161,5 @@ _X1BKM1E_1, }; -__extension__ signed int _X1fFi___1(); +__extension__ signed int _X1fFi___1(void); __extension__ signed int i; __extension__ signed int j; Index: tests/.expect/functions.arm64.txt =================================================================== --- tests/.expect/functions.arm64.txt (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/.expect/functions.arm64.txt (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -16,38 +16,38 @@ } -signed int _X2f1Fi___1(){ +signed int _X2f1Fi___1(void){ __attribute__ ((unused)) signed int _X10_retval_f1i_1; } -signed int _X2f2Fi___1(){ +signed int _X2f2Fi___1(void){ __attribute__ ((unused)) signed int _X10_retval_f2i_1; } -signed int (*_X2f3FFi_____1())(){ - __attribute__ ((unused)) signed int (*_X10_retval_f3Fi___1)(); -} -signed int *_X2f4FPi___1(){ +signed int (*_X2f3FFi_____1(void))(void){ + __attribute__ ((unused)) signed int (*_X10_retval_f3Fi___1)(void); +} +signed int *_X2f4FPi___1(void){ __attribute__ ((unused)) signed int *_X10_retval_f4Pi_1; } -signed int (*_X2f5FFi_____1())(){ - __attribute__ ((unused)) signed int (*_X10_retval_f5Fi___1)(); -} -signed int *_X2f6FPi___1(){ +signed int (*_X2f5FFi_____1(void))(void){ + __attribute__ ((unused)) signed int (*_X10_retval_f5Fi___1)(void); +} +signed int *_X2f6FPi___1(void){ __attribute__ ((unused)) signed int *_X10_retval_f6Pi_1; } -signed int *_X2f7FPi___1(){ +signed int *_X2f7FPi___1(void){ __attribute__ ((unused)) signed int *_X10_retval_f7Pi_1; } -signed int **_X2f8FPPi___1(){ +signed int **_X2f8FPPi___1(void){ __attribute__ ((unused)) signed int **_X10_retval_f8PPi_1; } -signed int *const *_X2f9FPKPi___1(){ +signed int *const *_X2f9FPKPi___1(void){ __attribute__ ((unused)) signed int *const *_X10_retval_f9PKPi_1; } -signed int (*_X3f10FPA0i___1())[]{ +signed int (*_X3f10FPA0i___1(void))[]{ __attribute__ ((unused)) signed int (*_X11_retval_f10PA0i_1)[]; } -signed int (*_X3f11FPA0A0i___1())[][((unsigned long int )3)]{ +signed int (*_X3f11FPA0A0i___1(void))[][((unsigned long int )3)]{ __attribute__ ((unused)) signed int (*_X11_retval_f11PA0A0i_1)[][((unsigned long int )3)]; } -signed int (*_X3f12FPA0A0i___1())[][((unsigned long int )3)]{ +signed int (*_X3f12FPA0A0i___1(void))[][((unsigned long int )3)]{ __attribute__ ((unused)) signed int (*_X11_retval_f12PA0A0i_1)[][((unsigned long int )3)]; } @@ -64,17 +64,17 @@ __attribute__ ((unused)) const signed int _X12_retval_fII4Ki_1; } -signed int *_X4fII5FPi___1(){ +signed int *_X4fII5FPi___1(void){ __attribute__ ((unused)) signed int *_X12_retval_fII5Pi_1; } -signed int *const _X4fII6FPi___1(){ +signed int *const _X4fII6FPi___1(void){ __attribute__ ((unused)) signed int *const _X12_retval_fII6KPi_1; } -const signed long int *_X4fII7FPKl___1(){ +const signed long int *_X4fII7FPKl___1(void){ __attribute__ ((unused)) const signed long int *_X12_retval_fII7PKl_1; } -static const signed long int *_X4fII8FPKl___1(){ +static const signed long int *_X4fII8FPKl___1(void){ __attribute__ ((unused)) const signed long int *_X12_retval_fII8PKl_1; } -static const signed long int *_X4fII9FPKl___1(){ +static const signed long int *_X4fII9FPKl___1(void){ __attribute__ ((unused)) const signed long int *_X12_retval_fII9PKl_1; } @@ -224,5 +224,5 @@ signed int _X3f11Fi_i__1(signed int __anonymous_object34); signed int _X3f12Fi___1(void); -const double _X4bar1Fd___1(); +const double _X4bar1Fd___1(void); const double _X4bar2Fd_i__1(signed int __anonymous_object35); const double _X4bar3Fd_d__1(double __anonymous_object36); @@ -290,5 +290,5 @@ signed int (*(*_X1pPA0Fi_i__2)[])(signed int __param_0); } -static const signed int *_X2f1FPKi___1(){ +static const signed int *_X2f1FPKi___1(void){ __attribute__ ((unused)) const signed int *_X10_retval_f1PKi_1; } @@ -310,6 +310,6 @@ __attribute__ ((unused)) const struct _conc__tuple2_3 _X10_retval_f5KT2PiKi_1; } -signed int _X1fFi_Fi__FPi__FPPi__FPKPi__FPKPi__PiPiPPiPPiPPPiPPPiPPKPiPPKPiPKPKPiPKPKPi__1(signed int (*__anonymous_object42)(), signed int *(*__anonymous_object43)(), signed int **(*__anonymous_object44)(), signed int *const *(*__anonymous_object45)(), signed int *const *const (*__anonymous_object46)(), signed int *__anonymous_object47, signed int __anonymous_object48[10], signed int **__anonymous_object49, signed int *__anonymous_object50[10], signed int ***__anonymous_object51, signed int **__anonymous_object52[10], signed int *const **__anonymous_object53, signed int *const *__anonymous_object54[10], signed int *const *const *__anonymous_object55, signed int *const *const __anonymous_object56[10]); -signed int _X1fFi_Fi__FPi__FPPi__FPKPi__FPKPi__PiPiPPiPPiPPPiPPPiPPKPiPPKPiPKPKPiPKPKPi__1(__attribute__ ((unused)) signed int (*__anonymous_object57)(), __attribute__ ((unused)) signed int *(*__anonymous_object58)(), __attribute__ ((unused)) signed int **(*__anonymous_object59)(), __attribute__ ((unused)) signed int *const *(*__anonymous_object60)(), __attribute__ ((unused)) signed int *const *const (*__anonymous_object61)(), __attribute__ ((unused)) signed int *__anonymous_object62, __attribute__ ((unused)) signed int __anonymous_object63[10], __attribute__ ((unused)) signed int **__anonymous_object64, __attribute__ ((unused)) signed int *__anonymous_object65[10], __attribute__ ((unused)) signed int ***__anonymous_object66, __attribute__ ((unused)) signed int **__anonymous_object67[10], __attribute__ ((unused)) signed int *const **__anonymous_object68, __attribute__ ((unused)) signed int *const *__anonymous_object69[10], __attribute__ ((unused)) signed int *const *const *__anonymous_object70, __attribute__ ((unused)) signed int *const *const __anonymous_object71[10]){ +signed int _X1fFi_Fi__FPi__FPPi__FPKPi__FPKPi__PiPiPPiPPiPPPiPPPiPPKPiPPKPiPKPKPiPKPKPi__1(signed int (*__anonymous_object42)(void), signed int *(*__anonymous_object43)(void), signed int **(*__anonymous_object44)(void), signed int *const *(*__anonymous_object45)(void), signed int *const *const (*__anonymous_object46)(void), signed int *__anonymous_object47, signed int __anonymous_object48[10], signed int **__anonymous_object49, signed int *__anonymous_object50[10], signed int ***__anonymous_object51, signed int **__anonymous_object52[10], signed int *const **__anonymous_object53, signed int *const *__anonymous_object54[10], signed int *const *const *__anonymous_object55, signed int *const *const __anonymous_object56[10]); +signed int _X1fFi_Fi__FPi__FPPi__FPKPi__FPKPi__PiPiPPiPPiPPPiPPPiPPKPiPPKPiPKPKPiPKPKPi__1(__attribute__ ((unused)) signed int (*__anonymous_object57)(void), __attribute__ ((unused)) signed int *(*__anonymous_object58)(void), __attribute__ ((unused)) signed int **(*__anonymous_object59)(void), __attribute__ ((unused)) signed int *const *(*__anonymous_object60)(void), __attribute__ ((unused)) signed int *const *const (*__anonymous_object61)(void), __attribute__ ((unused)) signed int *__anonymous_object62, __attribute__ ((unused)) signed int __anonymous_object63[10], __attribute__ ((unused)) signed int **__anonymous_object64, __attribute__ ((unused)) signed int *__anonymous_object65[10], __attribute__ ((unused)) signed int ***__anonymous_object66, __attribute__ ((unused)) signed int **__anonymous_object67[10], __attribute__ ((unused)) signed int *const **__anonymous_object68, __attribute__ ((unused)) signed int *const *__anonymous_object69[10], __attribute__ ((unused)) signed int *const *const *__anonymous_object70, __attribute__ ((unused)) signed int *const *const __anonymous_object71[10]){ __attribute__ ((unused)) signed int _X9_retval_fi_1; } Index: tests/.expect/functions.x64.txt =================================================================== --- tests/.expect/functions.x64.txt (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/.expect/functions.x64.txt (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -16,38 +16,38 @@ } -signed int _X2f1Fi___1(){ +signed int _X2f1Fi___1(void){ __attribute__ ((unused)) signed int _X10_retval_f1i_1; } -signed int _X2f2Fi___1(){ +signed int _X2f2Fi___1(void){ __attribute__ ((unused)) signed int _X10_retval_f2i_1; } -signed int (*_X2f3FFi_____1())(){ - __attribute__ ((unused)) signed int (*_X10_retval_f3Fi___1)(); -} -signed int *_X2f4FPi___1(){ +signed int (*_X2f3FFi_____1(void))(void){ + __attribute__ ((unused)) signed int (*_X10_retval_f3Fi___1)(void); +} +signed int *_X2f4FPi___1(void){ __attribute__ ((unused)) signed int *_X10_retval_f4Pi_1; } -signed int (*_X2f5FFi_____1())(){ - __attribute__ ((unused)) signed int (*_X10_retval_f5Fi___1)(); -} -signed int *_X2f6FPi___1(){ +signed int (*_X2f5FFi_____1(void))(void){ + __attribute__ ((unused)) signed int (*_X10_retval_f5Fi___1)(void); +} +signed int *_X2f6FPi___1(void){ __attribute__ ((unused)) signed int *_X10_retval_f6Pi_1; } -signed int *_X2f7FPi___1(){ +signed int *_X2f7FPi___1(void){ __attribute__ ((unused)) signed int *_X10_retval_f7Pi_1; } -signed int **_X2f8FPPi___1(){ +signed int **_X2f8FPPi___1(void){ __attribute__ ((unused)) signed int **_X10_retval_f8PPi_1; } -signed int *const *_X2f9FPKPi___1(){ +signed int *const *_X2f9FPKPi___1(void){ __attribute__ ((unused)) signed int *const *_X10_retval_f9PKPi_1; } -signed int (*_X3f10FPA0i___1())[]{ +signed int (*_X3f10FPA0i___1(void))[]{ __attribute__ ((unused)) signed int (*_X11_retval_f10PA0i_1)[]; } -signed int (*_X3f11FPA0A0i___1())[][((unsigned long int )3)]{ +signed int (*_X3f11FPA0A0i___1(void))[][((unsigned long int )3)]{ __attribute__ ((unused)) signed int (*_X11_retval_f11PA0A0i_1)[][((unsigned long int )3)]; } -signed int (*_X3f12FPA0A0i___1())[][((unsigned long int )3)]{ +signed int (*_X3f12FPA0A0i___1(void))[][((unsigned long int )3)]{ __attribute__ ((unused)) signed int (*_X11_retval_f12PA0A0i_1)[][((unsigned long int )3)]; } @@ -64,17 +64,17 @@ __attribute__ ((unused)) const signed int _X12_retval_fII4Ki_1; } -signed int *_X4fII5FPi___1(){ +signed int *_X4fII5FPi___1(void){ __attribute__ ((unused)) signed int *_X12_retval_fII5Pi_1; } -signed int *const _X4fII6FPi___1(){ +signed int *const _X4fII6FPi___1(void){ __attribute__ ((unused)) signed int *const _X12_retval_fII6KPi_1; } -const signed long int *_X4fII7FPKl___1(){ +const signed long int *_X4fII7FPKl___1(void){ __attribute__ ((unused)) const signed long int *_X12_retval_fII7PKl_1; } -static const signed long int *_X4fII8FPKl___1(){ +static const signed long int *_X4fII8FPKl___1(void){ __attribute__ ((unused)) const signed long int *_X12_retval_fII8PKl_1; } -static const signed long int *_X4fII9FPKl___1(){ +static const signed long int *_X4fII9FPKl___1(void){ __attribute__ ((unused)) const signed long int *_X12_retval_fII9PKl_1; } @@ -224,5 +224,5 @@ signed int _X3f11Fi_i__1(signed int __anonymous_object34); signed int _X3f12Fi___1(void); -const double _X4bar1Fd___1(); +const double _X4bar1Fd___1(void); const double _X4bar2Fd_i__1(signed int __anonymous_object35); const double _X4bar3Fd_d__1(double __anonymous_object36); @@ -290,5 +290,5 @@ signed int (*(*_X1pPA0Fi_i__2)[])(signed int __param_0); } -static const signed int *_X2f1FPKi___1(){ +static const signed int *_X2f1FPKi___1(void){ __attribute__ ((unused)) const signed int *_X10_retval_f1PKi_1; } @@ -310,6 +310,6 @@ __attribute__ ((unused)) const struct _conc__tuple2_3 _X10_retval_f5KT2PiKi_1; } -signed int _X1fFi_Fi__FPi__FPPi__FPKPi__FPKPi__PiPiPPiPPiPPPiPPPiPPKPiPPKPiPKPKPiPKPKPi__1(signed int (*__anonymous_object42)(), signed int *(*__anonymous_object43)(), signed int **(*__anonymous_object44)(), signed int *const *(*__anonymous_object45)(), signed int *const *const (*__anonymous_object46)(), signed int *__anonymous_object47, signed int __anonymous_object48[10], signed int **__anonymous_object49, signed int *__anonymous_object50[10], signed int ***__anonymous_object51, signed int **__anonymous_object52[10], signed int *const **__anonymous_object53, signed int *const *__anonymous_object54[10], signed int *const *const *__anonymous_object55, signed int *const *const __anonymous_object56[10]); -signed int _X1fFi_Fi__FPi__FPPi__FPKPi__FPKPi__PiPiPPiPPiPPPiPPPiPPKPiPPKPiPKPKPiPKPKPi__1(__attribute__ ((unused)) signed int (*__anonymous_object57)(), __attribute__ ((unused)) signed int *(*__anonymous_object58)(), __attribute__ ((unused)) signed int **(*__anonymous_object59)(), __attribute__ ((unused)) signed int *const *(*__anonymous_object60)(), __attribute__ ((unused)) signed int *const *const (*__anonymous_object61)(), __attribute__ ((unused)) signed int *__anonymous_object62, __attribute__ ((unused)) signed int __anonymous_object63[10], __attribute__ ((unused)) signed int **__anonymous_object64, __attribute__ ((unused)) signed int *__anonymous_object65[10], __attribute__ ((unused)) signed int ***__anonymous_object66, __attribute__ ((unused)) signed int **__anonymous_object67[10], __attribute__ ((unused)) signed int *const **__anonymous_object68, __attribute__ ((unused)) signed int *const *__anonymous_object69[10], __attribute__ ((unused)) signed int *const *const *__anonymous_object70, __attribute__ ((unused)) signed int *const *const __anonymous_object71[10]){ +signed int _X1fFi_Fi__FPi__FPPi__FPKPi__FPKPi__PiPiPPiPPiPPPiPPPiPPKPiPPKPiPKPKPiPKPKPi__1(signed int (*__anonymous_object42)(void), signed int *(*__anonymous_object43)(void), signed int **(*__anonymous_object44)(void), signed int *const *(*__anonymous_object45)(void), signed int *const *const (*__anonymous_object46)(void), signed int *__anonymous_object47, signed int __anonymous_object48[10], signed int **__anonymous_object49, signed int *__anonymous_object50[10], signed int ***__anonymous_object51, signed int **__anonymous_object52[10], signed int *const **__anonymous_object53, signed int *const *__anonymous_object54[10], signed int *const *const *__anonymous_object55, signed int *const *const __anonymous_object56[10]); +signed int _X1fFi_Fi__FPi__FPPi__FPKPi__FPKPi__PiPiPPiPPiPPPiPPPiPPKPiPPKPiPKPKPiPKPKPi__1(__attribute__ ((unused)) signed int (*__anonymous_object57)(void), __attribute__ ((unused)) signed int *(*__anonymous_object58)(void), __attribute__ ((unused)) signed int **(*__anonymous_object59)(void), __attribute__ ((unused)) signed int *const *(*__anonymous_object60)(void), __attribute__ ((unused)) signed int *const *const (*__anonymous_object61)(void), __attribute__ ((unused)) signed int *__anonymous_object62, __attribute__ ((unused)) signed int __anonymous_object63[10], __attribute__ ((unused)) signed int **__anonymous_object64, __attribute__ ((unused)) signed int *__anonymous_object65[10], __attribute__ ((unused)) signed int ***__anonymous_object66, __attribute__ ((unused)) signed int **__anonymous_object67[10], __attribute__ ((unused)) signed int *const **__anonymous_object68, __attribute__ ((unused)) signed int *const *__anonymous_object69[10], __attribute__ ((unused)) signed int *const *const *__anonymous_object70, __attribute__ ((unused)) signed int *const *const __anonymous_object71[10]){ __attribute__ ((unused)) signed int _X9_retval_fi_1; } Index: tests/.expect/functions.x86.txt =================================================================== --- tests/.expect/functions.x86.txt (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/.expect/functions.x86.txt (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -16,38 +16,38 @@ } -signed int _X2f1Fi___1(){ +signed int _X2f1Fi___1(void){ __attribute__ ((unused)) signed int _X10_retval_f1i_1; } -signed int _X2f2Fi___1(){ +signed int _X2f2Fi___1(void){ __attribute__ ((unused)) signed int _X10_retval_f2i_1; } -signed int (*_X2f3FFi_____1())(){ - __attribute__ ((unused)) signed int (*_X10_retval_f3Fi___1)(); -} -signed int *_X2f4FPi___1(){ +signed int (*_X2f3FFi_____1(void))(void){ + __attribute__ ((unused)) signed int (*_X10_retval_f3Fi___1)(void); +} +signed int *_X2f4FPi___1(void){ __attribute__ ((unused)) signed int *_X10_retval_f4Pi_1; } -signed int (*_X2f5FFi_____1())(){ - __attribute__ ((unused)) signed int (*_X10_retval_f5Fi___1)(); -} -signed int *_X2f6FPi___1(){ +signed int (*_X2f5FFi_____1(void))(void){ + __attribute__ ((unused)) signed int (*_X10_retval_f5Fi___1)(void); +} +signed int *_X2f6FPi___1(void){ __attribute__ ((unused)) signed int *_X10_retval_f6Pi_1; } -signed int *_X2f7FPi___1(){ +signed int *_X2f7FPi___1(void){ __attribute__ ((unused)) signed int *_X10_retval_f7Pi_1; } -signed int **_X2f8FPPi___1(){ +signed int **_X2f8FPPi___1(void){ __attribute__ ((unused)) signed int **_X10_retval_f8PPi_1; } -signed int *const *_X2f9FPKPi___1(){ +signed int *const *_X2f9FPKPi___1(void){ __attribute__ ((unused)) signed int *const *_X10_retval_f9PKPi_1; } -signed int (*_X3f10FPA0i___1())[]{ +signed int (*_X3f10FPA0i___1(void))[]{ __attribute__ ((unused)) signed int (*_X11_retval_f10PA0i_1)[]; } -signed int (*_X3f11FPA0A0i___1())[][((unsigned int )3)]{ +signed int (*_X3f11FPA0A0i___1(void))[][((unsigned int )3)]{ __attribute__ ((unused)) signed int (*_X11_retval_f11PA0A0i_1)[][((unsigned int )3)]; } -signed int (*_X3f12FPA0A0i___1())[][((unsigned int )3)]{ +signed int (*_X3f12FPA0A0i___1(void))[][((unsigned int )3)]{ __attribute__ ((unused)) signed int (*_X11_retval_f12PA0A0i_1)[][((unsigned int )3)]; } @@ -64,17 +64,17 @@ __attribute__ ((unused)) const signed int _X12_retval_fII4Ki_1; } -signed int *_X4fII5FPi___1(){ +signed int *_X4fII5FPi___1(void){ __attribute__ ((unused)) signed int *_X12_retval_fII5Pi_1; } -signed int *const _X4fII6FPi___1(){ +signed int *const _X4fII6FPi___1(void){ __attribute__ ((unused)) signed int *const _X12_retval_fII6KPi_1; } -const signed long int *_X4fII7FPKl___1(){ +const signed long int *_X4fII7FPKl___1(void){ __attribute__ ((unused)) const signed long int *_X12_retval_fII7PKl_1; } -static const signed long int *_X4fII8FPKl___1(){ +static const signed long int *_X4fII8FPKl___1(void){ __attribute__ ((unused)) const signed long int *_X12_retval_fII8PKl_1; } -static const signed long int *_X4fII9FPKl___1(){ +static const signed long int *_X4fII9FPKl___1(void){ __attribute__ ((unused)) const signed long int *_X12_retval_fII9PKl_1; } @@ -224,5 +224,5 @@ signed int _X3f11Fi_i__1(signed int __anonymous_object34); signed int _X3f12Fi___1(void); -const double _X4bar1Fd___1(); +const double _X4bar1Fd___1(void); const double _X4bar2Fd_i__1(signed int __anonymous_object35); const double _X4bar3Fd_d__1(double __anonymous_object36); @@ -290,5 +290,5 @@ signed int (*(*_X1pPA0Fi_i__2)[])(signed int __param_0); } -static const signed int *_X2f1FPKi___1(){ +static const signed int *_X2f1FPKi___1(void){ __attribute__ ((unused)) const signed int *_X10_retval_f1PKi_1; } @@ -310,6 +310,6 @@ __attribute__ ((unused)) const struct _conc__tuple2_3 _X10_retval_f5KT2PiKi_1; } -signed int _X1fFi_Fi__FPi__FPPi__FPKPi__FPKPi__PiPiPPiPPiPPPiPPPiPPKPiPPKPiPKPKPiPKPKPi__1(signed int (*__anonymous_object42)(), signed int *(*__anonymous_object43)(), signed int **(*__anonymous_object44)(), signed int *const *(*__anonymous_object45)(), signed int *const *const (*__anonymous_object46)(), signed int *__anonymous_object47, signed int __anonymous_object48[10], signed int **__anonymous_object49, signed int *__anonymous_object50[10], signed int ***__anonymous_object51, signed int **__anonymous_object52[10], signed int *const **__anonymous_object53, signed int *const *__anonymous_object54[10], signed int *const *const *__anonymous_object55, signed int *const *const __anonymous_object56[10]); -signed int _X1fFi_Fi__FPi__FPPi__FPKPi__FPKPi__PiPiPPiPPiPPPiPPPiPPKPiPPKPiPKPKPiPKPKPi__1(__attribute__ ((unused)) signed int (*__anonymous_object57)(), __attribute__ ((unused)) signed int *(*__anonymous_object58)(), __attribute__ ((unused)) signed int **(*__anonymous_object59)(), __attribute__ ((unused)) signed int *const *(*__anonymous_object60)(), __attribute__ ((unused)) signed int *const *const (*__anonymous_object61)(), __attribute__ ((unused)) signed int *__anonymous_object62, __attribute__ ((unused)) signed int __anonymous_object63[10], __attribute__ ((unused)) signed int **__anonymous_object64, __attribute__ ((unused)) signed int *__anonymous_object65[10], __attribute__ ((unused)) signed int ***__anonymous_object66, __attribute__ ((unused)) signed int **__anonymous_object67[10], __attribute__ ((unused)) signed int *const **__anonymous_object68, __attribute__ ((unused)) signed int *const *__anonymous_object69[10], __attribute__ ((unused)) signed int *const *const *__anonymous_object70, __attribute__ ((unused)) signed int *const *const __anonymous_object71[10]){ +signed int _X1fFi_Fi__FPi__FPPi__FPKPi__FPKPi__PiPiPPiPPiPPPiPPPiPPKPiPPKPiPKPKPiPKPKPi__1(signed int (*__anonymous_object42)(void), signed int *(*__anonymous_object43)(void), signed int **(*__anonymous_object44)(void), signed int *const *(*__anonymous_object45)(void), signed int *const *const (*__anonymous_object46)(void), signed int *__anonymous_object47, signed int __anonymous_object48[10], signed int **__anonymous_object49, signed int *__anonymous_object50[10], signed int ***__anonymous_object51, signed int **__anonymous_object52[10], signed int *const **__anonymous_object53, signed int *const *__anonymous_object54[10], signed int *const *const *__anonymous_object55, signed int *const *const __anonymous_object56[10]); +signed int _X1fFi_Fi__FPi__FPPi__FPKPi__FPKPi__PiPiPPiPPiPPPiPPPiPPKPiPPKPiPKPKPiPKPKPi__1(__attribute__ ((unused)) signed int (*__anonymous_object57)(void), __attribute__ ((unused)) signed int *(*__anonymous_object58)(void), __attribute__ ((unused)) signed int **(*__anonymous_object59)(void), __attribute__ ((unused)) signed int *const *(*__anonymous_object60)(void), __attribute__ ((unused)) signed int *const *const (*__anonymous_object61)(void), __attribute__ ((unused)) signed int *__anonymous_object62, __attribute__ ((unused)) signed int __anonymous_object63[10], __attribute__ ((unused)) signed int **__anonymous_object64, __attribute__ ((unused)) signed int *__anonymous_object65[10], __attribute__ ((unused)) signed int ***__anonymous_object66, __attribute__ ((unused)) signed int **__anonymous_object67[10], __attribute__ ((unused)) signed int *const **__anonymous_object68, __attribute__ ((unused)) signed int *const *__anonymous_object69[10], __attribute__ ((unused)) signed int *const *const *__anonymous_object70, __attribute__ ((unused)) signed int *const *const __anonymous_object71[10]){ __attribute__ ((unused)) signed int _X9_retval_fi_1; } Index: tests/.expect/gccExtensions.arm64.txt =================================================================== --- tests/.expect/gccExtensions.arm64.txt (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/.expect/gccExtensions.arm64.txt (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -19,8 +19,8 @@ const signed int _X2i2Ki_2; const signed int _X2i3Ki_2; - inline signed int _X2f1Fi___2(){ + inline signed int _X2f1Fi___2(void){ __attribute__ ((unused)) signed int _X10_retval_f1i_2; } - inline signed int _X2f2Fi___2(){ + inline signed int _X2f2Fi___2(void){ __attribute__ ((unused)) signed int _X10_retval_f2i_2; } Index: tests/.expect/gccExtensions.x64.txt =================================================================== --- tests/.expect/gccExtensions.x64.txt (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/.expect/gccExtensions.x64.txt (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -19,8 +19,8 @@ const signed int _X2i2Ki_2; const signed int _X2i3Ki_2; - inline signed int _X2f1Fi___2(){ + inline signed int _X2f1Fi___2(void){ __attribute__ ((unused)) signed int _X10_retval_f1i_2; } - inline signed int _X2f2Fi___2(){ + inline signed int _X2f2Fi___2(void){ __attribute__ ((unused)) signed int _X10_retval_f2i_2; } Index: tests/.expect/gccExtensions.x86.txt =================================================================== --- tests/.expect/gccExtensions.x86.txt (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/.expect/gccExtensions.x86.txt (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -19,8 +19,8 @@ const signed int _X2i2Ki_2; const signed int _X2i3Ki_2; - inline signed int _X2f1Fi___2(){ + inline signed int _X2f1Fi___2(void){ __attribute__ ((unused)) signed int _X10_retval_f1i_2; } - inline signed int _X2f2Fi___2(){ + inline signed int _X2f2Fi___2(void){ __attribute__ ((unused)) signed int _X10_retval_f2i_2; } Index: tests/castError.cfa =================================================================== --- tests/castError.cfa (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/castError.cfa (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -1,10 +1,10 @@ -// +// // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo // // The contents of this file are covered under the licence agreement in the // file "LICENCE" distributed with Cforall. -// +// // castError.cfa -- test invalid casts -// +// // Author : Peter A. Buhr // Created On : Tue Feb 19 21:15:39 2019 @@ -12,5 +12,5 @@ // Last Modified On : Tue Feb 19 21:16:44 2019 // Update Count : 1 -// +// forall(T) struct S { T p; }; Index: tests/errors/.expect/declaration.txt =================================================================== --- tests/errors/.expect/declaration.txt (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/errors/.expect/declaration.txt (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -20,50 +20,60 @@ errors/declaration.cfa:24:1 error: duplicate const qualifier(s) in declaration of f01: static inline function - with no parameters + with parameters + void returning const volatile int errors/declaration.cfa:25:1 error: duplicate volatile qualifier(s) in declaration of f02: static inline function - with no parameters + with parameters + void returning const volatile int errors/declaration.cfa:26:1 error: duplicate const qualifier(s) in declaration of f03: static inline function - with no parameters + with parameters + void returning const volatile int errors/declaration.cfa:27:1 error: duplicate volatile qualifier(s) in declaration of f04: static inline function - with no parameters + with parameters + void returning const volatile int errors/declaration.cfa:28:1 error: duplicate const qualifier(s) in declaration of f05: static inline function - with no parameters + with parameters + void returning const volatile int errors/declaration.cfa:29:1 error: duplicate volatile qualifier(s) in declaration of f06: static inline function - with no parameters + with parameters + void returning const volatile int errors/declaration.cfa:30:1 error: duplicate const qualifier(s) in declaration of f07: static inline function - with no parameters + with parameters + void returning const volatile int errors/declaration.cfa:31:1 error: duplicate const volatile qualifier(s) in declaration of f08: static inline function - with no parameters + with parameters + void returning const volatile int errors/declaration.cfa:33:1 error: duplicate const volatile qualifier(s) in declaration of f09: static inline function - with no parameters + with parameters + void returning const volatile int errors/declaration.cfa:34:1 error: duplicate const qualifier(s), duplicate _Atomic qualifier(s), duplicate _Atomic qualifier(s), duplicate const restrict volatile qualifier(s) in declaration of f09: static inline function - with no parameters + with parameters + void returning const restrict volatile _Atomic int Index: tests/errors/.expect/signature.txt =================================================================== --- tests/errors/.expect/signature.txt (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/errors/.expect/signature.txt (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -2,7 +2,7 @@ errors/signature.cfa:3:1 error: Constructors, destructors, and assignment functions require at least one parameter. errors/signature.cfa:4:1 error: Constructors, destructors, and assignment functions require at least one parameter. -errors/signature.cfa:5:1 error: First parameter of a constructor, destructor, or assignment function must be a reference. -errors/signature.cfa:6:1 error: First parameter of a constructor, destructor, or assignment function must be a reference. -errors/signature.cfa:7:1 error: First parameter of a constructor, destructor, or assignment function must be a reference. +errors/signature.cfa:5:1 error: Constructors, destructors, and assignment functions require at least one parameter. +errors/signature.cfa:6:1 error: Constructors, destructors, and assignment functions require at least one parameter. +errors/signature.cfa:7:1 error: Constructors, destructors, and assignment functions require at least one parameter. errors/signature.cfa:10:1 error: First parameter of a constructor, destructor, or assignment function must be a reference. errors/signature.cfa:11:1 error: First parameter of a constructor, destructor, or assignment function must be a reference. Index: tests/errors/declaration.cfa =================================================================== --- tests/errors/declaration.cfa (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/errors/declaration.cfa (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -1,10 +1,10 @@ -// +// // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo // // The contents of this file are covered under the licence agreement in the // file "LICENCE" distributed with Cforall. -// -// declarationErrors.cfa -- -// +// +// declarationErrors.cfa -- +// // Author : Peter A. Buhr // Created On : Wed Aug 17 08:23:43 2016 @@ -12,5 +12,5 @@ // Last Modified On : Tue Nov 6 17:52:47 2018 // Update Count : 32 -// +// static short int volatile static const x1; // duplicate static Index: tests/gccExtensions.cfa =================================================================== --- tests/gccExtensions.cfa (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/gccExtensions.cfa (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -1,10 +1,10 @@ -// +// // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo // // The contents of this file are covered under the licence agreement in the // file "LICENCE" distributed with Cforall. -// -// gccExtensions.cfa -- -// +// +// gccExtensions.cfa -- +// // Author : Peter A. Buhr // Created On : Sun Aug 14 17:28:17 2016 @@ -12,5 +12,5 @@ // Last Modified On : Mon Aug 5 18:04:37 2019 // Update Count : 28 -// +// extern int x asm( "xx" ); Index: tests/meta/.expect/arch.arm64.txt =================================================================== --- tests/meta/.expect/arch.arm64.txt (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/meta/.expect/arch.arm64.txt (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -21,10 +21,8 @@ Cost ( 1, 0, 0, 0, 0, 0, 0, 0 ): Explicit Cast of: Variable Expression: FA64: function - accepting unspecified arguments ... returning nothing ... with resolved type: pointer to function - accepting unspecified arguments ... returning nothing Index: tests/meta/.expect/arch.x64.txt =================================================================== --- tests/meta/.expect/arch.x64.txt (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/meta/.expect/arch.x64.txt (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -21,10 +21,8 @@ Cost ( 1, 0, 0, 0, 0, 0, 0, 0 ): Explicit Cast of: Variable Expression: FX64: function - accepting unspecified arguments ... returning nothing ... with resolved type: pointer to function - accepting unspecified arguments ... returning nothing Index: tests/meta/.expect/arch.x86.txt =================================================================== --- tests/meta/.expect/arch.x86.txt (revision cdbb909ded4bb5325b86d9b815ce893c0854ec8c) +++ tests/meta/.expect/arch.x86.txt (revision db19e1d0d4adcc296ca7022c295f441155d4b6dc) @@ -21,10 +21,8 @@ Cost ( 1, 0, 0, 0, 0, 0, 0, 0 ): Explicit Cast of: Variable Expression: FX86: function - accepting unspecified arguments ... returning nothing ... with resolved type: pointer to function - accepting unspecified arguments ... returning nothing