Changeset 80722d0

Timestamp:

Aug 20, 2016, 7:06:26 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

ab57786, d30790f

Parents:

e6955b1 (diff), 4a7d895 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Files:

• doc/aaron_comp_II/comp_II.tex (modified) (26 diffs)
• src/Parser/DeclarationNode.cc (modified) (2 diffs)
• src/Parser/ExpressionNode.cc (modified) (5 diffs)
• src/Parser/ParseNode.h (modified) (6 diffs)
• src/Parser/StatementNode.cc (modified) (4 diffs)
• src/Parser/parser.cc (modified) (70 diffs)
• src/Parser/parser.h (modified) (4 diffs)
• src/Parser/parser.yy (modified) (8 diffs)
• src/SynTree/Expression.cc (modified) (1 diff)
• src/SynTree/FunctionDecl.cc (modified) (1 diff)
• src/SynTree/Statement.cc (modified) (5 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 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 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 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 also 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 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 to ©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 of ©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 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 \emph{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 ) {
-    M aa = abs(a), ab = abs(b);
-    return aa < ab ? b : a; 
+    return abs(a) < abs(b) ? 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 interface implementation 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 implementation of an interface 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}
@@ -190 +189 @@
 \end{lstlisting}
 
-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:
+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:
 \begin{lstlisting}
 trait pointer_like(®otype Ptr, otype El®) {
@@ -202 +201 @@
 };
 
-typedef list* list_iterator;
+typedef list *list_iterator;
 
 lvalue int *?( list_iterator it ) {
@@ -209 +208 @@
 \end{lstlisting}
 
-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. 
+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©).
 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 could 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 can 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 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 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. 
 \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 7 
-max(max, 3.14); // uses (2) and (4), by matching double type of 3.14
+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(max, -max);  // ERROR: ambiguous
-int m = max(max, -max); // uses (1) and (3) twice, by return type
+int m = max(max, -max); // uses (1) once and (3) twice, by matching return type
 \end{lstlisting}
 
@@ -239 +239 @@
 
 \subsection{Implicit Conversions}
-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. 
+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. 
 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. 
-©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).
+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).
 
 \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} has laid out a framework for using polymorphic-conversion-constructor functions to create a directed acyclic graph (DAG) of conversions. 
+Ditchfield~\cite{Ditchfield:conversions} 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 as path length through the DAG. 
+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. 
 \begin{figure}[h]
 \centering
 \includegraphics{conversion_dag}
-\caption{A portion of the implicit conversion DAG for built-in types.}
+\caption{A portion of the implicit conversion DAG for built-in types.}\label{fig:conv_dag}
 \end{figure}
-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©).
+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©).
 
 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 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?
+\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?
 \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 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 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. 
 The following example shows the implicitly-generated code in green:
 \begin{lstlisting}
@@ -280 +281 @@
 };
 
-¢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);
+¢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);
     return *this;
 }
-void ^?{}(kv *this) {
-    ^?{}(&this->key);
-    ^?{}(&this->value);
+void ^?{}(kv *this) {  // destructor
+    ^?{}(&(this->key));
+    ^?{}(&(this->value));
 }¢
 
@@ -335 +336 @@
 \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© 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 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 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 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. 
+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. 
 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. 
 
@@ -345 +347 @@
 \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© below:
-\begin{lstlisting}
-[char, char] x = [ '!', '?' ];
-int x = 42;
-
-forall(otype T) [T, T] swap( T a, T b ) { return [b, a]; }
+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)
 
 x = swap( x ); // destructure [char, char] x into two elements of parameter list
 // cannot use int x for parameter, not enough arguments to swap
-\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.
+
+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.
 
 \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 below:
+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:
 \begin{lstlisting} 
 const int magic = 42;
@@ -369 +378 @@
 print_inc( magic ); // legal; implicitly generated code in green below:
 
-¢int tmp = magic;¢ // copies to safely strip const-qualifier
+¢int tmp = magic;¢ // 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 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.
+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.
 
 \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 precicely. 
+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. 
 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.
@@ -386 +395 @@
 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, 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. 
+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. 
 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.
 
@@ -404 +413 @@
 %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 of a cross-argument dependency 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 cross-argument dependencies 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. 
@@ -412 +421 @@
 
 \subsection{Argument-Parameter Matching}
-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. 
+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. 
 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 below:
+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}:
 \begin{figure}[h]
 \centering
@@ -433 +442 @@
 \end{figure}
 
-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.
+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.
 
 \subsubsection{Argument-directed (Bottom-up)}
@@ -451 +460 @@
 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:
+For instance, in:
 \begin{lstlisting}
 forall(otype T)
@@ -460 +469 @@
 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 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. 
+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. 
 
 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 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.
+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.
 
 \subsubsection{Common Subexpression Caching}
@@ -480 +490 @@
 \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 which integrates overload resolution with a polymorphic type inference approach very similar 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.
 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.}.
 
@@ -486 +496 @@
 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, 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.
+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.
 
 \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 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. 
+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. 
 
 \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 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.
+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.
 
 \subsubsection{Eager}
@@ -563 +571 @@
 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 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.}. 
+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.}. 
 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.
@@ -571 +579 @@
 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 modern 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 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/Parser/DeclarationNode.cc

@@ -300 +300 @@
         newnode->type->array->dimension = size;
         newnode->type->array->isStatic = isStatic;
-        if ( newnode->type->array->dimension == 0 || dynamic_cast< ConstantExpr * >( newnode->type->array->dimension->build() ) ) {
+        if ( newnode->type->array->dimension == 0 || newnode->type->array->dimension->isExpressionType<ConstantExpr *>() ) {
                 newnode->type->array->isVarLen = false;
         } else {
@@ -776 +776 @@
                 } // if
         } // if
+        delete o;
         return o;
 }

src/Parser/ExpressionNode.cc

@@ -57 +57 @@
 static inline bool checkX( char c ) { return c == 'x' || c == 'X'; }
 
-Expression *build_constantInteger( std::string & str ) {
+Expression *build_constantInteger( const std::string & str ) {
         static const BasicType::Kind kind[2][3] = {
                 { BasicType::SignedInt, BasicType::LongSignedInt, BasicType::LongLongSignedInt },
@@ -123 +123 @@
 } // build_constantInteger
 
-Expression *build_constantFloat( std::string & str ) {
+Expression *build_constantFloat( const std::string & str ) {
         static const BasicType::Kind kind[2][3] = {
                 { BasicType::Float, BasicType::Double, BasicType::LongDouble },
@@ -153 +153 @@
 } // build_constantFloat
 
-Expression *build_constantChar( std::string & str ) {
+Expression *build_constantChar( const std::string & str ) {
         return new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::Char ), str ) );
 } // build_constantChar
 
-ConstantExpr *build_constantStr( std::string & str ) {
+ConstantExpr *build_constantStr( const std::string & str ) {
         // string should probably be a primitive type
         ArrayType *at = new ArrayType( emptyQualifiers, new BasicType( emptyQualifiers, BasicType::Char ),
@@ -213 +213 @@
 }
 Expression *build_sizeOftype( DeclarationNode *decl_node ) {
-        return new SizeofExpr( decl_node->buildType() );
+        Expression* ret = new SizeofExpr( decl_node->buildType() );
+        delete decl_node;
+        return ret;
 }
 Expression *build_alignOfexpr( ExpressionNode *expr_node ) {
@@ -222 +224 @@
 }
 Expression *build_offsetOf( DeclarationNode *decl_node, NameExpr *member ) {
-        return new UntypedOffsetofExpr( decl_node->buildType(), member->get_name() );
+        Expression* ret = new UntypedOffsetofExpr( decl_node->buildType(), member->get_name() );
+        delete decl_node;
+        delete member;
+        return ret;
 }
 

src/Parser/ParseNode.h

@@ -103 +103 @@
 //##############################################################################
 
-class ExpressionNode : public ParseNode {
+class ExpressionNode final : public ParseNode {
   public:
         ExpressionNode( Expression * expr = nullptr ) : expr( expr ) {}
@@ -114 +114 @@
         ExpressionNode *set_extension( bool exten ) { extension = exten; return this; }
 
-        virtual void print( std::ostream &os, int indent = 0 ) const {}
-        virtual void printOneLine( std::ostream &os, int indent = 0 ) const {}
-
-        virtual Expression *build() const { return expr; }
+        void print( std::ostream &os, int indent = 0 ) const {}
+        void printOneLine( std::ostream &os, int indent = 0 ) const {}
+
+        template<typename T>
+        bool isExpressionType() const {
+                return nullptr != dynamic_cast<T>(expr.get());
+        }
+
+        Expression *build() const { return const_cast<ExpressionNode*>(this)->expr.release(); }
   private:
         bool extension = false;
-        Expression *expr;
+        std::unique_ptr<Expression> expr;
 };
 
@@ -151 +156 @@
 };
 
-Expression *build_constantInteger( std::string &str );
-Expression *build_constantFloat( std::string &str );
-Expression *build_constantChar( std::string &str );
-ConstantExpr *build_constantStr( std::string &str );
+Expression *build_constantInteger( const std::string &str );
+Expression *build_constantFloat( const std::string &str );
+Expression *build_constantChar( const std::string &str );
+ConstantExpr *build_constantStr( const std::string &str );
 
 NameExpr *build_varref( const std::string *name, bool labelp = false );
@@ -304 +309 @@
 //##############################################################################
 
-class StatementNode : public ParseNode {
+class StatementNode final : public ParseNode {
   public:
         StatementNode() { stmt = nullptr; }
@@ -311 +316 @@
         virtual ~StatementNode() {}
 
-        virtual StatementNode *clone() const { assert( false ); return nullptr; }
-        virtual Statement *build() const { return stmt; }
+        virtual StatementNode *clone() const final { assert( false ); return nullptr; }
+        Statement *build() const { return const_cast<StatementNode*>(this)->stmt.release(); }
 
         virtual StatementNode *add_label( const std::string * name ) {
                 stmt->get_labels().emplace_back( *name );
+                delete name;
                 return this;
         }
@@ -324 +330 @@
         virtual void printList( std::ostream &os, int indent = 0 ) {}
   private:
-        Statement *stmt;
+        std::unique_ptr<Statement> stmt;
 }; // StatementNode
 

src/Parser/StatementNode.cc

@@ -44 +44 @@
                         agg = decl;
                 } // if
-                stmt = new DeclStmt( noLabels, maybeBuild< Declaration >(agg) );
+                stmt.reset( new DeclStmt( noLabels, maybeBuild< Declaration >(agg) ) );
         } else {
                 assert( false );
@@ -56 +56 @@
                 StatementNode *node = dynamic_cast< StatementNode * >(curr);
                 assert( node );
-                assert( dynamic_cast< CaseStmt * >(node->stmt) );
+                assert( dynamic_cast< CaseStmt * >(node->stmt.get()) );
                 prev = curr;
         } // for
@@ -64 +64 @@
         buildMoveList( stmt, stmts );
         // splice any new Statements to end of current Statements
-        CaseStmt * caseStmt = dynamic_cast< CaseStmt * >(node->stmt);
+        CaseStmt * caseStmt = dynamic_cast< CaseStmt * >(node->stmt.get());
         caseStmt->get_statements().splice( caseStmt->get_statements().end(), stmts );
         return this;
@@ -153 +153 @@
         std::list< Expression * > exps;
         buildMoveList( ctl, exps );
-        return new ReturnStmt( noLabels, exps.size() > 0 ? exps.back() : nullptr, true );
+        assertf( exps.size() < 2, "This means we are leaking memory");
+        return new ReturnStmt( noLabels, !exps.empty() ? exps.back() : nullptr, true );
 }
 

src/Parser/parser.cc

@@ -1 @@
-/* A Bison parser, made by GNU Bison 2.5.  */
+/* A Bison parser, made by GNU Bison 3.0.2.  */
 
 /* Bison implementation for Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
-   
+
+   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
@@ -27 +27 @@
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
@@ -45 +45 @@
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.5"
+#define YYBISON_VERSION "3.0.2"
 
 /* Skeleton name.  */
@@ -59 +59 @@
 #define YYPULL 1
 
-/* Using locations.  */
-#define YYLSP_NEEDED 0
 
 
 
 /* Copy the first part of user declarations.  */
-
-/* Line 268 of yacc.c  */
-#line 42 "parser.yy"
+#line 42 "parser.yy" /* yacc.c:339  */
 
 #define YYDEBUG_LEXER_TEXT (yylval)                                             // lexer loads this up each time
@@ -94 +90 @@
 } // appendStr
 
-
-/* Line 268 of yacc.c  */
-#line 99 "Parser/parser.cc"
-
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
+#line 93 "Parser/parser.cc" /* yacc.c:339  */
+
+# ifndef YY_NULLPTR
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULLPTR nullptr
+#  else
+#   define YY_NULLPTR 0
+#  endif
+# endif
 
 /* Enabling verbose error messages.  */
@@ -111 +108 @@
 #endif
 
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
+/* In a future release of Bison, this section will be replaced
+   by #include "y.tab.h".  */
+#ifndef YY_YY_Y_TAB_H_INCLUDED
+# define YY_YY_Y_TAB_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
 #endif
-
-
-/* Tokens.  */
+#if YYDEBUG
+extern int yydebug;
+#endif
+
+/* Token type.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     TYPEDEF = 258,
-     AUTO = 259,
-     EXTERN = 260,
-     REGISTER = 261,
-     STATIC = 262,
-     INLINE = 263,
-     FORTRAN = 264,
-     CONST = 265,
-     VOLATILE = 266,
-     RESTRICT = 267,
-     FORALL = 268,
-     LVALUE = 269,
-     VOID = 270,
-     CHAR = 271,
-     SHORT = 272,
-     INT = 273,
-     LONG = 274,
-     FLOAT = 275,
-     DOUBLE = 276,
-     SIGNED = 277,
-     UNSIGNED = 278,
-     VALIST = 279,
-     BOOL = 280,
-     COMPLEX = 281,
-     IMAGINARY = 282,
-     TYPEOF = 283,
-     LABEL = 284,
-     ENUM = 285,
-     STRUCT = 286,
-     UNION = 287,
-     OTYPE = 288,
-     FTYPE = 289,
-     DTYPE = 290,
-     TRAIT = 291,
-     SIZEOF = 292,
-     OFFSETOF = 293,
-     ATTRIBUTE = 294,
-     EXTENSION = 295,
-     IF = 296,
-     ELSE = 297,
-     SWITCH = 298,
-     CASE = 299,
-     DEFAULT = 300,
-     DO = 301,
-     WHILE = 302,
-     FOR = 303,
-     BREAK = 304,
-     CONTINUE = 305,
-     GOTO = 306,
-     RETURN = 307,
-     CHOOSE = 308,
-     DISABLE = 309,
-     ENABLE = 310,
-     FALLTHRU = 311,
-     TRY = 312,
-     CATCH = 313,
-     CATCHRESUME = 314,
-     FINALLY = 315,
-     THROW = 316,
-     THROWRESUME = 317,
-     AT = 318,
-     ASM = 319,
-     ALIGNAS = 320,
-     ALIGNOF = 321,
-     ATOMIC = 322,
-     GENERIC = 323,
-     NORETURN = 324,
-     STATICASSERT = 325,
-     THREADLOCAL = 326,
-     IDENTIFIER = 327,
-     QUOTED_IDENTIFIER = 328,
-     TYPEDEFname = 329,
-     TYPEGENname = 330,
-     ATTR_IDENTIFIER = 331,
-     ATTR_TYPEDEFname = 332,
-     ATTR_TYPEGENname = 333,
-     INTEGERconstant = 334,
-     FLOATINGconstant = 335,
-     CHARACTERconstant = 336,
-     STRINGliteral = 337,
-     ZERO = 338,
-     ONE = 339,
-     ARROW = 340,
-     ICR = 341,
-     DECR = 342,
-     LS = 343,
-     RS = 344,
-     LE = 345,
-     GE = 346,
-     EQ = 347,
-     NE = 348,
-     ANDAND = 349,
-     OROR = 350,
-     ELLIPSIS = 351,
-     MULTassign = 352,
-     DIVassign = 353,
-     MODassign = 354,
-     PLUSassign = 355,
-     MINUSassign = 356,
-     LSassign = 357,
-     RSassign = 358,
-     ANDassign = 359,
-     ERassign = 360,
-     ORassign = 361,
-     ATassign = 362,
-     THEN = 363
-   };
+  enum yytokentype
+  {
+    TYPEDEF = 258,
+    AUTO = 259,
+    EXTERN = 260,
+    REGISTER = 261,
+    STATIC = 262,
+    INLINE = 263,
+    FORTRAN = 264,
+    CONST = 265,
+    VOLATILE = 266,
+    RESTRICT = 267,
+    FORALL = 268,
+    LVALUE = 269,
+    VOID = 270,
+    CHAR = 271,
+    SHORT = 272,
+    INT = 273,
+    LONG = 274,
+    FLOAT = 275,
+    DOUBLE = 276,
+    SIGNED = 277,
+    UNSIGNED = 278,
+    VALIST = 279,
+    BOOL = 280,
+    COMPLEX = 281,
+    IMAGINARY = 282,
+    TYPEOF = 283,
+    LABEL = 284,
+    ENUM = 285,
+    STRUCT = 286,
+    UNION = 287,
+    OTYPE = 288,
+    FTYPE = 289,
+    DTYPE = 290,
+    TRAIT = 291,
+    SIZEOF = 292,
+    OFFSETOF = 293,
+    ATTRIBUTE = 294,
+    EXTENSION = 295,
+    IF = 296,
+    ELSE = 297,
+    SWITCH = 298,
+    CASE = 299,
+    DEFAULT = 300,
+    DO = 301,
+    WHILE = 302,
+    FOR = 303,
+    BREAK = 304,
+    CONTINUE = 305,
+    GOTO = 306,
+    RETURN = 307,
+    CHOOSE = 308,
+    DISABLE = 309,
+    ENABLE = 310,
+    FALLTHRU = 311,
+    TRY = 312,
+    CATCH = 313,
+    CATCHRESUME = 314,
+    FINALLY = 315,
+    THROW = 316,
+    THROWRESUME = 317,
+    AT = 318,
+    ASM = 319,
+    ALIGNAS = 320,
+    ALIGNOF = 321,
+    ATOMIC = 322,
+    GENERIC = 323,
+    NORETURN = 324,
+    STATICASSERT = 325,
+    THREADLOCAL = 326,
+    IDENTIFIER = 327,
+    QUOTED_IDENTIFIER = 328,
+    TYPEDEFname = 329,
+    TYPEGENname = 330,
+    ATTR_IDENTIFIER = 331,
+    ATTR_TYPEDEFname = 332,
+    ATTR_TYPEGENname = 333,
+    INTEGERconstant = 334,
+    FLOATINGconstant = 335,
+    CHARACTERconstant = 336,
+    STRINGliteral = 337,
+    ZERO = 338,
+    ONE = 339,
+    ARROW = 340,
+    ICR = 341,
+    DECR = 342,
+    LS = 343,
+    RS = 344,
+    LE = 345,
+    GE = 346,
+    EQ = 347,
+    NE = 348,
+    ANDAND = 349,
+    OROR = 350,
+    ELLIPSIS = 351,
+    MULTassign = 352,
+    DIVassign = 353,
+    MODassign = 354,
+    PLUSassign = 355,
+    MINUSassign = 356,
+    LSassign = 357,
+    RSassign = 358,
+    ANDassign = 359,
+    ERassign = 360,
+    ORassign = 361,
+    ATassign = 362,
+    THEN = 363
+  };
 #endif
 /* Tokens.  */
@@ -339 +341 @@
 #define THEN 363
 
-
-
-
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
+typedef union YYSTYPE YYSTYPE;
+union YYSTYPE
 {
-
-/* Line 293 of yacc.c  */
-#line 115 "parser.yy"
+#line 115 "parser.yy" /* yacc.c:355  */
 
         Token tok;
@@ -363 +362 @@
         bool flag;
 
-
-
-/* Line 293 of yacc.c  */
-#line 369 "Parser/parser.cc"
-} YYSTYPE;
+#line 365 "Parser/parser.cc" /* yacc.c:355  */
+};
 # define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
 
+extern YYSTYPE yylval;
+
+int yyparse (void);
+
+#endif /* !YY_YY_Y_TAB_H_INCLUDED  */
+
 /* Copy the second part of user declarations.  */
 
-
-/* Line 343 of yacc.c  */
-#line 381 "Parser/parser.cc"
+#line 380 "Parser/parser.cc" /* yacc.c:358  */
 
 #ifdef short
@@ -392 +391 @@
 #ifdef YYTYPE_INT8
 typedef YYTYPE_INT8 yytype_int8;
-#elif (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#else
 typedef signed char yytype_int8;
-#else
-typedef short int yytype_int8;
 #endif
 
@@ -416 +412 @@
 # elif defined size_t
 #  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+# elif ! defined YYSIZE_T
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
@@ -431 +426 @@
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
 #  endif
 # endif
 # ifndef YY_
-#  define YY_(msgid) msgid
+#  define YY_(Msgid) Msgid
 # endif
 #endif
 
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__                                               \
+      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+#  define YY_ATTRIBUTE(Spec) /* empty */
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#endif
+
+#if !defined _Noreturn \
+     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+# if defined _MSC_VER && 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
+# endif
+#endif
+
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__
-# define YYUSE(e) ((void) (e))
+# define YYUSE(E) ((void) (E))
 #else
-# define YYUSE(e) /* empty */
+# define YYUSE(E) /* empty */
 #endif
 
-/* Identity function, used to suppress warnings about constant conditions.  */
-#ifndef lint
-# define YYID(n) (n)
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
 #else
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int yyi)
-#else
-static int
-YYID (yyi)
-    int yyi;
+# define YY_INITIAL_VALUE(Value) Value
 #endif
-{
-  return yyi;
-}
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
 #endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
+#endif
+
 
 #if ! defined yyoverflow || YYERROR_VERBOSE
@@ -481 +505 @@
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
 #     ifndef EXIT_SUCCESS
 #      define EXIT_SUCCESS 0
@@ -493 +517 @@
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+   /* Pacify GCC's 'empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
     /* The OS might guarantee only one guard page at the bottom of the stack,
@@ -510 +534 @@
 #  if (defined __cplusplus && ! defined EXIT_SUCCESS \
        && ! ((defined YYMALLOC || defined malloc) \
-             && (defined YYFREE || defined free)))
+             && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 #   ifndef EXIT_SUCCESS
@@ -518 +542 @@
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined malloc && ! defined EXIT_SUCCESS
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
@@ -525 +548 @@
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined free && ! defined EXIT_SUCCESS
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
@@ -536 +558 @@
 #if (! defined yyoverflow \
      && (! defined __cplusplus \
-         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
@@ -561 +583 @@
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
-    do                                                                  \
-      {                                                                 \
-        YYSIZE_T yynewbytes;                                            \
-        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
-        Stack = &yyptr->Stack_alloc;                                    \
-        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-        yyptr += yynewbytes / sizeof (*yyptr);                          \
-      }                                                                 \
-    while (YYID (0))
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
+    do                                                                  \
+      {                                                                 \
+        YYSIZE_T yynewbytes;                                            \
+        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+        Stack = &yyptr->Stack_alloc;                                    \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                 \
+    while (0)
 
 #endif
 
 #if defined YYCOPY_NEEDED && YYCOPY_NEEDED
-/* Copy COUNT objects from FROM to TO.  The source and destination do
+/* Copy COUNT objects from SRC to DST.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY
 #  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
 #  else
-#   define YYCOPY(To, From, Count)              \
-      do                                        \
-        {                                       \
-          YYSIZE_T yyi;                         \
-          for (yyi = 0; yyi < (Count); yyi++)   \
-            (To)[yyi] = (From)[yyi];            \
-        }                                       \
-      while (YYID (0))
+#   define YYCOPY(Dst, Src, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (Dst)[yyi] = (Src)[yyi];            \
+        }                                       \
+      while (0)
 #  endif
 # endif
@@ -605 +627 @@
 /* YYNRULES -- Number of rules.  */
 #define YYNRULES  749
-/* YYNRULES -- Number of states.  */
+/* YYNSTATES -- Number of states.  */
 #define YYNSTATES  1553
 
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+   by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   363
 
-#define YYTRANSLATE(YYX)                                                \
+#define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, without out-of-bounds checking.  */
 static const yytype_uint8 yytranslate[] =
 {
@@ -658 +682 @@
 
 #if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const yytype_uint16 yyprhs[] =
-{
-       0,     0,     3,     4,     5,     7,     9,    11,    13,    15,
-      17,    19,    21,    23,    25,    27,    29,    31,    34,    36,
-      38,    42,    46,    48,    55,    60,    64,    72,    76,    84,
-      87,    90,    98,   103,   105,   109,   110,   112,   114,   118,
-     120,   124,   132,   136,   144,   146,   148,   150,   153,   156,
-     159,   162,   165,   168,   173,   176,   181,   188,   190,   195,
-     200,   202,   204,   206,   208,   210,   212,   214,   219,   224,
-     226,   230,   234,   238,   240,   244,   248,   250,   254,   258,
-     260,   264,   268,   272,   276,   278,   282,   286,   288,   292,
-     294,   298,   300,   304,   306,   310,   312,   316,   318,   324,
-     329,   335,   337,   339,   343,   346,   347,   349,   351,   353,
-     355,   357,   359,   361,   363,   365,   367,   369,   371,   374,
-     380,   387,   395,   397,   401,   403,   407,   408,   410,   412,
-     414,   416,   418,   420,   422,   424,   426,   433,   438,   441,
-     449,   451,   455,   457,   460,   462,   465,   467,   470,   473,
-     479,   487,   493,   503,   509,   519,   521,   525,   527,   529,
-     533,   537,   540,   542,   545,   548,   549,   551,   554,   558,
-     559,   561,   564,   568,   572,   577,   578,   580,   582,   585,
-     591,   599,   606,   613,   618,   622,   627,   630,   634,   637,
-     641,   645,   649,   653,   659,   663,   667,   672,   674,   680,
-     687,   693,   700,   710,   721,   731,   742,   745,   747,   750,
-     753,   756,   758,   765,   774,   785,   798,   813,   814,   816,
-     817,   819,   821,   825,   830,   838,   839,   841,   845,   847,
-     851,   853,   855,   857,   861,   863,   865,   867,   871,   872,
-     874,   878,   883,   885,   889,   891,   893,   897,   901,   905,
-     909,   913,   916,   920,   927,   931,   935,   940,   942,   945,
-     948,   952,   958,   967,   975,   983,   989,   999,  1002,  1005,
-    1011,  1015,  1021,  1026,  1030,  1035,  1040,  1048,  1052,  1056,
-    1060,  1064,  1069,  1076,  1078,  1080,  1082,  1084,  1086,  1088,
-    1090,  1092,  1093,  1095,  1097,  1100,  1102,  1104,  1106,  1108,
-    1110,  1112,  1114,  1115,  1121,  1123,  1126,  1130,  1132,  1135,
-    1137,  1139,  1141,  1143,  1145,  1147,  1149,  1151,  1153,  1155,
-    1157,  1159,  1161,  1163,  1165,  1167,  1169,  1171,  1173,  1175,
-    1177,  1179,  1182,  1185,  1189,  1193,  1195,  1199,  1201,  1204,
-    1207,  1210,  1215,  1220,  1225,  1230,  1232,  1235,  1238,  1242,
-    1244,  1247,  1250,  1252,  1255,  1258,  1262,  1264,  1267,  1270,
-    1272,  1274,  1279,  1282,  1283,  1290,  1298,  1301,  1304,  1307,
-    1308,  1311,  1314,  1318,  1321,  1325,  1327,  1330,  1334,  1337,
-    1340,  1345,  1346,  1348,  1351,  1354,  1356,  1357,  1359,  1362,
-    1365,  1371,  1374,  1375,  1383,  1386,  1391,  1392,  1395,  1396,
-    1398,  1400,  1402,  1408,  1414,  1420,  1422,  1428,  1434,  1444,
-    1446,  1452,  1453,  1455,  1457,  1463,  1465,  1467,  1473,  1479,
-    1481,  1485,  1489,  1494,  1496,  1498,  1500,  1502,  1505,  1507,
-    1511,  1515,  1517,  1520,  1522,  1526,  1528,  1530,  1532,  1534,
-    1536,  1538,  1540,  1542,  1544,  1546,  1548,  1551,  1553,  1555,
-    1557,  1560,  1561,  1564,  1567,  1569,  1574,  1575,  1577,  1580,
-    1584,  1589,  1592,  1595,  1597,  1600,  1603,  1609,  1615,  1623,
-    1630,  1632,  1635,  1638,  1642,  1644,  1647,  1650,  1655,  1658,
-    1663,  1664,  1669,  1672,  1674,  1676,  1678,  1679,  1682,  1688,
-    1694,  1708,  1710,  1712,  1716,  1720,  1723,  1727,  1731,  1734,
-    1739,  1741,  1748,  1758,  1759,  1771,  1773,  1777,  1781,  1785,
-    1787,  1789,  1795,  1798,  1804,  1805,  1807,  1809,  1813,  1814,
-    1816,  1818,  1820,  1822,  1823,  1830,  1833,  1835,  1838,  1843,
-    1846,  1850,  1854,  1858,  1863,  1869,  1875,  1881,  1888,  1890,
-    1892,  1894,  1898,  1899,  1905,  1906,  1908,  1910,  1913,  1920,
-    1922,  1926,  1927,  1929,  1934,  1936,  1938,  1940,  1942,  1945,
-    1947,  1950,  1953,  1955,  1959,  1962,  1966,  1970,  1973,  1978,
-    1983,  1987,  1996,  2000,  2003,  2005,  2008,  2015,  2024,  2028,
-    2031,  2035,  2039,  2044,  2049,  2053,  2055,  2057,  2059,  2064,
-    2071,  2075,  2078,  2082,  2086,  2091,  2096,  2100,  2103,  2105,
-    2108,  2111,  2113,  2117,  2120,  2124,  2128,  2131,  2136,  2141,
-    2145,  2152,  2161,  2165,  2168,  2170,  2173,  2176,  2179,  2183,
-    2187,  2190,  2195,  2200,  2204,  2211,  2220,  2224,  2227,  2229,
-    2232,  2235,  2237,  2239,  2242,  2246,  2250,  2253,  2258,  2265,
-    2274,  2276,  2279,  2282,  2284,  2287,  2290,  2294,  2298,  2300,
-    2305,  2310,  2314,  2320,  2329,  2333,  2336,  2340,  2342,  2348,
-    2354,  2361,  2368,  2370,  2373,  2376,  2378,  2381,  2384,  2388,
-    2392,  2394,  2399,  2404,  2408,  2414,  2423,  2427,  2429,  2432,
-    2434,  2437,  2444,  2450,  2457,  2465,  2473,  2475,  2478,  2481,
-    2483,  2486,  2489,  2493,  2497,  2499,  2504,  2509,  2513,  2522,
-    2526,  2528,  2530,  2533,  2535,  2537,  2540,  2544,  2547,  2551,
-    2554,  2558,  2562,  2565,  2570,  2574,  2577,  2581,  2584,  2589,
-    2593,  2596,  2603,  2610,  2617,  2625,  2627,  2630,  2632,  2634,
-    2636,  2639,  2643,  2646,  2650,  2653,  2657,  2661,  2666,  2669,
-    2673,  2678,  2681,  2687,  2693,  2700,  2707,  2708,  2710,  2711
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int16 yyrhs[] =
-{
-     301,     0,    -1,    -1,    -1,    79,    -1,    80,    -1,    81,
-      -1,    72,    -1,    76,    -1,   140,    -1,    72,    -1,    76,
-      -1,    72,    -1,   140,    -1,    83,    -1,    84,    -1,    82,
-      -1,   141,    82,    -1,    72,    -1,   140,    -1,   109,   169,
-     110,    -1,   109,   173,   110,    -1,   142,    -1,   143,   111,
-     134,   164,   135,   112,    -1,   143,   109,   144,   110,    -1,
-     143,   113,   139,    -1,   143,   113,   111,   134,   146,   135,
-     112,    -1,   143,    85,   139,    -1,   143,    85,   111,   134,
-     146,   135,   112,    -1,   143,    86,    -1,   143,    87,    -1,
-     109,   274,   110,   114,   278,   371,   115,    -1,   143,   114,
-     144,   115,    -1,   145,    -1,   144,   116,   145,    -1,    -1,
-     164,    -1,   147,    -1,   146,   116,   147,    -1,   139,    -1,
-     139,   113,   147,    -1,   139,   113,   111,   134,   146,   135,
-     112,    -1,   139,    85,   147,    -1,   139,    85,   111,   134,
-     146,   135,   112,    -1,   143,    -1,   136,    -1,   141,    -1,
-      40,   151,    -1,   149,   151,    -1,   150,   151,    -1,    86,
-     148,    -1,    87,   148,    -1,    37,   148,    -1,    37,   109,
-     274,   110,    -1,    66,   148,    -1,    66,   109,   274,   110,
-      -1,    38,   109,   274,   116,   139,   110,    -1,    76,    -1,
-      76,   109,   145,   110,    -1,    76,   109,   275,   110,    -1,
-     117,    -1,   118,    -1,   119,    -1,   120,    -1,   121,    -1,
-     122,    -1,   148,    -1,   109,   274,   110,   151,    -1,   109,
-     274,   110,   167,    -1,   151,    -1,   152,   117,   151,    -1,
-     152,   123,   151,    -1,   152,   124,   151,    -1,   152,    -1,
-     153,   119,   152,    -1,   153,   120,   152,    -1,   153,    -1,
-     154,    88,   153,    -1,   154,    89,   153,    -1,   154,    -1,
-     155,   125,   154,    -1,   155,   126,   154,    -1,   155,    90,
-     154,    -1,   155,    91,   154,    -1,   155,    -1,   156,    92,
-     155,    -1,   156,    93,   155,    -1,   156,    -1,   157,   118,
-     156,    -1,   157,    -1,   158,   127,   157,    -1,   158,    -1,
-     159,   128,   158,    -1,   159,    -1,   160,    94,   159,    -1,
-     160,    -1,   161,    95,   160,    -1,   161,    -1,   161,   129,
-     169,   130,   162,    -1,   161,   129,   130,   162,    -1,   161,
-     129,   169,   130,   167,    -1,   162,    -1,   162,    -1,   148,
-     166,   164,    -1,   167,   372,    -1,    -1,   164,    -1,   131,
-      -1,    97,    -1,    98,    -1,    99,    -1,   100,    -1,   101,
-      -1,   102,    -1,   103,    -1,   104,    -1,   105,    -1,   106,
-      -1,   111,   112,    -1,   111,   134,   164,   135,   112,    -1,
-     111,   134,   116,   168,   135,   112,    -1,   111,   134,   164,
-     116,   168,   135,   112,    -1,   165,    -1,   168,   116,   165,
-      -1,   164,    -1,   169,   116,   164,    -1,    -1,   169,    -1,
-     172,    -1,   173,    -1,   177,    -1,   178,    -1,   190,    -1,
-     192,    -1,   193,    -1,   198,    -1,   127,   143,   114,   144,
-     115,   132,    -1,    72,   130,   311,   171,    -1,   114,   115,
-      -1,   114,   134,   134,   209,   174,   135,   115,    -1,   175,
-      -1,   174,   134,   175,    -1,   212,    -1,    40,   212,    -1,
-     307,    -1,   171,   135,    -1,   171,    -1,   176,   171,    -1,
-     170,   132,    -1,    41,   109,   169,   110,   171,    -1,    41,
-     109,   169,   110,   171,    42,   171,    -1,    43,   109,   169,
-     110,   183,    -1,    43,   109,   169,   110,   114,   134,   205,
-     184,   115,    -1,    53,   109,   169,   110,   183,    -1,    53,
-     109,   169,   110,   114,   134,   205,   186,   115,    -1,   163,
-      -1,   163,    96,   163,    -1,   309,    -1,   179,    -1,   180,
-     116,   179,    -1,    44,   180,   130,    -1,    45,   130,    -1,
-     181,    -1,   182,   181,    -1,   182,   171,    -1,    -1,   185,
-      -1,   182,   176,    -1,   185,   182,   176,    -1,    -1,   187,
-      -1,   182,   189,    -1,   182,   176,   188,    -1,   187,   182,
-     189,    -1,   187,   182,   176,   188,    -1,    -1,   189,    -1,
-      56,    -1,    56,   132,    -1,    47,   109,   169,   110,   171,
-      -1,    46,   171,    47,   109,   169,   110,   132,    -1,    48,
-     109,   134,   191,   110,   171,    -1,   170,   135,   132,   170,
-     132,   170,    -1,   212,   170,   132,   170,    -1,    51,    72,
-     132,    -1,    51,   117,   169,   132,    -1,    50,   132,    -1,
-      50,    72,   132,    -1,    49,   132,    -1,    49,    72,   132,
-      -1,    52,   170,   132,    -1,    61,   165,   132,    -1,    62,
-     165,   132,    -1,    62,   165,    63,   164,   132,    -1,    57,
-     173,   194,    -1,    57,   173,   196,    -1,    57,   173,   194,
-     196,    -1,   195,    -1,    58,   109,    96,   110,   173,    -1,
-     195,    58,   109,    96,   110,   173,    -1,    59,   109,    96,
-     110,   173,    -1,   195,    59,   109,    96,   110,   173,    -1,
-      58,   109,   134,   134,   197,   135,   110,   173,   135,    -1,
-     195,    58,   109,   134,   134,   197,   135,   110,   173,   135,
-      -1,    59,   109,   134,   134,   197,   135,   110,   173,   135,
-      -1,   195,    59,   109,   134,   134,   197,   135,   110,   173,
-     135,    -1,    60,   173,    -1,   225,    -1,   225,   308,    -1,
-     225,   356,    -1,   365,   139,    -1,   365,    -1,    64,   199,
-     109,   141,   110,   132,    -1,    64,   199,   109,   141,   130,
-     200,   110,   132,    -1,    64,   199,   109,   141,   130,   200,
-     130,   200,   110,   132,    -1,    64,   199,   109,   141,   130,
-     200,   130,   200,   130,   203,   110,   132,    -1,    64,   199,
-      51,   109,   141,   130,   130,   200,   130,   203,   130,   204,
-     110,   132,    -1,    -1,    11,    -1,    -1,   201,    -1,   202,
-      -1,   201,   116,   202,    -1,   141,   109,   163,   110,    -1,
-     111,   163,   112,   141,   109,   163,   110,    -1,    -1,   141,
-      -1,   203,   116,   141,    -1,   139,    -1,   204,   116,   139,
-      -1,   135,    -1,   206,    -1,   212,    -1,   206,   134,   212,
-      -1,   135,    -1,   208,    -1,   222,    -1,   208,   134,   222,
-      -1,    -1,   210,    -1,    29,   211,   132,    -1,   210,    29,
-     211,   132,    -1,   273,    -1,   211,   116,   273,    -1,   213,
-      -1,   222,    -1,   214,   135,   132,    -1,   219,   135,   132,
-      -1,   216,   135,   132,    -1,   292,   135,   132,    -1,   295,
-     135,   132,    -1,   215,   276,    -1,   231,   215,   276,    -1,
-     214,   135,   116,   134,   271,   276,    -1,   366,   271,   310,
-      -1,   369,   271,   310,    -1,   227,   369,   271,   310,    -1,
-     217,    -1,   227,   217,    -1,   231,   217,    -1,   231,   227,
-     217,    -1,   216,   135,   116,   134,   271,    -1,   111,   112,
-     271,   109,   134,   259,   135,   110,    -1,   369,   271,   109,
-     134,   259,   135,   110,    -1,   218,   271,   109,   134,   259,
-     135,   110,    -1,   111,   134,   261,   135,   112,    -1,   111,
-     134,   261,   135,   116,   134,   262,   135,   112,    -1,     3,
-     215,    -1,     3,   217,    -1,   219,   135,   116,   134,   139,
-      -1,     3,   225,   308,    -1,   220,   135,   116,   134,   308,
-      -1,   227,     3,   225,   308,    -1,   225,     3,   308,    -1,
-     225,     3,   227,   308,    -1,     3,   139,   131,   164,    -1,
-     221,   135,   116,   134,   139,   131,   164,    -1,   223,   135,
-     132,    -1,   220,   135,   132,    -1,   221,   135,   132,    -1,
-     239,   135,   132,    -1,   224,   308,   310,   276,    -1,   223,
-     116,   311,   308,   310,   276,    -1,   235,    -1,   239,    -1,
-     241,    -1,   282,    -1,   236,    -1,   240,    -1,   242,    -1,
-     283,    -1,    -1,   227,    -1,   228,    -1,   227,   228,    -1,
-     229,    -1,   313,    -1,    10,    -1,    12,    -1,    11,    -1,
-      14,    -1,    67,    -1,    -1,    13,   109,   230,   285,   110,
-      -1,   232,    -1,   227,   232,    -1,   231,   227,   232,    -1,
-     233,    -1,   232,   233,    -1,     5,    -1,     7,    -1,     4,
-      -1,     6,    -1,     8,    -1,     9,    -1,    69,    -1,    71,
-      -1,    16,    -1,    21,    -1,    20,    -1,    18,    -1,    19,
-      -1,    17,    -1,    22,    -1,    23,    -1,    15,    -1,    25,
-      -1,    26,    -1,    27,    -1,    24,    -1,   236,    -1,   231,
-     236,    -1,   235,   233,    -1,   235,   233,   227,    -1,   235,
-     233,   236,    -1,   237,    -1,   226,   238,   226,    -1,   234,
-      -1,   227,   234,    -1,   237,   228,    -1,   237,   234,    -1,
-      28,   109,   275,   110,    -1,    28,   109,   169,   110,    -1,
-      78,   109,   275,   110,    -1,    78,   109,   169,   110,    -1,
-     240,    -1,   231,   240,    -1,   239,   233,    -1,   239,   233,
-     227,    -1,   243,    -1,   227,   243,    -1,   240,   228,    -1,
-     242,    -1,   231,   242,    -1,   241,   233,    -1,   241,   233,
-     227,    -1,    74,    -1,   227,    74,    -1,   242,   228,    -1,
-     244,    -1,   255,    -1,   246,   114,   247,   115,    -1,   246,
-     273,    -1,    -1,   246,   273,   245,   114,   247,   115,    -1,
-     246,   109,   291,   110,   114,   247,   115,    -1,   246,   284,
-      -1,    31,   311,    -1,    32,   311,    -1,    -1,   247,   248,
-      -1,   249,   132,    -1,    40,   249,   132,    -1,   250,   132,
-      -1,    40,   250,   132,    -1,   365,    -1,   365,   273,    -1,
-     249,   116,   273,    -1,   249,   116,    -1,   225,   251,    -1,
-     250,   116,   311,   251,    -1,    -1,   253,    -1,   317,   252,
-      -1,   330,   252,    -1,   356,    -1,    -1,   253,    -1,   130,
-     163,    -1,    30,   311,    -1,   254,   114,   257,   371,   115,
-      -1,   254,   273,    -1,    -1,   254,   273,   256,   114,   257,
-     371,   115,    -1,   273,   258,    -1,   257,   116,   273,   258,
-      -1,    -1,   131,   163,    -1,    -1,   260,    -1,   262,    -1,
-     261,    -1,   261,   135,   116,   134,   262,    -1,   262,   135,
-     116,   134,    96,    -1,   261,   135,   116,   134,    96,    -1,
-     266,    -1,   262,   135,   116,   134,   266,    -1,   261,   135,
-     116,   134,   266,    -1,   261,   135,   116,   134,   262,   135,
-     116,   134,   266,    -1,   267,    -1,   262,   135,   116,   134,
-     267,    -1,    -1,   264,    -1,   265,    -1,   265,   135,   116,
-     134,    96,    -1,   269,    -1,   268,    -1,   265,   135,   116,
-     134,   269,    -1,   265,   135,   116,   134,   268,    -1,   268,
-      -1,   361,   271,   372,    -1,   369,   271,   372,    -1,   227,
-     369,   271,   372,    -1,   217,    -1,   269,    -1,   361,    -1,
-     369,    -1,   227,   369,    -1,   370,    -1,   224,   335,   372,
-      -1,   224,   339,   372,    -1,   224,    -1,   224,   350,    -1,
-     139,    -1,   270,   116,   139,    -1,   137,    -1,    74,    -1,
-      75,    -1,   138,    -1,    74,    -1,    75,    -1,   139,    -1,
-      74,    -1,    75,    -1,   365,    -1,   225,    -1,   225,   356,
-      -1,   365,    -1,   370,    -1,   225,    -1,   225,   344,    -1,
-      -1,   131,   277,    -1,   107,   277,    -1,   164,    -1,   114,
-     278,   371,   115,    -1,    -1,   277,    -1,   279,   277,    -1,
-     278,   116,   277,    -1,   278,   116,   279,   277,    -1,   280,
-     130,    -1,   273,   130,    -1,   281,    -1,   280,   281,    -1,
-     113,   273,    -1,   111,   134,   164,   135,   112,    -1,   111,
-     134,   309,   135,   112,    -1,   111,   134,   163,    96,   163,
-     135,   112,    -1,   113,   111,   134,   146,   135,   112,    -1,
-     283,    -1,   231,   283,    -1,   282,   233,    -1,   282,   233,
-     227,    -1,   284,    -1,   227,   284,    -1,   283,   228,    -1,
-      75,   109,   291,   110,    -1,   286,   372,    -1,   285,   116,
-     286,   372,    -1,    -1,   288,   273,   287,   289,    -1,   225,
-     335,    -1,    33,    -1,    35,    -1,    34,    -1,    -1,   289,
-     290,    -1,   128,   273,   109,   291,   110,    -1,   128,   114,
-     134,   297,   115,    -1,   128,   109,   134,   285,   135,   110,
-     114,   134,   297,   115,   109,   291,   110,    -1,   275,    -1,
-     164,    -1,   291,   116,   275,    -1,   291,   116,   164,    -1,
-      33,   293,    -1,   232,    33,   293,    -1,   292,   116,   293,
-      -1,   294,   289,    -1,   294,   289,   131,   275,    -1,   273,
-      -1,   272,   109,   134,   285,   135,   110,    -1,    36,   273,
-     109,   134,   285,   135,   110,   114,   115,    -1,    -1,    36,
-     273,   109,   134,   285,   135,   110,   114,   296,   297,   115,
-      -1,   298,    -1,   297,   134,   298,    -1,   299,   135,   132,
-      -1,   300,   135,   132,    -1,   215,    -1,   217,    -1,   299,
-     135,   116,   134,   271,    -1,   225,   308,    -1,   300,   135,
-     116,   134,   308,    -1,    -1,   302,    -1,   304,    -1,   302,
-     134,   304,    -1,    -1,   302,    -1,   212,    -1,   306,    -1,
-     198,    -1,    -1,     5,    82,   305,   114,   303,   115,    -1,
-      40,   304,    -1,   307,    -1,   322,   173,    -1,   326,   134,
-     207,   173,    -1,   216,   173,    -1,   224,   322,   173,    -1,
-     227,   322,   173,    -1,   231,   322,   173,    -1,   231,   227,
-     322,   173,    -1,   224,   326,   134,   207,   173,    -1,   227,
-     326,   134,   207,   173,    -1,   231,   326,   134,   207,   173,
-      -1,   231,   227,   326,   134,   207,   173,    -1,   317,    -1,
-     330,    -1,   322,    -1,   163,   122,   163,    -1,    -1,    64,
-     109,   141,   110,   311,    -1,    -1,   312,    -1,   313,    -1,
-     312,   313,    -1,    39,   109,   109,   314,   110,   110,    -1,
-     315,    -1,   314,   116,   315,    -1,    -1,   316,    -1,   316,
-     109,   170,   110,    -1,   271,    -1,   233,    -1,   234,    -1,
-     228,    -1,   318,   311,    -1,   319,    -1,   320,   311,    -1,
-     321,   311,    -1,   137,    -1,   109,   318,   110,    -1,   149,
-     317,    -1,   149,   227,   317,    -1,   109,   319,   110,    -1,
-     318,   348,    -1,   109,   319,   110,   348,    -1,   109,   320,
-     110,   349,    -1,   109,   320,   110,    -1,   109,   319,   110,
-     109,   134,   263,   135,   110,    -1,   109,   321,   110,    -1,
-     323,   311,    -1,   324,    -1,   325,   311,    -1,   318,   109,
-     134,   263,   135,   110,    -1,   109,   324,   110,   109,   134,
-     263,   135,   110,    -1,   109,   323,   110,    -1,   149,   322,
-      -1,   149,   227,   322,    -1,   109,   324,   110,    -1,   109,
-     324,   110,   348,    -1,   109,   325,   110,   349,    -1,   109,
-     325,   110,    -1,   327,    -1,   328,    -1,   329,    -1,   318,
-     109,   270,   110,    -1,   109,   328,   110,   109,   270,   110,
-      -1,   109,   327,   110,    -1,   149,   326,    -1,   149,   227,
-     326,    -1,   109,   328,   110,    -1,   109,   328,   110,   348,
-      -1,   109,   329,   110,   349,    -1,   109,   329,   110,    -1,
-     331,   311,    -1,   332,    -1,   333,   311,    -1,   334,   311,
-      -1,   340,    -1,   109,   331,   110,    -1,   149,   330,    -1,
-     149,   227,   330,    -1,   109,   332,   110,    -1,   331,   348,
-      -1,   109,   332,   110,   348,    -1,   109,   333,   110,   349,
-      -1,   109,   333,   110,    -1,   331,   109,   134,   263,   135,
-     110,    -1,   109,   332,   110,   109,   134,   263,   135,   110,
-      -1,   109,   334,   110,    -1,   318,   311,    -1,   336,    -1,
-     337,   311,    -1,   338,   311,    -1,   149,   335,    -1,   149,
-     227,   335,    -1,   109,   336,   110,    -1,   318,   354,    -1,
-     109,   336,   110,   348,    -1,   109,   337,   110,   349,    -1,
-     109,   337,   110,    -1,   318,   109,   134,   263,   135,   110,
-      -1,   109,   336,   110,   109,   134,   263,   135,   110,    -1,
-     109,   338,   110,    -1,   340,   311,    -1,   341,    -1,   342,
-     311,    -1,   343,   311,    -1,    74,    -1,    75,    -1,   149,
-     339,    -1,   149,   227,   339,    -1,   109,   341,   110,    -1,
-     340,   354,    -1,   109,   341,   110,   354,    -1,   340,   109,
-     134,   263,   135,   110,    -1,   109,   341,   110,   109,   134,
-     263,   135,   110,    -1,   345,    -1,   346,   311,    -1,   347,
-     311,    -1,   149,    -1,   149,   227,    -1,   149,   344,    -1,
-     149,   227,   344,    -1,   109,   345,   110,    -1,   348,    -1,
-     109,   345,   110,   348,    -1,   109,   346,   110,   349,    -1,
-     109,   346,   110,    -1,   109,   134,   263,   135,   110,    -1,
-     109,   345,   110,   109,   134,   263,   135,   110,    -1,   109,
-     347,   110,    -1,   111,   112,    -1,   111,   112,   349,    -1,
-     349,    -1,   111,   134,   164,   135,   112,    -1,   111,   134,
-     117,   135,   112,    -1,   349,   111,   134,   164,   135,   112,
-      -1,   349,   111,   134,   117,   135,   112,    -1,   351,    -1,
-     352,   311,    -1,   353,   311,    -1,   149,    -1,   149,   227,
-      -1,   149,   350,    -1,   149,   227,   350,    -1,   109,   351,
-     110,    -1,   354,    -1,   109,   351,   110,   354,    -1,   109,
-     352,   110,   349,    -1,   109,   352,   110,    -1,   109,   134,
-     263,   135,   110,    -1,   109,   351,   110,   109,   134,   263,
-     135,   110,    -1,   109,   353,   110,    -1,   355,    -1,   355,
-     349,    -1,   349,    -1,   111,   112,    -1,   111,   134,   227,
-     117,   135,   112,    -1,   111,   134,   227,   135,   112,    -1,
-     111,   134,   227,   164,   135,   112,    -1,   111,   134,     7,
-     226,   164,   135,   112,    -1,   111,   134,   227,     7,   164,
-     135,   112,    -1,   357,    -1,   358,   311,    -1,   359,   311,
-      -1,   149,    -1,   149,   227,    -1,   149,   356,    -1,   149,
-     227,   356,    -1,   109,   357,   110,    -1,   348,    -1,   109,
-     357,   110,   348,    -1,   109,   358,   110,   349,    -1,   109,
-     358,   110,    -1,   109,   357,   110,   109,   134,   263,   135,
-     110,    -1,   109,   359,   110,    -1,   361,    -1,   369,    -1,
-     227,   369,    -1,   362,    -1,   363,    -1,   149,   225,    -1,
-     227,   149,   225,    -1,   149,   370,    -1,   227,   149,   370,
-      -1,   149,   360,    -1,   227,   149,   360,    -1,   111,   112,
-     225,    -1,   364,   225,    -1,   111,   112,   349,   225,    -1,
-     364,   349,   225,    -1,   349,   225,    -1,   111,   112,   362,
-      -1,   364,   362,    -1,   111,   112,   349,   362,    -1,   364,
-     349,   362,    -1,   349,   362,    -1,   111,   134,   227,   117,
-     135,   112,    -1,   111,   134,   227,   164,   135,   112,    -1,
-     111,   134,   231,   164,   135,   112,    -1,   111,   134,   231,
-     227,   164,   135,   112,    -1,   369,    -1,   227,   369,    -1,
-     366,    -1,   367,    -1,   368,    -1,   149,   225,    -1,   227,
-     149,   225,    -1,   149,   370,    -1,   227,   149,   370,    -1,
-     149,   365,    -1,   227,   149,   365,    -1,   111,   112,   225,
-      -1,   111,   112,   349,   225,    -1,   349,   225,    -1,   111,
-     112,   367,    -1,   111,   112,   349,   367,    -1,   349,   367,
-      -1,   111,   134,   262,   135,   112,    -1,   111,   112,   109,
-     259,   110,    -1,   369,   109,   134,   259,   135,   110,    -1,
-     218,   109,   134,   259,   135,   110,    -1,    -1,   116,    -1,
-      -1,   131,   164,    -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
@@ -1097 +763 @@
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+#if YYDEBUG || YYERROR_VERBOSE || 0
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
@@ -1205 +871 @@
   "new_abstract_declarator_no_tuple", "new_abstract_ptr",
   "new_abstract_array", "new_abstract_tuple", "new_abstract_function",
-  "comma_opt", "assignment_opt", 0
+  "comma_opt", "assignment_opt", YY_NULLPTR
 };
 #endif
 
 # ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-   token YYLEX-NUM.  */
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
 static const yytype_uint16 yytoknum[] =
 {
@@ -1231 +897 @@
 # endif
 
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint16 yyr1[] =
+#define YYPACT_NINF -1317
+
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-1317)))
+
+#define YYTABLE_NINF -520
+
+#define yytable_value_is_error(Yytable_value) \
+  0
+
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
+static const yytype_int16 yypact[] =
 {
-       0,   133,   134,   135,   136,   136,   136,   137,   137,   137,
-     138,   138,   139,   139,   140,   140,   141,   141,   142,   142,
-     142,   142,   143,   143,   143,   143,   143,   143,   143,   143,
-     143,   143,   143,   144,   144,   145,   145,   146,   146,   147,
-     147,   147,   147,   147,   148,   148,   148,   148,   148,   148,
-     148,   148,   148,   148,   148,   148,   148,   148,   148,   148,
-     149,   149,   150,   150,   150,   150,   151,   151,   151,   152,
-     152,   152,   152,   153,   153,   153,   154,   154,   154,   155,
-     155,   155,   155,   155,   156,   156,   156,   157,   157,   158,
-     158,   159,   159,   160,   160,   161,   161,   162,   162,   162,
-     162,   163,   164,   164,   164,   165,   165,   166,   166,   166,
-     166,   166,   166,   166,   166,   166,   166,   166,   167,   167,
-     167,   167,   168,   168,   169,   169,   170,   170,   171,   171,
-     171,   171,   171,   171,   171,   171,   171,   172,   173,   173,
-     174,   174,   175,   175,   175,   175,   176,   176,   177,   178,
-     178,   178,   178,   178,   178,   179,   179,   179,   180,   180,
-     181,   181,   182,   182,   183,   184,   184,   185,   185,   186,
-     186,   187,   187,   187,   187,   188,   188,   189,   189,   190,
-     190,   190,   191,   191,   192,   192,   192,   192,   192,   192,
-     192,   192,   192,   192,   193,   193,   193,   194,   194,   194,
-     194,   194,   195,   195,   195,   195,   196,   197,   197,   197,
-     197,   197,   198,   198,   198,   198,   198,   199,   199,   200,
-     200,   201,   201,   202,   202,   203,   203,   203,   204,   204,
-     205,   205,   206,   206,   207,   207,   208,   208,   209,   209,
-     210,   210,   211,   211,   212,   212,   213,   213,   213,   213,
-     213,   214,   214,   214,   215,   215,   215,   216,   216,   216,
-     216,   216,   217,   217,   217,   218,   218,   219,   219,   219,
-     220,   220,   220,   220,   220,   221,   221,   222,   222,   222,
-     222,   223,   223,   224,   224,   224,   224,   225,   225,   225,
-     225,   226,   226,   227,   227,   228,   228,   229,   229,   229,
-     229,   229,   230,   229,   231,   231,   231,   232,   232,   233,
-     233,   233,   233,   233,   233,   233,   233,   234,   234,   234,
-     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
-     235,   235,   235,   235,   235,   236,   236,   237,   237,   237,
-     237,   238,   238,   238,   238,   239,   239,   239,   239,   240,
-     240,   240,   241,   241,   241,   241,   242,   242,   242,   243,
-     243,   244,   244,   245,   244,   244,   244,   246,   246,   247,
-     247,   248,   248,   248,   248,   249,   249,   249,   249,   250,
-     250,   251,   251,   251,   251,   251,   252,   252,   253,   254,
-     255,   255,   256,   255,   257,   257,   258,   258,   259,   259,
-     260,   260,   260,   260,   260,   261,   261,   261,   261,   262,
-     262,   263,   263,   264,   264,   265,   265,   265,   265,   266,
-     266,   266,   266,   266,   267,   267,   267,   267,   267,   268,
-     268,   269,   269,   270,   270,   271,   271,   271,   272,   272,
-     272,   273,   273,   273,   274,   274,   274,   275,   275,   275,
-     275,   276,   276,   276,   277,   277,   278,   278,   278,   278,
-     278,   279,   279,   280,   280,   281,   281,   281,   281,   281,
-     282,   282,   282,   282,   283,   283,   283,   284,   285,   285,
-     287,   286,   286,   288,   288,   288,   289,   289,   290,   290,
-     290,   291,   291,   291,   291,   292,   292,   292,   293,   293,
-     294,   294,   295,   296,   295,   297,   297,   298,   298,   299,
-     299,   299,   300,   300,   301,   301,   302,   302,   303,   303,
-     304,   304,   304,   305,   304,   304,   306,   306,   306,   307,
-     307,   307,   307,   307,   307,   307,   307,   307,   308,   308,
-     308,   309,   310,   310,   311,   311,   312,   312,   313,   314,
-     314,   315,   315,   315,   316,   316,   316,   316,   317,   317,
-     317,   317,   318,   318,   319,   319,   319,   320,   320,   320,
-     320,   321,   321,   322,   322,   322,   323,   323,   323,   324,
-     324,   324,   325,   325,   325,   326,   326,   326,   327,   327,
-     327,   328,   328,   328,   329,   329,   329,   330,   330,   330,
-     330,   331,   331,   332,   332,   332,   333,   333,   333,   333,
-     334,   334,   334,   335,   335,   335,   335,   336,   336,   336,
-     337,   337,   337,   337,   338,   338,   338,   339,   339,   339,
-     339,   340,   340,   341,   341,   341,   342,   342,   343,   343,
-     344,   344,   344,   345,   345,   345,   345,   345,   346,   346,
-     346,   346,   347,   347,   347,   348,   348,   348,   349,   349,
-     349,   349,   350,   350,   350,   351,   351,   351,   351,   351,
-     352,   352,   352,   352,   353,   353,   353,   354,   354,   354,
-     355,   355,   355,   355,   355,   355,   356,   356,   356,   357,
-     357,   357,   357,   357,   358,   358,   358,   358,   359,   359,
-     360,   360,   360,   361,   361,   362,   362,   362,   362,   362,
-     362,   363,   363,   363,   363,   363,   363,   363,   363,   363,
-     363,   364,   364,   364,   364,   365,   365,   365,   366,   366,
-     367,   367,   367,   367,   367,   367,   368,   368,   368,   368,
-     368,   368,   369,   370,   370,   370,   371,   371,   372,   372
+    7252,  8635, -1317,    -3, -1317, -1317, -1317, -1317, -1317, -1317,
+   -1317,    23, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317,
+   -1317, -1317, -1317, -1317, -1317, -1317,    81,    81,    81,  1277,
+     970,   104,  7368,   277, -1317, -1317, -1317, -1317, -1317,   201,
+   -1317, -1317, -1317,  1047,   187, -1317, -1317, -1317, -1317,  5370,
+   -1317, -1317, -1317, -1317,    35,    48, -1317,  1328, -1317, -1317,
+   -1317, -1317,   235,  1663,   343,    98,  7484, -1317, -1317,  6174,
+    1066, -1317, -1317,   536,   376,  5540,   978,  1631,   536,  1775,
+   -1317, -1317,   477,   683, -1317,   536,  1892, -1317,   295, -1317,
+     422,   489, -1317, -1317, -1317, -1317,   346,    48,    81, -1317,
+      81, -1317, -1317, -1317, -1317,  9392,  1328, -1317, -1317,  1328,
+   -1317,   321, -1317,  9431, -1317, -1317,  2250,  9501, -1317,   668,
+     668,   668, -1317, -1317, -1317,    81, -1317, -1317, -1317,   373,
+     399,   410, -1317, -1317, -1317,   420, -1317, -1317, -1317, -1317,
+   -1317,   428,   450, -1317, -1317,    59,  8604,  2904,   144,   440,
+     493,   498,   531,   544,   560,  8522,  6772,   510,   580, -1317,
+    9114, -1317, -1317, -1317, -1317,   584, -1317,   153,  4280,  4280,
+   -1317,   570,   283, -1317, -1317, -1317, -1317,   596,   288,   303,
+     332,    81,   583, -1317, -1317,  1663,  2232,   648, -1317,    73,
+   -1317,    81,    81,    48, -1317, -1317,    80, -1317,    81,    81,
+   -1317,  3694,   599,   613,   668,  6565, -1317, -1317,   661,  5370,
+   -1317, -1317,   536, -1317, -1317, -1317,    48, -1317,  1328,    35,
+   -1317,  7675, -1317,   668,   668,   668,    48, -1317,  1277, -1317,
+    5446, -1317, -1317,   620,   668, -1317,   668, -1317,   201,  8604,
+   -1317,   673, -1317,   970,   692,   668, -1317,  1277,   697,   707,
+   -1317,  7368,   576, -1317, -1317, -1317,  4822, -1317, -1317,  9720,
+   -1317,   648,   165, 10347,  9501,  2250,  3694, -1317,   109, -1317,
+   -1317,  9431,  1328,   743,  7515, -1317, -1317,   306, -1317, 10675,
+     770,   800,  2676,   801, 10480, 10499, -1317,   813, -1317, -1317,
+   -1317, -1317, 10556, 10556,  8378,   795, -1317, -1317, -1317, -1317,
+   -1317, -1317,   842, -1317,   685,  1919,  8717, 10480, -1317,   652,
+     325,   507,   317,   581,   826,   820,   823,   861,   111, -1317,
+   -1317,   827,   703, -1317,   452, -1317, -1317,  2904, -1317, -1317,
+     278,   856, -1317,   636,   856,   866,   201, -1317, -1317,   872,
+    9392, -1317,   876,   887,  8830, -1317, -1317,  1020,  2049,  8093,
+    6565,   536, -1317,   536,   668,   668, -1317, -1317, -1317, -1317,
+   -1317, -1317,   668,  9392,  1328, -1317, -1317,  9540,  1233, -1317,
+    7824, -1317, -1317, -1317, -1317, -1317, -1317, -1317,   891,  4627,
+   10480, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317,
+   -1317, -1317, -1317, -1317, -1317,  2250, -1317,   552,   901,   904,
+     912,   862,   920,   922,   924,  2232, -1317, -1317,   932,    35,
+     936, -1317, -1317,   939, -1317, -1317, -1317,  4822, -1317, -1317,
+   -1317, -1317, -1317,  3694, -1317,  8604,  8604, -1317,   668,  2250,
+    6684,  1328,  8166, -1317, -1317, -1317, -1317,  4822,   165, -1317,
+   -1317,   536,    48, -1317, -1317,  4822, -1317,  6449, -1317, -1317,
+     668,   668,   484,  8011,   938,   941,   931,   952,   668, -1317,
+   -1317, -1317, -1317,  9797, -1317,   578,  6327, -1317,    48,   955,
+   -1317,  2250, 10757, 10404, -1317, -1317, -1317, -1317,   881,  3694,
+   -1317,  8239,   648,  3545, -1317, -1317, -1317,  1641,   586,   827,
+     970,  7515,   592,  9431, -1317,  7515, -1317, -1317, -1317, -1317,
+     603, -1317,   967,   800,   215,  8378, -1317,  9570, -1317, -1317,
+    8378, -1317,  8491,  8378, -1317, -1317,   966, -1317,   617,   973,
+     839,   983, -1317, -1317,  9253,  6415, -1317,   247, -1317, -1317,
+   10347, -1317,   330, 10347, -1317, -1317, -1317, -1317, -1317, -1317,
+   -1317, -1317, -1317, -1317, -1317, 10347, -1317, -1317, 10480, 10480,
+   10480, 10480, 10480, 10480, 10480, 10480, 10480, 10480, 10480, 10480,
+   10480, 10480, 10480, 10480, 10480, 10480,  4526, 10347, -1317,   703,
+     751, -1317, -1317,    81,    81, -1317, -1317,  8604, -1317, -1317,
+     939,   576, -1317,   939, 10423, -1317, -1317, -1317,  8975,  6415,
+     968,   976, -1317,  9501, -1317, -1317,   584, -1317,   990,   769,
+     999,  3014,   124,   827, -1317,    81,    81,   827,   125, -1317,
+      81,    81,   939, -1317, -1317,    81,    81, -1317,   856,  9652,
+    1328, 10902,   151,   358,  9652, -1317,  9720, -1317,   827, -1317,
+    9392, -1317,   147,  7790,  7790,  7790,  1328, -1317,  5708,   982,
+     891,  1167,   995,   996, -1317,  1011,  4280,   230, -1317,  1103,
+    1328,  7790,   576,  2250,   576,   648,   671,   856, -1317, -1317,
+     694,   856, -1317, -1317, -1317,   800, -1317,   856,    48,  9797,
+   -1317,   621,  1024,   640,  1026, -1317,  1030,    48, -1317, -1317,
+    4822,    48,  1032,  9570,  1037, -1317,  1585, -1317,   335,   390,
+     970, -1317,   970,  1023, 10480, -1317,   970, 10902, -1317, -1317,
+    1034, -1317, -1317, -1317,   576, -1317, 10830,   887, -1317,  7790,
+     859,  8093, -1317, -1317,   584,  1025,  1036,  1641,  3247, -1317,
+   -1317,  7515, -1317, -1317,  1039, -1317, -1317,  1043, -1317,  1039,
+    1048, 10675, 10347,    67,  1027,   133,  1053,  1061,  1068,  1069,
+   -1317,  1072,  1074,  9362,  6534, -1317, 10347, -1317,   839,  2140,
+   -1317, -1317, -1317,    81,    81, 10290, 10347,  1070, -1317, -1317,
+     675, -1317, 10347, -1317, -1317,   644, -1317, -1317, -1317, -1317,
+     652,   652,   325,   325,   507,   507,   507,   507,   317,   317,
+     581,   826,   820,   823,   861, 10480,   333, -1317,  9797,  1079,
+    1080,  1081,   751, -1317, -1317, -1317, -1317, -1317,  9797,   700,
+    7790, -1317,  9392, -1317,  6891,  8943, -1317,  7824,  6772, -1317,
+   -1317,   769,  9797,   917,  1082,  1083,  1084,  1087,  1088,  1089,
+    1091, -1317,  4955,  3014, -1317, -1317, -1317, -1317, -1317, -1317,
+   -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317,
+   -1317,   939, -1317, -1317, -1317,   827, -1317, -1317, -1317, -1317,
+   -1317, -1317, -1317, -1317,  1098, -1317,  1099,  1101, -1317, -1317,
+      35,  1070,  5708, -1317, -1317, -1317,  4627,  1102, -1317, -1317,
+   -1317, -1317,   970,  5944,  1191, -1317, -1317, -1317, -1317,  1094,
+      35, -1317, -1317,   939, -1317, -1317,   939,    24,   939, -1317,
+   -1317, -1317, -1317, -1317, -1317,  9223, -1317,    48, -1317, -1317,
+     432,   441,  9540,  7010,  2348, 10480,  3377, -1317, -1317,  1092,
+      94,  1092, -1317,   970, -1317,    81, -1317, -1317,  8748,   931,
+   -1317, -1317, -1317,   941,  1116,  1111, -1317, -1317,  1118,  1119,
+   -1317,   859,  2430, -1317,   455, -1317,  3247,   827, -1317,  1122,
+    7515,  9682,  8604,  1125, -1317, -1317,  1130,  1135,  1124, -1317,
+   10480,   166,   222,  1132, -1317,  1138,   576,  1138, -1317, -1317,
+    1138,  1137, -1317,  1145,  1147,  1148,  2140, -1317, -1317, -1317,
+    4627, -1317, -1317, -1317, -1317,  1143, 10347,  1149,   576, -1317,
+   10347, -1317,   576, -1317, -1317, 10347, -1317,   721,   856, -1317,
+   -1317, -1317, -1317, -1317, -1317, -1317,   891,   887,  8830, -1317,
+   -1317,  7129,  1152, -1317,   731,   856, -1317,   745,   763,   856,
+   -1317,   668,  5561, -1317, -1317, -1317,  9797,  9797, -1317,  8166,
+    8166, -1317,  1154,  1156,  1153,  1155, -1317,  1168,   460,   196,
+    1070, -1317,   576, -1317,  4280, -1317, 10347,   474, -1317,  6296,
+    1159,  1170, 10233,  1172,  1175,   -14,     3,    11, 10347,  1179,
+      48, 10347, 10347,  1160,  1177,   282,  1161, -1317, -1317, -1317,
+    1180, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317,
+     970,  1184, 10347, -1317,  9797,  9797,    81,  1188, -1317,  8861,
+   -1317, -1317,   809, -1317,  3377, -1317, -1317, -1317, -1317,  1585,
+   -1317, -1317,  1185, -1317, -1317, -1317, -1317,  1193,  2430, -1317,
+   -1317,  1176, -1317,  1039, -1317, -1317,  2250,  1196, -1317, -1317,
+   -1317,   709,  1198, -1317,   133,  1202, 10480,  1186,   133,   133,
+    1211,  9253,   789,   856, -1317, -1317,  1011, 10347,  1214,  1143,
+     505,   224,  1217, -1317, -1317,  1218,  1217, -1317, -1317,  1226,
+   -1317, -1317,   939,  1228,  1230,  6653,  1231,  1232,  1243, -1317,
+   -1317,  1246, -1317, -1317,   939, -1317, -1317, -1317, -1317,   939,
+   10347, 10347,   887,  1245, -1317, -1317, -1317, -1317, -1317, -1317,
+   -1317, -1317, -1317, -1317, -1317, -1317, 10480, 10480,  1247,  1251,
+    1217, -1317, -1317,   970, -1317, -1317, -1317,  4468,  9682, 10347,
+   10347,  1311, 10347, -1317,  1234, -1317,  1237, -1317,  1239, 10347,
+    1241, 10347,  1049,  1244,    26,    81,  9084,   750, -1317, -1317,
+    5944,  1267,   481, -1317, -1317, -1317, -1317, -1317, -1317, -1317,
+   -1317, -1317, 10053, -1317,  8239,  1274, -1317, -1317,  9682,   482,
+     512, -1317,  1272,  1259,   800,  1280, -1317,   245, -1317, -1317,
+   -1317, -1317,   939,  1279, -1317, -1317,  1287,   385,   444,   576,
+    1293, -1317,  1294, -1317,  9797, -1317, -1317, -1317, -1317, -1317,
+    1295, -1317,  9797,  9797,  9797, -1317, -1317,  1297, -1317,  1298,
+    1282,  1305,   511,  7863,  7978, -1317, -1317,   348, -1317,  1304,
+    1310, -1317,  8312,   712,   734,  1308,   739,  6143, -1317, -1317,
+   -1317,   515, -1317,   765,  1318,  1320,    48,  1371,   879, -1317,
+   -1317, 10347, -1317, 10233, 10347, -1317, -1317, -1317,  1322,  1329,
+   -1317, -1317, -1317,  1324, -1317, -1317, -1317, -1317, -1317, -1317,
+    9682,   800,   265, -1317,  1309,   800,  9797, -1317, -1317, -1317,
+   -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317,
+   -1317,  1330,  1331, -1317, -1317, -1317, -1317, -1317, -1317, -1317,
+    1334, -1317,  1333, -1317, -1317, 10233,   143, 10347, 10233, -1317,
+    1338, 10347, -1317,   259,  1354,  1356, -1317, -1317,  1346,  1347,
+    1326, -1317,   880, -1317, -1317, -1317,  1328,  2250,  1345,   842,
+     364, 10480, -1317,   774, -1317,   576,   576,  1352,  1355,  1357,
+    1360, -1317, -1317,  8166,  1358, -1317,  1436, 10480,  1349, -1317,
+   -1317, 10145, -1317,   783, -1317,  1350, 10233,  1359, -1317, -1317,
+    1378, -1317,  1379, -1317,  1394,  1396, -1317,  1361,  9682, -1317,
+   -1317, -1317,   800,   576,  1386,  1367,  1392,  1217,  1217, -1317,
+   -1317, -1317, -1317, -1317, 10233,   275, -1317,   384, -1317, -1317,
+    7600, -1317, -1317,  1375, 10347, -1317, 10347,  7600,    48,  9570,
+      48,  9570,  1393, -1317,  1398, -1317, -1317,  1395,   842, -1317,
+     798, -1317, -1317, -1317,  1399,  1401, -1317, 10480, 10480, -1317,
+   -1317,   964,   167, -1317, -1317,  1388, -1317,   964, -1317, -1317,
+    2461,   576, -1317, -1317,    48,  9570,    48,  9570,  1409,  1390,
+     576, -1317, -1317, -1317, -1317, 10145,  1410,   964,  5861, 10347,
+   10057,  1412,   964,  1414,  2461,  3613, -1317, -1317, -1317,  1420,
+   -1317, -1317, -1317, -1317,  8604, -1317, -1317, -1317,  9924, -1317,
+   10145, -1317, -1317,  1402,  9836, -1317, -1317, 10057,    48,  3613,
+      48,  1421,  1429,   817, -1317,  9924, -1317, -1317, -1317,  9836,
+   -1317, -1317, -1317,    48,    48, -1317, -1317, -1317, -1317, -1317,
+   -1317, -1317, -1317
 };
 
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
-{
-       0,     2,     0,     0,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     2,     1,     1,
-       3,     3,     1,     6,     4,     3,     7,     3,     7,     2,
-       2,     7,     4,     1,     3,     0,     1,     1,     3,     1,
-       3,     7,     3,     7,     1,     1,     1,     2,     2,     2,
-       2,     2,     2,     4,     2,     4,     6,     1,     4,     4,
-       1,     1,     1,     1,     1,     1,     1,     4,     4,     1,
-       3,     3,     3,     1,     3,     3,     1,     3,     3,     1,
-       3,     3,     3,     3,     1,     3,     3,     1,     3,     1,
-       3,     1,     3,     1,     3,     1,     3,     1,     5,     4,
-       5,     1,     1,     3,     2,     0,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     2,     5,
-       6,     7,     1,     3,     1,     3,     0,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     6,     4,     2,     7,
-       1,     3,     1,     2,     1,     2,     1,     2,     2,     5,
-       7,     5,     9,     5,     9,     1,     3,     1,     1,     3,
-       3,     2,     1,     2,     2,     0,     1,     2,     3,     0,
-       1,     2,     3,     3,     4,     0,     1,     1,     2,     5,
-       7,     6,     6,     4,     3,     4,     2,     3,     2,     3,
-       3,     3,     3,     5,     3,     3,     4,     1,     5,     6,
-       5,     6,     9,    10,     9,    10,     2,     1,     2,     2,
-       2,     1,     6,     8,    10,    12,    14,     0,     1,     0,
-       1,     1,     3,     4,     7,     0,     1,     3,     1,     3,
-       1,     1,     1,     3,     1,     1,     1,     3,     0,     1,
-       3,     4,     1,     3,     1,     1,     3,     3,     3,     3,
-       3,     2,     3,     6,     3,     3,     4,     1,     2,     2,
-       3,     5,     8,     7,     7,     5,     9,     2,     2,     5,
-       3,     5,     4,     3,     4,     4,     7,     3,     3,     3,
-       3,     4,     6,     1,     1,     1,     1,     1,     1,     1,
-       1,     0,     1,     1,     2,     1,     1,     1,     1,     1,
-       1,     1,     0,     5,     1,     2,     3,     1,     2,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     2,     2,     3,     3,     1,     3,     1,     2,     2,
-       2,     4,     4,     4,     4,     1,     2,     2,     3,     1,
-       2,     2,     1,     2,     2,     3,     1,     2,     2,     1,
-       1,     4,     2,     0,     6,     7,     2,     2,     2,     0,
-       2,     2,     3,     2,     3,     1,     2,     3,     2,     2,
-       4,     0,     1,     2,     2,     1,     0,     1,     2,     2,
-       5,     2,     0,     7,     2,     4,     0,     2,     0,     1,
-       1,     1,     5,     5,     5,     1,     5,     5,     9,     1,
-       5,     0,     1,     1,     5,     1,     1,     5,     5,     1,
-       3,     3,     4,     1,     1,     1,     1,     2,     1,     3,
-       3,     1,     2,     1,     3,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     2,     1,     1,     1,
-       2,     0,     2,     2,     1,     4,     0,     1,     2,     3,
-       4,     2,     2,     1,     2,     2,     5,     5,     7,     6,
-       1,     2,     2,     3,     1,     2,     2,     4,     2,     4,
-       0,     4,     2,     1,     1,     1,     0,     2,     5,     5,
-      13,     1,     1,     3,     3,     2,     3,     3,     2,     4,
-       1,     6,     9,     0,    11,     1,     3,     3,     3,     1,
-       1,     5,     2,     5,     0,     1,     1,     3,     0,     1,
-       1,     1,     1,     0,     6,     2,     1,     2,     4,     2,
-       3,     3,     3,     4,     5,     5,     5,     6,     1,     1,
-       1,     3,     0,     5,     0,     1,     1,     2,     6,     1,
-       3,     0,     1,     4,     1,     1,     1,     1,     2,     1,
-       2,     2,     1,     3,     2,     3,     3,     2,     4,     4,
-       3,     8,     3,     2,     1,     2,     6,     8,     3,     2,
-       3,     3,     4,     4,     3,     1,     1,     1,     4,     6,
-       3,     2,     3,     3,     4,     4,     3,     2,     1,     2,
-       2,     1,     3,     2,     3,     3,     2,     4,     4,     3,
-       6,     8,     3,     2,     1,     2,     2,     2,     3,     3,
-       2,     4,     4,     3,     6,     8,     3,     2,     1,     2,
-       2,     1,     1,     2,     3,     3,     2,     4,     6,     8,
-       1,     2,     2,     1,     2,     2,     3,     3,     1,     4,
-       4,     3,     5,     8,     3,     2,     3,     1,     5,     5,
-       6,     6,     1,     2,     2,     1,     2,     2,     3,     3,
-       1,     4,     4,     3,     5,     8,     3,     1,     2,     1,
-       2,     6,     5,     6,     7,     7,     1,     2,     2,     1,
-       2,     2,     3,     3,     1,     4,     4,     3,     8,     3,
-       1,     1,     2,     1,     1,     2,     3,     2,     3,     2,
-       3,     3,     2,     4,     3,     2,     3,     2,     4,     3,
-       2,     6,     6,     6,     7,     1,     2,     1,     1,     1,
-       2,     3,     2,     3,     2,     3,     3,     4,     2,     3,
-       4,     2,     5,     5,     6,     6,     0,     1,     0,     2
-};
-
-/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
-   Performed when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
+  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
@@ -1554 +1232 @@
 };
 
-/* YYDEFGOTO[NTERM-NUM].  */
+  /* YYPGOTO[NTERM-NUM].  */
+static const yytype_int16 yypgoto[] =
+{
+   -1317,  4344,  3244, -1317,   633, -1317,   172,   896,  -203, -1317,
+     487,  -518,  -482,  -910,  -211,  1511,     0, -1317,  1129,   534,
+     537,   615,   556,   984,   981,   988,   980,   989, -1317,     4,
+    -451,  4784,  -913, -1317,  -702,   571,    13,  -706,   419, -1317,
+     190, -1317,   345,  -964, -1317, -1317,    85, -1317, -1099, -1138,
+     197, -1317, -1317, -1317, -1317,    20, -1281, -1317, -1317, -1317,
+   -1317, -1317, -1317,   266, -1095,    50, -1317,  -472, -1317,   443,
+     239, -1317,   118, -1317,  -294, -1317, -1317, -1317,   496,  -829,
+   -1317, -1317,     8,  -952,    28,  2894, -1317, -1317, -1317,  -214,
+   -1317,   121,  1028,  -198,  1848,  3592, -1317, -1317,   127,   296,
+    1545,  1505, -1317,  1929, -1317, -1317,   137,  2139, -1317,  2574,
+     804, -1317, -1317, -1317,  -637, -1317,   886,   889,   490,   670,
+      52, -1317, -1317, -1317,   893,   666,  -510, -1317,  -116,    40,
+    1073, -1317, -1317,  -889,  -983,   933,  1377,  1006,   -11, -1317,
+    1351,   508,  -322,  -183,  -145,   623,   724, -1317,   944, -1317,
+    2701,   574,  -443,   875, -1317, -1317,   659, -1317,  -228, -1317,
+     -45, -1317, -1317, -1317, -1253,   370, -1317, -1317, -1317,  1120,
+   -1317,    33, -1317, -1317,  -828,  -100, -1316,  -170,  2264, -1317,
+    1914, -1317,   868, -1317,  -155,   129,  -181,  -180,  -175,     7,
+     -41,   -40,   -35,  1507,    37,    53,    57,   -29,  -172,  -163,
+    -158,  -150,  -293,  -500,  -490,  -485,  -542,  -284,  -525, -1317,
+   -1317,  -499,  1035,  1038,  1040,  1486,  4616,  -563,  -531,  -513,
+    -491,  -561, -1317,  -506,  -730,  -727,  -723,  -562,  -311,  -227,
+   -1317, -1317,   378,    19,   -93, -1317,  3633,   159,  -611,  -428
+};
+
+  /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
@@ -1583 +1290 @@
 };
 
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -1317
-static const yytype_int16 yypact[] =
-{
-    7252,  8635, -1317,    -3, -1317, -1317, -1317, -1317, -1317, -1317,
-   -1317,    23, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317,
-   -1317, -1317, -1317, -1317, -1317, -1317,    81,    81,    81,  1277,
-     970,   104,  7368,   277, -1317, -1317, -1317, -1317, -1317,   201,
-   -1317, -1317, -1317,  1047,   187, -1317, -1317, -1317, -1317,  5370,
-   -1317, -1317, -1317, -1317,    35,    48, -1317,  1328, -1317, -1317,
-   -1317, -1317,   235,  1663,   343,    98,  7484, -1317, -1317,  6174,
-    1066, -1317, -1317,   536,   376,  5540,   978,  1631,   536,  1775,
-   -1317, -1317,   477,   683, -1317,   536,  1892, -1317,   295, -1317,
-     422,   489, -1317, -1317, -1317, -1317,   346,    48,    81, -1317,
-      81, -1317, -1317, -1317, -1317,  9392,  1328, -1317, -1317,  1328,
-   -1317,   321, -1317,  9431, -1317, -1317,  2250,  9501, -1317,   668,
-     668,   668, -1317, -1317, -1317,    81, -1317, -1317, -1317,   373,
-     399,   410, -1317, -1317, -1317,   420, -1317, -1317, -1317, -1317,
-   -1317,   428,   450, -1317, -1317,    59,  8604,  2904,   144,   440,
-     493,   498,   531,   544,   560,  8522,  6772,   510,   580, -1317,
-    9114, -1317, -1317, -1317, -1317,   584, -1317,   153,  4280,  4280,
-   -1317,   570,   283, -1317, -1317, -1317, -1317,   596,   288,   303,
-     332,    81,   583, -1317, -1317,  1663,  2232,   648, -1317,    73,
-   -1317,    81,    81,    48, -1317, -1317,    80, -1317,    81,    81,
-   -1317,  3694,   599,   613,   668,  6565, -1317, -1317,   661,  5370,
-   -1317, -1317,   536, -1317, -1317, -1317,    48, -1317,  1328,    35,
-   -1317,  7675, -1317,   668,   668,   668,    48, -1317,  1277, -1317,
-    5446, -1317, -1317,   620,   668, -1317,   668, -1317,   201,  8604,
-   -1317,   673, -1317,   970,   692,   668, -1317,  1277,   697,   707,
-   -1317,  7368,   576, -1317, -1317, -1317,  4822, -1317, -1317,  9720,
-   -1317,   648,   165, 10347,  9501,  2250,  3694, -1317,   109, -1317,
-   -1317,  9431,  1328,   743,  7515, -1317, -1317,   306, -1317, 10675,
-     770,   800,  2676,   801, 10480, 10499, -1317,   813, -1317, -1317,
-   -1317, -1317, 10556, 10556,  8378,   795, -1317, -1317, -1317, -1317,
-   -1317, -1317,   842, -1317,   685,  1919,  8717, 10480, -1317,   652,
-     325,   507,   317,   581,   826,   820,   823,   861,   111, -1317,
-   -1317,   827,   703, -1317,   452, -1317, -1317,  2904, -1317, -1317,
-     278,   856, -1317,   636,   856,   866,   201, -1317, -1317,   872,
-    9392, -1317,   876,   887,  8830, -1317, -1317,  1020,  2049,  8093,
-    6565,   536, -1317,   536,   668,   668, -1317, -1317, -1317, -1317,
-   -1317, -1317,   668,  9392,  1328, -1317, -1317,  9540,  1233, -1317,
-    7824, -1317, -1317, -1317, -1317, -1317, -1317, -1317,   891,  4627,
-   10480, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317,
-   -1317, -1317, -1317, -1317, -1317,  2250, -1317,   552,   901,   904,
-     912,   862,   920,   922,   924,  2232, -1317, -1317,   932,    35,
-     936, -1317, -1317,   939, -1317, -1317, -1317,  4822, -1317, -1317,
-   -1317, -1317, -1317,  3694, -1317,  8604,  8604, -1317,   668,  2250,
-    6684,  1328,  8166, -1317, -1317, -1317, -1317,  4822,   165, -1317,
-   -1317,   536,    48, -1317, -1317,  4822, -1317,  6449, -1317, -1317,
-     668,   668,   484,  8011,   938,   941,   931,   952,   668, -1317,
-   -1317, -1317, -1317,  9797, -1317,   578,  6327, -1317,    48,   955,
-   -1317,  2250, 10757, 10404, -1317, -1317, -1317, -1317,   881,  3694,
-   -1317,  8239,   648,  3545, -1317, -1317, -1317,  1641,   586,   827,
-     970,  7515,   592,  9431, -1317,  7515, -1317, -1317, -1317, -1317,
-     603, -1317,   967,   800,   215,  8378, -1317,  9570, -1317, -1317,
-    8378, -1317,  8491,  8378, -1317, -1317,   966, -1317,   617,   973,
-     839,   983, -1317, -1317,  9253,  6415, -1317,   247, -1317, -1317,
-   10347, -1317,   330, 10347, -1317, -1317, -1317, -1317, -1317, -1317,
-   -1317, -1317, -1317, -1317, -1317, 10347, -1317, -1317, 10480, 10480,
-   10480, 10480, 10480, 10480, 10480, 10480, 10480, 10480, 10480, 10480,
-   10480, 10480, 10480, 10480, 10480, 10480,  4526, 10347, -1317,   703,
-     751, -1317, -1317,    81,    81, -1317, -1317,  8604, -1317, -1317,
-     939,   576, -1317,   939, 10423, -1317, -1317, -1317,  8975,  6415,
-     968,   976, -1317,  9501, -1317, -1317,   584, -1317,   990,   769,
-     999,  3014,   124,   827, -1317,    81,    81,   827,   125, -1317,
-      81,    81,   939, -1317, -1317,    81,    81, -1317,   856,  9652,
-    1328, 10902,   151,   358,  9652, -1317,  9720, -1317,   827, -1317,
-    9392, -1317,   147,  7790,  7790,  7790,  1328, -1317,  5708,   982,
-     891,  1167,   995,   996, -1317,  1011,  4280,   230, -1317,  1103,
-    1328,  7790,   576,  2250,   576,   648,   671,   856, -1317, -1317,
-     694,   856, -1317, -1317, -1317,   800, -1317,   856,    48,  9797,
-   -1317,   621,  1024,   640,  1026, -1317,  1030,    48, -1317, -1317,
-    4822,    48,  1032,  9570,  1037, -1317,  1585, -1317,   335,   390,
-     970, -1317,   970,  1023, 10480, -1317,   970, 10902, -1317, -1317,
-    1034, -1317, -1317, -1317,   576, -1317, 10830,   887, -1317,  7790,
-     859,  8093, -1317, -1317,   584,  1025,  1036,  1641,  3247, -1317,
-   -1317,  7515, -1317, -1317,  1039, -1317, -1317,  1043, -1317,  1039,
-    1048, 10675, 10347,    67,  1027,   133,  1053,  1061,  1068,  1069,
-   -1317,  1072,  1074,  9362,  6534, -1317, 10347, -1317,   839,  2140,
-   -1317, -1317, -1317,    81,    81, 10290, 10347,  1070, -1317, -1317,
-     675, -1317, 10347, -1317, -1317,   644, -1317, -1317, -1317, -1317,
-     652,   652,   325,   325,   507,   507,   507,   507,   317,   317,
-     581,   826,   820,   823,   861, 10480,   333, -1317,  9797,  1079,
-    1080,  1081,   751, -1317, -1317, -1317, -1317, -1317,  9797,   700,
-    7790, -1317,  9392, -1317,  6891,  8943, -1317,  7824,  6772, -1317,
-   -1317,   769,  9797,   917,  1082,  1083,  1084,  1087,  1088,  1089,
-    1091, -1317,  4955,  3014, -1317, -1317, -1317, -1317, -1317, -1317,
-   -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317,
-   -1317,   939, -1317, -1317, -1317,   827, -1317, -1317, -1317, -1317,
-   -1317, -1317, -1317, -1317,  1098, -1317,  1099,  1101, -1317, -1317,
-      35,  1070,  5708, -1317, -1317, -1317,  4627,  1102, -1317, -1317,
-   -1317, -1317,   970,  5944,  1191, -1317, -1317, -1317, -1317,  1094,
-      35, -1317, -1317,   939, -1317, -1317,   939,    24,   939, -1317,
-   -1317, -1317, -1317, -1317, -1317,  9223, -1317,    48, -1317, -1317,
-     432,   441,  9540,  7010,  2348, 10480,  3377, -1317, -1317,  1092,
-      94,  1092, -1317,   970, -1317,    81, -1317, -1317,  8748,   931,
-   -1317, -1317, -1317,   941,  1116,  1111, -1317, -1317,  1118,  1119,
-   -1317,   859,  2430, -1317,   455, -1317,  3247,   827, -1317,  1122,
-    7515,  9682,  8604,  1125, -1317, -1317,  1130,  1135,  1124, -1317,
-   10480,   166,   222,  1132, -1317,  1138,   576,  1138, -1317, -1317,
-    1138,  1137, -1317,  1145,  1147,  1148,  2140, -1317, -1317, -1317,
-    4627, -1317, -1317, -1317, -1317,  1143, 10347,  1149,   576, -1317,
-   10347, -1317,   576, -1317, -1317, 10347, -1317,   721,   856, -1317,
-   -1317, -1317, -1317, -1317, -1317, -1317,   891,   887,  8830, -1317,
-   -1317,  7129,  1152, -1317,   731,   856, -1317,   745,   763,   856,
-   -1317,   668,  5561, -1317, -1317, -1317,  9797,  9797, -1317,  8166,
-    8166, -1317,  1154,  1156,  1153,  1155, -1317,  1168,   460,   196,
-    1070, -1317,   576, -1317,  4280, -1317, 10347,   474, -1317,  6296,
-    1159,  1170, 10233,  1172,  1175,   -14,     3,    11, 10347,  1179,
-      48, 10347, 10347,  1160,  1177,   282,  1161, -1317, -1317, -1317,
-    1180, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317,
-     970,  1184, 10347, -1317,  9797,  9797,    81,  1188, -1317,  8861,
-   -1317, -1317,   809, -1317,  3377, -1317, -1317, -1317, -1317,  1585,
-   -1317, -1317,  1185, -1317, -1317, -1317, -1317,  1193,  2430, -1317,
-   -1317,  1176, -1317,  1039, -1317, -1317,  2250,  1196, -1317, -1317,
-   -1317,   709,  1198, -1317,   133,  1202, 10480,  1186,   133,   133,
-    1211,  9253,   789,   856, -1317, -1317,  1011, 10347,  1214,  1143,
-     505,   224,  1217, -1317, -1317,  1218,  1217, -1317, -1317,  1226,
-   -1317, -1317,   939,  1228,  1230,  6653,  1231,  1232,  1243, -1317,
-   -1317,  1246, -1317, -1317,   939, -1317, -1317, -1317, -1317,   939,
-   10347, 10347,   887,  1245, -1317, -1317, -1317, -1317, -1317, -1317,
-   -1317, -1317, -1317, -1317, -1317, -1317, 10480, 10480,  1247,  1251,
-    1217, -1317, -1317,   970, -1317, -1317, -1317,  4468,  9682, 10347,
-   10347,  1311, 10347, -1317,  1234, -1317,  1237, -1317,  1239, 10347,
-    1241, 10347,  1049,  1244,    26,    81,  9084,   750, -1317, -1317,
-    5944,  1267,   481, -1317, -1317, -1317, -1317, -1317, -1317, -1317,
-   -1317, -1317, 10053, -1317,  8239,  1274, -1317, -1317,  9682,   482,
-     512, -1317,  1272,  1259,   800,  1280, -1317,   245, -1317, -1317,
-   -1317, -1317,   939,  1279, -1317, -1317,  1287,   385,   444,   576,
-    1293, -1317,  1294, -1317,  9797, -1317, -1317, -1317, -1317, -1317,
-    1295, -1317,  9797,  9797,  9797, -1317, -1317,  1297, -1317,  1298,
-    1282,  1305,   511,  7863,  7978, -1317, -1317,   348, -1317,  1304,
-    1310, -1317,  8312,   712,   734,  1308,   739,  6143, -1317, -1317,
-   -1317,   515, -1317,   765,  1318,  1320,    48,  1371,   879, -1317,
-   -1317, 10347, -1317, 10233, 10347, -1317, -1317, -1317,  1322,  1329,
-   -1317, -1317, -1317,  1324, -1317, -1317, -1317, -1317, -1317, -1317,
-    9682,   800,   265, -1317,  1309,   800,  9797, -1317, -1317, -1317,
-   -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317, -1317,
-   -1317,  1330,  1331, -1317, -1317, -1317, -1317, -1317, -1317, -1317,
-    1334, -1317,  1333, -1317, -1317, 10233,   143, 10347, 10233, -1317,
-    1338, 10347, -1317,   259,  1354,  1356, -1317, -1317,  1346,  1347,
-    1326, -1317,   880, -1317, -1317, -1317,  1328,  2250,  1345,   842,
-     364, 10480, -1317,   774, -1317,   576,   576,  1352,  1355,  1357,
-    1360, -1317, -1317,  8166,  1358, -1317,  1436, 10480,  1349, -1317,
-   -1317, 10145, -1317,   783, -1317,  1350, 10233,  1359, -1317, -1317,
-    1378, -1317,  1379, -1317,  1394,  1396, -1317,  1361,  9682, -1317,
-   -1317, -1317,   800,   576,  1386,  1367,  1392,  1217,  1217, -1317,
-   -1317, -1317, -1317, -1317, 10233,   275, -1317,   384, -1317, -1317,
-    7600, -1317, -1317,  1375, 10347, -1317, 10347,  7600,    48,  9570,
-      48,  9570,  1393, -1317,  1398, -1317, -1317,  1395,   842, -1317,
-     798, -1317, -1317, -1317,  1399,  1401, -1317, 10480, 10480, -1317,
-   -1317,   964,   167, -1317, -1317,  1388, -1317,   964, -1317, -1317,
-    2461,   576, -1317, -1317,    48,  9570,    48,  9570,  1409,  1390,
-     576, -1317, -1317, -1317, -1317, 10145,  1410,   964,  5861, 10347,
-   10057,  1412,   964,  1414,  2461,  3613, -1317, -1317, -1317,  1420,
-   -1317, -1317, -1317, -1317,  8604, -1317, -1317, -1317,  9924, -1317,
-   10145, -1317, -1317,  1402,  9836, -1317, -1317, 10057,    48,  3613,
-      48,  1421,  1429,   817, -1317,  9924, -1317, -1317, -1317,  9836,
-   -1317, -1317, -1317,    48,    48, -1317, -1317, -1317, -1317, -1317,
-   -1317, -1317, -1317
-};
-
-/* YYPGOTO[NTERM-NUM].  */
-static const yytype_int16 yypgoto[] =
-{
-   -1317,  4344,  3244, -1317,   633, -1317,   172,   896,  -203, -1317,
-     487,  -518,  -482,  -910,  -211,  1511,     0, -1317,  1129,   534,
-     537,   615,   556,   984,   981,   988,   980,   989, -1317,     4,
-    -451,  4784,  -913, -1317,  -702,   571,    13,  -706,   419, -1317,
-     190, -1317,   345,  -964, -1317, -1317,    85, -1317, -1099, -1138,
-     197, -1317, -1317, -1317, -1317,    20, -1281, -1317, -1317, -1317,
-   -1317, -1317, -1317,   266, -1095,    50, -1317,  -472, -1317,   443,
-     239, -1317,   118, -1317,  -294, -1317, -1317, -1317,   496,  -829,
-   -1317, -1317,     8,  -952,    28,  2894, -1317, -1317, -1317,  -214,
-   -1317,   121,  1028,  -198,  1848,  3592, -1317, -1317,   127,   296,
-    1545,  1505, -1317,  1929, -1317, -1317,   137,  2139, -1317,  2574,
-     804, -1317, -1317, -1317,  -637, -1317,   886,   889,   490,   670,
-      52, -1317, -1317, -1317,   893,   666,  -510, -1317,  -116,    40,
-    1073, -1317, -1317,  -889,  -983,   933,  1377,  1006,   -11, -1317,
-    1351,   508,  -322,  -183,  -145,   623,   724, -1317,   944, -1317,
-    2701,   574,  -443,   875, -1317, -1317,   659, -1317,  -228, -1317,
-     -45, -1317, -1317, -1317, -1253,   370, -1317, -1317, -1317,  1120,
-   -1317,    33, -1317, -1317,  -828,  -100, -1316,  -170,  2264, -1317,
-    1914, -1317,   868, -1317,  -155,   129,  -181,  -180,  -175,     7,
-     -41,   -40,   -35,  1507,    37,    53,    57,   -29,  -172,  -163,
-    -158,  -150,  -293,  -500,  -490,  -485,  -542,  -284,  -525, -1317,
-   -1317,  -499,  1035,  1038,  1040,  1486,  4616,  -563,  -531,  -513,
-    -491,  -561, -1317,  -506,  -730,  -727,  -723,  -562,  -311,  -227,
-   -1317, -1317,   378,    19,   -93, -1317,  3633,   159,  -611,  -428
-};
-
-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -520
+  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
@@ -2881 +2395 @@
 };
 
-#define yypact_value_is_default(yystate) \
-  ((yystate) == (-1317))
-
-#define yytable_value_is_error(yytable_value) \
-  YYID (0)
-
 static const yytype_int16 yycheck[] =
 {
@@ -3989 +3497 @@
 };
 
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
 static const yytype_uint16 yystos[] =
 {
@@ -4151 +3659 @@
 };
 
-#define yyerrok         (yyerrstatus = 0)
-#define yyclearin       (yychar = YYEMPTY)
-#define YYEMPTY         (-2)
-#define YYEOF           0
-
-#define YYACCEPT        goto yyacceptlab
-#define YYABORT         goto yyabortlab
-#define YYERROR         goto yyerrorlab
-
-
-/* Like YYERROR except do call yyerror.  This remains here temporarily
-   to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  However,
-   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
-   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
-   discussed.  */
-
-#define YYFAIL          goto yyerrlab
-#if defined YYFAIL
-  /* This is here to suppress warnings from the GCC cpp's
-     -Wunused-macros.  Normally we don't worry about that warning, but
-     some users do, and we want to make it easy for users to remove
-     YYFAIL uses, which will produce warnings from Bison 2.5.  */
-#endif
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint16 yyr1[] =
+{
+       0,   133,   134,   135,   136,   136,   136,   137,   137,   137,
+     138,   138,   139,   139,   140,   140,   141,   141,   142,   142,
+     142,   142,   143,   143,   143,   143,   143,   143,   143,   143,
+     143,   143,   143,   144,   144,   145,   145,   146,   146,   147,
+     147,   147,   147,   147,   148,   148,   148,   148,   148,   148,
+     148,   148,   148,   148,   148,   148,   148,   148,   148,   148,
+     149,   149,   150,   150,   150,   150,   151,   151,   151,   152,
+     152,   152,   152,   153,   153,   153,   154,   154,   154,   155,
+     155,   155,   155,   155,   156,   156,   156,   157,   157,   158,
+     158,   159,   159,   160,   160,   161,   161,   162,   162,   162,
+     162,   163,   164,   164,   164,   165,   165,   166,   166,   166,
+     166,   166,   166,   166,   166,   166,   166,   166,   167,   167,
+     167,   167,   168,   168,   169,   169,   170,   170,   171,   171,
+     171,   171,   171,   171,   171,   171,   171,   172,   173,   173,
+     174,   174,   175,   175,   175,   175,   176,   176,   177,   178,
+     178,   178,   178,   178,   178,   179,   179,   179,   180,   180,
+     181,   181,   182,   182,   183,   184,   184,   185,   185,   186,
+     186,   187,   187,   187,   187,   188,   188,   189,   189,   190,
+     190,   190,   191,   191,   192,   192,   192,   192,   192,   192,
+     192,   192,   192,   192,   193,   193,   193,   194,   194,   194,
+     194,   194,   195,   195,   195,   195,   196,   197,   197,   197,
+     197,   197,   198,   198,   198,   198,   198,   199,   199,   200,
+     200,   201,   201,   202,   202,   203,   203,   203,   204,   204,
+     205,   205,   206,   206,   207,   207,   208,   208,   209,   209,
+     210,   210,   211,   211,   212,   212,   213,   213,   213,   213,
+     213,   214,   214,   214,   215,   215,   215,   216,   216,   216,
+     216,   216,   217,   217,   217,   218,   218,   219,   219,   219,
+     220,   220,   220,   220,   220,   221,   221,   222,   222,   222,
+     222,   223,   223,   224,   224,   224,   224,   225,   225,   225,
+     225,   226,   226,   227,   227,   228,   228,   229,   229,   229,
+     229,   229,   230,   229,   231,   231,   231,   232,   232,   233,
+     233,   233,   233,   233,   233,   233,   233,   234,   234,   234,
+     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
+     235,   235,   235,   235,   235,   236,   236,   237,   237,   237,
+     237,   238,   238,   238,   238,   239,   239,   239,   239,   240,
+     240,   240,   241,   241,   241,   241,   242,   242,   242,   243,
+     243,   244,   244,   245,   244,   244,   244,   246,   246,   247,
+     247,   248,   248,   248,   248,   249,   249,   249,   249,   250,
+     250,   251,   251,   251,   251,   251,   252,   252,   253,   254,
+     255,   255,   256,   255,   257,   257,   258,   258,   259,   259,
+     260,   260,   260,   260,   260,   261,   261,   261,   261,   262,
+     262,   263,   263,   264,   264,   265,   265,   265,   265,   266,
+     266,   266,   266,   266,   267,   267,   267,   267,   267,   268,
+     268,   269,   269,   270,   270,   271,   271,   271,   272,   272,
+     272,   273,   273,   273,   274,   274,   274,   275,   275,   275,
+     275,   276,   276,   276,   277,   277,   278,   278,   278,   278,
+     278,   279,   279,   280,   280,   281,   281,   281,   281,   281,
+     282,   282,   282,   282,   283,   283,   283,   284,   285,   285,
+     287,   286,   286,   288,   288,   288,   289,   289,   290,   290,
+     290,   291,   291,   291,   291,   292,   292,   292,   293,   293,
+     294,   294,   295,   296,   295,   297,   297,   298,   298,   299,
+     299,   299,   300,   300,   301,   301,   302,   302,   303,   303,
+     304,   304,   304,   305,   304,   304,   306,   306,   306,   307,
+     307,   307,   307,   307,   307,   307,   307,   307,   308,   308,
+     308,   309,   310,   310,   311,   311,   312,   312,   313,   314,
+     314,   315,   315,   315,   316,   316,   316,   316,   317,   317,
+     317,   317,   318,   318,   319,   319,   319,   320,   320,   320,
+     320,   321,   321,   322,   322,   322,   323,   323,   323,   324,
+     324,   324,   325,   325,   325,   326,   326,   326,   327,   327,
+     327,   328,   328,   328,   329,   329,   329,   330,   330,   330,
+     330,   331,   331,   332,   332,   332,   333,   333,   333,   333,
+     334,   334,   334,   335,   335,   335,   335,   336,   336,   336,
+     337,   337,   337,   337,   338,   338,   338,   339,   339,   339,
+     339,   340,   340,   341,   341,   341,   342,   342,   343,   343,
+     344,   344,   344,   345,   345,   345,   345,   345,   346,   346,
+     346,   346,   347,   347,   347,   348,   348,   348,   349,   349,
+     349,   349,   350,   350,   350,   351,   351,   351,   351,   351,
+     352,   352,   352,   352,   353,   353,   353,   354,   354,   354,
+     355,   355,   355,   355,   355,   355,   356,   356,   356,   357,
+     357,   357,   357,   357,   358,   358,   358,   358,   359,   359,
+     360,   360,   360,   361,   361,   362,   362,   362,   362,   362,
+     362,   363,   363,   363,   363,   363,   363,   363,   363,   363,
+     363,   364,   364,   364,   364,   365,   365,   365,   366,   366,
+     367,   367,   367,   367,   367,   367,   368,   368,   368,   368,
+     368,   368,   369,   370,   370,   370,   371,   371,   372,   372
+};
+
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     0,     0,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     2,     1,     1,
+       3,     3,     1,     6,     4,     3,     7,     3,     7,     2,
+       2,     7,     4,     1,     3,     0,     1,     1,     3,     1,
+       3,     7,     3,     7,     1,     1,     1,     2,     2,     2,
+       2,     2,     2,     4,     2,     4,     6,     1,     4,     4,
+       1,     1,     1,     1,     1,     1,     1,     4,     4,     1,
+       3,     3,     3,     1,     3,     3,     1,     3,     3,     1,
+       3,     3,     3,     3,     1,     3,     3,     1,     3,     1,
+       3,     1,     3,     1,     3,     1,     3,     1,     5,     4,
+       5,     1,     1,     3,     2,     0,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     2,     5,
+       6,     7,     1,     3,     1,     3,     0,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     6,     4,     2,     7,
+       1,     3,     1,     2,     1,     2,     1,     2,     2,     5,
+       7,     5,     9,     5,     9,     1,     3,     1,     1,     3,
+       3,     2,     1,     2,     2,     0,     1,     2,     3,     0,
+       1,     2,     3,     3,     4,     0,     1,     1,     2,     5,
+       7,     6,     6,     4,     3,     4,     2,     3,     2,     3,
+       3,     3,     3,     5,     3,     3,     4,     1,     5,     6,
+       5,     6,     9,    10,     9,    10,     2,     1,     2,     2,
+       2,     1,     6,     8,    10,    12,    14,     0,     1,     0,
+       1,     1,     3,     4,     7,     0,     1,     3,     1,     3,
+       1,     1,     1,     3,     1,     1,     1,     3,     0,     1,
+       3,     4,     1,     3,     1,     1,     3,     3,     3,     3,
+       3,     2,     3,     6,     3,     3,     4,     1,     2,     2,
+       3,     5,     8,     7,     7,     5,     9,     2,     2,     5,
+       3,     5,     4,     3,     4,     4,     7,     3,     3,     3,
+       3,     4,     6,     1,     1,     1,     1,     1,     1,     1,
+       1,     0,     1,     1,     2,     1,     1,     1,     1,     1,
+       1,     1,     0,     5,     1,     2,     3,     1,     2,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     2,     2,     3,     3,     1,     3,     1,     2,     2,
+       2,     4,     4,     4,     4,     1,     2,     2,     3,     1,
+       2,     2,     1,     2,     2,     3,     1,     2,     2,     1,
+       1,     4,     2,     0,     6,     7,     2,     2,     2,     0,
+       2,     2,     3,     2,     3,     1,     2,     3,     2,     2,
+       4,     0,     1,     2,     2,     1,     0,     1,     2,     2,
+       5,     2,     0,     7,     2,     4,     0,     2,     0,     1,
+       1,     1,     5,     5,     5,     1,     5,     5,     9,     1,
+       5,     0,     1,     1,     5,     1,     1,     5,     5,     1,
+       3,     3,     4,     1,     1,     1,     1,     2,     1,     3,
+       3,     1,     2,     1,     3,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     2,     1,     1,     1,
+       2,     0,     2,     2,     1,     4,     0,     1,     2,     3,
+       4,     2,     2,     1,     2,     2,     5,     5,     7,     6,
+       1,     2,     2,     3,     1,     2,     2,     4,     2,     4,
+       0,     4,     2,     1,     1,     1,     0,     2,     5,     5,
+      13,     1,     1,     3,     3,     2,     3,     3,     2,     4,
+       1,     6,     9,     0,    11,     1,     3,     3,     3,     1,
+       1,     5,     2,     5,     0,     1,     1,     3,     0,     1,
+       1,     1,     1,     0,     6,     2,     1,     2,     4,     2,
+       3,     3,     3,     4,     5,     5,     5,     6,     1,     1,
+       1,     3,     0,     5,     0,     1,     1,     2,     6,     1,
+       3,     0,     1,     4,     1,     1,     1,     1,     2,     1,
+       2,     2,     1,     3,     2,     3,     3,     2,     4,     4,
+       3,     8,     3,     2,     1,     2,     6,     8,     3,     2,
+       3,     3,     4,     4,     3,     1,     1,     1,     4,     6,
+       3,     2,     3,     3,     4,     4,     3,     2,     1,     2,
+       2,     1,     3,     2,     3,     3,     2,     4,     4,     3,
+       6,     8,     3,     2,     1,     2,     2,     2,     3,     3,
+       2,     4,     4,     3,     6,     8,     3,     2,     1,     2,
+       2,     1,     1,     2,     3,     3,     2,     4,     6,     8,
+       1,     2,     2,     1,     2,     2,     3,     3,     1,     4,
+       4,     3,     5,     8,     3,     2,     3,     1,     5,     5,
+       6,     6,     1,     2,     2,     1,     2,     2,     3,     3,
+       1,     4,     4,     3,     5,     8,     3,     1,     2,     1,
+       2,     6,     5,     6,     7,     7,     1,     2,     2,     1,
+       2,     2,     3,     3,     1,     4,     4,     3,     8,     3,
+       1,     1,     2,     1,     1,     2,     3,     2,     3,     2,
+       3,     3,     2,     4,     3,     2,     3,     2,     4,     3,
+       2,     6,     6,     6,     7,     1,     2,     1,     1,     1,
+       2,     3,     2,     3,     2,     3,     3,     4,     2,     3,
+       4,     2,     5,     5,     6,     6,     0,     1,     0,     2
+};
+
+
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
+
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
+
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
-#define YYBACKUP(Token, Value)                                  \
-do                                                              \
-  if (yychar == YYEMPTY && yylen == 1)                          \
-    {                                                           \
-      yychar = (Token);                                         \
-      yylval = (Value);                                         \
-      YYPOPSTACK (1);                                           \
-      goto yybackup;                                            \
-    }                                                           \
-  else                                                          \
-    {                                                           \
+#define YYBACKUP(Token, Value)                                  \
+do                                                              \
+  if (yychar == YYEMPTY)                                        \
+    {                                                           \
+      yychar = (Token);                                         \
+      yylval = (Value);                                         \
+      YYPOPSTACK (yylen);                                       \
+      yystate = *yyssp;                                         \
+      goto yybackup;                                            \
+    }                                                           \
+  else                                                          \
+    {                                                           \
       yyerror (YY_("syntax error: cannot back up")); \
-      YYERROR;                                                  \
-    }                                                           \
-while (YYID (0))
-
-
-#define YYTERROR        1
-#define YYERRCODE       256
-
-
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
-   If N is 0, then set CURRENT to the empty location which ends
-   the previous symbol: RHS[0] (always defined).  */
-
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)                                \
-    do                                                                  \
-      if (YYID (N))                                                    \
-        {                                                               \
-          (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
-          (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
-          (Current).last_line    = YYRHSLOC (Rhs, N).last_line;         \
-          (Current).last_column  = YYRHSLOC (Rhs, N).last_column;       \
-        }                                                               \
-      else                                                              \
-        {                                                               \
-          (Current).first_line   = (Current).last_line   =              \
-            YYRHSLOC (Rhs, 0).last_line;                                \
-          (Current).first_column = (Current).last_column =              \
-            YYRHSLOC (Rhs, 0).last_column;                              \
-        }                                                               \
-    while (YYID (0))
-#endif
-
-
-/* This macro is provided for backward compatibility. */
-
-#ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-#endif
-
-
-/* YYLEX -- calling `yylex' with the right arguments.  */
-
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (YYLEX_PARAM)
-#else
-# define YYLEX yylex ()
-#endif
+      YYERROR;                                                  \
+    }                                                           \
+while (0)
+
+/* Error token number */
+#define YYTERROR        1
+#define YYERRCODE       256
+
+
 
 /* Enable debugging if requested.  */
@@ -4248 +3863 @@
 # endif
 
-# define YYDPRINTF(Args)                        \
-do {                                            \
-  if (yydebug)                                  \
-    YYFPRINTF Args;                             \
-} while (YYID (0))
-
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
-do {                                                                      \
-  if (yydebug)                                                            \
-    {                                                                     \
-      YYFPRINTF (stderr, "%s ", Title);                                   \
-      yy_symbol_print (stderr,                                            \
-                  Type, Value); \
-      YYFPRINTF (stderr, "\n");                                           \
-    }                                                                     \
-} while (YYID (0))
-
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
-
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (0)
+
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
+
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (0)
+
+
+/*----------------------------------------.
+| Print this symbol's value on YYOUTPUT.  |
+`----------------------------------------*/
+
 static void
 yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
 {
+  FILE *yyo = yyoutput;
+  YYUSE (yyo);
   if (!yyvaluep)
     return;
@@ -4288 +3901 @@
   if (yytype < YYNTOKENS)
     YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# else
-  YYUSE (yyoutput);
 # endif
-  switch (yytype)
-    {
-      default:
-        break;
-    }
+  YYUSE (yytype);
 }
 
@@ -4303 +3910 @@
 `--------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
 {
-  if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-  else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+  YYFPRINTF (yyoutput, "%s %s (",
+             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
 
   yy_symbol_value_print (yyoutput, yytype, yyvaluep);
@@ -4329 +3925 @@
 `------------------------------------------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
-#else
-static void
-yy_stack_print (yybottom, yytop)
-    yytype_int16 *yybottom;
-    yytype_int16 *yytop;
-#endif
 {
   YYFPRINTF (stderr, "Stack now");
@@ -4349 +3937 @@
 }
 
-# define YY_STACK_PRINT(Bottom, Top)                            \
-do {                                                            \
-  if (yydebug)                                                  \
-    yy_stack_print ((Bottom), (Top));                           \
-} while (YYID (0))
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \
+} while (0)
 
 
@@ -4360 +3948 @@
 `------------------------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
-#else
-static void
-yy_reduce_print (yyvsp, yyrule)
-    YYSTYPE *yyvsp;
-    int yyrule;
-#endif
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
 {
+  unsigned long int yylno = yyrline[yyrule];
   int yynrhs = yyr2[yyrule];
   int yyi;
-  unsigned long int yylno = yyrline[yyrule];
   YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-             yyrule - 1, yylno);
+             yyrule - 1, yylno);
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-                       &(yyvsp[(yyi + 1) - (yynrhs)])
-                                       );
+      yy_symbol_print (stderr,
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                                              );
       YYFPRINTF (stderr, "\n");
     }
 }
 
-# define YY_REDUCE_PRINT(Rule)          \
-do {                                    \
-  if (yydebug)                          \
-    yy_reduce_print (yyvsp, Rule); \
-} while (YYID (0))
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, Rule); \
+} while (0)
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
@@ -4405 +3986 @@
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef YYINITDEPTH
+#ifndef YYINITDEPTH
 # define YYINITDEPTH 200
 #endif
@@ -4428 +4009 @@
 #  else
 /* Return the length of YYSTR.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static YYSIZE_T
 yystrlen (const char *yystr)
-#else
-static YYSIZE_T
-yystrlen (yystr)
-    const char *yystr;
-#endif
 {
   YYSIZE_T yylen;
@@ -4452 +4026 @@
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static char *
 yystpcpy (char *yydest, const char *yysrc)
-#else
-static char *
-yystpcpy (yydest, yysrc)
-    char *yydest;
-    const char *yysrc;
-#endif
 {
   char *yyd = yydest;
@@ -4491 +4057 @@
 
       for (;;)
-        switch (*++yyp)
-          {
-          case '\'':
-          case ',':
-            goto do_not_strip_quotes;
-
-          case '\\':
-            if (*++yyp != '\\')
-              goto do_not_strip_quotes;
-            /* Fall through.  */
-          default:
-            if (yyres)
-              yyres[yyn] = *yyp;
-            yyn++;
-            break;
-
-          case '"':
-            if (yyres)
-              yyres[yyn] = '\0';
-            return yyn;
-          }
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            /* Fall through.  */
+          default:
+            if (yyres)
+              yyres[yyn] = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }
     do_not_strip_quotes: ;
     }
@@ -4534 +4100 @@
                 yytype_int16 *yyssp, int yytoken)
 {
-  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
+  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
   YYSIZE_T yysize = yysize0;
-  YYSIZE_T yysize1;
   enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
   /* Internationalized format string. */
-  const char *yyformat = 0;
+  const char *yyformat = YY_NULLPTR;
   /* Arguments of yyformat. */
   char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
@@ -4547 +4112 @@
 
   /* There are many possibilities here to consider:
-     - Assume YYFAIL is not used.  It's too flawed to consider.  See
-       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
-       for details.  YYERROR is fine as it does not invoke this
-       function.
      - If this state is a consistent state with a default action, then
        the only way this function was invoked is if the default action
@@ -4599 +4160 @@
                   }
                 yyarg[yycount++] = yytname[yyx];
-                yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-                if (! (yysize <= yysize1
-                       && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-                  return 2;
-                yysize = yysize1;
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }
               }
         }
@@ -4623 +4186 @@
     }
 
-  yysize1 = yysize + yystrlen (yyformat);
-  if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-    return 2;
-  yysize = yysize1;
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }
 
   if (*yymsg_alloc < yysize)
@@ -4663 +4228 @@
 `-----------------------------------------------*/
 
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep)
-    const char *yymsg;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
 {
   YYUSE (yyvaluep);
-
   if (!yymsg)
     yymsg = "Deleting";
   YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
-  switch (yytype)
-    {
-
-      default:
-        break;
-    }
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  YYUSE (yytype);
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
 
-/* Prevent warnings from -Wmissing-prototypes.  */
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
 
 
@@ -4712 +4249 @@
 /* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
-
 /* Number of syntax errors so far.  */
 int yynerrs;
@@ -4721 +4257 @@
 `----------*/
 
-#ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void *YYPARSE_PARAM)
-#else
-int
-yyparse (YYPARSE_PARAM)
-    void *YYPARSE_PARAM;
-#endif
-#else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 int
 yyparse (void)
-#else
-int
-yyparse ()
-
-#endif
-#endif
 {
     int yystate;
@@ -4748 +4265 @@
 
     /* The stacks and their tools:
-       `yyss': related to states.
-       `yyvs': related to semantic values.
-
-       Refer to the stacks thru separate pointers, to allow yyoverflow
+       'yyss': related to states.
+       'yyvs': related to semantic values.
+
+       Refer to the stacks through separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */
 
@@ -4769 +4286 @@
   int yyresult;
   /* Lookahead token as an internal (translated) token number.  */
-  int yytoken;
+  int yytoken = 0;
   /* The variables used to return semantic value and location from the
      action routines.  */
@@ -4787 +4304 @@
   int yylen = 0;
 
-  yytoken = 0;
-  yyss = yyssa;
-  yyvs = yyvsa;
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
   yystacksize = YYINITDEPTH;
 
@@ -4798 +4314 @@
   yynerrs = 0;
   yychar = YYEMPTY; /* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-  yyssp = yyss;
-  yyvsp = yyvs;
-
   goto yysetstate;
 
@@ -4826 +4334 @@
 #ifdef yyoverflow
       {
-        /* Give user a chance to reallocate the stack.  Use copies of
-           these so that the &'s don't force the real ones into
-           memory.  */
-        YYSTYPE *yyvs1 = yyvs;
-        yytype_int16 *yyss1 = yyss;
-
-        /* Each stack pointer address is followed by the size of the
-           data in use in that stack, in bytes.  This used to be a
-           conditional around just the two extra args, but that might
-           be undefined if yyoverflow is a macro.  */
-        yyoverflow (YY_("memory exhausted"),
-                    &yyss1, yysize * sizeof (*yyssp),
-                    &yyvs1, yysize * sizeof (*yyvsp),
-                    &yystacksize);
-
-        yyss = yyss1;
-        yyvs = yyvs1;
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        YYSTYPE *yyvs1 = yyvs;
+        yytype_int16 *yyss1 = yyss;
+
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  This used to be a
+           conditional around just the two extra args, but that might
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yystacksize);
+
+        yyss = yyss1;
+        yyvs = yyvs1;
       }
 #else /* no yyoverflow */
@@ -4850 +4358 @@
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-        goto yyexhaustedlab;
+        goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
-        yystacksize = YYMAXDEPTH;
+        yystacksize = YYMAXDEPTH;
 
       {
-        yytype_int16 *yyss1 = yyss;
-        union yyalloc *yyptr =
-          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-        if (! yyptr)
-          goto yyexhaustedlab;
-        YYSTACK_RELOCATE (yyss_alloc, yyss);
-        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+        yytype_int16 *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyexhaustedlab;
+        YYSTACK_RELOCATE (yyss_alloc, yyss);
+        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
-        if (yyss1 != yyssa)
-          YYSTACK_FREE (yyss1);
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
       }
 # endif
@@ -4874 +4382 @@
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-                  (unsigned long int) yystacksize));
+                  (unsigned long int) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
-        YYABORT;
+        YYABORT;
     }
 
@@ -4906 +4414 @@
     {
       YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = YYLEX;
+      yychar = yylex ();
     }
 
@@ -4946 +4454 @@
 
   yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
   goto yynewstate;
@@ -4969 +4479 @@
 
   /* If YYLEN is nonzero, implement the default value of the action:
-     `$$ = $1'.
+     '$$ = $1'.
 
      Otherwise, the following line sets YYVAL to garbage.
@@ -4983 +4493 @@
     {
         case 2:
-
-/* Line 1806 of yacc.c  */
-#line 298 "parser.yy"
+#line 298 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.enterScope();
                 }
+#line 4500 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 3:
-
-/* Line 1806 of yacc.c  */
-#line 304 "parser.yy"
+#line 304 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.leaveScope();
                 }
+#line 4508 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 4:
-
-/* Line 1806 of yacc.c  */
-#line 313 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_constantInteger( *(yyvsp[(1) - (1)].tok) ) ); }
+#line 313 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_constantInteger( assign_strptr((yyvsp[0].tok)) ) ); }
+#line 4514 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 5:
-
-/* Line 1806 of yacc.c  */
-#line 314 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_constantFloat( *(yyvsp[(1) - (1)].tok) ) ); }
+#line 314 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_constantFloat( assign_strptr((yyvsp[0].tok)) ) ); }
+#line 4520 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 6:
-
-/* Line 1806 of yacc.c  */
-#line 315 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_constantChar( *(yyvsp[(1) - (1)].tok) ) ); }
+#line 315 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_constantChar( assign_strptr((yyvsp[0].tok)) ) ); }
+#line 4526 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 16:
-
-/* Line 1806 of yacc.c  */
-#line 340 "parser.yy"
-    { (yyval.constant) = build_constantStr( *(yyvsp[(1) - (1)].tok) ); }
+#line 340 "parser.yy" /* yacc.c:1646  */
+    { (yyval.constant) = build_constantStr( assign_strptr((yyvsp[0].tok)) ); }
+#line 4532 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 17:
-
-/* Line 1806 of yacc.c  */
-#line 342 "parser.yy"
-    {
-                        appendStr( (yyvsp[(1) - (2)].constant)->get_constant()->get_value(), (yyvsp[(2) - (2)].tok) );
-                        delete (yyvsp[(2) - (2)].tok);                                                                  // allocated by lexer
-                        (yyval.constant) = (yyvsp[(1) - (2)].constant);
+#line 342 "parser.yy" /* yacc.c:1646  */
+    {
+                        appendStr( (yyvsp[-1].constant)->get_constant()->get_value(), (yyvsp[0].tok) );
+                        delete (yyvsp[0].tok);                                                                  // allocated by lexer
+                        (yyval.constant) = (yyvsp[-1].constant);
                 }
+#line 4542 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 18:
-
-/* Line 1806 of yacc.c  */
-#line 353 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[(1) - (1)].tok) ) ); }
+#line 353 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[0].tok) ) ); }
+#line 4548 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 19:
-
-/* Line 1806 of yacc.c  */
-#line 355 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[(1) - (1)].tok) ) ); }
+#line 355 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[0].tok) ) ); }
+#line 4554 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 20:
-
-/* Line 1806 of yacc.c  */
-#line 357 "parser.yy"
-    { (yyval.en) = (yyvsp[(2) - (3)].en); }
+#line 357 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (yyvsp[-1].en); }
+#line 4560 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 21:
-
-/* Line 1806 of yacc.c  */
-#line 359 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_valexpr( (yyvsp[(2) - (3)].sn) ) ); }
+#line 359 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_valexpr( (yyvsp[-1].sn) ) ); }
+#line 4566 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 23:
-
-/* Line 1806 of yacc.c  */
-#line 369 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Index, (yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en) ) ); }
+#line 369 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Index, (yyvsp[-5].en), (yyvsp[-2].en) ) ); }
+#line 4572 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 24:
-
-/* Line 1806 of yacc.c  */
-#line 371 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_func( (yyvsp[(1) - (4)].en), (yyvsp[(3) - (4)].en) ) ); }
+#line 371 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_func( (yyvsp[-3].en), (yyvsp[-1].en) ) ); }
+#line 4578 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 25:
-
-/* Line 1806 of yacc.c  */
-#line 375 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[(1) - (3)].en), build_varref( (yyvsp[(3) - (3)].tok) ) ) ); }
+#line 375 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[-2].en), build_varref( (yyvsp[0].tok) ) ) ); }
+#line 4584 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 27:
-
-/* Line 1806 of yacc.c  */
-#line 378 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[(1) - (3)].en), build_varref( (yyvsp[(3) - (3)].tok) ) ) ); }
+#line 378 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[-2].en), build_varref( (yyvsp[0].tok) ) ) ); }
+#line 4590 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 29:
-
-/* Line 1806 of yacc.c  */
-#line 381 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::IncrPost, (yyvsp[(1) - (2)].en) ) ); }
+#line 381 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::IncrPost, (yyvsp[-1].en) ) ); }
+#line 4596 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 30:
-
-/* Line 1806 of yacc.c  */
-#line 383 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::DecrPost, (yyvsp[(1) - (2)].en) ) ); }
+#line 383 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::DecrPost, (yyvsp[-1].en) ) ); }
+#line 4602 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 31:
-
-/* Line 1806 of yacc.c  */
-#line 385 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_compoundLiteral( (yyvsp[(2) - (7)].decl), new InitializerNode( (yyvsp[(5) - (7)].in), true ) ) ); }
+#line 385 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_compoundLiteral( (yyvsp[-5].decl), new InitializerNode( (yyvsp[-2].in), true ) ) ); }
+#line 4608 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 32:
-
-/* Line 1806 of yacc.c  */
-#line 387 "parser.yy"
+#line 387 "parser.yy" /* yacc.c:1646  */
     {
                         Token fn;
                         fn.str = new std::string( "?{}" ); // location undefined
-                        (yyval.en) = new ExpressionNode( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( (yyvsp[(1) - (4)].en) )->set_last( (yyvsp[(3) - (4)].en) ) ) );
+                        (yyval.en) = new ExpressionNode( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( (yyvsp[-3].en) )->set_last( (yyvsp[-1].en) ) ) );
                 }
+#line 4618 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 34:
-
-/* Line 1806 of yacc.c  */
-#line 397 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_last( (yyvsp[(3) - (3)].en) )); }
+#line 397 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (ExpressionNode *)( (yyvsp[-2].en)->set_last( (yyvsp[0].en) )); }
+#line 4624 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 35:
-
-/* Line 1806 of yacc.c  */
-#line 402 "parser.yy"
+#line 402 "parser.yy" /* yacc.c:1646  */
     { (yyval.en) = 0; }
+#line 4630 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 38:
-
-/* Line 1806 of yacc.c  */
-#line 408 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_last( (yyvsp[(3) - (3)].en) ); }
+#line 408 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (ExpressionNode *)(yyvsp[-2].en)->set_last( (yyvsp[0].en) ); }
+#line 4636 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 39:
-
-/* Line 1806 of yacc.c  */
-#line 413 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[(1) - (1)].tok) ) ); }
+#line 413 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_varref( (yyvsp[0].tok) ) ); }
+#line 4642 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 40:
-
-/* Line 1806 of yacc.c  */
-#line 417 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[(3) - (3)].en), build_varref( (yyvsp[(1) - (3)].tok) ) ) ); }
+#line 417 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[0].en), build_varref( (yyvsp[-2].tok) ) ) ); }
+#line 4648 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 41:
-
-/* Line 1806 of yacc.c  */
-#line 419 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[(5) - (7)].en), build_varref( (yyvsp[(1) - (7)].tok) ) ) ); }
+#line 419 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_fieldSel( (yyvsp[-2].en), build_varref( (yyvsp[-6].tok) ) ) ); }
+#line 4654 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 42:
-
-/* Line 1806 of yacc.c  */
-#line 421 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[(3) - (3)].en), build_varref( (yyvsp[(1) - (3)].tok) ) ) ); }
+#line 421 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[0].en), build_varref( (yyvsp[-2].tok) ) ) ); }
+#line 4660 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 43:
-
-/* Line 1806 of yacc.c  */
-#line 423 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[(5) - (7)].en), build_varref( (yyvsp[(1) - (7)].tok) ) ) ); }
+#line 423 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_pfieldSel( (yyvsp[-2].en), build_varref( (yyvsp[-6].tok) ) ) ); }
+#line 4666 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 45:
-
-/* Line 1806 of yacc.c  */
-#line 431 "parser.yy"
-    { (yyval.en) = (yyvsp[(1) - (1)].en); }
+#line 431 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (yyvsp[0].en); }
+#line 4672 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 46:
-
-/* Line 1806 of yacc.c  */
-#line 433 "parser.yy"
-    { (yyval.en) = new ExpressionNode( (yyvsp[(1) - (1)].constant) ); }
+#line 433 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( (yyvsp[0].constant) ); }
+#line 4678 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 47:
-
-/* Line 1806 of yacc.c  */
-#line 435 "parser.yy"
-    { (yyval.en) = (yyvsp[(2) - (2)].en)->set_extension( true ); }
+#line 435 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (yyvsp[0].en)->set_extension( true ); }
+#line 4684 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 48:
-
-/* Line 1806 of yacc.c  */
-#line 440 "parser.yy"
-    {
-                        switch ( (yyvsp[(1) - (2)].op) ) {
+#line 440 "parser.yy" /* yacc.c:1646  */
+    {
+                        switch ( (yyvsp[-1].op) ) {
                           case OperKinds::AddressOf:
-                                (yyval.en) = new ExpressionNode( build_addressOf( (yyvsp[(2) - (2)].en) ) );
+                                (yyval.en) = new ExpressionNode( build_addressOf( (yyvsp[0].en) ) );
                                 break;
                           case OperKinds::PointTo:
-                                (yyval.en) = new ExpressionNode( build_unary_val( (yyvsp[(1) - (2)].op), (yyvsp[(2) - (2)].en) ) );
+                                (yyval.en) = new ExpressionNode( build_unary_val( (yyvsp[-1].op), (yyvsp[0].en) ) );
                                 break;
                           default:
@@ -5220 +4698 @@
                         }
                 }
+#line 4701 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 49:
-
-/* Line 1806 of yacc.c  */
-#line 453 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_unary_val( (yyvsp[(1) - (2)].op), (yyvsp[(2) - (2)].en) ) ); }
+#line 453 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_unary_val( (yyvsp[-1].op), (yyvsp[0].en) ) ); }
+#line 4707 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 50:
-
-/* Line 1806 of yacc.c  */
-#line 455 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::Incr, (yyvsp[(2) - (2)].en) ) ); }
+#line 455 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::Incr, (yyvsp[0].en) ) ); }
+#line 4713 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 51:
-
-/* Line 1806 of yacc.c  */
-#line 457 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::Decr, (yyvsp[(2) - (2)].en) ) ); }
+#line 457 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_unary_ptr( OperKinds::Decr, (yyvsp[0].en) ) ); }
+#line 4719 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 52:
-
-/* Line 1806 of yacc.c  */
-#line 459 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_sizeOfexpr( (yyvsp[(2) - (2)].en) ) ); }
+#line 459 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_sizeOfexpr( (yyvsp[0].en) ) ); }
+#line 4725 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 53:
-
-/* Line 1806 of yacc.c  */
-#line 461 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_sizeOftype( (yyvsp[(3) - (4)].decl) ) ); }
+#line 461 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_sizeOftype( (yyvsp[-1].decl) ) ); }
+#line 4731 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 54:
-
-/* Line 1806 of yacc.c  */
-#line 463 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_alignOfexpr( (yyvsp[(2) - (2)].en) ) ); }
+#line 463 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_alignOfexpr( (yyvsp[0].en) ) ); }
+#line 4737 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 55:
-
-/* Line 1806 of yacc.c  */
-#line 465 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_alignOftype( (yyvsp[(3) - (4)].decl) ) ); }
+#line 465 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_alignOftype( (yyvsp[-1].decl) ) ); }
+#line 4743 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 56:
-
-/* Line 1806 of yacc.c  */
-#line 467 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_offsetOf( (yyvsp[(3) - (6)].decl), build_varref( (yyvsp[(5) - (6)].tok) ) ) ); }
+#line 467 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_offsetOf( (yyvsp[-3].decl), build_varref( (yyvsp[-1].tok) ) ) ); }
+#line 4749 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 57:
-
-/* Line 1806 of yacc.c  */
-#line 469 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_attrexpr( build_varref( (yyvsp[(1) - (1)].tok) ), nullptr ) ); }
+#line 469 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_attrexpr( build_varref( (yyvsp[0].tok) ), nullptr ) ); }
+#line 4755 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 58:
-
-/* Line 1806 of yacc.c  */
-#line 471 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_attrexpr( build_varref( (yyvsp[(1) - (4)].tok) ), (yyvsp[(3) - (4)].en) ) ); }
+#line 471 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_attrexpr( build_varref( (yyvsp[-3].tok) ), (yyvsp[-1].en) ) ); }
+#line 4761 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 59:
-
-/* Line 1806 of yacc.c  */
-#line 473 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_attrtype( build_varref( (yyvsp[(1) - (4)].tok) ), (yyvsp[(3) - (4)].decl) ) ); }
+#line 473 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_attrtype( build_varref( (yyvsp[-3].tok) ), (yyvsp[-1].decl) ) ); }
+#line 4767 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 60:
-
-/* Line 1806 of yacc.c  */
-#line 479 "parser.yy"
+#line 479 "parser.yy" /* yacc.c:1646  */
     { (yyval.op) = OperKinds::PointTo; }
+#line 4773 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 61:
-
-/* Line 1806 of yacc.c  */
-#line 480 "parser.yy"
+#line 480 "parser.yy" /* yacc.c:1646  */
     { (yyval.op) = OperKinds::AddressOf; }
+#line 4779 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 62:
-
-/* Line 1806 of yacc.c  */
-#line 486 "parser.yy"
+#line 486 "parser.yy" /* yacc.c:1646  */
     { (yyval.op) = OperKinds::UnPlus; }
+#line 4785 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 63:
-
-/* Line 1806 of yacc.c  */
-#line 487 "parser.yy"
+#line 487 "parser.yy" /* yacc.c:1646  */
     { (yyval.op) = OperKinds::UnMinus; }
+#line 4791 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 64:
-
-/* Line 1806 of yacc.c  */
-#line 488 "parser.yy"
+#line 488 "parser.yy" /* yacc.c:1646  */
     { (yyval.op) = OperKinds::Neg; }
+#line 4797 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 65:
-
-/* Line 1806 of yacc.c  */
-#line 489 "parser.yy"
+#line 489 "parser.yy" /* yacc.c:1646  */
     { (yyval.op) = OperKinds::BitNeg; }
+#line 4803 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 67:
-
-/* Line 1806 of yacc.c  */
-#line 495 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_cast( (yyvsp[(2) - (4)].decl), (yyvsp[(4) - (4)].en) ) ); }
+#line 495 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_cast( (yyvsp[-2].decl), (yyvsp[0].en) ) ); }
+#line 4809 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 68:
-
-/* Line 1806 of yacc.c  */
-#line 497 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_cast( (yyvsp[(2) - (4)].decl), (yyvsp[(4) - (4)].en) ) ); }
+#line 497 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_cast( (yyvsp[-2].decl), (yyvsp[0].en) ) ); }
+#line 4815 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 70:
-
-/* Line 1806 of yacc.c  */
-#line 503 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Mul, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 503 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Mul, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4821 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 71:
-
-/* Line 1806 of yacc.c  */
-#line 505 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Div, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 505 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Div, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4827 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 72:
-
-/* Line 1806 of yacc.c  */
-#line 507 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Mod, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 507 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Mod, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4833 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 74:
-
-/* Line 1806 of yacc.c  */
-#line 513 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Plus, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 513 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Plus, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4839 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 75:
-
-/* Line 1806 of yacc.c  */
-#line 515 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Minus, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 515 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Minus, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4845 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 77:
-
-/* Line 1806 of yacc.c  */
-#line 521 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LShift, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 521 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LShift, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4851 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 78:
-
-/* Line 1806 of yacc.c  */
-#line 523 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::RShift, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 523 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::RShift, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4857 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 80:
-
-/* Line 1806 of yacc.c  */
-#line 529 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 529 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LThan, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4863 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 81:
-
-/* Line 1806 of yacc.c  */
-#line 531 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::GThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 531 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::GThan, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4869 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 82:
-
-/* Line 1806 of yacc.c  */
-#line 533 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LEThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 533 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::LEThan, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4875 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 83:
-
-/* Line 1806 of yacc.c  */
-#line 535 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::GEThan, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 535 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::GEThan, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4881 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 85:
-
-/* Line 1806 of yacc.c  */
-#line 541 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Eq, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 541 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Eq, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4887 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 86:
-
-/* Line 1806 of yacc.c  */
-#line 543 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Neq, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 543 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Neq, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4893 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 88:
-
-/* Line 1806 of yacc.c  */
-#line 549 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::BitAnd, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 549 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::BitAnd, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4899 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 90:
-
-/* Line 1806 of yacc.c  */
-#line 555 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Xor, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 555 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::Xor, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4905 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 92:
-
-/* Line 1806 of yacc.c  */
-#line 561 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::BitOr, (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 561 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_val( OperKinds::BitOr, (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4911 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 94:
-
-/* Line 1806 of yacc.c  */
-#line 567 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_and_or( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en), true ) ); }
+#line 567 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_and_or( (yyvsp[-2].en), (yyvsp[0].en), true ) ); }
+#line 4917 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 96:
-
-/* Line 1806 of yacc.c  */
-#line 573 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_and_or( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en), false ) ); }
+#line 573 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_and_or( (yyvsp[-2].en), (yyvsp[0].en), false ) ); }
+#line 4923 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 98:
-
-/* Line 1806 of yacc.c  */
-#line 579 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_cond( (yyvsp[(1) - (5)].en), (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].en) ) ); }
+#line 579 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_cond( (yyvsp[-4].en), (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4929 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 99:
-
-/* Line 1806 of yacc.c  */
-#line 582 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_cond( (yyvsp[(1) - (4)].en), (yyvsp[(1) - (4)].en), (yyvsp[(4) - (4)].en) ) ); }
+#line 582 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_cond( (yyvsp[-3].en), (yyvsp[-3].en), (yyvsp[0].en) ) ); }
+#line 4935 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 100:
-
-/* Line 1806 of yacc.c  */
-#line 584 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_cond( (yyvsp[(1) - (5)].en), (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].en) ) ); }
+#line 584 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_cond( (yyvsp[-4].en), (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4941 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 103:
-
-/* Line 1806 of yacc.c  */
-#line 595 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_binary_ptr( (yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 595 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_binary_ptr( (yyvsp[-1].op), (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 4947 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 104:
-
-/* Line 1806 of yacc.c  */
-#line 597 "parser.yy"
-    { (yyval.en) = ( (yyvsp[(2) - (2)].en) == 0 ) ? (yyvsp[(1) - (2)].en) : new ExpressionNode( build_binary_ptr( OperKinds::Assign, (yyvsp[(1) - (2)].en), (yyvsp[(2) - (2)].en) ) ); }
+#line 597 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = ( (yyvsp[0].en) == 0 ) ? (yyvsp[-1].en) : new ExpressionNode( build_binary_ptr( OperKinds::Assign, (yyvsp[-1].en), (yyvsp[0].en) ) ); }
+#line 4953 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 105:
-
-/* Line 1806 of yacc.c  */
-#line 602 "parser.yy"
+#line 602 "parser.yy" /* yacc.c:1646  */
     { (yyval.en) = nullptr; }
+#line 4959 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 107:
-
-/* Line 1806 of yacc.c  */
-#line 607 "parser.yy"
+#line 607 "parser.yy" /* yacc.c:1646  */
     { (yyval.op) = OperKinds::Assign; }
+#line 4965 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 108:
-
-/* Line 1806 of yacc.c  */
-#line 608 "parser.yy"
+#line 608 "parser.yy" /* yacc.c:1646  */
     { (yyval.op) = OperKinds::MulAssn; }
+#line 4971 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 109:
-
-/* Line 1806 of yacc.c  */
-#line 609 "parser.yy"
+#line 609 "parser.yy" /* yacc.c:1646  */
     { (yyval.op) = OperKinds::DivAssn; }
+#line 4977 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 110:
-
-/* Line 1806 of yacc.c  */
-#line 610 "parser.yy"
+#line 610 "parser.yy" /* yacc.c:1646  */
     { (yyval.op) = OperKinds::ModAssn; }
+#line 4983 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 111:
-
-/* Line 1806 of yacc.c  */
-#line 611 "parser.yy"
+#line 611 "parser.yy" /* yacc.c:1646  */
     { (yyval.op) = OperKinds::PlusAssn; }
+#line 4989 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 112:
-
-/* Line 1806 of yacc.c  */
-#line 612 "parser.yy"
+#line 612 "parser.yy" /* yacc.c:1646  */
     { (yyval.op) = OperKinds::MinusAssn; }
+#line 4995 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 113:
-
-/* Line 1806 of yacc.c  */
-#line 613 "parser.yy"
+#line 613 "parser.yy" /* yacc.c:1646  */
     { (yyval.op) = OperKinds::LSAssn; }
+#line 5001 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 114:
-
-/* Line 1806 of yacc.c  */
-#line 614 "parser.yy"
+#line 614 "parser.yy" /* yacc.c:1646  */
     { (yyval.op) = OperKinds::RSAssn; }
+#line 5007 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 115:
-
-/* Line 1806 of yacc.c  */
-#line 615 "parser.yy"
+#line 615 "parser.yy" /* yacc.c:1646  */
     { (yyval.op) = OperKinds::AndAssn; }
+#line 5013 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 116:
-
-/* Line 1806 of yacc.c  */
-#line 616 "parser.yy"
+#line 616 "parser.yy" /* yacc.c:1646  */
     { (yyval.op) = OperKinds::ERAssn; }
+#line 5019 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 117:
-
-/* Line 1806 of yacc.c  */
-#line 617 "parser.yy"
+#line 617 "parser.yy" /* yacc.c:1646  */
     { (yyval.op) = OperKinds::OrAssn; }
+#line 5025 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 118:
-
-/* Line 1806 of yacc.c  */
-#line 624 "parser.yy"
+#line 624 "parser.yy" /* yacc.c:1646  */
     { (yyval.en) = new ExpressionNode( build_tuple() ); }
+#line 5031 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 119:
-
-/* Line 1806 of yacc.c  */
-#line 626 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_tuple( (yyvsp[(3) - (5)].en) ) ); }
+#line 626 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_tuple( (yyvsp[-2].en) ) ); }
+#line 5037 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 120:
-
-/* Line 1806 of yacc.c  */
-#line 628 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_tuple( (ExpressionNode *)(new ExpressionNode( nullptr ) )->set_last( (yyvsp[(4) - (6)].en) ) ) ); }
+#line 628 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_tuple( (ExpressionNode *)(new ExpressionNode( nullptr ) )->set_last( (yyvsp[-2].en) ) ) ); }
+#line 5043 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 121:
-
-/* Line 1806 of yacc.c  */
-#line 630 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_tuple( (ExpressionNode *)(yyvsp[(3) - (7)].en)->set_last( (yyvsp[(5) - (7)].en) ) ) ); }
+#line 630 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_tuple( (ExpressionNode *)(yyvsp[-4].en)->set_last( (yyvsp[-2].en) ) ) ); }
+#line 5049 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 123:
-
-/* Line 1806 of yacc.c  */
-#line 636 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_last( (yyvsp[(3) - (3)].en) ); }
+#line 636 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (ExpressionNode *)(yyvsp[-2].en)->set_last( (yyvsp[0].en) ); }
+#line 5055 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 125:
-
-/* Line 1806 of yacc.c  */
-#line 642 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_comma( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 642 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_comma( (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 5061 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 126:
-
-/* Line 1806 of yacc.c  */
-#line 647 "parser.yy"
+#line 647 "parser.yy" /* yacc.c:1646  */
     { (yyval.en) = 0; }
+#line 5067 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 130:
-
-/* Line 1806 of yacc.c  */
-#line 656 "parser.yy"
-    { (yyval.sn) = (yyvsp[(1) - (1)].sn); }
+#line 656 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (yyvsp[0].sn); }
+#line 5073 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 136:
-
-/* Line 1806 of yacc.c  */
-#line 663 "parser.yy"
+#line 663 "parser.yy" /* yacc.c:1646  */
     {
                         Token fn;
                         fn.str = new std::string( "^?{}" ); // location undefined
-                        (yyval.sn) = new StatementNode( build_expr( new ExpressionNode( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( (yyvsp[(2) - (6)].en) )->set_last( (yyvsp[(4) - (6)].en) ) ) ) ) );
+                        (yyval.sn) = new StatementNode( build_expr( new ExpressionNode( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( (yyvsp[-4].en) )->set_last( (yyvsp[-2].en) ) ) ) ) );
                 }
+#line 5083 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 137:
-
-/* Line 1806 of yacc.c  */
-#line 673 "parser.yy"
-    {
-                        (yyval.sn) = (yyvsp[(4) - (4)].sn)->add_label( (yyvsp[(1) - (4)].tok) );
+#line 673 "parser.yy" /* yacc.c:1646  */
+    {
+                        (yyval.sn) = (yyvsp[0].sn)->add_label( (yyvsp[-3].tok) );
                 }
+#line 5091 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 138:
-
-/* Line 1806 of yacc.c  */
-#line 680 "parser.yy"
+#line 680 "parser.yy" /* yacc.c:1646  */
     { (yyval.sn) = new StatementNode( build_compound( (StatementNode *)0 ) ); }
+#line 5097 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 139:
-
-/* Line 1806 of yacc.c  */
-#line 687 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_compound( (yyvsp[(5) - (7)].sn) ) ); }
+#line 687 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_compound( (yyvsp[-2].sn) ) ); }
+#line 5103 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 141:
-
-/* Line 1806 of yacc.c  */
-#line 693 "parser.yy"
-    { if ( (yyvsp[(1) - (3)].sn) != 0 ) { (yyvsp[(1) - (3)].sn)->set_last( (yyvsp[(3) - (3)].sn) ); (yyval.sn) = (yyvsp[(1) - (3)].sn); } }
+#line 693 "parser.yy" /* yacc.c:1646  */
+    { if ( (yyvsp[-2].sn) != 0 ) { (yyvsp[-2].sn)->set_last( (yyvsp[0].sn) ); (yyval.sn) = (yyvsp[-2].sn); } }
+#line 5109 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 142:
-
-/* Line 1806 of yacc.c  */
-#line 698 "parser.yy"
-    { (yyval.sn) = new StatementNode( (yyvsp[(1) - (1)].decl) ); }
+#line 698 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( (yyvsp[0].decl) ); }
+#line 5115 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 143:
-
-/* Line 1806 of yacc.c  */
-#line 700 "parser.yy"
+#line 700 "parser.yy" /* yacc.c:1646  */
     {   // mark all fields in list
-                        for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
+                        for ( DeclarationNode *iter = (yyvsp[0].decl); iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
                                 iter->set_extension( true );
-                        (yyval.sn) = new StatementNode( (yyvsp[(2) - (2)].decl) );
+                        (yyval.sn) = new StatementNode( (yyvsp[0].decl) );
                 }
+#line 5125 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 144:
-
-/* Line 1806 of yacc.c  */
-#line 706 "parser.yy"
-    { (yyval.sn) = new StatementNode( (yyvsp[(1) - (1)].decl) ); }
+#line 706 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( (yyvsp[0].decl) ); }
+#line 5131 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 147:
-
-/* Line 1806 of yacc.c  */
-#line 713 "parser.yy"
-    { if ( (yyvsp[(1) - (2)].sn) != 0 ) { (yyvsp[(1) - (2)].sn)->set_last( (yyvsp[(2) - (2)].sn) ); (yyval.sn) = (yyvsp[(1) - (2)].sn); } }
+#line 713 "parser.yy" /* yacc.c:1646  */
+    { if ( (yyvsp[-1].sn) != 0 ) { (yyvsp[-1].sn)->set_last( (yyvsp[0].sn) ); (yyval.sn) = (yyvsp[-1].sn); } }
+#line 5137 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 148:
-
-/* Line 1806 of yacc.c  */
-#line 718 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_expr( (yyvsp[(1) - (2)].en) ) ); }
+#line 718 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_expr( (yyvsp[-1].en) ) ); }
+#line 5143 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 149:
-
-/* Line 1806 of yacc.c  */
-#line 724 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_if( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn), nullptr ) ); }
+#line 724 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_if( (yyvsp[-2].en), (yyvsp[0].sn), nullptr ) ); }
+#line 5149 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 150:
-
-/* Line 1806 of yacc.c  */
-#line 726 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_if( (yyvsp[(3) - (7)].en), (yyvsp[(5) - (7)].sn), (yyvsp[(7) - (7)].sn) ) ); }
+#line 726 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_if( (yyvsp[-4].en), (yyvsp[-2].sn), (yyvsp[0].sn) ) ); }
+#line 5155 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 151:
-
-/* Line 1806 of yacc.c  */
-#line 728 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_switch( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ) ); }
+#line 728 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_switch( (yyvsp[-2].en), (yyvsp[0].sn) ) ); }
+#line 5161 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 152:
-
-/* Line 1806 of yacc.c  */
-#line 730 "parser.yy"
-    {
-                        StatementNode *sw = new StatementNode( build_switch( (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) ) );
+#line 730 "parser.yy" /* yacc.c:1646  */
+    {
+                        StatementNode *sw = new StatementNode( build_switch( (yyvsp[-6].en), (yyvsp[-1].sn) ) );
                         // The semantics of the declaration list is changed to include associated initialization, which is performed
                         // *before* the transfer to the appropriate case clause by hoisting the declarations into a compound
@@ -5768 +5170 @@
                         // therefore, are removed from the grammar even though C allows it. The change also applies to choose
                         // statement.
-                        (yyval.sn) = (yyvsp[(7) - (9)].decl) != 0 ? new StatementNode( build_compound( (StatementNode *)((new StatementNode( (yyvsp[(7) - (9)].decl) ))->set_last( sw )) ) ) : sw;
+                        (yyval.sn) = (yyvsp[-2].decl) != 0 ? new StatementNode( build_compound( (StatementNode *)((new StatementNode( (yyvsp[-2].decl) ))->set_last( sw )) ) ) : sw;
                 }
+#line 5175 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 153:
-
-/* Line 1806 of yacc.c  */
-#line 740 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_switch( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ) ); }
+#line 740 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_switch( (yyvsp[-2].en), (yyvsp[0].sn) ) ); }
+#line 5181 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 154:
-
-/* Line 1806 of yacc.c  */
-#line 742 "parser.yy"
-    {
-                        StatementNode *sw = new StatementNode( build_switch( (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) ) );
-                        (yyval.sn) = (yyvsp[(7) - (9)].decl) != 0 ? new StatementNode( build_compound( (StatementNode *)((new StatementNode( (yyvsp[(7) - (9)].decl) ))->set_last( sw )) ) ) : sw;
+#line 742 "parser.yy" /* yacc.c:1646  */
+    {
+                        StatementNode *sw = new StatementNode( build_switch( (yyvsp[-6].en), (yyvsp[-1].sn) ) );
+                        (yyval.sn) = (yyvsp[-2].decl) != 0 ? new StatementNode( build_compound( (StatementNode *)((new StatementNode( (yyvsp[-2].decl) ))->set_last( sw )) ) ) : sw;
                 }
+#line 5190 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 155:
-
-/* Line 1806 of yacc.c  */
-#line 752 "parser.yy"
-    { (yyval.en) = (yyvsp[(1) - (1)].en); }
+#line 752 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (yyvsp[0].en); }
+#line 5196 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 156:
-
-/* Line 1806 of yacc.c  */
-#line 754 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_range( (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ) ); }
+#line 754 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_range( (yyvsp[-2].en), (yyvsp[0].en) ) ); }
+#line 5202 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 158:
-
-/* Line 1806 of yacc.c  */
-#line 759 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_case( (yyvsp[(1) - (1)].en) ) ); }
+#line 759 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_case( (yyvsp[0].en) ) ); }
+#line 5208 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 159:
-
-/* Line 1806 of yacc.c  */
-#line 761 "parser.yy"
-    { (yyval.sn) = (StatementNode *)((yyvsp[(1) - (3)].sn)->set_last( new StatementNode( build_case( (yyvsp[(3) - (3)].en) ) ) ) ); }
+#line 761 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (StatementNode *)((yyvsp[-2].sn)->set_last( new StatementNode( build_case( (yyvsp[0].en) ) ) ) ); }
+#line 5214 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 160:
-
-/* Line 1806 of yacc.c  */
-#line 765 "parser.yy"
-    { (yyval.sn) = (yyvsp[(2) - (3)].sn); }
+#line 765 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (yyvsp[-1].sn); }
+#line 5220 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 161:
-
-/* Line 1806 of yacc.c  */
-#line 766 "parser.yy"
+#line 766 "parser.yy" /* yacc.c:1646  */
     { (yyval.sn) = new StatementNode( build_default() ); }
+#line 5226 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 163:
-
-/* Line 1806 of yacc.c  */
-#line 772 "parser.yy"
-    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (2)].sn)->set_last( (yyvsp[(2) - (2)].sn) )); }
+#line 772 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (StatementNode *)( (yyvsp[-1].sn)->set_last( (yyvsp[0].sn) )); }
+#line 5232 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 164:
-
-/* Line 1806 of yacc.c  */
-#line 776 "parser.yy"
-    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( new StatementNode( build_compound( (yyvsp[(2) - (2)].sn) ) ) ); }
+#line 776 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (yyvsp[-1].sn)->append_last_case( new StatementNode( build_compound( (yyvsp[0].sn) ) ) ); }
+#line 5238 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 165:
-
-/* Line 1806 of yacc.c  */
-#line 781 "parser.yy"
+#line 781 "parser.yy" /* yacc.c:1646  */
     { (yyval.sn) = 0; }
+#line 5244 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 167:
-
-/* Line 1806 of yacc.c  */
-#line 787 "parser.yy"
-    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( new StatementNode( build_compound( (yyvsp[(2) - (2)].sn) ) ) ); }
+#line 787 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (yyvsp[-1].sn)->append_last_case( new StatementNode( build_compound( (yyvsp[0].sn) ) ) ); }
+#line 5250 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 168:
-
-/* Line 1806 of yacc.c  */
-#line 789 "parser.yy"
-    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_last( (yyvsp[(2) - (3)].sn)->append_last_case( new StatementNode( build_compound( (yyvsp[(3) - (3)].sn) ) ) ) ) ); }
+#line 789 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (StatementNode *)( (yyvsp[-2].sn)->set_last( (yyvsp[-1].sn)->append_last_case( new StatementNode( build_compound( (yyvsp[0].sn) ) ) ) ) ); }
+#line 5256 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 169:
-
-/* Line 1806 of yacc.c  */
-#line 794 "parser.yy"
+#line 794 "parser.yy" /* yacc.c:1646  */
     { (yyval.sn) = 0; }
+#line 5262 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 171:
-
-/* Line 1806 of yacc.c  */
-#line 800 "parser.yy"
-    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( (yyvsp[(2) - (2)].sn) ); }
+#line 800 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (yyvsp[-1].sn)->append_last_case( (yyvsp[0].sn) ); }
+#line 5268 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 172:
-
-/* Line 1806 of yacc.c  */
-#line 802 "parser.yy"
-    { (yyval.sn) = (yyvsp[(1) - (3)].sn)->append_last_case( new StatementNode( build_compound( (StatementNode *)(yyvsp[(2) - (3)].sn)->set_last( (yyvsp[(3) - (3)].sn) ) ) ) ); }
+#line 802 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (yyvsp[-2].sn)->append_last_case( new StatementNode( build_compound( (StatementNode *)(yyvsp[-1].sn)->set_last( (yyvsp[0].sn) ) ) ) ); }
+#line 5274 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 173:
-
-/* Line 1806 of yacc.c  */
-#line 804 "parser.yy"
-    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_last( (yyvsp[(2) - (3)].sn)->append_last_case( (yyvsp[(3) - (3)].sn) ))); }
+#line 804 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (StatementNode *)( (yyvsp[-2].sn)->set_last( (yyvsp[-1].sn)->append_last_case( (yyvsp[0].sn) ))); }
+#line 5280 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 174:
-
-/* Line 1806 of yacc.c  */
-#line 806 "parser.yy"
-    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (4)].sn)->set_last( (yyvsp[(2) - (4)].sn)->append_last_case( new StatementNode( build_compound( (StatementNode *)(yyvsp[(3) - (4)].sn)->set_last( (yyvsp[(4) - (4)].sn) ) ) ) ) ) ); }
+#line 806 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (StatementNode *)( (yyvsp[-3].sn)->set_last( (yyvsp[-2].sn)->append_last_case( new StatementNode( build_compound( (StatementNode *)(yyvsp[-1].sn)->set_last( (yyvsp[0].sn) ) ) ) ) ) ); }
+#line 5286 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 175:
-
-/* Line 1806 of yacc.c  */
-#line 811 "parser.yy"
+#line 811 "parser.yy" /* yacc.c:1646  */
     { (yyval.sn) = new StatementNode( build_branch( "", BranchStmt::Break ) ); }
+#line 5292 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 177:
-
-/* Line 1806 of yacc.c  */
-#line 817 "parser.yy"
+#line 817 "parser.yy" /* yacc.c:1646  */
     { (yyval.sn) = 0; }
+#line 5298 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 178:
-
-/* Line 1806 of yacc.c  */
-#line 819 "parser.yy"
+#line 819 "parser.yy" /* yacc.c:1646  */
     { (yyval.sn) = 0; }
+#line 5304 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 179:
-
-/* Line 1806 of yacc.c  */
-#line 824 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_while( (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ) ); }
+#line 824 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_while( (yyvsp[-2].en), (yyvsp[0].sn) ) ); }
+#line 5310 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 180:
-
-/* Line 1806 of yacc.c  */
-#line 826 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_while( (yyvsp[(5) - (7)].en), (yyvsp[(2) - (7)].sn) ) ); }
+#line 826 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_while( (yyvsp[-2].en), (yyvsp[-5].sn) ) ); }
+#line 5316 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 181:
-
-/* Line 1806 of yacc.c  */
-#line 828 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_for( (yyvsp[(4) - (6)].fctl), (yyvsp[(6) - (6)].sn) ) ); }
+#line 828 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_for( (yyvsp[-2].fctl), (yyvsp[0].sn) ) ); }
+#line 5322 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 182:
-
-/* Line 1806 of yacc.c  */
-#line 833 "parser.yy"
-    { (yyval.fctl) = new ForCtl( (yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].en) ); }
+#line 833 "parser.yy" /* yacc.c:1646  */
+    { (yyval.fctl) = new ForCtl( (yyvsp[-5].en), (yyvsp[-2].en), (yyvsp[0].en) ); }
+#line 5328 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 183:
-
-/* Line 1806 of yacc.c  */
-#line 835 "parser.yy"
-    { (yyval.fctl) = new ForCtl( (yyvsp[(1) - (4)].decl), (yyvsp[(2) - (4)].en), (yyvsp[(4) - (4)].en) ); }
+#line 835 "parser.yy" /* yacc.c:1646  */
+    { (yyval.fctl) = new ForCtl( (yyvsp[-3].decl), (yyvsp[-2].en), (yyvsp[0].en) ); }
+#line 5334 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 184:
-
-/* Line 1806 of yacc.c  */
-#line 840 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_branch( *(yyvsp[(2) - (3)].tok), BranchStmt::Goto ) ); }
+#line 840 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_branch( assign_strptr((yyvsp[-1].tok)), BranchStmt::Goto ) ); }
+#line 5340 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 185:
-
-/* Line 1806 of yacc.c  */
-#line 844 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_computedgoto( (yyvsp[(3) - (4)].en) ) ); }
+#line 844 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_computedgoto( (yyvsp[-1].en) ) ); }
+#line 5346 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 186:
-
-/* Line 1806 of yacc.c  */
-#line 847 "parser.yy"
+#line 847 "parser.yy" /* yacc.c:1646  */
     { (yyval.sn) = new StatementNode( build_branch( "", BranchStmt::Continue ) ); }
+#line 5352 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 187:
-
-/* Line 1806 of yacc.c  */
-#line 851 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_branch( *(yyvsp[(2) - (3)].tok), BranchStmt::Continue ) ); delete (yyvsp[(2) - (3)].tok); }
+#line 851 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_branch( assign_strptr((yyvsp[-1].tok)), BranchStmt::Continue ) ); }
+#line 5358 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 188:
-
-/* Line 1806 of yacc.c  */
-#line 854 "parser.yy"
+#line 854 "parser.yy" /* yacc.c:1646  */
     { (yyval.sn) = new StatementNode( build_branch( "", BranchStmt::Break ) ); }
+#line 5364 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 189:
-
-/* Line 1806 of yacc.c  */
-#line 858 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_branch( *(yyvsp[(2) - (3)].tok), BranchStmt::Break ) ); delete (yyvsp[(2) - (3)].tok); }
+#line 858 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_branch( assign_strptr((yyvsp[-1].tok)), BranchStmt::Break ) ); }
+#line 5370 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 190:
-
-/* Line 1806 of yacc.c  */
-#line 860 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_return( (yyvsp[(2) - (3)].en) ) ); }
+#line 860 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_return( (yyvsp[-1].en) ) ); }
+#line 5376 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 191:
-
-/* Line 1806 of yacc.c  */
-#line 862 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_throw( (yyvsp[(2) - (3)].en) ) ); }
+#line 862 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_throw( (yyvsp[-1].en) ) ); }
+#line 5382 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 192:
-
-/* Line 1806 of yacc.c  */
-#line 864 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_throw( (yyvsp[(2) - (3)].en) ) ); }
+#line 864 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_throw( (yyvsp[-1].en) ) ); }
+#line 5388 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 193:
-
-/* Line 1806 of yacc.c  */
-#line 866 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_throw( (yyvsp[(2) - (5)].en) ) ); }
+#line 866 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_throw( (yyvsp[-3].en) ) ); }
+#line 5394 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 194:
-
-/* Line 1806 of yacc.c  */
-#line 871 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_try( (yyvsp[(2) - (3)].sn), (yyvsp[(3) - (3)].sn), 0 ) ); }
+#line 871 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_try( (yyvsp[-1].sn), (yyvsp[0].sn), 0 ) ); }
+#line 5400 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 195:
-
-/* Line 1806 of yacc.c  */
-#line 873 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_try( (yyvsp[(2) - (3)].sn), 0, (yyvsp[(3) - (3)].sn) ) ); }
+#line 873 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_try( (yyvsp[-1].sn), 0, (yyvsp[0].sn) ) ); }
+#line 5406 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 196:
-
-/* Line 1806 of yacc.c  */
-#line 875 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_try( (yyvsp[(2) - (4)].sn), (yyvsp[(3) - (4)].sn), (yyvsp[(4) - (4)].sn) ) ); }
+#line 875 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_try( (yyvsp[-2].sn), (yyvsp[-1].sn), (yyvsp[0].sn) ) ); }
+#line 5412 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 198:
-
-/* Line 1806 of yacc.c  */
-#line 882 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_catch( 0, (yyvsp[(5) - (5)].sn), true ) ); }
+#line 882 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_catch( 0, (yyvsp[0].sn), true ) ); }
+#line 5418 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 199:
-
-/* Line 1806 of yacc.c  */
-#line 884 "parser.yy"
-    { (yyval.sn) = (StatementNode *)(yyvsp[(1) - (6)].sn)->set_last( new StatementNode( build_catch( 0, (yyvsp[(6) - (6)].sn), true ) ) ); }
+#line 884 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (StatementNode *)(yyvsp[-5].sn)->set_last( new StatementNode( build_catch( 0, (yyvsp[0].sn), true ) ) ); }
+#line 5424 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 200:
-
-/* Line 1806 of yacc.c  */
-#line 886 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_catch( 0, (yyvsp[(5) - (5)].sn), true ) ); }
+#line 886 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_catch( 0, (yyvsp[0].sn), true ) ); }
+#line 5430 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 201:
-
-/* Line 1806 of yacc.c  */
-#line 888 "parser.yy"
-    { (yyval.sn) = (StatementNode *)(yyvsp[(1) - (6)].sn)->set_last( new StatementNode( build_catch( 0, (yyvsp[(6) - (6)].sn), true ) ) ); }
+#line 888 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (StatementNode *)(yyvsp[-5].sn)->set_last( new StatementNode( build_catch( 0, (yyvsp[0].sn), true ) ) ); }
+#line 5436 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 202:
-
-/* Line 1806 of yacc.c  */
-#line 893 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_catch( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ) ); }
+#line 893 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_catch( (yyvsp[-4].decl), (yyvsp[-1].sn) ) ); }
+#line 5442 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 203:
-
-/* Line 1806 of yacc.c  */
-#line 895 "parser.yy"
-    { (yyval.sn) = (StatementNode *)(yyvsp[(1) - (10)].sn)->set_last( new StatementNode( build_catch( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ) ); }
+#line 895 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (StatementNode *)(yyvsp[-9].sn)->set_last( new StatementNode( build_catch( (yyvsp[-4].decl), (yyvsp[-1].sn) ) ) ); }
+#line 5448 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 204:
-
-/* Line 1806 of yacc.c  */
-#line 897 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_catch( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ) ); }
+#line 897 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_catch( (yyvsp[-4].decl), (yyvsp[-1].sn) ) ); }
+#line 5454 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 205:
-
-/* Line 1806 of yacc.c  */
-#line 899 "parser.yy"
-    { (yyval.sn) = (StatementNode *)(yyvsp[(1) - (10)].sn)->set_last( new StatementNode( build_catch( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ) ); }
+#line 899 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = (StatementNode *)(yyvsp[-9].sn)->set_last( new StatementNode( build_catch( (yyvsp[-4].decl), (yyvsp[-1].sn) ) ) ); }
+#line 5460 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 206:
-
-/* Line 1806 of yacc.c  */
-#line 904 "parser.yy"
-    {
-                        (yyval.sn) = new StatementNode( build_finally( (yyvsp[(2) - (2)].sn) ) );
+#line 904 "parser.yy" /* yacc.c:1646  */
+    {
+                        (yyval.sn) = new StatementNode( build_finally( (yyvsp[0].sn) ) );
                 }
+#line 5468 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 208:
-
-/* Line 1806 of yacc.c  */
-#line 917 "parser.yy"
+#line 917 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) );
+                        (yyval.decl) = (yyvsp[0].decl)->addType( (yyvsp[-1].decl) );
                 }
+#line 5477 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 209:
-
-/* Line 1806 of yacc.c  */
-#line 922 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
+#line 922 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[0].decl)->addType( (yyvsp[-1].decl) ); }
+#line 5483 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 210:
-
-/* Line 1806 of yacc.c  */
-#line 924 "parser.yy"
+#line 924 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(1) - (2)].decl)->addName( (yyvsp[(2) - (2)].tok) );
+                        (yyval.decl) = (yyvsp[-1].decl)->addName( (yyvsp[0].tok) );
                 }
+#line 5492 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 212:
-
-/* Line 1806 of yacc.c  */
-#line 933 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[(2) - (6)].flag), (yyvsp[(4) - (6)].constant), 0 ) ); }
+#line 933 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[-4].flag), (yyvsp[-2].constant), 0 ) ); }
+#line 5498 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 213:
-
-/* Line 1806 of yacc.c  */
-#line 935 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[(2) - (8)].flag), (yyvsp[(4) - (8)].constant), (yyvsp[(6) - (8)].en) ) ); }
+#line 935 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[-6].flag), (yyvsp[-4].constant), (yyvsp[-2].en) ) ); }
+#line 5504 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 214:
-
-/* Line 1806 of yacc.c  */
-#line 937 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[(2) - (10)].flag), (yyvsp[(4) - (10)].constant), (yyvsp[(6) - (10)].en), (yyvsp[(8) - (10)].en) ) ); }
+#line 937 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[-8].flag), (yyvsp[-6].constant), (yyvsp[-4].en), (yyvsp[-2].en) ) ); }
+#line 5510 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 215:
-
-/* Line 1806 of yacc.c  */
-#line 939 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[(2) - (12)].flag), (yyvsp[(4) - (12)].constant), (yyvsp[(6) - (12)].en), (yyvsp[(8) - (12)].en), (yyvsp[(10) - (12)].en) ) ); }
+#line 939 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[-10].flag), (yyvsp[-8].constant), (yyvsp[-6].en), (yyvsp[-4].en), (yyvsp[-2].en) ) ); }
+#line 5516 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 216:
-
-/* Line 1806 of yacc.c  */
-#line 941 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[(2) - (14)].flag), (yyvsp[(5) - (14)].constant), 0, (yyvsp[(8) - (14)].en), (yyvsp[(10) - (14)].en), (yyvsp[(12) - (14)].label) ) ); }
+#line 941 "parser.yy" /* yacc.c:1646  */
+    { (yyval.sn) = new StatementNode( build_asmstmt( (yyvsp[-12].flag), (yyvsp[-9].constant), 0, (yyvsp[-6].en), (yyvsp[-4].en), (yyvsp[-2].label) ) ); }
+#line 5522 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 217:
-
-/* Line 1806 of yacc.c  */
-#line 946 "parser.yy"
+#line 946 "parser.yy" /* yacc.c:1646  */
     { (yyval.flag) = false; }
+#line 5528 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 218:
-
-/* Line 1806 of yacc.c  */
-#line 948 "parser.yy"
+#line 948 "parser.yy" /* yacc.c:1646  */
     { (yyval.flag) = true; }
+#line 5534 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 219:
-
-/* Line 1806 of yacc.c  */
-#line 953 "parser.yy"
+#line 953 "parser.yy" /* yacc.c:1646  */
     { (yyval.en) = 0; }
+#line 5540 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 222:
-
-/* Line 1806 of yacc.c  */
-#line 960 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_last( (yyvsp[(3) - (3)].en) ); }
+#line 960 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (ExpressionNode *)(yyvsp[-2].en)->set_last( (yyvsp[0].en) ); }
+#line 5546 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 223:
-
-/* Line 1806 of yacc.c  */
-#line 965 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_asmexpr( 0, (yyvsp[(1) - (4)].constant), (yyvsp[(3) - (4)].en) ) ); }
+#line 965 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_asmexpr( 0, (yyvsp[-3].constant), (yyvsp[-1].en) ) ); }
+#line 5552 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 224:
-
-/* Line 1806 of yacc.c  */
-#line 967 "parser.yy"
-    { (yyval.en) = new ExpressionNode( build_asmexpr( (yyvsp[(2) - (7)].en), (yyvsp[(4) - (7)].constant), (yyvsp[(6) - (7)].en) ) ); }
+#line 967 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( build_asmexpr( (yyvsp[-5].en), (yyvsp[-3].constant), (yyvsp[-1].en) ) ); }
+#line 5558 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 225:
-
-/* Line 1806 of yacc.c  */
-#line 972 "parser.yy"
+#line 972 "parser.yy" /* yacc.c:1646  */
     { (yyval.en) = 0; }
+#line 5564 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 226:
-
-/* Line 1806 of yacc.c  */
-#line 974 "parser.yy"
-    { (yyval.en) = new ExpressionNode( (yyvsp[(1) - (1)].constant) ); }
+#line 974 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = new ExpressionNode( (yyvsp[0].constant) ); }
+#line 5570 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 227:
-
-/* Line 1806 of yacc.c  */
-#line 976 "parser.yy"
-    { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_last( new ExpressionNode( (yyvsp[(3) - (3)].constant) ) ); }
+#line 976 "parser.yy" /* yacc.c:1646  */
+    { (yyval.en) = (ExpressionNode *)(yyvsp[-2].en)->set_last( new ExpressionNode( (yyvsp[0].constant) ) ); }
+#line 5576 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 228:
-
-/* Line 1806 of yacc.c  */
-#line 981 "parser.yy"
-    { (yyval.label) = new LabelNode(); (yyval.label)->labels.push_back( *(yyvsp[(1) - (1)].tok) ); }
+#line 981 "parser.yy" /* yacc.c:1646  */
+    { (yyval.label) = new LabelNode(); (yyval.label)->labels.push_back( assign_strptr((yyvsp[0].tok)) ); }
+#line 5582 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 229:
-
-/* Line 1806 of yacc.c  */
-#line 983 "parser.yy"
-    { (yyval.label) = (yyvsp[(1) - (3)].label); (yyvsp[(1) - (3)].label)->labels.push_back( *(yyvsp[(3) - (3)].tok) ); }
+#line 983 "parser.yy" /* yacc.c:1646  */
+    { (yyval.label) = (yyvsp[-2].label); (yyvsp[-2].label)->labels.push_back( assign_strptr((yyvsp[0].tok)) ); }
+#line 5588 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 230:
-
-/* Line 1806 of yacc.c  */
-#line 990 "parser.yy"
+#line 990 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = 0; }
+#line 5594 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 233:
-
-/* Line 1806 of yacc.c  */
-#line 997 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
+#line 997 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->appendList( (yyvsp[0].decl) ); }
+#line 5600 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 234:
-
-/* Line 1806 of yacc.c  */
-#line 1002 "parser.yy"
+#line 1002 "parser.yy" /* yacc.c:1646  */
     { (yyval.decl) = 0; }
+#line 5606 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 237:
-
-/* Line 1806 of yacc.c  */
-#line 1009 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
+#line 1009 "parser.yy" /* yacc.c:1646  */
+    { (yyval.decl) = (yyvsp[-2].decl)->appendList( (yyvsp[0].decl) ); }
+#line 5612 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 242:
-
-/* Line 1806 of yacc.c  */
-#line 1023 "parser.yy"
+#line 1023 "parser.yy" /* yacc.c:1646  */
     {}
+#line 5618 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 243:
-
-/* Line 1806 of yacc.c  */
-#line 1024 "parser.yy"
+#line 1024 "parser.yy" /* yacc.c:1646  */
     {}
+#line 5624 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 251:
-
-/* Line 1806 of yacc.c  */
-#line 1053 "parser.yy"
+#line 1053 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(1) - (2)].decl)->addInitializer( (yyvsp[(2) - (2)].in) );
+                        (yyval.decl) = (yyvsp[-1].decl)->addInitializer( (yyvsp[0].in) );
                 }
+#line 5633 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 252:
-
-/* Line 1806 of yacc.c  */
-#line 1060 "parser.yy"
+#line 1060 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(2) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) )->addInitializer( (yyvsp[(3) - (3)].in) );;
+                        (yyval.decl) = (yyvsp[-1].decl)->addQualifiers( (yyvsp[-2].decl) )->addInitializer( (yyvsp[0].in) );;
                 }
+#line 5642 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 253:
-
-/* Line 1806 of yacc.c  */
-#line 1065 "parser.yy"
-    {
-                        typedefTable.addToEnclosingScope( *(yyvsp[(5) - (6)].tok), TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(1) - (6)].decl)->appendList( (yyvsp[(1) - (6)].decl)->cloneType( (yyvsp[(5) - (6)].tok) )->addInitializer( (yyvsp[(6) - (6)].in) ) );
+#line 1065 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.addToEnclosingScope( *(yyvsp[-1].tok), TypedefTable::ID );
+                        (yyval.decl) = (yyvsp[-5].decl)->appendList( (yyvsp[-5].decl)->cloneType( (yyvsp[-1].tok) )->addInitializer( (yyvsp[0].in) ) );
                 }
+#line 5651 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 254:
-
-/* Line 1806 of yacc.c  */
-#line 1075 "parser.yy"
-    {
-                        typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
-                        (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) );
+#line 1075 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.setNextIdentifier( *(yyvsp[-1].tok) );
+                        (yyval.decl) = (yyvsp[-2].decl)->addName( (yyvsp[-1].tok) );
                 }
+#line 5660 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 255:
-
-/* Line 1806 of yacc.c  */
-#line 1080 "parser.yy"
-    {
-                        typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
-                        (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) );
+#line 1080 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.setNextIdentifier( *(yyvsp[-1].tok) );
+                        (yyval.decl) = (yyvsp[-2].decl)->addName( (yyvsp[-1].tok) );
                 }
+#line 5669 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 256:
-
-/* Line 1806 of yacc.c  */
-#line 1085 "parser.yy"
-    {
-                        typedefTable.setNextIdentifier( *(yyvsp[(3) - (4)].tok) );
-                        (yyval.decl) = (yyvsp[(2) - (4)].decl)->addQualifiers( (yyvsp[(1) - (4)].decl) )->addName( (yyvsp[(3) - (4)].tok) );
+#line 1085 "parser.yy" /* yacc.c:1646  */
+    {
+                        typedefTable.setNextIdentifier( *(yyvsp[-1].tok) );
+                        (yyval.decl) = (yyvsp[-2].decl)->addQualifiers( (yyvsp[-3].decl) )->addName( (yyvsp[-1].tok) );
                 }
+#line 5678 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 257:
-
-/* Line 1806 of yacc.c  */
-#line 1093 "parser.yy"
+#line 1093 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(1) - (1)].decl);
+                        (yyval.decl) = (yyvsp[0].decl);
                 }
+#line 5687 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 258:
-
-/* Line 1806 of yacc.c  */
-#line 1098 "parser.yy"
+#line 1098 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) );
+                        (yyval.decl) = (yyvsp[0].decl)->addQualifiers( (yyvsp[-1].decl) );
                 }
+#line 5696 "Parser/parser.cc" /* yacc.c:1646  */
     break;
 
   case 259:
-
-/* Line 1806 of yacc.c  */
-#line 1103 "parser.yy"
+#line 1103 "parser.yy" /* yacc.c:1646  */
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) );