Changeset becba789

Timestamp:

Aug 2, 2016, 6:40:20 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

8a443f4, 9799ec8

Parents:

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

Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

Files:

• INSTALL (modified) (2 diffs)
• Jenkins/FullBuild (modified) (3 diffs)
• doc/LaTeXmacros/common.tex (modified) (11 diffs)
• doc/aaron_comp_II/comp_II.tex (modified) (11 diffs)
• doc/bibliography/cfa.bib (modified) (1 diff)
• doc/user/user.tex (modified) (37 diffs)
• src/CodeGen/CodeGenerator.cc (modified) (17 diffs)
• src/CodeGen/CodeGenerator.h (modified) (2 diffs)
• src/ControlStruct/CaseRangeMutator.cc (modified) (3 diffs)
• src/ControlStruct/CaseRangeMutator.h (modified) (2 diffs)
• src/Parser/lex.cc (modified) (47 diffs)
• src/Parser/lex.ll (modified) (3 diffs)
• src/tests/switch.c (modified) (4 diffs)
• src/tests/test.py (modified) (1 diff)

INSTALL

@@ -3 +3 @@
 
 Cforall is built using GNU Make and the GNU Autoconf system.  It also requires
-g++ version 4, bison and flex.  On systems where GNU Make is the default make
-it may suffice to build the system by entering the commands
+g++ version >= 4.6, bison and flex.  On systems where GNU Make is the default
+make, the system is built by entering the commands:
 
         ./configure
@@ -17 +17 @@
 
 --prefix=/some/directory controls the path prefix common to all installed
-  cfa-cc components.  Some components will be installed in /some/directory/bin,
+  cfa-cc components.  Some components are installed in /some/directory/bin,
   others in /some/directory/lib.  If unspecified, this defaults to /usr/local.
-  If you wish to use (a subdirectory of) your home directory, ${HOME}/some/dir 
-  works, but it is important not to put quotes around the directory path; 
-  Cforall may appear to build, but the installed version may not work properly.
+  To use (a subdirectory of) your home directory, ${HOME}/some/dir works, but
+  it is important not to put quotes around the directory path; Cforall may
+  appear to build, but the installed version may not work properly.
 
 --with-backend-compiler=PROGRAM specifies the installed path of gcc.  It

Jenkins/FullBuild

@@ -43 +43 @@
                 }
 
-                sh "GIT_SSH_COMMAND=\"ssh -v\" git push DoLang ${gitRefNewValue}:master"
+                //sh "GIT_SSH_COMMAND=\"ssh -v\" git push DoLang ${gitRefNewValue}:master"
+                echo('BUILD NOT PUSH SINCE DO-LANG SERVER WAS DOWN')
 }
 
