Changes in / [e85a8631:04cdd9b]

Files:

• doc/aaron_comp_II/comp_II.tex (modified) (26 diffs)
• src/Common/Assert.cc (modified) (3 diffs)
• src/Common/utility.h (modified) (1 diff)
• src/Makefile.am (modified) (2 diffs)
• src/Makefile.in (modified) (1 diff)
• src/Parser/DeclarationNode.cc (modified) (2 diffs)
• src/Parser/ExpressionNode.cc (modified) (5 diffs)
• src/Parser/InitializerNode.cc (modified) (1 diff)
• src/Parser/ParseNode.h (modified) (3 diffs)
• src/Parser/StatementNode.cc (modified) (2 diffs)
• src/Parser/TypeData.cc (modified) (1 diff)
• src/Parser/parser.cc (modified) (3 diffs)
• src/Parser/parser.yy (modified) (2 diffs)
• src/SynTree/Expression.cc (modified) (1 diff)
• src/SynTree/FunctionDecl.cc (modified) (1 diff)
• src/SynTree/Statement.cc (modified) (4 diffs)
• src/include/assert.h (modified) (3 diffs)
• src/main.cc (modified) (7 diffs)

doc/aaron_comp_II/comp_II.tex

@@ -91 +91 @@
 \CFA\footnote{Pronounced ``C-for-all'', and written \CFA or \CFL.} is an evolutionary modernization of the C programming language currently being designed and built at the University of Waterloo by a team led by Peter Buhr. 
 \CFA both fixes existing design problems and adds multiple new features to C, including name overloading, user-defined operators, parametric-polymorphic routines, and type constructors and destructors, among others. 
-The new features make \CFA more powerful and expressive than C, but impose a compile-time cost, particularly in the expression resolver, which must evaluate the typing rules of a significantly more complex type-system.
+The new features make \CFA significantly more powerful and expressive than C, but impose a significant compile-time cost, particularly in the expression resolver, which must evaluate the typing rules of a much more complex type-system.
 
 The primary goal of this research project is to develop a sufficiently performant expression resolution algorithm, experimentally validate its performance, and integrate it into CFA, the \CFA reference compiler.
@@ -104 +104 @@
 
 It is important to note that \CFA is not an object-oriented language.
-\CFA does have a system of (possibly implicit) type conversions derived from C's type conversions; while these conversions may be thought of as something like an inheritance hierarchy, the underlying semantics are significantly different and such an analogy is loose at best. 
+\CFA does have a system of (possibly implicit) type conversions derived from C's type conversions; while these conversions may be thought of as something like an inheritance hierarchy the underlying semantics are significantly different and such an analogy is loose at best. 
 Particularly, \CFA has no concept of ``subclass'', and thus no need to integrate an inheritance-based form of polymorphism with its parametric and overloading-based polymorphism. 
 The graph structure of the \CFA type conversions is also markedly different than an inheritance graph; it has neither a top nor a bottom type, and does not satisfy the lattice properties typical of inheritance graphs.
@@ -120 +120 @@
 \end{lstlisting}
 The ©identity© function above can be applied to any complete object type (or ``©otype©''). 
-The type variable ©T© is transformed into a set of additional implicit parameters to ©identity©, which encode sufficient information about ©T© to create and return a variable of that type. 
+The type variable ©T© is transformed into a set of additional implicit parameters to ©identity© which encode sufficient information about ©T© to create and return a variable of that type. 
 The current \CFA implementation passes the size and alignment of the type represented by an ©otype© parameter, as well as an assignment operator, constructor, copy constructor and destructor. 
 Here, the runtime cost of polymorphism is spread over each polymorphic call, due to passing more arguments to polymorphic functions; preliminary experiments have shown this overhead to be similar to \CC virtual function calls. 
 Determining if packaging all polymorphic arguments to a function into a virtual function table would reduce the runtime overhead of polymorphic calls is an open research question. 
 
-Since bare polymorphic types do not provide a great range of available operations, \CFA provides a \emph{type assertion} mechanism to provide further information about a type:
+Since bare polymorphic types do not provide a great range of available operations, \CFA also provides a \emph{type assertion} mechanism to provide further information about a type:
 \begin{lstlisting}
 forall(otype T ®| { T twice(T); }®)
@@ -137 +137 @@
 \end{lstlisting}
 These type assertions may be either variable or function declarations that depend on a polymorphic type variable. 
-©four_times© can only be called with an argument for which there exists a function named ©twice© that can take that argument and return another value of the same type; a pointer to the appropriate ©twice© function is passed as an additional implicit parameter to the call of ©four_times©.
+©four_times© can only be called with an argument for which there exists a function named ©twice© that can take that argument and return another value of the same type; a pointer to the appropriate ©twice© function is passed as an additional implicit parameter to the call to ©four_times©.
 
 Monomorphic specializations of polymorphic functions can themselves be used to satisfy type assertions. 
@@ -148 +148 @@
 The compiler accomplishes this by creating a wrapper function calling ©twice // (2)© with ©S© bound to ©double©, then providing this wrapper function to ©four_times©\footnote{©twice // (2)© could also have had a type parameter named ©T©; \CFA specifies renaming of the type parameters, which would avoid the name conflict with the type variable ©T© of ©four_times©.}. 
 
-Finding appropriate functions to satisfy type assertions is essentially a recursive case of expression resolution, as it takes a name (that of the type assertion) and attempts to match it to a suitable declaration \emph{in the current scope}. 
+Finding appropriate functions to satisfy type assertions is essentially a recursive case of expression resolution, as it takes a name (that of the type assertion) and attempts to match it to a suitable declaration in the current scope. 
 If a polymorphic function can be used to satisfy one of its own type assertions, this recursion may not terminate, as it is possible that function is examined as a candidate for its own type assertion unboundedly repeatedly. 
 To avoid infinite loops, the current CFA compiler imposes a fixed limit on the possible depth of recursion, similar to that employed by most \CC compilers for template expansion; this restriction means that there are some semantically well-typed expressions that cannot be resolved by CFA. 
@@ -170 +170 @@
 forall(otype M | has_magnitude(M))
 M max_magnitude( M a, M b ) {
-    return abs(a) < abs(b) ? b : a; 
+    M aa = abs(a), ab = abs(b);
+    return aa < ab ? b : a; 
 }
 \end{lstlisting}
 
 Semantically, traits are simply a named lists of type assertions, but they may be used for many of the same purposes that interfaces in Java or abstract base classes in \CC are used for.
-Unlike Java interfaces or \CC base classes, \CFA types do not explicitly state any inheritance relationship to traits they satisfy; this can be considered a form of structural inheritance, similar to implementation of an interface in Go, as opposed to the nominal inheritance model of Java and \CC. 
+Unlike Java interfaces or \CC base classes, \CFA types do not explicitly state any inheritance relationship to traits they satisfy; this can be considered a form of structural inheritance, similar to interface implementation in Go, as opposed to the nominal inheritance model of Java and \CC. 
 Nominal inheritance can be simulated with traits using marker variables or functions:
 \begin{lstlisting}
@@ -189 +190 @@
 \end{lstlisting}
 
-Traits, however, are significantly more powerful than nominal-inheritance interfaces; firstly, due to the scoping rules of the declarations that satisfy a trait's type assertions, a type may not satisfy a trait everywhere that the type is declared, as with ©char© and the ©nominal© trait above. 
-Secondly, traits may be used to declare a relationship among multiple types, a property that may be difficult or impossible to represent in nominal-inheritance type systems:
+Traits, however, are significantly more powerful than nominal-inheritance interfaces; firstly, due to the scoping rules of the declarations which satisfy a trait's type assertions, a type may not satisfy a trait everywhere that the type is declared, as with ©char© and the ©nominal© trait above. 
+Secondly, traits may be used to declare a relationship between multiple types, a property which may be difficult or impossible to represent in nominal-inheritance type systems:
 \begin{lstlisting}
 trait pointer_like(®otype Ptr, otype El®) {
@@ -201 +202 @@
 };
 
