Changeset 6066e32

Jenkinsfile

-                      r7d5e243
+                      r6066e32
 //===========================================================================================================
 // Main compilation routine
+// Main compilation routines
 //===========================================================================================================
 //Compilation script is done here but environnement set-up and error handling is done in main loop
 …
+}
-def push_build() {
-        //Don't use the build_stage function which outputs the compiler
-        stage 'Push'
-                status_prefix = 'Push'
-                def out_dir = pwd tmp: true
-                sh "mkdir -p ${out_dir}"
-                //parse git logs to find what changed
-                sh "git remote > ${out_dir}/GIT_REMOTE"
-                git_remote = readFile("${out_dir}/GIT_REMOTE")
-                remoteDoLangExists = git_remote.contains("DoLang")
-                if( !remoteDoLangExists ) {
-                        sh 'git remote add DoLang git@gitlab.do-lang.org:internal/cfa-cc.git'
+                }
-                sh "git push DoLang ${gitRefNewValue}:master"
+}
 //===========================================================================================================
 // Helper classes/variables/routines to make the status and stage name easier to use
 …
 node ('master'){
         boolean doPromoteBuild2DoLang
+        boolean bIsFullBuild
         def err = null
         def log_needed = false
 …
                                                   defaultValue: false,                                          \
                                                   description: 'If true, the build will be promoted to the do-lang git repository (on successful builds only)', \
                                                   name: 'promoteBuild2DoLang'                                   \
+                                                  name: 'isFullBuild'                                   \
                                                 ],                                                              \
                                                 [$class: 'ChoiceParameterDefinition',                           \
 …
                                         ]])
                                 doPromoteBuild2DoLang = promoteBuild2DoLang == 'true'
+                                bIsFullBuild = isFullBuild == 'true'
                                 architectureFlag = buildArchitecture == '64-bit' ? '-m64' : (buildArchitecture == '32-bit' ? '-m32' : 'ERROR')
                                 echo "FULL BUILD = ${doPromoteBuild2DoLang}\nArchitecture = ${buildArchitecture} (flag ${architectureFlag})"
+                                echo "FULL BUILD = ${isFullBuild}\nArchitecture = ${buildArchitecture} (flag ${architectureFlag})"
                                 //Compile using gcc-4.9
                                 currentCC = new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9')
                                 cfa_build(doPromoteBuild2DoLang, architectureFlag)
