Changes in / [ad47ec4:9bb6c5f]

Files:

• doc/bibliography/pl.bib (modified) (3 diffs)
• doc/theses/fangren_yu_MMath/intro.tex (modified) (5 diffs)
• doc/theses/jiada_liang_MMath/Cenum.tex (modified) (2 diffs)
• doc/theses/jiada_liang_MMath/relatedwork.tex (modified) (2 diffs)
• libcfa/prelude/prototypes.awk (modified) (2 diffs)
• libcfa/src/concurrency/future.hfa (modified) (4 diffs)
• libcfa/src/iostream.cfa (modified) (7 diffs)
• src/CodeGen/CodeGenerator.cpp (modified) (1 diff)
• src/CodeGen/GenType.cpp (modified) (1 diff)
• src/Concurrency/Keywords.cpp (modified) (1 diff)
• src/Concurrency/Waitfor.cpp (modified) (1 diff)
• src/Parser/TypeData.cpp (modified) (4 diffs)
• src/Parser/parser.yy (modified) (1 diff)
• tests/.expect/KRfunctions.arm64.txt (modified) (1 diff)
• tests/.expect/KRfunctions.x64.txt (modified) (1 diff)
• tests/.expect/KRfunctions.x86.txt (modified) (1 diff)
• tests/.expect/attributes.arm64.txt (modified) (10 diffs)
• tests/.expect/attributes.x64.txt (modified) (10 diffs)
• tests/.expect/attributes.x86.txt (modified) (10 diffs)
• tests/.expect/castError.txt (modified) (1 diff)
• tests/.expect/declarationSpecifier.arm64.txt (modified) (9 diffs)
• tests/.expect/declarationSpecifier.x64.txt (modified) (9 diffs)
• tests/.expect/declarationSpecifier.x86.txt (modified) (9 diffs)
• tests/.expect/extension.arm64.txt (modified) (1 diff)
• tests/.expect/extension.x64.txt (modified) (1 diff)
• tests/.expect/extension.x86.txt (modified) (1 diff)
• tests/.expect/functions.arm64.txt (modified) (5 diffs)
• tests/.expect/functions.x64.txt (modified) (5 diffs)
• tests/.expect/functions.x86.txt (modified) (5 diffs)
• tests/.expect/gccExtensions.arm64.txt (modified) (1 diff)
• tests/.expect/gccExtensions.x64.txt (modified) (1 diff)
• tests/.expect/gccExtensions.x86.txt (modified) (1 diff)
• tests/castError.cfa (modified) (2 diffs)
• tests/errors/.expect/declaration.txt (modified) (1 diff)
• tests/errors/.expect/signature.txt (modified) (1 diff)
• tests/errors/declaration.cfa (modified) (2 diffs)
• tests/gccExtensions.cfa (modified) (2 diffs)
• tests/meta/.expect/arch.arm64.txt (modified) (1 diff)
• tests/meta/.expect/arch.x64.txt (modified) (1 diff)
• tests/meta/.expect/arch.x86.txt (modified) (1 diff)

doc/bibliography/pl.bib

@@ +1 @@
+
 % Conventions: uncross-referenced entries appear first, then
 %    cross-referenced entries.  In both groups, entries are sorted by their
@@ -5850 +5851 @@
     contributer = {pabuhr@plg},
     author      = {Leslie Lamport},
-    title       = {A New Solution of Dijkstra's Concurrent Programming Problem},
+    title       = {A New Solution of {D}ijkstra's Concurrent Programming Problem},
     journal     = cacm,
     month       = aug,
@@ -6809 +6810 @@
     year        = 1981,
     series      = {Series in Computer Science}
+}
+
+@inproceedings{Damas82,
+    contributer = {pabuhr@plg},
+    author      = {Luis Damas and Robin Milner},
+    title       = {Principal Type-Schemes for Functional Programs},
+    publisher   = {Association for Computing Machinery},
+    address     = {New York, NY, USA},
+    booktitle   = {Proceedings of the 9th ACM SIGPLAN-SIGACT Symposium on Principles of Programming Languages},
+    location    = {Albuquerque, New Mexico},
+    series      = {POPL'82}
+    year        = 1982,
+    pages       = {207-212},
 }
 

doc/theses/fangren_yu_MMath/intro.tex

@@ -6 +6 @@
 Overloading allows programmers to use the most meaningful names without fear of name clashes within a program or from external sources, like include files.
 \begin{quote}
-There are only two hard things in Computer Science: cache invalidation and naming things. --- Phil Karlton
+There are only two hard things in Computer Science: cache invalidation and \emph{naming things}. --- Phil Karlton
 \end{quote}
 Experience from \CC and \CFA developers is that the type system implicitly and correctly disambiguates the majority of overloaded names, \ie it is rare to get an incorrect selection or ambiguity, even among hundreds of overloaded (variables and) functions.
@@ -15 +15 @@
 
 
-\subsection{Operator Overloading}
-
-Virtually all programming languages overload the arithmetic operators across the basic types using the number and type of parameters and returns.
+\section{Types}
+
+\begin{quote}
+Some are born great, some achieve greatness, and some have greatness thrust upon them. Twelfth Night, Act II Scene 5, William Shakespeare
+\end{quote}
+
+All computers have multiple types because computer architects optimize the hardware around a few basic types with well defined (mathematical) operations: boolean, integral, floating-point, and occasionally strings.
+A programming language and its compiler present ways to declare types that ultimately map into those provided by the underlying hardware.
+These language types are thrust upon programmers, with their syntactic and semantic rules, and resulting restrictions.
+A language type-system defines these rules and uses them to understand how an expression is to be evaluated by the hardware.
+Modern programming-languages allow user-defined types and generalize across multiple types using polymorphism.
+Type systems can be static, where each variable has a fixed type during execution and an expression's type is determined once at compile time, or dynamic, where each variable can change type during execution and so an expression's type is reconstructed on each evaluation.
+Expressibility, generalization, and safety are all bound up in a language's type system, and hence, directly affect the capability, build time, and correctness of program development.
+
+
+\section{Operator Overloading}
+
+Virtually all programming languages overload the arithmetic operators across the basic computational types using the number and type of parameters and returns.
 Like \CC, \CFA also allows these operators to be overloaded with user-defined types.
-The syntax for operator names uses the @'?'@ character to denote a parameter, \eg prefix and infix increment operators: @?++@, @++?@, and @?+?@.
+The syntax for operator names uses the @'?'@ character to denote a function parameter, \eg prefix, postfix, and infix increment operators: @++?@, @?++@, and @?+?@.
+Here, a user-defined type is extended with an addition operation with the same syntax as builtin types.
 \begin{cfa}
 struct S { int i, j };
@@ -25 +41 @@
 S s1, s2;
 s1 = s1 @+@ s2;                 $\C[1.75in]{// infix call}$
-s1 = @?+?@( s1, s2 );   $\C{// direct call}\CRT$
+s1 = @?+?@( s1, s2 );   $\C{// direct call using operator name}\CRT$
 \end{cfa}
 The type system examines each call size and selects the best matching overloaded function based on the number and types of the arguments.
-If there are mixed-mode operands, @2 + 3.5@, the type system, like in C/\CC, attempts (safe) conversions, converting the argument type(s) to the parameter type(s).
-
-
-\subsection{Function Overloading}
+If there are mixed-mode operands, @2 + 3.5@, the \CFA type system, like C/\CC, attempts (safe) conversions, converting one or more of the argument type(s) to the parameter type(s).
+Conversions are necessary because the hardware rarely supports mix-mode operations, so both operands must be the same type.
+Note, without implicit conversions, programmers must write an exponential number of functions covering all possible exact-match cases among all possible types.
+This approach does not match with programmer intuition and expectation, regardless of any \emph{safety} issues resulting from converted values.
+
+
+\section{Function Overloading}
 
 Both \CFA and \CC allow function names to be overloaded, as long as their prototypes differ in the number and type of parameters and returns.
 \begin{cfa}
-void f( void );                 $\C[1.75in]{// (1): no parameter}$
+void f( void );                 $\C[2in]{// (1): no parameter}$
 void f( char );                 $\C{// (2): overloaded on the number and parameter type}$
 void f( int, int );             $\C{// (3): overloaded on the number and parameter type}$
@@ -45 +64 @@
 
 Ada, Scala, and \CFA type-systems also use the return type in resolving a call, to pinpoint the best overloaded name.
-\begin{cfa}
-int f( void );                  $\C[1.75in]{// (4); overloaded on return type}$
-double f( void );               $\C{// (5); overloaded on return type}$
-int i = f();                    $\C{// select (4)}$
-double d = f();                 $\C{// select (5)}\CRT$
-\end{cfa}
-
-
-\subsection{Variable Overloading}
-Unlike almost all programming languages, \CFA has variable overloading within a scope, along with shadow overloading in nested scopes.
+For example, in many programming languages with overloading, the following functions are ambiguous without using the return type.
+\begin{cfa}
+int f( int );                   $\C[2in]{// (1); overloaded on return type and parameter}$
+double f( int );                $\C{// (2); overloaded on return type and parameter}$
+int i = f( 3 );                 $\C{// select (1)}$
+double d = f( 3 );              $\C{// select (2)}\CRT$
+\end{cfa}
+However, if the type system looks at the return type, there is an exact match for each call, which matches with programmer intuition and expectation.
+This capability can be taken to the extreme, where there are no function parameters.
+\begin{cfa}
+int random( void );             $\C[2in]{// (1); overloaded on return type}$
+double random( void );  $\C{// (2); overloaded on return type}$
+int i = random();               $\C{// select (1)}$
+double d = random();    $\C{// select (2)}\CRT$
+\end{cfa}
+Again, there is an exact match for each call.
+If there is no exact match, a set of minimal conversions can be added to find a best match, as for operator overloading.
+
+
+\section{Variable Overloading}
+
+Unlike most programming languages, \CFA has variable overloading within a scope, along with shadow overloading in nested scopes.
+(Shadow overloading is also possible for functions, if a language supports nested function declarations, \eg \CC named, nested, lambda functions.)
 \begin{cfa}
 void foo( double d );
-int v;                              $\C[1.75in]{// (1)}$
+int v;                              $\C[2in]{// (1)}$
 double v;                               $\C{// (2) variable overloading}$
 foo( v );                               $\C{// select (2)}$
@@ -66 +98 @@
 }
 \end{cfa}
-The \CFA type system simply treats overloaded variables as an overloaded function returning a value with no parameters.
+It is interesting that shadow overloading is considered a normal programming-language feature with only slight software-engineering problems, but variable overloading within a scope is often considered extremely dangerous.
+
+In \CFA, the type system simply treats overloaded variables as an overloaded function returning a value with no parameters.
 Hence, no significant effort is required to support this feature.
+Leveraging the return type to disambiguate is essential because variables have no parameters.
+\begin{cfa}
+int MAX = 2147483647;   $\C[2in]{// (1); overloaded on return type}$
+double MAX = ...;               $\C{// (2); overloaded on return type}$
+int i = MAX;                    $\C{// select (1)}$
+double d = MAX;                 $\C{// select (2)}\CRT$
+\end{cfa}
+
+
+\section{Type Inferencing}
+
+One of the first and powerful type-inferencing system is Hindley--Milner~\cite{Damas82}.
+Here, the type resolver starts with the types of the program constants used for initialization and these constant types flow throughout the program, setting all variable and expression types.
+\begin{cfa}
+auto f() {
+        x = 1;   y = 3.5;       $\C{// set types from constants}$
+        x = // expression involving x, y and other local initialized variables
+        y = // expression involving x, y and other local initialized variables
+        return x, y;
+}
+auto w = f();                   $\C{// typing flows outwards}$
+
+void f( auto x, auto y ) {
+        x = // expression involving x, y and other local initialized variables
+        y = // expression involving x, y and other local initialized variables
+}
+s = 1;   t = 3.5;               $\C{// set types from constants}$
+f( s, t );                              $\C{// typing flows inwards}$
+\end{cfa}
+In both overloads of @f@, the type system works from the constant initializations inwards and/or outwards to determine the types of all variables and functions.
+Note, like template meta-programming, there can be a new function generated for the second @f@ depending on the types of the arguments, assuming these types are meaningful in the body of the @f@.
+Inferring type constraints, by analysing the body of @f@ is possible, and these constraints must be satisfied at each call site by the argument types;
+in this case, parametric polymorphism can allow separate compilation.
+In languages with type inferencing, there is often limited overloading to reduce the search space, which introduces the naming problem.
+Return-type inferencing goes in the opposite direction to Hindley--Milner: knowing the type of the result and flowing back through an expression to help select the best possible overloads, and possibly converting the constants for a best match.
+
+In simpler type inferencing systems, such as C/\CC/\CFA, there are more specific usages.
+\begin{cquote}
+\setlength{\tabcolsep}{10pt}
+\begin{tabular}{@{}lll@{}}
+\multicolumn{1}{c}{\textbf{gcc / \CFA}} & \multicolumn{1}{c}{\textbf{\CC}} \\
+\begin{cfa}
+#define expr 3.0 * i
+typeof(expr) x = expr;
+int y;
+typeof(y) z = y;
+\end{cfa}
+&
+\begin{cfa}
+
+auto x = 3.0 * 4;
+int y;
+auto z = y;
+\end{cfa}
+&
+\begin{cfa}
+
+// use type of initialization expression
+
+// use type of initialization expression
+\end{cfa}
+\end{tabular}
+\end{cquote}
+The two important capabilities are:
+\begin{itemize}[topsep=0pt]
+\item
+Not determining or writing long generic types, \eg, given deeply nested generic types.
+\begin{cfa}
+typedef T1(int).T2(float).T3(char).T ST;  $\C{// \CFA nested type declaration}$
+ST x, y, x;
+\end{cfa}
+This issue is exaggerated with \CC templates, where type names are 100s of characters long, resulting in unreadable error messages.
+\item
+Ensuring the type of secondary variables, always matches a primary variable.
+\begin{cfa}
+int x; $\C{// primary variable}$
+typeof(x) y, z, w; $\C{// secondary variables match x's type}$
+\end{cfa}
+If the type of @x@ changes, the types of the secondary variables correspondingly update.
+\end{itemize}
+Note, the use of @typeof@ is more restrictive, and possibly safer, than general type-inferencing.
+\begin{cfa}
+int x;
+type(x) y = ... // complex expression
+type(x) z = ... // complex expression
+\end{cfa}
+Here, the types of @y@ and @z@ are fixed (branded), whereas with type inferencing, the types of @y@ and @z@ are potentially unknown.
+
+
+\section{Type-Inferencing Issues}
+
+Each kind of type-inferencing systems has its own set of issues that flow onto the programmer in the form of restrictions and/or confusions.
+\begin{enumerate}[leftmargin=*]
+\item
+There can be large blocks of code where all declarations are @auto@.
+As a result, understanding and changing the code becomes almost impossible.
+Types provide important clues as to the behaviour of the code, and correspondingly to correctly change or add new code.
+In these cases, a programmer is forced to re-engineer types, which is fragile, or rely on a fancy IDE that can re-engineer types.
+\item
+The problem of unknown types becomes acute when the concrete type must be used, \eg, given:
+\begin{cfa}
+auto x = @...@
+\end{cfa}
+and the need to write a routine to compute using @x@
+\begin{cfa}
+void rtn( @...@ parm );
+rtn( x );
+\end{cfa}
+A programmer must re-engineer the type of @x@'s initialization expression, reconstructing the possibly long generic type-name.
+In this situation, having the type name or its short alias is essential.
+\item
+There is the conundrum in type inferencing of when to \emph{brand} a type.
+That is, when is the type of the variable/function more important than the type of its initialization expression.
+For example, if a change is made in an initialization expression, it can cause cascading type changes and/or errors.
+At some point, a variable's type needs to remain constant and the expression needs to be modified or in error when it changes.
+Often type-inferencing systems allow \newterm{branding} a variable or function type;
+now the complier can report a mismatch on the constant.
+\begin{cfa}
+void f( @int@ x, @int@ y ) {  // brand function prototype
+        x = // expression involving x, y and other local initialized variables
+        y = // expression involving x, y and other local initialized variables
+}
+s = 1;   t = 3.5;
+f( s, @t@ ); // type mismatch
+\end{cfa}
+In Haskell, it is common for programmers to brand (type) function parameters.
+\end{enumerate}
+
+\CFA's type system is trying to prevent type-resolution mistakes by relying heavily on the type of the left-hand side of assignment to pinpoint the right types for an expression computation.
+Type inferencing defeats this goal because there is no left-hand type.
+Fundamentally, type inferencing tries to magic away types from the programmer.
+However, this results in lazy programming with the potential for poor performance and safety concerns.
+Types are as important as control-flow, and should not be masked, even if it requires the programmer to think!
+A similar example is garbage collection, where storage management is masked, resulting in poor program design and performance.
+The entire area of Computer-Science data-structures is obsessed with time and space, and that obsession should continue into regular programming.
+Understanding space and time issues are an essential part of the programming craft.
+Given @typedef@ and @typeof@ in \CFA, and the strong need to use the left-hand type in resolution, implicit type-inferencing is unsupported.
+Should a significant need arise, this feature can be revisited.
+
+
+\section{Polymorphism}
+
+
+
+\section{Contributions}

doc/theses/jiada_liang_MMath/Cenum.tex

@@ -87 +87 @@
 \end{cfa}
 
-Note, \CC has the same safe restriction~\cite[C.1.5.7.2]{C++} and provides the same workaround cast.
-\begin{description}[parsep=0pt]
+Note, \CC has the same safe restriction and provides the same workaround cast:
+\begin{cquote}
+\begin{description}[leftmargin=*,topsep=0pt,itemsep=0pt,parsep=0pt]
 \item[Change:] \CC objects of enumeration type can only be assigned values of the same enumeration type.
 In C, objects of enumeration type can be assigned values of any integral type.
@@ -102 +103 @@
 \item[How widely used:] Common.
 \end{description}
+\hfill ISO/IEC 14882:1998 (\CC Programming Language Standard)~\cite[C.1.5.7.2.5]{ANSI98:C++}
+\end{cquote}

doc/theses/jiada_liang_MMath/relatedwork.tex

@@ -353 +353 @@
 whereas C @const@ declarations without @static@ are marked @R@.
 
-The following \CC non-backward compatible change is made~\cite[C.1.5.7.2]{C++}, plus the safe-assignment change shown in~\VRef{s:TypeSafety}.
-\begin{description}[parsep=0pt]
+The following \CC non-backward compatible change is made, plus the safe-assignment change shown in~\VRef{s:TypeSafety}.
+\begin{cquote}
+\begin{description}[leftmargin=*,topsep=0pt,itemsep=0pt,parsep=0pt]
 \item[Change:] In \CC, the type of an enumerator is its enumeration.
 In C, the type of an enumerator is @int@.
@@ -370 +371 @@
 Taking the size of an enumerator is not a common C coding practice.
 \end{description}
+\hfill ISO/IEC 14882:1998 (\CC Programming Language Standard)~\cite[C.1.5.7.2.6]{ANSI98:C++}
+\end{cquote}
 Hence, the values in a \CC enumeration can only be its enumerators (without a cast).
 

libcfa/prelude/prototypes.awk

@@ -103 +103 @@
 
         for ( prototype in prototypes ) {
-                # printf( "//\"%s\"\n", prototype )
                 if ( index( "BT_LAST", prototype ) == 1 ) {
                         continue
@@ -126 +125 @@
 
                 # 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

libcfa/src/concurrency/future.hfa

@@ -88 +88 @@
                 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 +146 @@
             }
             unlock( lock );
-            
+
             return [ret_val, false];
         }
@@ -154 +154 @@
 
             // 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 +180 @@
             return false;
         }
-                
+
         bool on_selected( future(T) & this, select_node & node ) { return true; }
         }

libcfa/src/iostream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Aug 17 12:31:47 2024
-// Update Count     : 2038
+// Last Modified On : Wed Sep  4 11:30:12 2024
+// Update Count     : 2040
 //
 
@@ -512 +512 @@
                 if ( cnt == 1 && f.flags.left ) { wd = f.wd; f.wd = maxdig; } // copy f.wd and reset for printing middle chunk
                 // printf( "R val:%#lx(%lu) wd:%u pc:%u base:%c neg:%d pc:%d left:%d nobsdp:%d sign:%d pad0:%d\n",
-                //              f.val, f.val, f.wd, f.pc, f.base, f.flags.neg, f.flags.pc, f.flags.left, f.flags.nobsdp, f.flags.sign, f.flags.pad0 ); 
+                //              f.val, f.val, f.wd, f.pc, f.base, f.flags.neg, f.flags.pc, f.flags.left, f.flags.nobsdp, f.flags.sign, f.flags.pad0 );
                 (ostype &)(os | f);
                 if ( cnt == 1 ) {
@@ -554 +554 @@
                 if ( f.flags.neg ) f.val = -f.val;
                 // printf( "L val:%#lx(%lu) wd:%u pc:%u base:%c neg:%d pc:%d left:%d nobsdp:%d sign:%d pad0:%d\n",
-                //              f.val, f.val, f.wd, f.pc, f.base, f.flags.neg, f.flags.pc, f.flags.left, f.flags.nobsdp, f.flags.sign, f.flags.pad0 ); 
+                //              f.val, f.val, f.wd, f.pc, f.base, f.flags.neg, f.flags.pc, f.flags.left, f.flags.nobsdp, f.flags.sign, f.flags.pad0 );
                 (ostype &)(os | f);
 
@@ -597 +597 @@
         "y", "z", "a", "f", "p", "n", "u", "m", "",
         "K", "M", "G", "T", "P", "E", "Z", "Y"
-}; 
+};
 #define SUFFIXES_START (-24) /* Smallest power for which there is a suffix defined. */
 #define SUFFIXES_END (SUFFIXES_START + (int)((sizeof(suffixes) / sizeof(char *) - 1) * 3))
@@ -1064 +1064 @@
                         else args = fmt( is, fmtstr, s, &len );
                         // fprintf( stderr, "cstr %s %d %d %d\n", fmtstr, args, len, f.cstr.wd );
+
+                        // No data read and eof is on => true eof so raise exception.
+                        if ( len == 0 && eof( is ) ) throwResume ExceptionInst( end_of_file );
+
                         if ( check && len >= rwd && ! eof( is ) ) {     // might not fit
                                 char peek;
@@ -1087 +1091 @@
                                 else args = fmt( is, fmtstr, s, &len );
 
+                                // No data read and eof is on => true eof so raise exception.
+                                if ( len == 0 && eof( is ) ) throwResume ExceptionInst( end_of_file );
+
                                 if ( check && len == rwd && ! eof( is ) ) {     // might not fit
                                         char peek;
@@ -1106 +1113 @@
                                 else args = fmt( is, fmtstr, s, &len );
                                 // fprintf( stderr, "incl/excl %s \"%s\" %d %d %d %d %d %c\n", fmtstr, s, args, wd, len, eof( is ), check, s[wd] );
+
+                                // No data read and eof is on => true eof so raise exception.
+                                if ( len == 0 && eof( is ) ) throwResume ExceptionInst( end_of_file );
+
                                 if ( check && len == rwd && ! eof( is ) ) {     // might not fit
                                         // fprintf( stderr, "overflow\n" );

src/CodeGen/CodeGenerator.cpp

@@ -180 +180 @@
 
         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 {

src/CodeGen/GenType.cpp

@@ -168 +168 @@
 
         if ( type->params.empty() ) {
-                if ( type->isVarArgs ) {
+                if ( !type->isVarArgs ) {
+                        os << "(void)";
+                } else if ( options.genC ) {
                         os << "()";
                 } else {
-                        os << "(void)";
+                        os << "(...)";
                 }
         } else {

src/Concurrency/Keywords.cpp

@@ -1510 +1510 @@
 
 ast::ptr<ast::Type> MutexKeyword::generic_func =
-        new ast::FunctionType( ast::VariableArgs );
+        new ast::FunctionType( ast::FixedArgs );
 
 // --------------------------------------------------------------------------

src/Concurrency/Waitfor.cpp

@@ -302 +302 @@
         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 =

src/Parser/TypeData.cpp

@@ -1541 +1541 @@
 
 // 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<ast::ptr<ast::DeclWithType>> & params ) {
+        buildList( decl, params );
+        if ( 1 == params.size() && params[0]->get_type()->isVoid() ) {
+                params.pop_back();
+        }
+}
 
 
@@ -1562 +1572 @@
         std::vector<ast::ptr<ast::DeclWithType>> params;
         std::vector<ast::ptr<ast::DeclWithType>> returns;
-        buildList( td->function.params, params );
+        buildParamList( td->function.params, params );
         buildForall( td->forall, forall );
         // Functions do not store their assertions there anymore.
@@ -1610 +1620 @@
                 std::move( attributes ),
                 funcSpec,
-                argumentFlag( td )
+                buildArgumentFlag( td )
         );
         buildList( td->function.withExprs, decl->withExprs );
@@ -1662 +1672 @@
         assert( td->kind == TypeData::Function );
         ast::FunctionType * ft = new ast::FunctionType(
-                argumentFlag( td ),
+                buildArgumentFlag( td ),
                 buildQualifiers( td )
         );

src/Parser/parser.yy

@@ -2889 +2889 @@
 parameter_list_ellipsis_opt:
         // empty
-                { $$ = nullptr; }
+                { $$ = DeclarationNode::newFromTypeData( build_basic_type( TypeData::Void ) ); }
         | ELLIPSIS
                 { $$ = nullptr; }

tests/.expect/KRfunctions.arm64.txt

@@ -98 +98 @@
     __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);

tests/.expect/KRfunctions.x64.txt

@@ -98 +98 @@
     __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);

tests/.expect/KRfunctions.x86.txt

@@ -98 +98 @@
     __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);

tests/.expect/attributes.arm64.txt

@@ -1 @@
-signed int _X2laFi___1(){
+signed int _X2laFi___1(void){
     __attribute__ ((unused)) signed int _X10_retval_lai_1;
     {
@@ -1179 +1179 @@
 
 }
-__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 +1186 @@
 __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 +1206 @@
     __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 +1223 @@
     __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 +1238 @@
     __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 +1246 @@
 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 +1256 @@
     __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 +1274 @@
 
     {
-        ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int ()));
+        ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int (void)));
     }
 
@@ -1348 +1348 @@
 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 {

tests/.expect/attributes.x64.txt

@@ -1 @@
-signed int _X2laFi___1(){
+signed int _X2laFi___1(void){
     __attribute__ ((unused)) signed int _X10_retval_lai_1;
     {
@@ -1179 +1179 @@
 
 }
-__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 +1186 @@
 __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 +1206 @@
     __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 +1223 @@
     __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 +1238 @@
     __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 +1246 @@
 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 +1256 @@
     __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 +1274 @@
 
     {
-        ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int ()));
+        ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int (void)));
     }
 
@@ -1348 +1348 @@
 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 {

tests/.expect/attributes.x86.txt

@@ -1 @@
-signed int _X2laFi___1(){
+signed int _X2laFi___1(void){
     __attribute__ ((unused)) signed int _X10_retval_lai_1;
     {
@@ -1179 +1179 @@
 
 }
-__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 +1186 @@
 __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 +1206 @@
     __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 +1223 @@
     __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 +1238 @@
     __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 +1246 @@
 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 +1256 @@
     __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 +1274 @@
 
     {
-        ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int ()));
+        ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int (void)));
     }
 
@@ -1348 +1348 @@
 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 {

tests/.expect/castError.txt

@@ -21 +21 @@
 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
 

tests/.expect/declarationSpecifier.arm64.txt

@@ -647 +647 @@
 _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 +707 @@
 
 }
-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 +752 @@
 
 }
-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 +797 @@
 
 }
-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 +842 @@
 
 }
-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 +887 @@
 
 }
-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 +932 @@
 
 }
-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 +977 @@
 
 }
-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 +1022 @@
 
 }
-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;

tests/.expect/declarationSpecifier.x64.txt

@@ -647 +647 @@
 _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 +707 @@
 
 }
-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 +752 @@
 
 }
-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 +797 @@
 
 }
-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 +842 @@
 
 }
-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 +887 @@
 
 }
-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 +932 @@
 
 }
-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 +977 @@
 
 }
-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 +1022 @@
 
 }
-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;

tests/.expect/declarationSpecifier.x86.txt

@@ -647 +647 @@
 _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 +707 @@
 
 }
-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 +752 @@
 
 }
-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 +797 @@
 
 }
-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 +842 @@
 
 }
-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 +887 @@
 
 }
-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 +932 @@
 
 }
-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 +977 @@
 
 }
-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 +1022 @@
 
 }
-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;

tests/.expect/extension.arm64.txt

@@ -161 +161 @@
     _X1BKM1E_1,
 };
-__extension__ signed int _X1fFi___1();
+__extension__ signed int _X1fFi___1(void);
 __extension__ signed int i;
 __extension__ signed int j;

tests/.expect/extension.x64.txt

@@ -161 +161 @@
     _X1BKM1E_1,
 };
-__extension__ signed int _X1fFi___1();
+__extension__ signed int _X1fFi___1(void);
 __extension__ signed int i;
 __extension__ signed int j;

tests/.expect/extension.x86.txt

@@ -161 +161 @@
     _X1BKM1E_1,
 };
-__extension__ signed int _X1fFi___1();
+__extension__ signed int _X1fFi___1(void);
 __extension__ signed int i;
 __extension__ signed int j;

tests/.expect/functions.arm64.txt

@@ -16 +16 @@
 
 }
-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 +64 @@
     __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 +224 @@
 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 +290 @@
     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 +310 @@
     __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;
 }

tests/.expect/functions.x64.txt

@@ -16 +16 @@
 
 }
-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 +64 @@
     __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 +224 @@
 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 +290 @@
     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 +310 @@
     __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;
 }

tests/.expect/functions.x86.txt

@@ -16 +16 @@
 
 }
-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 +64 @@
     __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 +224 @@
 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 +290 @@
     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 +310 @@
     __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;
 }

tests/.expect/gccExtensions.arm64.txt

@@ -19 +19 @@
     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;
     }

tests/.expect/gccExtensions.x64.txt

@@ -19 +19 @@
     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;
     }

tests/.expect/gccExtensions.x86.txt

@@ -19 +19 @@
     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;
     }

tests/castError.cfa

@@ -1 @@
-// 
+//
 // 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 +12 @@
 // Last Modified On : Tue Feb 19 21:16:44 2019
 // Update Count     : 1
-// 
+//
 
 forall(T) struct S { T p; };

tests/errors/.expect/declaration.txt

@@ -20 +20 @@
 
 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 
 

tests/errors/.expect/signature.txt

@@ -2 +2 @@
 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.

tests/errors/declaration.cfa

@@ -1 @@
-// 
+//
 // 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 +12 @@
 // Last Modified On : Tue Nov  6 17:52:47 2018
 // Update Count     : 32
-// 
+//
 
 static short int volatile static const x1;                              // duplicate static

tests/gccExtensions.cfa

@@ -1 @@
-// 
+//
 // 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 +12 @@
 // Last Modified On : Mon Aug  5 18:04:37 2019
 // Update Count     : 28
-// 
+//
 
 extern int x asm( "xx" );

tests/meta/.expect/arch.arm64.txt

@@ -21 +21 @@
 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
 

tests/meta/.expect/arch.x64.txt

@@ -21 +21 @@
 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
 

tests/meta/.expect/arch.x86.txt

@@ -21 +21 @@
 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