-typedef list *list_iterator;
+typedef list* list_iterator;
 
 lvalue int *?( list_iterator it ) {
@@ -208 +209 @@
 \end{lstlisting}
 
-In the example above, ©(list_iterator, int)© satisfies ©pointer_like© by the user-defined dereference function, and ©(list_iterator, list)© also satisfies ©pointer_like© by the built-in dereference operator for pointers. 
-Given a declaration ©list_iterator it©, ©*it© can be either an ©int© or a ©list©, with the meaning disambiguated by context (\eg ©int x = *it;© interprets ©*it© as an ©int©, while ©(*it).value = 42;© interprets ©*it© as a ©list©).
+In the example above, ©(list_iterator, int)© satisfies ©pointer_like© by the given function, and ©(list_iterator, list)© also satisfies ©pointer_like© by the built-in pointer dereference operator. 
 While a nominal-inheritance system with associated types could model one of those two relationships by making ©El© an associated type of ©Ptr© in the ©pointer_like© implementation, few such systems could model both relationships simultaneously.
 
-The flexibility of \CFA's implicit trait-satisfaction mechanism provides programmers with a great deal of power, but also blocks some optimization approaches for expression resolution. 
-The ability of types to begin to or cease to satisfy traits when declarations go into or out of scope makes caching of trait satisfaction judgements difficult, and the ability of traits to take multiple type parameters can lead to a combinatorial explosion of work in any attempt to pre-compute trait satisfaction relationships. 
+The flexibility of \CFA's implicit trait satisfaction mechanism provides programmers with a great deal of power, but also blocks some optimization approaches for expression resolution. 
+The ability of types to begin to or cease to satisfy traits when declarations go into or out of scope makes caching of trait satisfaction judgements difficult, and the ability of traits to take multiple type parameters could lead to a combinatorial explosion of work in any attempt to pre-compute trait satisfaction relationships. 
 On the other hand, the addition of a nominal inheritance mechanism to \CFA's type system or replacement of \CFA's trait satisfaction system with a more object-oriented inheritance model and investigation of possible expression resolution optimizations for such a system may be an interesting avenue of further research.
 
 \subsection{Name Overloading}
 In C, no more than one variable or function in the same scope may share the same name\footnote{Technically, C has multiple separated namespaces, one holding ©struct©, ©union©, and ©enum© tags, one holding labels, one holding typedef names, variable, function, and enumerator identifiers, and one for each ©struct© or ©union© type holding the field names.}, and variable or function declarations in inner scopes with the same name as a declaration in an outer scope hide the outer declaration. 
-This restriction makes finding the proper declaration to match to a variable expression or function application a simple matter of symbol-table lookup, which can be easily and efficiently implemented. 
+This makes finding the proper declaration to match to a variable expression or function application a simple matter of symbol table lookup, which can be easily and efficiently implemented. 
 \CFA, on the other hand, allows overloading of variable and function names, so long as the overloaded declarations do not have the same type, avoiding the multiplication of variable and function names for different types common in the C standard library, as in the following example:
 \begin{lstlisting}
@@ -229 +229 @@
 double max = DBL_MAX;  // (4)
 
-max(7, -max);   // uses (1) and (3), by matching int type of the constant 7 
-max(max, 3.14); // uses (2) and (4), by matching double type of the constant 3.14
+max(7, -max);   // uses (1) and (3), by matching int type of 7 
+max(max, 3.14); // uses (2) and (4), by matching double type of 3.14
 
 max(max, -max);  // ERROR: ambiguous
-int m = max(max, -max); // uses (1) once and (3) twice, by matching return type
+int m = max(max, -max); // uses (1) and (3) twice, by return type
 \end{lstlisting}
 
@@ -239 +239 @@
 
 \subsection{Implicit Conversions}
-In addition to the multiple interpretations of an expression produced by name overloading, \CFA must support all of the implicit conversions present in C for backward compatibility, producing further candidate interpretations for expressions. 
-C does not have a inheritance hierarchy of types, but the C standard's rules for the ``usual arithmetic conversions'' define which of the built-in types are implicitly convertable to which other types, and the relative cost of any pair of such conversions from a single source type. 
-\CFA adds to the usual arithmetic conversions rules defining the cost of binding a polymorphic type variable in a function call; such bindings are cheaper than any \emph{unsafe} (narrowing) conversion, \eg ©int© to ©char©, but more expensive than any \emph{safe} (widening) conversion, \eg ©int© to ©double©. 
-
-The expression resolution problem, then, is to find the unique minimal-cost interpretation of each expression in the program, where all identifiers must be matched to a declaration, and implicit conversions or polymorphic bindings of the result of an expression may increase the cost of the expression. 
+In addition to the multiple interpretations of an expression produced by name overloading, \CFA also supports all of the implicit conversions present in C, producing further candidate interpretations for expressions. 
+C does not have a traditionally-defined inheritance hierarchy of types, but the C standard's rules for the ``usual arithmetic conversions'' define which of the built-in types are implicitly convertable to which other types, and the relative cost of any pair of such conversions from a single source type. 
+\CFA adds to the usual arithmetic conversions rules for determining the cost of binding a polymorphic type variable in a function call; such bindings are cheaper than any \emph{unsafe} (narrowing) conversion, \eg ©int© to ©char©, but more expensive than any \emph{safe} (widening) conversion, \eg ©int© to ©double©. 
+
+The expression resolution problem, then, is to find the unique minimal-cost interpretation of each expression in the program, where all identifiers must be matched to a declaration and implicit conversions or polymorphic bindings of the result of an expression may increase the cost of the expression. 
 Note that which subexpression interpretation is minimal-cost may require contextual information to disambiguate. 
-For instance, in the example in the previous subsection, ©max(max, -max)© cannot be unambiguously resolved, but ©int m = max(max, -max)© has a single minimal-cost resolution. 
-While the interpretation ©int m = (int)max((double)max, -(double)max)© is also a valid interpretation, it is not minimal-cost due to the unsafe cast from the ©double© result of ©max© to ©int© (the two ©double© casts function as type ascriptions selecting ©double max© rather than casts from ©int max© to ©double©, and as such are zero-cost).
+For instance, in the example in the previous subsection, ©max(max, -max)© cannot be unambiguously resolved, but ©int m = max(max, -max);© has a single minimal-cost resolution. 
+©int m = (int)max((double)max, -(double)max)© is also be a valid interpretation, but is not minimal-cost due to the unsafe cast from the ©double© result of ©max© to ©int© (the two ©double© casts function as type ascriptions selecting ©double max© rather than casts from ©int max© to ©double©, and as such are zero-cost).
 
 \subsubsection{User-generated Implicit Conversions}
@@ -252 +252 @@
 Such a conversion system should be simple for programmers to utilize, and fit naturally with the existing design of implicit conversions in C; ideally it would also be sufficiently powerful to encode C's usual arithmetic conversions itself, so that \CFA only has one set of rules for conversions. 
 
-Ditchfield~\cite{Ditchfield:conversions} laid out a framework for using polymorphic-conversion-constructor functions to create a directed acyclic graph (DAG) of conversions. 
+Ditchfield~\cite{Ditchfield:conversions} has laid out a framework for using polymorphic-conversion-constructor functions to create a directed acyclic graph (DAG) of conversions. 
 A monomorphic variant of these functions can be used to mark a conversion arc in the DAG as only usable as the final step in a conversion. 
-With these two types of conversion arcs, separate DAGs can be created for the safe and the unsafe conversions, and conversion cost can be represented the length of the shortest path through the DAG from one type to another. 
+With these two types of conversion arcs, separate DAGs can be created for the safe and the unsafe conversions, and conversion cost can be represented as path length through the DAG. 
 \begin{figure}[h]
 \centering
 \includegraphics{conversion_dag}
-\caption{A portion of the implicit conversion DAG for built-in types.}\label{fig:conv_dag}
+\caption{A portion of the implicit conversion DAG for built-in types.}
 \end{figure}
-As can be seen in Figure~\ref{fig:conv_dag}, there are either safe or unsafe paths between each of the arithmetic types listed; the ``final'' arcs are important both to avoid creating cycles in the signed-unsigned conversions, and to disambiguate potential diamond conversions (\eg, if the ©int© to ©unsigned int© conversion was not marked final there would be two length-two paths from ©int© to ©unsigned long©, making it impossible to choose which one; however, since the ©unsigned int© to ©unsigned long© arc can not be traversed after the final ©int© to ©unsigned int© arc, there is a single unambiguous conversion path from ©int© to ©unsigned long©).
+As can be seen in the example DAG above, there are either safe or unsafe paths between each of the arithmetic types listed; the ``final'' arcs are important both to avoid creating cycles in the signed-unsigned conversions, and to disambiguate potential diamond conversions (\eg, if the ©int© to ©unsigned int© conversion was not marked final there would be two length-two paths from ©int© to ©unsigned long©, and it would be impossible to choose which one; however, since the ©unsigned int© to ©unsigned long© arc can not be traversed after the final ©int© to ©unsigned int© arc, there is a single unambiguous conversion path from ©int© to ©unsigned long©).
 
 Open research questions on this topic include:
 \begin{itemize}
 \item Can a conversion graph be generated that represents each allowable conversion in C with a unique minimal-length path such that the path lengths accurately represent the relative costs of the conversions?
-\item Can such a graph representation be usefully augmented to include user-defined types as well as built-in types?
-\item Can the graph be efficiently represented and used in the expression resolver?
+\item Can such a graph representation can be usefully augmented to include user-defined types as well as built-in types?
+\item Can the graph can be efficiently represented and used in the expression resolver?
 \end{itemize}
 
 \subsection{Constructors and Destructors}
 Rob Shluntz, a current member of the \CFA research team, has added constructors and destructors to \CFA. 
-Each type has an overridable default-generated zero-argument constructor, copy constructor, assignment operator, and destructor.
-For ©struct© types these functions each call their equivalents on each field of the ©struct©. 
-This feature affects expression resolution because an ©otype© type variable ©T© implicitly adds four type assertions, one for each of these four functions, so assertion resolution is pervasive in \CFA polymorphic functions, even those without any explicit type assertions. 
+Each type has an overridable default-generated zero-argument constructor, copy constructor, assignment operator, and destructor; for ©struct© types these functions each call their equivalents on each field of the ©struct©. 
+This affects expression resolution because an ©otype© type variable ©T© implicitly adds four type assertions, one for each of these four functions, so assertion resolution is pervasive in \CFA polymorphic functions, even those without any explicit type assertions. 
 The following example shows the implicitly-generated code in green:
 \begin{lstlisting}
@@ -281 +280 @@
 };
 
-¢void ?{}(kv *this) {  // default constructor
-    ?{}(&(this->key));  // call recursively on members
-    ?{}(&(this->value));
-}
-void ?{}(kv *this, kv that) {  // copy constructor
-    ?{}(&(this->key), that.key);
-    ?{}(&(this->value), that.value);
-}
-kv ?=?(kv *this, kv that) {  // assignment operator
-    ?=?(&(this->key), that.key);
-    ?=?(&(this->value), that.value);
+¢void ?{}(kv *this) {
+    ?{}(&this->key);
+    ?{}(&this->value);
+}
+void ?{}(kv *this, kv that) {
+    ?{}(&this->key, that.key);
+    ?{}(&this->value, that.value);
+}
+kv ?=?(kv *this, kv that) {
+    ?=?(&this->key, that.key);
+    ?=?(&this->value, that.value);
     return *this;
 }
-void ^?{}(kv *this) {  // destructor
-    ^?{}(&(this->key));
-    ^?{}(&(this->value));
+void ^?{}(kv *this) {
+    ^?{}(&this->key);
+    ^?{}(&this->value);
 }¢
 
@@ -336 +335 @@
 \begin{itemize} 
 \item Since there is an implicit conversion from ©void*© to any pointer type, the highlighted expression can be interpreted as either a ©void*©, matching ©f // (1)©, or a ©box(S)*© for some type ©S©, matching ©f // (2)©.
-\item To determine the cost of the ©box(S)© interpretation, a type must be found for ©S© that satisfies the ©otype© implicit type assertions (assignment operator, default and copy constructors, and destructor); one option is ©box(S2)© for some type ©S2©.
+\item To determine the cost of the ©box(S)© interpretation, a type must be found for ©S© which satisfies the ©otype© implicit type assertions (assignment operator, default and copy constructors, and destructor); one option is ©box(S2)© for some type ©S2©.
 \item The assignment operator, default and copy constructors, and destructor of ©box(T)© are also polymorphic functions, each of which require the type parameter ©T© to have an assignment operator, default and copy constructors, and destructor. When choosing an interpretation for ©S2©, one option is ©box(S3)©, for some type ©S3©.
 \item The previous step repeats until stopped, with four times as much work performed at each step.
 \end{itemize}
-This problem can occur in any resolution context where a polymorphic function can satisfy its own type assertions is required for a possible interpretation of an expression with no constraints on its type, and is thus not limited to combinations of generic types with ©void*© conversions.
-However, constructors for generic types often satisfy their own assertions and a polymorphic conversion such as the ©void*© conversion to a polymorphic variable is a common way to create an expression with no constraints on its type. 
+This problem can occur in any resolution context where a polymorphic function that can satisfy its own type assertions is required for a possible interpretation of an expression with no constraints on its type, and is thus not limited to combinations of generic types with ©void*© conversions, though constructors for generic types often satisfy their own assertions and a polymorphic conversion such as the ©void*© conversion to a polymorphic variable can create an expression with no constraints on its type. 
 As discussed above, the \CFA expression resolver must handle this possible infinite recursion somehow, and it occurs fairly naturally in code like the above that uses generic types. 
 
@@ -347 +345 @@
 \CFA adds \emph{tuple types} to C, a syntactic facility for referring to lists of values anonymously or with a single identifier. 
 An identifier may name a tuple, and a function may return one. 
-Particularly relevantly for resolution, a tuple may be implicitly \emph{destructured} into a list of values, as in the call to ©swap©:
-\begin{lstlisting}
-[char, char] x = [ '!', '?' ];  // (1)
-int x = 42;  // (2)
-
-forall(otype T) [T, T] swap( T a, T b ) { return [b, a]; }  // (3)
+Particularly relevantly for resolution, a tuple may be implicitly \emph{destructured} into a list of values, as in the call to ©swap© below:
+\begin{lstlisting}
+[char, char] x = [ '!', '?' ];
+int x = 42;
+
+forall(otype T) [T, T] swap( T a, T b ) { return [b, a]; }
 
 x = swap( x ); // destructure [char, char] x into two elements of parameter list
 // cannot use int x for parameter, not enough arguments to swap
-
-void swap( int, char, char ); // (4)
-
-swap( x, x ); // resolved as (4) on (2) and (1)
-// (3) on (2) and (2) is close, but the polymorphic binding makes it not minimal-cost
-\end{lstlisting}
-Tuple destructuring means that the mapping from the position of a subexpression in the argument list to the position of a paramter in the function declaration is not straightforward, as some arguments may be expandable to different numbers of parameters, like ©x© above. 
-In the second example, the second ©x© argument can be resolved starting at the second or third parameter of ©swap©, depending which interpretation of ©x© was chosen for the first argument.
+\end{lstlisting}
+Tuple destructuring means that the mapping from the position of a subexpression in the argument list to the position of a paramter in the function declaration is not straightforward, as some arguments may be expandable to different numbers of parameters, like ©x© above.
 
 \subsection{Reference Types}
 I have been designing \emph{reference types} for \CFA, in collaboration with the rest of the \CFA research team. 
 Given some type ©T©, a ©T&© (``reference to ©T©'') is essentially an automatically dereferenced pointer; with these semantics most of the C standard's discussions of lvalues can be expressed in terms of references instead, with the benefit of being able to express the difference between the reference and non-reference version of a type in user code. 
-References preserve C's existing qualifier-dropping lvalue-to-rvalue conversion (\eg a ©const volatile int&© can be implicitly converted to a bare ©int©).
-The reference proposal also adds a rvalue-to-lvalue conversion to \CFA, implemented by storing the value in a new compiler-generated temporary and passing a reference to the temporary. 
-These two conversions can chain, producing a qualifier-dropping conversion for references, for instance converting a reference to a ©const int© into a reference to a non-©const int© by copying the originally refered to value into a fresh temporary and taking a reference to this temporary, as in:
+References preserve C's existing qualifier-dropping lvalue-to-rvalue conversion (\eg a ©const volatile int&© can be implicitly converted to a bare ©int©); the reference proposal also adds a rvalue-to-lvalue conversion to \CFA, implemented by storing the value in a new compiler-generated temporary and passing a reference to the temporary. 
+These two conversions can chain, producing a qualifier-dropping conversion for references, for instance converting a reference to a ©const int© into a reference to a non-©const int© by copying the originally refered to value into a fresh temporary and taking a reference to this temporary, as below:
 \begin{lstlisting} 
 const int magic = 42;
@@ -378 +369 @@
 print_inc( magic ); // legal; implicitly generated code in green below:
 
-¢int tmp = magic;¢ // to safely strip const-qualifier
+¢int tmp = magic;¢ // copies to safely strip const-qualifier
 ¢print_inc( tmp );¢ // tmp is incremented, magic is unchanged
 \end{lstlisting}
-These reference conversions may also chain with the other implicit type-conversions. 
-The main implication of the reference conversions for expression resolution is the multiplication of available implicit conversions, though given the restricted context reference conversions may be able to be treated efficiently as a special case of implicit conversions.
+These reference conversions may also chain with the other implicit type conversions. 
+The main implication of this for expression resolution is the multiplication of available implicit conversions, though in a restricted context that may be able to be treated efficiently as a special case.
 
 \subsection{Special Literal Types}
 Another proposal currently under consideration for the \CFA type-system is assigning special types to the literal values ©0© and ©1©. 
-Implicit conversions from these types allow ©0© and ©1© to be considered as values of many different types, depending on context, allowing expression desugarings like ©if ( x ) {}© $\Rightarrow$ ©if ( x != 0 ) {}© to be implemented efficiently and precisely. 
+Implicit conversions from these types allow ©0© and ©1© to be considered as values of many different types, depending on context, allowing expression desugarings like ©if ( x ) {}© $\Rightarrow$ ©if ( x != 0 ) {}© to be implemented efficiently and precicely. 
 This approach is a generalization of C's existing behaviour of treating ©0© as either an integer zero or a null pointer constant, and treating either of those values as boolean false. 
 The main implication for expression resolution is that the frequently encountered expressions ©0© and ©1© may have a large number of valid interpretations.
@@ -395 +386 @@
 int somefn(char) = delete;
 \end{lstlisting}
-This feature is typically used in \CCeleven to make a type non-copyable by deleting its copy constructor and assignment operator\footnote{In previous versions of \CC a type could be made non-copyable by declaring a private copy constructor and assignment operator, but not defining either. This idiom is well-known, but depends on some rather subtle and \CC-specific rules about private members and implicitly-generated functions; the deleted-function form is both clearer and less verbose.}, or forbidding some interpretations of a polymorphic function by specifically deleting the forbidden overloads\footnote{Specific polymorphic function overloads can also be forbidden in previous \CC versions through use of template metaprogramming techniques, though this advanced usage is beyond the skills of many programmers. A similar effect can be produced on an ad-hoc basis at the appropriate call sites through use of casts to determine the function type. In both cases, the deleted-function form is clearer and more concise.}. 
-To add a similar feature to \CFA involves including the deleted function declarations in expression resolution along with the normal declarations, but producing a compiler error if the deleted function is the best resolution. 
+This feature is typically used in \CCeleven to make a type non-copyable by deleting its copy constructor and assignment operator, or forbidding some interpretations of a polymorphic function by specifically deleting the forbidden overloads. 
+To add a similar feature to \CFA would involve including the deleted function declarations in expression resolution along with the normal declarations, but producing a compiler error if the deleted function was the best resolution. 
 How conflicts should be handled between resolution of an expression to both a deleted and a non-deleted function is a small but open research question.
 
@@ -413 +404 @@
 %TODO: look up and lit review 
 The second area of investigation is minimizing dependencies between argument-parameter matches; the current CFA compiler attempts to match entire argument combinations against functions at once, potentially attempting to match the same argument against the same parameter multiple times. 
-Whether the feature set of \CFA admits an expression resolution algorithm where arguments can be matched to parameters independently of other arguments in the same function application is an area of open research; polymorphic type paramters produce enough cross-argument dependencies that the problem is not trivial. 
+Whether the feature set of \CFA admits an expression resolution algorithm where arguments can be matched to parameters independently of other arguments in the same function application is an area of open research; polymorphic type paramters produce enough of a cross-argument dependency that the problem is not trivial. 
 If cross-argument resolution dependencies cannot be completely eliminated, effective caching strategies to reduce duplicated work between equivalent argument-parameter matches in different combinations may mitigate the asymptotic defecits of the whole-combination matching approach. 
 The final area of investigation is heuristics and algorithmic approaches to reduce the number of argument interpretations considered in the common case; if argument-parameter matches cannot be made independent, even small reductions in $i$ should yield significant reductions in the $i^{p+1}$ resolver runtime factor. 
@@ -421 +412 @@
 
 \subsection{Argument-Parameter Matching}
-The first axis for consideration is the argument-parameter matching direction --- whether the type matching for a candidate function to a set of candidate arguments is directed by the argument types or the parameter types. 
+The first axis for consideration is argument-parameter matching direction --- whether the type matching for a candidate function to a set of candidate arguments is directed by the argument types or the parameter types. 
 For programming languages without implicit conversions, argument-parameter matching is essentially the entirety of the expression resolution problem, and is generally referred to as ``overload resolution'' in the literature.
-All expression-resolution algorithms form a DAG of interpretations, some explicitly, some implicitly; in this DAG, arcs point from function-call interpretations to argument interpretations, as in Figure~\ref{fig:res_dag}:
+All expression resolution algorithms form a DAG of interpretations, some explicitly, some implicitly; in this DAG, arcs point from function-call interpretations to argument interpretations, as below:
 \begin{figure}[h]
 \centering
@@ -442 +433 @@
 \end{figure}
 
-Note that some interpretations may be part of more than one super-interpretation, as with the second $p_i$ in the bottom row, while some valid subexpression interpretations, like $f_d$ in the middle row, are not used in any interpretation of their superexpression.
+Note that some interpretations may be part of more than one super-interpretation, as with $p_i$ in the bottom row, while some valid subexpression interpretations, like $f_d$ in the middle row, are not used in any interpretation of their containing expression.
 
 \subsubsection{Argument-directed (Bottom-up)}
@@ -460 +451 @@
 A reasonable hybrid approach might take a top-down approach when the expression to be matched has a fixed type, and a bottom-up approach in untyped contexts.
 This approach may involve switching from one type to another at different levels of the expression tree. 
-For instance, in:
+For instance:
 \begin{lstlisting}
 forall(otype T)
@@ -469 +460 @@
 int x = f( f( '!' ) );
 \end{lstlisting}
-the outer call to ©f© must have a return type that is (implicitly convertable to) ©int©, so a top-down approach is used to select \textit{(1)} as the proper interpretation of ©f©. \textit{(1)}'s parameter ©x©, however, is an unbound type variable, and can thus take a value of any complete type, providing no guidance for the choice of candidate for the inner call to ©f©. The leaf expression ©'!'©, however, determines a zero-cost interpretation of the inner ©f© as \textit{(2)}, providing a minimal-cost expression resolution where ©T© is bound to ©void*©.
-
-Deciding when to switch between bottom-up and top-down resolution to minimize wasted work in a hybrid algorithm is a necessarily heuristic process, and finding good heuristics for which subexpressions to swich matching strategies on is an open question.
-One reasonable approach might be to set a threshold $t$ for the number of candidate functions, and to use top-down resolution for any subexpression with fewer than $t$ candidate functions, to minimize the number of unmatchable argument interpretations computed, but to use bottom-up resolution for any subexpression with at least $t$ candidate functions, to reduce duplication in argument interpretation computation between the different candidate functions. 
+The outer call to ©f© must have a return type that is (implicitly convertable to) ©int©, so a top-down approach is used to select \textit{(1)} as the proper interpretation of ©f©. \textit{(1)}'s parameter ©x©, however, is an unbound type variable, and can thus take a value of any complete type, providing no guidance for the choice of candidate for the inner call to ©f©. The leaf expression ©'!'©, however, determines a zero-cost interpretation of the inner ©f© as \textit{(2)}, providing a minimal-cost expression resolution where ©T© is bound to ©void*©.
+
+Deciding when to switch between bottom-up and top-down resolution to minimize wasted work in a hybrid algorithm is a necessarily heuristic process, and though finding good heuristics for which subexpressions to swich matching strategies on is an open question, one reasonable approach might be to set a threshold $t$ for the number of candidate functions, and to use top-down resolution for any subexpression with fewer than $t$ candidate functions, to minimize the number of unmatchable argument interpretations computed, but to use bottom-up resolution for any subexpression with at least $t$ candidate functions, to reduce duplication in argument interpretation computation between the different candidate functions. 
 
 Ganzinger and Ripken~\cite{Ganzinger80} propose an approach (later refined by Pennello~\etal~\cite{Pennello80}) that uses a top-down filtering pass followed by a bottom-up filtering pass to reduce the number of candidate interpretations; they prove that for the Ada programming language a small number of such iterations is sufficient to converge to a solution for the expression resolution problem. 
 Persch~\etal~\cite{PW:overload} developed a similar two-pass approach where the bottom-up pass is followed by the top-down pass. 
-These algorithms differ from the hybrid approach under investigation in that they take multiple passes over the expression tree to yield a solution, and that they also apply both filtering heuristics to all expression nodes; \CFA's polymorphic functions and implicit conversions make the approach of filtering out invalid types taken by all of these algorithms infeasible.
+These algorithms differ from the hybrid approach under investigation in that they take multiple passes over the expression tree to yield a solution, and also in that they apply both filtering heuristics to all expression nodes; \CFA's polymorphic functions and implicit conversions make the approach of filtering out invalid types taken by all of these algorithms infeasible.
 
 \subsubsection{Common Subexpression Caching}
@@ -490 +480 @@
 \CC~\cite{ANSI98:C++} includes both name overloading and implicit conversions in its expression resolution specification, though unlike \CFA it does complete type-checking on a generated monomorphization of template functions, where \CFA simply checks a list of type constraints. 
 The upcoming Concepts standard~\cite{C++concepts} defines a system of type constraints similar in principle to \CFA's.
-Cormack and Wright~\cite{Cormack90} present an algorithm that integrates overload resolution with a polymorphic type inference approach very similar to \CFA's.
+Cormack and Wright~\cite{Cormack90} present an algorithm which integrates overload resolution with a polymorphic type inference approach very similar to \CFA's.
 However, their algorithm does not account for implicit conversions other than polymorphic type binding and their discussion of their overload resolution algorithm is not sufficiently detailed to classify it with the other argument-parameter matching approaches\footnote{Their overload resolution algorithm is possibly a variant of Ganzinger and Ripken~\cite{Ganzinger80} or Pennello~\etal~\cite{Pennello80}, modified to allow for polymorphic type binding.}.
 
@@ -496 +486 @@
 Bilson does account for implicit conversions in his algorithm, but it is unclear if the approach is optimal. 
 His algorithm integrates checking for valid implicit conversions into the argument-parameter-matching step, essentially trading more expensive matching for a smaller number of argument interpretations. 
-This approach may result in the same subexpression being checked for a type match with the same type multiple times, though again memoization may mitigate this cost; however, this approach does not generate implicit conversions that are not useful to match the containing function.
+This approach may result in the same subexpression being checked for a type match with the same type multiple times, though again memoization may mitigate this cost, and this approach does not generate implicit conversions that are not useful to match the containing function. 
+Calculating implicit conversions on parameters pairs naturally with a top-down approach to expression resolution, though it can also be used in a bottom-up approach, as Bilson demonstrates.
 
 \subsubsection{On Arguments}
 Another approach is to generate a set of possible implicit conversions for each set of interpretations of a given argument. 
 This approach has the benefit of detecting ambiguous interpretations of arguments at the level of the argument rather than its containing call, never finds more than one interpretation of the argument with a given type, and re-uses calculation of implicit conversions between function candidates. 
-On the other hand, this approach may unnecessarily generate argument interpretations that never match any parameter, wasting work. 
-Furthermore, in the presence of tuple types, this approach may lead to a combinatorial explosion of argument interpretations considered, unless the tuple can be considered as a sequence of elements rather than a unified whole. 
+On the other hand, this approach may unncessarily generate argument interpretations that never match any parameter, wasting work. 
+Further, in the presence of tuple types this approach may lead to a combinatorial explosion of argument interpretations considered, unless the tuple can be considered as a sequence of elements rather than a unified whole. 
+Calculating implicit conversions on arguments is a viable approach for bottom-up expression resolution, though it may be difficult to apply in a top-down approach due to the presence of a target type for the expression interpretation. 
 
 \subsection{Candidate Set Generation}
-All the algorithms discussed to this point generate the complete set of candidate argument interpretations before attempting to match the containing function-call expression. 
-However, given that the top-level expression interpretation that is ultimately chosen is the minimal-cost valid interpretation, any consideration of non-minimal-cost interpretations is wasted work.
-Under the assumption that programmers generally write function calls with relatively low-cost interpretations, a possible work-saving heuristic is to generate only the lowest-cost argument interpretations first, attempt to find a valid top-level interpretation using them, and only if that fails generate the next higher-cost argument interpretations.
+All the algorithms discussed to this point generate the complete set of candidate argument interpretations before attempting to match the containing function call expression. 
+However, given that the top-level expression interpretation that is ultimately chosen is the minimal-cost valid interpretation, any consideration of non-minimal-cost interpretations is in some sense wasted work.
+Under the assumption that that programmers generally write function calls with relatively low-cost interpretations, a possible work-saving heuristic is to generate only the lowest-cost argument interpretations first, attempt to find a valid top-level interpretation using them, and only if that fails generate the next higher-cost argument interpretations.
 
 \subsubsection{Eager}
@@ -571 +563 @@
 This comparison closes Baker's open research question, as well as potentially improving Bilson's \CFA compiler.
 
-Rather than testing all of these algorithms in-place in the \CFA compiler, a resolver prototype is being developed that acts on a simplified input language encapsulating the essential details of the \CFA type-system\footnote{Note this simplified input language is not a usable programming language.}. 
+Rather than testing all of these algorithms in-place in the \CFA compiler, a resolver prototype is being developed which acts on a simplified input language encapsulating the essential details of the \CFA type-system\footnote{Note this simplified input language is not a usable programming language.}. 
 Multiple variants of this resolver prototype will be implemented, each encapsulating a different expression resolution variant, sharing as much code as feasible. 
 These variants will be instrumented to test runtime performance, and run on a variety of input files; the input files may be generated programmatically or from exisiting code in \CFA or similar languages.
@@ -579 +571 @@
 As an example, there are currently multiple open proposals for how implicit conversions should interact with polymorphic type binding in \CFA, each with distinct levels of expressive power; if the resolver prototype is modified to support each proposal, the optimal algorithm for each proposal can be compared, providing an empirical demonstration of the trade-off between expressive power and compiler runtime. 
 
-This proposed project should provide valuable data on how to implement a performant compiler for programming languages such as \CFA with powerful static type-systems, specifically targeting the feature interaction between name overloading and implicit conversions. 
+This proposed project should provide valuable data on how to implement a performant compiler for modern programming languages such as \CFA with powerful static type-systems, specifically targeting the feature interaction between name overloading and implicit conversions. 
 This work is not limited in applicability to \CFA, but may also be useful for supporting efficient compilation of the upcoming Concepts standard~\cite{C++concepts} for \CC template constraints, for instance. 
 

src/Common/Assert.cc

@@ -10 +10 @@
 // Created On       : Thu Aug 18 13:26:59 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug 19 17:07:08 2016
-// Update Count     : 10
+// Last Modified On : Thu Aug 18 23:40:29 2016
+// Update Count     : 8
 // 
 
 #include <assert.h>
-#include <cstdarg>                                                                              // varargs
-#include <cstdio>                                                                               // fprintf
-#include <cstdlib>                                                                              // abort
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
 
 extern const char * __progname;                                                 // global name of running executable (argv[0])
@@ -26 +26 @@
 void __assert_fail( const char *assertion, const char *file, unsigned int line, const char *function ) {
         fprintf( stderr, CFA_ASSERT_FMT ".\n", __progname, function, line, file );
-        abort();
+        exit( EXIT_FAILURE );
 }
 
@@ -35 +35 @@
         va_start( args, fmt );
         vfprintf( stderr, fmt, args );
-        abort();
+        exit( EXIT_FAILURE );
 }
 

src/Common/utility.h

@@ -56 +56 @@
 }
 
+
 template< typename Input_iterator >
 void printEnums( Input_iterator begin, Input_iterator end, const char * const *name_array, std::ostream &os ) {

src/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:51:46 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Sat Aug 20 11:13:12 2016
-## Update Count     : 71
+## Last Modified On : Thu Aug 18 17:47:06 2016
+## Update Count     : 70
 ###############################################################################
 
@@ -43 +43 @@
 driver_cfa_cpp_SOURCES = ${SRC}
 driver_cfa_cpp_LDADD = ${LEXLIB}                        # yywrap
-driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -rdynamic -I${abs_top_srcdir}/src/include
+driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -I${abs_top_srcdir}/src/include
 
 MAINTAINERCLEANFILES += ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}

src/Makefile.in

@@ -427 +427 @@
 driver_cfa_cpp_SOURCES = ${SRC}
 driver_cfa_cpp_LDADD = ${LEXLIB}                        # yywrap
-driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -rdynamic -I${abs_top_srcdir}/src/include
+driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -I${abs_top_srcdir}/src/include
 all: $(BUILT_SOURCES)
         $(MAKE) $(AM_MAKEFLAGS) all-am

src/Parser/DeclarationNode.cc

@@ -230 +230 @@
         DeclarationNode *newnode = new DeclarationNode;
         newnode->name = assign_strptr( name );
-        newnode->enumeratorValue.reset( constant );
+        newnode->enumeratorValue = constant;
         typedefTable.addToEnclosingScope( newnode->name, TypedefTable::ID );
         return newnode;
@@ -776 +776 @@
                 } // if
         } // if
-        delete o;
         return o;
 }

src/Parser/ExpressionNode.cc

@@ -183 +183 @@
 
 Expression *build_cast( DeclarationNode *decl_node, ExpressionNode *expr_node ) {
-        Type *targetType = maybeMoveBuildType( decl_node );
+        Type *targetType = decl_node->buildType();
         if ( dynamic_cast< VoidType * >( targetType ) ) {
                 delete targetType;
@@ -213 +213 @@
 }
 Expression *build_sizeOftype( DeclarationNode *decl_node ) {
-        return new SizeofExpr( maybeMoveBuildType( decl_node ) );
+        Expression* ret = new SizeofExpr( decl_node->buildType() );
+        delete decl_node;
+        return ret;
 }
 Expression *build_alignOfexpr( ExpressionNode *expr_node ) {
@@ -219 +221 @@
 }
 Expression *build_alignOftype( DeclarationNode *decl_node ) {
-        return new AlignofExpr( maybeMoveBuildType( decl_node) );
+        return new AlignofExpr( decl_node->buildType() );
 }
 Expression *build_offsetOf( DeclarationNode *decl_node, NameExpr *member ) {
-        Expression* ret = new UntypedOffsetofExpr( maybeMoveBuildType( decl_node ), member->get_name() );
+        Expression* ret = new UntypedOffsetofExpr( decl_node->buildType(), member->get_name() );
+        delete decl_node;
         delete member;
         return ret;
@@ -266 +269 @@
 }
 Expression *build_attrtype( NameExpr *var, DeclarationNode * decl_node ) {
-        return new AttrExpr( var, maybeMoveBuildType( decl_node ) );
+        return new AttrExpr( var, decl_node->buildType() );
 }
 
@@ -293 +296 @@
 }
 Expression *build_typevalue( DeclarationNode *decl ) {
-        return new TypeExpr( maybeMoveBuildType( decl ) );
+        return new TypeExpr( decl->buildType() );
 }
 

src/Parser/InitializerNode.cc

@@ -45 +45 @@
 InitializerNode::~InitializerNode() {
         delete expr;
-        delete designator;
-        delete kids;
 }
 

src/Parser/ParseNode.h

@@ -280 +280 @@
         LinkageSpec::Spec get_linkage() const { return linkage; }
         DeclarationNode *extractAggregate() const;
-        bool has_enumeratorValue() const { return (bool)enumeratorValue; }
-        ExpressionNode *consume_enumeratorValue() const { return const_cast<DeclarationNode*>(this)->enumeratorValue.release(); }
+        ExpressionNode *get_enumeratorValue() const { return enumeratorValue; }
 
         bool get_extension() const { return extension; }
@@ -296 +295 @@
         std::list< std::string > attributes;
         ExpressionNode *bitfieldWidth;
-        std::unique_ptr<ExpressionNode> enumeratorValue;
+        ExpressionNode *enumeratorValue;
         InitializerNode *initializer;
         bool hasEllipsis;
@@ -307 +306 @@
 
 Type *buildType( TypeData *type );
-
-static inline Type * maybeMoveBuildType( const DeclarationNode *orig ) {
-        Type* ret = orig ? orig->buildType() : nullptr;
-        delete orig;
-        return ret;
-}
 
 //##############################################################################

src/Parser/StatementNode.cc

@@ -54 +54 @@
         // find end of list and maintain previous pointer
         for ( StatementNode * curr = prev; curr != nullptr; curr = (StatementNode *)curr->get_next() ) {
-                StatementNode *node = safe_dynamic_cast< StatementNode * >(curr);
+                StatementNode *node = dynamic_cast< StatementNode * >(curr);
+                assert( node );
                 assert( dynamic_cast< CaseStmt * >(node->stmt.get()) );
                 prev = curr;
@@ -159 +160 @@
         std::list< Statement * > branches;
         buildMoveList< Statement, StatementNode >( catch_stmt, branches );
-        CompoundStmt *tryBlock = safe_dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >(try_stmt));
+        CompoundStmt *tryBlock = dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >(try_stmt));
+        assert( tryBlock );
         FinallyStmt *finallyBlock = dynamic_cast< FinallyStmt * >(maybeMoveBuild< Statement >(finally_stmt) );
         return new TryStmt( noLabels, tryBlock, branches, finallyBlock );

src/Parser/TypeData.cc

@@ -909 +909 @@
         std::list< Declaration * >::iterator members = ret->get_members().begin();
         for ( const DeclarationNode *cur = enumeration->constants; cur != nullptr; cur = dynamic_cast< DeclarationNode * >( cur->get_next() ), ++members ) {
-                if ( cur->has_enumeratorValue() ) {
+                if ( cur->get_enumeratorValue() != nullptr ) {
                         ObjectDecl *member = dynamic_cast< ObjectDecl * >(*members);
-                        member->set_init( new SingleInit( maybeMoveBuild< Expression >( cur->consume_enumeratorValue() ), std::list< Expression * >() ) );
+                        member->set_init( new SingleInit( maybeBuild< Expression >( cur->get_enumeratorValue() ), std::list< Expression * >() ) );
                 } // if
         } // for

src/Parser/parser.cc

@@ -739 +739 @@
     1988,  1989,  1990,  1993,  1992,  2003,  2012,  2018,  2024,  2033,
     2039,  2045,  2051,  2057,  2065,  2071,  2079,  2085,  2094,  2095,
-    2096,  2100,  2104,  2106,  2112,  2113,  2117,  2118,  2123,  2129,
-    2130,  2133,  2135,  2136,  2141,  2142,  2143,  2144,  2178,  2180,
-    2181,  2183,  2188,  2193,  2198,  2200,  2202,  2207,  2209,  2211,
-    2213,  2218,  2220,  2229,  2231,  2232,  2237,  2239,  2241,  2246,
-    2248,  2250,  2255,  2257,  2259,  2268,  2269,  2270,  2274,  2276,
-    2278,  2283,  2285,  2287,  2292,  2294,  2296,  2311,  2313,  2314,
-    2316,  2321,  2322,  2327,  2329,  2331,  2336,  2338,  2340,  2342,
-    2347,  2349,  2351,  2361,  2363,  2364,  2366,  2371,  2373,  2375,
-    2380,  2382,  2384,  2386,  2391,  2393,  2395,  2426,  2428,  2429,
-    2431,  2436,  2441,  2449,  2451,  2453,  2458,  2460,  2465,  2467,
-    2481,  2482,  2484,  2489,  2491,  2493,  2495,  2497,  2502,  2503,
-    2505,  2507,  2512,  2514,  2516,  2522,  2524,  2526,  2530,  2532,
-    2534,  2536,  2550,  2551,  2553,  2558,  2560,  2562,  2564,  2566,
-    2571,  2572,  2574,  2576,  2581,  2583,  2585,  2591,  2592,  2594,
-    2603,  2606,  2608,  2611,  2613,  2615,  2628,  2629,  2631,  2636,
-    2638,  2640,  2642,  2644,  2649,  2650,  2652,  2654,  2659,  2661,
-    2669,  2670,  2671,  2676,  2677,  2681,  2683,  2685,  2687,  2689,
-    2691,  2698,  2700,  2702,  2704,  2706,  2708,  2710,  2712,  2714,
-    2716,  2721,  2723,  2725,  2730,  2756,  2757,  2759,  2763,  2764,
-    2768,  2770,  2772,  2774,  2776,  2778,  2785,  2787,  2789,  2791,
-    2793,  2795,  2800,  2805,  2807,  2809,  2827,  2829,  2834,  2835
+    2096,  2100,  2104,  2106,  2111,  2112,  2116,  2117,  2122,  2128,
+    2129,  2132,  2134,  2135,  2139,  2140,  2141,  2142,  2176,  2178,
+    2179,  2181,  2186,  2191,  2196,  2198,  2200,  2205,  2207,  2209,
+    2211,  2216,  2218,  2227,  2229,  2230,  2235,  2237,  2239,  2244,
+    2246,  2248,  2253,  2255,  2257,  2266,  2267,  2268,  2272,  2274,
+    2276,  2281,  2283,  2285,  2290,  2292,  2294,  2309,  2311,  2312,
+    2314,  2319,  2320,  2325,  2327,  2329,  2334,  2336,  2338,  2340,
+    2345,  2347,  2349,  2359,  2361,  2362,  2364,  2369,  2371,  2373,
+    2378,  2380,  2382,  2384,  2389,  2391,  2393,  2424,  2426,  2427,
+    2429,  2434,  2439,  2447,  2449,  2451,  2456,  2458,  2463,  2465,
+    2479,  2480,  2482,  2487,  2489,  2491,  2493,  2495,  2500,  2501,
+    2503,  2505,  2510,  2512,  2514,  2520,  2522,  2524,  2528,  2530,
+    2532,  2534,  2548,  2549,  2551,  2556,  2558,  2560,  2562,  2564,
+    2569,  2570,  2572,  2574,  2579,  2581,  2583,  2589,  2590,  2592,
+    2601,  2604,  2606,  2609,  2611,  2613,  2626,  2627,  2629,  2634,
+    2636,  2638,  2640,  2642,  2647,  2648,  2650,  2652,  2657,  2659,
+    2667,  2668,  2669,  2674,  2675,  2679,  2681,  2683,  2685,  2687,
+    2689,  2696,  2698,  2700,  2702,  2704,  2706,  2708,  2710,  2712,
+    2714,  2719,  2721,  2723,  2728,  2754,  2755,  2757,  2761,  2762,
+    2766,  2768,  2770,  2772,  2774,  2776,  2783,  2785,  2787,  2789,
+    2791,  2793,  2798,  2803,  2805,  2807,  2825,  2827,  2832,  2833
 };
 #endif
@@ -7075 +7075 @@
     break;
 
-  case 543:
-#line 2107 "parser.yy" /* yacc.c:1646  */
-    { delete (yyvsp[-2].constant); }
+  case 544:
+#line 2111 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = 0; }
 #line 7081 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 544:
-#line 2112 "parser.yy" /* yacc.c:1646  */
+  case 547:
+#line 2118 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addQualifiers( (yyvsp[-1].decl) ); }
+#line 7087 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 548:
+#line 2124 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = 0; }
-#line 7087 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 547:
-#line 2119 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addQualifiers( (yyvsp[-1].decl) ); }
 #line 7093 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 548:
-#line 2125 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = 0; }
+  case 554:
+#line 2139 "parser.yy" /* yacc.c:1646  */
+    {}
 #line 7099 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 553:
-#line 2137 "parser.yy" /* yacc.c:1646  */
-    { delete (yyvsp[-1].en); }
+  case 555:
+#line 2140 "parser.yy" /* yacc.c:1646  */
+    {}
 #line 7105 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 554:
+  case 556:
 #line 2141 "parser.yy" /* yacc.c:1646  */
-    { delete (yyvsp[0].tok); }
+    {}
 #line 7111 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 555:
+  case 557:
 #line 2142 "parser.yy" /* yacc.c:1646  */
-    { delete (yyvsp[0].decl); }
+    {}
 #line 7117 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 556:
-#line 2143 "parser.yy" /* yacc.c:1646  */
-    { delete (yyvsp[0].decl); }
+  case 558:
+#line 2177 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
 #line 7123 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 557:
-#line 2144 "parser.yy" /* yacc.c:1646  */
-    { delete (yyvsp[0].decl); }
+  case 560:
+#line 2180 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
 #line 7129 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 558:
-#line 2179 "parser.yy" /* yacc.c:1646  */
+  case 561:
+#line 2182 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
 #line 7135 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 560:
-#line 2182 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
-#line 7141 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 561:
-#line 2184 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
-#line 7147 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
   case 562:
-#line 2189 "parser.yy" /* yacc.c:1646  */
+#line 2187 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.setNextIdentifier( *(yyvsp[0].tok) );
                         (yyval.decl) = DeclarationNode::newName( (yyvsp[0].tok) );
                 }
+#line 7144 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 563:
+#line 2192 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7150 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 564:
+#line 2197 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
 #line 7156 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 563:
-#line 2194 "parser.yy" /* yacc.c:1646  */
+  case 565:
+#line 2199 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
+#line 7162 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 566:
+#line 2201 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-1].decl); }
-#line 7162 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 564:
-#line 2199 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
 #line 7168 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 565:
-#line 2201 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
+  case 567:
+#line 2206 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addArray( (yyvsp[0].decl) ); }
 #line 7174 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 566:
-#line 2203 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl); }
+  case 568:
+#line 2208 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
 #line 7180 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 567:
-#line 2208 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl)->addArray( (yyvsp[0].decl) ); }
-#line 7186 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 568:
+  case 569:
 #line 2210 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7186 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 570:
+#line 2212 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
 #line 7192 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 569:
-#line 2212 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+  case 571:
+#line 2217 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-6].decl)->addParamList( (yyvsp[-2].decl) ); }
 #line 7198 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 570:
-#line 2214 "parser.yy" /* yacc.c:1646  */
+  case 572:
+#line 2219 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-1].decl); }
 #line 7204 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 571:
-#line 2219 "parser.yy" /* yacc.c:1646  */
+  case 573:
+#line 2228 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 7210 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 575:
+#line 2231 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 7216 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 576:
+#line 2236 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-5].decl)->addParamList( (yyvsp[-2].decl) ); }
+#line 7222 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 577:
+#line 2238 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-6].decl)->addParamList( (yyvsp[-2].decl) ); }
-#line 7210 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 572:
-#line 2221 "parser.yy" /* yacc.c:1646  */
+#line 7228 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 578:
+#line 2240 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-1].decl); }
-#line 7216 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 573:
-#line 2230 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
-#line 7222 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 575:
-#line 2233 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
-#line 7228 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 576:
-#line 2238 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-5].decl)->addParamList( (yyvsp[-2].decl) ); }
 #line 7234 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 577:
-#line 2240 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-6].decl)->addParamList( (yyvsp[-2].decl) ); }
+  case 579:
+#line 2245 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
 #line 7240 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 578:
-#line 2242 "parser.yy" /* yacc.c:1646  */
+  case 580:
+#line 2247 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
+#line 7246 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 581:
+#line 2249 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-1].decl); }
-#line 7246 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 579:
-#line 2247 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
 #line 7252 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 580:
-#line 2249 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
+  case 582:
+#line 2254 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
 #line 7258 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 581:
-#line 2251 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl); }
-#line 7264 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 582:
+  case 583:
 #line 2256 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7264 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 584:
+#line 2258 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
 #line 7270 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 583:
-#line 2258 "parser.yy" /* yacc.c:1646  */
+  case 588:
+#line 2273 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-3].decl)->addIdList( (yyvsp[-1].decl) ); }
+#line 7276 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 589:
+#line 2275 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-4].decl)->addIdList( (yyvsp[-1].decl) ); }
+#line 7282 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 590:
+#line 2277 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7288 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 591:
+#line 2282 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+#line 7294 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 592:
+#line 2284 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
+#line 7300 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 593:
+#line 2286 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
+#line 7306 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 594:
+#line 2291 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
-#line 7276 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 584:
-#line 2260 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl); }
-#line 7282 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 588:
-#line 2275 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-3].decl)->addIdList( (yyvsp[-1].decl) ); }
-#line 7288 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 589:
-#line 2277 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-4].decl)->addIdList( (yyvsp[-1].decl) ); }
-#line 7294 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 590:
-#line 2279 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl); }
-#line 7300 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 591:
-#line 2284 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-#line 7306 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 592:
-#line 2286 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
 #line 7312 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 593:
-#line 2288 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl); }
-#line 7318 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 594:
+  case 595:
 #line 2293 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7318 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 596:
+#line 2295 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
 #line 7324 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 595:
-#line 2295 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+  case 597:
+#line 2310 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
 #line 7330 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 596:
-#line 2297 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl); }
+  case 599:
+#line 2313 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
 #line 7336 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 597:
-#line 2312 "parser.yy" /* yacc.c:1646  */
+  case 600:
+#line 2315 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
 #line 7342 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 599:
-#line 2315 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+  case 602:
+#line 2321 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
 #line 7348 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 600:
-#line 2317 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+  case 603:
+#line 2326 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
 #line 7354 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 602:
-#line 2323 "parser.yy" /* yacc.c:1646  */
+  case 604:
+#line 2328 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
+#line 7360 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 605:
+#line 2330 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-1].decl); }
-#line 7360 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 603:
-#line 2328 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
 #line 7366 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 604:
-#line 2330 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
+  case 606:
+#line 2335 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addArray( (yyvsp[0].decl) ); }
 #line 7372 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 605:
-#line 2332 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl); }
+  case 607:
+#line 2337 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
 #line 7378 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 606:
-#line 2337 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl)->addArray( (yyvsp[0].decl) ); }
-#line 7384 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 607:
+  case 608:
 #line 2339 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7384 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 609:
+#line 2341 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
 #line 7390 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 608:
-#line 2341 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+  case 610:
+#line 2346 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-5].decl)->addParamList( (yyvsp[-2].decl) ); }
 #line 7396 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 609:
-#line 2343 "parser.yy" /* yacc.c:1646  */
+  case 611:
+#line 2348 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-6].decl)->addParamList( (yyvsp[-2].decl) ); }
+#line 7402 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 612:
+#line 2350 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-1].decl); }
-#line 7402 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 610:
-#line 2348 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-5].decl)->addParamList( (yyvsp[-2].decl) ); }
 #line 7408 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 611:
-#line 2350 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-6].decl)->addParamList( (yyvsp[-2].decl) ); }
+  case 613:
+#line 2360 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
 #line 7414 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 612:
-#line 2352 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl); }
+  case 615:
+#line 2363 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
 #line 7420 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 613:
-#line 2362 "parser.yy" /* yacc.c:1646  */
+  case 616:
+#line 2365 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
 #line 7426 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 615:
-#line 2365 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+  case 617:
+#line 2370 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
 #line 7432 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 616:
-#line 2367 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+  case 618:
+#line 2372 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
 #line 7438 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 617:
-#line 2372 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+  case 619:
+#line 2374 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
 #line 7444 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 618:
-#line 2374 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
+  case 620:
+#line 2379 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addArray( (yyvsp[0].decl) ); }
 #line 7450 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 619:
-#line 2376 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl); }
+  case 621:
+#line 2381 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
 #line 7456 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 620:
-#line 2381 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl)->addArray( (yyvsp[0].decl) ); }
-#line 7462 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 621:
+  case 622:
 #line 2383 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7462 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 623:
+#line 2385 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
 #line 7468 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 622:
-#line 2385 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+  case 624:
+#line 2390 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-5].decl)->addParamList( (yyvsp[-2].decl) ); }
 #line 7474 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 623:
-#line 2387 "parser.yy" /* yacc.c:1646  */
+  case 625:
+#line 2392 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-6].decl)->addParamList( (yyvsp[-2].decl) ); }
+#line 7480 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 626:
+#line 2394 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-1].decl); }
-#line 7480 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 624:
-#line 2392 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-5].decl)->addParamList( (yyvsp[-2].decl) ); }
 #line 7486 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 625:
-#line 2394 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-6].decl)->addParamList( (yyvsp[-2].decl) ); }
+  case 627:
+#line 2425 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
 #line 7492 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 626:
-#line 2396 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl); }
+  case 629:
+#line 2428 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
 #line 7498 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 627:
-#line 2427 "parser.yy" /* yacc.c:1646  */
+  case 630:
+#line 2430 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
 #line 7504 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 629:
-#line 2430 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
-#line 7510 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 630:
-#line 2432 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
-#line 7516 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
   case 631:
-#line 2437 "parser.yy" /* yacc.c:1646  */
+#line 2435 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.setNextIdentifier( *(yyvsp[0].tok) );
                         (yyval.decl) = DeclarationNode::newName( (yyvsp[0].tok) );
                 }
-#line 7525 "Parser/parser.cc" /* yacc.c:1646  */
+#line 7513 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 632:
-#line 2442 "parser.yy" /* yacc.c:1646  */
+#line 2440 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.setNextIdentifier( *(yyvsp[0].tok) );
                         (yyval.decl) = DeclarationNode::newName( (yyvsp[0].tok) );
                 }
+#line 7522 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 633:
+#line 2448 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+#line 7528 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 634:
+#line 2450 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
 #line 7534 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 633:
-#line 2450 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+  case 635:
+#line 2452 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
 #line 7540 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 634:
-#line 2452 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
+  case 636:
+#line 2457 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addArray( (yyvsp[0].decl) ); }
 #line 7546 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 635:
-#line 2454 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl); }
+  case 637:
+#line 2459 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
 #line 7552 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 636:
-#line 2459 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl)->addArray( (yyvsp[0].decl) ); }
+  case 638:
+#line 2464 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-5].decl)->addParamList( (yyvsp[-2].decl) ); }
 #line 7558 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 637:
-#line 2461 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+  case 639:
+#line 2466 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-6].decl)->addParamList( (yyvsp[-2].decl) ); }
 #line 7564 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 638:
-#line 2466 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-5].decl)->addParamList( (yyvsp[-2].decl) ); }
+  case 641:
+#line 2481 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
 #line 7570 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 639:
-#line 2468 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-6].decl)->addParamList( (yyvsp[-2].decl) ); }
-#line 7576 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 641:
+  case 642:
 #line 2483 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 7576 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 643:
+#line 2488 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
 #line 7582 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 642:
-#line 2485 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+  case 644:
+#line 2490 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[0].decl) ); }
 #line 7588 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 643:
-#line 2490 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
+  case 645:
+#line 2492 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
 #line 7594 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 644:
-#line 2492 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[0].decl) ); }
+  case 646:
+#line 2494 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
 #line 7600 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 645:
-#line 2494 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+  case 647:
+#line 2496 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
 #line 7606 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 646:
-#line 2496 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
+  case 649:
+#line 2502 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
 #line 7612 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 647:
-#line 2498 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl); }
-#line 7618 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 649:
+  case 650:
 #line 2504 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7618 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 651:
+#line 2506 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
 #line 7624 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 650:
-#line 2506 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+  case 652:
+#line 2511 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[-2].decl), 0 ); }
 #line 7630 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 651:
-#line 2508 "parser.yy" /* yacc.c:1646  */
+  case 653:
+#line 2513 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-6].decl)->addParamList( (yyvsp[-2].decl) ); }
+#line 7636 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 654:
+#line 2515 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-1].decl); }
-#line 7636 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 652:
-#line 2513 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[-2].decl), 0 ); }
 #line 7642 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 653:
-#line 2515 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-6].decl)->addParamList( (yyvsp[-2].decl) ); }
+  case 655:
+#line 2521 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
 #line 7648 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 654:
-#line 2517 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl); }
+  case 656:
+#line 2523 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false )->addArray( (yyvsp[0].decl) ); }
 #line 7654 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 655:
-#line 2523 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
+  case 658:
+#line 2529 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[-2].en), 0, false ); }
 #line 7660 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 656:
-#line 2525 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false )->addArray( (yyvsp[0].decl) ); }
+  case 659:
+#line 2531 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newVarArray( 0 ); }
 #line 7666 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 658:
-#line 2531 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[-2].en), 0, false ); }
+  case 660:
+#line 2533 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-5].decl)->addArray( DeclarationNode::newArray( (yyvsp[-2].en), 0, false ) ); }
 #line 7672 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 659:
-#line 2533 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = DeclarationNode::newVarArray( 0 ); }
+  case 661:
+#line 2535 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-5].decl)->addArray( DeclarationNode::newVarArray( 0 ) ); }
 #line 7678 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 660:
-#line 2535 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-5].decl)->addArray( DeclarationNode::newArray( (yyvsp[-2].en), 0, false ) ); }
+  case 663:
+#line 2550 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
 #line 7684 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 661:
-#line 2537 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-5].decl)->addArray( DeclarationNode::newVarArray( 0 ) ); }
-#line 7690 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 663:
+  case 664:
 #line 2552 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 7690 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 665:
+#line 2557 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
 #line 7696 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 664:
-#line 2554 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+  case 666:
+#line 2559 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[0].decl) ); }
 #line 7702 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 665:
-#line 2559 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
+  case 667:
+#line 2561 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
 #line 7708 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 666:
-#line 2561 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[0].decl) ); }
+  case 668:
+#line 2563 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
 #line 7714 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 667:
-#line 2563 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+  case 669:
+#line 2565 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
 #line 7720 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 668:
-#line 2565 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
+  case 671:
+#line 2571 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
 #line 7726 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 669:
-#line 2567 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl); }
-#line 7732 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 671:
+  case 672:
 #line 2573 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7732 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 673:
+#line 2575 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
 #line 7738 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 672:
-#line 2575 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+  case 674:
+#line 2580 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[-2].decl), 0 ); }
 #line 7744 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 673:
-#line 2577 "parser.yy" /* yacc.c:1646  */
+  case 675:
+#line 2582 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-6].decl)->addParamList( (yyvsp[-2].decl) ); }
+#line 7750 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 676:
+#line 2584 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-1].decl); }
-#line 7750 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 674:
-#line 2582 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[-2].decl), 0 ); }
 #line 7756 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 675:
-#line 2584 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-6].decl)->addParamList( (yyvsp[-2].decl) ); }
+  case 678:
+#line 2591 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addArray( (yyvsp[0].decl) ); }
 #line 7762 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 676:
-#line 2586 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl); }
+  case 680:
+#line 2602 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
 #line 7768 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 678:
-#line 2593 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl)->addArray( (yyvsp[0].decl) ); }
+  case 681:
+#line 2605 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[-3].decl) ); }
 #line 7774 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 680:
-#line 2604 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
+  case 682:
+#line 2607 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newArray( 0, (yyvsp[-2].decl), false ); }
 #line 7780 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 681:
-#line 2607 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[-3].decl) ); }
+  case 683:
+#line 2610 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[-2].en), (yyvsp[-3].decl), false ); }
 #line 7786 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 682:
-#line 2609 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = DeclarationNode::newArray( 0, (yyvsp[-2].decl), false ); }
+  case 684:
+#line 2612 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[-2].en), (yyvsp[-3].decl), true ); }
 #line 7792 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 683:
-#line 2612 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[-2].en), (yyvsp[-3].decl), false ); }
+  case 685:
+#line 2614 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[-2].en), (yyvsp[-4].decl), true ); }
 #line 7798 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 684:
-#line 2614 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[-2].en), (yyvsp[-3].decl), true ); }
+  case 687:
+#line 2628 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
 #line 7804 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 685:
-#line 2616 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[-2].en), (yyvsp[-4].decl), true ); }
-#line 7810 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 687:
+  case 688:
 #line 2630 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+#line 7810 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 689:
+#line 2635 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
 #line 7816 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 688:
-#line 2632 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[0].decl) ); }
+  case 690:
+#line 2637 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[0].decl) ); }
 #line 7822 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 689:
-#line 2637 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
+  case 691:
+#line 2639 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
 #line 7828 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 690:
-#line 2639 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[0].decl) ); }
+  case 692:
+#line 2641 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
 #line 7834 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 691:
-#line 2641 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+  case 693:
+#line 2643 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
 #line 7840 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 692:
-#line 2643 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[-1].decl) ) ); }
+  case 695:
+#line 2649 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
 #line 7846 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 693:
-#line 2645 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl); }
-#line 7852 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 695:
+  case 696:
 #line 2651 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+#line 7852 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 697:
+#line 2653 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-1].decl); }
 #line 7858 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 696:
-#line 2653 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-2].decl)->addArray( (yyvsp[0].decl) ); }
+  case 698:
+#line 2658 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-6].decl)->addParamList( (yyvsp[-2].decl) ); }
 #line 7864 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 697:
-#line 2655 "parser.yy" /* yacc.c:1646  */
+  case 699:
+#line 2660 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[-1].decl); }
 #line 7870 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 698:
-#line 2660 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-6].decl)->addParamList( (yyvsp[-2].decl) ); }
+  case 702:
+#line 2670 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addQualifiers( (yyvsp[-1].decl) ); }
 #line 7876 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 699:
-#line 2662 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[-1].decl); }
+  case 705:
+#line 2680 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
 #line 7882 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 702:
-#line 2672 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addQualifiers( (yyvsp[-1].decl) ); }
+  case 706:
+#line 2682 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[-2].decl) ) ); }
 #line 7888 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 705:
-#line 2682 "parser.yy" /* yacc.c:1646  */
+  case 707:
+#line 2684 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
 #line 7894 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 706:
-#line 2684 "parser.yy" /* yacc.c:1646  */
+  case 708:
+#line 2686 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[-2].decl) ) ); }
 #line 7900 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 707:
-#line 2686 "parser.yy" /* yacc.c:1646  */
+  case 709:
+#line 2688 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
 #line 7906 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 708:
-#line 2688 "parser.yy" /* yacc.c:1646  */
+  case 710:
+#line 2690 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[-2].decl) ) ); }
 #line 7912 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 709:
-#line 2690 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+  case 711:
+#line 2697 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
 #line 7918 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 710:
-#line 2692 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[-2].decl) ) ); }
+  case 712:
+#line 2699 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) ); }
 #line 7924 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 711:
-#line 2699 "parser.yy" /* yacc.c:1646  */
+  case 713:
+#line 2701 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+#line 7930 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 714:
+#line 2703 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) )->addNewArray( (yyvsp[-2].decl) ); }
+#line 7936 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 715:
+#line 2705 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) ); }
+#line 7942 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 716:
+#line 2707 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[0].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-#line 7930 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 712:
-#line 2701 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) ); }
-#line 7936 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 713:
-#line 2703 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-#line 7942 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 714:
-#line 2705 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) )->addNewArray( (yyvsp[-2].decl) ); }
 #line 7948 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 715:
-#line 2707 "parser.yy" /* yacc.c:1646  */
+  case 717:
+#line 2709 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) ); }
 #line 7954 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 716:
-#line 2709 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+  case 718:
+#line 2711 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
 #line 7960 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 717:
-#line 2711 "parser.yy" /* yacc.c:1646  */
+  case 719:
+#line 2713 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) )->addNewArray( (yyvsp[-2].decl) ); }
+#line 7966 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 720:
+#line 2715 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) ); }
-#line 7966 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 718:
-#line 2713 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
 #line 7972 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 719:
-#line 2715 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) )->addNewArray( (yyvsp[-2].decl) ); }
+  case 721:
+#line 2720 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[-3].decl) ); }
 #line 7978 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 720:
-#line 2717 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) ); }
+  case 722:
+#line 2722 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[-2].en), (yyvsp[-3].decl), false ); }
 #line 7984 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 721:
-#line 2722 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[-3].decl) ); }
+  case 723:
+#line 2727 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[-2].en), (yyvsp[-3].decl), true ); }
 #line 7990 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 722:
-#line 2724 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[-2].en), (yyvsp[-3].decl), false ); }
+  case 724:
+#line 2729 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[-2].en), (yyvsp[-3].decl)->addQualifiers( (yyvsp[-4].decl) ), true ); }
 #line 7996 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 723:
-#line 2729 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[-2].en), (yyvsp[-3].decl), true ); }
+  case 726:
+#line 2756 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addQualifiers( (yyvsp[-1].decl) ); }
 #line 8002 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 724:
-#line 2731 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = DeclarationNode::newArray( (yyvsp[-2].en), (yyvsp[-3].decl)->addQualifiers( (yyvsp[-4].decl) ), true ); }
+  case 730:
+#line 2767 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
 #line 8008 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 726:
-#line 2758 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addQualifiers( (yyvsp[-1].decl) ); }
+  case 731:
+#line 2769 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[-2].decl) ) ); }
 #line 8014 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 730:
-#line 2769 "parser.yy" /* yacc.c:1646  */
+  case 732:
+#line 2771 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
 #line 8020 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 731:
-#line 2771 "parser.yy" /* yacc.c:1646  */
+  case 733:
+#line 2773 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[-2].decl) ) ); }
 #line 8026 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 732:
-#line 2773 "parser.yy" /* yacc.c:1646  */
+  case 734:
+#line 2775 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
 #line 8032 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 733:
-#line 2775 "parser.yy" /* yacc.c:1646  */
+  case 735:
+#line 2777 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[-2].decl) ) ); }
 #line 8038 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 734:
-#line 2777 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
+  case 736:
+#line 2784 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
 #line 8044 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 735:
-#line 2779 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[-2].decl) ) ); }
+  case 737:
+#line 2786 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
 #line 8050 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 736:
-#line 2786 "parser.yy" /* yacc.c:1646  */
+  case 738:
+#line 2788 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) ); }
+#line 8056 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 739:
+#line 2790 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[0].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-#line 8056 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 737:
-#line 2788 "parser.yy" /* yacc.c:1646  */
+#line 8062 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 740:
+#line 2792 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-#line 8062 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 738:
-#line 2790 "parser.yy" /* yacc.c:1646  */
+#line 8068 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 741:
+#line 2794 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) ); }
-#line 8068 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 739:
-#line 2792 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
 #line 8074 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 740:
-#line 2794 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+  case 742:
+#line 2799 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[-2].decl) ); }
 #line 8080 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 741:
-#line 2796 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = (yyvsp[0].decl)->addNewArray( (yyvsp[-1].decl) ); }
+  case 743:
+#line 2804 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newFunction( 0, DeclarationNode::newTuple( 0 ), (yyvsp[-1].decl), 0 ); }
 #line 8086 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 742:
-#line 2801 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[-2].decl) ); }
+  case 744:
+#line 2806 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[-5].decl), (yyvsp[-2].decl), 0 ); }
 #line 8092 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 743:
-#line 2806 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = DeclarationNode::newFunction( 0, DeclarationNode::newTuple( 0 ), (yyvsp[-1].decl), 0 ); }
-#line 8098 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 744:
+  case 745:
 #line 2808 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[-5].decl), (yyvsp[-2].decl), 0 ); }
+#line 8098 "Parser/parser.cc" /* yacc.c:1646  */
+    break;
+
+  case 748:
+#line 2832 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = 0; }
 #line 8104 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 745:
-#line 2810 "parser.yy" /* yacc.c:1646  */
-    { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[-5].decl), (yyvsp[-2].decl), 0 ); }
+  case 749:
+#line 2834 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (yyvsp[0].en); }
 #line 8110 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
-  case 748:
-#line 2834 "parser.yy" /* yacc.c:1646  */
-    { (yyval.en) = 0; }
-#line 8116 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-  case 749:
-#line 2836 "parser.yy" /* yacc.c:1646  */
-    { (yyval.en) = (yyvsp[0].en); }
-#line 8122 "Parser/parser.cc" /* yacc.c:1646  */
-    break;
-
-
-#line 8126 "Parser/parser.cc" /* yacc.c:1646  */
+
+#line 8114 "Parser/parser.cc" /* yacc.c:1646  */
       default: break;
     }
@@ -8351 +8339 @@
   return yyresult;
 }
-#line 2839 "parser.yy" /* yacc.c:1906  */
+#line 2837 "parser.yy" /* yacc.c:1906  */
 
 // ----end of grammar----

src/Parser/parser.yy

@@ -2105 +2105 @@
         // empty
         | ASM '(' string_literal_list ')' attribute_list_opt
-                { delete $3; }
         ;
 
@@ -2135 +2134 @@
         | any_word
         | any_word '(' comma_expression_opt ')'
-                { delete $3; }
         ;
 
 any_word:                                                                                               // GCC
-        identifier_or_type_name { delete $1; }
-        | storage_class { delete $1; }
-        | basic_type_name { delete $1; }
-        | type_qualifier { delete $1; }
+        identifier_or_type_name {}
+        | storage_class {}
+        | basic_type_name {}
+        | type_qualifier {}
         ;
 

src/SynTree/Expression.cc

@@ -385 +385 @@
 UntypedExpr::~UntypedExpr() {
         delete function;
-        // deleteAll( args );  //TODO FIXME the arguments are leaked but they seem to be shared in some way
 }
 

src/SynTree/FunctionDecl.cc

@@ -39 +39 @@
         delete type;
         delete statements;
-        deleteAll( oldDecls );
 }
 

src/SynTree/Statement.cc

@@ -159 +159 @@
         delete condition;
         // destroy statements
-        deleteAll( statements );
 }
 
@@ -188 +187 @@
 CaseStmt::~CaseStmt() {
         delete condition;
-        deleteAll( stmts );
 }
 
@@ -222 +220 @@
 WhileStmt::~WhileStmt() {
         delete body;
-        delete condition;
 }
 
@@ -297 +294 @@
 TryStmt::~TryStmt() {
         delete block;
-        deleteAll( handlers );
-        delete finallyBlock;
 }
 

src/include/assert.h

@@ -4 +4 @@
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-//
-// assert.h --
-//
+// 
+// assert.h -- 
+// 
 // Author           : Peter A. Buhr
 // Created On       : Thu Aug 18 13:19:26 2016
@@ -12 +12 @@
 // Last Modified On : Thu Aug 18 13:25:55 2016
 // Update Count     : 4
-//
-
-#pragma once
+// 
 
 #include_next <assert.h>
@@ -24 +22 @@
 void __assert_fail_f( const char *assertion, const char *file, unsigned int line, const char *function, const char *fmt, ... );
 
-template<typename T, typename U>
-static inline T safe_dynamic_cast(const U& src) {
-        T ret = dynamic_cast<T>(src);
-        assert(ret);
-        return ret;
-}
-
 // Local Variables: //
 // tab-width: 4 //

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Aug 20 12:52:22 2016
-// Update Count     : 403
+// Last Modified On : Fri Aug 19 08:31:22 2016
+// Update Count     : 350
 //
 
 #include <iostream>
 #include <fstream>
-#include <signal.h>                                                                             // signal
-#include <getopt.h>                                                                             // getopt
-#include <execinfo.h>                                                                   // backtrace, backtrace_symbols_fd
-#include <cxxabi.h>                                                                             // __cxa_demangle
-
-using namespace std;
-
+#include <getopt.h>
 #include "Parser/lex.h"
 #include "Parser/parser.h"
@@ -41 +35 @@
 #include "InitTweak/FixInit.h"
 #include "Common/UnimplementedError.h"
+
 #include "../config.h"
 
 using namespace std;
 
-#define OPTPRINT(x) if ( errorp ) cerr << x << endl;
+#define OPTPRINT(x) if ( errorp ) std::cerr << x << std::endl;
 
 
@@ -73 +68 @@
 static void parse_cmdline( int argc, char *argv[], const char *& filename );
 static void parse( FILE * input, LinkageSpec::Spec linkage, bool shouldExit = false );
-static void dump( list< Declaration * > & translationUnit, ostream & out = cout );
-
-void sigSegvBusHandler( int sig_num ) {
-        enum { Frames = 50 };
-        void * array[Frames];
-        int size = backtrace( array, Frames );
-
-        cerr << "*CFA runtime error* program cfa-cpp terminated with "
-                 <<     (sig_num == SIGSEGV ? "segment fault" : "bus error")
-                 << " backtrace:" << endl;
-
-        char ** messages = backtrace_symbols( array, size );    
-
-        // skip first stack frame (points here)
-        for ( int i = 2; i < size - 2 && messages != nullptr; i += 1 ) {
-                char * mangled_name = nullptr, * offset_begin = nullptr, * offset_end = nullptr;
-                for ( char *p = messages[i]; *p; ++p ) {        // find parantheses and +offset
-                        if (*p == '(') {
-                                mangled_name = p; 
-                        } else if (*p == '+') {
-                                offset_begin = p;
-                        } else if (*p == ')') {
-                                offset_end = p;
-                                break;
-                        } // if
-                } // for
-
-                // if line contains symbol, attempt to demangle
-                if ( mangled_name && offset_begin && offset_end && mangled_name < offset_begin ) {
-                        *mangled_name++ = '\0';
-                        *offset_begin++ = '\0';
-                        *offset_end++ = '\0';
-
-                        int status;
-                        char * real_name = __cxxabiv1::__cxa_demangle( mangled_name, 0, 0, &status );
-                        if ( status == 0 ) {                                            // demangling successful ?
-                                cerr << "(" << i - 2 << ") " << messages[i] << " : " 
-                                         << real_name << "+" << offset_begin << offset_end << endl;
-
-                        } else {                                                                        // otherwise, output mangled name
-                                cerr << "(" << i - 2 << ") " << messages[i] << " : " 
-                                         << mangled_name << "+" << offset_begin << offset_end << endl;
-                        } // if
-                        free( real_name );
-                } else {                                                                                // otherwise, print the whole line
-                        cerr << "(" << i - 2 << ") " << messages[i] << endl;
-                } // if
-        } // for
-        free( messages );
-        exit( EXIT_FAILURE );
-} // sigSegvBusHandler
+static void dump( std::list< Declaration * > & translationUnit, std::ostream & out = std::cout );
 
 int main( int argc, char * argv[] ) {
         FILE * input;                                                                           // use FILE rather than istream because yyin is FILE
-        ostream *output = & cout;
+        std::ostream *output = & std::cout;
+        std::list< Declaration * > translationUnit;
         const char *filename = nullptr;
-        list< Declaration * > translationUnit;
-
-        signal( SIGSEGV, sigSegvBusHandler );
-        signal( SIGBUS, sigSegvBusHandler );
 
         parse_cmdline( argc, argv, filename );                          // process command-line arguments
@@ -180 +122 @@
 
                 if ( parsep ) {
-                        parseTree->printList( cout );
+                        parseTree->printList( std::cout );
                         delete parseTree;
                         return 0;
@@ -202 +144 @@
 
                 if ( expraltp ) {
-                        ResolvExpr::AlternativePrinter printer( cout );
+                        ResolvExpr::AlternativePrinter printer( std::cout );
                         acceptAll( translationUnit, printer );
                         return 0;
@@ -268 +210 @@
                 CodeGen::generate( translationUnit, *output, ! noprotop );
 
-                if ( output != &cout ) {
+                if ( output != &std::cout ) {
                         delete output;
                 } // if
         } catch ( SemanticError &e ) {
                 if ( errorp ) {
-                        cerr << "---AST at error:---" << endl;
-                        dump( translationUnit, cerr );
-                        cerr << endl << "---End of AST, begin error message:---\n" << endl;
-                } // if
-                e.print( cerr );
-                if ( output != &cout ) {
+                        std::cerr << "---AST at error:---" << std::endl;
+                        dump( translationUnit, std::cerr );
+                        std::cerr << std::endl << "---End of AST, begin error message:---\n" << std::endl;
+                } // if
+                e.print( std::cerr );
+                if ( output != &std::cout ) {
                         delete output;
                 } // if
                 return 1;
         } catch ( UnimplementedError &e ) {
-                cout << "Sorry, " << e.get_what() << " is not currently implemented" << endl;
-                if ( output != &cout ) {
+                std::cout << "Sorry, " << e.get_what() << " is not currently implemented" << std::endl;
+                if ( output != &std::cout ) {
                         delete output;
                 } // if
                 return 1;
         } catch ( CompilerError &e ) {
-                cerr << "Compiler Error: " << e.get_what() << endl;
-                cerr << "(please report bugs to " << endl;
-                if ( output != &cout ) {
+                std::cerr << "Compiler Error: " << e.get_what() << std::endl;
+                std::cerr << "(please report bugs to " << std::endl;
+                if ( output != &std::cout ) {
                         delete output;
                 } // if
@@ -427 +369 @@
 } // notPrelude
 
-static void dump( list< Declaration * > & translationUnit, ostream & out ) {
-        list< Declaration * > decls;
+static void dump( std::list< Declaration * > & translationUnit, std::ostream & out ) {
+        std::list< Declaration * > decls;
 
         if ( noprotop ) {
-                filter( translationUnit.begin(), translationUnit.end(), back_inserter( decls ), notPrelude );
+                filter( translationUnit.begin(), translationUnit.end(), std::back_inserter( decls ), notPrelude );
         } else {
                 decls = translationUnit;