+                                cfa_build(bIsFullBuild, architectureFlag)
                                 //Compile latex documentation
                                 doc_build()
                                 if( doPromoteBuild2DoLang ) {
+                                if( bIsFullBuild ) {
                                         //Compile using gcc-5
                                         currentCC = new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
 …
                                         currentCC = new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
                                         cfa_build(true, architectureFlag)
-                                        //Push latest changes to do-lang repo
-                                        push_build()
+                                }
+                        }
 …
         finally {
+                //Send email with final results
+                notify_result(doPromoteBuild2DoLang, err, currentBuild.result, log_needed)
+                echo 'Build Completed'
+                //Send email with final results if this is not a full build
+                if( !bIsFullBuild ) {
+                        echo 'Notifying users of result'
+                        email(currentBuild.result, log_needed)
+                }
                 /* Must re-throw exception to propagate error */
 …
 //Routine responsible of sending the email notification once the build is completed
 //===========================================================================================================
-def notify_result(boolean promote, Exception err, String status, boolean log) {
-        echo 'Build completed, sending result notification'
-        if(promote)     {
-                if( err ) {
-                        promote_email(status)
+                }
+        }
-        else {
-                email(status, log)
+        }
+}
-//Email notification on a full build failure
-def promote_email(String status) {
-        //Since tokenizer doesn't work, figure stuff out from the environnement variables and command line
-        //Configurations for email format
-        def email_subject = "[cforall git][PROMOTE - FAILURE]"
-        def email_body = """This is an automated email from the Jenkins build machine. It was
-generated because of a git hooks/post-receive script following
-a ref change was pushed to the repository containing
-the project "UNNAMED PROJECT".
-Check console output at ${env.BUILD_URL} to view the results.
-- Status --------------------------------------------------------------
-PROMOTE FAILURE - ${status}
-"""
-        def email_to = "pabuhr@uwaterloo.ca, rschlunt@uwaterloo.ca, a3moss@uwaterloo.ca, tdelisle@uwaterloo.ca, brice.dobry@huawei.com"
-        //send email notification
-        emailext body: email_body, subject: email_subject, to: email_to, attachLog: true
+}
 //Standard build email notification
 def email(String status, boolean log) {

doc/LaTeXmacros/common.tex

-                      r7d5e243
+                      r6066e32
 %% Created On       : Sat Apr  9 10:06:17 2016
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Sun Jul 10 12:34:09 2016
 %% Update Count     : 205
+%% Last Modified On : Tue Jul 12 20:37:57 2016
+%% Update Count     : 206
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 …
 \lstMakeShortInline©    % single-character for \lstinline
+\let\Oldthebibliography\thebibliography
+\renewcommand\thebibliography[1]{
+  \Oldthebibliography{#1}
+  \setlength{\parskip}{0pt}                     % reduce vertical spacing between references
+  \setlength{\itemsep}{5pt plus 0.3ex}
+}%
 % Local Variables: %
 % tab-width: 4 %

doc/user/user.tex

-                      r7d5e243
+                      r6066e32
 %% Created On       : Wed Apr  6 14:53:29 2016
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Sun Jul 10 12:52:09 2016
 %% Update Count     : 1200
+%% Last Modified On : Wed Jul 13 08:14:39 2016
+%% Update Count     : 1247
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 …
 \item
 \Indexc{-nodebug}\index{compilation option!-nodebug@©-nodebug©}
 The program is linked with the non-debugging version of the unikernel or multikernel, so the execution of the program is faster.
+The program is linked with the non-debugging version of the runtime system, so the execution of the program is faster.
 \Emph{However, no runtime checks or ©assert©s are performed so errors usually result in abnormal program termination.}
 …
 ®&®crc = &cx;                                   §\C{// error, cannot change crc}§
 \end{lstlisting}
+Hence, for type ©& const©, there is no pointer assignment, so ©&rc = &x© is disallowed, and \emph{the address value cannot be ©0© unless an arbitrary pointer is assigned to the reference}.
+In effect, the compiler is managing the addresses for type ©& const© not the programmer, and by a programming discipline of only using references with references, address errors can be prevented.
+Hence, for type ©& const©, there is no pointer assignment, so ©&rc = &x© is disallowed, and \emph{the address value cannot be ©0© unless an arbitrary pointer is assigned to the reference}, e.g.:
+\begin{lstlisting}
+int & const r = *0;                             §\C{// where 0 is the int * zero}§
+\end{lstlisting}
+Otherwise, the compiler is managing the addresses for type ©& const© not the programmer, and by a programming discipline of only using references with references, address errors can be prevented.
 \Index{Initialization} is different than \Index{assignment} because initialization occurs on the empty (uninitialized) storage on an object, while assignment occurs on possibly initialized storage of an object.
 …
 \begin{lstlisting}
 int & f( int & rp );                    §\C{// reference parameter and return}§
 z = f( x ) + f( y );                    §\C{// reference operator added}§
+z = f( x ) + f( y );                    §\C{// reference operator added, temporaries needed for call results}§
 \end{lstlisting}
 Within routine ©f©, it is possible to change the argument by changing the corresponding parameter, and parameter ©rp© can be locally reassigned within ©f©.
 The return reference from ©f© is copied into a compiler generated temporary, which is treated as an initialization.
+Since ©?+?© takes its arguments by value, the references returned from ©f© are used to initialize compiler generated temporaries with value semantics that copy from the references.
 When a pointer/reference parameter has a ©const© value (immutable), it is possible to pass literals and expressions.
 …
 \end{lstlisting}
 The ability to fall-through to the next clause \emph{is} a useful form of control flow, specifically when a sequence of case actions compound:
+\begin{quote2}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{}}
 \begin{lstlisting}
 switch ( argc ) {
 …
+}
 \end{lstlisting}
+&
+\begin{lstlisting}
+if ( argc == 3 ) {
+        // open output file
+        ®// open input file
+®} else if ( argc == 2 ) {
+        ®// open input file
+®} else {
+        // usage message
+}
+\end{lstlisting}
+\end{tabular}
+\end{quote2}
 In this example, case 2 is always done if case 3 is done.
 This control flow is difficult to simulate with if statements or a ©switch© statement without fall-through as code must be duplicated or placed in a separate routine.
 …
 \end{lstlisting}
 However, this situation is handled in other languages without fall-through by allowing a list of case values.
 While fall-through itself is not a problem, the problem occurs when fall-through is the default, as this semantics is not intuitive to most programmers and is different from virtually all other programming languages with a ©switch© statement.
+While fall-through itself is not a problem, the problem occurs when fall-through is the default, as this semantics is unintuitive to many programmers and is different from virtually all other programming languages with a ©switch© statement.
 Hence, default fall-through semantics results in a large number of programming errors as programmers often forget the ©break© statement at the end of a ©case© clause, resulting in inadvertent fall-through.
 …
         if ( j < k ) {
                 ...
+          case 1:               // transfer into "if" statement
+                if ( j < m ) {
+                        ...
+                  case 2:       // transfer into "if" statement
+                        ...
+                }
+        }
+  case 3:
+          ®case 1:®             // transfer into "if" statement
+                ...
+        } // if
+  case 2:
         while ( j < 5 ) {
                 ...
           case 4:               // transfer into "while" statement
+          ®case 3:®             // transfer into "while" statement
                 ...
+        }
+}
+        } // while
+} // switch
 \end{lstlisting}
 The problem with this usage is branching into control structures, which is known to cause both comprehension and technical difficulties.
 …
 \begin{lstlisting}
 switch ( x ) {
         int y = 1;                      §\C{// unreachable initialization}§
         x = 7;                          §\C{// unreachable code}§
+        ®int y = 1;®                            §\C{// unreachable initialization}§
+        ®x = 7;®                                        §\C{// unreachable code without label/branch}§
   case 3: ...
-        y = 3;
         ...
+        ®int z = 0;®                            §\C{// unreachable initialization, cannot appear after case}§
+        z = 2;
+  case 3:
+        ®x = z;®                                        §\C{// without fall through, z is uninitialized}§
+}
 \end{lstlisting}
 While the declaration of the local variable ©y© is useful and its scope is across all ©case© clauses, the initialization for such a variable is defined to never be executed because control always transfers over it.
+Furthermore, any statements before the first ©case© clause can only be executed if labelled and transfered to using a ©goto©, either from outside or inside of the ©switch©.
+As mentioned, transfer into control structures should be forbidden.
+Transfers from within the ©switch© body using a ©goto© are equally unpalatable.
+Furthermore, any statements before the first ©case© clause can only be executed if labelled and transferred to using a ©goto©, either from outside or inside of the ©switch©.
+As mentioned, transfer into control structures should be forbidden;
+transfers from within the ©switch© body using a ©goto© are equally unpalatable.
+As well, the declaration of ©z© is cannot occur after the ©case© because a label can only be attached to a statement, and without a fall through to case 3, ©z© is uninitialized.
 \end{enumerate}
 Before discussing potential language changes to deal with these problems, it is worth observing that in a typical C program:
 \begin{itemize}
 …
 and there is only a medium amount of fall-through from one ©case© clause to the next, and most of these result from a list of case values executing common code, rather than a sequence of case actions that compound.
 \end{itemize}
 These observations help to put the effects of suggested changes into perspective.
+These observations help to put the suggested changes to the ©switch© into perspective.
 \begin{enumerate}
 \item
 …
 still work.
 Nevertheless, reversing the default action would have a non-trivial effect on case actions that compound, such as the above example of processing shell arguments.
+Therefore, to preserve backwards compatibility, it is necessary to introduce a new kind of ©switch© statement, called ©choose©, with no fall-through semantics.
+The ©choose© statement is identical to the new ©switch© statement, except there is no implicit fall-through between case-clauses and the ©break© statement applies to the enclosing loop construct (as for the ©continue© statement in a ©switch© statement).
+It is still possible to fall-through if a case-clause ends with the new keyword ©fallthru©, e.g.:
+Therefore, to preserve backwards compatibility, it is necessary to introduce a new kind of ©switch© statement, called ©choose©, with no implicit fall-through semantics and an explicit fall-through if the last statement of a case-clause ends with the new keyword ©fallthru©, e.g.:
 \begin{lstlisting}
 ®choose® ( i ) {
   case 3:
+  case 1:  case 2:  case 3:
         ...
+        ®fallthru®;             §\C{// explicit fall through}§
+  case 5:
+        ...                             §\C{// implicit end of switch}§
+        ®// implicit end of switch (break)
+  ®case 5:
+        ...
+        ®fallthru®;                                     §\C{// explicit fall through}§
   case 7:
         ...
         ®break®                 §\C{// transfer to end of enclosing loop / switch}§
+        ®break®                                         §\C{// explicit end of switch}§
   default:
         j = 3;
+}
 \end{lstlisting}
+The ability to fall-through is retained because it is a sufficient C-idiom that most C programmers simply expect it, and its absence might discourage these programmers from using the ©choose© statement.
+\item
+Eliminating \Index*{Duff's device} is straightforward and only invalidates a small amount of very questionable code.
+The solution is to allow ©case© clauses to only appear at the same nesting level as the ©switch© body, as is done in most other programming languages with ©switch© statements.
+Like the ©switch© statement, the ©choose© statement retains the fall-through semantics for a list of ©case© clauses;
+the implicit ©break© is applied only at the end of the \emph{statements} following a ©case© clause.
+The explicit ©fallthru© is retained because it is a C-idiom most C programmers expect, and its absence might discourage programmers from using the ©choose© statement.
+As well, allowing an explicit ©break© from the ©choose© is a carry over from the ©switch© statement, and expected by C programmers.
+\item
+\Index*{Duff's device} is eliminated from both ©switch© and ©choose© statements, and only invalidates a small amount of very questionable code.
+Hence, the ©case© clause must appear at the same nesting level as the ©switch©/©choose© body, as is done in most other programming languages with ©switch© statements.
 \item
 The issue of ©default© at locations other than at the end of the cause clause can be solved by using good programming style, and there are a few reasonable situations involving fall-through where the ©default© clause needs to appear is locations other than at the end.
+Therefore, no language change is made for this issue.
+\item
+Dealing with unreachable code at the start of a ©switch© statement is solved by defining the declaration-list, including any associated initialization, at the start of a ©switch© statement body to be executed \emph{before} the transfer to the appropriate ©case© clause.
+This semantics is the same as for declarations at the start of a loop body, which are executed before each iteration of the loop body.
+As well, statements cannot appear before the first ©case© clause.
+The change is compatible for declarations with initialization in this context because existing code cannot assume the initialization has occurred.
+The change is incompatible for statements, but any existing code using it is highly questionable, as in:
+\begin{lstlisting}
+switch ( i ) {
+        L: x = 5;               §\C{// questionable code}§
+Therefore, no change is made for this issue.
+\item
+Dealing with unreachable code in a ©switch©/©choose© body is solved by restricting declarations and associated initialization to the start of statement body, which is executed \emph{before} the transfer to the appropriate ©case© clause.\footnote{
+Essentially, these declarations are hoisted before the statement and both declarations and statement are surrounded by a compound statement.} and precluding statements before the first ©case© clause.
+Further declaration in the statement body are disallowed.
+\begin{lstlisting}
+switch ( x ) {
+        ®int i = 0;®                            §\C{// allowed}§
   case 0:
         ...
+}
+\end{lstlisting}
+The statement after the ©switch© can never be executed unless it is labelled.
+If it is labelled, it must be transfered to from outside or inside the ©switch© statement, neither of which is acceptable control flow.
+        ®int i = 0;®                            §\C{// disallowed}§
+  case 1:
+    {
+                ®int i = 0;®                    §\C{// allowed in any compound statement}§
+                ...
+        }
+  ...
+}
+\end{lstlisting}
 \end{enumerate}
 …
 \section{Exception Handling}
 Exception handling provides two mechanim: change of control flow from a raise to a handler, and commumication from the riase to the handler.
+Exception handling provides two mechanism: change of control flow from a raise to a handler, and communication from the raise to the handler.
 \begin{lstlisting}
 exception void h( int i );
 …
 A facility that let programmers declare specific constants..const Rational 12., for instance. would not be much of an improvement.
 Some facility for defining the creation of values of programmer-defined types from arbitrary integer tokens would be needed.
 The complexity of such a feature doesn.t seem worth the gain.
+The complexity of such a feature does not seem worth the gain.
 For example, to define the constants for a complex type, the programmer would define the following:
 …
 } s;
 \end{lstlisting}
 The problem occurs in accesing these fields using the selection operation ``©.©'':
+The problem occurs in accessing these fields using the selection operation ``©.©'':
 \begin{lstlisting}
 s.0 = 0;        // ambiguity with floating constant .0
 …
 ®s.§\textvisiblespace§1® = 1;
 \end{lstlisting}
 While this sytact is awkward, it is unlikely many programers will name fields of a structure 0 or 1.
+While this syntax is awkward, it is unlikely many programmers will name fields of a structure 0 or 1.
 Like the \Index*[C++]{\CC} lexical problem with closing template-syntax, e.g, ©Foo<Bar<int®>>®©, this issue can be solved with a more powerful lexer/parser.
 …
 In \CFA, multiple definitions are not necessary.
 Within a module, all of the module's global definitions are visible throughout the module.
 For example, the following code compiles, even though isOdd was not declared before being called:
+For example, the following code compiles, even though ©isOdd© was not declared before being called:
 \begin{lstlisting}
 bool isEven(unsigned int x) {
 …
 \item[Difficulty of converting:] keyword clashes are accommodated by syntactic transformations using the \CFA backquote escape-mechanism:
 \begin{lstlisting}
 int `otype` = 3;                                // make keyword an indentifier
+int `otype` = 3;                                // make keyword an identifier
 double `choose` = 3.5;
 \end{lstlisting}
 …
 \begin{description}
 \item[Change:] comma expression is disallowed as subscript
 \item[Rationale:] safety issue to prevent subscripting error for multidimensional arrays: ©x[i,j]© instead of ©x[i][j]©, and this syntactic form then taken by \CFA for new styple arrays.
+\item[Rationale:] safety issue to prevent subscripting error for multidimensional arrays: ©x[i,j]© instead of ©x[i][j]©, and this syntactic form then taken by \CFA for new style arrays.
 \item[Effect on original feature:] change to semantics of well-defined feature.
 \item[Difficulty of converting:] semantic transformation of ©x[i,j]© to ©x[(i,j)]©
 …
 \index{input/output library}
 The goal for the \CFA I/O is to make I/O as simple as possible in the common cases, while fully supporting polmorphism and user defined types in a consistent way.
+The goal for the \CFA I/O is to make I/O as simple as possible in the common cases, while fully supporting polymorphism and user defined types in a consistent way.
 The common case is printing out a sequence of variables separated by whitespace.
 \begin{quote2}
 …
 Finally, the logical-or operator has a link with the Shell pipe-operator for moving data, although data flows in the opposite direction.
 The implicit seperator\index{I/O separator} character (space/blank) is a separator not a terminator.
+The implicit separator\index{I/O separator} character (space/blank) is a separator not a terminator.
 The rules for implicitly adding the separator are:
 \begin{enumerate}
 \item
 A seperator does not appear at the start or end of a line.
+A separator does not appear at the start or end of a line.
 \begin{lstlisting}[belowskip=0pt]
 sout | 1 | 2 | 3 | endl;
 …
 \end{lstlisting}
 \item
 A seperator does not appear before or after a character literal or variable.
+A separator does not appear before or after a character literal or variable.
 \begin{lstlisting}
 sout | '1' | '2' | '3' | endl;
 …
 \end{lstlisting}
 \item
 A seperator does not appear before or after a null (empty) C string
+A separator does not appear before or after a null (empty) C string
 \begin{lstlisting}
 sout | 1 | "" | 2 | "" | 3 | endl;
 …
 which is a local mechanism to disable insertion of the separator character.
 \item
 A seperator does not appear before a C string starting with the (extended) \Index{ASCII}\index{ASCII!extended} characters: \lstinline[mathescape=off]@([{$£¥¡¿«@
+A separator does not appear before a C string starting with the (extended) \Index{ASCII}\index{ASCII!extended} characters: \lstinline[mathescape=off]@([{$£¥¡¿«@
 %$
 \begin{lstlisting}[mathescape=off]
 …
 \subsection{min / max / swap}
+\subsection{min / max / clamp / swap}
 \begin{lstlisting}[aboveskip=0pt,belowskip=0pt]
 …
 forall( otype T | { int ?>?( T, T ); } )
 T max( const T t1, const T t2 );§\indexc{max}§
+forall( otype T | { T min( T, T ); T max( T, T ); } )
+T clamp( T value, T min_val, T max_val );§\indexc{clamp}§
 forall( otype T )
 …
 When creating and computing with rational numbers, results are constantly reduced to keep the numerator and denominator as small as possible.
 \begin{lstlisting}[aboveskip=0pt,belowskip=0pt]
+\begin{lstlisting}[belowskip=0pt]
 // implementation
 struct Rational {§\indexc{Rational}§

src/ControlStruct/CaseRangeMutator.cc

-                      r7d5e243
+                      r6066e32
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Jun 30 13:28:55 2016
 // Update Count     : 8
+// Last Modified On : Tue Jul 12 17:35:13 2016
+// Update Count     : 9
 //
 …
 namespace ControlStruct {
-        Statement *CaseRangeMutator::mutate( ChooseStmt *chooseStmt ) {
-                // There shouldn't be any `choose' statements by now, throw an exception or something.
-                throw( 0 ) ; /* FIXME */
+        }
         Statement *CaseRangeMutator::mutate( SwitchStmt *switchStmt ) {
                 std::list< Statement * > &cases = switchStmt->get_branches();
 …
                 return switchStmt;
+        }
-        Statement *CaseRangeMutator::mutate( FallthruStmt *fallthruStmt ) {
-                //delete fallthruStmt;
-                return new NullStmt();
+        }

src/ControlStruct/CaseRangeMutator.h

-                      r7d5e243
+                      r6066e32
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue May 19 15:22:51 2015
 // Update Count     : 3
+// Last Modified On : Tue Jul 12 17:35:30 2016
+// Update Count     : 4
 //
 …
                 CaseRangeMutator() {}
-                virtual Statement *mutate( ChooseStmt * );
                 virtual Statement *mutate( SwitchStmt * );
-                virtual Statement *mutate( FallthruStmt * );
                 virtual Statement *mutate( CaseStmt * );
           private:

src/ControlStruct/LabelFixer.h

-                      r7d5e243
+                      r6066e32
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Mon Jan 25 21:22:22 2016
 // Update Count     : 32
+// Last Modified On : Tue Jul 12 17:36:16 2016
+// Update Count     : 33
 //
 …
                 virtual void visit( ForStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
                 virtual void visit( SwitchStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( ChooseStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( FallthruStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
                 virtual void visit( CaseStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
                 virtual void visit( ReturnStmt *stmt ) { visit( (Statement *)stmt ); return Parent::visit( stmt ); }

src/ControlStruct/MLEMutator.cc

-                      r7d5e243
+                      r6066e32
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed Jul  6 17:40:02 2016
 // Update Count     : 196
+// Last Modified On : Tue Jul 12 17:36:51 2016
+// Update Count     : 197
 //
 …
                 return handleSwitchStmt( switchStmt );
+        }
-        Statement *MLEMutator::mutate( ChooseStmt *switchStmt ) {
-                return handleSwitchStmt( switchStmt );
+        }
 } // namespace ControlStruct

src/ControlStruct/MLEMutator.h

-                      r7d5e243
+                      r6066e32
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed Jul  6 18:16:26 2016
 // Update Count     : 33
+// Last Modified On : Tue Jul 12 17:37:01 2016
+// Update Count     : 34
 //
 …
                 virtual Statement *mutate( IfStmt *ifStmt ) override;
                 virtual Statement *mutate( SwitchStmt *switchStmt ) override;
-                virtual Statement *mutate( ChooseStmt *switchStmt ) override;
                 Statement *mutateLoop( Statement *bodyLoop, Entry &e );

src/ControlStruct/Mutate.cc

-                      r7d5e243
+                      r6066e32
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
 // Last Modified On : Wed Jul 15 14:50:04 2015
 // Update Count     : 7
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:37:45 2016
+// Update Count     : 8
 //
 …
 #include "Mutate.h"
-#include "ChooseMutator.h"
 #include "LabelFixer.h"
 #include "MLEMutator.h"
 …
                 ForExprMutator formut;
+                // transform choose statements into switch statements
+                ChooseMutator chmut;
+                // normalizes label definitions and generates multi-level
+                // exit labels
+                // normalizes label definitions and generates multi-level exit labels
                 LabelFixer lfix;
                 // expand case ranges and turn fallthru into a null statement
                 CaseRangeMutator ranges;  // has to run after ChooseMutator
+                CaseRangeMutator ranges;
                 //ExceptMutator exc;
 …
                 mutateAll( translationUnit, formut );
-                mutateAll( translationUnit, chmut );
                 acceptAll( translationUnit, lfix );
                 mutateAll( translationUnit, ranges );

src/ControlStruct/module.mk

-                      r7d5e243
+                      r6066e32
 ## Created On       : Mon Jun  1 17:49:17 2015
 ## Last Modified By : Peter A. Buhr
 ## Last Modified On : Mon Jun  1 17:51:45 2015
 ## Update Count     : 1
+## Last Modified On : Tue Jul 12 17:40:31 2016
+## Update Count     : 2
 ###############################################################################
 …
         ControlStruct/CaseRangeMutator.cc \
         ControlStruct/Mutate.cc \
-        ControlStruct/ChooseMutator.cc \
         ControlStruct/ForExprMutator.cc \
         ControlStruct/LabelTypeChecker.cc

src/GenPoly/DeclMutator.cc

-                      r7d5e243
+                      r6066e32
 // Author           : Aaron B. Moss
 // Created On       : Fri Nov 27 14:44:00 2015
 // Last Modified By : Aaron B. Moss
 // Last Modified On : Fri Nov 27 14:44:00 2015
 // Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:38:46 2016
+// Update Count     : 2
 //
 …
+        }
-        Statement* DeclMutator::mutate(ChooseStmt *chooseStmt) {
-                chooseStmt->set_condition( maybeMutate( chooseStmt->get_condition(), *this ) );
-                mutateAll( chooseStmt->get_branches(), *this );
-                return chooseStmt;
+        }
         Statement* DeclMutator::mutate(CaseStmt *caseStmt) {
                 caseStmt->set_condition( maybeMutate( caseStmt->get_condition(), *this ) );

src/GenPoly/DeclMutator.h

-                      r7d5e243
+                      r6066e32
 // Author           : Aaron B. Moss
 // Created On       : Fri Nov 27 14:44:00 2015
 // Last Modified By : Aaron B. Moss
 // Last Modified On : Fri Nov 27 14:44:00 2015
 // Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:39:01 2016
+// Update Count     : 2
 //
 …
                 virtual Statement* mutate(ForStmt *forStmt);
                 virtual Statement* mutate(SwitchStmt *switchStmt);
-                virtual Statement* mutate(ChooseStmt *chooseStmt);
                 virtual Statement* mutate(CaseStmt *caseStmt);
                 virtual Statement* mutate(TryStmt *tryStmt);

src/GenPoly/PolyMutator.cc

-                      r7d5e243
+                      r6066e32
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
 // Last Modified On : Mon May 02 14:50:58 2016
 // Update Count     : 11
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:39:32 2016
+// Update Count     : 12
 //
 …
+        }
-        Statement * PolyMutator::mutate(ChooseStmt *switchStmt) {
-                mutateStatementList( switchStmt->get_branches() );
-                switchStmt->set_condition( mutateExpression( switchStmt->get_condition() ) );
-                return switchStmt;
+        }
         Statement * PolyMutator::mutate(CaseStmt *caseStmt) {
                 mutateStatementList( caseStmt->get_statements() );

src/GenPoly/PolyMutator.h

-                      r7d5e243
+                      r6066e32
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
 // Last Modified On : Tue Dec 08 15:19:05 2015
 // Update Count     : 5
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:39:41 2016
+// Update Count     : 6
 //
 …
                 virtual Statement* mutate(ForStmt *forStmt);
                 virtual Statement* mutate(SwitchStmt *switchStmt);
-                virtual Statement* mutate(ChooseStmt *chooseStmt);
                 virtual Statement* mutate(CaseStmt *caseStmt);
                 virtual Statement* mutate(TryStmt *returnStmt);

src/InitTweak/FixInit.cc

-                      r7d5e243
+                      r6066e32
 // Created On       : Wed Jan 13 16:29:30 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed Jul  6 17:34:46 2016
 // Update Count     : 33
+// Last Modified On : Tue Jul 12 17:41:15 2016
+// Update Count     : 34
 //
 …
                         virtual void visit( ForStmt *stmt ) { handleStmt( stmt ); return Parent::visit( stmt ); }
                         virtual void visit( SwitchStmt *stmt ) { handleStmt( stmt ); return Parent::visit( stmt ); }
-                        virtual void visit( ChooseStmt *stmt ) { handleStmt( stmt ); return Parent::visit( stmt ); }
-                        virtual void visit( FallthruStmt *stmt ) { handleStmt( stmt ); return Parent::visit( stmt ); }
                         virtual void visit( CaseStmt *stmt ) { handleStmt( stmt ); return Parent::visit( stmt ); }
                         virtual void visit( BranchStmt *stmt ) { handleStmt( stmt ); return Parent::visit( stmt ); }

src/Makefile.in

-                      r7d5e243
+                      r6066e32
         ControlStruct/driver_cfa_cpp-CaseRangeMutator.$(OBJEXT) \
         ControlStruct/driver_cfa_cpp-Mutate.$(OBJEXT) \
-        ControlStruct/driver_cfa_cpp-ChooseMutator.$(OBJEXT) \
         ControlStruct/driver_cfa_cpp-ForExprMutator.$(OBJEXT) \
         ControlStruct/driver_cfa_cpp-LabelTypeChecker.$(OBJEXT) \
 …
         ControlStruct/LabelGenerator.cc ControlStruct/LabelFixer.cc \
         ControlStruct/MLEMutator.cc ControlStruct/CaseRangeMutator.cc \
+        ControlStruct/Mutate.cc ControlStruct/ChooseMutator.cc \
+        ControlStruct/ForExprMutator.cc \
+        ControlStruct/Mutate.cc ControlStruct/ForExprMutator.cc \
         ControlStruct/LabelTypeChecker.cc Designators/Processor.cc \
         GenPoly/Box.cc GenPoly/GenPoly.cc GenPoly/PolyMutator.cc \
 …
         ControlStruct/$(DEPDIR)/$(am__dirstamp)
 ControlStruct/driver_cfa_cpp-Mutate.$(OBJEXT):  \
-        ControlStruct/$(am__dirstamp) \
-        ControlStruct/$(DEPDIR)/$(am__dirstamp)
-ControlStruct/driver_cfa_cpp-ChooseMutator.$(OBJEXT):  \
         ControlStruct/$(am__dirstamp) \
         ControlStruct/$(DEPDIR)/$(am__dirstamp)
 …
         -rm -f Common/driver_cfa_cpp-UniqueName.$(OBJEXT)
         -rm -f ControlStruct/driver_cfa_cpp-CaseRangeMutator.$(OBJEXT)
-        -rm -f ControlStruct/driver_cfa_cpp-ChooseMutator.$(OBJEXT)
         -rm -f ControlStruct/driver_cfa_cpp-ForExprMutator.$(OBJEXT)
         -rm -f ControlStruct/driver_cfa_cpp-LabelFixer.$(OBJEXT)
 …
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-UniqueName.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-CaseRangeMutator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-ChooseMutator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-ForExprMutator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-LabelFixer.Po@am__quote@
 …
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ControlStruct/driver_cfa_cpp-Mutate.obj `if test -f 'ControlStruct/Mutate.cc'; then $(CYGPATH_W) 'ControlStruct/Mutate.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/Mutate.cc'; fi`
-ControlStruct/driver_cfa_cpp-ChooseMutator.o: ControlStruct/ChooseMutator.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ControlStruct/driver_cfa_cpp-ChooseMutator.o -MD -MP -MF ControlStruct/$(DEPDIR)/driver_cfa_cpp-ChooseMutator.Tpo -c -o ControlStruct/driver_cfa_cpp-ChooseMutator.o `test -f 'ControlStruct/ChooseMutator.cc' || echo '$(srcdir)/'`ControlStruct/ChooseMutator.cc
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ControlStruct/$(DEPDIR)/driver_cfa_cpp-ChooseMutator.Tpo ControlStruct/$(DEPDIR)/driver_cfa_cpp-ChooseMutator.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ControlStruct/ChooseMutator.cc' object='ControlStruct/driver_cfa_cpp-ChooseMutator.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ControlStruct/driver_cfa_cpp-ChooseMutator.o `test -f 'ControlStruct/ChooseMutator.cc' || echo '$(srcdir)/'`ControlStruct/ChooseMutator.cc
-ControlStruct/driver_cfa_cpp-ChooseMutator.obj: ControlStruct/ChooseMutator.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ControlStruct/driver_cfa_cpp-ChooseMutator.obj -MD -MP -MF ControlStruct/$(DEPDIR)/driver_cfa_cpp-ChooseMutator.Tpo -c -o ControlStruct/driver_cfa_cpp-ChooseMutator.obj `if test -f 'ControlStruct/ChooseMutator.cc'; then $(CYGPATH_W) 'ControlStruct/ChooseMutator.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/ChooseMutator.cc'; fi`
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) ControlStruct/$(DEPDIR)/driver_cfa_cpp-ChooseMutator.Tpo ControlStruct/$(DEPDIR)/driver_cfa_cpp-ChooseMutator.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='ControlStruct/ChooseMutator.cc' object='ControlStruct/driver_cfa_cpp-ChooseMutator.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ControlStruct/driver_cfa_cpp-ChooseMutator.obj `if test -f 'ControlStruct/ChooseMutator.cc'; then $(CYGPATH_W) 'ControlStruct/ChooseMutator.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/ChooseMutator.cc'; fi`
 ControlStruct/driver_cfa_cpp-ForExprMutator.o: ControlStruct/ForExprMutator.cc
 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT ControlStruct/driver_cfa_cpp-ForExprMutator.o -MD -MP -MF ControlStruct/$(DEPDIR)/driver_cfa_cpp-ForExprMutator.Tpo -c -o ControlStruct/driver_cfa_cpp-ForExprMutator.o `test -f 'ControlStruct/ForExprMutator.cc' || echo '$(srcdir)/'`ControlStruct/ForExprMutator.cc

src/Parser/ParseNode.cc

-                      r7d5e243
+                      r6066e32
 // Created On       : Sat May 16 13:26:29 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Jun 30 21:13:12 2016
 // Update Count     : 52
+// Last Modified On : Tue Jul 12 17:19:57 2016
+// Update Count     : 53
 //
 …
 ParseNode *ParseNode::set_link( ParseNode *next_ ) {
+        if ( next_ == 0 ) return this;
+        get_last()->next = next_;
+        if ( next_ != 0 ) get_last()->next = next_;
         return this;
+}

src/Parser/StatementNode.cc

-                      r7d5e243
+                      r6066e32
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Jun  9 14:18:46 2016
 // Update Count     : 132
+// Last Modified On : Tue Jul 12 17:21:02 2016
+// Update Count     : 133
 //
 …
           case Switch:
                 return new SwitchStmt( labs, maybeBuild<Expression>(get_control()), branches );
-          case Choose:
-                return new ChooseStmt( labs, maybeBuild<Expression>(get_control()), branches );
-          case Fallthru:
-                return new FallthruStmt( labs );
           case Case:
                 return new CaseStmt( labs, maybeBuild<Expression>(get_control()), branches );

src/Parser/TypeData.cc

-                      r7d5e243
+                      r6066e32
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Rob Schluntz
 // Last Modified On : Wed Apr 06 16:57:53 2016
 // Update Count     : 49
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:21:49 2016
+// Update Count     : 50
 //
 …
                 assert( false );
         } // switch
+//      buildList( aggregate->params, at->get_parameters() );
         buildList( aggregate->fields, at->get_members() );
         return at;
+}
-/// namespace {
-/// Type*
-/// makeType( Declaration* decl )
-/// {
-///   if ( DeclarationWithType *dwt = dynamic_cast< DeclarationWithType* >( decl ) ) {
-///     return dwt->get_type()->clone();
-///   } else {
-///     return 0;
-///   }
-/// }
-/// }
 ReferenceToType *TypeData::buildAggInst() const {

src/Parser/parser.cc

-                      r7d5e243
+                      r6066e32
 ,   632,   638,   639,   640,   641,   642,   643,   644,   645,
 ,   656,   663,   665,   675,   676,   681,   683,   689,   691,
 ,   696,   701,   706,   709,   711,   713,   718,   720,   728,
 ,   731,   735,   736,   741,   742,   747,   748,   752,   757,
 ,   762,   764,   770,   771,   775,   777,   779,   781,   787,
 ,   792,   793,   797,   799,   801,   806,   808,   813,   815,
 ,   822,   826,   829,   833,   835,   839,   841,   848,   850,
 ,   861,   863,   865,   867,   869,   874,   876,   878,   880,
 ,   898,   899,   904,   906,   911,   915,   917,   919,   921,
 ,   929,   930,   936,   937,   941,   942,   947,   949,   955,
 ,   958,   963,   965,   972,   974,   978,   979,   984,   986,
 ,   991,   995,   997,  1001,  1002,  1006,  1007,  1011,  1012,
 ,  1028,  1029,  1030,  1031,  1035,  1040,  1047,  1057,  1062,
 ,  1075,  1080,  1085,  1090,  1095,  1103,  1125,  1130,  1137,
 ,  1146,  1151,  1156,  1167,  1172,  1177,  1182,  1187,  1196,
 ,  1209,  1210,  1211,  1212,  1218,  1223,  1231,  1232,  1233,
 ,  1238,  1239,  1240,  1241,  1246,  1247,  1256,  1257,  1262,
 ,  1268,  1270,  1272,  1274,  1276,  1279,  1278,  1290,  1291,
 ,  1303,  1304,  1309,  1313,  1315,  1317,  1319,  1321,  1323,
 ,  1327,  1332,  1334,  1336,  1338,  1340,  1342,  1344,  1346,
 ,  1350,  1352,  1354,  1356,  1362,  1363,  1365,  1367,  1369,
 ,  1375,  1381,  1382,  1384,  1386,  1391,  1393,  1395,  1397,
 ,  1403,  1405,  1407,  1412,  1413,  1415,  1420,  1421,  1423,
 ,  1430,  1432,  1434,  1439,  1440,  1444,  1446,  1452,  1451,
 ,  1457,  1462,  1464,  1469,  1471,  1476,  1477,  1479,  1480,
 ,  1490,  1492,  1494,  1499,  1501,  1507,  1508,  1510,  1513,
 ,  1521,  1522,  1527,  1532,  1536,  1538,  1544,  1543,  1550,
 ,  1558,  1559,  1567,  1568,  1572,  1573,  1574,  1576,  1578,
 ,  1586,  1588,  1590,  1595,  1596,  1602,  1603,  1607,  1608,
 ,  1614,  1615,  1617,  1625,  1626,  1628,  1631,  1633,  1637,
 ,  1639,  1641,  1643,  1647,  1652,  1660,  1661,  1670,  1672,
 ,  1678,  1679,  1683,  1684,  1685,  1689,  1690,  1691,  1695,
 ,  1697,  1702,  1703,  1704,  1705,  1711,  1712,  1714,  1719,
 ,  1725,  1726,  1727,  1728,  1729,  1744,  1745,  1750,  1751,
 ,  1761,  1763,  1766,  1768,  1770,  1793,  1794,  1796,  1798,
 ,  1804,  1806,  1811,  1816,  1817,  1823,  1822,  1826,  1830,
 ,  1834,  1840,  1841,  1846,  1851,  1853,  1858,  1860,  1861,
 ,  1868,  1870,  1872,  1877,  1879,  1884,  1889,  1897,  1903,
 ,  1916,  1917,  1922,  1923,  1927,  1932,  1937,  1945,  1950,
 ,  1962,  1973,  1974,  1980,  1981,  1985,  1986,  1987,  1990,
 ,  2000,  2009,  2015,  2021,  2030,  2036,  2042,  2048,  2054,
 ,  2068,  2076,  2082,  2091,  2092,  2093,  2097,  2101,  2103,
 ,  2109,  2113,  2114,  2119,  2125,  2126,  2129,  2131,  2132,
 ,  2137,  2138,  2139,  2173,  2175,  2176,  2178,  2183,  2188,
 ,  2195,  2197,  2202,  2204,  2206,  2208,  2213,  2215,  2224,
 ,  2227,  2232,  2234,  2236,  2241,  2243,  2245,  2250,  2252,
 ,  2263,  2264,  2265,  2269,  2271,  2273,  2278,  2280,  2282,
 ,  2289,  2291,  2306,  2308,  2309,  2311,  2316,  2317,  2322,
 ,  2326,  2331,  2333,  2335,  2337,  2342,  2344,  2346,  2356,
 ,  2359,  2361,  2366,  2368,  2370,  2375,  2377,  2379,  2381,
 ,  2388,  2390,  2421,  2423,  2424,  2426,  2431,  2436,  2444,
 ,  2448,  2453,  2455,  2460,  2462,  2476,  2477,  2479,  2484,
 ,  2488,  2490,  2492,  2497,  2498,  2500,  2502,  2507,  2509,
 ,  2517,  2519,  2521,  2525,  2527,  2529,  2531,  2545,  2546,
 ,  2553,  2555,  2557,  2559,  2561,  2566,  2567,  2569,  2571,
 ,  2578,  2580,  2586,  2587,  2589,  2598,  2601,  2603,  2606,
 ,  2610,  2623,  2624,  2626,  2631,  2633,  2635,  2637,  2639,
 ,  2645,  2647,  2649,  2654,  2656,  2664,  2665,  2666,  2671,
 ,  2676,  2678,  2680,  2682,  2684,  2686,  2693,  2695,  2697,
 ,  2701,  2703,  2705,  2707,  2709,  2711,  2716,  2718,  2720,
 ,  2751,  2752,  2754,  2758,  2759,  2763,  2765,  2767,  2769,
 ,  2773,  2780,  2782,  2784,  2786,  2788,  2790,  2795,  2800,
 ,  2804,  2822,  2824,  2829,  2830
+,   696,   701,   706,   709,   711,   713,   722,   724,   735,
+,   738,   742,   743,   748,   749,   754,   755,   759,   764,
+,   769,   771,   777,   778,   782,   784,   786,   788,   794,
+,   799,   801,   806,   808,   810,   815,   817,   822,   824,
+,   831,   835,   838,   842,   844,   848,   850,   857,   859,
+,   870,   872,   874,   876,   878,   883,   885,   887,   889,
+,   907,   908,   913,   915,   920,   924,   926,   928,   930,
+,   938,   939,   945,   946,   950,   951,   956,   958,   964,
+,   967,   972,   974,   981,   983,   987,   988,   993,   995,
+,  1000,  1004,  1006,  1010,  1011,  1015,  1016,  1020,  1021,
+,  1037,  1038,  1039,  1040,  1044,  1049,  1056,  1066,  1071,
+,  1084,  1089,  1094,  1099,  1104,  1112,  1134,  1139,  1146,
+,  1155,  1160,  1165,  1176,  1181,  1186,  1191,  1196,  1205,
+,  1218,  1219,  1220,  1221,  1227,  1232,  1240,  1241,  1242,
+,  1247,  1248,  1249,  1250,  1255,  1256,  1265,  1266,  1271,
+,  1277,  1279,  1281,  1283,  1285,  1288,  1287,  1299,  1300,
+,  1312,  1313,  1318,  1322,  1324,  1326,  1328,  1330,  1332,
+,  1336,  1341,  1343,  1345,  1347,  1349,  1351,  1353,  1355,
+,  1359,  1361,  1363,  1365,  1371,  1372,  1374,  1376,  1378,
+,  1384,  1390,  1391,  1393,  1395,  1400,  1402,  1404,  1406,
+,  1412,  1414,  1416,  1421,  1422,  1424,  1429,  1430,  1432,
+,  1439,  1441,  1443,  1448,  1449,  1453,  1455,  1461,  1460,
+,  1466,  1471,  1473,  1478,  1480,  1485,  1486,  1488,  1489,
+,  1499,  1501,  1503,  1508,  1510,  1516,  1517,  1519,  1522,
+,  1530,  1531,  1536,  1541,  1545,  1547,  1553,  1552,  1559,
+,  1567,  1568,  1576,  1577,  1581,  1582,  1583,  1585,  1587,
+,  1595,  1597,  1599,  1604,  1605,  1611,  1612,  1616,  1617,
+,  1623,  1624,  1626,  1634,  1635,  1637,  1640,  1642,  1646,
+,  1648,  1650,  1652,  1656,  1661,  1669,  1670,  1679,  1681,
+,  1687,  1688,  1692,  1693,  1694,  1698,  1699,  1700,  1704,
+,  1706,  1711,  1712,  1713,  1714,  1720,  1721,  1723,  1728,
+,  1734,  1735,  1736,  1737,  1738,  1753,  1754,  1759,  1760,
+,  1770,  1772,  1775,  1777,  1779,  1802,  1803,  1805,  1807,
+,  1813,  1815,  1820,  1825,  1826,  1832,  1831,  1835,  1839,
+,  1843,  1849,  1850,  1855,  1860,  1862,  1867,  1869,  1870,
+,  1877,  1879,  1881,  1886,  1888,  1893,  1898,  1906,  1912,
+,  1925,  1926,  1931,  1932,  1936,  1941,  1946,  1954,  1959,
+,  1971,  1982,  1983,  1989,  1990,  1994,  1995,  1996,  1999,
+,  2009,  2018,  2024,  2030,  2039,  2045,  2051,  2057,  2063,
+,  2077,  2085,  2091,  2100,  2101,  2102,  2106,  2110,  2112,
+,  2118,  2122,  2123,  2128,  2134,  2135,  2138,  2140,  2141,
+,  2146,  2147,  2148,  2182,  2184,  2185,  2187,  2192,  2197,
+,  2204,  2206,  2211,  2213,  2215,  2217,  2222,  2224,  2233,
+,  2236,  2241,  2243,  2245,  2250,  2252,  2254,  2259,  2261,
+,  2272,  2273,  2274,  2278,  2280,  2282,  2287,  2289,  2291,
+,  2298,  2300,  2315,  2317,  2318,  2320,  2325,  2326,  2331,
+,  2335,  2340,  2342,  2344,  2346,  2351,  2353,  2355,  2365,
+,  2368,  2370,  2375,  2377,  2379,  2384,  2386,  2388,  2390,
+,  2397,  2399,  2430,  2432,  2433,  2435,  2440,  2445,  2453,
+,  2457,  2462,  2464,  2469,  2471,  2485,  2486,  2488,  2493,
+,  2497,  2499,  2501,  2506,  2507,  2509,  2511,  2516,  2518,
+,  2526,  2528,  2530,  2534,  2536,  2538,  2540,  2554,  2555,
+,  2562,  2564,  2566,  2568,  2570,  2575,  2576,  2578,  2580,
+,  2587,  2589,  2595,  2596,  2598,  2607,  2610,  2612,  2615,
+,  2619,  2632,  2633,  2635,  2640,  2642,  2644,  2646,  2648,
+,  2654,  2656,  2658,  2663,  2665,  2673,  2674,  2675,  2680,
+,  2685,  2687,  2689,  2691,  2693,  2695,  2702,  2704,  2706,
+,  2710,  2712,  2714,  2716,  2718,  2720,  2725,  2727,  2729,
+,  2760,  2761,  2763,  2767,  2768,  2772,  2774,  2776,  2778,
+,  2782,  2789,  2791,  2793,  2795,  2797,  2799,  2804,  2809,
+,  2813,  2831,  2833,  2838,  2839
 };
 #endif
 …
 /* Line 1806 of yacc.c  */
 #line 714 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) ); /* xxx */ }
+    {
+                        StatementNode *sw = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].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
+                        // statement around the switch.  Statements after the initial declaration list can never be executed, and
+                        // therefore, are removed from the grammar even though C allows it. Change also applies to choose statement.
+                        (yyval.sn) = (yyvsp[(7) - (9)].decl) != 0 ? new CompoundStmtNode( (StatementNode *)((new StatementNode( (yyvsp[(7) - (9)].decl) ))->set_link( sw )) ) : sw;
+                }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 719 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Choose, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
+#line 723 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
+#line 721 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Choose, (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) ); }
+#line 725 "parser.yy"
+    {
+                        StatementNode *sw = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) );
+                        (yyval.sn) = (yyvsp[(7) - (9)].decl) != 0 ? new CompoundStmtNode( (StatementNode *)((new StatementNode( (yyvsp[(7) - (9)].decl) ))->set_link( sw )) ) : sw;
+                }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 728 "parser.yy"
+#line 735 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].en); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 730 "parser.yy"
+#line 737 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Range ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 737 "parser.yy"
+#line 744 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (ExpressionNode *)(tupleContents( (yyvsp[(1) - (3)].en) ))->set_link( (yyvsp[(3) - (3)].en) ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 741 "parser.yy"
+#line 748 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Case, (yyvsp[(2) - (3)].en), 0 ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 742 "parser.yy"
+#line 749 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Default ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 748 "parser.yy"
+#line 755 "parser.yy"
     { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (2)].sn)->set_link( (yyvsp[(2) - (2)].sn) )); }
     break;
 …
 /* Line 1806 of yacc.c  */
+#line 752 "parser.yy"
+#line 759 "parser.yy"
+    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( new CompoundStmtNode( (yyvsp[(2) - (2)].sn) ) ); }
+    break;
+  case 169:
+/* Line 1806 of yacc.c  */
+#line 764 "parser.yy"
+    { (yyval.sn) = 0; }
+    break;
+  case 171:
+/* Line 1806 of yacc.c  */
+#line 770 "parser.yy"
+    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( new CompoundStmtNode( (yyvsp[(2) - (2)].sn) ) ); }
+    break;
+  case 172:
+/* Line 1806 of yacc.c  */
+#line 772 "parser.yy"
+    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_link( (yyvsp[(2) - (3)].sn)->append_last_case( new CompoundStmtNode( (yyvsp[(3) - (3)].sn) ) ) ) ); }
+    break;
+  case 173:
+/* Line 1806 of yacc.c  */
+#line 777 "parser.yy"
+    { (yyval.sn) = 0; }
+    break;
+  case 175:
+/* Line 1806 of yacc.c  */
+#line 783 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( (yyvsp[(2) - (2)].sn) ); }
     break;
+  case 169:
+/* Line 1806 of yacc.c  */
+#line 757 "parser.yy"
+  case 176:
+/* Line 1806 of yacc.c  */
+#line 785 "parser.yy"
+    { (yyval.sn) = (yyvsp[(1) - (3)].sn)->append_last_case( new CompoundStmtNode( (StatementNode *)mkList( (*(yyvsp[(2) - (3)].sn), *(yyvsp[(3) - (3)].sn) ) ) ) ); }
+    break;
+  case 177:
+/* Line 1806 of yacc.c  */
+#line 787 "parser.yy"
+    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_link( (yyvsp[(2) - (3)].sn)->append_last_case( (yyvsp[(3) - (3)].sn) ))); }
+    break;
+  case 178:
+/* Line 1806 of yacc.c  */
+#line 789 "parser.yy"
+    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (4)].sn)->set_link( (yyvsp[(2) - (4)].sn)->append_last_case( new CompoundStmtNode( (StatementNode *)mkList( (*(yyvsp[(3) - (4)].sn), *(yyvsp[(4) - (4)].sn) ) ) ) ) ) ); }
+    break;
+  case 179:
+/* Line 1806 of yacc.c  */
+#line 794 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Break ); }
+    break;
+  case 181:
+/* Line 1806 of yacc.c  */
+#line 800 "parser.yy"
     { (yyval.sn) = 0; }
     break;
+  case 171:
+/* Line 1806 of yacc.c  */
+#line 763 "parser.yy"
+    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( (yyvsp[(2) - (2)].sn) ); }
+    break;
+  case 172:
+/* Line 1806 of yacc.c  */
+#line 765 "parser.yy"
+    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_link( (yyvsp[(2) - (3)].sn)->append_last_case( (yyvsp[(3) - (3)].sn) ))); }
+    break;
+  case 173:
+/* Line 1806 of yacc.c  */
+#line 770 "parser.yy"
+  case 182:
+/* Line 1806 of yacc.c  */
+#line 802 "parser.yy"
     { (yyval.sn) = 0; }
     break;
-  case 175:
-/* Line 1806 of yacc.c  */
-#line 776 "parser.yy"
-    { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( (yyvsp[(2) - (2)].sn) ); }
-    break;
-  case 176:
-/* Line 1806 of yacc.c  */
-#line 778 "parser.yy"
-    { (yyval.sn) = (yyvsp[(1) - (3)].sn)->append_last_case((StatementNode *)mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].sn) ))); }
-    break;
-  case 177:
-/* Line 1806 of yacc.c  */
-#line 780 "parser.yy"
-    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_link( (yyvsp[(2) - (3)].sn)->append_last_case( (yyvsp[(3) - (3)].sn) ))); }
-    break;
-  case 178:
-/* Line 1806 of yacc.c  */
-#line 782 "parser.yy"
-    { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (4)].sn)->set_link( (yyvsp[(2) - (4)].sn)->append_last_case((StatementNode *)mkList((*(yyvsp[(3) - (4)].sn),*(yyvsp[(4) - (4)].sn) ))))); }
-    break;
-  case 179:
-/* Line 1806 of yacc.c  */
-#line 787 "parser.yy"
-    { (yyval.sn) = 0; }
-    break;
-  case 181:
-/* Line 1806 of yacc.c  */
-#line 792 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Fallthru ); }
-    break;
-  case 182:
-/* Line 1806 of yacc.c  */
-#line 793 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Fallthru ); }
-    break;
   case 183:
 /* Line 1806 of yacc.c  */
 #line 798 "parser.yy"