@@ -67 +68 @@
 
 node ('master') {
+        def err = null
+
         try {
                 //Prevent the build from exceeding 30 minutes
@@ -78 +81 @@
                                         results = [null, null]
 
-                                        // parallel (
-                                        //      x64: {
-                                        //              trigger_build('64-bit')
-                                        //      },
-                                        //      x32: {
-                                        //              trigger_build('32-bit')
-                                        //      }
-                                        // )
+                                        parallel (
+                                                x64: {
+                                                        trigger_build('64-bit')
+                                                },
+                                                x32: {
+                                                        trigger_build('32-bit')
+                                                }
+                                        )
 
                                 //Push latest changes to do-lang repo

doc/LaTeXmacros/common.tex

@@ -11 +11 @@
 %% Created On       : Sat Apr  9 10:06:17 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Tue Jul 12 20:37:57 2016
-%% Update Count     : 206
+%% Last Modified On : Mon Aug  1 09:11:20 2016
+%% Update Count     : 225
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \setlength{\textheight}{9in}
 %\oddsidemargin 0.0in
-\renewcommand{\topfraction}{0.8}        % float must be greater than X of the page before it is forced onto its own page
-\renewcommand{\bottomfraction}{0.8}     % float must be greater than X of the page before it is forced onto its own page
+\renewcommand{\topfraction}{0.8}                % float must be greater than X of the page before it is forced onto its own page
+\renewcommand{\bottomfraction}{0.8}             % float must be greater than X of the page before it is forced onto its own page
 \renewcommand{\floatpagefraction}{0.8}  % float must be greater than X of the page before it is forced onto its own page
-\renewcommand{\textfraction}{0.0}       % the entire page maybe devoted to floats with no text on the page at all
-
-\lefthyphenmin=4
+\renewcommand{\textfraction}{0.0}               % the entire page maybe devoted to floats with no text on the page at all
+
+\lefthyphenmin=4                                                % hyphen only after 4 characters
 \righthyphenmin=4
 
@@ -38 +36 @@
 % Names used in the document.
 
-\newcommand{\CFA}{C$\mathbf\forall$\xspace}              % set language symbolic name
-\newcommand{\CFL}{Cforall\xspace}                        % set language text name
+\newcommand{\CFA}{C$\mathbf\forall$\xspace} % set language symbolic name
+\newcommand{\CFL}{Cforall\xspace}               % set language text name
 \newcommand{\CC}{\rm C\kern-.1em\hbox{+\kern-.25em+}\xspace} % CC symbolic name
 \newcommand{\CCeleven}{\rm C\kern-.1em\hbox{+\kern-.25em+}11\xspace} % C++11 symbolic name
-\def\c11{ISO/IEC C} % C11 name (cannot have numbers in latex command name)
+\def\c11{ISO/IEC C}                                             % C11 name (cannot have numbers in latex command name)
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -52 +50 @@
 \setlength{\parindentlnth}{\parindent}
 
-\newlength{\gcolumnposn}
+\newlength{\gcolumnposn}                                % temporary hack because lstlisting does handle tabs correctly
 \newlength{\columnposn}
 \setlength{\gcolumnposn}{2.5in}
@@ -63 +61 @@
 %\patchcmd{\lsthk@TextStyle}{\let\lst@DefEsc\@empty}{}{}{\errmessage{failed to patch}}
 
-\usepackage{pslatex}                                                                    % reduce size of san serif font
-\usepackage{relsize}                                    % must be after change to small or selects old size
+\usepackage{pslatex}                                    % reduce size of san serif font
+\usepackage{relsize}                                    % must be after change to small or selects old size
 
 % reduce size of chapter/section titles
@@ -120 +118 @@
 
 % inline text and lowercase index: \Index{inline and lowercase index text}
+\newcommand{\Index}{\@ifstar\@sIndex\@Index}
 % inline text and as-in index: \Index[as-is index text]{inline text}
+\newcommand{\@Index}[2][\@empty]{\lowercase{\def\temp{#2}}#2\ifx#1\@empty\index{\temp}\else\index{#1@{\protect#2}}\fi}
 % inline text but index with different as-is text: \Index[index text]{inline text}
-\newcommand{\Index}{\@ifstar\@sIndex\@Index}
-\newcommand{\@Index}[2][\@empty]{\lowercase{\def\temp{#2}}#2\ifx#1\@empty\index{\temp}\else\index{#1@{\protect#2}}\fi}
 \newcommand{\@sIndex}[2][\@empty]{#2\ifx#1\@empty\index{#2}\else\index{#1@{\protect#2}}\fi}
 
-% cannot use ©
+% inline text and code index (cannot use ©)
 \newcommand{\Indexc}[1]{\lstinline$#1$\index{#1@\lstinline$#1$}}
+% code index (cannot use ©)
 \newcommand{\indexc}[1]{\index{#1@\lstinline$#1$}}
 
@@ -137 +136 @@
 \newcommand{\@newterm}[2][\@empty]{\lowercase{\def\temp{#2}}{\newtermFontInline{#2}}\ifx#1\@empty\index{\temp}\else\index{#1@{\protect#2}}\fi}
 \newcommand{\@snewterm}[2][\@empty]{{\newtermFontInline{#2}}\ifx#1\@empty\index{#2}\else\index{#1@{\protect#2}}\fi}
+
+% Latin abbreviation
+\newcommand{\abbrevFont}{\textit}       % set empty for no italics
+\newcommand*{\eg}{%
+        \@ifnextchar{,}{\abbrevFont{e}.\abbrevFont{g}.}%
+                {\@ifnextchar{:}{\abbrevFont{e}.\abbrevFont{g}.}%
+                        {\abbrevFont{e}.\abbrevFont{g}.,\xspace}}%
+}%
+\newcommand*{\ie}{%
+        \@ifnextchar{,}{\abbrevFont{i}.\abbrevFont{e}.}%
+                {\@ifnextchar{:}{\abbrevFont{i}.\abbrevFont{e}.}%
+                        {\abbrevFont{i}.\abbrevFont{e}.,\xspace}}%
+}%
+\newcommand*{\etc}{%
+        \@ifnextchar{.}{\abbrevFont{etc}}%
+        {\abbrevFont{etc}.\xspace}%
+}%
 \makeatother
 
@@ -145 +161 @@
         \endlist
 }% quote2
+
 \newenvironment{rationale}{%
   \begin{quote2}\noindent$\Box$\enspace
@@ -188 +205 @@
 \newcommand{\VPageref}[2][page]{\ifx#1\@empty\else{#1}\nobreakspace\fi\pageref{#2}}
 
-% Go programming language
+% Go programming language: https://github.com/julienc91/listings-golang/blob/master/listings-golang.sty
 \lstdefinelanguage{Golang}{
         morekeywords=[1]{package,import,func,type,struct,return,defer,panic, recover,select,var,const,iota,},%
@@ -204 +221 @@
 }
 
-% CFA programming language, based on ANSI C
+% CFA programming language, based on ANSI C (with some gcc additions)
 \lstdefinelanguage{CFA}[ANSI]{C}{
         morekeywords={_Alignas,_Alignof,__alignof,__alignof__,asm,__asm,__asm__,_At,_Atomic,__attribute,__attribute__,auto,
                 _Bool,catch,catchResume,choose,_Complex,__complex,__complex__,__const,__const__,disable,dtype,enable,__extension__,
-                fallthru,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,_Noreturn,otype,restrict,_Static_assert,
+                fallthrough,fallthru,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,_Noreturn,otype,restrict,_Static_assert,
                 _Thread_local,throw,throwResume,trait,try,typeof,__typeof,__typeof__,},
 }%
@@ -215 +232 @@
 language=CFA,
 columns=fullflexible,
-basicstyle=\linespread{0.9}\sf,
-stringstyle=\tt,
-tabsize=4,
-xleftmargin=\parindentlnth,
-extendedchars=true,
-escapechar=§,
-mathescape=true,
-keepspaces=true,
-showstringspaces=false,
-showlines=true,
-aboveskip=4pt,
+basicstyle=\linespread{0.9}\sf,                 % reduce line spacing and use sanserif font
+stringstyle=\tt,                                                % use typewriter font
+tabsize=4,                                                              % 4 space tabbing
+xleftmargin=\parindentlnth,                             % indent code to paragraph indentation
+extendedchars=true,                                             % allow ASCII characters in the range 128-255
+escapechar=§,                                                   % escape to latex in CFA code
+mathescape=true,                                                % allow $...$ LaTeX math escapes in code
+%keepspaces=true,                                               % 
+showstringspaces=false,                                 % do not show spaces with cup
+showlines=true,                                                 % show blank lines at end of code
+aboveskip=4pt,                                                  % spacing above/below code block
 belowskip=3pt,
-moredelim=**[is][\color{red}]{®}{®}, % red highlighting
-moredelim=**[is][\color{blue}]{ß}{ß}, % blue highlighting
+moredelim=**[is][\color{red}]{®}{®},    % red highlighting
+moredelim=**[is][\color{blue}]{ß}{ß},   % blue highlighting
 moredelim=**[is][\color{OliveGreen}]{¢}{¢}, % green highlighting
 moredelim=[is][\lstset{keywords={}}]{¶}{¶}, % temporarily turn off keywords
@@ -242 +259 @@
 \renewcommand\thebibliography[1]{
   \Oldthebibliography{#1}
-  \setlength{\parskip}{0pt}                     % reduce vertical spacing between references
+  \setlength{\parskip}{0pt}                             % reduce vertical spacing between references
   \setlength{\itemsep}{5pt plus 0.3ex}
 }%
-
-\newcommand*{\eg}{\textit{e.g}.\@\xspace}
-\newcommand*{\ie}{\textit{i.e}.\@\xspace}
-
-\makeatletter
-\newcommand*{\etc}{%
-    \@ifnextchar{.}%
-        {\textit{etc}}%
-        {\textit{etc}.\@\xspace}%
-}
-\makeatother
 
 % Local Variables: %

doc/aaron_comp_II/comp_II.tex

@@ -43 +43 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\title{\Huge
-\vspace*{1in}
-Efficient Type Resolution in \CFA \\
-\vspace*{0.25in}
-\huge
-PhD Comprehensive II Research Proposal
+\title{
+\Huge \vspace*{1in} Efficient Type Resolution in \CFA \\
+\huge \vspace*{0.25in} PhD Comprehensive II Research Proposal
 \vspace*{1in}
 }
 
-\author{\huge
-\vspace*{0.1in}
-Aaron Moss \\
+\author{
+\huge Aaron Moss \\
+\Large \vspace*{0.1in} \texttt{a3moss@uwaterloo.ca} \\
 \Large Cheriton School of Computer Science \\
 \Large University of Waterloo
@@ -88 +85 @@
 
 \CFA\footnote{Pronounced ``C-for-all'', and written \CFA, CFA, or \CFL.} is an evolutionary modernization of the C programming language currently being designed and built at the University of Waterloo by a team led by Peter Buhr. 
-Features added to C by \CFA include name overloading, user-defined operators, parametric-polymorphic routines, and type constructors and destructors, among others. 
-These features make \CFA significantly more powerful and expressive than C, but impose a significant compile-time cost to implement, particularly in the expression resolver, which must evaluate the typing rules of a much more complex type system. 
+\CFA adds multiple features to C, including name overloading, user-defined operators, parametric-polymorphic routines, and type constructors and destructors, among others. 
+These features make \CFA significantly more powerful and expressive than C, but impose a significant compile-time cost to support, particularly in the expression resolver, which must evaluate the typing rules of a much more complex type system. 
 The primary goal of this proposed research project is to develop a sufficiently performant expression resolution algorithm, experimentally validate its performance, and integrate it into \Index*{CFA-CC}, the \CFA reference compiler.
 Secondary goals of this project include the development of various new language features for \CFA; parametric-polymorphic (``generic'') types have already been designed and implemented, and reference types and user-defined conversions are under design consideration. 
-The experimental performance-testing architecture for resolution algorithms will also be used to determine the compile-time cost of adding such new features to the \CFA type system.
+The experimental performance-testing architecture for resolution algorithms will also be used to determine the compile-time cost of adding such new features to the \CFA type system. 
+More broadly, this research should provide valuable data for implementers of compilers for other programming languages with similarly powerful static type systems.
 
 \section{\CFA}
@@ -101 +99 @@
 \subsection{Polymorphic Functions}
 The most significant feature \CFA adds is parametric-polymorphic functions. 
-Such functions are written using a ©forall© clause, the feature that gave the language its name:
+Such functions are written using a ©forall© clause (which gives the language its name):
 \begin{lstlisting}
 forall(otype T)
@@ -129 +127 @@
 
 Monomorphic specializations of polymorphic functions can themselves be used to satisfy type assertions. 
-For instance, ©twice© could have been define as below, using the \CFA syntax for operator overloading:
+For instance, ©twice© could have been defined as below, using the \CFA syntax for operator overloading:
 \begin{lstlisting}
 forall(otype S | { S ?+?(S, S); })
@@ -135 +133 @@
 \end{lstlisting} 
 This version of ©twice© will work for any type ©S© that has an addition operator defined for it, and it could have been used to satisfy the type assertion on ©four_times©. 
-The compiler accomplishes this by creating a wrapper function calling ©twice // (2)© with ©S© bound to ©double©, then providing this wrapper function to ©four_times©\footnote{©twice // (2)© could have had a type parameter named ©T©; \CFA specifies a renaming the type parameters, which would avoid the name conflict with the parameter ©T© of ©four_times©.}. 
+The compiler accomplishes this by creating a wrapper function calling ©twice // (2)© with ©S© bound to ©double©, then providing this wrapper function to ©four_times©\footnote{©twice // (2)© could also have had a type parameter named ©T©; \CFA specifies renaming of the type parameters, which would avoid the name conflict with the type variable ©T© of ©four_times©.}. 
 
 Finding appropriate functions to satisfy type assertions is essentially a recursive case of expression resolution, as it takes a name (that of the type assertion) and attempts to match it to a suitable declaration in the current scope. 
 If a polymorphic function can be used to satisfy one of its own type assertions, this recursion may not terminate, as it is possible that function will be examined as a candidate for its own type assertion unboundedly repeatedly. 
 To avoid infinite loops, the current \Index*{CFA-CC} compiler imposes a fixed limit on the possible depth of recursion, similar to that employed by most \Index*[C++]{\CC} compilers for template expansion; this restriction means that there are some semantically well-typed expressions which cannot be resolved by {CFA-CC}. 
-One area of potential improvement this project proposes to investigate is the possibility of using the compiler's knowledge of the current set of declarations to make a more precise judgement of when further type assertion satisfaction recursion will not produce a well-typed expression.
+One area of potential improvement this project proposes to investigate is the possibility of using the compiler's knowledge of the current set of declarations to more precicely determine when further type assertion satisfaction recursion will not produce a well-typed expression.
 
 \subsection{Name Overloading}
@@ -171 +169 @@
 Such a conversion system should be simple for user programmers to utilize, and fit naturally with the existing design of implicit conversions in C; ideally it would also be sufficiently powerful to encode C's usual arithmetic conversions itself, so that \CFA only has one set of rules for conversions. 
 
-Glen Ditchfield \textbf{TODO CITE} has laid out a framework for using polymorphic conversion constructor functions to create a directed acyclic graph (DAG) of conversions. 
+Ditchfield\cite{Ditchfield:conversions} has laid out a framework for using polymorphic conversion constructor functions to create a directed acyclic graph (DAG) of conversions. 
 A monomorphic variant of these functions can be used to mark a conversion arc in the DAG as only usable as the final step in a conversion. 
 With these two types of conversion arcs, separate DAGs can be created for the safe and the unsafe conversions, and conversion cost can be represented as path length through the DAG. 
@@ -210 +208 @@
 \CFA adds \emph{tuple types} to C, a facility for referring to multiple values with a single identifier. 
 A variable may name a tuple, and a function may return one. 
-Particularly relevantly for resolution, a tuple may be automatically \emph{destructured} into a list of values, as in the ©swap© function below:
+Particularly relevantly for resolution, a tuple may be implicitly \emph{destructured} into a list of values, as in the call to ©swap© below:
 \begin{lstlisting}
 [char, char] x = [ '!', '?' ];
@@ -218 +216 @@
 
 x = swap( x ); // destructure [char, char] x into two elements of parameter list
-// ^ can't use int x for parameter, not enough arguments to swap
+// can't use int x for parameter, not enough arguments to swap
 \end{lstlisting}
 Tuple destructuring means that the mapping from the position of a subexpression in the argument list to the position of a paramter in the function declaration is not straightforward, as some arguments may be expandable to different numbers of parameters, like ©x© above.
@@ -245 +243 @@
 
 \section{Expression Resolution}
-% TODO cite Baker, Cormack, etc.
-
+The expression resolution problem is essentially to determine an optimal matching between some combination of argument interpretations and the parameter list of some overloaded instance of a function; the argument interpretations are produced by recursive invocations of expression resolution, where the base case is zero-argument functions (which are, for purposes of this discussion, semantically equivalent to named variables or constant literal expressions). 
+Assuming that the matching between a function's parameter list and a combination of argument interpretations can be done in $O(p^k)$ time, where $p$ is the number of parameters and $k$ is some positive number, if there are $O(i)$ valid interpretations for each subexpression, there will be $O(i)$ candidate functions and $O(i^p)$ possible argument combinations for each expression, so a single recursive call to expression resolution will take $O(i^{p+1} \cdot p^k)$ time if it compares all combinations. 
+Given this bound, resolution of a single top-level expression tree of depth $d$ takes $O(i^{p+1} \cdot p^{k \cdot d})$ time\footnote{The call tree will have leaves at depth $O(d)$, and each internal node will have $O(p)$ fan-out, producing $O(p^d)$ total recursive calls.}.
+Expression resolution is somewhat unavoidably exponential in $p$, the number of function parameters, and $d$, the depth of the expression tree, but these values are fixed by the user programmer, and generally bounded by reasonably small constants. 
+$k$, on the other hand, is mostly dependent on the representation of types in the system and the efficiency of type assertion checking; if a candidate argument combination can be compared to a function parameter list in linear time in the length of the list (\ie $k = 1$), then the $p^{k \cdot d}$ term is linear in the input size of the source code for the expression, otherwise the resolution algorithm will exibit sub-linear performance scaling on code containing more-deeply nested expressions.
+The number of valid interpretations of any subexpression, $i$, is bounded by the number of types in the system, which is possibly infinite, though practical resolution algorithms for \CFA must be able to place some finite bound on $i$, possibly at the expense of type system completeness. 
+
+The research goal of this project is to develop a performant expression resolver for \CFA; this analysis suggests two primary areas of investigation to accomplish that end. 
+The first is efficient argument-parameter matching; Bilson\cite{Bilson03} mentions significant optimization opportunities available in the current literature to improve on the existing {CFA-CC} compiler.
+%TODO: look up and lit review 
+The second, and likely more fruitful, area of investigation is heuristics and algorithmic approaches to reduce the number of argument interpretations considered in the common case; given the large ($p+1$) exponent on number of interpretations considered in the runtime analysis, even small reductions here could have a significant effect on overall resolver runtime. 
+The discussion below presents a number of largely orthagonal axes for expression resolution algorithm design to be investigated, noting prior work where applicable. 
+
+\subsection{Argument-Parameter Matching}
+The first axis we consider is argument-parameter matching --- whether the type matching for a candidate function to a set of candidate arguments is directed by the argument types or the parameter types. 
+
+\subsubsection{Argument-directed (``Bottom-up'')}
+Baker's algorithm for expression resolution\cite{Baker82} pre-computes argument candidates, from the leaves of the expression tree up.
+For each candidate function, Baker attempts to match argument types to parameter types in sequence, failing if any parameter cannot be matched.
+
+Bilson\cite{Bilson03} similarly pre-computes argument candidates in the original \CFA compiler, but then explicitly enumerates all possible argument combinations for a multi-parameter function; these argument combinations are matched to the parameter types of the candidate function as a unit rather than individual arguments.
+This is less efficient than Baker's approach, as the same argument may be compared to the same parameter many times, but allows a more straightforward handling of polymorphic type binding and multiple return types.
+It is possible the efficiency losses here relative to Baker could be significantly reduced by application of memoization to the argument-parameter type comparisons.
+
+\subsubsection{Parameter-directed (``Top-down'')}
+Unlike Baker and Bilson, Cormack's algorithm\cite{Cormack81} requests argument candidates which match the type of each parameter of each candidate function, from the top-level expression down; memoization of these requests is presented as an optimization.
+As presented, this algorithm requires the result of the expression to have a known type, though an algorithm based on Cormack's could reasonably request a candidate set of any return type, though such a set may be quite large.
+
+\subsubsection{Hybrid}
+This proposal includes the investigation of hybrid top-down/bottom-up argument-parameter matching.
+A reasonable hybrid approach might be to take a top-down approach when the expression to be matched is known to have a fixed type, and a bottom-up approach in untyped contexts.
+This may include switches from one type to another at different levels of the expression tree, for instance:
+\begin{lstlisting}
+forall(otype T)
+int f(T x);  // (1)
+
+void* f(char y);  // (2)
+
+int x = f( f( '!' ) );
+\end{lstlisting}
+Here, the outer call to ©f© must have a return type that is (implicitly convertable to) ©int©, so a top-down approach could be used to select \textit{(1)} as the proper interpretation of ©f©. \textit{(1)}'s parameter ©x© here, however, is an unbound type variable, and can thus take a value of any complete type, providing no guidance for the choice of candidate for the inner ©f©. The leaf expression ©'!'©, however, gives us a zero-cost interpretation of the inner ©f© as \textit{(2)}, providing a minimal-cost expression resolution where ©T© is bound to ©void*©.
+
+Deciding when to switch between bottom-up and top-down resolution in a hybrid algorithm is a necessarily heuristic process, and though finding good heuristics for it is an open question, one reasonable approach might be to switch from top-down to bottom-up when the number of candidate functions exceeds some threshold.
+
+\subsection{Implicit Conversion Application}
+Baker's\cite{Baker82} and Cormack's\cite{Cormack81} algorithms do not account for implicit conversions\footnote{Baker does briefly comment on an approach for handling implicit conversions.}; both assume that there is at most one valid interpretation of a given expression for each distinct type.
+Integrating implicit conversion handling into their algorithms provides some choice of implementation approach. 
+
+\subsubsection{On Parameters}
+Bilson\cite{Bilson03} did account for implicit conversions in his algorithm, but it is not clear his approach is optimal. 
+His algorithm integrates checking for valid implicit conversions into the argument-parameter matching step, essentially trading more expensive matching for a smaller number of argument interpretations. 
+This approach may result in the same subexpression being checked for a type match with the same type multiple times, though again memoization may mitigate this cost, and this approach will not generate implicit conversions that are not useful to match the containing function. 
+
+\subsubsection{On Arguments}
+Another approach would be to generate a set of possible implicit conversions for each set of interpretations of a given argument. 
+This would have the benefit of detecting ambiguous interpretations of arguments at the level of the argument rather than its containing call, would also never find more than one interpretation of the argument with a given type, and would re-use calculation of implicit conversions between function candidates. 
+On the other hand, this approach may unncessarily generate argument interpretations that will never match a parameter, wasting work.
+
+\subsection{Candidate Set Generation}
+Cormack\cite{Cormack81}, Baker\cite{Baker82} \& Bilson\cite{Bilson03} all generate the complete set of candidate argument interpretations before attempting to match the containing function call expression. 
+However, given that the top-level expression interpretation that is ultimately chosen will be the minimal-cost valid interpretation, any consideration of non-minimal-cost interpretations is in some sense wasted work.
+If we assume that user programmers will generally write function calls with relatively low-cost interpretations, a possible work-saving heuristic is to generate only the lowest-cost argument interpretations first, attempt to find a valid top-level interpretation using them, and only if that fails generate the higher-cost argument interpretations.
+
+\subsubsection{Eager}
+Within the eager approach taken by Cormack, Baker \& Bilson, there are still variants to explore. 
+Cormack \& Baker do not account for implict conversions, and thus do not account for the possibility of multiple valid interpretations with distinct costs; Bilson, on the other hand, sorts the list of interpretations to aid in finding minimal-cost interpretations. 
+Sorting the lists of argument or function call interpretations by cost at some point during resolution may provide useful opportunities to short-circuit expression evaluation when a minimal-cost interpretation is found, though it is not clear if this short-circuiting behaviour would justify the cost of the sort.
+
+\subsubsection{Lazy}
+In the presence of implicit conversions, many argument interpretations may match a given parameter by application of an appropriate implicit conversion. 
+However, if user programmers actually use relatively few implicit conversions, then the ``on arguments'' approach to implicit conversions will generate a large number of high-cost interpretations which may never be used. 
+The essence of the lazy approach to candidate set generation is to wrap the matching algorithm into the element generator of a lazy list type, only generating as few elements at a time as possible to ensure that the next-smallest-cost interpretation has been generated. 
+Assuming that argument interpretations are provided to the parameter matching algorithm in sorted order, a sorted list of function call interpretations can be produced by generating combinations of arguments sorted by total cost\footnote{The author has developed a lazy $n$-way combination generation algorithm that can perform this task.}, then generating function call interpretations in the order suggested by this list. 
+Note that the function call interpretation chosen may have costs of its own, for instance polymorphic type binding, so in some cases a number of argument combinations (any combination whose marginal cost does not exceed the cost of the function call interpretation itself) may need to be considered to determine the next-smallest-cost function call interpretation.
+Ideally, this candidate generation approach will lead to very few unused candidates being generated (in the expected case where the user programmer has, in fact, provided a validly-typable program), but this research project will need to determine whether or not the overheads of lazy generation exceed the benefit produced from considering fewer interpretations.
+
+\subsubsection{Stepwise Lazy}
+As a compromise between the trade-offs of the eager and lazy approaches, it would also be interesting to investigate a ``stepwise lazy'' approach, where all the interpretations for some ``step'' are eagerly generated, then the interpretations in the later steps are only generated on demand. 
+Under this approach the \CFA resolver could, for instance, try expression interpretations in the following order:
+\begin{enumerate}
+\item Interpretations with no polymorphic type binding or implicit conversions.
+\item Interpretations containing no polymorphic type binding and at least one safe implicit conversion.
+\item Interpretations containing polymorphic type binding, but only safe implicit conversions.
+\item Interpretations containing at least one unsafe implicit conversion.
+\end{enumerate} 
+If a valid expression interpretation is found in one step, it is guaranteed to be lower-cost than any interpretation in a later step (by the structure of \CFA interpretation costs), so no step after the first one where a valid interpretation can be found need be considered.
+This may save significant amounts of work, especially given that the first steps avoid potentially expensive handling of implicit conversions and type assertion satisfaction entirely.
+
+%\subsection{Parameter-Directed}
+%\textbf{TODO: Richard's algorithm isn't Baker (Cormack?), disentangle from this section \ldots}. 
+%The expression resolution algorithm used by the existing iteration of {CFA-CC} is based on Baker's\cite{Baker82} algorithm for overload resolution in Ada. 
+%The essential idea of this algorithm is to first find the possible interpretations of the most deeply nested subexpressions, then to use these interpretations to recursively generate valid interpretations of their superexpressions. 
+%To simplify matters, the only expressions considered in this discussion of the algorithm are function application and literal expressions; other expression types can generally be considered to be variants of one of these for the purposes of the resolver, \eg variables are essentially zero-argument functions. 
+%If we consider expressions as graph nodes with arcs connecting them to their subexpressions, these expressions form a DAG, generated by the algorithm from the bottom up.
+%Literal expressions are represented by leaf nodes, annotated with the type of the expression, while a function application will have a reference to the function declaration chosen, as well as arcs to the interpretation nodes for its argument expressions; functions are annotated with their return type (or types, in the case of multiple return values).
+%
+%\textbf{TODO: Figure}
+%
+%Baker's algorithm was designed to account for name overloading; Richard Bilson\cite{Bilson03} extended this algorithm to also handle polymorphic functions, implicit conversions \& multiple return types when designing the original \CFA compiler. 
+%The core of the algorithm is a function which Baker refers to as $gen\_calls$. 
+%$gen\_calls$ takes as arguments the name of a function $f$ and a list containing the set of possible subexpression interpretations $S_j$ for each argument of the function and returns a set of possible interpretations of calling that function on those arguments. 
+%The subexpression interpretations are generally either singleton sets generated by the single valid interpretation of a literal expression, or the results of a previous call to $gen\_calls$. 
+%If there are no valid interpretations of an expression, the set returned by $gen\_calls$ will be empty, at which point resolution can cease, since each subexpression must have at least one valid interpretation to produce an interpretation of the whole expression. 
+%On the other hand, if for some type $T$ there is more than one valid interpretation of an expression with type $T$, all interpretations of that expression with type $T$ can be collapsed into a single \emph{ambiguous expression} of type $T$, since the only way to disambiguate expressions is by their return types. 
+%If a subexpression interpretation is ambiguous, than any expression interpretation containing it will also be ambiguous. 
+%In the variant of this algorithm including implicit conversions, the interpretation of an expression as type $T$ is ambiguous only if there is more than one \emph{minimal-cost} interpretation of the expression as type $T$, as cheaper expressions are always chosen in preference to more expensive ones.
+%
+%Given this description of the behaviour of $gen\_calls$, its implementation is quite straightforward: for each function declaration $f_i$ matching the name of the function, consider each of the parameter types $p_j$ of $f_i$, attempting to match the type of an element of $S_j$ to $p_j$ (this may include checking of implicit conversions).
+%If no such element can be found, there is no valid interpretation of the expression using $f_i$, while if more than one such (minimal-cost) element is found than an ambiguous interpretation with the result type of $f_i$ is produced. 
+%In the \CFA variant, which includes polymorphic functions, it is possible that a single polymorphic function definition $f_i$ can produce multiple valid interpretations by different choices of type variable bindings; these interpretations are unambiguous so long as the return type of $f_i$ is different for each type binding. 
+%If all the parameters $p_j$ of $f_i$ can be uniquely matched to a candidate interpretation, then a valid interpretation based on $f_i$ and those $p_j$ is produced. 
+%$gen\_calls$ collects the produced interpretations for each $f_i$ and returns them; a top level expression is invalid if this list is empty, ambiguous if there is more than one (minimal-cost) result, or if this single result is ambiguous, and valid otherwise.
+%
+%In this implementation, resolution of a single top-level expression takes time $O(\ldots)$, where \ldots. \textbf{TODO:} \textit{Look at 2.3.1 in Richard's thesis when working out complexity; I think he does get the Baker algorithm wrong on combinations though, maybe\ldots}
+%
+%\textbf{TODO: Basic Lit Review} \textit{Look at 2.4 in Richard's thesis for any possible more-recent citations of Baker\ldots} \textit{Look back at Baker's related work for other papers that look similar to what you're doing, then check their citations as well\ldots} \textit{Look at Richard's citations in 2.3.2 w.r.t. type data structures\ldots}
+%\textit{CormackWright90 seems to describe a solution for the same problem, mostly focused on how to find the implicit parameters}
+
+\section{Proposal}
+Baker\cite{Baker82} discussed various expression resolution algorithms that could handle name overloading, but left experimental comparison of those algorithms to future work; Bilson\cite{Bilson03} described one extension of Baker's algorithm to handle implicit conversions, but did not fully explore the space of algorithmic approaches to handle both overloaded names and implicit conversions. 
+This project is intended to experimentally test a number of expression resolution algorithms which are powerful enough to handle the \CFA type system, including both name overloading and implicit conversions. 
+This comparison will close Baker's open research question, as well as potentially improving on Bilson's \CFA compiler.
+
+Rather than testing all of these algorithms in-place in the \CFA compiler, a resolver prototype will be developed which acts on a simplified input language encapsulating the essential details of the \CFA type system\footnote{Note that this simplified input language is not required to be a usable programming language.}. 
+Multiple variants of this resolver prototype will be implemented, each encapsulating a different expression resolution variant, sharing as much code as feasible. 
+These variants will be instrumented to test runtime performance, and run on a variety of input files; the input files may be generated programmatically or from exisiting code in \CFA or similar languages.
+These experimental results will allow the research team to determine the algorithm likely to be most performant in practical use, and replace {CFA-CC}'s existing expression resolver with that code. 
+The experimental results will also provide some empirical sense of the compile-time cost of various language features by comparing the results of the most performant resolver variant that supports the feature with the most performant resolver variant that doesn't, a useful capability to guide language design.
+
+This proposed project should provide valuable data on how to implement a performant compiler for modern programming languages such as \CFA with powerful static type systems, specifically targeting the feature interaction between name overloading and implicit conversions.
+
+\appendix
 \section{Completion Timeline}
 The following is a preliminary estimate of the time necessary to complete the major components of this research project:
@@ -252 +380 @@
 \begin{tabular}{ | r @{--} l | p{4in} | }
 \hline       May 2015 & April 2016   & Project familiarization and generic types design \& implementation. \\
-\hline       May 2016 & April 2017   & Design \& implement prototype resolver and run performance experiments. \\
+\hline       May 2016 & April 2017   & Design \& implement resolver prototype and run performance experiments. \\
 \hline       May 2017 & August 2017  & Integrate new language features and best-performing resolver prototype into {CFA-CC}. \\
 \hline September 2017 & January 2018 & Thesis writing \& defense. \\
@@ -259 +387 @@
 \end{center}
 
-\section{Conclusion}
-
-\newpage
-
+\addcontentsline{toc}{section}{\refname}
 \bibliographystyle{plain}
 \bibliography{cfa}
 
-
-\addcontentsline{toc}{section}{\indexname} % add index name to table of contents
-\begin{theindex}
-Italic page numbers give the location of the main entry for the referenced term.
-Plain page numbers denote uses of the indexed term.
-Entries for grammar non-terminals are italicized.
-A typewriter font is used for grammar terminals and program identifiers.
-\indexspace
-\input{comp_II.ind}
-\end{theindex}
+%\addcontentsline{toc}{section}{\indexname} % add index name to table of contents
+%\begin{theindex}
+%Italic page numbers give the location of the main entry for the referenced term.
+%Plain page numbers denote uses of the indexed term.
+%Entries for grammar non-terminals are italicized.
+%A typewriter font is used for grammar terminals and program identifiers.
+%\indexspace
+%\input{comp_II.ind}
+%\end{theindex}
 
 \end{document}

doc/bibliography/cfa.bib

@@ -1623 +1623 @@
     year        = 1974,
 }
+
+@unpublished{Ditchfield:conversions,
+        contributer = {a3moss@uwaterloo.ca},
+        author = {Glen Ditchfield},
+        title = {Conversions for {Cforall}},
+        note = {\href{http://plg.uwaterloo.ca/~cforall/Conversions/index.html}{http://\-plg.uwaterloo.ca/\-\textasciitilde cforall/\-Conversions/\-index.html}},
+        month = {Nov},
+        year = {2002},
+        urldate = {28 July 2016},
+}
+
 
 @techreport{Dijkstra65,

doc/user/user.tex

@@ -11 +11 @@
 %% Created On       : Wed Apr  6 14:53:29 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Wed Jul 13 08:14:39 2016
-%% Update Count     : 1247
+%% Last Modified On : Mon Aug  1 09:11:24 2016
+%% Update Count     : 1271
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -211 +211 @@
 however, it largely extended the language, and did not address many existing problems.\footnote{%
 Two important existing problems addressed were changing the type of character literals from ©int© to ©char© and enumerator from ©int© to the type of its enumerators.}
-\Index*{Fortran}~\cite{Fortran08}, \Index*{Ada}~\cite{Ada12}, and \Index*{Cobol}~\cite{Cobol14} are examples of programming languages that took an evolutionary approach, where modern language features (e.g., objects, concurrency) are added and problems fixed within the framework of the existing language.
+\Index*{Fortran}~\cite{Fortran08}, \Index*{Ada}~\cite{Ada12}, and \Index*{Cobol}~\cite{Cobol14} are examples of programming languages that took an evolutionary approach, where modern language features (\eg objects, concurrency) are added and problems fixed within the framework of the existing language.
 \Index*{Java}~\cite{Java8}, \Index*{Go}~\cite{Go}, \Index*{Rust}~\cite{Rust} and \Index*{D}~\cite{D} are examples of the revolutionary approach for modernizing C/\CC, resulting in a new language rather than an extension of the descendent.
 These languages have different syntax and semantics from C, and do not interoperate directly with C, largely because of garbage collection.
@@ -265 +265 @@
 \section[Compiling CFA Program]{Compiling \CFA Program}
 
-The command ©cfa© is used to compile \CFA program(s), and is based on the GNU \Indexc{gcc} command, e.g.:
+The command ©cfa© is used to compile \CFA program(s), and is based on the GNU \Indexc{gcc} command, \eg:
 \begin{lstlisting}
 cfa§\indexc{cfa}\index{compilation!cfa@©cfa©}§ [ gcc-options ] C/§\CFA§-files [ assembler/loader-files ]
@@ -350 +350 @@
 \section{Underscores in Constants}
 
-Numeric constants are extended to allow \Index{underscore}s within constants\index{constant!underscore}, e.g.:
+Numeric constants are extended to allow \Index{underscore}s within constants\index{constant!underscore}, \eg:
 \begin{lstlisting}
 2®_®147®_®483®_®648;                    §\C{// decimal constant}§
@@ -366 +366 @@
 \begin{enumerate}
 \item
-A sequence of underscores is disallowed, e.g., ©12__34© is invalid.
+A sequence of underscores is disallowed, \eg ©12__34© is invalid.
 \item
 Underscores may only appear within a sequence of digits (regardless of the digit radix).
-In other words, an underscore cannot start or end a sequence of digits, e.g., ©_1©, ©1_© and ©_1_© are invalid (actually, the 1st and 3rd examples are identifier names).
+In other words, an underscore cannot start or end a sequence of digits, \eg ©_1©, ©1_© and ©_1_© are invalid (actually, the 1st and 3rd examples are identifier names).
 \item
 A numeric prefix may end with an underscore;
@@ -498 +498 @@
 \end{quote2}
 
-All type qualifiers, e.g., ©const©, ©volatile©, etc., are used in the normal way with the new declarations and also appear left to right, e.g.:
+All type qualifiers, \eg ©const©, ©volatile©, etc., are used in the normal way with the new declarations and also appear left to right, \eg:
 \begin{quote2}
 \begin{tabular}{@{}l@{\hspace{1em}}l@{\hspace{1em}}l@{}}
@@ -518 +518 @@
 \end{tabular}
 \end{quote2}
-All declaration qualifiers, e.g., ©extern©, ©static©, etc., are used in the normal way with the new declarations but can only appear at the start of a \CFA routine declaration,\footnote{\label{StorageClassSpecifier}
-The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature.~\cite[\S~6.11.5(1)]{C11}} e.g.:
+All declaration qualifiers, \eg ©extern©, ©static©, etc., are used in the normal way with the new declarations but can only appear at the start of a \CFA routine declaration,\footnote{\label{StorageClassSpecifier}
+The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature.~\cite[\S~6.11.5(1)]{C11}} \eg:
 \begin{quote2}
 \begin{tabular}{@{}l@{\hspace{3em}}l@{\hspace{2em}}l@{}}
@@ -542 +542 @@
 Unsupported are K\&R C declarations where the base type defaults to ©int©, if no type is specified,\footnote{
 At least one type specifier shall be given in the declaration specifiers in each declaration, and in the specifier-qualifier list in each structure declaration and type name~\cite[\S~6.7.2(2)]{C11}}
-e.g.:
+\eg:
 \begin{lstlisting}
 x;                                                              §\C{// int x}§
@@ -612 +612 @@
 A \Index{pointer}/\Index{reference} is a generalization of a variable name, i.e., a mutable address that can point to more than one memory location during its lifetime.
 (Similarly, an integer variable can contain multiple integer literals during its lifetime versus an integer constant representing a single literal during its lifetime and may not occupy storage as the literal is embedded directly into instructions.)
-Hence, a pointer occupies memory to store its current address, and the pointer's value is loaded by dereferencing, e.g.:
+Hence, a pointer occupies memory to store its current address, and the pointer's value is loaded by dereferencing, \eg:
 \begin{quote2}
 \begin{tabular}{@{}ll@{}}
@@ -669 +669 @@
 Except for auto-dereferencing by the compiler, this reference example is the same as the previous pointer example.
 Hence, a reference behaves like the variable name for the current variable it is pointing-to.
-The simplest way to understand a reference is to imagine the compiler inserting a dereference operator before the reference variable for each reference qualifier in a declaration, e.g.:
+The simplest way to understand a reference is to imagine the compiler inserting a dereference operator before the reference variable for each reference qualifier in a declaration, \eg:
 \begin{lstlisting}
 r2 = ((r1 + r2) * (r3 - r1)) / (r3 - 15);
@@ -677 +677 @@
 ®*®r2 = ((®*®r1 + ®*®r2) ®*® (®**®r3 - ®*®r1)) / (®**®r3 - 15);
 \end{lstlisting}
-When a reference operation appears beside a dereference operation, e.g., ©&*©, they cancel out.\footnote{
+When a reference operation appears beside a dereference operation, \eg ©&*©, they cancel out.\footnote{
 The unary ©&© operator yields the address of its operand.
 If the operand has type ``type'', the result has type ``pointer to type''.
@@ -721 +721 @@
 ®&®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}, e.g.:
+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}, \eg:
 \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.
+Finally, the position of the ©const© qualifier \emph{after} the pointer/reference qualifier causes confuse for C programmers.
+The ©const© qualifier cannot be moved before the pointer/reference qualifier for C style-declarations;
+\CFA-style declarations attempt to address this issue:
+\begin{quote2}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c}{\textbf{C}}        \\
+\begin{lstlisting}
+®const® * ®const® * const int ccp;
+®const® & ®const® & const int ccr;
+\end{lstlisting}
+&
+\begin{lstlisting}
+const int * ®const® * ®const® ccp;
+
+\end{lstlisting}
+\end{tabular}
+\end{quote2}
+where the \CFA declaration is read left-to-right (see \VRef{s:Declarations}).
 
 \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.
@@ -785 +803 @@
 \section{Type Operators}
 
-The new declaration syntax can be used in other contexts where types are required, e.g., casts and the pseudo-routine ©sizeof©:
+The new declaration syntax can be used in other contexts where types are required, \eg casts and the pseudo-routine ©sizeof©:
 \begin{quote2}
 \begin{tabular}{@{}l@{\hspace{3em}}l@{}}
@@ -805 +823 @@
 
 \CFA also supports a new syntax for routine definition, as well as ISO C and K\&R routine syntax.
-The point of the new syntax is to allow returning multiple values from a routine~\cite{Galletly96,CLU}, e.g.:
+The point of the new syntax is to allow returning multiple values from a routine~\cite{Galletly96,CLU}, \eg:
 \begin{lstlisting}
 ®[ int o1, int o2, char o3 ]® f( int i1, char i2, char i3 ) {
@@ -817 +835 @@
 \Index*{Michael Tiemann}, with help from \Index*{Doug Lea}, provided named return values in g++, circa 1989.}
 The value of each local return variable is automatically returned at routine termination.
-Declaration qualifiers can only appear at the start of a routine definition, e.g.:
+Declaration qualifiers can only appear at the start of a routine definition, \eg:
 \begin{lstlisting}
 ®extern® [ int x ] g( int y ) {§\,§}
@@ -849 +867 @@
 The inability to use \CFA declarations in these two contexts is probably a blessing because it precludes programmers from arbitrarily switching between declarations forms within a declaration contexts.
 
-C-style declarations can be used to declare parameters for \CFA style routine definitions, e.g.:
+C-style declarations can be used to declare parameters for \CFA style routine definitions, \eg:
 \begin{lstlisting}
 [ int ] f( * int, int * );              §\C{// returns an integer, accepts 2 pointers to integers}§
@@ -898 +916 @@
 
 The syntax of the new routine prototype declaration follows directly from the new routine definition syntax;
-as well, parameter names are optional, e.g.:
+as well, parameter names are optional, \eg:
 \begin{lstlisting}
 [ int x ] f ();                                 §\C{// returning int with no parameters}§
@@ -906 +924 @@
 \end{lstlisting}
 This syntax allows a prototype declaration to be created by cutting and pasting source text from the routine definition header (or vice versa).
-It is possible to declare multiple routine-prototypes in a single declaration, but the entire type specification is distributed across \emph{all} routine names in the declaration list (see~\VRef{s:Declarations}), e.g.:
+It is possible to declare multiple routine-prototypes in a single declaration, but the entire type specification is distributed across \emph{all} routine names in the declaration list (see~\VRef{s:Declarations}), \eg:
 \begin{quote2}
 \begin{tabular}{@{}l@{\hspace{3em}}l@{}}
@@ -919 +937 @@
 \end{tabular}
 \end{quote2}
-Declaration qualifiers can only appear at the start of a \CFA routine declaration,\footref{StorageClassSpecifier} e.g.:
+Declaration qualifiers can only appear at the start of a \CFA routine declaration,\footref{StorageClassSpecifier} \eg:
 \begin{lstlisting}
 extern [ int ] f (int);
@@ -928 +946 @@
 \section{Routine Pointers}
 
-The syntax for pointers to \CFA routines specifies the pointer name on the right, e.g.:
+The syntax for pointers to \CFA routines specifies the pointer name on the right, \eg:
 \begin{lstlisting}
 * [ int x ] () fp;                      §\C{// pointer to routine returning int with no parameters}§
@@ -1046 +1064 @@
 p( /* positional */, /* named */, . . . );
 \end{lstlisting}
-While it is possible to implement both approaches, the first possibly is more complex than the second, e.g.:
+While it is possible to implement both approaches, the first possibly is more complex than the second, \eg:
 \begin{lstlisting}
 p( int x, int y, int z, . . . );
@@ -1056 +1074 @@
 In the second call, the named arguments separate the positional and ellipse arguments, making it trivial to read the call.
 
-The problem is exacerbated with default arguments, e.g.:
+The problem is exacerbated with default arguments, \eg:
 \begin{lstlisting}
 void p( int x, int y = 2, int z = 3. . . );
@@ -1264 +1282 @@
 
 As mentioned, tuples can appear in contexts requiring a list of value, such as an argument list of a routine call.
-In unambiguous situations, the tuple brackets may be omitted, e.g., a tuple that appears as an argument may have its
+In unambiguous situations, the tuple brackets may be omitted, \eg a tuple that appears as an argument may have its
 square brackets omitted for convenience; therefore, the following routine invocations are equivalent:
 \begin{lstlisting}
@@ -1303 +1321 @@
 
 Type qualifiers, i.e., const and volatile, may modify a tuple type.
-The meaning is the same as for a type qualifier modifying an aggregate type [Int99, x 6.5.2.3(7),x 6.7.3(11)], i.e., the qualifier is distributed across all of the types in the tuple, e.g.:
+The meaning is the same as for a type qualifier modifying an aggregate type [Int99, x 6.5.2.3(7),x 6.7.3(11)], i.e., the qualifier is distributed across all of the types in the tuple, \eg:
 \begin{lstlisting}
 const volatile [ int, float, const int ] x;
@@ -1311 +1329 @@
 [ const volatile int, const volatile float, const volatile int ] x;
 \end{lstlisting}
-Declaration qualifiers can only appear at the start of a \CFA tuple declaration4, e.g.:
+Declaration qualifiers can only appear at the start of a \CFA tuple declaration4, \eg:
 \begin{lstlisting}
 extern [ int, int ] w1;
@@ -1319 +1337 @@
 Unfortunately, C's syntax for subscripts precluded treating them as tuples.
 The C subscript list has the form ©[i][j]...© and not ©[i, j, ...]©.
-Therefore, there is no syntactic way for a routine returning multiple values to specify the different subscript values, e.g., ©f[g()]© always means a single subscript value because there is only one set of brackets.
+Therefore, there is no syntactic way for a routine returning multiple values to specify the different subscript values, \eg ©f[g()]© always means a single subscript value because there is only one set of brackets.
 Fixing this requires a major change to C because the syntactic form ©M[i, j, k]© already has a particular meaning: ©i, j, k© is a comma expression.
 \end{rationale}
@@ -1380 +1398 @@
 Clearly, the types of the entities being assigned must be type compatible with the value of the expression.
 
-Mass assignment has parallel semantics, e.g., the statement:
+Mass assignment has parallel semantics, \eg the statement:
 \begin{lstlisting}
 [ x, y, z ] = 1.5;
@@ -1469 +1487 @@
 \section{Unnamed Structure Fields}
 
-C requires each field of a structure to have a name, except for a bit field associated with a basic type, e.g.:
+C requires each field of a structure to have a name, except for a bit field associated with a basic type, \eg:
 \begin{lstlisting}
 struct {
-        int f1;                 // named field
-        int f2 : 4;             // named field with bit field size
-        int : 3;                // unnamed field for basic type with bit field size
-        int ;                   // disallowed, unnamed field
-        int *;                  // disallowed, unnamed field
-        int (*)(int);   // disallowed, unnamed field
+        int f1;                                 §\C{// named field}§
+        int f2 : 4;                             §\C{// named field with bit field size}§
+        int : 3;                                §\C{// unnamed field for basic type with bit field size}§
+        int ;                                   §\C{// disallowed, unnamed field}§
+        int *;                                  §\C{// disallowed, unnamed field}§
+        int (*)(int);                   §\C{// disallowed, unnamed field}§
 };
 \end{lstlisting}
 This requirement is relaxed by making the field name optional for all field declarations; therefore, all the field declarations in the example are allowed.
 As for unnamed bit fields, an unnamed field is used for padding a structure to a particular size.
-A list of unnamed fields is also supported, e.g.:
+A list of unnamed fields is also supported, \eg:
 \begin{lstlisting}
 struct {
-        int , , ;               // 3 unnamed fields
+        int , , ;                               §\C{// 3 unnamed fields}§
 }
 \end{lstlisting}
@@ -1498 +1516 @@
 §\emph{expr}§ -> [ §\emph{fieldlist}§ ]
 \end{lstlisting}
-\emph{expr} is any expression yielding a value of type record, e.g., ©struct©, ©union©.
+\emph{expr} is any expression yielding a value of type record, \eg ©struct©, ©union©.
 Each element of \emph{ fieldlist} is an element of the record specified by \emph{expr}.
 A record-field tuple may be used anywhere a tuple can be used. An example of the use of a record-field tuple is
@@ -1760 +1778 @@
 }
 \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 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.
+While the declaration of the local variable ©y© is useful with a scope 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 transferred to using a ©goto©, either from outside or inside of the ©switch©, both of which are problematic.
+As well, the declaration of ©z© 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.
+The key observation is that the ©switch© statement branches into control structure, i.e., there are multiple entry points into its statement body.
 \end{enumerate}
 
@@ -1778 +1795 @@
 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 suggested changes to the ©switch© into perspective.
+These observations help to put the \CFA changes to the ©switch© into perspective.
 \begin{enumerate}
 \item
 Eliminating default fall-through has the greatest potential for affecting existing code.
-However, even if fall-through is removed, most ©switch© statements would continue to work because of the explicit transfers already present at the end of each ©case© clause, the common placement of the ©default© clause at the end of the case list, and the most common use of fall-through, i.e., a list of ©case© clauses executing common code, e.g.:
-\begin{lstlisting}
+However, even if fall-through is removed, most ©switch© statements would continue to work because of the explicit transfers already present at the end of each ©case© clause, the common placement of the ©default© clause at the end of the case list, and the most common use of fall-through, i.e., a list of ©case© clauses executing common code, \eg:
+ \begin{lstlisting}
 case 1:  case 2:  case 3: ...
 \end{lstlisting}
 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 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.:
+<<<<<<< HEAD
+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©, \eg:
+=======
+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 ©fallthrough©/©fallthru©, e.g.:
+>>>>>>> 080615890f586cb9954c252b55cab47f52c25758
 \begin{lstlisting}
 ®choose® ( i ) {
@@ -1815 +1836 @@
 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.
+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 ©switch©/©choose© statement and both declarations and statement are surrounded by a compound statement.} and precluding statements before the first ©case© clause.
+Further declarations at the same nesting level as the statement body are disallowed to ensure every transfer into the body is sound.
 \begin{lstlisting}
 switch ( x ) {
-        ®int i = 0;®                            §\C{// allowed}§
+        ®int i = 0;®                            §\C{// allowed only at start}§
   case 0:
         ...
-        ®int i = 0;®                            §\C{// disallowed}§
+        ®int j = 0;®                            §\C{// disallowed}§
   case 1:
     {
-                ®int i = 0;®                    §\C{// allowed in any compound statement}§
+                ®int k = 0;®                    §\C{// allowed at different nesting levels}§
                 ...
         }
@@ -2707 +2728 @@
 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.
 
-There are several ambiguous cases with operator identifiers, e.g., ©int *?*?()©, where the string ©*?*?© can be lexed as ©*©/©?*?© or ©*?©/©*?©.
-Since it is common practise to put a unary operator juxtaposed to an identifier, e.g., ©*i©, users will be annoyed if they cannot do this with respect to operator identifiers.
+There are several ambiguous cases with operator identifiers, \eg ©int *?*?()©, where the string ©*?*?© can be lexed as ©*©/©?*?© or ©*?©/©*?©.
+Since it is common practise to put a unary operator juxtaposed to an identifier, \eg ©*i©, users will be annoyed if they cannot do this with respect to operator identifiers.
 Even with this special hack, there are 5 general cases that cannot be handled.
 The first case is for the function-call identifier ©?()©:
@@ -2773 +2794 @@
 This means that a function requiring mutual exclusion could block if the lock is already held by another thread.
 Blocking on a monitor lock does not block the kernel thread, it simply blocks the user thread, which yields its kernel thread while waiting to obtain the lock.
-If multiple mutex parameters are specified, they will be locked in parameter order (i.e. first parameter is locked first) and unlocked in the
+If multiple mutex parameters are specified, they will be locked in parameter order (\ie first parameter is locked first) and unlocked in the
 reverse order.
 \begin{lstlisting}
@@ -4342 +4363 @@
 
 
+\section{New Keywowrds}
+
+©catch©, ©catchResume©, ©choose©, \quad ©disable©, ©dtype©, \quad ©enable©, \quad ©fallthrough©, ©fallthru©, ©finally©, ©forall©, ©ftype©, \quad ©lvalue©, \quad ©otype©, \quad ©throw©, ©throwResume©, ©trait©, ©try©
+
+
 \section{Incompatible}
 
@@ -4471 +4497 @@
 \CFA is C \emph{incompatible} on this issue, and provides semantics similar to \Index*[C++]{\CC}.
 Nested types are not hoisted and can be referenced using the field selection operator ``©.©'', unlike the \CC scope-resolution operator ``©::©''.
-Given that nested types in C are equivalent to not using them, i.e., they are essentially useless, it is unlikely there are any realistic usages that break because of this incompatibility.
+Given that nested types in C are equivalent to not using them, \ie they are essentially useless, it is unlikely there are any realistic usages that break because of this incompatibility.
 \end{description}
 
@@ -5162 +5188 @@
 \label{s:RationalNumbers}
 
-Rational numbers are numbers written as a ratio, i.e., as a fraction, where the numerator (top number) and the denominator (bottom number) are whole numbers.
+Rational numbers are numbers written as a ratio, \ie as a fraction, where the numerator (top number) and the denominator (bottom number) are whole numbers.
 When creating and computing with rational numbers, results are constantly reduced to keep the numerator and denominator as small as possible.
 

src/CodeGen/CodeGenerator.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 15 15:53:15 2016
-// Update Count     : 306
+// Last Modified By : 
+// Last Modified On : Sun Jul 31 08:42:18 2016
+// Update Count     : 345
 //
 
@@ -45 +45 @@
         bool wantSpacing( Statement * stmt) {
                 return dynamic_cast< IfStmt * >( stmt ) || dynamic_cast< CompoundStmt * >( stmt ) ||
-                        dynamic_cast< WhileStmt * >( stmt ) || dynamic_cast< ForStmt * > ( stmt ) || dynamic_cast< SwitchStmt *>( stmt );
+                        dynamic_cast< WhileStmt * >( stmt ) || dynamic_cast< ForStmt * >( stmt ) || dynamic_cast< SwitchStmt *>( stmt );
         }
 
@@ -83 +83 @@
         }
 
-        CodeGenerator::CodeGenerator( std::ostream &os ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ) { }
+        CodeGenerator::CodeGenerator( std::ostream &os ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ) {}
 
         CodeGenerator::CodeGenerator( std::ostream &os, std::string init, int indentation, bool infunp )
@@ -155 +155 @@
                         objectDecl->get_init()->accept( *this );
                 } // if
+
                 if ( objectDecl->get_bitfieldWidth() ) {
                         output << ":";
@@ -172 +173 @@
 
                         cur_indent += CodeGenerator::tabsize;
-                        for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end();  i++) {
+                        for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end(); i++ ) {
                                 output << indent;
                                 (*i)->accept( *this );
                                 output << ";" << endl;
-                        }
+                        } // for
 
                         cur_indent -= CodeGenerator::tabsize;
@@ -257 +258 @@
                                 (*iter)->accept( *this );
                                 output << "]";
-                        }
-                }
+                        } // if
+                } // for
                 output << " = ";
         }
@@ -317 +318 @@
                                         // do nothing
                                         ;
-                                }
+                                } // switch
 
                                 switch ( opInfo.type ) {
@@ -385 +386 @@
                                         // there are no intrinsic definitions of 0/1 or label addresses as functions
                                         assert( false );
-                                }
+                                } // switch
                         } else {
                                 varExpr->accept( *this );
@@ -417 +418 @@
                                   case OT_CALL:
                                         assert( false );
-
 
                                   case OT_CTOR:
@@ -437 +437 @@
                                                 // no constructors with 0 or more than 2 parameters
                                                 assert( false );
-                                        }
+                                        } // if
                                         break;
 
@@ -470 +470 @@
                                         // there are no intrinsic definitions of 0 or 1 as functions
                                         assert( false );
-                                }
+                                } // switch
                         } else {
-                                nameExpr->accept( *this );
-                                output << "(";
-                                genCommaList( untypedExpr->get_args().begin(), untypedExpr->get_args().end() );
-                                output << ")";
+                                if ( nameExpr->get_name() == "Range" ) { // case V1 ... V2 or case V1~V2
+                                        assert( untypedExpr->get_args().size() == 2 );
+                                        (*untypedExpr->get_args().begin())->accept( *this );
+                                        output << " ... ";
+                                        (*--untypedExpr->get_args().end())->accept( *this );
+                                } else {                                                                // builtin routines
+                                        nameExpr->accept( *this );
+                                        output << "(";
+                                        genCommaList( untypedExpr->get_args().begin(), untypedExpr->get_args().end() );
+                                        output << ")";
+                                } // if
                         } // if
                 } else {
@@ -521 +528 @@
                         // otherwise, the cast is to an lvalue type, so the cast should be dropped, since the result of a cast is
                         // never an lvalue in C
-                }
+                } // if
                 castExpr->get_arg()->accept( *this );
                 output << ")";
@@ -654 +661 @@
                         if ( wantSpacing( *i ) ) {
                                 output << endl;
-                        }
+                        } // if
                 }
                 cur_indent -= CodeGenerator::tabsize;
@@ -737 +744 @@
                         (*i)->accept( *this );
                         output << endl;
-                }
+                } // for
                 cur_indent -= CodeGenerator::tabsize;
         }
@@ -759 +766 @@
                         output << "continue";
                         break;
-                }
+                } // switch
                 output << ";";
         }
@@ -798 +805 @@
                 if ( forStmt->get_condition() != 0 ) {
                         forStmt->get_condition()->accept( *this );
-                }
+                } // if
                 output << ";";
 
@@ -805 +812 @@
                         Expression * expr = new CastExpr( forStmt->get_increment() );
                         expr->accept( *this );
-                }
+                } // if
                 output << ") ";
 

src/CodeGen/CodeGenerator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul  4 17:12:40 2016
-// Update Count     : 34
+// Last Modified On : Sat Jul 30 11:10:42 2016
+// Update Count     : 37
 //
 
@@ -118 +118 @@
                 void handleAggregate( AggregateDecl *aggDecl );
                 void handleTypedef( NamedTypeDecl *namedType );
-        };
+        }; // CodeGenerator
 
         template< class Iterator >

src/ControlStruct/CaseRangeMutator.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:35:13 2016
-// Update Count     : 9
+// Last Modified By : 
+// Last Modified On : Sun Jul 31 12:16:28 2016
+// Update Count     : 32
 //
 
@@ -34 +34 @@
                 std::list< Statement * >::iterator i = cases.begin();
                 while ( i != cases.end() ) {
-                        (*i )->acceptMutator( *this );
+                        (*i)->acceptMutator( *this );
 
                         if ( ! newCaseLabels.empty() ) {
+                                std::cout << "FRED" << std::endl;
                                 std::list< Statement * > newCases;
 
                                 // transform( newCaseLabels.begin(), newCaseLabels.end(), bnd1st( ptr_fun( ctor< CaseStmt, Label, Expression * > ) ) );
 
-                                for ( std::list< Expression * >::iterator j = newCaseLabels.begin();
-                                          j != newCaseLabels.end(); j++ ) {
-                                        std::list<Label> emptyLabels;
-                                        std::list< Statement *> emptyStmts;
+                                for ( std::list< Expression * >::iterator j = newCaseLabels.begin(); j != newCaseLabels.end(); j++ ) {
+                                        std::list< Label > emptyLabels;
+                                        std::list< Statement * > emptyStmts;
                                         newCases.push_back( new CaseStmt( emptyLabels, *j, emptyStmts ) );
                                 } // for
 
-                                if ( CaseStmt *currentCase = dynamic_cast< CaseStmt * > ( *i ) )
+                                if ( CaseStmt *currentCase = dynamic_cast< CaseStmt * >( *i ) )
                                         if ( ! currentCase->get_statements().empty() ) {
-                                                CaseStmt *lastCase = dynamic_cast< CaseStmt * > ( newCases.back() );
+                                                CaseStmt *lastCase = dynamic_cast< CaseStmt * >( newCases.back() );
                                                 if ( lastCase == 0 ) { throw ( 0 ); /* FIXME */ } // something is very wrong, as I just made these, and they were all cases
                                                 // transfer the statement block ( if any ) to the new list:
                                                 lastCase->set_statements( currentCase->get_statements() );
                                         } // if
-                                std::list< Statement * >::iterator j = i; advance( j, 1 );
-                                replace ( cases, i, newCases );
+                                std::list< Statement * >::iterator j = i;
+                                advance( j, 1 );
+                                replace( cases, i, newCases );
                                 i = j;
                                 newCaseLabels.clear();
@@ -64 +65 @@
 
                 return switchStmt;
-        }
+        } // CaseRangeMutator::mutate
 
         Statement *CaseRangeMutator::mutate( CaseStmt *caseStmt ) {
-                UntypedExpr *cond;
-                if ( ( cond = dynamic_cast< UntypedExpr * >( caseStmt->get_condition() )) != 0 ) {
-                        NameExpr *nmfunc;
-                        if ( ( nmfunc = dynamic_cast< NameExpr *>( cond->get_function() )) != 0 ) {
-                                if ( nmfunc->get_name() == std::string("Range") ) {
-                                        assert( cond->get_args().size() == 2 );
-                                        std::list<Expression *>::iterator i = cond->get_args().begin();
-                                        Expression *lo = *i, *hi = *(++i ); // "unnecessary" temporaries
-                                        fillRange( lo, hi );
-                                } // if
-                        } // if
-                } else if ( TupleExpr *tcond = dynamic_cast< TupleExpr * >( caseStmt->get_condition() ) ) {
-                        // case list
+                // case list, e.g., case 1, 3, 5:
+                if ( TupleExpr *tcond = dynamic_cast< TupleExpr * >( caseStmt->get_condition() ) ) {
                         assert( ! tcond->get_exprs().empty() );
-                        for ( std::list< Expression * >::iterator i = tcond->get_exprs().begin(); i != tcond->get_exprs().end(); i++ )
-                                newCaseLabels.push_back( *i ); // do I need to clone them?
+                        for ( std::list< Expression * >::iterator i = tcond->get_exprs().begin(); i != tcond->get_exprs().end(); i++ ) {
+                                newCaseLabels.push_back( *i );                  // do I need to clone them?
+                        } // for
                 } // if
 
                 std::list< Statement * > &stmts = caseStmt->get_statements();
-                mutateAll ( stmts, *this );
+                mutateAll( stmts, *this );
 
                 return caseStmt;
-        }
-
-        void CaseRangeMutator::fillRange( Expression *lo, Expression *hi ) {
-                // generate the actual range ( and check for consistency )
-                Constant *c_lo, *c_hi;
-                ConstantExpr *ce_lo, *ce_hi;
-                ce_lo = dynamic_cast< ConstantExpr * >( lo );
-                ce_hi = dynamic_cast< ConstantExpr * >( hi );
-
-                if ( ce_lo && ce_hi ) {
-                        c_lo = ce_lo->get_constant(); c_hi = ce_hi->get_constant();
-                } /* else {
-                         if ( ! ce_lo ) ;
-                         if ( ! ce_hi ) ;
-                         } */
-                BasicType *ty_lo = dynamic_cast< BasicType * >( c_lo->get_type() ),
-                        *ty_hi = dynamic_cast< BasicType * >( c_hi->get_type() );
-        
-                if ( ! ty_lo || ! ty_hi )
-                        return; // one of them is not a constant
-
-                switch ( ty_lo->get_kind() ) {
-                  case BasicType::Char:
-                  case BasicType::UnsignedChar:
-                        switch ( ty_hi->get_kind() ) {
-                          case BasicType::Char:
-                          case BasicType::UnsignedChar:
-                                // first case, they are both printable ASCII characters represented as 'x'
-                                if ( c_lo->get_value().size() == 3 && c_hi->get_value().size() == 3 ) {
-                                        char ch_lo = ( c_lo->get_value())[1], ch_hi = ( c_hi->get_value())[1];
-
-                                        if ( ch_lo > ch_hi ) { char t=ch_lo; ch_lo=ch_hi; ch_hi=t; }
-
-                                        for ( char c = ch_lo; c <=  ch_hi; c++ ) {
-                                                Type::Qualifiers q;
-                                                Constant cnst( new BasicType( q, BasicType::Char ),
-                                                                           std::string("'") + c + std::string("'") );
-                                                newCaseLabels.push_back( new ConstantExpr( cnst ) );
-                                        } // for
-
-                                        return;
-                                } // if
-                                break;
-                          default:
-                                // error: incompatible constants
-                                break;
-                        } // switch
-                        break;
-                  case BasicType::ShortSignedInt:
-                  case BasicType::ShortUnsignedInt:
-                  case BasicType::SignedInt:
-                  case BasicType::UnsignedInt:
-                  case BasicType::LongSignedInt:
-                  case BasicType::LongUnsignedInt:
-                  case BasicType::LongLongSignedInt:
-                  case BasicType::LongLongUnsignedInt:
-                        switch ( ty_hi->get_kind() ) {
-                          case BasicType::ShortSignedInt:
-                          case BasicType::ShortUnsignedInt:
-                          case BasicType::SignedInt:
-                          case BasicType::UnsignedInt:
-                          case BasicType::LongSignedInt:
-                          case BasicType::LongUnsignedInt:
-                          case BasicType::LongLongSignedInt:
-                          case BasicType::LongLongUnsignedInt: {
-                                  int i_lo = atoi( c_lo->get_value().c_str()),
-                                          i_hi = atoi( c_hi->get_value().c_str());
-
-                                  if ( i_lo > i_hi ) { int t=i_lo; i_lo=i_hi; i_hi=t; }
-
-                                  for ( int c = i_lo; c <=  i_hi; c++ ) {
-                                          Type::Qualifiers q;
-                                          Constant cnst( new BasicType( q, ty_hi->get_kind()), // figure can't hurt (used to think in positives)
-                                                                         toString< int >( c ) );
-                                          newCaseLabels.push_back( new ConstantExpr( cnst ) );
-                                  }
-
-                                  return;
-                          }
-                          default:
-                                // error: incompatible constants
-                                break;
-                        }
-                        break;
-                  default:
-                        break;
-                } // switch
-
-                /* End: */{ 
-                        // invalid range, signal a warning (it still generates the two case labels)
-                        newCaseLabels.push_back( lo );
-                        newCaseLabels.push_back( hi );
-                        return;
-                }
-        }
+        } // CaseRangeMutator::mutate
 } // namespace ControlStruct
 

src/ControlStruct/CaseRangeMutator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:35:30 2016
-// Update Count     : 4
+// Last Modified On : Sat Jul 30 23:41:57 2016
+// Update Count     : 5
 //
 
@@ -30 +30 @@
                 virtual Statement *mutate( CaseStmt * );
           private:
-                void fillRange( Expression *lo, Expression *hi );
-
                 Expression *currentCondition;
                 std::list< Expression * > newCaseLabels;

src/Parser/lex.cc

@@ -382 +382 @@
         (yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 180
-#define YY_END_OF_BUFFER 181
+#define YY_NUM_RULES 181
+#define YY_END_OF_BUFFER 182
 /* This struct is not used in this scanner,
    but its presence is necessary. */
@@ -391 +391 @@
         flex_int32_t yy_nxt;
         };
-static yyconst flex_int16_t yy_accept[888] =
+static yyconst flex_int16_t yy_accept[892] =
     {   0,
-        0,    0,    0,    0,    0,    0,  115,  115,  118,  118,
-      181,  179,    7,    9,    8,  138,  117,  102,  143,  146,
-      114,  125,  126,  141,  139,  129,  140,  132,  142,  107,
-      108,  109,  130,  131,  148,  150,  149,  151,  179,  102,
-      123,  179,  124,  144,  102,  104,  102,  102,  102,  102,
-      102,  102,  102,  102,  102,  102,  102,  102,  102,  102,
-      102,  102,  127,  147,  128,  145,    7,  179,    4,    4,
-      180,  105,  180,  106,  115,  116,  122,  118,  119,    7,
-        9,    0,    8,  155,  174,  102,    0,  167,  137,  160,
-      168,  165,  152,  163,  153,  164,  162,    0,  112,    3,
-
-        0,  166,  112,  110,    0,    0,  110,  110,    0,    0,
-      110,  109,  109,  109,    0,  109,  135,  136,  134,  156,
-      158,  154,  159,  157,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,  103,
-      173,    0,  117,  114,  102,    0,    0,  170,    0,  102,
-      102,  102,  102,  102,  102,  102,  102,  102,  102,  102,
-      102,  102,  102,  102,  102,  102,   38,  102,  102,  102,
-      102,  102,  102,  102,  102,  102,  102,   56,  102,  102,
-      102,  102,  102,  102,  102,  102,  102,  102,  102,  102,
-      102,  102,  102,  102,  169,  161,    7,    0,    0,    0,
-
-        2,    0,    5,  105,    0,    0,    0,  115,    0,  121,
-      120,  120,    0,    0,    0,  118,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,  116,  116,  119,  119,
+      182,  180,    7,    9,    8,  139,  118,  103,  144,  147,
+      115,  126,  127,  142,  140,  130,  141,  133,  143,  108,
+      109,  110,  131,  132,  149,  151,  150,  152,  180,  103,
+      124,  180,  125,  145,  103,  105,  103,  103,  103,  103,
+      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
+      103,  103,  128,  148,  129,  146,    7,  180,    4,    4,
+      181,  106,  181,  107,  116,  117,  123,  119,  120,    7,
+        9,    0,    8,  156,  175,  103,    0,  168,  138,  161,
+      169,  166,  153,  164,  154,  165,  163,    0,  113,    3,
+
+        0,  167,  113,  111,    0,    0,  111,  111,    0,    0,
+      111,  110,  110,  110,    0,  110,  136,  137,  135,  157,
+      159,  155,  160,  158,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  104,
+      174,    0,  118,  115,  103,    0,    0,  171,    0,  103,
+      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
+      103,  103,  103,  103,  103,  103,   38,  103,  103,  103,
+      103,  103,  103,  103,  103,  103,  103,   57,  103,  103,
+      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
+      103,  103,  103,  103,  170,  162,    7,    0,    0,    0,
+
+        2,    0,    5,  106,    0,    0,    0,  116,    0,  122,
+      121,  121,    0,    0,    0,  119,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,  133,  112,  112,    0,  112,  112,    0,    0,    6,
-        0,  110,    0,    0,    0,  112,    0,  110,  110,  110,
-      110,    0,  111,    0,    0,  109,  109,  109,  109,    0,
-      171,  172,    0,  177,  175,    0,    0,    0,  103,    0,
-        0,    0,    0,    0,    0,    0,    0,  102,   17,  102,
-      102,  102,  102,  102,  102,  102,  102,  102,  102,  102,
-      102,  102,  102,  102,  102,  102,  102,   14,  102,  102,
-
-      102,  102,  102,  102,  102,  102,  102,  102,  102,  102,
-      102,  102,  102,  102,  102,  102,   50,  102,  102,  102,
-       63,  102,  102,  102,  102,  102,  102,  102,  102,  102,
-      102,  102,  102,  102,  102,   89,  102,  102,  102,  102,
-      102,  102,  102,    0,    0,    0,    0,    0,    0,    0,
-        0,  120,    0,    0,    0,    0,    0,  120,    0,    0,
-      178,    0,    0,    0,    0,    0,    0,    0,  112,    0,
-      112,    0,  112,    0,    0,  112,    0,  110,  110,    0,
-        0,  111,  111,    0,  111,    0,  111,  109,  109,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,  176,
-
-      102,  102,  102,  102,  102,  102,  102,  102,  102,  102,
-      102,  102,  102,  102,  102,  102,  102,  102,  102,  102,
-      102,  102,  102,   21,  102,   24,  102,   27,  102,  102,
-      102,  102,  102,  102,  102,   41,  102,   43,  102,  102,
-      102,  102,  102,  102,  102,   55,  102,   66,  102,  102,
-      102,  102,  102,  102,  102,  102,  102,  102,  102,  102,
-      102,  102,  102,  102,   97,  102,  102,    0,    0,    0,
+        0,  134,  113,  113,    0,  113,  113,    0,    0,    6,
+        0,  111,    0,    0,    0,  113,    0,  111,  111,  111,
+      111,    0,  112,    0,    0,  110,  110,  110,  110,    0,
+      172,  173,    0,  178,  176,    0,    0,    0,  104,    0,
+        0,    0,    0,    0,    0,    0,    0,  103,   17,  103,
+      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
+      103,  103,  103,  103,  103,  103,  103,   14,  103,  103,
+
+      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
+      103,  103,  103,  103,  103,  103,   51,  103,  103,  103,
+       64,  103,  103,  103,  103,  103,  103,  103,  103,  103,
+      103,  103,  103,  103,  103,   90,  103,  103,  103,  103,
+      103,  103,  103,    0,    0,    0,    0,    0,    0,    0,
+        0,  121,    0,    0,    0,    0,    0,  121,    0,    0,
+      179,    0,    0,    0,    0,    0,    0,    0,  113,    0,
+      113,    0,  113,    0,    0,  113,    0,  111,  111,    0,
+        0,  112,  112,    0,  112,    0,  112,  110,  110,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  177,
+
+      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
+      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
+      103,  103,  103,   21,  103,   24,  103,   27,  103,  103,
+      103,  103,  103,  103,  103,   41,  103,   43,  103,  103,
+      103,  103,  103,  103,  103,   56,  103,   67,  103,  103,
+      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
+      103,  103,  103,  103,   98,  103,  103,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,  120,    0,    0,    0,    0,    0,  112,    0,    0,
-        0,    0,    0,    0,  111,  111,    0,  113,    0,  111,
-
-      111,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,  102,  102,   22,  102,  102,  102,
-      102,  102,  102,  102,   15,  102,  102,  102,  102,  102,
-      102,  102,  102,  102,  102,  102,  102,  102,  102,   23,
-       25,  102,   32,  102,  102,  102,  102,   40,  102,  102,
-      102,  102,   48,  102,  102,   53,  102,  102,   70,  102,
-      102,  102,   76,  102,  102,  102,  102,  102,   86,   88,
-      102,  102,   94,  102,  102,  101,    0,    0,    0,    0,
+        0,  121,    0,    0,    0,    0,    0,  113,    0,    0,
+        0,    0,    0,    0,  112,  112,    0,  114,    0,  112,
+
+      112,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,  103,  103,   22,  103,  103,  103,
+      103,  103,  103,  103,   15,  103,  103,  103,  103,  103,
+      103,  103,  103,  103,  103,  103,  103,  103,  103,   23,
+       25,  103,   32,  103,  103,  103,  103,   40,  103,  103,
+      103,  103,   49,  103,  103,   54,  103,  103,   71,  103,
+      103,  103,   77,  103,  103,  103,  103,  103,   87,   89,
+      103,  103,   95,  103,  103,  102,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  113,    0,    0,  111,  113,
-
-      113,  113,  113,    0,  111,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  102,    0,  102,  102,  102,
-      102,  102,  102,  102,  102,  102,  102,  102,  102,  102,
-      102,  102,  102,   58,  102,  102,  102,  102,  102,  102,
-      102,  102,   28,  102,  102,  102,   39,   42,   45,  102,
-      102,   51,  102,   60,   67,  102,  102,   75,   77,   80,
-       81,   83,   84,  102,  102,   91,  102,  102,    0,    1,
-        0,    0,    0,    0,    0,    0,  105,    0,    0,    0,
-      120,    0,    0,    0,    0,  113,    0,  113,  113,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,  102,  102,
-
-       18,  102,  102,  102,  102,  102,  102,  102,   16,  102,
-      102,  102,   33,  102,  102,  102,  102,  102,  102,  102,
-      102,  102,  102,  102,  102,   36,   37,  102,   47,   52,
-      102,  102,  102,   90,  102,  102,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  114,    0,    0,  112,  114,
+
+      114,  114,  114,    0,  112,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  103,    0,  103,  103,  103,
+      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
+      103,  103,  103,   59,  103,  103,  103,  103,  103,  103,
+      103,  103,   28,  103,  103,  103,   39,   42,   45,  103,
+      103,   52,  103,   61,   68,  103,  103,   76,   78,   81,
+       82,   84,   85,  103,  103,   92,  103,  103,    0,    1,
+        0,    0,    0,    0,    0,    0,  106,    0,    0,    0,
+      121,    0,    0,    0,    0,  114,    0,  114,  114,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,  103,  103,
+
+       18,  103,  103,  103,  103,  103,  103,  103,   16,  103,
+      103,  103,   33,  103,  103,  103,  103,  103,  103,  103,
+      103,  103,  103,  103,  103,   36,   37,  103,   48,   53,
+      103,  103,  103,   91,  103,  103,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,   10,
-       11,   29,   54,  102,  102,  102,  102,  102,  102,  102,
-      102,  102,  102,  102,   59,   61,   64,  102,  102,   78,
-       92,  102,  102,   35,   46,   71,   72,  102,   95,   98,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  102,   68,  102,  102,   12,  102,  102,   30,
-
-       34,  102,  102,  102,   65,  102,  102,  102,  102,  102,
-      102,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,   57,  102,  102,  102,  102,  102,
-      102,  102,   49,   62,   73,   79,   93,   99,  102,  102,
-        0,    0,    0,    0,    0,    0,    0,    0,  102,  102,
-       13,   19,  102,  102,   31,  102,  102,  102,   26,   87,
-        0,    0,  102,  102,  102,  102,  102,  102,   74,  100,
-      102,   85,   20,  102,  102,   44,   82,  102,  102,  102,
-      102,  102,  102,  102,   96,   69,    0
+       11,   29,   55,  103,  103,  103,  103,  103,  103,  103,
+      103,  103,  103,  103,   60,   62,   65,  103,  103,   79,
+       93,  103,  103,   35,  103,   47,   72,   73,  103,   96,
+       99,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  103,   69,  103,  103,   12,  103,  103,
+
+       30,   34,  103,  103,  103,   66,  103,  103,  103,  103,
+      103,  103,  103,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,   58,  103,  103,  103,
+      103,  103,  103,  103,   50,   63,   74,   80,   94,  100,
+      103,  103,  103,    0,    0,    0,    0,    0,    0,    0,
+        0,  103,  103,   13,   19,  103,  103,   31,  103,  103,
+      103,   26,   46,   88,    0,    0,  103,  103,  103,  103,
+      103,  103,   75,  101,  103,   86,   20,  103,  103,   44,
+       83,  103,  103,  103,  103,  103,  103,  103,   97,   70,
+        0
+
     } ;
 
@@ -537 +539 @@
     } ;
 
-static yyconst flex_int16_t yy_base[1062] =
+static yyconst flex_int16_t yy_base[1066] =
     {   0,
-        0,   84, 2272, 2269,   94,    0,  177,  178,  179,  180,
-     2285, 2822,  191, 2822,  197,   55, 2822, 2231,   60,  173,
-     2822, 2822, 2822,   56,  188, 2822,  191,  189,  204,  216,
-      275,    0, 2249, 2822,  216, 2247,  152,  344,  155,  220,
-     2822,  159, 2822,  217,  226, 2822,  185,  154,  212,  251,
+        0,   84, 2285, 2282,   94,    0,  177,  178,  179,  180,
+     2298, 2825,  191, 2825,  197,   55, 2825, 2244,   60,  173,
+     2825, 2825, 2825,   56,  188, 2825,  191,  189,  204,  216,
+      275,    0, 2262, 2825,  216, 2260,  152,  344,  155,  220,
+     2825,  159, 2825,  217,  226, 2825,  185,  154,  212,  251,
       237,  270,  235,  257,  241,  205,  193,  305,  314,  333,
-      238,  228, 2822,  225, 2822, 2242,  402,  390, 2822, 2253,
-     2822, 2221,  235, 2822,    0, 2822,  426,    0, 2822,  417,
-     2822,  439,  451, 2822,  498, 2219,  264, 2822, 2822, 2822,
-     2822, 2822, 2235, 2822, 2232, 2822, 2822, 2244,  559, 2822,
-
-     2261, 2822,  438,  444,  511,  534,  289,  253,  197,  380,
-      305,    0,  319,  280,  198,  322, 2822, 2822, 2822, 2230,
-     2822, 2822, 2822, 2227, 2224,  218,  255, 2239,  298,  350,
-      368,  312,  440,  398,  405, 2220,  441, 2168,  446, 2196,
-     2822,  335, 2822, 2822,  468, 2190, 2189, 2822, 2162,  439,
+      238,  228, 2825,  225, 2825, 2255,  402,  390, 2825, 2266,
+     2825, 2234,  235, 2825,    0, 2825,  426,    0, 2825,  417,
+     2825,  439,  451, 2825,  498, 2232,  264, 2825, 2825, 2825,
+     2825, 2825, 2248, 2825, 2245, 2825, 2825, 2257,  559, 2825,
+
+     2274, 2825,  438,  444,  511,  534,  289,  253,  197,  380,
+      305,    0,  319,  280,  198,  322, 2825, 2825, 2825, 2243,
+     2825, 2825, 2825, 2240, 2237,  218,  255, 2252,  298,  350,
+      368,  312,  440,  398,  405, 2233,  441, 2181,  446, 2209,
+     2825,  335, 2825, 2825,  468, 2203, 2202, 2825, 2175,  439,
       282,  433,  372,  281,  437,  434,  428,  570,  444,  466,
       464,  469,  475,  321,  492,  438,  471,  445,  474,  512,
-      489,  503,  496,  521,  276,  515,  516, 2189,  526,  510,
+      489,  503,  496,  521,  276,  515,  516, 2202,  526,  510,
       519,  525,  543,  522,  560,  553,  523,  561,  551,  544,
-      599,  582,  593,  584, 2822, 2822,  660,  651, 2236,  666,
-
-     2822,  678, 2822, 2183,  607, 2179, 2178,    0,  693, 2822,
-     2822,  684, 2176, 2156, 2154,    0, 2177,  578,  608,  617,
-      654,  679,  650,  683,  684,  687, 2172,  690,  691, 2147,
-     2146, 2822,    0,  683,  710,  686,  700, 2145, 2196, 2822,
-      714,    0,  427,  746,  764,  786,  808,  621, 2822, 2152,
-     2125,    0,  794, 2171,  795,  709, 2822, 2147, 2121,  832,
-     2822, 2822, 2152, 2822, 2822,  711,  714, 2129, 2129,  717,
-     2125, 2123, 2120,    0, 2117,    0, 2088,  694,  679,  712,
+      599,  582,  593,  584, 2825, 2825,  660,  651, 2249,  666,
+
+     2825,  678, 2825, 2196,  607, 2192, 2191,    0,  693, 2825,
+     2825,  684, 2189, 2186, 2183,    0, 2206,  578,  608,  617,
+      654,  679,  650,  683,  684,  687, 2203,  690,  691, 2179,
+     2159, 2825,    0,  683,  710,  686,  700, 2157, 2209, 2825,
+      714,    0,  427,  746,  764,  786,  808,  621, 2825, 2165,
+     2138,    0,  794, 2184,  795,  709, 2825, 2160, 2134,  832,
+     2825, 2825, 2165, 2825, 2825,  711,  714, 2142, 2142,  717,
+     2138, 2136, 2133,    0, 2130,    0, 2101,  694,  679,  712,
       709,  711,  698,  566,  726,  743,  771,  741,  790,  784,
-      800,  795,  742,  744,  814,  816,  818, 2118,  819,  745,
+      800,  795,  742,  744,  814,  816,  818, 2131,  819,  745,
 
       820,  821,  822,  823,  824,  746,  825,  748,  659,  831,
       826,  833,  838,  839,  848,  850,  851,  844,  834,  857,
-     2116,  858,  859,  860,  862,  861,  864,  865,  867,  868,
-      866,  871,  876,  872,  878, 2113,  880,  689,  881,  882,
-      892,  896,  893,  953,  954, 2109, 2108, 2106,    0, 2103,
-        0,  941,  945, 2102,    0, 2101,    0, 2099,    0, 2118,
-     2822,  940,  941, 2094, 2088,    0, 2086,    0, 2822,  953,
-      975,  964, 2822,  981,  997, 1021, 2084, 2822, 2822,  939,
-      940, 1006,  982, 1041,  310, 1039, 1004, 2822, 2822, 2081,
-     2079, 2077,    0, 2074,    0, 2071,    0, 2070,    0, 2822,
+     2129,  858,  859,  860,  862,  861,  864,  865,  867,  868,
+      866,  871,  876,  872,  878, 2126,  880,  689,  881,  882,
+      892,  896,  893,  953,  954, 2120, 2119, 2118,    0, 2116,
+        0,  941,  945, 2113,    0, 2112,    0, 2111,    0, 2131,
+     2825,  940,  941, 2108, 2105,    0, 2104,    0, 2825,  953,
+      975,  964, 2825,  981,  997, 1021, 2102, 2825, 2825,  939,
+      940, 1006,  982, 1041,  310, 1039, 1004, 2825, 2825, 2099,
+     2095, 2091,    0, 2089,    0, 2087,    0, 2084,    0, 2825,
 
       886,  941,  960,  962,  977,  976,  980,  982, 1017, 1010,
      1002,  998, 1022, 1031, 1028, 1033, 1034, 1037, 1040, 1043,
-     1038, 1041, 1053, 2072, 1055, 2070, 1045, 2067, 1056, 1061,
-     1063, 1065, 1066, 1067, 1070, 2064, 1071, 2063, 1073, 1074,
-     1075, 1078, 1080, 1081, 1085, 2062, 1087, 2060, 1084, 1089,
+     1038, 1041, 1053, 2085, 1055, 2083, 1045, 2080, 1056, 1061,
+     1063, 1065, 1066, 1067, 1070, 2077, 1071, 2076, 1073, 1074,
+     1075, 1078, 1080, 1081, 1085, 2075, 1087, 2073, 1084, 1089,
      1091, 1097, 1099, 1092, 1102, 1103, 1105, 1106, 1108,  905,
-     1109, 1116, 1110, 1122, 2057, 1120, 1123, 1179, 2051,    0,
-     2050,    0, 2049,    0, 2047,    0, 1166, 2044,    0, 2041,
-        0, 2040, 2039, 2037,    0, 2034,    0, 1173, 2031, 1179,
-     1137, 1195, 1181, 1178, 1176, 2822, 1219, 1231, 1253, 2042,
-
-     2017, 2027, 2024,    0, 2021,    0, 2020,    0, 2019,    0,
-     2017,    0, 2014,    0, 1141, 1172, 2014, 1180, 1155, 1196,
+     1109, 1116, 1110, 1122, 2070, 1120, 1123, 1179, 2064,    0,
+     2063,    0, 2062,    0, 2060,    0, 1166, 2057,    0, 2054,
+        0, 2053, 2052, 2050,    0, 2047,    0, 1173, 2044, 1179,
+     1137, 1195, 1181, 1178, 1176, 2825, 1219, 1231, 1253, 2055,
+
+     2030, 2040, 2037,    0, 2034,    0, 2033,    0, 2032,    0,
+     2030,    0, 2027,    0, 1141, 1172, 2027, 1180, 1155, 1196,
      1157, 1216, 1207, 1231, 1125, 1210, 1232, 1214, 1187, 1236,
-     1235, 1237, 1238, 1272, 1249, 1252, 1250, 1253, 1254, 2013,
-     1261, 1256, 2012, 1260, 1263, 1264, 1257, 2010, 1271, 1268,
-     1269, 1273, 2007, 1275, 1282, 2006, 1283, 1284, 2005, 1276,
-     1286, 1289, 2003, 1294, 1291, 1296, 1295, 1297, 1310, 2000,
-     1305, 1308, 1999, 1307, 1300, 1998, 2046, 1960,    0, 1958,
-        0, 1957,    0, 1954,    0, 1951,    0, 1950,    0, 1949,
-        0, 1947,    0, 1355, 1361, 1389, 1372, 1944, 2822, 1378,
-
-     1325, 1365, 1379, 1941, 2822, 1940,    0, 1939,    0, 1937,
-        0, 1934,    0,    0,    0, 1936,    0, 1366, 1312, 1311,
+     1235, 1237, 1238, 1272, 1249, 1252, 1250, 1253, 1254, 2026,
+     1261, 1256, 2025, 1260, 1263, 1264, 1257, 2023, 1271, 1268,
+     1269, 1273, 2020, 1275, 1282, 2017, 1283, 1284, 2016, 1276,
+     1286, 1289, 2015, 1294, 1291, 1296, 1295, 1297, 1310, 2013,
+     1305, 1308, 2010, 1307, 1300, 2009, 2058, 2003,    0, 2000,
+        0, 1999,    0, 1998,    0, 1996,    0, 1963,    0, 1961,
+        0, 1960,    0, 1355, 1361, 1389, 1372, 1957, 2825, 1378,
+
+     1325, 1365, 1379, 1954, 2825, 1953,    0, 1952,    0, 1950,
+        0, 1947,    0,    0,    0, 1947,    0, 1366, 1312, 1311,
      1341, 1323, 1368, 1369, 1374, 1356, 1383, 1372, 1388, 1390,
      1393, 1395, 1396, 1398, 1400, 1431, 1406, 1407, 1411, 1408,
-     1413, 1414, 1935, 1409, 1416, 1419, 1933, 1930, 1929, 1422,
-     1424, 1928, 1429, 1926, 1923, 1425, 1430, 1919, 1915, 1911,
-     1895, 1894, 1893, 1436, 1433, 1891, 1439, 1440, 1938, 2822,
-     1884,    0, 1883,    0,    0,    0, 1884,    0,    0,    0,
-     2822,    0,    0,    0,    0, 1486, 1878, 2822, 2822, 1492,
-     1877,    0, 1876,    0,    0,    0,    0, 1874, 1447, 1444,
-
-     1874, 1449, 1471, 1479, 1450, 1480, 1482, 1469, 1873, 1486,
+     1413, 1414, 1946, 1409, 1416, 1419, 1945, 1943, 1940, 1422,
+     1424, 1939, 1429, 1938, 1936, 1425, 1430, 1933, 1932, 1931,
+     1929, 1926, 1922, 1436, 1433, 1918, 1439, 1440, 1964, 2825,
+     1895,    0, 1894,    0,    0,    0, 1896,    0,    0,    0,
+     2825,    0,    0,    0,    0, 1486, 1891, 2825, 2825, 1492,
+     1888,    0, 1887,    0,    0,    0,    0, 1886, 1447, 1444,
+
+     1887, 1449, 1471, 1479, 1450, 1480, 1482, 1469, 1884, 1486,
      1490, 1488, 1502, 1452, 1510, 1504, 1491, 1519, 1506, 1498,
-     1508, 1512, 1513, 1514, 1515, 1872, 1870, 1517, 1867, 1866,
-     1518, 1520, 1523, 1865, 1521, 1525,    0,    0,    0, 1860,
-     1857, 1856, 1575,    0, 1855, 1853, 1850, 1849, 1848, 1849,
-     1846, 1845, 1844, 1531, 1536, 1527, 1528, 1552, 1533, 1537,
-     1539, 1555, 1557, 1569, 1842, 1560, 1839, 1561, 1559, 1568,
-     1572, 1567, 1573, 1838, 1837, 1835, 1828, 1574, 1826, 1825,
-     1819, 1818, 1817, 1815, 1798, 1789, 1788, 1785, 1778, 1775,
-     1768, 1766, 1576, 1768, 1577, 1581, 1580, 1579, 1584, 1585,
-
-     1747, 1586, 1615, 1590, 1746, 1591, 1592, 1602, 1600, 1594,
-     1606, 1742, 1735, 1733, 1732, 1690, 1689, 1686, 1685, 1683,
-     1682, 1678, 1677, 1674, 1676, 1607, 1611, 1614, 1612, 1608,
-     1616, 1620, 1675, 1623, 1624, 1530, 1453, 1630, 1625, 1629,
-     1438, 1354, 1319, 1318, 1267, 1212, 1210, 1208, 1631, 1636,
-     1178, 1639, 1635, 1643, 1177, 1644, 1646, 1650, 1126,  964,
-      937,  903, 1651, 1652, 1654, 1655, 1656, 1658,  788,  752,
-     1660,  607,  487, 1662, 1663,  394,  357, 1664, 1666, 1668,
-     1670, 1669, 1672, 1674,  233,  137, 2822, 1747, 1760, 1773,
-     1783, 1793, 1806, 1816, 1829, 1842, 1855, 1863, 1873, 1880,
-
-     1887, 1894, 1901, 1908, 1915, 1922, 1929, 1936, 1949, 1956,
-     1960, 1968, 1971, 1978, 1985, 1992, 1995, 2002, 2008, 2021,
-     2034, 2041, 2048, 2055, 2062, 2065, 2072, 2075, 2082, 2085,
-     2092, 2095, 2102, 2105, 2112, 2115, 2122, 2125, 2132, 2140,
-     2147, 2154, 2161, 2168, 2171, 2178, 2181, 2188, 2191, 2198,
-     2204, 2217, 2224, 2231, 2234, 2241, 2244, 2251, 2254, 2261,
-     2264, 2271, 2274, 2281, 2284, 2291, 2298, 2301, 2308, 2311,
-     2318, 2325, 2332, 2335, 2342, 2345, 2352, 2355, 2362, 2365,
-     2372, 2375, 2382, 2388, 2401, 2408, 2415, 2418, 2425, 2428,
-     2435, 2438, 2445, 2448, 2455, 2458, 2465, 2468, 2475, 2478,
-
-     2485, 2488, 2495, 2502, 2505, 2512, 2515, 2522, 2525, 2532,
-     2535, 2538, 2544, 2551, 2560, 2567, 2574, 2577, 2584, 2587,
-     2590, 2596, 2603, 2606, 2609, 2612, 2615, 2618, 2621, 2624,
-     2631, 2634, 2641, 2644, 2647, 2650, 2653, 2663, 2670, 2673,
-     2676, 2679, 2686, 2693, 2700, 2703, 2710, 2717, 2724, 2731,
-     2738, 2745, 2752, 2759, 2766, 2773, 2780, 2787, 2794, 2801,
-     2808
+     1508, 1512, 1513, 1514, 1515, 1883, 1882, 1518, 1880, 1877,
+     1517, 1520, 1523, 1876, 1521, 1525,    0,    0,    0, 1872,
+     1870, 1867, 1575,    0, 1866, 1865, 1863, 1860, 1859, 1861,
+     1859, 1856, 1855, 1531, 1538, 1527, 1528, 1530, 1533, 1552,
+     1539, 1554, 1553, 1586, 1854, 1559, 1852, 1560, 1561, 1564,
+     1570, 1572, 1571, 1849, 1574, 1848, 1847, 1845, 1575, 1842,
+     1841, 1837, 1835, 1828, 1826, 1825, 1822, 1821, 1820, 1818,
+     1801, 1792, 1791, 1576, 1791, 1579, 1577, 1580, 1582, 1581,
+
+     1585, 1784, 1589, 1616, 1593, 1781, 1591, 1599, 1605, 1592,
+     1606, 1609, 1610, 1771, 1769, 1768, 1747, 1746, 1745, 1738,
+     1736, 1735, 1693, 1689, 1688, 1687, 1689, 1611, 1612, 1614,
+     1615, 1618, 1625, 1621, 1686, 1683, 1627, 1682, 1681, 1631,
+     1635, 1441, 1637, 1677, 1674, 1354, 1319, 1318, 1267, 1212,
+     1210, 1639, 1640, 1211, 1647, 1623, 1649, 1178, 1652, 1653,
+     1657, 1177, 1126,  964,  937,  903, 1641, 1643, 1659, 1663,
+     1664, 1665,  788,  752, 1629,  607,  487, 1666, 1669,  394,
+      357, 1670, 1672, 1671, 1674, 1676, 1675, 1678,  233,  137,
+     2825, 1750, 1763, 1776, 1786, 1796, 1809, 1819, 1832, 1845,
+
+     1858, 1866, 1876, 1883, 1890, 1897, 1904, 1911, 1918, 1925,
+     1932, 1939, 1952, 1959, 1963, 1971, 1974, 1981, 1988, 1995,
+     1998, 2005, 2011, 2024, 2037, 2044, 2051, 2058, 2065, 2068,
+     2075, 2078, 2085, 2088, 2095, 2098, 2105, 2108, 2115, 2118,
+     2125, 2128, 2135, 2143, 2150, 2157, 2164, 2171, 2174, 2181,
+     2184, 2191, 2194, 2201, 2207, 2220, 2227, 2234, 2237, 2244,
+     2247, 2254, 2257, 2264, 2267, 2274, 2277, 2284, 2287, 2294,
+     2301, 2304, 2311, 2314, 2321, 2328, 2335, 2338, 2345, 2348,
+     2355, 2358, 2365, 2368, 2375, 2378, 2385, 2391, 2404, 2411,
+     2418, 2421, 2428, 2431, 2438, 2441, 2448, 2451, 2458, 2461,
+
+     2468, 2471, 2478, 2481, 2488, 2491, 2498, 2505, 2508, 2515,
+     2518, 2525, 2528, 2535, 2538, 2541, 2547, 2554, 2563, 2570,
+     2577, 2580, 2587, 2590, 2593, 2599, 2606, 2609, 2612, 2615,
+     2618, 2621, 2624, 2627, 2634, 2637, 2644, 2647, 2650, 2653,
+     2656, 2666, 2673, 2676, 2679, 2682, 2689, 2696, 2703, 2706,
+     2713, 2720, 2727, 2734, 2741, 2748, 2755, 2762, 2769, 2776,
+     2783, 2790, 2797, 2804, 2811
     } ;
 
-static yyconst flex_int16_t yy_def[1062] =
+static yyconst flex_int16_t yy_def[1066] =
     {   0,
-      887,    1,  888,  888,  887,    5,  889,  889,  890,  890,
-      887,  887,  887,  887,  887,  887,  887,  891,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,   31,  887,  887,  887,  887,  887,  887,  892,  891,
-      887,  887,  887,  887,  891,  887,  891,  891,  891,  891,
+      891,    1,  892,  892,  891,    5,  893,  893,  894,  894,
+      891,  891,  891,  891,  891,  891,  891,  895,  891,  891,
       891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
-      891,  891,  887,  887,  887,  887,  887,  893,  887,  887,
-      887,  894,  887,  887,  895,  887,  887,  896,  887,  887,
-      887,  887,  887,  887,  887,  891,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-
-      897,  887,   99,   30,  887,  887,  887,  887,  898,   30,
-      887,   31,  887,  887,   31,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  899,
-      887,  887,  887,  887,  891,  900,  901,  887,  887,  891,
+      891,   31,  891,  891,  891,  891,  891,  891,  896,  895,
+      891,  891,  891,  891,  895,  891,  895,  895,  895,  895,
+      895,  895,  895,  895,  895,  895,  895,  895,  895,  895,
+      895,  895,  891,  891,  891,  891,  891,  897,  891,  891,
+      891,  898,  891,  891,  899,  891,  891,  900,  891,  891,
+      891,  891,  891,  891,  891,  895,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+
+      901,  891,   99,   30,  891,  891,  891,  891,  902,   30,
+      891,   31,  891,  891,   31,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  903,
+      891,  891,  891,  891,  895,  904,  905,  891,  891,  895,
+      895,  895,  895,  895,  895,  895,  895,  895,  895,  895,
+      895,  895,  895,  895,  895,  895,  895,  895,  895,  895,
+      895,  895,  895,  895,  895,  895,  895,  895,  895,  895,
+      895,  895,  895,  895,  895,  895,  895,  895,  895,  895,
+      895,  895,  895,  895,  891,  891,  891,  897,  897,  897,
+
+      891,  897,  891,  898,  891,  906,  907,  899,  891,  891,
+      891,  891,  908,  909,  910,  900,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  911,
+      912,  891,   99,  891,  891,  891,  891,   99,  913,  891,
+      891,  104,  104,  891,  891,  891,  891,  891,  891,  891,
+      891,  914,  915,  916,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  903,  891,
+      917,  918,  919,  920,  921,  922,  891,  923,  923,  923,
+      923,  923,  923,  923,  923,  923,  923,  923,  923,  923,
+      923,  923,  923,  923,  923,  923,  923,  923,  923,  923,
+
+      923,  923,  923,  923,  923,  923,  923,  923,  923,  923,
+      923,  923,  923,  923,  923,  923,  923,  923,  923,  923,
+      923,  923,  923,  923,  923,  923,  923,  923,  923,  923,
+      923,  923,  923,  923,  923,  923,  923,  923,  923,  923,
+      923,  923,  923,  924,  925,  926,  927,  928,  929,  930,
+      931,  891,  891,  932,  933,  934,  935,  936,  937,  891,
+      891,  891,  891,  891,  938,  939,  940,  941,  891,  891,
+      891,  891,  891,  891,  891,  371,  376,  891,  891,  942,
+      943,  944,  891,  891,  891,  944,  891,  891,  891,  945,
+      946,  947,  948,  949,  950,  951,  952,  953,  954,  891,
+
+      955,  955,  955,  955,  955,  955,  955,  955,  955,  955,
+      955,  955,  955,  955,  955,  955,  955,  955,  955,  955,
+      955,  955,  955,  955,  955,  955,  955,  955,  955,  955,
+      955,  955,  955,  955,  955,  955,  955,  955,  955,  955,
+      955,  955,  955,  955,  955,  955,  955,  955,  955,  955,
+      955,  955,  955,  955,  955,  955,  955,  955,  955,  955,
+      955,  955,  955,  955,  955,  955,  955,  956,  957,  958,
+      959,  960,  961,  962,  963,  964,  891,  965,  966,  967,
+      968,  969,  969,  970,  971,  972,  973,  891,  488,  891,
+      974,  891,  974,  891,  891,  891,  891,  891,  891,  891,
+
+      891,  975,  976,  977,  978,  979,  980,  981,  982,  983,
+      984,  985,  986,  987,  988,  988,  988,  988,  988,  988,
+      988,  988,  988,  988,  988,  988,  988,  988,  988,  988,
+      988,  988,  988,  988,  988,  988,  988,  988,  988,  988,
+      988,  988,  988,  988,  988,  988,  988,  988,  988,  988,
+      988,  988,  988,  988,  988,  988,  988,  988,  988,  988,
+      988,  988,  988,  988,  988,  988,  988,  988,  988,  988,
+      988,  988,  988,  988,  988,  988,  989,  990,  991,  992,
+      993,  994,  995,  996,  997,  998,  999, 1000, 1001, 1002,
+     1003, 1004, 1005,  891,  891,  891,  891, 1006,  891,  596,
+
+      891,  891,  891,  600,  891, 1007, 1008, 1009, 1010, 1011,
+     1012, 1013, 1014, 1015, 1016, 1017, 1018, 1017, 1017, 1017,
+     1017, 1017, 1017, 1017, 1017, 1017, 1017, 1017, 1017, 1017,
+     1017, 1017, 1017, 1017, 1017, 1017, 1017, 1017, 1017, 1017,
+     1017, 1017, 1017, 1017, 1017, 1017, 1017, 1017, 1017, 1017,
+     1017, 1017, 1017, 1017, 1017, 1017, 1017, 1017, 1017, 1017,
+     1017, 1017, 1017, 1017, 1017, 1017, 1017, 1017, 1019,  891,
+     1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027, 1028, 1029,
+      891, 1030, 1031, 1032, 1033,  891,  686,  891,  891,  891,
+     1034, 1035, 1036, 1037, 1038, 1039, 1040, 1041, 1042, 1042,
+
+     1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042,
+     1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042,
+     1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042,
+     1042, 1042, 1042, 1042, 1042, 1042, 1043, 1044, 1045, 1046,
+     1047, 1048,  891, 1049, 1034, 1036, 1050, 1051, 1041, 1042,
+     1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042,
+     1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042,
+     1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042,
+     1042, 1052, 1053, 1046, 1054, 1047, 1055, 1048, 1056, 1057,
+     1050, 1058, 1051, 1042, 1042, 1042, 1042, 1042, 1042, 1042,
+
+     1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042,
+     1042, 1042, 1042, 1059, 1052, 1060, 1053, 1061, 1054, 1062,
+     1055, 1063, 1056, 1064, 1057, 1058, 1042, 1042, 1042, 1042,
+     1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042,
+     1042, 1042, 1042, 1065, 1059, 1060, 1061, 1062, 1036, 1063,
+     1064, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042,
+     1042, 1042, 1042, 1042, 1065, 1036, 1042, 1042, 1042, 1042,
+     1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042,
+     1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042,
+        0,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+
       891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
       891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
       891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
       891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
-      891,  891,  891,  891,  887,  887,  887,  893,  893,  893,
-
-      887,  893,  887,  894,  887,  902,  903,  895,  887,  887,
-      887,  887,  904,  905,  906,  896,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  907,
-      908,  887,   99,  887,  887,  887,  887,   99,  909,  887,
-      887,  104,  104,  887,  887,  887,  887,  887,  887,  887,
-      887,  910,  911,  912,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  899,  887,
-      913,  914,  915,  916,  917,  918,  887,  919,  919,  919,
-      919,  919,  919,  919,  919,  919,  919,  919,  919,  919,
-      919,  919,  919,  919,  919,  919,  919,  919,  919,  919,
-
-      919,  919,  919,  919,  919,  919,  919,  919,  919,  919,
-      919,  919,  919,  919,  919,  919,  919,  919,  919,  919,
-      919,  919,  919,  919,  919,  919,  919,  919,  919,  919,
-      919,  919,  919,  919,  919,  919,  919,  919,  919,  919,
-      919,  919,  919,  920,  921,  922,  923,  924,  925,  926,
-      927,  887,  887,  928,  929,  930,  931,  932,  933,  887,
-      887,  887,  887,  887,  934,  935,  936,  937,  887,  887,
-      887,  887,  887,  887,  887,  371,  376,  887,  887,  938,
-      939,  940,  887,  887,  887,  940,  887,  887,  887,  941,
-      942,  943,  944,  945,  946,  947,  948,  949,  950,  887,
-
-      951,  951,  951,  951,  951,  951,  951,  951,  951,  951,
-      951,  951,  951,  951,  951,  951,  951,  951,  951,  951,
-      951,  951,  951,  951,  951,  951,  951,  951,  951,  951,
-      951,  951,  951,  951,  951,  951,  951,  951,  951,  951,
-      951,  951,  951,  951,  951,  951,  951,  951,  951,  951,
-      951,  951,  951,  951,  951,  951,  951,  951,  951,  951,
-      951,  951,  951,  951,  951,  951,  951,  952,  953,  954,
-      955,  956,  957,  958,  959,  960,  887,  961,  962,  963,
-      964,  965,  965,  966,  967,  968,  969,  887,  488,  887,
-      970,  887,  970,  887,  887,  887,  887,  887,  887,  887,
-
-      887,  971,  972,  973,  974,  975,  976,  977,  978,  979,
-      980,  981,  982,  983,  984,  984,  984,  984,  984,  984,
-      984,  984,  984,  984,  984,  984,  984,  984,  984,  984,
-      984,  984,  984,  984,  984,  984,  984,  984,  984,  984,
-      984,  984,  984,  984,  984,  984,  984,  984,  984,  984,
-      984,  984,  984,  984,  984,  984,  984,  984,  984,  984,
-      984,  984,  984,  984,  984,  984,  984,  984,  984,  984,
-      984,  984,  984,  984,  984,  984,  985,  986,  987,  988,
-      989,  990,  991,  992,  993,  994,  995,  996,  997,  998,
-      999, 1000, 1001,  887,  887,  887,  887, 1002,  887,  596,
-
-      887,  887,  887,  600,  887, 1003, 1004, 1005, 1006, 1007,
-     1008, 1009, 1010, 1011, 1012, 1013, 1014, 1013, 1013, 1013,
-     1013, 1013, 1013, 1013, 1013, 1013, 1013, 1013, 1013, 1013,
-     1013, 1013, 1013, 1013, 1013, 1013, 1013, 1013, 1013, 1013,
-     1013, 1013, 1013, 1013, 1013, 1013, 1013, 1013, 1013, 1013,
-     1013, 1013, 1013, 1013, 1013, 1013, 1013, 1013, 1013, 1013,
-     1013, 1013, 1013, 1013, 1013, 1013, 1013, 1013, 1015,  887,
-     1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025,
-      887, 1026, 1027, 1028, 1029,  887,  686,  887,  887,  887,
-     1030, 1031, 1032, 1033, 1034, 1035, 1036, 1037, 1038, 1038,
-
-     1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
-     1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
-     1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
-     1038, 1038, 1038, 1038, 1038, 1038, 1039, 1040, 1041, 1042,
-     1043, 1044,  887, 1045, 1030, 1032, 1046, 1047, 1037, 1038,
-     1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
-     1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
-     1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
-     1048, 1049, 1042, 1050, 1043, 1051, 1044, 1052, 1053, 1046,
-     1054, 1047, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
-
-     1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
-     1038, 1055, 1048, 1056, 1049, 1057, 1050, 1058, 1051, 1059,
-     1052, 1060, 1053, 1054, 1038, 1038, 1038, 1038, 1038, 1038,
-     1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
-     1061, 1055, 1056, 1057, 1058, 1032, 1059, 1060, 1038, 1038,
-     1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
-     1061, 1032, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
-     1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
-     1038, 1038, 1038, 1038, 1038, 1038,    0,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891
     } ;
 
-static yyconst flex_int16_t yy_nxt[2908] =
+static yyconst flex_int16_t yy_nxt[2911] =
     {   0,
        12,   13,   14,   15,   15,   15,   13,   16,   17,   12,
@@ -804 +806 @@
 
        83,   83,   83,   82,   91,   93,   87,  142,  146,   98,
-       95,   99,   99,   99,   99,   99,   99,  252,  887,   94,
+       95,   99,   99,   99,   99,   99,   99,  252,  891,   94,
       100,   85,   96,   97,   85,  101,  161,  118,  143,   77,
        77,   77,   77,  144,  147,  102,  103,   87,  104,  104,
@@ -825 +827 @@
       305,  200,  201,  190,  257,  136,  200,  257,  137,  263,
 
-      887,  264,  192,  197,   81,   82,   82,   82,  197,   87,
+      891,  264,  192,  197,   81,   82,   82,   82,  197,   87,
       272,  198,  202,  202,  202,  202,  202,  202,   80,   81,
        82,   82,   82,   80,   87,  138,  139,  209,  210,  263,
-      887,  264,  209,  282,  211,  255,  263,  267,  264,  211,
-       82,   81,   82,   82,   82,   82,   87,  887,  212,  212,
-      212,  212,   82,   81,   83,   83,   83,   82,  887,  211,
+      891,  264,  209,  282,  211,  255,  263,  267,  264,  211,
+       82,   81,   82,   82,   82,   82,   87,  891,  212,  212,
+      212,  212,   82,   81,   83,   83,   83,   82,  891,  211,
        99,   99,   99,   99,   99,   99,  242,  242,  242,  242,
       266,  263,  263,  264,  264,  213,  143,  263,  211,  264,
        87,  144,  375,  211,  211,   87,   87,  211,  211,   87,
-       87,   87,  286,  241,  887,  211,   87,   87,  211,  243,
+       87,   87,  286,  241,  891,  211,   87,   87,  211,  243,
 
       211,  214,  211,  281,  215,  217,  278,  284,  285,  218,
       219,  307,  298,  279,  220,  221,   87,  222,   87,  223,
-       87,   87,  887,   87,  309,  300,   87,   87,  224,  225,
+       87,   87,  891,   87,  309,  300,   87,   87,  224,  225,
       226,  103,  303,  105,  105,  105,  105,  105,  105,   87,
       299,   87,  301,  302,   87,  304,  308,  310,   87,  227,
@@ -885 +887 @@
        87,  450,   87,   87,   87,  452,  455,  454,   87,  453,
       457,  462,  460,  461,   87,   87,  458,  464,   87,  515,
-      459,  463,  465,  466,  344,  201,  201,   87,  887,  344,
+      459,  463,  465,  466,  344,  201,  201,   87,  891,  344,
       467,  345,  199,  211,  211,  211,  211,  352,  352,  352,
       352,  360,  360,  361,  361,  371,  371,  371,  371,  371,
       371,  370,  569,  370,  492,  492,  371,  371,  371,  371,
-      371,  371,  887,   87,  493,  494,  477,  488,  488,  488,
+      371,  371,  891,   87,  493,  494,  477,  488,  488,  488,
 
       488,  488,  488,  233,  233,  233,  233,  233,  233,  516,
@@ -896 +898 @@
       489,  496,   87,  518,   87,  236,  374,  236,  519,  520,
       237,  521,  236,  376,  376,  376,  376,  376,  376,  383,
-       87,  384,  375,  496,   87,  385,  522,  496,  497,  887,
+       87,  384,  375,  496,   87,  385,  522,  496,  497,  891,
       497,  386,   87,  498,  498,  498,  498,  498,  498,   87,
       525,  495,  526,  387,   87,  524,  377,  384,  523,  496,
@@ -919 +921 @@
       236,  498,  498,  498,  498,  498,  498,  620,   87,  492,
       597,  599,  492,  600,  600,  600,  600,  600,  600,   87,
-      631,  622,   87,  887,  625,  887,   87,  862,   87,  601,
+      631,  622,   87,   87,  625,  891,   87,  891,   87,  601,
       497,  602,  497,  603,  602,  498,  498,  498,  498,  498,
       498,  624,  628,   87,   87,  630,  604,   87,   87,   87,
@@ -926 +928 @@
       634,   87,   87,  635,   87,   87,   87,  642,   87,   87,
       637,  641,   87,   87,  640,   87,   87,  643,  647,  639,
-       87,   87,  887,   87,   87,   87,  638,   87,   87,  644,
+       87,   87,  866,   87,   87,   87,  638,   87,   87,  644,
       645,  646,  648,  650,   87,   87,   87,  649,   87,  653,
       651,   87,  652,   87,  654,  655,   87,   87,   87,   87,
       656,  657,   87,  660,  659,  661,  664,   87,  658,   87,
        87,  663,   87,   87,   87,  668,  665,  688,  688,  662,
-      666,  701,  702,  887,  887,   87,  667,  488,  488,  488,
+      666,  701,  702,  891,  891,   87,  667,  488,  488,  488,
       488,  488,  488,  596,  596,  596,  596,  596,  596,  595,
       688,  595,  704,   87,  596,  596,  596,  596,  596,  596,
 
-      600,  600,  600,  600,  600,  600,  703,  688,   87,  887,
+      600,  600,  600,  600,  600,  600,  703,  688,   87,  891,
       594,  686,  686,  686,  686,  686,  686,  689,   87,  689,
        87,   87,  689,  699,   87,  708,   87,  601,  706,  602,
@@ -944 +946 @@
       715,   87,  721,  719,   87,  724,   87,   87,  722,  720,
       727,   87,   87,   87,  725,   87,  731,  723,   87,  732,
-      726,   87,   87,  861,  728,  734,   87,  733,  730,   87,
-
-      735,   87,   87,  729,   87,   87,  751,  736,  686,  686,
+      726,   87,   87,   87,  728,  734,   87,  733,  730,   87,
+
+      735,   87,   87,  729,   87,  863,  751,  736,  686,  686,
       686,  686,  686,  686,  600,  600,  600,  600,  600,  600,
       750,   87,  755,   87,  601,  763,  602,  752,  603,  602,
@@ -954 +956 @@
        87,  768,   87,  769,   87,   87,   87,   87,  770,   87,
        87,   87,   87,   87,  771,   87,  774,   87,  772,   87,
-       87,  779,   87,   87,  795,   87,  780,  773,   87,   87,
-      776,   87,  775,  803,  777,  796,  778,  686,  686,  686,
-
-      686,  686,  686,  793,   87,  794,  799,   87,  798,   87,
-      801,   87,   87,   87,  797,  804,  805,  800,  806,   87,
-       87,   87,  802,  807,   87,   87,   87,  808,   87,   87,
-      743,   87,   87,   87,  809,  828,   87,   87,   87,  830,
-      831,  833,   87,   87,   87,  834,   87,  836,  810,  811,
-      826,  827,   87,  829,   87,  825,  832,  837,   87,   87,
-       87,  838,  839,   87,   87,  835,   87,   87,   87,  851,
-      850,  855,   87,  852,  840,   87,   87,   87,  853,  857,
-      849,   87,   87,   87,  854,  858,  859,   87,   87,  856,
-      860,   87,  863,  864,  865,   87,   87,  866,   87,  868,
-
-      867,  869,   87,   87,   87,  870,   87,   87,   87,  873,
-       87,  875,   87,  876,   87,   87,   87,  874,   87,  872,
-       87,   87,   87,  871,   87,  880,   87,   87,   87,  887,
-      879,  881,  887,  848,  877,  878,  886,  887,  847,  884,
-      887,  845,  882,  883,  887,  844,  885,   69,   69,   69,
+       87,  780,   87,   87,  796,   87,  781,  773,  775,  777,
+       87,   87,  798,  776,  778,  797,  779,  686,  686,  686,
+
+      686,  686,  686,  794,   87,   87,   87,  795,  799,  802,
+      804,   87,   87,   87,  805,  806,   87,  801,  803,  808,
+      807,  800,   87,   87,   87,  809,   87,   87,   87,   87,
+      743,   87,   87,   87,   87,  830,  832,   87,   87,  810,
+      833,   87,  835,   87,   87,   87,  811,  829,  836,  812,
+      813,   87,  828,  840,  838,  827,  831,   87,   87,  834,
+      839,   87,   87,   87,   87,  837,   87,   87,   87,  854,
+       87,  853,  842,   87,  841,   87,  855,   87,  843,   87,
+      858,   87,  860,   87,  852,  870,  861,   87,  856,   87,
+      859,   87,   87,   87,  857,   87,  862,  868,  864,   87,
+
+      867,   87,  869,  881,   87,   87,  871,  872,  873,   87,
+      876,   87,  874,  875,  877,   87,   87,   87,   87,  879,
+      880,   87,   87,   87,   87,  878,   87,   87,   87,  891,
+       87,  884,  865,   87,   87,   87,  883,  885,   87,  882,
+      890,   87,  891,  891,  851,  886,  888,  887,  891,  889,
        69,   69,   69,   69,   69,   69,   69,   69,   69,   69,
-       75,   75,   75,   75,   75,   75,   75,   75,   75,   75,
-       75,   75,   75,   78,   78,   78,   78,   78,   78,   78,
-       78,   78,   78,   78,   78,   78,   86,  887,  843,   86,
-      887,   86,   86,   86,   86,   86,  140,  842,   87,   87,
-
-      140,  140,  140,  140,  140,  140,  199,  199,  199,  199,
-      199,  199,  199,  199,  199,  199,  199,  199,  199,  204,
-       87,  887,  204,  824,  204,  204,  204,  204,  204,  208,
-      887,  208,  208,  823,  208,  208,  208,  208,  208,  208,
-      821,  208,  216,  887,  819,  216,  216,  216,  216,  216,
-      216,  216,  216,  887,  216,  239,  239,  239,  239,  239,
-      239,  239,  239,  239,  239,  239,  239,  239,  253,  253,
-      817,  253,  887,  815,  813,  253,  269,   87,   87,  269,
-       87,  269,  269,  269,  269,  269,  273,   87,  273,   87,
-       87,   87,  273,  275,   87,  275,   87,   87,   87,  275,
-
-      348,   87,  348,  887,  792,  790,  348,  350,  887,  350,
-      887,  787,  785,  350,  354,  783,  354,   87,   87,   87,
-      354,  356,   87,  356,   87,   87,   87,  356,  358,  749,
-      358,  746,  745,  743,  358,  365,  205,  365,  739,  738,
-      670,  365,  367,   87,  367,   87,   87,   87,  367,  239,
+       69,   69,   69,   75,   75,   75,   75,   75,   75,   75,
+       75,   75,   75,   75,   75,   75,   78,   78,   78,   78,
+       78,   78,   78,   78,   78,   78,   78,   78,   78,   86,
+      850,  891,   86,  848,   86,   86,   86,   86,   86,  140,
+
+      891,  847,  891,  140,  140,  140,  140,  140,  140,  199,
+      199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
+      199,  199,  204,  846,  891,  204,  845,  204,  204,  204,
+      204,  204,  208,   87,  208,  208,   87,  208,  208,  208,
+      208,  208,  208,   87,  208,  216,  891,  826,  216,  216,
+      216,  216,  216,  216,  216,  216,  891,  216,  239,  239,
       239,  239,  239,  239,  239,  239,  239,  239,  239,  239,
-      239,  239,  380,   87,  380,  382,  382,   87,  382,  382,
-      382,   87,  382,  253,  253,   87,  253,  392,   87,  392,
-       87,   87,   87,  392,  394,   87,  394,   87,   87,  697,
-      394,  396,  696,  396,  694,  692,  690,  396,  273,  598,
-
-      273,  398,  685,  398,  684,  682,  680,  398,  275,  678,
-      275,   86,  676,  674,   86,  672,   86,   86,   86,   86,
-       86,  199,  199,  199,  199,  199,  199,  199,  199,  199,
-      199,  199,  199,  199,  468,  468,  468,  468,  468,  468,
-      468,  468,  468,  468,  468,  468,  468,  469,  670,  469,
-       87,   87,   87,  469,  471,   87,  471,   87,   87,   87,
-      471,  473,   87,  473,   87,   87,   87,  473,  348,  617,
-      348,  475,  615,  475,  613,  611,  609,  475,  350,  607,
-      350,  478,  502,  478,  605,  605,  594,  478,  354,  593,
-      354,  480,  591,  480,  483,  483,  589,  480,  356,  587,
-
-      356,  482,  585,  482,  583,  581,  579,  482,  358,   87,
-      358,  484,   87,  484,   87,   87,   87,  484,  365,   87,
-      365,  486,   87,  486,   87,  514,  512,  486,  367,  510,
-      367,  491,  508,  491,  506,  491,  504,  491,  380,  490,
-      380,  487,  380,  485,  380,  382,  382,  361,  382,  382,
-      382,  361,  382,  503,  483,  503,  481,  479,  476,  503,
-      505,  474,  505,  472,  470,   87,  505,  507,   87,  507,
-       87,  400,  399,  507,  392,  397,  392,  509,  395,  509,
-      393,  270,  265,  509,  394,  264,  394,  511,  389,  511,
-      389,  252,  379,  511,  396,  379,  396,  513,  240,  513,
-
-      374,  368,  366,  513,  398,  364,  398,   86,  360,  359,
-       86,  357,   86,   86,   86,   86,   86,  468,  468,  468,
+      239,  253,  253,  825,  253,  823,  891,  821,  253,  269,
+      891,  819,  269,  891,  269,  269,  269,  269,  269,  273,
+      817,  273,  815,   87,   87,  273,  275,   87,  275,   87,
+
+       87,   87,  275,  348,   87,  348,   87,   87,   87,  348,
+      350,   87,  350,   87,  891,  793,  350,  354,  791,  354,
+      891,  891,  788,  354,  356,  786,  356,  784,   87,   87,
+      356,  358,   87,  358,   87,   87,   87,  358,  365,   87,
+      365,  749,  746,  745,  365,  367,  743,  367,  205,  739,
+      738,  367,  239,  239,  239,  239,  239,  239,  239,  239,
+      239,  239,  239,  239,  239,  380,  670,  380,  382,  382,
+       87,  382,  382,  382,   87,  382,  253,  253,   87,  253,
+      392,   87,  392,   87,   87,   87,  392,  394,   87,  394,
+       87,   87,   87,  394,  396,   87,  396,   87,   87,   87,
+
+      396,  273,  697,  273,  398,  696,  398,  694,  692,  690,
+      398,  275,  598,  275,   86,  685,  684,   86,  682,   86,
+       86,   86,   86,   86,  199,  199,  199,  199,  199,  199,
+      199,  199,  199,  199,  199,  199,  199,  468,  468,  468,
       468,  468,  468,  468,  468,  468,  468,  468,  468,  468,
-      578,  355,  578,  351,  349,  205,  578,  469,  201,  469,
-      580,   87,  580,  277,  276,  274,  580,  471,  270,  471,
-      582,  265,  582,  268,  265,  263,  582,  473,  262,  473,
-      584,  261,  584,  240,  232,   85,  584,  475,   85,  475,
-      586,   87,  586,  205,  203,   85,  586,  478,  122,  478,
-      588,  117,  588,   87,  887,   70,  588,  480,   70,  480,
-      482,  887,  482,  887,  887,  887,  482,  590,  887,  590,
-
-      887,  887,  887,  590,  484,  887,  484,  592,  887,  592,
-      887,  887,  887,  592,  486,  887,  486,  491,  887,  491,
-      887,  491,  887,  491,  382,  887,  382,  887,  887,  887,
-      382,  606,  887,  606,  887,  887,  887,  606,  503,  887,
-      503,  608,  887,  608,  887,  887,  887,  608,  505,  887,
-      505,  610,  887,  610,  887,  887,  887,  610,  507,  887,
-      507,  612,  887,  612,  887,  887,  887,  612,  509,  887,
-      509,  614,  887,  614,  887,  887,  887,  614,  511,  887,
-      511,  616,  887,  616,  887,  887,  887,  616,  513,  887,
-      513,   86,  887,  887,   86,  887,   86,   86,   86,   86,
-
-       86,  669,  669,  669,  669,  669,  669,  669,  669,  669,
-      669,  669,  669,  669,  671,  887,  671,  887,  887,  887,
-      671,  578,  887,  578,  673,  887,  673,  887,  887,  887,
-      673,  580,  887,  580,  675,  887,  675,  887,  887,  887,
-      675,  582,  887,  582,  677,  887,  677,  887,  887,  887,
-      677,  584,  887,  584,  679,  887,  679,  887,  887,  887,
-      679,  586,  887,  586,  681,  887,  681,  887,  887,  887,
-      681,  588,  887,  588,  683,  887,  683,  887,  887,  887,
-      683,  590,  887,  590,   86,  887,   86,  887,  887,  887,
-       86,  592,  887,  592,  491,  887,  491,  887,  887,  887,
-
-      491,  691,  887,  691,  887,  887,  887,  691,  606,  887,
-      606,  693,  887,  693,  887,  887,  887,  693,  608,  887,
-      608,  695,  887,  695,  887,  887,  887,  695,  610,  887,
-      610,  140,  887,  140,  887,  887,  887,  140,  612,  887,
-      612,  698,  887,  698,  614,  887,  614,   86,  887,  887,
-       86,  887,   86,   86,   86,   86,   86,  616,  887,  616,
-      669,  669,  669,  669,  669,  669,  669,  669,  669,  669,
-      669,  669,  669,  737,  887,  737,  887,  887,  887,  737,
-      671,  887,  671,  204,  887,  204,  887,  887,  887,  204,
-      673,  887,  673,  740,  887,  740,  675,  887,  675,  204,
-
-      887,  887,  204,  887,  204,  204,  204,  204,  204,  677,
-      887,  677,  741,  887,  741,  679,  887,  679,  681,  887,
-      681,  742,  887,  742,  683,  887,  683,   86,  887,   86,
-      744,  887,  744,  887,  887,  887,  744,  691,  887,  691,
-      269,  887,  269,  887,  887,  887,  269,  693,  887,  693,
-      747,  887,  747,  695,  887,  695,  140,  887,  140,  748,
-      887,  748,  887,  887,  887,  748,   86,  887,  887,   86,
-      887,   86,   86,   86,   86,   86,  781,  887,  781,  737,
-      887,  737,  204,  887,  204,  782,  887,  782,  887,  887,
-      887,  782,  784,  887,  784,  887,  887,  887,  784,  786,
-
-      887,  786,  887,  887,  887,  786,  788,  887,  788,  789,
-      887,  789,  887,  887,  887,  789,  791,  887,  791,  887,
-      887,  887,  791,  812,  887,  812,  887,  887,  887,  812,
-      814,  887,  814,  887,  887,  887,  814,  816,  887,  816,
-      887,  887,  887,  816,  818,  887,  818,  887,  887,  887,
-      818,  820,  887,  820,  887,  887,  887,  820,  822,  887,
-      822,  887,  887,  887,  822,  616,  887,  616,  887,  887,
-      887,  616,  841,  887,  841,  887,  887,  887,  841,  677,
-      887,  677,  887,  887,  887,  677,  681,  887,  681,  887,
-      887,  887,  681,   86,  887,   86,  887,  887,  887,   86,
-
-      846,  887,  846,  887,  887,  887,  846,  140,  887,  140,
-      887,  887,  887,  140,  204,  887,  204,  887,  887,  887,
-      204,   11,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-
-      887,  887,  887,  887,  887,  887,  887
+      469,  680,  469,  678,  676,  674,  469,  471,  672,  471,
+      670,   87,   87,  471,  473,   87,  473,   87,   87,   87,
+      473,  348,   87,  348,  475,   87,  475,   87,   87,   87,
+      475,  350,  617,  350,  478,  615,  478,  613,  611,  609,
+      478,  354,  607,  354,  480,  502,  480,  605,  605,  594,
+
+      480,  356,  593,  356,  482,  591,  482,  483,  483,  589,
+      482,  358,  587,  358,  484,  585,  484,  583,  581,  579,
+      484,  365,   87,  365,  486,   87,  486,   87,   87,   87,
+      486,  367,   87,  367,  491,   87,  491,   87,  491,  514,
+      491,  380,  512,  380,  510,  380,  508,  380,  382,  382,
+      506,  382,  382,  382,  504,  382,  503,  490,  503,  487,
+      485,  361,  503,  505,  361,  505,  483,  481,  479,  505,
+      507,  476,  507,  474,  472,  470,  507,  392,   87,  392,
+      509,   87,  509,   87,  400,  399,  509,  394,  397,  394,
+      511,  395,  511,  393,  270,  265,  511,  396,  264,  396,
+
+      513,  389,  513,  389,  252,  379,  513,  398,  379,  398,
+       86,  240,  374,   86,  368,   86,   86,   86,   86,   86,
+      468,  468,  468,  468,  468,  468,  468,  468,  468,  468,
+      468,  468,  468,  578,  366,  578,  364,  360,  359,  578,
+      469,  357,  469,  580,  355,  580,  351,  349,  205,  580,
+      471,  201,  471,  582,   87,  582,  277,  276,  274,  582,
+      473,  270,  473,  584,  265,  584,  268,  265,  263,  584,
+      475,  262,  475,  586,  261,  586,  240,  232,   85,  586,
+      478,   85,  478,  588,   87,  588,  205,  203,   85,  588,
+      480,  122,  480,  482,  117,  482,   87,  891,   70,  482,
+
+      590,   70,  590,  891,  891,  891,  590,  484,  891,  484,
+      592,  891,  592,  891,  891,  891,  592,  486,  891,  486,
+      491,  891,  491,  891,  491,  891,  491,  382,  891,  382,
+      891,  891,  891,  382,  606,  891,  606,  891,  891,  891,
+      606,  503,  891,  503,  608,  891,  608,  891,  891,  891,
+      608,  505,  891,  505,  610,  891,  610,  891,  891,  891,
+      610,  507,  891,  507,  612,  891,  612,  891,  891,  891,
+      612,  509,  891,  509,  614,  891,  614,  891,  891,  891,
+      614,  511,  891,  511,  616,  891,  616,  891,  891,  891,
+      616,  513,  891,  513,   86,  891,  891,   86,  891,   86,
+
+       86,   86,   86,   86,  669,  669,  669,  669,  669,  669,
+      669,  669,  669,  669,  669,  669,  669,  671,  891,  671,
+      891,  891,  891,  671,  578,  891,  578,  673,  891,  673,
+      891,  891,  891,  673,  580,  891,  580,  675,  891,  675,
+      891,  891,  891,  675,  582,  891,  582,  677,  891,  677,
+      891,  891,  891,  677,  584,  891,  584,  679,  891,  679,
+      891,  891,  891,  679,  586,  891,  586,  681,  891,  681,
+      891,  891,  891,  681,  588,  891,  588,  683,  891,  683,
+      891,  891,  891,  683,  590,  891,  590,   86,  891,   86,
+      891,  891,  891,   86,  592,  891,  592,  491,  891,  491,
+
+      891,  891,  891,  491,  691,  891,  691,  891,  891,  891,
+      691,  606,  891,  606,  693,  891,  693,  891,  891,  891,
+      693,  608,  891,  608,  695,  891,  695,  891,  891,  891,
+      695,  610,  891,  610,  140,  891,  140,  891,  891,  891,
+      140,  612,  891,  612,  698,  891,  698,  614,  891,  614,
+       86,  891,  891,   86,  891,   86,   86,   86,   86,   86,
+      616,  891,  616,  669,  669,  669,  669,  669,  669,  669,
+      669,  669,  669,  669,  669,  669,  737,  891,  737,  891,
+      891,  891,  737,  671,  891,  671,  204,  891,  204,  891,
+      891,  891,  204,  673,  891,  673,  740,  891,  740,  675,
+
+      891,  675,  204,  891,  891,  204,  891,  204,  204,  204,
+      204,  204,  677,  891,  677,  741,  891,  741,  679,  891,
+      679,  681,  891,  681,  742,  891,  742,  683,  891,  683,
+       86,  891,   86,  744,  891,  744,  891,  891,  891,  744,
+      691,  891,  691,  269,  891,  269,  891,  891,  891,  269,
+      693,  891,  693,  747,  891,  747,  695,  891,  695,  140,
+      891,  140,  748,  891,  748,  891,  891,  891,  748,   86,
+      891,  891,   86,  891,   86,   86,   86,   86,   86,  782,
+      891,  782,  737,  891,  737,  204,  891,  204,  783,  891,
+      783,  891,  891,  891,  783,  785,  891,  785,  891,  891,
+
+      891,  785,  787,  891,  787,  891,  891,  891,  787,  789,
+      891,  789,  790,  891,  790,  891,  891,  891,  790,  792,
+      891,  792,  891,  891,  891,  792,  814,  891,  814,  891,
+      891,  891,  814,  816,  891,  816,  891,  891,  891,  816,
+      818,  891,  818,  891,  891,  891,  818,  820,  891,  820,
+      891,  891,  891,  820,  822,  891,  822,  891,  891,  891,
+      822,  824,  891,  824,  891,  891,  891,  824,  616,  891,
+      616,  891,  891,  891,  616,  844,  891,  844,  891,  891,
+      891,  844,  677,  891,  677,  891,  891,  891,  677,  681,
+      891,  681,  891,  891,  891,  681,   86,  891,   86,  891,
+
+      891,  891,   86,  849,  891,  849,  891,  891,  891,  849,
+      140,  891,  140,  891,  891,  891,  140,  204,  891,  204,
+      891,  891,  891,  204,   11,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891
     } ;
 
-static yyconst flex_int16_t yy_chk[2908] =
+static yyconst flex_int16_t yy_chk[2911] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -1124 +1126 @@
         5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
         5,    5,    5,    5,    5,    5,    5,    5,    5,    7,
-        8,    9,   10,   37,   37,   20,   39,    9,   10,  886,
+        8,    9,   10,   37,   37,   20,   39,    9,   10,  890,
         7,    8,   13,   13,   13,   13,   13,   13,   15,   15,
 
@@ -1135 +1137 @@
        47,   45,   45,   45,   49,   30,   30,   45,   45,   49,
        45,   30,   40,   45,   45,   40,   49,   30,   45,   56,
-       62,   45,   49,   30,   73,  885,  127,   53,  127,   51,
+       62,   45,   49,   30,   73,  889,  127,   53,  127,   51,
        61,   30,   62,   55,   30,   31,  108,   31,   31,   31,
 
@@ -1149 +1151 @@
       164,   68,   68,   59,  113,   38,   68,  116,   38,  131,
 
-      110,  131,   60,   67,   67,   67,   67,   67,   67,  877,
+      110,  131,   60,   67,   67,   67,   67,   67,   67,  881,
       142,   67,   68,   68,   68,   68,   68,   68,   80,   80,
        80,   80,   80,   80,  153,   38,   38,   77,   77,  134,
       110,  134,   77,  153,   77,  110,  135,  135,  135,   77,
-       82,   82,   82,   82,   82,   82,  876,  243,   77,   77,
+       82,   82,   82,   82,   82,   82,  880,  243,   77,   77,
        77,   77,   83,   83,   83,   83,   83,   83,  110,   77,
       103,  103,  103,  103,  103,  103,  104,  104,  104,  104,
@@ -1163 +1165 @@
        85,  166,  159,  150,   85,   85,  161,   85,  160,   85,
       145,  162,  104,  167,  168,  161,  169,  163,   85,   85,
-       85,  105,  163,  105,  105,  105,  105,  105,  105,  873,
+       85,  105,  163,  105,  105,  105,  105,  105,  105,  877,
       160,  171,  162,  162,  165,  163,  167,  169,  173,   85,
       105,  106,   85,  106,  165,  172,  106,  106,  106,  106,
@@ -1176 +1178 @@
       189,  158,  158,  188,  192,  158,  194,  158,  284,  219,
       185,  219,  158,  158,  158,  193,  158,  192,  220,  194,
-      220,  191,  198,  198,  191,  192,  205,  198,  193,  872,
+      220,  191,  198,  198,  191,  192,  205,  198,  193,  876,
       193,  197,  197,  197,  197,  197,  197,  200,  200,  197,
       248,  221,  200,  198,  198,  198,  198,  198,  198,  202,
@@ -1193 +1195 @@
       245,  245,  270,  288,  293,  286,  294,  300,  306,  293,
 
-      308,  244,  300,  306,  870,  294,  308,  244,  246,  246,
+      308,  244,  300,  306,  874,  294,  308,  244,  246,  246,
       246,  246,  246,  246,  253,  286,  288,  255,  255,  255,
       255,  255,  255,  287,  246,  247,  246,  247,  246,  246,
       247,  247,  247,  247,  247,  247,  290,  253,  287,  253,
-      869,  246,  289,  253,  287,  287,  246,  292,  246,  253,
+      873,  246,  289,  253,  287,  287,  246,  292,  246,  253,
       255,  246,  291,  246,  260,  260,  260,  260,  260,  260,
       289,  253,  290,  292,  292,  253,  295,  291,  296,  253,
@@ -1209 +1211 @@
       335,  324,  337,  339,  340,  326,  329,  328,  401,  327,
       331,  337,  334,  335,  341,  343,  332,  340,  342,  401,
-      333,  339,  341,  342,  344,  344,  345,  460,  862,  344,
+      333,  339,  341,  342,  344,  344,  345,  460,  866,  344,
       343,  344,  345,  352,  352,  352,  352,  353,  353,  353,
       353,  362,  363,  362,  363,  370,  370,  370,  370,  370,
       370,  372,  460,  372,  380,  381,  372,  372,  372,  372,
-      372,  372,  861,  402,  380,  381,  352,  371,  371,  371,
+      372,  372,  865,  402,  380,  381,  352,  371,  371,  371,
 
       371,  371,  371,  374,  374,  374,  374,  374,  374,  402,
-      380,  381,  403,  371,  404,  371,  860,  371,  371,  375,
+      380,  381,  403,  371,  404,  371,  864,  371,  371,  375,
       375,  375,  375,  375,  375,  383,  382,  403,  406,  405,
       371,  383,  407,  404,  408,  371,  374,  371,  405,  406,
@@ -1233 +1235 @@
       450,  453,  442,  444,  455,  456,  447,  457,  458,  449,
       459,  461,  463,  455,  451,  458,  454,  459,  462,  452,
-      457,  453,  466,  456,  464,  467,  462,  525,  859,  463,
+      457,  453,  466,  456,  464,  467,  462,  525,  863,  463,
       525,  468,  491,  461,  467,  464,  462,  468,  477,  477,
       477,  477,  491,  515,  466,  488,  488,  488,  488,  488,
@@ -1239 +1241 @@
       488,  490,  490,  490,  490,  490,  490,  519,  491,  521,
       515,  488,  492,  488,  492,  488,  488,  492,  492,  492,
-      492,  492,  492,  494,  516,  495,  493,  519,  488,  855,
-      851,  521,  518,  488,  490,  488,  493,  516,  488,  529,
+      492,  492,  492,  494,  516,  495,  493,  519,  488,  862,
+      858,  521,  518,  488,  490,  488,  493,  516,  488,  529,
       488,  497,  497,  497,  497,  497,  497,  518,  520,  494,
       492,  495,  493,  498,  498,  498,  498,  498,  498,  523,
-      529,  520,  526,  848,  523,  847,  528,  846,  522,  498,
+      529,  520,  526,  854,  523,  851,  528,  850,  522,  498,
       499,  498,  499,  498,  498,  499,  499,  499,  499,  499,
       499,  522,  526,  524,  527,  528,  498,  531,  530,  532,
@@ -1250 +1252 @@
       532,  535,  537,  533,  536,  538,  539,  541,  542,  547,
       535,  539,  544,  541,  538,  545,  546,  542,  547,  537,
-      550,  551,  845,  549,  534,  552,  536,  554,  560,  544,
+      550,  551,  849,  549,  534,  552,  536,  554,  560,  544,
       545,  546,  549,  551,  555,  557,  558,  550,  561,  555,
       552,  562,  554,  565,  557,  558,  564,  567,  566,  568,
       560,  561,  575,  565,  564,  566,  569,  571,  562,  574,
       572,  568,  569,  620,  619,  575,  571,  601,  601,  567,
-      572,  619,  620,  844,  843,  622,  574,  594,  594,  594,
+      572,  619,  620,  848,  847,  622,  574,  594,  594,  594,
       594,  594,  594,  595,  595,  595,  595,  595,  595,  597,
       601,  597,  622,  621,  597,  597,  597,  597,  597,  597,
 
-      600,  600,  600,  600,  600,  600,  621,  602,  626,  842,
+      600,  600,  600,  600,  600,  600,  621,  602,  626,  846,
       594,  596,  596,  596,  596,  596,  596,  603,  618,  603,
       623,  624,  603,  618,  628,  626,  625,  596,  624,  596,
@@ -1268 +1270 @@
       633,  646,  639,  637,  650,  642,  651,  656,  640,  638,
       646,  653,  657,  636,  644,  665,  656,  641,  664,  657,
-      645,  667,  668,  841,  650,  665,  700,  664,  653,  699,
-
-      667,  702,  705,  651,  714,  837,  700,  668,  686,  686,
+      645,  667,  668,  842,  650,  665,  700,  664,  653,  699,
+
+      667,  702,  705,  651,  714,  842,  700,  668,  686,  686,
       686,  686,  686,  686,  690,  690,  690,  690,  690,  690,
       699,  708,  705,  703,  686,  714,  686,  702,  686,  686,
@@ -1276 +1278 @@
       712,  686,  711,  717,  710,  718,  686,  690,  686,  712,
       720,  686,  717,  686,  713,  711,  716,  713,  719,  716,
-      721,  719,  715,  720,  722,  723,  724,  725,  721,  728,
-      731,  718,  732,  735,  722,  733,  725,  736,  723,  756,
-      757,  735,  836,  754,  756,  759,  736,  724,  755,  760,
-      731,  761,  728,  764,  732,  757,  733,  743,  743,  743,
-
-      743,  743,  743,  754,  758,  755,  760,  762,  759,  763,
-      762,  769,  766,  768,  758,  766,  768,  761,  769,  772,
-      770,  764,  763,  770,  771,  773,  778,  771,  793,  795,
-      743,  798,  797,  796,  772,  797,  799,  800,  802,  799,
-      800,  803,  804,  806,  807,  804,  810,  807,  773,  778,
-      795,  796,  809,  798,  808,  793,  802,  808,  811,  826,
-      830,  809,  810,  827,  829,  806,  828,  803,  831,  828,
-      827,  831,  832,  829,  811,  834,  835,  839,  830,  835,
-      826,  840,  838,  849,  830,  838,  839,  853,  850,  832,
-      840,  852,  849,  850,  852,  854,  856,  853,  857,  856,
-
-      854,  857,  858,  863,  864,  858,  865,  866,  867,  865,
-      868,  867,  871,  868,  874,  875,  878,  866,  879,  864,
-      880,  882,  881,  863,  883,  878,  884,  833,  825,  824,
-      875,  879,  823,  822,  871,  874,  884,  821,  820,  882,
-      819,  818,  880,  881,  817,  816,  883,  888,  888,  888,
-      888,  888,  888,  888,  888,  888,  888,  888,  888,  888,
-      889,  889,  889,  889,  889,  889,  889,  889,  889,  889,
-      889,  889,  889,  890,  890,  890,  890,  890,  890,  890,
-      890,  890,  890,  890,  890,  890,  891,  815,  814,  891,
-      813,  891,  891,  891,  891,  891,  892,  812,  805,  801,
-
-      892,  892,  892,  892,  892,  892,  893,  893,  893,  893,
-      893,  893,  893,  893,  893,  893,  893,  893,  893,  894,
-      794,  792,  894,  791,  894,  894,  894,  894,  894,  895,
-      790,  895,  895,  789,  895,  895,  895,  895,  895,  895,
-      788,  895,  896,  787,  786,  896,  896,  896,  896,  896,
-      896,  896,  896,  785,  896,  897,  897,  897,  897,  897,
-      897,  897,  897,  897,  897,  897,  897,  897,  898,  898,
-      784,  898,  783,  782,  781,  898,  899,  780,  779,  899,
-      777,  899,  899,  899,  899,  899,  900,  776,  900,  775,
-      774,  767,  900,  901,  765,  901,  753,  752,  751,  901,
-
-      902,  750,  902,  749,  748,  747,  902,  903,  746,  903,
-      745,  742,  741,  903,  904,  740,  904,  734,  730,  729,
-      904,  905,  727,  905,  726,  709,  701,  905,  906,  698,
-      906,  693,  691,  687,  906,  907,  677,  907,  673,  671,
-      669,  907,  908,  666,  908,  663,  662,  661,  908,  909,
-      909,  909,  909,  909,  909,  909,  909,  909,  909,  909,
-      909,  909,  910,  660,  910,  911,  911,  659,  911,  911,
-      911,  658,  911,  912,  912,  655,  912,  913,  654,  913,
-      652,  649,  648,  913,  914,  647,  914,  643,  616,  612,
-      914,  915,  610,  915,  608,  606,  604,  915,  916,  598,
-
-      916,  917,  592,  917,  590,  588,  586,  917,  918,  584,
-      918,  919,  582,  580,  919,  578,  919,  919,  919,  919,
-      919,  920,  920,  920,  920,  920,  920,  920,  920,  920,
-      920,  920,  920,  920,  921,  921,  921,  921,  921,  921,
-      921,  921,  921,  921,  921,  921,  921,  922,  577,  922,
-      576,  573,  570,  922,  923,  563,  923,  559,  556,  553,
-      923,  924,  548,  924,  543,  540,  517,  924,  925,  513,
-      925,  926,  511,  926,  509,  507,  505,  926,  927,  503,
-      927,  928,  502,  928,  501,  500,  489,  928,  929,  486,
-      929,  930,  484,  930,  483,  482,  480,  930,  931,  478,
-
-      931,  932,  475,  932,  473,  471,  469,  932,  933,  465,
-      933,  934,  448,  934,  446,  438,  436,  934,  935,  428,
-      935,  936,  426,  936,  424,  398,  396,  936,  937,  394,
-      937,  938,  392,  938,  391,  938,  390,  938,  939,  377,
-      939,  367,  939,  365,  939,  940,  940,  364,  940,  940,
-      940,  360,  940,  941,  358,  941,  356,  354,  350,  941,
-      942,  348,  942,  347,  346,  336,  942,  943,  321,  943,
-      298,  277,  275,  943,  944,  273,  944,  945,  272,  945,
-      271,  269,  268,  945,  946,  263,  946,  947,  259,  947,
-      258,  254,  251,  947,  948,  250,  948,  949,  239,  949,
-
-      238,  231,  230,  949,  950,  227,  950,  951,  217,  215,
-      951,  214,  951,  951,  951,  951,  951,  952,  952,  952,
-      952,  952,  952,  952,  952,  952,  952,  952,  952,  952,
-      953,  213,  953,  207,  206,  204,  953,  954,  199,  954,
-      955,  178,  955,  149,  147,  146,  955,  956,  140,  956,
-      957,  138,  957,  136,  128,  125,  957,  958,  124,  958,
-      959,  120,  959,  101,   98,   95,  959,  960,   93,  960,
-      961,   86,  961,   72,   70,   66,  961,  962,   36,  962,
-      963,   33,  963,   18,   11,    4,  963,  964,    3,  964,
-      965,    0,  965,    0,    0,    0,  965,  966,    0,  966,
-
-        0,    0,    0,  966,  967,    0,  967,  968,    0,  968,
-        0,    0,    0,  968,  969,    0,  969,  970,    0,  970,
-        0,  970,    0,  970,  971,    0,  971,    0,    0,    0,
-      971,  972,    0,  972,    0,    0,    0,  972,  973,    0,
-      973,  974,    0,  974,    0,    0,    0,  974,  975,    0,
-      975,  976,    0,  976,    0,    0,    0,  976,  977,    0,
-      977,  978,    0,  978,    0,    0,    0,  978,  979,    0,
-      979,  980,    0,  980,    0,    0,    0,  980,  981,    0,
-      981,  982,    0,  982,    0,    0,    0,  982,  983,    0,
-      983,  984,    0,    0,  984,    0,  984,  984,  984,  984,
-
-      984,  985,  985,  985,  985,  985,  985,  985,  985,  985,
-      985,  985,  985,  985,  986,    0,  986,    0,    0,    0,
-      986,  987,    0,  987,  988,    0,  988,    0,    0,    0,
-      988,  989,    0,  989,  990,    0,  990,    0,    0,    0,
-      990,  991,    0,  991,  992,    0,  992,    0,    0,    0,
-      992,  993,    0,  993,  994,    0,  994,    0,    0,    0,
-      994,  995,    0,  995,  996,    0,  996,    0,    0,    0,
-      996,  997,    0,  997,  998,    0,  998,    0,    0,    0,
-      998,  999,    0,  999, 1000,    0, 1000,    0,    0,    0,
-     1000, 1001,    0, 1001, 1002,    0, 1002,    0,    0,    0,
-
-     1002, 1003,    0, 1003,    0,    0,    0, 1003, 1004,    0,
-     1004, 1005,    0, 1005,    0,    0,    0, 1005, 1006,    0,
-     1006, 1007,    0, 1007,    0,    0,    0, 1007, 1008,    0,
-     1008, 1009,    0, 1009,    0,    0,    0, 1009, 1010,    0,
-     1010, 1011,    0, 1011, 1012,    0, 1012, 1013,    0,    0,
-     1013,    0, 1013, 1013, 1013, 1013, 1013, 1014,    0, 1014,
-     1015, 1015, 1015, 1015, 1015, 1015, 1015, 1015, 1015, 1015,
-     1015, 1015, 1015, 1016,    0, 1016,    0,    0,    0, 1016,
-     1017,    0, 1017, 1018,    0, 1018,    0,    0,    0, 1018,
-     1019,    0, 1019, 1020,    0, 1020, 1021,    0, 1021, 1022,
-
-        0,    0, 1022,    0, 1022, 1022, 1022, 1022, 1022, 1023,
-        0, 1023, 1024,    0, 1024, 1025,    0, 1025, 1026,    0,
-     1026, 1027,    0, 1027, 1028,    0, 1028, 1029,    0, 1029,
-     1030,    0, 1030,    0,    0,    0, 1030, 1031,    0, 1031,
-     1032,    0, 1032,    0,    0,    0, 1032, 1033,    0, 1033,
-     1034,    0, 1034, 1035,    0, 1035, 1036,    0, 1036, 1037,
-        0, 1037,    0,    0,    0, 1037, 1038,    0,    0, 1038,
-        0, 1038, 1038, 1038, 1038, 1038, 1039,    0, 1039, 1040,
-        0, 1040, 1041,    0, 1041, 1042,    0, 1042,    0,    0,
-        0, 1042, 1043,    0, 1043,    0,    0,    0, 1043, 1044,
-
-        0, 1044,    0,    0,    0, 1044, 1045,    0, 1045, 1046,
-        0, 1046,    0,    0,    0, 1046, 1047,    0, 1047,    0,
-        0,    0, 1047, 1048,    0, 1048,    0,    0,    0, 1048,
-     1049,    0, 1049,    0,    0,    0, 1049, 1050,    0, 1050,
-        0,    0,    0, 1050, 1051,    0, 1051,    0,    0,    0,
-     1051, 1052,    0, 1052,    0,    0,    0, 1052, 1053,    0,
-     1053,    0,    0,    0, 1053, 1054,    0, 1054,    0,    0,
-        0, 1054, 1055,    0, 1055,    0,    0,    0, 1055, 1056,
-        0, 1056,    0,    0,    0, 1056, 1057,    0, 1057,    0,
-        0,    0, 1057, 1058,    0, 1058,    0,    0,    0, 1058,
-
-     1059,    0, 1059,    0,    0,    0, 1059, 1060,    0, 1060,
-        0,    0,    0, 1060, 1061,    0, 1061,    0,    0,    0,
-     1061,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-      887,  887,  887,  887,  887,  887,  887,  887,  887,  887,
-
-      887,  887,  887,  887,  887,  887,  887
+      721,  719,  715,  720,  722,  723,  724,  725,  721,  731,
+      728,  718,  732,  735,  722,  733,  725,  736,  723,  756,
+      757,  735,  758,  754,  756,  759,  736,  724,  728,  731,
+      755,  761,  758,  728,  732,  757,  733,  743,  743,  743,
+
+      743,  743,  743,  754,  760,  763,  762,  755,  759,  762,
+      764,  766,  768,  769,  766,  768,  770,  761,  763,  770,
+      769,  760,  771,  773,  772,  771,  775,  779,  794,  797,
+      743,  796,  798,  800,  799,  798,  800,  801,  764,  772,
+      801,  803,  804,  807,  810,  805,  773,  797,  805,  775,
+      779,  808,  796,  810,  808,  794,  799,  809,  811,  803,
+      809,  812,  813,  828,  829,  807,  830,  831,  804,  830,
+      832,  829,  812,  834,  811,  856,  831,  833,  813,  837,
+      833,  875,  837,  840,  828,  856,  840,  841,  832,  843,
+      834,  852,  853,  867,  832,  868,  841,  853,  843,  855,
+
+      852,  857,  855,  875,  859,  860,  857,  859,  860,  861,
+      868,  869,  861,  867,  869,  870,  871,  872,  878,  871,
+      872,  879,  882,  884,  883,  870,  885,  887,  886,  845,
+      888,  882,  844,  839,  838,  836,  879,  883,  835,  878,
+      888,  827,  826,  825,  824,  884,  886,  885,  823,  887,
+      892,  892,  892,  892,  892,  892,  892,  892,  892,  892,
+      892,  892,  892,  893,  893,  893,  893,  893,  893,  893,
+      893,  893,  893,  893,  893,  893,  894,  894,  894,  894,
+      894,  894,  894,  894,  894,  894,  894,  894,  894,  895,
+      822,  821,  895,  820,  895,  895,  895,  895,  895,  896,
+
+      819,  818,  817,  896,  896,  896,  896,  896,  896,  897,
+      897,  897,  897,  897,  897,  897,  897,  897,  897,  897,
+      897,  897,  898,  816,  815,  898,  814,  898,  898,  898,
+      898,  898,  899,  806,  899,  899,  802,  899,  899,  899,
+      899,  899,  899,  795,  899,  900,  793,  792,  900,  900,
+      900,  900,  900,  900,  900,  900,  791,  900,  901,  901,
+      901,  901,  901,  901,  901,  901,  901,  901,  901,  901,
+      901,  902,  902,  790,  902,  789,  788,  787,  902,  903,
+      786,  785,  903,  784,  903,  903,  903,  903,  903,  904,
+      783,  904,  782,  781,  780,  904,  905,  778,  905,  777,
+
+      776,  774,  905,  906,  767,  906,  765,  753,  752,  906,
+      907,  751,  907,  750,  749,  748,  907,  908,  747,  908,
+      746,  745,  742,  908,  909,  741,  909,  740,  734,  730,
+      909,  910,  729,  910,  727,  726,  709,  910,  911,  701,
+      911,  698,  693,  691,  911,  912,  687,  912,  677,  673,
+      671,  912,  913,  913,  913,  913,  913,  913,  913,  913,
+      913,  913,  913,  913,  913,  914,  669,  914,  915,  915,
+      666,  915,  915,  915,  663,  915,  916,  916,  662,  916,
+      917,  661,  917,  660,  659,  658,  917,  918,  655,  918,
+      654,  652,  649,  918,  919,  648,  919,  647,  643,  616,
+
+      919,  920,  612,  920,  921,  610,  921,  608,  606,  604,
+      921,  922,  598,  922,  923,  592,  590,  923,  588,  923,
+      923,  923,  923,  923,  924,  924,  924,  924,  924,  924,
+      924,  924,  924,  924,  924,  924,  924,  925,  925,  925,
+      925,  925,  925,  925,  925,  925,  925,  925,  925,  925,
+      926,  586,  926,  584,  582,  580,  926,  927,  578,  927,
+      577,  576,  573,  927,  928,  570,  928,  563,  559,  556,
+      928,  929,  553,  929,  930,  548,  930,  543,  540,  517,
+      930,  931,  513,  931,  932,  511,  932,  509,  507,  505,
+      932,  933,  503,  933,  934,  502,  934,  501,  500,  489,
+
+      934,  935,  486,  935,  936,  484,  936,  483,  482,  480,
+      936,  937,  478,  937,  938,  475,  938,  473,  471,  469,
+      938,  939,  465,  939,  940,  448,  940,  446,  438,  436,
+      940,  941,  428,  941,  942,  426,  942,  424,  942,  398,
+      942,  943,  396,  943,  394,  943,  392,  943,  944,  944,
+      391,  944,  944,  944,  390,  944,  945,  377,  945,  367,
+      365,  364,  945,  946,  360,  946,  358,  356,  354,  946,
+      947,  350,  947,  348,  347,  346,  947,  948,  336,  948,
+      949,  321,  949,  298,  277,  275,  949,  950,  273,  950,
+      951,  272,  951,  271,  269,  268,  951,  952,  263,  952,
+
+      953,  259,  953,  258,  254,  251,  953,  954,  250,  954,
+      955,  239,  238,  955,  231,  955,  955,  955,  955,  955,
+      956,  956,  956,  956,  956,  956,  956,  956,  956,  956,
+      956,  956,  956,  957,  230,  957,  227,  217,  215,  957,
+      958,  214,  958,  959,  213,  959,  207,  206,  204,  959,
+      960,  199,  960,  961,  178,  961,  149,  147,  146,  961,
+      962,  140,  962,  963,  138,  963,  136,  128,  125,  963,
+      964,  124,  964,  965,  120,  965,  101,   98,   95,  965,
+      966,   93,  966,  967,   86,  967,   72,   70,   66,  967,
+      968,   36,  968,  969,   33,  969,   18,   11,    4,  969,
+
+      970,    3,  970,    0,    0,    0,  970,  971,    0,  971,
+      972,    0,  972,    0,    0,    0,  972,  973,    0,  973,
+      974,    0,  974,    0,  974,    0,  974,  975,    0,  975,
+        0,    0,    0,  975,  976,    0,  976,    0,    0,    0,
+      976,  977,    0,  977,  978,    0,  978,    0,    0,    0,
+      978,  979,    0,  979,  980,    0,  980,    0,    0,    0,
+      980,  981,    0,  981,  982,    0,  982,    0,    0,    0,
+      982,  983,    0,  983,  984,    0,  984,    0,    0,    0,
+      984,  985,    0,  985,  986,    0,  986,    0,    0,    0,
+      986,  987,    0,  987,  988,    0,    0,  988,    0,  988,
+
+      988,  988,  988,  988,  989,  989,  989,  989,  989,  989,
+      989,  989,  989,  989,  989,  989,  989,  990,    0,  990,
+        0,    0,    0,  990,  991,    0,  991,  992,    0,  992,
+        0,    0,    0,  992,  993,    0,  993,  994,    0,  994,
+        0,    0,    0,  994,  995,    0,  995,  996,    0,  996,
+        0,    0,    0,  996,  997,    0,  997,  998,    0,  998,
+        0,    0,    0,  998,  999,    0,  999, 1000,    0, 1000,
+        0,    0,    0, 1000, 1001,    0, 1001, 1002,    0, 1002,
+        0,    0,    0, 1002, 1003,    0, 1003, 1004,    0, 1004,
+        0,    0,    0, 1004, 1005,    0, 1005, 1006,    0, 1006,
+
+        0,    0,    0, 1006, 1007,    0, 1007,    0,    0,    0,
+     1007, 1008,    0, 1008, 1009,    0, 1009,    0,    0,    0,
+     1009, 1010,    0, 1010, 1011,    0, 1011,    0,    0,    0,
+     1011, 1012,    0, 1012, 1013,    0, 1013,    0,    0,    0,
+     1013, 1014,    0, 1014, 1015,    0, 1015, 1016,    0, 1016,
+     1017,    0,    0, 1017,    0, 1017, 1017, 1017, 1017, 1017,
+     1018,    0, 1018, 1019, 1019, 1019, 1019, 1019, 1019, 1019,
+     1019, 1019, 1019, 1019, 1019, 1019, 1020,    0, 1020,    0,
+        0,    0, 1020, 1021,    0, 1021, 1022,    0, 1022,    0,
+        0,    0, 1022, 1023,    0, 1023, 1024,    0, 1024, 1025,
+
+        0, 1025, 1026,    0,    0, 1026,    0, 1026, 1026, 1026,
+     1026, 1026, 1027,    0, 1027, 1028,    0, 1028, 1029,    0,
+     1029, 1030,    0, 1030, 1031,    0, 1031, 1032,    0, 1032,
+     1033,    0, 1033, 1034,    0, 1034,    0,    0,    0, 1034,
+     1035,    0, 1035, 1036,    0, 1036,    0,    0,    0, 1036,
+     1037,    0, 1037, 1038,    0, 1038, 1039,    0, 1039, 1040,
+        0, 1040, 1041,    0, 1041,    0,    0,    0, 1041, 1042,
+        0,    0, 1042,    0, 1042, 1042, 1042, 1042, 1042, 1043,
+        0, 1043, 1044,    0, 1044, 1045,    0, 1045, 1046,    0,
+     1046,    0,    0,    0, 1046, 1047,    0, 1047,    0,    0,
+
+        0, 1047, 1048,    0, 1048,    0,    0,    0, 1048, 1049,
+        0, 1049, 1050,    0, 1050,    0,    0,    0, 1050, 1051,
+        0, 1051,    0,    0,    0, 1051, 1052,    0, 1052,    0,
+        0,    0, 1052, 1053,    0, 1053,    0,    0,    0, 1053,
+     1054,    0, 1054,    0,    0,    0, 1054, 1055,    0, 1055,
+        0,    0,    0, 1055, 1056,    0, 1056,    0,    0,    0,
+     1056, 1057,    0, 1057,    0,    0,    0, 1057, 1058,    0,
+     1058,    0,    0,    0, 1058, 1059,    0, 1059,    0,    0,
+        0, 1059, 1060,    0, 1060,    0,    0,    0, 1060, 1061,
+        0, 1061,    0,    0,    0, 1061, 1062,    0, 1062,    0,
+
+        0,    0, 1062, 1063,    0, 1063,    0,    0,    0, 1063,
+     1064,    0, 1064,    0,    0,    0, 1064, 1065,    0, 1065,
+        0,    0,    0, 1065,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891,
+
+      891,  891,  891,  891,  891,  891,  891,  891,  891,  891
     } ;
 
 /* Table of booleans, true if rule could match eol. */
-static yyconst flex_int32_t yy_rule_can_match_eol[181] =
+static yyconst flex_int32_t yy_rule_can_match_eol[182] =
     {   0,
 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -1435 +1437 @@
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 
-    0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 
+    1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0,     };
+    0, 0,     };
 
 static yy_state_type yy_last_accepting_state;
@@ -1466 +1468 @@
  * Author           : Peter A. Buhr
  * Created On       : Sat Sep 22 08:58:10 2001
- * Last Modified By : Peter A. Buhr
- * Last Modified On : Thu Jun 23 07:29:30 2016
- * Update Count     : 457
+ * Last Modified By : 
+ * Last Modified On : Sun Jul 31 07:19:36 2016
+ * Update Count     : 459
  */
 #line 20 "lex.ll"
@@ -1529 +1531 @@
 
 
-#line 1532 "Parser/lex.cc"
+#line 1534 "Parser/lex.cc"
 
 #define INITIAL 0
@@ -1724 +1726 @@
 
                                    /* line directives */
-#line 1727 "Parser/lex.cc"
+#line 1729 "Parser/lex.cc"
 
         if ( !(yy_init) )
@@ -1778 +1780 @@
                                 {
                                 yy_current_state = (int) yy_def[yy_current_state];
-                                if ( yy_current_state >= 888 )
+                                if ( yy_current_state >= 892 )
                                         yy_c = yy_meta[(unsigned int) yy_c];
                                 }
@@ -1784 +1786 @@
                         ++yy_cp;
                         }
-                while ( yy_base[yy_current_state] != 2822 );
+                while ( yy_base[yy_current_state] != 2825 );
 
 yy_find_action:
@@ -2081 +2083 @@
 YY_RULE_SETUP
 #line 216 "lex.ll"
+{ KEYWORD_RETURN(FALLTHRU); }                   // CFA
+        YY_BREAK
+case 48:
+YY_RULE_SETUP
+#line 217 "lex.ll"
 { KEYWORD_RETURN(FINALLY); }                    // CFA
         YY_BREAK
-case 48:
-YY_RULE_SETUP
-#line 217 "lex.ll"
+case 49:
+YY_RULE_SETUP
+#line 218 "lex.ll"
 { KEYWORD_RETURN(FLOAT); }
         YY_BREAK
-case 49:
-YY_RULE_SETUP
-#line 218 "lex.ll"
+case 50:
+YY_RULE_SETUP
+#line 219 "lex.ll"
 { KEYWORD_RETURN(FLOAT); }                              // GCC
         YY_BREAK
-case 50:
-YY_RULE_SETUP
-#line 219 "lex.ll"
+case 51:
+YY_RULE_SETUP
+#line 220 "lex.ll"
 { KEYWORD_RETURN(FOR); }
         YY_BREAK
-case 51:
-YY_RULE_SETUP
-#line 220 "lex.ll"
+case 52:
+YY_RULE_SETUP
+#line 221 "lex.ll"
 { KEYWORD_RETURN(FORALL); }                             // CFA
         YY_BREAK
-case 52:
-YY_RULE_SETUP
-#line 221 "lex.ll"
+case 53:
+YY_RULE_SETUP
+#line 222 "lex.ll"
 { KEYWORD_RETURN(FORTRAN); }
         YY_BREAK
-case 53:
-YY_RULE_SETUP
-#line 222 "lex.ll"
+case 54:
+YY_RULE_SETUP
+#line 223 "lex.ll"
 { KEYWORD_RETURN(FTYPE); }                              // CFA
         YY_BREAK
-case 54:
-YY_RULE_SETUP
-#line 223 "lex.ll"
+case 55:
+YY_RULE_SETUP
+#line 224 "lex.ll"
 { KEYWORD_RETURN(GENERIC); }                    // C11
         YY_BREAK
-case 55:
-YY_RULE_SETUP
-#line 224 "lex.ll"
+case 56:
+YY_RULE_SETUP
+#line 225 "lex.ll"
 { KEYWORD_RETURN(GOTO); }
         YY_BREAK
-case 56:
-YY_RULE_SETUP
-#line 225 "lex.ll"
+case 57:
+YY_RULE_SETUP
+#line 226 "lex.ll"
 { KEYWORD_RETURN(IF); }
         YY_BREAK
-case 57:
-YY_RULE_SETUP
-#line 226 "lex.ll"
+case 58:
+YY_RULE_SETUP
+#line 227 "lex.ll"
 { KEYWORD_RETURN(IMAGINARY); }                  // C99
-        YY_BREAK
-case 58:
-YY_RULE_SETUP
-#line 227 "lex.ll"
-{ KEYWORD_RETURN(IMAGINARY); }                  // GCC
         YY_BREAK
 case 59:
@@ -2146 +2148 @@
 YY_RULE_SETUP
 #line 229 "lex.ll"
+{ KEYWORD_RETURN(IMAGINARY); }                  // GCC
+        YY_BREAK
+case 61:
+YY_RULE_SETUP
+#line 230 "lex.ll"
 { KEYWORD_RETURN(INLINE); }                             // C99
-        YY_BREAK
-case 61:
-YY_RULE_SETUP
-#line 230 "lex.ll"
-{ KEYWORD_RETURN(INLINE); }                             // GCC
         YY_BREAK
 case 62:
@@ -2161 +2163 @@
 YY_RULE_SETUP
 #line 232 "lex.ll"
+{ KEYWORD_RETURN(INLINE); }                             // GCC
+        YY_BREAK
+case 64:
+YY_RULE_SETUP
+#line 233 "lex.ll"
 { KEYWORD_RETURN(INT); }
         YY_BREAK
-case 64:
-YY_RULE_SETUP
-#line 233 "lex.ll"
+case 65:
+YY_RULE_SETUP
+#line 234 "lex.ll"
 { KEYWORD_RETURN(INT); }                                // GCC
         YY_BREAK
-case 65:
-YY_RULE_SETUP
-#line 234 "lex.ll"
+case 66:
+YY_RULE_SETUP
+#line 235 "lex.ll"
 { KEYWORD_RETURN(LABEL); }                              // GCC
         YY_BREAK
-case 66:
-YY_RULE_SETUP
-#line 235 "lex.ll"
+case 67:
+YY_RULE_SETUP
+#line 236 "lex.ll"
 { KEYWORD_RETURN(LONG); }
         YY_BREAK
-case 67:
-YY_RULE_SETUP
-#line 236 "lex.ll"
+case 68:
+YY_RULE_SETUP
+#line 237 "lex.ll"
 { KEYWORD_RETURN(LVALUE); }                             // CFA
         YY_BREAK
-case 68:
-YY_RULE_SETUP
-#line 237 "lex.ll"
+case 69:
+YY_RULE_SETUP
+#line 238 "lex.ll"
 { KEYWORD_RETURN(NORETURN); }                   // C11
         YY_BREAK
-case 69:
-YY_RULE_SETUP
-#line 238 "lex.ll"
+case 70:
+YY_RULE_SETUP
+#line 239 "lex.ll"
 { KEYWORD_RETURN(OFFSETOF); }           // GCC
         YY_BREAK
-case 70:
-YY_RULE_SETUP
-#line 239 "lex.ll"
+case 71:
+YY_RULE_SETUP
+#line 240 "lex.ll"
 { KEYWORD_RETURN(OTYPE); }                              // CFA
         YY_BREAK
-case 71:
-YY_RULE_SETUP
-#line 240 "lex.ll"
+case 72:
+YY_RULE_SETUP
+#line 241 "lex.ll"
 { KEYWORD_RETURN(REGISTER); }
         YY_BREAK
-case 72:
-YY_RULE_SETUP
-#line 241 "lex.ll"
+case 73:
+YY_RULE_SETUP
+#line 242 "lex.ll"
 { KEYWORD_RETURN(RESTRICT); }                   // C99
-        YY_BREAK
-case 73:
-YY_RULE_SETUP
-#line 242 "lex.ll"
-{ KEYWORD_RETURN(RESTRICT); }                   // GCC
         YY_BREAK
 case 74:
@@ -2221 +2223 @@
 YY_RULE_SETUP
 #line 244 "lex.ll"
+{ KEYWORD_RETURN(RESTRICT); }                   // GCC
+        YY_BREAK
+case 76:
+YY_RULE_SETUP
+#line 245 "lex.ll"
 { KEYWORD_RETURN(RETURN); }
         YY_BREAK
-case 76:
-YY_RULE_SETUP
-#line 245 "lex.ll"
+case 77:
+YY_RULE_SETUP
+#line 246 "lex.ll"
 { KEYWORD_RETURN(SHORT); }
         YY_BREAK
-case 77:
-YY_RULE_SETUP
-#line 246 "lex.ll"
+case 78:
+YY_RULE_SETUP
+#line 247 "lex.ll"
 { KEYWORD_RETURN(SIGNED); }
-        YY_BREAK
-case 78:
-YY_RULE_SETUP
-#line 247 "lex.ll"
-{ KEYWORD_RETURN(SIGNED); }                             // GCC
         YY_BREAK
 case 79:
@@ -2246 +2248 @@
 YY_RULE_SETUP
 #line 249 "lex.ll"
+{ KEYWORD_RETURN(SIGNED); }                             // GCC
+        YY_BREAK
+case 81:
+YY_RULE_SETUP
+#line 250 "lex.ll"
 { KEYWORD_RETURN(SIZEOF); }
         YY_BREAK
-case 81:
-YY_RULE_SETUP
-#line 250 "lex.ll"
+case 82:
+YY_RULE_SETUP
+#line 251 "lex.ll"
 { KEYWORD_RETURN(STATIC); }
         YY_BREAK
-case 82:
-YY_RULE_SETUP
-#line 251 "lex.ll"
+case 83:
+YY_RULE_SETUP
+#line 252 "lex.ll"
 { KEYWORD_RETURN(STATICASSERT); }               // C11
         YY_BREAK
-case 83:
-YY_RULE_SETUP
-#line 252 "lex.ll"
+case 84:
+YY_RULE_SETUP
+#line 253 "lex.ll"
 { KEYWORD_RETURN(STRUCT); }
         YY_BREAK
-case 84:
-YY_RULE_SETUP
-#line 253 "lex.ll"
+case 85:
+YY_RULE_SETUP
+#line 254 "lex.ll"
 { KEYWORD_RETURN(SWITCH); }
         YY_BREAK
-case 85:
-YY_RULE_SETUP
-#line 254 "lex.ll"
+case 86:
+YY_RULE_SETUP
+#line 255 "lex.ll"
 { KEYWORD_RETURN(THREADLOCAL); }                // C11
         YY_BREAK
-case 86:
-YY_RULE_SETUP
-#line 255 "lex.ll"
+case 87:
+YY_RULE_SETUP
+#line 256 "lex.ll"
 { KEYWORD_RETURN(THROW); }                              // CFA
         YY_BREAK
-case 87:
-YY_RULE_SETUP
-#line 256 "lex.ll"
+case 88:
+YY_RULE_SETUP
+#line 257 "lex.ll"
 { KEYWORD_RETURN(THROWRESUME); }                // CFA
         YY_BREAK
-case 88:
-YY_RULE_SETUP
-#line 257 "lex.ll"
+case 89:
+YY_RULE_SETUP
+#line 258 "lex.ll"
 { KEYWORD_RETURN(TRAIT); }                              // CFA
         YY_BREAK
-case 89:
-YY_RULE_SETUP
-#line 258 "lex.ll"
+case 90:
+YY_RULE_SETUP
+#line 259 "lex.ll"
 { KEYWORD_RETURN(TRY); }                                // CFA
         YY_BREAK
-case 90:
-YY_RULE_SETUP
-#line 259 "lex.ll"
+case 91:
+YY_RULE_SETUP
+#line 260 "lex.ll"
 { KEYWORD_RETURN(TYPEDEF); }
-        YY_BREAK
-case 91:
-YY_RULE_SETUP
-#line 260 "lex.ll"
-{ KEYWORD_RETURN(TYPEOF); }                             // GCC
         YY_BREAK
 case 92:
@@ -2316 +2318 @@
 YY_RULE_SETUP
 #line 263 "lex.ll"
+{ KEYWORD_RETURN(TYPEOF); }                             // GCC
+        YY_BREAK
+case 95:
+YY_RULE_SETUP
+#line 264 "lex.ll"
 { KEYWORD_RETURN(UNION); }
         YY_BREAK
-case 95:
-YY_RULE_SETUP
-#line 264 "lex.ll"
+case 96:
+YY_RULE_SETUP
+#line 265 "lex.ll"
 { KEYWORD_RETURN(UNSIGNED); }
         YY_BREAK
-case 96:
-YY_RULE_SETUP
-#line 265 "lex.ll"
+case 97:
+YY_RULE_SETUP
+#line 266 "lex.ll"
 { KEYWORD_RETURN(VALIST); }                     // GCC
         YY_BREAK
-case 97:
-YY_RULE_SETUP
-#line 266 "lex.ll"
+case 98:
+YY_RULE_SETUP
+#line 267 "lex.ll"
 { KEYWORD_RETURN(VOID); }
         YY_BREAK
-case 98:
-YY_RULE_SETUP
-#line 267 "lex.ll"
+case 99:
+YY_RULE_SETUP
+#line 268 "lex.ll"
 { KEYWORD_RETURN(VOLATILE); }
-        YY_BREAK
-case 99:
-YY_RULE_SETUP
-#line 268 "lex.ll"
-{ KEYWORD_RETURN(VOLATILE); }                   // GCC
         YY_BREAK
 case 100:
@@ -2351 +2353 @@
 YY_RULE_SETUP
 #line 270 "lex.ll"
+{ KEYWORD_RETURN(VOLATILE); }                   // GCC
+        YY_BREAK
+case 102:
+YY_RULE_SETUP
+#line 271 "lex.ll"
 { KEYWORD_RETURN(WHILE); }
         YY_BREAK
 /* identifier */
-case 102:
-YY_RULE_SETUP
-#line 273 "lex.ll"
+case 103:
+YY_RULE_SETUP
+#line 274 "lex.ll"
 { IDENTIFIER_RETURN(); }
         YY_BREAK
-case 103:
-YY_RULE_SETUP
-#line 274 "lex.ll"
+case 104:
+YY_RULE_SETUP
+#line 275 "lex.ll"
 { ATTRIBUTE_RETURN(); }
         YY_BREAK
-case 104:
-YY_RULE_SETUP
-#line 275 "lex.ll"
+case 105:
+YY_RULE_SETUP
+#line 276 "lex.ll"
 { BEGIN BKQUOTE; }
         YY_BREAK
-case 105:
-YY_RULE_SETUP
-#line 276 "lex.ll"
+case 106:
+YY_RULE_SETUP
+#line 277 "lex.ll"
 { IDENTIFIER_RETURN(); }
         YY_BREAK
-case 106:
-YY_RULE_SETUP
-#line 277 "lex.ll"
+case 107:
+YY_RULE_SETUP
+#line 278 "lex.ll"
 { BEGIN 0; }
         YY_BREAK
 /* numeric constants */
-case 107:
-YY_RULE_SETUP
-#line 280 "lex.ll"
+case 108:
+YY_RULE_SETUP
+#line 281 "lex.ll"
 { NUMERIC_RETURN(ZERO); }                               // CFA
         YY_BREAK
-case 108:
-YY_RULE_SETUP
-#line 281 "lex.ll"
+case 109:
+YY_RULE_SETUP
+#line 282 "lex.ll"
 { NUMERIC_RETURN(ONE); }                                // CFA
-        YY_BREAK
-case 109:
-YY_RULE_SETUP
-#line 282 "lex.ll"
-{ NUMERIC_RETURN(INTEGERconstant); }
         YY_BREAK
 case 110:
@@ -2408 +2410 @@
 YY_RULE_SETUP
 #line 285 "lex.ll"
-{ NUMERIC_RETURN(FLOATINGconstant); }
+{ NUMERIC_RETURN(INTEGERconstant); }
         YY_BREAK
 case 113:
@@ -2415 +2417 @@
 { NUMERIC_RETURN(FLOATINGconstant); }
         YY_BREAK
+case 114:
+YY_RULE_SETUP
+#line 287 "lex.ll"
+{ NUMERIC_RETURN(FLOATINGconstant); }
+        YY_BREAK
 /* character constant, allows empty value */
-case 114:
-YY_RULE_SETUP
-#line 289 "lex.ll"
+case 115:
+YY_RULE_SETUP
+#line 290 "lex.ll"
 { BEGIN QUOTE; rm_underscore(); strtext = new std::string; *strtext += std::string( yytext ); }
         YY_BREAK
-case 115:
-YY_RULE_SETUP
-#line 290 "lex.ll"
+case 116:
+YY_RULE_SETUP
+#line 291 "lex.ll"
 { *strtext += std::string( yytext ); }
         YY_BREAK
-case 116:
-/* rule 116 can match eol */
-YY_RULE_SETUP
-#line 291 "lex.ll"
+case 117:
+/* rule 117 can match eol */
+YY_RULE_SETUP
+#line 292 "lex.ll"
 { BEGIN 0; *strtext += std::string( yytext); RETURN_STR(CHARACTERconstant); }
         YY_BREAK
 /* ' stop highlighting */
 /* string constant */
-case 117:
-YY_RULE_SETUP
-#line 295 "lex.ll"
+case 118:
+YY_RULE_SETUP
+#line 296 "lex.ll"
 { BEGIN STRING; rm_underscore(); strtext = new std::string; *strtext += std::string( yytext ); }
         YY_BREAK
-case 118:
-YY_RULE_SETUP
-#line 296 "lex.ll"
+case 119:
+YY_RULE_SETUP
+#line 297 "lex.ll"
 { *strtext += std::string( yytext ); }
         YY_BREAK
-case 119:
-/* rule 119 can match eol */
-YY_RULE_SETUP
-#line 297 "lex.ll"
+case 120:
+/* rule 120 can match eol */
+YY_RULE_SETUP
+#line 298 "lex.ll"
 { BEGIN 0; *strtext += std::string( yytext ); RETURN_STR(STRINGliteral); }
         YY_BREAK
 /* " stop highlighting */
 /* common character/string constant */
-case 120:
-YY_RULE_SETUP
-#line 301 "lex.ll"
+case 121:
+YY_RULE_SETUP
+#line 302 "lex.ll"
 { rm_underscore(); *strtext += std::string( yytext ); }
         YY_BREAK
-case 121:
-/* rule 121 can match eol */
-YY_RULE_SETUP
-#line 302 "lex.ll"
+case 122:
+/* rule 122 can match eol */
+YY_RULE_SETUP
+#line 303 "lex.ll"
 {}                                              // continuation (ALSO HANDLED BY CPP)
         YY_BREAK
-case 122:
-YY_RULE_SETUP
-#line 303 "lex.ll"
+case 123:
+YY_RULE_SETUP
+#line 304 "lex.ll"
 { *strtext += std::string( yytext ); } // unknown escape character
         YY_BREAK
 /* punctuation */
-case 123:
-YY_RULE_SETUP
-#line 306 "lex.ll"
-{ ASCIIOP_RETURN(); }
-        YY_BREAK
 case 124:
 YY_RULE_SETUP
@@ -2502 +2504 @@
 YY_RULE_SETUP
 #line 312 "lex.ll"
+{ ASCIIOP_RETURN(); }
+        YY_BREAK
+case 130:
+YY_RULE_SETUP
+#line 313 "lex.ll"
 { ASCIIOP_RETURN(); }                                   // also operator
-        YY_BREAK
-case 130:
-YY_RULE_SETUP
-#line 313 "lex.ll"
-{ ASCIIOP_RETURN(); }
         YY_BREAK
 case 131:
@@ -2517 +2519 @@
 YY_RULE_SETUP
 #line 315 "lex.ll"
+{ ASCIIOP_RETURN(); }
+        YY_BREAK
+case 133:
+YY_RULE_SETUP
+#line 316 "lex.ll"
 { ASCIIOP_RETURN(); }                                   // also operator
         YY_BREAK
-case 133:
-YY_RULE_SETUP
-#line 316 "lex.ll"
+case 134:
+YY_RULE_SETUP
+#line 317 "lex.ll"
 { NAMEDOP_RETURN(ELLIPSIS); }
         YY_BREAK
 /* alternative C99 brackets, "<:" & "<:<:" handled by preprocessor */
-case 134:
-YY_RULE_SETUP
-#line 319 "lex.ll"
+case 135:
+YY_RULE_SETUP
+#line 320 "lex.ll"
 { RETURN_VAL('['); }
         YY_BREAK
-case 135:
-YY_RULE_SETUP
-#line 320 "lex.ll"
+case 136:
+YY_RULE_SETUP
+#line 321 "lex.ll"
 { RETURN_VAL(']'); }
         YY_BREAK
-case 136:
-YY_RULE_SETUP
-#line 321 "lex.ll"
+case 137:
+YY_RULE_SETUP
+#line 322 "lex.ll"
 { RETURN_VAL('{'); }
         YY_BREAK
-case 137:
-YY_RULE_SETUP
-#line 322 "lex.ll"
+case 138:
+YY_RULE_SETUP
+#line 323 "lex.ll"
 { RETURN_VAL('}'); }
         YY_BREAK
 /* operators */
-case 138:
-YY_RULE_SETUP
-#line 325 "lex.ll"
-{ ASCIIOP_RETURN(); }
-        YY_BREAK
 case 139:
 YY_RULE_SETUP
@@ -2618 +2620 @@
 case 152:
 YY_RULE_SETUP
-#line 340 "lex.ll"
+#line 339 "lex.ll"
+{ ASCIIOP_RETURN(); }
+        YY_BREAK
+case 153:
+YY_RULE_SETUP
+#line 341 "lex.ll"
 { NAMEDOP_RETURN(ICR); }
         YY_BREAK
-case 153:
-YY_RULE_SETUP
-#line 341 "lex.ll"
+case 154:
+YY_RULE_SETUP
+#line 342 "lex.ll"
 { NAMEDOP_RETURN(DECR); }
         YY_BREAK
-case 154:
-YY_RULE_SETUP
-#line 342 "lex.ll"
+case 155:
+YY_RULE_SETUP
+#line 343 "lex.ll"
 { NAMEDOP_RETURN(EQ); }
         YY_BREAK
-case 155:
-YY_RULE_SETUP
-#line 343 "lex.ll"
+case 156:
+YY_RULE_SETUP
+#line 344 "lex.ll"
 { NAMEDOP_RETURN(NE); }
         YY_BREAK
-case 156:
-YY_RULE_SETUP
-#line 344 "lex.ll"
+case 157:
+YY_RULE_SETUP
+#line 345 "lex.ll"
 { NAMEDOP_RETURN(LS); }
         YY_BREAK
-case 157:
-YY_RULE_SETUP
-#line 345 "lex.ll"
+case 158:
+YY_RULE_SETUP
+#line 346 "lex.ll"
 { NAMEDOP_RETURN(RS); }
         YY_BREAK
-case 158:
-YY_RULE_SETUP
-#line 346 "lex.ll"
+case 159:
+YY_RULE_SETUP
+#line 347 "lex.ll"
 { NAMEDOP_RETURN(LE); }
         YY_BREAK
-case 159:
-YY_RULE_SETUP
-#line 347 "lex.ll"
+case 160:
+YY_RULE_SETUP
+#line 348 "lex.ll"
 { NAMEDOP_RETURN(GE); }
         YY_BREAK
-case 160:
-YY_RULE_SETUP
-#line 348 "lex.ll"
+case 161:
+YY_RULE_SETUP
+#line 349 "lex.ll"
 { NAMEDOP_RETURN(ANDAND); }
         YY_BREAK
-case 161:
-YY_RULE_SETUP
-#line 349 "lex.ll"
+case 162:
+YY_RULE_SETUP
+#line 350 "lex.ll"
 { NAMEDOP_RETURN(OROR); }
         YY_BREAK
-case 162:
-YY_RULE_SETUP
-#line 350 "lex.ll"
+case 163:
+YY_RULE_SETUP
+#line 351 "lex.ll"
 { NAMEDOP_RETURN(ARROW); }
         YY_BREAK
-case 163:
-YY_RULE_SETUP
-#line 351 "lex.ll"
+case 164:
+YY_RULE_SETUP
+#line 352 "lex.ll"
 { NAMEDOP_RETURN(PLUSassign); }
         YY_BREAK
-case 164:
-YY_RULE_SETUP
-#line 352 "lex.ll"
+case 165:
+YY_RULE_SETUP
+#line 353 "lex.ll"
 { NAMEDOP_RETURN(MINUSassign); }
         YY_BREAK
-case 165:
-YY_RULE_SETUP
-#line 353 "lex.ll"
+case 166:
+YY_RULE_SETUP
+#line 354 "lex.ll"
 { NAMEDOP_RETURN(MULTassign); }
         YY_BREAK
-case 166:
-YY_RULE_SETUP
-#line 354 "lex.ll"
+case 167:
+YY_RULE_SETUP
+#line 355 "lex.ll"
 { NAMEDOP_RETURN(DIVassign); }
         YY_BREAK
-case 167:
-YY_RULE_SETUP
-#line 355 "lex.ll"
+case 168:
+YY_RULE_SETUP
+#line 356 "lex.ll"
 { NAMEDOP_RETURN(MODassign); }
         YY_BREAK
-case 168:
-YY_RULE_SETUP
-#line 356 "lex.ll"
+case 169:
+YY_RULE_SETUP
+#line 357 "lex.ll"
 { NAMEDOP_RETURN(ANDassign); }
         YY_BREAK
-case 169:
-YY_RULE_SETUP
-#line 357 "lex.ll"
+case 170:
+YY_RULE_SETUP
+#line 358 "lex.ll"
 { NAMEDOP_RETURN(ORassign); }
         YY_BREAK
-case 170:
-YY_RULE_SETUP
-#line 358 "lex.ll"
+case 171:
+YY_RULE_SETUP
+#line 359 "lex.ll"
 { NAMEDOP_RETURN(ERassign); }
         YY_BREAK
-case 171:
-YY_RULE_SETUP
-#line 359 "lex.ll"
+case 172:
+YY_RULE_SETUP
+#line 360 "lex.ll"
 { NAMEDOP_RETURN(LSassign); }
         YY_BREAK
-case 172:
-YY_RULE_SETUP
-#line 360 "lex.ll"
+case 173:
+YY_RULE_SETUP
+#line 361 "lex.ll"
 { NAMEDOP_RETURN(RSassign); }
         YY_BREAK
-case 173:
-YY_RULE_SETUP
-#line 362 "lex.ll"
-{ NAMEDOP_RETURN(ATassign); }
+case 174:
+YY_RULE_SETUP
+#line 363 "lex.ll"
+{ NAMEDOP_RETURN(ATassign); }                   // CFA
         YY_BREAK
 /* CFA, operator identifier */
-case 174:
-YY_RULE_SETUP
-#line 365 "lex.ll"
+case 175:
+YY_RULE_SETUP
+#line 366 "lex.ll"
 { IDENTIFIER_RETURN(); }                                // unary
-        YY_BREAK
-case 175:
-YY_RULE_SETUP
-#line 366 "lex.ll"
-{ IDENTIFIER_RETURN(); }
         YY_BREAK
 case 176:
@@ -2745 +2747 @@
 YY_RULE_SETUP
 #line 368 "lex.ll"
+{ IDENTIFIER_RETURN(); }
+        YY_BREAK
+case 178:
+YY_RULE_SETUP
+#line 369 "lex.ll"
 { IDENTIFIER_RETURN(); }                // binary
         YY_BREAK
@@ -2773 +2780 @@
           an argument list.
         */
-case 178:
-YY_RULE_SETUP
-#line 395 "lex.ll"
+case 179:
+YY_RULE_SETUP
+#line 396 "lex.ll"
 {
         // 1 or 2 character unary operator ?
@@ -2788 +2795 @@
         YY_BREAK
 /* unknown characters */
-case 179:
-YY_RULE_SETUP
-#line 407 "lex.ll"
+case 180:
+YY_RULE_SETUP
+#line 408 "lex.ll"
 { printf("unknown character(s):\"%s\" on line %d\n", yytext, yylineno); }
         YY_BREAK
-case 180:
-YY_RULE_SETUP
-#line 409 "lex.ll"
+case 181:
+YY_RULE_SETUP
+#line 410 "lex.ll"
 ECHO;
         YY_BREAK
-#line 2801 "Parser/lex.cc"
+#line 2808 "Parser/lex.cc"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(COMMENT):
@@ -3095 +3102 @@
                         {
                         yy_current_state = (int) yy_def[yy_current_state];
-                        if ( yy_current_state >= 888 )
+                        if ( yy_current_state >= 892 )
                                 yy_c = yy_meta[(unsigned int) yy_c];
                         }
@@ -3123 +3130 @@
                 {
                 yy_current_state = (int) yy_def[yy_current_state];
-                if ( yy_current_state >= 888 )
+                if ( yy_current_state >= 892 )
                         yy_c = yy_meta[(unsigned int) yy_c];
                 }
         yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-        yy_is_jam = (yy_current_state == 887);
+        yy_is_jam = (yy_current_state == 891);
 
         return yy_is_jam ? 0 : yy_current_state;
@@ -3773 +3780 @@
 #define YYTABLES_NAME "yytables"
 
-#line 409 "lex.ll"
+#line 410 "lex.ll"
 
 

src/Parser/lex.ll

@@ -9 +9 @@
  * Author           : Peter A. Buhr
  * Created On       : Sat Sep 22 08:58:10 2001
- * Last Modified By : Peter A. Buhr
- * Last Modified On : Thu Jun 23 07:29:30 2016
- * Update Count     : 457
+ * Last Modified By : 
+ * Last Modified On : Sun Jul 31 07:19:36 2016
+ * Update Count     : 459
  */
 
@@ -213 +213 @@
 __extension__   { KEYWORD_RETURN(EXTENSION); }                  // GCC
 extern                  { KEYWORD_RETURN(EXTERN); }
+fallthrough             { KEYWORD_RETURN(FALLTHRU); }                   // CFA
 fallthru                { KEYWORD_RETURN(FALLTHRU); }                   // CFA
 finally                 { KEYWORD_RETURN(FINALLY); }                    // CFA
@@ -360 +361 @@
 ">>="                   { NAMEDOP_RETURN(RSassign); }
 
-"@="                    { NAMEDOP_RETURN(ATassign); }
+"@="                    { NAMEDOP_RETURN(ATassign); }                   // CFA
 
                                 /* CFA, operator identifier */

src/tests/switch.c

@@ -10 +10 @@
 // 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
+// Last Modified On : Sat Jul 30 14:41:32 2016
+// Update Count     : 30
 // 
 
@@ -33 +33 @@
         } // switch
 
-        // switch (3 ) {
-        //      int j;
-        //   case 3:
-        //      break;
-        //   case 4:
-        //      j = 0;
-        // }
+        switch ( 3 ) {
+                int j;
+          case 3:
+                break;
+          case 4:
+                j = 0;
+        }
 
         switch ( i ) {
@@ -49 +49 @@
           default:
                 i = 3;
-          case 3:
+          case 19:
           case 'A' ... 'Z':
-          case 5 ... 6:
-          case 2, 4:
+          case 1 ... 6:
+          case 20, 30:
                 j = 3;
                 f( 3 );
@@ -78 +78 @@
                 struct S { int i; };
                 S s;
-          case 3:
+          case 19:
           case 'A' ... 'Z':
-          case 5 ... 6:
-          case 2, 4, 7:
+          case 0 ... 6:
+          case 20, 30, 40:
                 i = 3;
                 f( 3 );

src/tests/test.py

@@ -33 +33 @@
 def listTests():
         machineType = getMachineType()
-
-        print(machineType)
 
         # tests directly in the .expect folder will always be processed