+#line 807 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::While, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 800 "parser.yy"
+#line 809 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Do, (yyvsp[(5) - (7)].en), (yyvsp[(2) - (7)].sn) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 802 "parser.yy"
+#line 811 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::For, (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].sn) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 807 "parser.yy"
+#line 816 "parser.yy"
     { (yyval.en) = new ForCtlExprNode( (yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].en) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 809 "parser.yy"
+#line 818 "parser.yy"
     { (yyval.en) = new ForCtlExprNode( (yyvsp[(1) - (4)].decl), (yyvsp[(2) - (4)].en), (yyvsp[(4) - (4)].en) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 814 "parser.yy"
+#line 823 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Goto, (yyvsp[(2) - (3)].tok) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 818 "parser.yy"
+#line 827 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Goto, (yyvsp[(3) - (4)].en) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 821 "parser.yy"
+#line 830 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Continue ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 825 "parser.yy"
+#line 834 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Continue, (yyvsp[(2) - (3)].tok) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 828 "parser.yy"
+#line 837 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Break ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 832 "parser.yy"
+#line 841 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Break, (yyvsp[(2) - (3)].tok) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 834 "parser.yy"
+#line 843 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Return, (yyvsp[(2) - (3)].en), 0 ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 836 "parser.yy"
+#line 845 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Throw, (yyvsp[(2) - (3)].en), 0 ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 840 "parser.yy"
+#line 849 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Throw, (yyvsp[(2) - (3)].en), 0 ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 842 "parser.yy"
+#line 851 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Throw, (yyvsp[(2) - (5)].en), 0 ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 849 "parser.yy"
+#line 858 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Try, 0,(StatementNode *)(mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].pn) )))); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 851 "parser.yy"
+#line 860 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Try, 0,(StatementNode *)(mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].pn) )))); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 853 "parser.yy"
+#line 862 "parser.yy"
+    {
                         (yyvsp[(3) - (4)].pn)->set_link( (yyvsp[(4) - (4)].pn) );
 …
 /* Line 1806 of yacc.c  */
 #line 864 "parser.yy"
+#line 873 "parser.yy"
     { (yyval.pn) = StatementNode::newCatchStmt( 0, (yyvsp[(5) - (5)].sn), true ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 866 "parser.yy"
+#line 875 "parser.yy"
     { (yyval.pn) = (yyvsp[(1) - (6)].pn)->set_link( StatementNode::newCatchStmt( 0, (yyvsp[(6) - (6)].sn), true ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 868 "parser.yy"
+#line 877 "parser.yy"
     { (yyval.pn) = StatementNode::newCatchStmt( 0, (yyvsp[(5) - (5)].sn), true ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 870 "parser.yy"
+#line 879 "parser.yy"
     { (yyval.pn) = (yyvsp[(1) - (6)].pn)->set_link( StatementNode::newCatchStmt( 0, (yyvsp[(6) - (6)].sn), true ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 875 "parser.yy"
+#line 884 "parser.yy"
     { (yyval.pn) = StatementNode::newCatchStmt( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 877 "parser.yy"
+#line 886 "parser.yy"
     { (yyval.pn) = (yyvsp[(1) - (10)].pn)->set_link( StatementNode::newCatchStmt( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 879 "parser.yy"
+#line 888 "parser.yy"
     { (yyval.pn) = StatementNode::newCatchStmt( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 881 "parser.yy"
+#line 890 "parser.yy"
     { (yyval.pn) = (yyvsp[(1) - (10)].pn)->set_link( StatementNode::newCatchStmt( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 886 "parser.yy"
+#line 895 "parser.yy"
+    {
                         (yyval.pn) = new StatementNode( StatementNode::Finally, 0, (yyvsp[(2) - (2)].sn) );
 …
 /* Line 1806 of yacc.c  */
 #line 900 "parser.yy"
+#line 909 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 905 "parser.yy"
+#line 914 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 907 "parser.yy"
+#line 916 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 916 "parser.yy"
+#line 925 "parser.yy"
     { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (6)].flag), (yyvsp[(4) - (6)].constant), 0 ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 918 "parser.yy"
+#line 927 "parser.yy"
     { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (8)].flag), (yyvsp[(4) - (8)].constant), (yyvsp[(6) - (8)].en) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 920 "parser.yy"
+#line 929 "parser.yy"
     { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (10)].flag), (yyvsp[(4) - (10)].constant), (yyvsp[(6) - (10)].en), (yyvsp[(8) - (10)].en) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 922 "parser.yy"
+#line 931 "parser.yy"
     { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (12)].flag), (yyvsp[(4) - (12)].constant), (yyvsp[(6) - (12)].en), (yyvsp[(8) - (12)].en), (yyvsp[(10) - (12)].constant) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 924 "parser.yy"
+#line 933 "parser.yy"
     { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (14)].flag), (yyvsp[(5) - (14)].constant), 0, (yyvsp[(8) - (14)].en), (yyvsp[(10) - (14)].constant), (yyvsp[(12) - (14)].label) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 929 "parser.yy"
+#line 938 "parser.yy"
     { (yyval.flag) = false; }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 931 "parser.yy"
+#line 940 "parser.yy"
     { (yyval.flag) = true; }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 936 "parser.yy"
+#line 945 "parser.yy"
     { (yyval.en) = 0; }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 943 "parser.yy"
+#line 952 "parser.yy"
     { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 948 "parser.yy"
+#line 957 "parser.yy"
     { (yyval.en) = new AsmExprNode( 0, (yyvsp[(1) - (4)].constant), (yyvsp[(3) - (4)].en) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 950 "parser.yy"
+#line 959 "parser.yy"
     { (yyval.en) = new AsmExprNode( (yyvsp[(2) - (7)].en), (yyvsp[(4) - (7)].constant), (yyvsp[(6) - (7)].en) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 955 "parser.yy"
+#line 964 "parser.yy"
     { (yyval.constant) = 0; }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 957 "parser.yy"
+#line 966 "parser.yy"
     { (yyval.constant) = (yyvsp[(1) - (1)].constant); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 959 "parser.yy"
+#line 968 "parser.yy"
     { (yyval.constant) = (ConstantNode *)(yyvsp[(1) - (3)].constant)->set_link( (yyvsp[(3) - (3)].constant) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 964 "parser.yy"
+#line 973 "parser.yy"
     { (yyval.label) = new LabelNode(); (yyval.label)->append_label( (yyvsp[(1) - (1)].tok) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 966 "parser.yy"
+#line 975 "parser.yy"
     { (yyval.label) = (yyvsp[(1) - (3)].label); (yyvsp[(1) - (3)].label)->append_label( (yyvsp[(3) - (3)].tok) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 973 "parser.yy"
+#line 982 "parser.yy"
     { (yyval.decl) = 0; }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 980 "parser.yy"
+#line 989 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 985 "parser.yy"
+#line 994 "parser.yy"
     { (yyval.decl) = 0; }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 992 "parser.yy"
+#line 1001 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1006 "parser.yy"
+#line 1015 "parser.yy"
     {}
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1007 "parser.yy"
+#line 1016 "parser.yy"
     {}
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1036 "parser.yy"
+#line 1045 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 1043 "parser.yy"
+#line 1052 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 1048 "parser.yy"
+#line 1057 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (6)].tok), TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 1058 "parser.yy"
+#line 1067 "parser.yy"
+    {
                         typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
 …
 /* Line 1806 of yacc.c  */
 #line 1063 "parser.yy"
+#line 1072 "parser.yy"
+    {
                         typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
 …
 /* Line 1806 of yacc.c  */
 #line 1068 "parser.yy"
+#line 1077 "parser.yy"
+    {
                         typedefTable.setNextIdentifier( *(yyvsp[(3) - (4)].tok) );
 …
 /* Line 1806 of yacc.c  */
 #line 1076 "parser.yy"
+#line 1085 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 1081 "parser.yy"
+#line 1090 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 1086 "parser.yy"
+#line 1095 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 1091 "parser.yy"
+#line 1100 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 1096 "parser.yy"
+#line 1105 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 1104 "parser.yy"
+#line 1113 "parser.yy"
+    {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(3) - (8)].tok), DeclarationNode::newTuple( 0 ), (yyvsp[(6) - (8)].decl), 0, true );
 …
 /* Line 1806 of yacc.c  */
 #line 1127 "parser.yy"
+#line 1136 "parser.yy"
+    {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(2) - (7)].tok), (yyvsp[(1) - (7)].decl), (yyvsp[(5) - (7)].decl), 0, true );
 …
 /* Line 1806 of yacc.c  */
 #line 1131 "parser.yy"
+#line 1140 "parser.yy"
+    {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(2) - (7)].tok), (yyvsp[(1) - (7)].decl), (yyvsp[(5) - (7)].decl), 0, true );
 …
 /* Line 1806 of yacc.c  */
 #line 1138 "parser.yy"
+#line 1147 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1142 "parser.yy"
+#line 1151 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (9)].decl)->appendList( (yyvsp[(7) - (9)].decl) ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1147 "parser.yy"
+#line 1156 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
 …
 /* Line 1806 of yacc.c  */
 #line 1152 "parser.yy"
+#line 1161 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
 …
 /* Line 1806 of yacc.c  */
 #line 1157 "parser.yy"
+#line 1166 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::TD );
 …
 /* Line 1806 of yacc.c  */
 #line 1168 "parser.yy"
+#line 1177 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
 …
 /* Line 1806 of yacc.c  */
 #line 1173 "parser.yy"
+#line 1182 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
 …
 /* Line 1806 of yacc.c  */
 #line 1178 "parser.yy"
+#line 1187 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
 …
 /* Line 1806 of yacc.c  */
 #line 1183 "parser.yy"
+#line 1192 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
 …
 /* Line 1806 of yacc.c  */
 #line 1188 "parser.yy"
+#line 1197 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
 …
 /* Line 1806 of yacc.c  */
 #line 1197 "parser.yy"
+#line 1206 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( *(yyvsp[(2) - (4)].tok), TypedefTable::TD );
 …
 /* Line 1806 of yacc.c  */
 #line 1202 "parser.yy"
+#line 1211 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (7)].tok), TypedefTable::TD );
 …
 /* Line 1806 of yacc.c  */
 #line 1219 "parser.yy"
+#line 1228 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 1224 "parser.yy"
+#line 1233 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 1246 "parser.yy"
+#line 1255 "parser.yy"
     { (yyval.decl) = 0; }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1258 "parser.yy"
+#line 1267 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1269 "parser.yy"
+#line 1278 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Const ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1271 "parser.yy"
+#line 1280 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Restrict ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1273 "parser.yy"
+#line 1282 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Volatile ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1275 "parser.yy"
+#line 1284 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Lvalue ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1277 "parser.yy"
+#line 1286 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Atomic ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1279 "parser.yy"
+#line 1288 "parser.yy"
+    {
                         typedefTable.enterScope();
 …
 /* Line 1806 of yacc.c  */
 #line 1283 "parser.yy"
+#line 1292 "parser.yy"
+    {
                         typedefTable.leaveScope();
 …
 /* Line 1806 of yacc.c  */
 #line 1292 "parser.yy"
+#line 1301 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1294 "parser.yy"
+#line 1303 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1305 "parser.yy"
+#line 1314 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1314 "parser.yy"
+#line 1323 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Extern ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1316 "parser.yy"
+#line 1325 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Static ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1318 "parser.yy"
+#line 1327 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Auto ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1320 "parser.yy"
+#line 1329 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Register ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1322 "parser.yy"
+#line 1331 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Inline ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1324 "parser.yy"
+#line 1333 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Fortran ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1326 "parser.yy"
+#line 1335 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Noreturn ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1328 "parser.yy"
+#line 1337 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Threadlocal ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1333 "parser.yy"
+#line 1342 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Char ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1335 "parser.yy"
+#line 1344 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Double ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1337 "parser.yy"
+#line 1346 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Float ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1339 "parser.yy"
+#line 1348 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Int ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1341 "parser.yy"
+#line 1350 "parser.yy"
     { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Long ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1343 "parser.yy"
+#line 1352 "parser.yy"
     { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Short ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1345 "parser.yy"
+#line 1354 "parser.yy"
     { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Signed ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1347 "parser.yy"
+#line 1356 "parser.yy"
     { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Unsigned ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1349 "parser.yy"
+#line 1358 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Void ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1351 "parser.yy"
+#line 1360 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Bool ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1353 "parser.yy"
+#line 1362 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Complex ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1355 "parser.yy"
+#line 1364 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Imaginary ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1357 "parser.yy"
+#line 1366 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1364 "parser.yy"
+#line 1373 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1366 "parser.yy"
+#line 1375 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1368 "parser.yy"
+#line 1377 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1370 "parser.yy"
+#line 1379 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addType( (yyvsp[(1) - (3)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1376 "parser.yy"
+#line 1385 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1383 "parser.yy"
+#line 1392 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1385 "parser.yy"
+#line 1394 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1387 "parser.yy"
+#line 1396 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addType( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1392 "parser.yy"
+#line 1401 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (4)].decl); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1394 "parser.yy"
+#line 1403 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTypeof( (yyvsp[(3) - (4)].en) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1396 "parser.yy"
+#line 1405 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1398 "parser.yy"
+#line 1407 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1404 "parser.yy"
+#line 1413 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1406 "parser.yy"
+#line 1415 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1408 "parser.yy"
+#line 1417 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1414 "parser.yy"
+#line 1423 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1416 "parser.yy"
+#line 1425 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1422 "parser.yy"
+#line 1431 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1424 "parser.yy"
+#line 1433 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1426 "parser.yy"
+#line 1435 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1431 "parser.yy"
+#line 1440 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(1) - (1)].tok) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1433 "parser.yy"
+#line 1442 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(2) - (2)].tok) )->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1435 "parser.yy"
+#line 1444 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1445 "parser.yy"
+#line 1454 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (4)].aggKey), 0, 0, (yyvsp[(3) - (4)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1447 "parser.yy"
+#line 1456 "parser.yy"
+    {
                         typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) );
 …
 /* Line 1806 of yacc.c  */
 #line 1452 "parser.yy"
+#line 1461 "parser.yy"
     { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1454 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (6)].aggKey), (yyvsp[(2) - (6)].tok), 0, (yyvsp[(5) - (6)].decl)); }
+#line 1463 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (6)].aggKey), (yyvsp[(2) - (6)].tok), 0, (yyvsp[(5) - (6)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1456 "parser.yy"
+#line 1465 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (7)].aggKey), 0, (yyvsp[(3) - (7)].en), (yyvsp[(6) - (7)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1458 "parser.yy"
+#line 1467 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1463 "parser.yy"
+#line 1472 "parser.yy"
     { (yyval.aggKey) = DeclarationNode::Struct; }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1465 "parser.yy"
+#line 1474 "parser.yy"
     { (yyval.aggKey) = DeclarationNode::Union; }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1470 "parser.yy"
+#line 1479 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (1)].decl); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1472 "parser.yy"
+#line 1481 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1478 "parser.yy"
+#line 1487 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl)->set_extension( true ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1481 "parser.yy"
+#line 1490 "parser.yy"
     {   // mark all fields in list
                         for ( DeclarationNode *iter = (yyvsp[(2) - (3)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_link() )
 …
 /* Line 1806 of yacc.c  */
 #line 1491 "parser.yy"
+#line 1500 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addName( (yyvsp[(2) - (2)].tok) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1493 "parser.yy"
+#line 1502 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(1) - (3)].decl)->cloneType( (yyvsp[(3) - (3)].tok) ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1495 "parser.yy"
+#line 1504 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(1) - (2)].decl)->cloneType( 0 ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1500 "parser.yy"
+#line 1509 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1502 "parser.yy"
+#line 1511 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(1) - (4)].decl)->cloneBaseType( (yyvsp[(4) - (4)].decl) ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1507 "parser.yy"
+#line 1516 "parser.yy"
     { (yyval.decl) = DeclarationNode::newName( 0 ); /* XXX */ }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1509 "parser.yy"
+#line 1518 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBitfield( (yyvsp[(1) - (1)].en) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1512 "parser.yy"
+#line 1521 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1515 "parser.yy"
+#line 1524 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1521 "parser.yy"
+#line 1530 "parser.yy"
     { (yyval.en) = 0; }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1523 "parser.yy"
+#line 1532 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].en); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1528 "parser.yy"
+#line 1537 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1537 "parser.yy"
+#line 1546 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnum( 0, (yyvsp[(3) - (5)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1539 "parser.yy"
+#line 1548 "parser.yy"
+    {
                         typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) );
 …
 /* Line 1806 of yacc.c  */
 #line 1544 "parser.yy"
+#line 1553 "parser.yy"
     { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1546 "parser.yy"
+#line 1555 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnum( (yyvsp[(2) - (7)].tok), (yyvsp[(5) - (7)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1551 "parser.yy"
+#line 1560 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnumConstant( (yyvsp[(1) - (2)].tok), (yyvsp[(2) - (2)].en) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1553 "parser.yy"
+#line 1562 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( DeclarationNode::newEnumConstant( (yyvsp[(3) - (4)].tok), (yyvsp[(4) - (4)].en) ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1558 "parser.yy"
+#line 1567 "parser.yy"
     { (yyval.en) = 0; }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1560 "parser.yy"
+#line 1569 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1567 "parser.yy"
+#line 1576 "parser.yy"
     { (yyval.decl) = 0; }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1575 "parser.yy"
+#line 1584 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1577 "parser.yy"
+#line 1586 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1579 "parser.yy"
+#line 1588 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1587 "parser.yy"
+#line 1596 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1589 "parser.yy"
+#line 1598 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1591 "parser.yy"
+#line 1600 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (9)].decl)->appendList( (yyvsp[(5) - (9)].decl) )->appendList( (yyvsp[(9) - (9)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1597 "parser.yy"
+#line 1606 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1602 "parser.yy"
+#line 1611 "parser.yy"
     { (yyval.decl) = 0; }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1609 "parser.yy"
+#line 1618 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1616 "parser.yy"
+#line 1625 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1618 "parser.yy"
+#line 1627 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1627 "parser.yy"
+#line 1636 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1630 "parser.yy"
+#line 1639 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1632 "parser.yy"
+#line 1641 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addName( (yyvsp[(3) - (4)].tok) )->addQualifiers( (yyvsp[(1) - (4)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1642 "parser.yy"
+#line 1651 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1648 "parser.yy"
+#line 1657 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 1653 "parser.yy"
+#line 1662 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 1662 "parser.yy"
+#line 1671 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1671 "parser.yy"
+#line 1680 "parser.yy"
     { (yyval.decl) = DeclarationNode::newName( (yyvsp[(1) - (1)].tok) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1673 "parser.yy"
+#line 1682 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( DeclarationNode::newName( (yyvsp[(3) - (3)].tok) ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1698 "parser.yy"
+#line 1707 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1706 "parser.yy"
+#line 1715 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1711 "parser.yy"
+#line 1720 "parser.yy"
     { (yyval.in) = 0; }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1713 "parser.yy"
+#line 1722 "parser.yy"
     { (yyval.in) = (yyvsp[(2) - (2)].in); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1715 "parser.yy"
+#line 1724 "parser.yy"
     { (yyval.in) = (yyvsp[(2) - (2)].in)->set_maybeConstructed( false ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1719 "parser.yy"
+#line 1728 "parser.yy"
     { (yyval.in) = new InitializerNode( (yyvsp[(1) - (1)].en) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1720 "parser.yy"
+#line 1729 "parser.yy"
     { (yyval.in) = new InitializerNode( (yyvsp[(2) - (4)].in), true ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1725 "parser.yy"
+#line 1734 "parser.yy"
     { (yyval.in) = 0; }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1727 "parser.yy"
+#line 1736 "parser.yy"
     { (yyval.in) = (yyvsp[(2) - (2)].in)->set_designators( (yyvsp[(1) - (2)].en) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1728 "parser.yy"
+#line 1737 "parser.yy"
     { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (3)].in)->set_link( (yyvsp[(3) - (3)].in) ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1730 "parser.yy"
+#line 1739 "parser.yy"
     { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (4)].in)->set_link( (yyvsp[(4) - (4)].in)->set_designators( (yyvsp[(3) - (4)].en) ) ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1746 "parser.yy"
+#line 1755 "parser.yy"
     { (yyval.en) = new VarRefNode( (yyvsp[(1) - (2)].tok) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1752 "parser.yy"
+#line 1761 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (2)].en)->set_link( (yyvsp[(2) - (2)].en) )); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1760 "parser.yy"
+#line 1769 "parser.yy"
     { (yyval.en) = new DesignatorNode( new VarRefNode( (yyvsp[(1) - (1)].tok) ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1762 "parser.yy"
+#line 1771 "parser.yy"
     { (yyval.en) = new DesignatorNode( new VarRefNode( (yyvsp[(2) - (2)].tok) ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1765 "parser.yy"
+#line 1774 "parser.yy"
     { (yyval.en) = new DesignatorNode( (yyvsp[(3) - (5)].en), true ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1767 "parser.yy"
+#line 1776 "parser.yy"
     { (yyval.en) = new DesignatorNode( (yyvsp[(3) - (5)].en), true ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1769 "parser.yy"
+#line 1778 "parser.yy"
     { (yyval.en) = new DesignatorNode( new CompositeExprNode( new OperatorNode( OperatorNode::Range ), (yyvsp[(3) - (7)].en), (yyvsp[(5) - (7)].en) ), true ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1771 "parser.yy"
+#line 1780 "parser.yy"
     { (yyval.en) = new DesignatorNode( (yyvsp[(4) - (6)].en) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1795 "parser.yy"
+#line 1804 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1797 "parser.yy"
+#line 1806 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1799 "parser.yy"
+#line 1808 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1805 "parser.yy"
+#line 1814 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1807 "parser.yy"
+#line 1816 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1812 "parser.yy"
+#line 1821 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFromTypeGen( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1818 "parser.yy"
+#line 1827 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(3) - (4)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1823 "parser.yy"
+#line 1832 "parser.yy"
     { typedefTable.addToEnclosingScope( *(yyvsp[(2) - (2)].tok), TypedefTable::TD ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1825 "parser.yy"
+#line 1834 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTypeParam( (yyvsp[(1) - (4)].tclass), (yyvsp[(2) - (4)].tok) )->addAssertions( (yyvsp[(4) - (4)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1831 "parser.yy"
+#line 1840 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Type; }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1833 "parser.yy"
+#line 1842 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Ftype; }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1835 "parser.yy"
+#line 1844 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Dtype; }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1840 "parser.yy"
+#line 1849 "parser.yy"
     { (yyval.decl) = 0; }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1842 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl) == 0 ? (yyvsp[(2) - (2)].decl) : (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ); }
+#line 1851 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (2)].decl) != 0 ? (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ) : (yyvsp[(2) - (2)].decl); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1847 "parser.yy"
+#line 1856 "parser.yy"
+    {
                         typedefTable.openTrait( *(yyvsp[(2) - (5)].tok) );
 …
 /* Line 1806 of yacc.c  */
 #line 1852 "parser.yy"
+#line 1861 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (5)].decl); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1854 "parser.yy"
+#line 1863 "parser.yy"
     { (yyval.decl) = 0; }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1859 "parser.yy"
+#line 1868 "parser.yy"
     { (yyval.en) = new TypeValueNode( (yyvsp[(1) - (1)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1862 "parser.yy"
+#line 1871 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_link( new TypeValueNode( (yyvsp[(3) - (3)].decl) ))); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1864 "parser.yy"
+#line 1873 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) )); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1869 "parser.yy"
+#line 1878 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1871 "parser.yy"
+#line 1880 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1873 "parser.yy"
+#line 1882 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl)->copyStorageClasses( (yyvsp[(1) - (3)].decl) ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1878 "parser.yy"
+#line 1887 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addAssertions( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1880 "parser.yy"
+#line 1889 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addAssertions( (yyvsp[(2) - (4)].decl) )->addType( (yyvsp[(4) - (4)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1885 "parser.yy"
+#line 1894 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( *(yyvsp[(1) - (1)].tok), TypedefTable::TD );
 …
 /* Line 1806 of yacc.c  */
 #line 1890 "parser.yy"
+#line 1899 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( *(yyvsp[(1) - (6)].tok), TypedefTable::TG );
 …
 /* Line 1806 of yacc.c  */
 #line 1898 "parser.yy"
+#line 1907 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( *(yyvsp[(2) - (9)].tok), TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 1903 "parser.yy"
+#line 1912 "parser.yy"
+    {
                         typedefTable.enterTrait( *(yyvsp[(2) - (8)].tok) );
 …
 /* Line 1806 of yacc.c  */
 #line 1908 "parser.yy"
+#line 1917 "parser.yy"
+    {
                         typedefTable.leaveTrait();
 …
 /* Line 1806 of yacc.c  */
 #line 1918 "parser.yy"
+#line 1927 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1928 "parser.yy"
+#line 1937 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 1933 "parser.yy"
+#line 1942 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 1938 "parser.yy"
+#line 1947 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope2( *(yyvsp[(5) - (5)].tok), TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 1946 "parser.yy"
+#line 1955 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 1951 "parser.yy"
+#line 1960 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 1961 "parser.yy"
+#line 1970 "parser.yy"
     {}
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1963 "parser.yy"
+#line 1972 "parser.yy"
+    {
                         if ( theTree ) {
 …
 /* Line 1806 of yacc.c  */
 #line 1975 "parser.yy"
+#line 1984 "parser.yy"
     { (yyval.decl) = ( (yyvsp[(1) - (3)].decl) != NULL ) ? (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ) : (yyvsp[(3) - (3)].decl); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1980 "parser.yy"
+#line 1989 "parser.yy"
     { (yyval.decl) = 0; }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1988 "parser.yy"
+#line 1997 "parser.yy"
     {}
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 1990 "parser.yy"
+#line 1999 "parser.yy"
+    {
                         linkageStack.push( linkage );
 …
 /* Line 1806 of yacc.c  */
 #line 1995 "parser.yy"
+#line 2004 "parser.yy"
+    {
                         linkage = linkageStack.top();
 …
 /* Line 1806 of yacc.c  */
 #line 2001 "parser.yy"
+#line 2010 "parser.yy"
     {   // mark all fields in list
                         for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_link() )
 …
 /* Line 1806 of yacc.c  */
 #line 2016 "parser.yy"
+#line 2025 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 2022 "parser.yy"
+#line 2031 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 2031 "parser.yy"
+#line 2040 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 2037 "parser.yy"
+#line 2046 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 2043 "parser.yy"
+#line 2052 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 2049 "parser.yy"
+#line 2058 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 2055 "parser.yy"
+#line 2064 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 2063 "parser.yy"
+#line 2072 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 2069 "parser.yy"
+#line 2078 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 2077 "parser.yy"
+#line 2086 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 2083 "parser.yy"
+#line 2092 "parser.yy"
+    {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
 …
 /* Line 1806 of yacc.c  */
 #line 2098 "parser.yy"
+#line 2107 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Range ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2108 "parser.yy"
+#line 2117 "parser.yy"
     { (yyval.decl) = 0; }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2115 "parser.yy"
+#line 2124 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2121 "parser.yy"
+#line 2130 "parser.yy"
     { (yyval.decl) = 0; }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2136 "parser.yy"
+#line 2145 "parser.yy"
     {}
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2137 "parser.yy"
+#line 2146 "parser.yy"
     {}
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2138 "parser.yy"
+#line 2147 "parser.yy"
     {}
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2139 "parser.yy"
+#line 2148 "parser.yy"
     {}
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2174 "parser.yy"
+#line 2183 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2177 "parser.yy"
+#line 2186 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2179 "parser.yy"
+#line 2188 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2184 "parser.yy"
+#line 2193 "parser.yy"
+    {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
 …
 /* Line 1806 of yacc.c  */
-#line 2189 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-  case 570:
-/* Line 1806 of yacc.c  */
-#line 2194 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-  case 571:
-/* Line 1806 of yacc.c  */
-#line 2196 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-  case 572:
-/* Line 1806 of yacc.c  */
 #line 2198 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
+  case 570:
+/* Line 1806 of yacc.c  */
+#line 2203 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+  case 571:
+/* Line 1806 of yacc.c  */
+#line 2205 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+  case 572:
+/* Line 1806 of yacc.c  */
+#line 2207 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
   case 573:
 /* Line 1806 of yacc.c  */
 #line 2203 "parser.yy"
+#line 2212 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2205 "parser.yy"
+#line 2214 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2207 "parser.yy"
+#line 2216 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2209 "parser.yy"
+#line 2218 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2214 "parser.yy"
+#line 2223 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2216 "parser.yy"
+#line 2225 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2225 "parser.yy"
+#line 2234 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2228 "parser.yy"
+#line 2237 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2233 "parser.yy"
+#line 2242 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2235 "parser.yy"
+#line 2244 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
   case 584:
-/* Line 1806 of yacc.c  */
-#line 2237 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-  case 585:
-/* Line 1806 of yacc.c  */
-#line 2242 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-  case 586:
-/* Line 1806 of yacc.c  */
-#line 2244 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-  case 587:
 /* Line 1806 of yacc.c  */
 …
     break;
   case 588:
+  case 585:
 /* Line 1806 of yacc.c  */
 #line 2251 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
   case 589:
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+  case 586:
 /* Line 1806 of yacc.c  */
 #line 2253 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
   case 590:
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+  case 587:
 /* Line 1806 of yacc.c  */
 …
     break;
+  case 588:
+/* Line 1806 of yacc.c  */
+#line 2260 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+  case 589:
+/* Line 1806 of yacc.c  */
+#line 2262 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+  case 590:
+/* Line 1806 of yacc.c  */
+#line 2264 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
   case 594:
 /* Line 1806 of yacc.c  */
 #line 2270 "parser.yy"
+#line 2279 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addIdList( (yyvsp[(3) - (4)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2272 "parser.yy"
+#line 2281 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (6)].decl)->addIdList( (yyvsp[(5) - (6)].decl) ); }
     break;
   case 596:
-/* Line 1806 of yacc.c  */
-#line 2274 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-  case 597:
-/* Line 1806 of yacc.c  */
-#line 2279 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-  case 598:
-/* Line 1806 of yacc.c  */
-#line 2281 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-  case 599:
 /* Line 1806 of yacc.c  */
 …
     break;
   case 600:
+  case 597:
 /* Line 1806 of yacc.c  */
 #line 2288 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
   case 601:
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+  case 598:
 /* Line 1806 of yacc.c  */
 #line 2290 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
   case 602:
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+  case 599:
 /* Line 1806 of yacc.c  */
 …
     break;
+  case 600:
+/* Line 1806 of yacc.c  */
+#line 2297 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+  case 601:
+/* Line 1806 of yacc.c  */
+#line 2299 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
+    break;
+  case 602:
+/* Line 1806 of yacc.c  */
+#line 2301 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
   case 603:
 /* Line 1806 of yacc.c  */
 #line 2307 "parser.yy"
+#line 2316 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2310 "parser.yy"
+#line 2319 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2312 "parser.yy"
+#line 2321 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
   case 608:
-/* Line 1806 of yacc.c  */
-#line 2318 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-  case 609:
-/* Line 1806 of yacc.c  */
-#line 2323 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
-    break;
-  case 610:
-/* Line 1806 of yacc.c  */
-#line 2325 "parser.yy"
-    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
-    break;
-  case 611:
 /* Line 1806 of yacc.c  */
 …
     break;
+  case 609:
+/* Line 1806 of yacc.c  */
+#line 2332 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
+    break;
+  case 610:
+/* Line 1806 of yacc.c  */
+#line 2334 "parser.yy"
+    { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
+    break;
+  case 611:
+/* Line 1806 of yacc.c  */
+#line 2336 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
   case 612:
 /* Line 1806 of yacc.c  */
 #line 2332 "parser.yy"
+#line 2341 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2334 "parser.yy"
+#line 2343 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2336 "parser.yy"
+#line 2345 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
   case 615:
-/* Line 1806 of yacc.c  */
-#line 2338 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-  case 616:
-/* Line 1806 of yacc.c  */
-#line 2343 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
-    break;
-  case 617:
-/* Line 1806 of yacc.c  */
-#line 2345 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-  case 618:
 /* Line 1806 of yacc.c  */
 …
     break;
+  case 616:
+/* Line 1806 of yacc.c  */
+#line 2352 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
+    break;
+  case 617:
+/* Line 1806 of yacc.c  */
+#line 2354 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+  case 618:
+/* Line 1806 of yacc.c  */
+#line 2356 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
   case 619:
 /* Line 1806 of yacc.c  */
 #line 2357 "parser.yy"
+#line 2366 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2360 "parser.yy"
+#line 2369 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2362 "parser.yy"
+#line 2371 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2367 "parser.yy"
+#line 2376 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2369 "parser.yy"
+#line 2378 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2371 "parser.yy"
+#line 2380 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2376 "parser.yy"
+#line 2385 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2378 "parser.yy"
+#line 2387 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2380 "parser.yy"
+#line 2389 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
   case 629:
-/* Line 1806 of yacc.c  */
-#line 2382 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-  case 630:
-/* Line 1806 of yacc.c  */
-#line 2387 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
-    break;
-  case 631:
-/* Line 1806 of yacc.c  */
-#line 2389 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-  case 632:
 /* Line 1806 of yacc.c  */
 …
     break;
+  case 630:
+/* Line 1806 of yacc.c  */
+#line 2396 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
+    break;
+  case 631:
+/* Line 1806 of yacc.c  */
+#line 2398 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+  case 632:
+/* Line 1806 of yacc.c  */
+#line 2400 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
   case 633:
 /* Line 1806 of yacc.c  */
 #line 2422 "parser.yy"
+#line 2431 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2425 "parser.yy"
+#line 2434 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2427 "parser.yy"
+#line 2436 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2432 "parser.yy"
+#line 2441 "parser.yy"
+    {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
 …
 /* Line 1806 of yacc.c  */
 #line 2437 "parser.yy"
+#line 2446 "parser.yy"
+    {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
 …
 /* Line 1806 of yacc.c  */
 #line 2445 "parser.yy"
+#line 2454 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2447 "parser.yy"
+#line 2456 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2449 "parser.yy"
+#line 2458 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2454 "parser.yy"
+#line 2463 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2456 "parser.yy"
+#line 2465 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2461 "parser.yy"
+#line 2470 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2463 "parser.yy"
+#line 2472 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2478 "parser.yy"
+#line 2487 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2480 "parser.yy"
+#line 2489 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2485 "parser.yy"
+#line 2494 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2487 "parser.yy"
+#line 2496 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2489 "parser.yy"
+#line 2498 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2491 "parser.yy"
+#line 2500 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2493 "parser.yy"
+#line 2502 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2499 "parser.yy"
+#line 2508 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2501 "parser.yy"
+#line 2510 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
   case 657:
-/* Line 1806 of yacc.c  */
-#line 2503 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-  case 658:
-/* Line 1806 of yacc.c  */
-#line 2508 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
-    break;
-  case 659:
-/* Line 1806 of yacc.c  */
-#line 2510 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-  case 660:
 /* Line 1806 of yacc.c  */
 …
     break;
+  case 658:
+/* Line 1806 of yacc.c  */
+#line 2517 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
+    break;
+  case 659:
+/* Line 1806 of yacc.c  */
+#line 2519 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+  case 660:
+/* Line 1806 of yacc.c  */
+#line 2521 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
   case 661:
 /* Line 1806 of yacc.c  */
 #line 2518 "parser.yy"
+#line 2527 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2520 "parser.yy"
+#line 2529 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, 0, false )->addArray( (yyvsp[(3) - (3)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2526 "parser.yy"
+#line 2535 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(3) - (5)].en), 0, false ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2528 "parser.yy"
+#line 2537 "parser.yy"
     { (yyval.decl) = DeclarationNode::newVarArray( 0 ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2530 "parser.yy"
+#line 2539 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newArray( (yyvsp[(4) - (6)].en), 0, false ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2532 "parser.yy"
+#line 2541 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newVarArray( 0 ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2547 "parser.yy"
+#line 2556 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2549 "parser.yy"
+#line 2558 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2554 "parser.yy"
+#line 2563 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2556 "parser.yy"
+#line 2565 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2558 "parser.yy"
+#line 2567 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2560 "parser.yy"
+#line 2569 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2562 "parser.yy"
+#line 2571 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2568 "parser.yy"
+#line 2577 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2570 "parser.yy"
+#line 2579 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
   case 679:
-/* Line 1806 of yacc.c  */
-#line 2572 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
-    break;
-  case 680:
-/* Line 1806 of yacc.c  */
-#line 2577 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
-    break;
-  case 681:
-/* Line 1806 of yacc.c  */
-#line 2579 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
-    break;
-  case 682:
 /* Line 1806 of yacc.c  */
 …
     break;
+  case 680:
+/* Line 1806 of yacc.c  */
+#line 2586 "parser.yy"
+    { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
+    break;
+  case 681:
+/* Line 1806 of yacc.c  */
+#line 2588 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
+    break;
+  case 682:
+/* Line 1806 of yacc.c  */
+#line 2590 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
+    break;
   case 684:
 /* Line 1806 of yacc.c  */
 #line 2588 "parser.yy"
+#line 2597 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2599 "parser.yy"
+#line 2608 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2602 "parser.yy"
+#line 2611 "parser.yy"
     { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2604 "parser.yy"
+#line 2613 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, (yyvsp[(3) - (5)].decl), false ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2607 "parser.yy"
+#line 2616 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2609 "parser.yy"
+#line 2618 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl), true ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2611 "parser.yy"
+#line 2620 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(3) - (7)].decl), true ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2625 "parser.yy"
+#line 2634 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2627 "parser.yy"
+#line 2636 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2632 "parser.yy"
+#line 2641 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2634 "parser.yy"
+#line 2643 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2636 "parser.yy"
+#line 2645 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2638 "parser.yy"
+#line 2647 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2640 "parser.yy"
+#line 2649 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2646 "parser.yy"
+#line 2655 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2648 "parser.yy"
+#line 2657 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2650 "parser.yy"
+#line 2659 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2655 "parser.yy"
+#line 2664 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2657 "parser.yy"
+#line 2666 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2667 "parser.yy"
+#line 2676 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2677 "parser.yy"
+#line 2686 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2679 "parser.yy"
+#line 2688 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2681 "parser.yy"
+#line 2690 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2683 "parser.yy"
+#line 2692 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2685 "parser.yy"
+#line 2694 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2687 "parser.yy"
+#line 2696 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2694 "parser.yy"
+#line 2703 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2696 "parser.yy"
+#line 2705 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2698 "parser.yy"
+#line 2707 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2700 "parser.yy"
+#line 2709 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2702 "parser.yy"
+#line 2711 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2704 "parser.yy"
+#line 2713 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2706 "parser.yy"
+#line 2715 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2708 "parser.yy"
+#line 2717 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2710 "parser.yy"
+#line 2719 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2712 "parser.yy"
+#line 2721 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2717 "parser.yy"
+#line 2726 "parser.yy"
     { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2719 "parser.yy"
+#line 2728 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2724 "parser.yy"
+#line 2733 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), true ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2726 "parser.yy"
+#line 2735 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl)->addQualifiers( (yyvsp[(3) - (7)].decl) ), true ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2753 "parser.yy"
+#line 2762 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2764 "parser.yy"
+#line 2773 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2766 "parser.yy"
+#line 2775 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2768 "parser.yy"
+#line 2777 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2770 "parser.yy"
+#line 2779 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2772 "parser.yy"
+#line 2781 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2774 "parser.yy"
+#line 2783 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2781 "parser.yy"
+#line 2790 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2783 "parser.yy"
+#line 2792 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2785 "parser.yy"
+#line 2794 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2787 "parser.yy"
+#line 2796 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2789 "parser.yy"
+#line 2798 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2791 "parser.yy"
+#line 2800 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2796 "parser.yy"
+#line 2805 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2801 "parser.yy"
+#line 2810 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, DeclarationNode::newTuple( 0 ), (yyvsp[(4) - (5)].decl), 0 ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2803 "parser.yy"
+#line 2812 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[(1) - (6)].decl), (yyvsp[(4) - (6)].decl), 0 ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2805 "parser.yy"
+#line 2814 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[(1) - (6)].decl), (yyvsp[(4) - (6)].decl), 0 ); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2829 "parser.yy"
+#line 2838 "parser.yy"
     { (yyval.en) = 0; }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 2831 "parser.yy"
+#line 2840 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
 …
 /* Line 1806 of yacc.c  */
 #line 9412 "Parser/parser.cc"
+#line 9422 "Parser/parser.cc"
       default: break;
+    }
 …
 /* Line 2067 of yacc.c  */
 #line 2834 "parser.yy"
+#line 2843 "parser.yy"
 // ----end of grammar----

src/Parser/parser.yy

-                      r7d5e243
+                      r6066e32
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Jun 30 21:15:54 2016
 // Update Count     : 1657
+// Last Modified On : Tue Jul 12 17:26:32 2016
+// Update Count     : 1659
 //
 …
                 { $$ = new StatementNode( StatementNode::Switch, $3, $5 ); }
         | SWITCH '(' comma_expression ')' '{' push declaration_list_opt switch_clause_list_opt '}' // CFA
+                { $$ = new StatementNode( StatementNode::Switch, $3, $8 ); /* xxx */ }
+                // The semantics of the declaration list is changed to include any associated initialization, which is performed
+                // *before* the transfer to the appropriate case clause.  Statements after the initial declaration list can
+                // never be executed, and therefore, are removed from the grammar even though C allows it.
+                {
+                        StatementNode *sw = new StatementNode( StatementNode::Switch, $3, $8 );
+                        // 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
+                        // statement around the switch.  Statements after the initial declaration list can never be executed, and
+                        // therefore, are removed from the grammar even though C allows it. Change also applies to choose statement.
+                        $$ = $7 != 0 ? new CompoundStmtNode( (StatementNode *)((new StatementNode( $7 ))->set_link( sw )) ) : sw;
+                }
         | CHOOSE '(' comma_expression ')' case_clause           // CFA
                 { $$ = new StatementNode( StatementNode::Choose, $3, $5 ); }
+                { $$ = new StatementNode( StatementNode::Switch, $3, $5 ); }
         | CHOOSE '(' comma_expression ')' '{' push declaration_list_opt choose_clause_list_opt '}' // CFA
+                { $$ = new StatementNode( StatementNode::Choose, $3, $8 ); }
+                {
+                        StatementNode *sw = new StatementNode( StatementNode::Switch, $3, $8 );
+                        $$ = $7 != 0 ? new CompoundStmtNode( (StatementNode *)((new StatementNode( $7 ))->set_link( sw )) ) : sw;
+                }
+        ;
 …
 case_clause:                                                                                    // CFA
         case_label_list statement                                       { $$ = $1->append_last_case( $2 ); }
+        case_label_list statement                                       { $$ = $1->append_last_case( new CompoundStmtNode( $2 ) ); }
+        ;
 …
 switch_clause_list:                                                                             // CFA
         case_label_list statement_list
                 { $$ = $1->append_last_case( $2 ); }
+                { $$ = $1->append_last_case( new CompoundStmtNode( $2 ) ); }
         | switch_clause_list case_label_list statement_list
                 { $$ = (StatementNode *)( $1->set_link( $2->append_last_case( $3 ))); }
+                { $$ = (StatementNode *)( $1->set_link( $2->append_last_case( new CompoundStmtNode( $3 ) ) ) ); }
+        ;
 …
                 { $$ = $1->append_last_case( $2 ); }
         | case_label_list statement_list fall_through_opt
                 { $$ = $1->append_last_case((StatementNode *)mkList((*$2,*$3 ))); }
+                { $$ = $1->append_last_case( new CompoundStmtNode( (StatementNode *)mkList( (*$2, *$3 ) ) ) ); }
         | choose_clause_list case_label_list fall_through
                 { $$ = (StatementNode *)( $1->set_link( $2->append_last_case( $3 ))); }
         | choose_clause_list case_label_list statement_list fall_through_opt
                 { $$ = (StatementNode *)( $1->set_link( $2->append_last_case((StatementNode *)mkList((*$3,*$4 ))))); }
+                { $$ = (StatementNode *)( $1->set_link( $2->append_last_case( new CompoundStmtNode( (StatementNode *)mkList( (*$3, *$4 ) ) ) ) ) ); }
+        ;
 fall_through_opt:                                                                               // CFA
         // empty
+                { $$ = new StatementNode( StatementNode::Break ); }     // insert implicit break
+        | fall_through
+        ;
+fall_through:                                                                                   // CFA
+        FALLTHRU
                 { $$ = 0; }
+        | fall_through
+        ;
+fall_through:                                                                                   // CFA
+        FALLTHRU                                                                        { $$ = new StatementNode( StatementNode::Fallthru ); }
+        | FALLTHRU ';'                                                          { $$ = new StatementNode( StatementNode::Fallthru ); }
+        | FALLTHRU ';'
+                { $$ = 0; }
+        ;
 …
                 { $$ = new StatementNode( StatementNode::Goto, $2 ); }
         | GOTO '*' comma_expression ';'                                         // GCC, computed goto
                 // The syntax for the GCC computed goto violates normal expression precedence, e.g., goto *i+3; => goto *(i+3 );
+                // The syntax for the GCC computed goto violates normal expression precedence, e.g., goto *i+3; => goto *(i+3);
                 // whereas normal operator precedence yields goto (*i)+3;
                 { $$ = new StatementNode( StatementNode::Goto, $3 ); }
 …
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement.
                 { $$ = new StatementNode( StatementNode::Continue ); }
         | CONTINUE IDENTIFIER ';'                                       // CFA, multi-level continue
+        | CONTINUE IDENTIFIER ';'                                                       // CFA, multi-level continue
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement, and
                 // the target of the transfer appears only at the start of an iteration statement.
 …
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement.
                 { $$ = new StatementNode( StatementNode::Break ); }
         | BREAK IDENTIFIER ';'                                          // CFA, multi-level exit
+        | BREAK IDENTIFIER ';'                                                          // CFA, multi-level exit
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement, and
                 // the target of the transfer appears only at the start of an iteration statement.
 …
+        ;
 asm_clobbers_list_opt:                                                                          // GCC
+asm_clobbers_list_opt:                                                                  // GCC
         // empty
                 { $$ = 0; }                                                                             // use default argument
 …
                 { typedefTable.makeTypedef( *$2 ); }
                 '{' field_declaration_list '}'
                 { $$ = DeclarationNode::newAggregate( $1, $2, 0, $5); }
+                { $$ = DeclarationNode::newAggregate( $1, $2, 0, $5 ); }
         | aggregate_key '(' type_name_list ')' '{' field_declaration_list '}' // CFA
                 { $$ = DeclarationNode::newAggregate( $1, 0, $3, $6 ); }
 …
                 { $$ = 0; }
         | assertion_list_opt assertion
                 { $$ = $1 == 0 ? $2 : $1->appendList( $2 ); }
+                { $$ = $1 != 0 ? $1->appendList( $2 ) : $2; }
+        ;

src/ResolvExpr/Resolver.cc

-                      r7d5e243
+                      r6066e32
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:17:01 2015
 // Last Modified By : Rob Schluntz
 // Last Modified On : Fri May 13 11:36:40 2016
 // Update Count     : 203
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:45:42 2016
+// Update Count     : 204
 //
 …
                 virtual void visit( ForStmt *forStmt );
                 virtual void visit( SwitchStmt *switchStmt );
-                virtual void visit( ChooseStmt *switchStmt );
                 virtual void visit( CaseStmt *caseStmt );
                 virtual void visit( BranchStmt *branchStmt );
 …
         void Resolver::visit( SwitchStmt *switchStmt ) {
-                handleSwitchStmt( switchStmt, *this );
+        }
-        void Resolver::visit( ChooseStmt *switchStmt ) {
                 handleSwitchStmt( switchStmt, *this );
+        }

src/SymTab/AddVisit.h

-                      r7d5e243
+                      r6066e32
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 16:14:32 2015
 // Last Modified By : Rob Schluntz
 // Last Modified On : Thu Apr 14 15:52:42 2016
 // Update Count     : 5
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:46:33 2016
+// Update Count     : 6
 //
 …
         template< typename Visitor >
-        inline void addVisit(ChooseStmt *switchStmt, Visitor &visitor) {
-                addVisitStatementList( switchStmt->get_branches(), visitor );
-                maybeAccept( switchStmt->get_condition(), visitor );
+        }
-        // template< typename Visitor >
-        // inline void addVisit(CaseStmt *caseStmt, Visitor &visitor) {
-        //      addVisitStatementList( caseStmt->get_statements(), visitor );
-        //      maybeAccept( caseStmt->get_condition(), visitor );
-        // }
-        template< typename Visitor >
         void acceptAndAdd( std::list< Declaration * > &translationUnit, Visitor &visitor, bool addBefore ) {
                 std::list< Declaration * >::iterator i = translationUnit.begin();

src/SymTab/Autogen.cc

-                      r7d5e243
+                      r6066e32
 // Author           : Rob Schluntz
 // Created On       : Thu Mar 03 15:45:56 2016
 // Last Modified By : Rob Schluntz
 // Last Modified On : Thu May 26 14:14:09 2016
 // Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:47:17 2016
+// Update Count     : 2
 //
 …
                 virtual void visit( CompoundStmt *compoundStmt );
                 virtual void visit( SwitchStmt *switchStmt );
-                virtual void visit( ChooseStmt *chooseStmt );
-                // virtual void visit( CaseStmt *caseStmt );
                 AutogenerateRoutines() : functionNesting( 0 ) {}
 …
                 visitStatement( switchStmt );
+        }
-        void AutogenerateRoutines::visit( ChooseStmt *switchStmt ) {
-                visitStatement( switchStmt );
+        }
-        // void AutogenerateRoutines::visit( CaseStmt *caseStmt ) {
-        //      visitStatement( caseStmt );
-        // }
 } // SymTab

src/SymTab/Indexer.cc

-                      r7d5e243
+                      r6066e32
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:37:33 2015
 // Last Modified By : Rob Schluntz
 // Last Modified On : Fri Apr 22 15:25:43 2016
 // Update Count     : 11
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:47:47 2016
+// Update Count     : 12
 //
 …
                         const MangleTable &mangleTable = decls->second;
                         for ( MangleTable::const_iterator decl = mangleTable.begin(); decl != mangleTable.end(); ++decl ) {
+                                // check for C decls with the same name, skipping
+                                // those with a compatible type (by mangleName)
+                                // check for C decls with the same name, skipping those with a compatible type (by mangleName)
                                 if ( decl->second->get_linkage() == LinkageSpec::C && decl->first != mangleName ) return true;
+                        }

src/SymTab/Validate.cc

-                      r7d5e243
+                      r6066e32
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Rob Schluntz
 // Last Modified On : Wed May 11 13:17:52 2016
 // Update Count     : 297
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:49:21 2016
+// Update Count     : 298
 //
 …
                 virtual void visit( CompoundStmt *compoundStmt );
                 virtual void visit( SwitchStmt *switchStmt );
-                virtual void visit( ChooseStmt *chooseStmt );
-                // virtual void visit( CaseStmt *caseStmt );
           private:
                 HoistStruct();
 …
                 addVisit( switchStmt, *this );
+        }
-        void HoistStruct::visit( ChooseStmt *switchStmt ) {
-                addVisit( switchStmt, *this );
+        }
-        // void HoistStruct::visit( CaseStmt *caseStmt ) {
-        //      addVisit( caseStmt, *this );
-        // }
         void Pass1::visit( EnumDecl *enumDecl ) {
 …
                 if ( StructInstType *aggDecl = dynamic_cast< StructInstType * >( tyDecl->get_base() ) ) {
                         return new StructDecl( aggDecl->get_name() );
+//                      return aggDecl->get_baseStruct();
                 } else if ( UnionInstType *aggDecl = dynamic_cast< UnionInstType * >( tyDecl->get_base() ) ) {
                         return new UnionDecl( aggDecl->get_name() );
 …
                 } // if
+        }
         Declaration *EliminateTypedef::mutate( StructDecl * structDecl ) {
                 addImplicitTypedef( structDecl );
 …
                 Visitor::visit( funcDecl );
-                // original idea: modify signature of ctor/dtors and insert appropriate return statements
-                // to cause desired behaviour
-                // new idea: add comma exprs to every ctor call to produce first parameter.
-                // this requires some memoization of the first parameter, because it can be a
-                // complicated expression with side effects (see: malloc). idea: add temporary variable
-                // that is assigned address of constructed object in ctor argument position and
-                // return the temporary. It should also be done after all implicit ctors are
-                // added, so not in this pass!
+        }

src/SynTree/AddStmtVisitor.cc

-                      r7d5e243
+                      r6066e32
 // Author           : Rob Schluntz
 // Created On       : Wed Jun 22 12:11:17 2016
 // Last Modified By : Rob Schluntz
 // Last Modified On : Wed Jun 22 12:16:29 2016
 // Update Count     : 11
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:49:59 2016
+// Update Count     : 12
 //
 …
+}
-void AddStmtVisitor::visit(ChooseStmt *switchStmt) {
-        visitStatementList( switchStmt->get_branches() );
-        maybeAccept( switchStmt->get_condition(), *this );
+}
 void AddStmtVisitor::visit(CaseStmt *caseStmt) {
         visitStatementList( caseStmt->get_statements() );

src/SynTree/AddStmtVisitor.h

-                      r7d5e243
+                      r6066e32
 // Author           : Rob Schluntz
 // Created On       : Wed Jun 22 12:05:48 2016
 // Last Modified By : Rob Schluntz
 // Last Modified On : Wed Jun 22 12:12:05 2016
 // Update Count     : 7
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:50:32 2016
+// Update Count     : 8
 //
 …
         virtual void visit(ForStmt *forStmt);
         virtual void visit(SwitchStmt *switchStmt);
-        virtual void visit(ChooseStmt *chooseStmt);
         virtual void visit(CaseStmt *caseStmt);
         virtual void visit(CatchStmt *catchStmt);

src/SynTree/Mutator.cc

-                      r7d5e243
+                      r6066e32
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
 // Last Modified On : Wed Apr 27 17:07:29 2016
 // Update Count     : 16
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:51:19 2016
+// Update Count     : 17
 //
 …
+}
-Statement *Mutator::mutate( ChooseStmt *switchStmt ) {
-        switchStmt->set_condition( maybeMutate( switchStmt->get_condition(), *this ) );
-        mutateAll( switchStmt->get_branches(), *this );
-        return switchStmt;
+}
-Statement *Mutator::mutate( FallthruStmt *fallthruStmt ) {
-        return fallthruStmt;
+}
 Statement *Mutator::mutate( CaseStmt *caseStmt ) {
         caseStmt->set_condition( maybeMutate( caseStmt->get_condition(), *this ) );

src/SynTree/Mutator.h

-                      r7d5e243
+                      r6066e32
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
 // Last Modified On : Thu Apr 14 15:32:00 2016
 // Update Count     : 10
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:51:43 2016
+// Update Count     : 11
 //
 #include <cassert>
 …
         virtual Statement* mutate( ForStmt *forStmt );
         virtual Statement* mutate( SwitchStmt *switchStmt );
-        virtual Statement* mutate( ChooseStmt *chooseStmt );
-        virtual Statement* mutate( FallthruStmt *fallthruStmt );
         virtual Statement* mutate( CaseStmt *caseStmt );
         virtual Statement* mutate( BranchStmt *branchStmt );

src/SynTree/Statement.cc

-                      r7d5e243
+                      r6066e32
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
 // Last Modified On : Thu May 12 13:33:18 2016
 // Update Count     : 54
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:52:32 2016
+// Update Count     : 55
 //
 …
         for ( i = stmts.begin(); i != stmts.end(); i++)
                 (*i )->print( os, indent + 4 );
+}
-//ChooseStmt::ChooseStmt( std::list<Label> labels, Expression *condition, Statement *body ) {}
-ChooseStmt::ChooseStmt( std::list<Label> _labels, Expression * _condition, std::list<Statement *> &_branches ):
-        Statement( _labels ), condition( _condition ), branches( _branches ) {
+}
-ChooseStmt::ChooseStmt( const ChooseStmt & other ):
-        Statement( other ), condition( maybeClone( other.condition ) ) {
-                cloneAll( other.branches, branches );
+}
-ChooseStmt::~ChooseStmt() {
-        delete condition;
+}
-void ChooseStmt::add_case( CaseStmt *c ) {}
-void ChooseStmt::print( std::ostream &os, int indent ) const {
-        os << "Choose on condition: ";
-        condition->print( os );
-        os << endl;
-        // branches
-        std::list<Statement *>::const_iterator i;
-        for ( i = branches.begin(); i != branches.end(); i++)
-                (*i )->print( os, indent + 4 );
-        //for_each( branches.begin(), branches.end(), mem_fun( bind1st(&Statement::print ), os ));
+}
-void FallthruStmt::print( std::ostream &os, int indent ) const {
-        os << string( indent, ' ' ) << "Fall-through statement" << endl;
+}

src/SynTree/Statement.h

-                      r7d5e243
+                      r6066e32
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
 // Last Modified On : Wed Dec 09 14:09:24 2015
 // Update Count     : 46
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:53:29 2016
+// Update Count     : 47
 //
 …
 };
-class ChooseStmt : public Statement {
-  public:
-        ChooseStmt( std::list<Label> labels, Expression *condition, std::list<Statement *> &branches );
-        ChooseStmt( const ChooseStmt &other );
-        virtual ~ChooseStmt();
-        Expression *get_condition() { return condition; }
-        void set_condition( Expression *newValue ) { condition = newValue; }
-        std::list<Statement *>& get_branches() { return branches; }
-        void add_case( CaseStmt * );
-        virtual void accept( Visitor &v ) { v.visit( this ); }
-        virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
-        virtual ChooseStmt *clone() const { return new ChooseStmt( *this ); }
-        virtual void print( std::ostream &os, int indent = 0 ) const;
-  private:
-        Expression *condition;
-        std::list<Statement *> branches; // should be list of CaseStmt
-};
-class FallthruStmt : public Statement {
-  public:
-        FallthruStmt( std::list<Label> labels ) : Statement( labels ) { }
-        virtual void accept( Visitor &v ) { v.visit( this ); }
-        virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
-        virtual FallthruStmt *clone() const { return new FallthruStmt( *this ); }
-        virtual void print( std::ostream &os, int indent = 0 ) const;
-};
 class CaseStmt : public Statement {
   public:

src/SynTree/SynTree.h

-                      r7d5e243
+                      r6066e32
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
 // Last Modified On : Thu Apr 14 15:31:36 2016
 // Update Count     : 5
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:54:02 2016
+// Update Count     : 6
 //
 …
 class ForStmt;
 class SwitchStmt;
-class ChooseStmt;
-class FallthruStmt;
 class CaseStmt;
 class BranchStmt;

src/SynTree/Visitor.cc

-                      r7d5e243
+                      r6066e32
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
 // Last Modified On : Wed Apr 27 17:07:40 2016
 // Update Count     : 18
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:54:39 2016
+// Update Count     : 19
 //
 …
+}
-void Visitor::visit( ChooseStmt *switchStmt ) {
-        maybeAccept( switchStmt->get_condition(), *this );
-        acceptAll( switchStmt->get_branches(), *this );
+}
-void Visitor::visit( FallthruStmt *fallthruStmt ) {}
 void Visitor::visit( CaseStmt *caseStmt ) {
         maybeAccept( caseStmt->get_condition(), *this );

src/SynTree/Visitor.h

-                      r7d5e243
+                      r6066e32
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
 // Last Modified On : Thu Apr 14 15:30:58 2016
 // Update Count     : 7
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:55:09 2016
+// Update Count     : 8
 //
 …
         virtual void visit( ForStmt *forStmt );
         virtual void visit( SwitchStmt *switchStmt );
-        virtual void visit( ChooseStmt *switchStmt );
-        virtual void visit( FallthruStmt *switchStmt );
         virtual void visit( CaseStmt *caseStmt );
         virtual void visit( BranchStmt *branchStmt );

src/examples/includes.c

-                      r7d5e243
+                      r6066e32
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed Apr 13 22:30:02 2016
 // Update Count     : 370
+// Last Modified On : Tue Jul 12 17:59:25 2016
+// Update Count     : 371
 //
 …
 #endif // __CFA__
+#if 0
 #if 1
 #define _GNU_SOURCE
 //#include <aio.h>
 //#include <a.out.h>
 //#include <aliases.h>
 //#include <alloca.h>
 //#include <ansidecl.h>
 //#include <ar.h>
 //#include <argp.h>
+#include <aio.h>
+#include <a.out.h>
+#include <aliases.h>
+#include <alloca.h>
+#include <ansidecl.h>
+#include <ar.h>
+#include <argp.h>
 #include <argz.h>
 //#include <assert.h>
+#include <assert.h>
 #include <bfd.h>
-#if 0
 #include <bfdlink.h>
 #include <byteswap.h>
 …
 #include <ctype.h>
 #include <curses.h>
 #include <demangle.h>
+//#include <demangle.h>
 #include <dialog.h>
 #include <dirent.h>
 #include <dis-asm.h>
+#endif
+#if 0
 #include <dlfcn.h>
 #include <dlg_colors.h>
 …
 #else
 //#define _GNU_SOURCE
 #include <bfd.h>
+#define _GNU_SOURCE
+//#include <bfd.h>
 //#include <error.h>
+#include <demangle.h>
 #endif // 0

src/libcfa/iostream

-                      r7d5e243
+                      r6066e32
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sun Apr 10 23:00:12 2016
 // Update Count     : 92
+// Last Modified On : Tue Jul 12 18:01:09 2016
+// Update Count     : 93
 //
 …
 };
 // implement writable for some intrinsic types
+// implement writable for intrinsic types
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, char );
 …
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, ostype * (*)( ostype * ) );
+// manipulators
 forall( dtype ostype | ostream( ostype ) ) ostype * endl( ostype * );
 forall( dtype ostype | ostream( ostype ) ) ostype * sepOn( ostype * );

src/libcfa/iostream.c

-                      r7d5e243
+                      r6066e32
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu May 26 10:08:31 2016
 // Update Count     : 305
+// Last Modified On : Tue Jul 12 18:01:39 2016
+// Update Count     : 306
 //
 …
 forall( dtype ostype | ostream( ostype ) )
 ostype * ?|?( ostype *os, ostype * (* manip)( ostype * ) ) {
+ostype * ?|?( ostype * os, ostype * (* manip)( ostype * ) ) {
         return manip( os );
 } // ?|?

src/tests/switch.c

-                      r7d5e243
+                      r6066e32
+int main(int argc, char const *argv[]) {
+    int i;
+    switch ( i ) case 3 : i = 1;
+    switch ( i ) default : i = 1;
+    switch ( 3 )
+      default:
+      case 2:
+      case 3:
+;
+//
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// switch.c --
+//
+// Author           : Peter A. Buhr
+// Created On       : Tue Jul 12 06:50:22 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 18:02:23 2016
+// Update Count     : 22
+//
+    switch ( i ) {
+    }
+int f( int i ) { return i; }
+    switch ( i ) {
+        int i;
+      case 8~10:
+      default:
+        i = 3;
+      case 3:
+      case 'A' ... 'Z':
+      case 5 ... 6:
+      case 2, 4:
+        i = 3;
+        break;
+    }
+int main() {
+        int i = 0;
+        switch ( i ) case 3 : i = 1;
+        switch ( i ) default : f( 3 );
+    choose ( i ) case 3 : i = 1;
+    choose ( i ) default : i = 1;
+    choose ( i ) {
+        int i;
+      case 3:
+      case 'A' ... 'Z':
+      case 5 ... 6:
+      case 2, 4, 7:
+        i = 3;
+        fallthru;
+      default:
+        i = 3;
+      case 8~10:
+        fallthru
+    }
+        switch ( 3 )
+          default:
+          case 2:
+          case 3:
+                f( 3 );
+        switch ( i ) {}
+        switch ( i ) {
+          case 3:
+                f( 3 );
+        } // switch
+        // switch (3 ) {
+        //      int j;
+        //   case 3:
+        //      break;
+        //   case 4:
+        //      j = 0;
+        // }
+        switch ( i ) {
+                int j = 0;
+                int k = 0;
+                struct S { int i; };
+                S s;
+          case 8~10:
+          default:
+                i = 3;
+          case 3:
+          case 'A' ... 'Z':
+          case 5 ... 6:
+          case 2, 4:
+                j = 3;
+                f( 3 );
+                break;
+        } // switch
+        choose ( i ) case 3 : f( 3 );
+        choose ( i ) default : i = 1;
+        choose ( 3 )
+          case 2:
+          default:
+          case 3:
+                f( 3 );
+        choose ( i ) {}
+        choose ( i ) {
+          case 3:
+                f( 3 );
+        } // choose
+        choose ( i ) {
+                int j = 0;
+                int k = 0;
+                struct S { int i; };
+                S s;
+          case 3:
+          case 'A' ... 'Z':
+          case 5 ... 6:
+          case 2, 4, 7:
+                i = 3;
+                f( 3 );
+          default:
+                j = 3;
+          case 8~10:
+                f( 3 );
+                fallthru
+          case 'd':
+                j = 5;
+        } // choose
+}
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa switch.c" //
+// End: //

Context Navigation

Legend:

Download in other formats: