Changeset 579263a

.gitignore

re4d829b	r579263a
13	13	libcfa/Makefile
14	14	src/Makefile
15		version
	15	/version
16	16
17	17	# genereted by premake

configure

-                      re4d829b
+                      r579263a
 ac_config_files="$ac_config_files Makefile src/driver/Makefile src/Makefile src/benchmark/Makefile src/examples/Makefile src/tests/Makefile src/prelude/Makefile src/libcfa/Makefile"
+ac_config_files="$ac_config_files Makefile src/driver/Makefile src/Makefile src/benchmark/Makefile src/examples/Makefile src/tests/Makefile src/tests/preempt_longrun/Makefile src/prelude/Makefile src/libcfa/Makefile"
 …
     "src/examples/Makefile") CONFIG_FILES="$CONFIG_FILES src/examples/Makefile" ;;
     "src/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/tests/Makefile" ;;
+    "src/tests/preempt_longrun/Makefile") CONFIG_FILES="$CONFIG_FILES src/tests/preempt_longrun/Makefile" ;;
     "src/prelude/Makefile") CONFIG_FILES="$CONFIG_FILES src/prelude/Makefile" ;;
     "src/libcfa/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcfa/Makefile" ;;

configure.ac

re4d829b	r579263a
235	235	src/examples/Makefile
236	236	src/tests/Makefile
	237	src/tests/preempt_longrun/Makefile
237	238	src/prelude/Makefile
238	239	src/libcfa/Makefile

doc/LaTeXmacros/common.tex

-                      re4d829b
+                      r579263a
 %% Created On       : Sat Apr  9 10:06:17 2016
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Mon May 15 18:03:29 2017
 %% Update Count     : 302
+%% Last Modified On : Sun Jun 18 20:32:32 2017
+%% Update Count     : 319
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 …
 % Names used in the document.
+\newcommand{\CFA}{\textrm{C}\raisebox{\depth}{\rotatebox{180}{\textsf{A}}}\xspace} % Cforall symbolic name
+\newcommand{\CFAIcon}{\textrm{C}\raisebox{\depth}{\rotatebox{180}{\textsf{A}}}\xspace} % Cforall symbolic name
+\newcommand{\CFA}{\protect\CFAIcon} % safe for section/caption
 \newcommand{\CFL}{\textrm{Cforall}\xspace} % Cforall symbolic name
 \newcommand{\Celeven}{\textrm{C11}\xspace} % C11 symbolic name
 …
 belowskip=3pt,
 % replace/adjust listing characters that look bad in sanserif
 literate={-}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.8ex}{0.075ex}}}}1 {^}{\raisebox{0.6ex}{$\scriptscriptstyle\land\,$}}1
+literate={-}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.8ex}{0.1ex}}}}1 {^}{\raisebox{0.6ex}{$\scriptscriptstyle\land\,$}}1
         {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1
+        {__}{\_\,\_}2 {<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2 {->}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.8ex}{0.075ex}}}\kern-0.2ex\textgreater}2
+        {___}{\_\,\_\,\_}3,
+        {<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2 {->}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.8ex}{0.075ex}}}\kern-0.2ex\textgreater}2,
 moredelim=**[is][\color{red}]{®}{®},                                    % red highlighting ®...® (registered trademark symbol) emacs: C-q M-.
 moredelim=**[is][\color{blue}]{ß}{ß},                                   % blue highlighting ß...ß (sharp s symbol) emacs: C-q M-_

doc/proposals/concurrency/Makefile

re4d829b	r579263a
13	13	annex/glossary \
14	14	text/intro \
	15	text/cforall \
15	16	text/basics \
16	17	text/concurrency \

doc/proposals/concurrency/build/bump_ver.sh

-                      re4d829b
+                      r579263a
 #!/bin/bash
 if [ ! -f build/version ]; then
     echo "0.0.0" > build/version
+if [ ! -f version ]; then
+    echo "0.0.0" > version
 fi
 sed -r 's/([0-9]+\.[0-9]+.)([0-9]+)/echo "\1\$((\2+1))" > version/ge' build/version > /dev/null
+sed -r 's/([0-9]+\.[0-9]+.)([0-9]+)/echo "\1\$((\2+1))" > version/ge' version > /dev/null

doc/proposals/concurrency/text/basics.tex

-                      re4d829b
+                      r579263a
 \section{Basics of concurrency}
 At its core, concurrency is based on having multiple call stacks and potentially multiple threads of execution for these stacks. Concurrency alone without parallelism only requires having multiple call stacks (or contexts) for a single thread of execution and switching between these call stacks on a regular basis. A minimal concurrency product can be achieved by creating coroutines which instead of context switching between each other, always ask an oracle where to context switch next. While coroutines do not technically require a stack, stackfull coroutines are the closest abstraction to a practical "naked"" call stack. When writing concurrency in terms of coroutines, the oracle effectively becomes a scheduler and the whole system now follows a cooperative threading model \cit. The oracle/scheduler can either be a stackless or stackfull entity and correspondingly require one or two context switches to run a different coroutine but in any case a subset of concurrency related challenges start to appear. For the complete set of concurrency challenges to be present, the only feature missing is preemption. Indeed, concurrency challenges appear with the lack of determinism. Guaranteeing mutual-exclusion or synchronisation are simply ways of limiting the lack of determinism in the system. A scheduler introduces order of execution uncertainty while preemption introduces incertainty about when context-switches occur. Now it is important to understand that uncertainty is not necessarily undesireable, uncertainty can often be used by systems to significantly increase performance and is often the basis of giving the user the illusion that hundred of tasks are running in parallel. Optimal performance in concurrent applications is often obtained by having as little determinism as correctness will allow\cit.
+At its core, concurrency is based on having call-stacks and potentially multiple threads of execution for these stacks. Concurrency without parallelism only requires having multiple call stacks (or contexts) for a single thread of execution, and switching between these call stacks on a regular basis. A minimal concurrency product can be achieved by creating coroutines, which instead of context switching between each other, always ask an oracle where to context switch next. While coroutines do not technically require a stack, stackfull coroutines are the closest abstraction to a practical "naked"" call stack. When writing concurrency in terms of coroutines, the oracle effectively becomes a scheduler and the whole system now follows a cooperative threading-model \cit. The oracle/scheduler can either be a stackless or stackfull entity and correspondingly require one or two context switches to run a different coroutine. In any case, a subset of concurrency related challenges start to appear. For the complete set of concurrency challenges to occur, the only feature missing is preemption. Indeed, concurrency challenges appear with non-determinism. Guaranteeing mutual-exclusion or synchronisation are simply ways of limiting the lack of determinism in a system. A scheduler introduces order of execution uncertainty, while preemption introduces incertainty about where context-switches occur. Now it is important to understand that uncertainty is not necessarily undesireable; uncertainty can often be used by systems to significantly increase performance and is often the basis of giving a user the illusion that tasks are running in parallel. Optimal performance in concurrent applications is often obtained by having as much non-determinism as correctness allows\cit.
 \section{\protect\CFA 's Thread Building Blocks}
+% As a system-level language, \CFA should offer both performance and flexibilty as its primary goals, simplicity and user-friendliness being a secondary concern. Therefore, the core of parallelism in \CFA should prioritize power and efficiency. With this said, deconstructing popular paradigms in order to get simple building blocks yields \glspl{uthread} as the core parallelism block. \Glspl{pool} and other parallelism paradigms can then be built on top of the underlying threading model.
+One of the important features that is missing to C is threading. On modern architectures, the lack of threading is becoming less and less forgivable\cite{Sutter05, Sutter05b} and therefore any modern programming language should have the proper tools to allow users to write performant concurrent and/or parallel programs. As an extension of C, \CFA needs to express these concepts an a way that is as natural as possible to programmers used to imperative languages. And being a system level language means programmers will expect to be able to choose precisely which features they need and which cost they are willing to pay.
+\section{Coroutines A stepping stone}\label{coroutine}
+While the main focus of this proposal is concurrency and parallelism, as mentionned above it is important to adress coroutines which are actually a significant underlying aspect of the concurrency system. Indeed, while having nothing todo with parallelism and arguably little to do with concurrency, coroutines need to deal with context-switchs and and other context management operations. Therefore, this proposal includes coroutines both as an intermediate step for the implementation of threads and a first class feature of \CFA. Furthermore, many design challenges of threads are at least partially present in designing coroutines, which makes the design effort that much more relevant. The core API of coroutines revolve around two features independent call stacks and \code{suspend}/\code{resume}.
+One of the important features that is missing in C is threading. On modern architectures, a lack of threading is becoming less and less forgivable\cite{Sutter05, Sutter05b}, and therefore modern programming languages must have the proper tools to allow users to write performant concurrent and/or parallel programs. As an extension of C, \CFA needs to express these concepts in a way that is as natural as possible to programmers used to imperative languages. And being a system-level language means programmers expect to choose precisely which features they need and which cost they are willing to pay.
+\section{Coroutines: A stepping stone}\label{coroutine}
+While the main focus of this proposal is concurrency and parallelism, as mentionned above it is important to adress coroutines, which are actually a significant underlying aspect of a concurrency system. Indeed, while having nothing todo with parallelism and arguably little to do with concurrency, coroutines need to deal with context-switchs and and other context-management operations. Therefore, this proposal includes coroutines both as an intermediate step for the implementation of threads, and a first class feature of \CFA. Furthermore, many design challenges of threads are at least partially present in designing coroutines, which makes the design effort that much more relevant. The core API of coroutines revolve around two features: independent call stacks and \code{suspend}/\code{resume}.
 Here is an example of a solution to the fibonnaci problem using \CFA coroutines:
 …
+        }
+        // main automacically called on first resume
         void main(Fibonacci* this) {
                 int fn1, fn2;           // retained between resumes
 …
 \subsection{Construction}
 One important design challenge for coroutines and threads (shown in section \ref{threads}) is that the runtime system needs to run some code after the user-constructor runs. In the case of the coroutines this challenge is simpler since there is no loss of determinism brough by preemption or scheduling, however, the underlying challenge remains the same for coroutines and threads.
 The runtime system needs to create the coroutine's stack and more importantly prepare it for the first resumption. The timing of the creation is non trivial since users both expect to have fully constructed objects once execution enters the coroutine main and to be able to resume the coroutine from the constructor (Obviously we only solve cases where these two statements don't conflict). There are several solutions to this problem but the chosen options effectively forces the design of the coroutine.
 Furthermore, \CFA faces an extra challenge which is that polymorphique routines rely on invisible thunks when casted to non-polymorphic routines and these thunks have function scope. For example, the following code, while looking benign, can run into undefined behaviour because of thunks:
+One important design challenge for coroutines and threads (shown in section \ref{threads}) is that the runtime system needs to run code after the user-constructor runs. In the case of coroutines, this challenge is simpler since there is no non-determinism from preemption or scheduling. However, the underlying challenge remains the same for coroutines and threads.
+The runtime system needs to create the coroutine's stack and more importantly prepare it for the first resumption. The timing of the creation is non-trivial since users both expect to have fully constructed objects once execution enters the coroutine main and to be able to resume the coroutine from the constructor. Like for regular objects, constructors can still leak coroutines before they are ready. There are several solutions to this problem but the chosen options effectively forces the design of the coroutine.
+Furthermore, \CFA faces an extra challenge as polymorphic routines create invisible thunks when casted to non-polymorphic routines and these thunks have function scope. For example, the following code, while looking benign, can run into undefined behaviour because of thunks:
 \begin{cfacode}
 …
+}
 \end{cfacode}
 Indeed, the generated C code\footnote{Code trimmed down for brevity} shows that a local thunk is created in order to hold type information:
+The generated C code\footnote{Code trimmed down for brevity} creates a local thunk to hold type information:
 \begin{ccode}
 …
+}
 \end{ccode}
 The problem in the this example is that there is a race condition between the start of the execution of \code{noop} on the other thread and the stack frame of \code{bar} being destroyed. This extra challenge limits which solutions are viable because storing the function pointer for too long only increases the chances that the race will end in undefined behavior; i.e. the stack based thunk being destroyed before it was used.
+The problem in this example is a race condition between the start of the execution of \code{noop} on the other thread and the stack frame of \code{bar} being destroyed. This extra challenge limits which solutions are viable because storing the function pointer for too long only increases the chances that the race will end in undefined behavior; i.e. the stack based thunk being destroyed before it was used. This challenge is an extension of challenges that come with second-class routines. Indeed, GCC nested routines also have the limitation that the routines cannot be passed outside of the scope of the functions these were declared in. The case of coroutines and threads is simply an extension of this problem to multiple call-stacks.
 \subsection{Alternative: Composition}
 One solution to this challenge would be to use inheritence,
+One solution to this challenge would be to use composition/containement,
 \begin{cfacode}
         struct Fibonacci {
               int fn; // used for communication
               coroutine c;
+              coroutine c; //composition
         };
 …
+        }
 \end{cfacode}
+There are two downsides to this approach. The first, which is relatively minor, is that the base class needs to be made aware of the main routine pointer, regardless of whether we use a parameter or a virtual pointer, this means the coroutine data must be made larger to store a value that is actually a compile time constant (The address of the main routine). The second problem which is both subtle but significant, is that now users can get the initialisation order of there coroutines wrong. Indeed, every field of a \CFA struct will be constructed but in the order of declaration, unless users explicitly write otherwise. This means that users who forget to initialize a the coroutine at the right time may resume the coroutine with an uninitilized object. For coroutines, this is unlikely to be a problem, for threads however, this is a significant problem.
+There are two downsides to this approach. The first, which is relatively minor, is that the base class needs to be made aware of the main routine pointer, regardless of whether a parameter or a virtual pointer is used, this means the coroutine data must be made larger to store a value that is actually a compile time constant (address of the main routine). The second problem, which is both subtle and significant, is that now users can get the initialisation order of there coroutines wrong. Indeed, every field of a \CFA struct is constructed but in declaration order, unless users explicitly write otherwise. This semantics means that users who forget to initialize a the coroutine may resume the coroutine with an uninitilized object. For coroutines, this is unlikely to be a problem, for threads however, this is a significant problem.
 \subsection{Alternative: Reserved keyword}
 …
         };
 \end{cfacode}
 This mean the compiler can solve problems by injecting code where needed. The downside of this approach is that it makes coroutine a special case in the language. Users who would want to extend coroutines or build their own for various reasons can only do so in ways offered by the language. Furthermore, implementing coroutines without language supports also displays the power of \CFA.
 While this is ultimately the option used for idiomatic \CFA code, coroutines and threads can both be constructed by users without using the language support. The reserved keywords are only present to improve ease of use for the common cases.
 …
 \subsection{Alternative: Lamda Objects}
+For coroutines as for threads, many implementations are based on routine pointers or function objects\cit. For example, Boost implements coroutines in terms of four functor object types \code{asymmetric_coroutine<>::pull_type}, \code{asymmetric_coroutine<>::push_type}, \code{symmetric_coroutine<>::call_type}, \code{symmetric_coroutine<>::yield_type}. Often, the canonical threading paradigm in languages is based on function pointers, pthread being one of the most well known example. The main problem of these approach is that the thread usage is limited to a generic handle that must otherwise be wrapped in a custom type. Since the custom type is simple to write and \CFA and solves several issues, added support for routine/lambda based coroutines adds very little.
+\subsection{Trait based coroutines}
+Finally the underlying approach, which is the one closest to \CFA idioms, is to use trait-based lazy coroutines. This approach defines a coroutine as \say{anything that \say{satisfies the trait \code{is_coroutine} and is used as a coroutine} is a coroutine}.
+For coroutines as for threads, many implementations are based on routine pointers or function objects\cit. For example, Boost implements coroutines in terms of four functor object types:
+\begin{cfacode}
+asymmetric_coroutine<>::pull_type
+asymmetric_coroutine<>::push_type
+symmetric_coroutine<>::call_type
+symmetric_coroutine<>::yield_type
+\end{cfacode}
+Often, the canonical threading paradigm in languages is based on function pointers, pthread being one of the most well known examples. The main problem of this approach is that the thread usage is limited to a generic handle that must otherwise be wrapped in a custom type. Since the custom type is simple to write in \CFA and solves several issues, added support for routine/lambda based coroutines adds very little.
+A variation of this would be to use an simple function pointer in the same way pthread does for threads :
+\begin{cfacode}
+void foo( coroutine_t cid, void * arg ) {
+        int * value = (int *)arg;
+        //Coroutine body
+}
+int main() {
+        int value = 0;
+        coroutine_t cid = coroutine_create( &foo, (void*)&value );
+        coroutine_resume( &cid );
+}
+\end{cfacode}
+This semantic is more common for thread interfaces than coroutines but would work equally well. As discussed in section \ref{threads}, this approach is superseeded by static approaches in terms of expressivity.
+\subsection{Alternative: Trait-based coroutines}
+Finally the underlying approach, which is the one closest to \CFA idioms, is to use trait-based lazy coroutines. This approach defines a coroutine as anything that satisfies the trait \code{is_coroutine} and is used as a coroutine is a coroutine.
 \begin{cfacode}
 …
 };
 \end{cfacode}
+This entails that an object is not a coroutine until \code{resume} (or \code{prime}) is called on the object. Correspondingly, any object that is passed to \code{resume} is a coroutine since it must satisfy the \code{is_coroutine} trait to compile. The advantage of this approach is that users can easily create different types of coroutines, for example, changing the memory foot print of a coroutine is trivial when implementing the \code{get_coroutine} routine. The \CFA keyword \code{coroutine} only has the effect of implementing the getter and forward declarations required for users to only have to implement the main routine.
+This ensures an object is not a coroutine until \code{resume} (or \code{prime}) is called on the object. Correspondingly, any object that is passed to \code{resume} is a coroutine since it must satisfy the \code{is_coroutine} trait to compile. The advantage of this approach is that users can easily create different types of coroutines, for example, changing the memory foot print of a coroutine is trivial when implementing the \code{get_coroutine} routine. The \CFA keyword \code{coroutine} only has the effect of implementing the getter and forward declarations required for users to only have to implement the main routine.
+\begin{center}
+\begin{tabular}{c c c}
+\begin{cfacode}[tabsize=3]
+coroutine MyCoroutine {
+        int someValue;
+};
+\end{cfacode} & == & \begin{cfacode}[tabsize=3]
+struct MyCoroutine {
+        int someValue;
+        coroutine_desc __cor;
+};
+static inline
+coroutine_desc * get_coroutine(
+        struct MyCoroutine * this
+) {
+        return &this->__cor;
+}
+void main(struct MyCoroutine * this);
+\end{cfacode}
+\end{tabular}
+\end{center}
 \section{Thread Interface}\label{threads}
 The basic building blocks of multi-threading in \CFA are \glspl{cfathread}. By default these are implemented as \glspl{uthread}, and as such, offer a flexible and lightweight threading interface (lightweight compared to \glspl{kthread}). A thread can be declared using a SUE declaration \code{thread} as follows:
+The basic building blocks of multi-threading in \CFA are \glspl{cfathread}. Both use and kernel threads are supported, where user threads are the concurrency mechanism and kernel threads are the parallel mechanism. User threads offer a flexible and lightweight interface. A thread can be declared using a struct declaration \code{thread} as follows:
 \begin{cfacode}
 …
 \end{cfacode}
 Like for coroutines, the keyword is a thin wrapper arount a \CFA trait:
+As for coroutines, the keyword is a thin wrapper arount a \CFA trait:
 \begin{cfacode}
 …
 \end{cfacode}
 In this example, threads of type \code{foo} will start there execution in the \code{void main(foo*)} routine which in this case prints \code{"Hello World!"}. While this proposoal encourages this approach which enforces strongly type programming, users may prefer to use the routine based thread semantics for the sake of simplicity. With these semantics it is trivial to write a thread type that takes a function pointer as parameter and executes it on its stack asynchronously
+In this example, threads of type \code{foo} start execution in the \code{void main(foo*)} routine which prints \code{"Hello World!"}. While this proposoal encourages this approach to enforce strongly-typed programming, users may prefer to use the routine based thread semantics for the sake of simplicity. With these semantics it is trivial to write a thread type that takes a function pointer as parameter and executes it on its stack asynchronously
 \begin{cfacode}
         typedef void (*voidFunc)(void);
 …
 void main() {
         World w;
         //Thread run forks here
         //Printing "Hello " and "World!" will be run concurrently
+        //Thread forks here
+        //Printing "Hello " and "World!" are run concurrently
         sout | "Hello " | endl;
 …
 \end{cfacode}
+This semantic has several advantages over explicit semantics typesafety is guaranteed, a thread is always started and stopped exaclty once and users cannot make any progamming errors. However, one of the apparent drawbacks of this system is that threads now always form a lattice, that is they are always destroyed in opposite order of construction. While this seems like a significant limitation, existing \CFA semantics can solve this problem. Indeed, using dynamic allocation to create threads will naturally let threads outlive the scope in which the thread was created much like dynamically allocating memory will let objects outlive the scope in which thy were created
+This semantic has several advantages over explicit semantics typesafety is guaranteed, a thread is always started and stopped exaclty once and users cannot make any progamming errors. Another advantage of this semantic is that it naturally scale to multiple threads meaning basic synchronisation is very simple
+\begin{cfacode}
+        thread MyThread {
+                //...
+        };
+        //main
+        void main(MyThread* this) {
+                //...
+        }
+        void foo() {
+                MyThread thrds[10];
+                //Start 10 threads at the beginning of the scope
+                DoStuff();
+                //Wait for the 10 threads to finish
+        }
+\end{cfacode}
+However, one of the apparent drawbacks of this system is that threads now always form a lattice, that is they are always destroyed in opposite order of construction because of block structure. However, storage allocation os not limited to blocks; dynamic allocation can create threads that outlive the scope in which the thread is created much like dynamically allocating memory lets objects outlive the scope in which they are created
 \begin{cfacode}
 …
+        }
 \end{cfacode}
-Another advantage of this semantic is that it naturally scale to multiple threads meaning basic synchronisation is very simple
-\begin{cfacode}
-        thread MyThread {
-                //...
-        };
-        //main
-        void main(MyThread* this) {
-                //...
+        }
-        void foo() {
-                MyThread thrds[10];
-                //Start 10 threads at the beginning of the scope
-                DoStuff();
-                //Wait for the 10 threads to finish
+        }
-\end{cfacode}

doc/proposals/concurrency/text/concurrency.tex

-                      re4d829b
+                      r579263a
 % ======================================================================
 % ======================================================================
+Several tool can be used to solve concurrency challenges. Since many of these challenges appear with the use of mutable shared-state, some languages and libraries simply disallow mutable shared-state (Erlang~\cite{Erlang}, Haskell~\cite{Haskell}, Akka (Scala)~\cite{Akka}). In these paradigms, interaction among concurrent objects relies on message passing~\cite{Thoth,Harmony,V-Kernel} or other paradigms that closely relate to networking concepts (channels\cit for example). However, in languages that use routine calls as their core abstraction-mechanism, these approaches force a clear distinction between concurrent and non-concurrent paradigms (i.e., message passing versus routine call). This distinction in turn means that, in order to be effective, programmers need to learn two sets of designs patterns. This distinction can be hidden away in library code, effective use of the librairy still has to take both paradigms into account. Approaches based on shared memory are more closely related to non-concurrent paradigms since they often rely on basic constructs like routine calls and shared objects. At a lower level, non-concurrent paradigms are often implemented as locks and atomic operations. Many such mechanisms have been proposed, including semaphores~\cite{Dijkstra68b} and path expressions~\cite{Campbell74}. However, for productivity reasons it is desireable to have a higher-level construct be the core concurrency paradigm~\cite{HPP:Study}. An approach that is worth mentionning because it is gaining in popularity is transactionnal memory~\cite{Dice10}[Check citation]. While this approach is even pursued by system languages like \CC\cit, the performance and feature set is currently too restrictive to add such a paradigm to a language like C or \CC\cit, which is why it was rejected as the core paradigm for concurrency in \CFA. One of the most natural, elegant, and efficient mechanisms for synchronization and communication, especially for shared memory systems, is the \emph{monitor}. Monitors were first proposed by Brinch Hansen~\cite{Hansen73} and later described and extended by C.A.R.~Hoare~\cite{Hoare74}. Many programming languages---e.g., Concurrent Pascal~\cite{ConcurrentPascal}, Mesa~\cite{Mesa}, Modula~\cite{Modula-2}, Turing~\cite{Turing:old}, Modula-3~\cite{Modula-3}, NeWS~\cite{NeWS}, Emerald~\cite{Emerald}, \uC~\cite{Buhr92a} and Java~\cite{Java}---provide monitors as explicit language constructs. In addition, operating-system kernels and device drivers have a monitor-like structure, although they often use lower-level primitives such as semaphores or locks to simulate monitors. For these reasons, this project proposes monitors as the core concurrency-construct.
+Several tool can be used to solve concurrency challenges. Since many of these challenges appear with the use of mutable shared-state, some languages and libraries simply disallow mutable shared-state (Erlang~\cite{Erlang}, Haskell~\cite{Haskell}, Akka (Scala)~\cite{Akka}). In these paradigms, interaction among concurrent objects relies on message passing~\cite{Thoth,Harmony,V-Kernel} or other paradigms that closely relate to networking concepts (channels\cit for example). However, in languages that use routine calls as their core abstraction-mechanism, these approaches force a clear distinction between concurrent and non-concurrent paradigms (i.e., message passing versus routine call). This distinction in turn means that, in order to be effective, programmers need to learn two sets of designs patterns. While this distinction can be hidden away in library code, effective use of the librairy still has to take both paradigms into account.
+Approaches based on shared memory are more closely related to non-concurrent paradigms since they often rely on basic constructs like routine calls and shared objects. At the lowest level, concurrent paradigms are implemented as atomic operations and locks. Many such mechanisms have been proposed, including semaphores~\cite{Dijkstra68b} and path expressions~\cite{Campbell74}. However, for productivity reasons it is desireable to have a higher-level construct be the core concurrency paradigm~\cite{HPP:Study}.
+An approach that is worth mentionning because it is gaining in popularity is transactionnal memory~\cite{Dice10}[Check citation]. While this approach is even pursued by system languages like \CC\cit, the performance and feature set is currently too restrictive to be the main concurrency paradigm for general purpose language, which is why it was rejected as the core paradigm for concurrency in \CFA.
+One of the most natural, elegant, and efficient mechanisms for synchronization and communication, especially for shared memory systems, is the \emph{monitor}. Monitors were first proposed by Brinch Hansen~\cite{Hansen73} and later described and extended by C.A.R.~Hoare~\cite{Hoare74}. Many programming languages---e.g., Concurrent Pascal~\cite{ConcurrentPascal}, Mesa~\cite{Mesa}, Modula~\cite{Modula-2}, Turing~\cite{Turing:old}, Modula-3~\cite{Modula-3}, NeWS~\cite{NeWS}, Emerald~\cite{Emerald}, \uC~\cite{Buhr92a} and Java~\cite{Java}---provide monitors as explicit language constructs. In addition, operating-system kernels and device drivers have a monitor-like structure, although they often use lower-level primitives such as semaphores or locks to simulate monitors. For these reasons, this project proposes monitors as the core concurrency-construct.
 \section{Basics}
 The basic features that concurrency tools neet to offer is support for mutual-exclusion and synchronisation. Mutual-exclusion is the concept that only a fixed number of threads can access a critical section at any given time, where a critical section is the group of instructions on an associated portion of data that requires the limited access. On the other hand, synchronization enforces relative ordering of execution and synchronization tools are used to guarantee that event \textit{X} always happens before \textit{Y}.
+Non-determinism requires concurrent systems to offer support for mutual-exclusion and synchronisation. Mutual-exclusion is the concept that only a fixed number of threads can access a critical section at any given time, where a critical section is a group of instructions on an associated portion of data that requires the restricted access. On the other hand, synchronization enforces relative ordering of execution and synchronization tools numerous mechanisms to establish timing relationships among threads.
 \subsection{Mutual-Exclusion}
 As mentionned above, mutual-exclusion is the guarantee that only a fix number of threads can enter a critical section at once. However, many solution exists for mutual exclusion which vary in terms of performance, flexibility and ease of use. Methods range from low level locks, which are fast and flexible but require significant attention to be correct, to  higher level mutual-exclusion methods, which sacrifice some performance in order to improve ease of use. Often by either guaranteeing some problems cannot occur (e.g. being deadlock free) or by offering a more explicit coupling between data and corresponding critical section. For example, the \CC \code{std::atomic<T>} which offer an easy way to express mutual-exclusion on a restricted set of features (.e.g: reading/writing large types atomically). Another challenge with low level locks is composability. Locks are said to not be composable because it takes careful organising for multiple locks to be used and once while preventing deadlocks. Easing composability is another feature higher-level mutual-exclusion mechanisms often offer.
+As mentionned above, mutual-exclusion is the guarantee that only a fix number of threads can enter a critical section at once. However, many solution exists for mutual exclusion which vary in terms of performance, flexibility and ease of use. Methods range from low-level locks, which are fast and flexible but require significant attention to be correct, to  higher-level mutual-exclusion methods, which sacrifice some performance in order to improve ease of use. Ease of use comes by either guaranteeing some problems cannot occur (e.g., being deadlock free) or by offering a more explicit coupling between data and corresponding critical section. For example, the \CC \code{std::atomic<T>} which offer an easy way to express mutual-exclusion on a restricted set of operations (.e.g: reading/writing large types atomically). Another challenge with low-level locks is composability. Locks are not composable because it takes careful organising for multiple locks to be used while preventing deadlocks. Easing composability is another feature higher-level mutual-exclusion mechanisms often offer.
 \subsection{Synchronization}
 As for mutual-exclusion, low level synchronisation primitive often offer great performance and good flexibility at the cost of ease of use. Again, higher-level mechanism often simplify usage by adding better coupling between synchronization and data, for example message passing, or offering simple solution to otherwise involved challenges. An example of this is barging. As mentionned above synchronization can be expressed as guaranteeing that event \textit{X} always happens before \textit{Y}. Most of the time synchronisation happens around a critical section, where threads most acquire said critical section in a certain order. However, it may also be desired to be able to guarantee that event \textit{Z} does not occur between \textit{X} and \textit{Y}. This is called barging, where event \textit{X} tries to effect event \textit{Y} but anoter thread races to grab the critical section and emits \textit{Z} before \textit{Y}. Preventing or detecting barging is an involved challenge with low-level locks, which can be made much easier by higher-level constructs.
+As for mutual-exclusion, low level synchronisation primitive often offer good performance and good flexibility at the cost of ease of use. Again, higher-level mechanism often simplify usage by adding better coupling between synchronization and data, .eg., message passing, or offering simple solution to otherwise involved challenges. An example of this is barging. As mentionned above synchronization can be expressed as guaranteeing that event \textit{X} always happens before \textit{Y}. Most of the time synchronisation happens around a critical section, where threads most acquire said critical section in a certain order. However, it may also be desired to be able to guarantee that event \textit{Z} does not occur between \textit{X} and \textit{Y}. This is called barging, where event \textit{X} tries to effect event \textit{Y} but anoter thread races to grab the critical section and emits \textit{Z} before \textit{Y}. Preventing or detecting barging is an involved challenge with low-level locks, which can be made much easier by higher-level constructs.
 % ======================================================================
 …
 % ======================================================================
 % ======================================================================
 A monitor is a set of routines that ensure mutual exclusion when accessing shared state. This concept is generally associated with Object-Oriented Languages like Java~\cite{Java} or \uC~\cite{uC++book} but does not strictly require OOP semantics. The only requirements is the ability to declare a handle to a shared object and a set of routines that act on it :
+A monitor is a set of routines that ensure mutual exclusion when accessing shared state. This concept is generally associated with Object-Oriented Languages like Java~\cite{Java} or \uC~\cite{uC++book} but does not strictly require OO semantics. The only requirements is the ability to declare a handle to a shared object and a set of routines that act on it :
 \begin{cfacode}
         typedef /*some monitor type*/ monitor;
 …
 % ======================================================================
 % ======================================================================
 The above monitor example displays some of the intrinsic characteristics. Indeed, it is necessary to use pass-by-reference over pass-by-value for monitor routines. This semantics is important because at their core, monitors are implicit mutual-exclusion objects (locks), and these objects cannot be copied. Therefore, monitors are implicitly non-copyable.
 Another aspect to consider is when a monitor acquires its mutual exclusion. For example, a monitor may need to be passed through multiple helper routines that do not acquire the monitor mutual-exclusion on entry. Pass through can be both generic helper routines (\code{swap}, \code{sort}, etc.) or specific helper routines like the following to implement an atomic counter :
+The above monitor example displays some of the intrinsic characteristics. First, it is necessary to use pass-by-reference over pass-by-value for monitor routines. This semantics is important because at their core, monitors are implicit mutual-exclusion objects (locks), and these objects cannot be copied. Therefore, monitors are implicitly non-copyable objects.
+Another aspect to consider is when a monitor acquires its mutual exclusion. For example, a monitor may need to be passed through multiple helper routines that do not acquire the monitor mutual-exclusion on entry. Pass through can occur for generic helper routines (\code{swap}, \code{sort}, etc.) or specific helper routines like the following to implement an atomic counter :
 \begin{cfacode}
 …
         size_t ++?(counter_t & mutex this); //increment
         //need for mutex is platform dependent here
+        //need for mutex is platform dependent
         void ?{}(size_t * this, counter_t & mutex cnt); //conversion
 \end{cfacode}
 …
 Here, the constructor(\code{?\{\}}) uses the \code{nomutex} keyword to signify that it does not acquire the monitor mutual-exclusion when constructing. This semantics is because an object not yet constructed should never be shared and therefore does not require mutual exclusion. The prefix increment operator uses \code{mutex} to protect the incrementing process from race conditions. Finally, there is a conversion operator from \code{counter_t} to \code{size_t}. This conversion may or may not require the \code{mutex} keyword depending on whether or not reading an \code{size_t} is an atomic operation.
 Having both \code{mutex} and \code{nomutex} keywords could be argued to be redundant based on the meaning of a routine having neither of these keywords. For example, given a routine without qualifiers \code{void foo(counter_t & this)} then it is reasonable that it should default to the safest option \code{mutex}. On the other hand, the option of having routine \code{void foo(counter_t & this)} mean \code{nomutex} is unsafe by default and may easily cause subtle errors. In fact \code{nomutex} is the "normal" parameter behaviour, with the \code{nomutex} keyword effectively stating explicitly that "this routine is not special". Another alternative is to make having exactly one of these keywords mandatory, which would provide the same semantics but without the ambiguity of supporting routines neither keyword. Mandatory keywords would also have the added benefit of being self-documented but at the cost of extra typing. While there are several benefits to mandatory keywords, they do bring a few challenges. Mandatory keywords in \CFA would imply that the compiler must know without a doubt wheter or not a parameter is a monitor or not. Since \CFA relies heavily on traits as an abstraction mechanism, the distinction between a type that is a monitor and a type that looks like a monitor can become blurred. For this reason, \CFA only has the \code{mutex} keyword.
+Having both \code{mutex} and \code{nomutex} keywords is redundant based on the meaning of a routine having neither of these keywords. For example, given a routine without qualifiers \code{void foo(counter_t & this)}, then it is reasonable that it should default to the safest option \code{mutex}, whereas assuming \code{nomutex} is unsafe and may cause subtle errors. In fact, \code{nomutex} is the "normal" parameter behaviour, with the \code{nomutex} keyword effectively stating explicitly that "this routine is not special". Another alternative is to make having exactly one of these keywords mandatory, which would provide the same semantics but without the ambiguity of supporting routines neither keyword. Mandatory keywords would also have the added benefit of being self-documented but at the cost of extra typing. While there are several benefits to mandatory keywords, they do bring a few challenges. Mandatory keywords in \CFA would imply that the compiler must know without a doubt wheter or not a parameter is a monitor or not. Since \CFA relies heavily on traits as an abstraction mechanism, the distinction between a type that is a monitor and a type that looks like a monitor can become blurred. For this reason, \CFA only has the \code{mutex} keyword.
 …
 int f2(const monitor & mutex m);
 int f3(monitor ** mutex m);
 int f4(monitor *[] mutex m);
+int f4(monitor * mutex m []);
 int f5(graph(monitor*) & mutex m);
 \end{cfacode}
 …
 int f1(monitor & mutex m);   //Okay : recommanded case
 int f2(monitor * mutex m);   //Okay : could be an array but probably not
 int f3(monitor [] mutex m);  //Not Okay : Array of unkown length
+int f3(monitor mutex m []);  //Not Okay : Array of unkown length
 int f4(monitor ** mutex m);  //Not Okay : Could be an array
 int f5(monitor *[] mutex m); //Not Okay : Array of unkown length
+int f5(monitor * mutex m []); //Not Okay : Array of unkown length
 \end{cfacode}

doc/proposals/concurrency/text/intro.tex

-                      re4d829b
+                      r579263a
 % ======================================================================
 This proposal provides a minimal concurrency API that is simple, efficient and can be reused to build higher-level features. The simplest possible concurrency core is a thread and a lock but this low-level approach is hard to master. An easier approach for users is to support higher-level constructs as the basis of the concurrency in \CFA. Indeed, for highly productive parallel programming, high-level approaches are much more popular~\cite{HPP:Study}. Examples are task based, message passing and implicit threading.
+This proposal provides a minimal concurrency API that is simple, efficient and can be reused to build higher-level features. The simplest possible concurrency system is a thread and a lock but this low-level approach is hard to master. An easier approach for users is to support higher-level constructs as the basis of the concurrency, in \CFA. Indeed, for highly productive parallel programming, high-level approaches are much more popular~\cite{HPP:Study}. Examples are task based, message passing and implicit threading. Therefore a high-level approach is adapted in \CFA
 There are actually two problems that need to be solved in the design of concurrency for a programming language: which concurrency tools are available to the users and which parallelism tools are available. While these two concepts are often seen together, they are in fact distinct concepts that require different sorts of tools~\cite{Buhr05a}. Concurrency tools need to handle mutual exclusion and synchronization, while parallelism tools are about performance, cost and resource utilization.
+There are actually two problems that need to be solved in the design of concurrency for a programming language: which concurrency and which parallelism tools are available to the users. While these two concepts are often combined, they are in fact distinct concepts that require different tools~\cite{Buhr05a}. Concurrency tools need to handle mutual exclusion and synchronization, while parallelism tools are about performance, cost and resource utilization.

doc/proposals/concurrency/thesis.tex

-                      re4d829b
+                      r579263a
 \fancyhf{}
 \cfoot{\thepage}
 \rfoot{v\input{build/version}}
+\rfoot{v\input{version}}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 …
 \input{intro}
+\input{cforall}
 \input{basics}

doc/rob_thesis/intro.tex

-                      re4d829b
+                      r579263a
 %======================================================================
 \section{\CFA Background}
+\section{\protect\CFA Background}
 \label{s:background}
 \CFA \footnote{Pronounced ``C-for-all'', and written \CFA or Cforall.} is a modern non-object-oriented extension to the C programming language.
 …
     \end{tabular}
   \end{center}
   \caption{\label{table:types} The different kinds of type parameters in \CFA}
+  \caption{\label{table:types} The different kinds of type parameters in \protect\CFA}
 \end{table}

doc/rob_thesis/thesis.tex

re4d829b	r579263a
66	66	% ,monochrome % toggle black and white mode
67	67	}{xcolor}
	68	\PassOptionsToPackage{pdftex}{graphicx}
68	69	\documentclass[letterpaper,12pt,titlepage,oneside,final]{book}
69	70

doc/user/user.tex

-                      re4d829b
+                      r579263a
 %% Created On       : Wed Apr  6 14:53:29 2016
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Fri Jun  2 10:07:51 2017
 %% Update Count     : 2128
+%% Last Modified On : Fri Jun 16 12:00:01 2017
+%% Update Count     : 2433
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 …
 \usepackage[pagewise]{lineno}
 \renewcommand{\linenumberfont}{\scriptsize\sffamily}
 \input{common}                                          % bespoke macros used in the document
+\input{common}                                          % common CFA document macros
 \usepackage[dvips,plainpages=false,pdfpagelabels,pdfpagemode=UseNone,colorlinks=true,pagebackref=true,linkcolor=blue,citecolor=blue,urlcolor=blue,pagebackref=true,breaklinks=true]{hyperref}
 \usepackage{breakurl}
 …
 \renewcommand{\subsectionmark}[1]{\markboth{\thesubsection\quad #1}{\thesubsection\quad #1}}
 \pagenumbering{roman}
 \linenumbers                                            % comment out to turn off line numbering
+%\linenumbers                                            % comment out to turn off line numbering
 \maketitle
 …
 the type suffixes ©U©, ©L©, etc. may start with an underscore ©1_U©, ©1_ll© or ©1.0E10_f©.
 \end{enumerate}
 It is significantly easier to read and enter long constants when they are broken up into smaller groupings (most cultures use comma or period among digits for the same purpose).
+It is significantly easier to read and enter long constants when they are broken up into smaller groupings (many cultures use comma and/or period among digits for the same purpose).
 This extension is backwards compatible, matches with the use of underscore in variable names, and appears in \Index*{Ada} and \Index*{Java} 8.
 …
 \begin{cfa}
 int ®`®otype®`® = 3;                    §\C{// make keyword an identifier}§
 double ®`®choose®`® = 3.5;
 \end{cfa}
 Programs can be converted easily by enclosing keyword identifiers in backquotes, and the backquotes can be removed later when the identifier name is changed to a  non-keyword name.
+double ®`®forall®`® = 3.5;
+\end{cfa}
+Existing C programs with keyword clashes can be converted by enclosing keyword identifiers in backquotes, and eventually the identifier name can be changed to a non-keyword name.
 \VRef[Figure]{f:InterpositionHeaderFile} shows how clashes in C header files (see~\VRef{s:StandardHeaders}) can be handled using preprocessor \newterm{interposition}: ©#include_next© and ©-I filename©:
 …
 // include file uses the CFA keyword "otype".
 #if ! defined( otype )                  §\C{// nesting ?}§
 #define otype `otype`
+#define otype ®`®otype®`®               §\C{// make keyword an identifier}§
 #define __CFA_BFD_H__
 #endif // ! otype
 …
 \begin{tabular}{@{}ll@{}}
 \begin{cfa}
 int *x[5]
+int * x[5]
 \end{cfa}
+&
 …
 For example, a routine returning a \Index{pointer} to an array of integers is defined and used in the following way:
 \begin{cfa}
 int (*f())[5] {...};                    §\C{}§
+... (*f())[3] += 1;
+int ®(*®f®())[®5®]® {...};                              §\C{definition}§
+ ... ®(*®f®())[®3®]® += 1;                              §\C{usage}§
 \end{cfa}
 Essentially, the return type is wrapped around the routine name in successive layers (like an \Index{onion}).
 …
 \CFA provides its own type, variable and routine declarations, using a different syntax.
 The new declarations place qualifiers to the left of the base type, while C declarations place qualifiers to the right of the base type.
 In the following example, \R{red} is for the base type and \B{blue} is for the qualifiers.
+In the following example, \R{red} is the base type and \B{blue} is qualifiers.
 The \CFA declarations move the qualifiers to the left of the base type, \ie move the blue to the left of the red, while the qualifiers have the same meaning but are ordered left to right to specify a variable's type.
 \begin{quote2}
 …
 \end{tabular}
 \end{quote2}
 The only exception is bit field specification, which always appear to the right of the base type.
+The only exception is \Index{bit field} specification, which always appear to the right of the base type.
 % Specifically, the character ©*© is used to indicate a pointer, square brackets ©[©\,©]© are used to represent an array or function return value, and parentheses ©()© are used to indicate a routine parameter.
 However, unlike C, \CFA type declaration tokens are distributed across all variables in the declaration list.
 …
 \begin{cfa}
 int z[ 5 ];
 char *w[ 5 ];
 double (*v)[ 5 ];
+char * w[ 5 ];
+double (* v)[ 5 ];
 struct s {
         int f0:3;
         int *f1;
         int *f2[ 5 ]
+        int * f1;
+        int * f2[ 5 ]
 };
 \end{cfa}
 …
 \begin{cfa}
 int extern x[ 5 ];
 const int static *y;
+const int static * y;
 \end{cfa}
+&
 …
 \begin{cfa}
 y = (®int *®)x;
 i = sizeof(®int *[ 5 ]®);
+i = sizeof(®int * [ 5 ]®);
 \end{cfa}
 \end{tabular}
 …
 C provides a \newterm{pointer type};
 \CFA adds a \newterm{reference type}.
 These types may be derived from a object or routine type, called the \newterm{referenced type}.
+These types may be derived from an object or routine type, called the \newterm{referenced type}.
 Objects of these types contain an \newterm{address}, which is normally a location in memory, but may also address memory-mapped registers in hardware devices.
 An integer constant expression with the value 0, or such an expression cast to type ©void *©, is called a \newterm{null-pointer constant}.\footnote{
 …
 A \Index{pointer}/\Index{reference} object is a generalization of an object variable-name, \ie 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 like a variable name, may not occupy storage as the literal is embedded directly into instructions.)
+(Similarly, an integer variable can contain multiple integer literals during its lifetime versus an integer constant representing a single literal during its lifetime, and like a variable name, may not occupy storage if 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, \eg:
 \begin{quote2}
 …
 \begin{cfa}
 p1 = p2;                                                §\C{// p1 = p2\ \ rather than\ \ *p1 = *p2}§
 p2 = p1 + x;                                    §\C{// p2 = p1 + x\ \ rather than\ \ *p1 = *p1 + x}§
+p2 = p1 + x;                                    §\C{// p2 = p1 + x\ \ rather than\ \ *p2 = *p1 + x}§
 \end{cfa}
 even though the assignment to ©p2© is likely incorrect, and the programmer probably meant:
 …
 ®*®p2 = ®*®p1 + x;                              §\C{// pointed-to value assignment / operation}§
 \end{cfa}
 The C semantics works well for situations where manipulation of addresses is the primary meaning and data is rarely accessed, such as storage management (©malloc©/©free©).
+The C semantics work well for situations where manipulation of addresses is the primary meaning and data is rarely accessed, such as storage management (©malloc©/©free©).
 However, in most other situations, the pointed-to value is requested more often than the pointer address.
 …
 For a \CFA reference type, the cancellation on the left-hand side of assignment leaves the reference as an address (\Index{lvalue}):
 \begin{cfa}
 (&®*®)r1 = &x;                                  §\C{// (\&*) cancel giving address of r1 not variable pointed-to by r1}§
+(&®*®)r1 = &x;                                  §\C{// (\&*) cancel giving address in r1 not variable pointed-to by r1}§
 \end{cfa}
 Similarly, the address of a reference can be obtained for assignment or computation (\Index{rvalue}):
 \begin{cfa}
 (&(&®*®)®*®)r3 = &(&®*®)r2;             §\C{// (\&*) cancel giving address of r2, (\&(\&*)*) cancel giving address of r3}§
+(&(&®*®)®*®)r3 = &(&®*®)r2;             §\C{// (\&*) cancel giving address in r2, (\&(\&*)*) cancel giving address in r3}§
 \end{cfa}
 Cancellation\index{cancellation!pointer/reference}\index{pointer!cancellation} works to arbitrary depth.
 …
 As for a pointer type, a reference type may have qualifiers:
 \begin{cfa}
 const int cx = 5;                               §\C{// cannot change cx;}§
 const int & cr = cx;                    §\C{// cannot change what cr points to}§
 ®&®cr = &cx;                                    §\C{// can change cr}§
 cr = 7;                                                 §\C{// error, cannot change cx}§
 int & const rc = x;                             §\C{// must be initialized}§
 ®&®rc = &x;                                             §\C{// error, cannot change rc}§
 const int & const crc = cx;             §\C{// must be initialized}§
 crc = 7;                                                §\C{// error, cannot change cx}§
 ®&®crc = &cx;                                   §\C{// error, cannot change crc}§
 \end{cfa}
 Hence, for type ©& const©, there is no pointer assignment, so ©&rc = &x© is disallowed, and \emph{the address value cannot be the null pointer unless an arbitrary pointer is coerced into the reference}:
 \begin{cfa}
 int & const cr = *0;                    §\C{// where 0 is the int * zero}§
 \end{cfa}
 Note, constant reference-types do not prevent addressing errors because of explicit storage-management:
+const int cx = 5;                                       §\C{// cannot change cx;}§
+const int & cr = cx;                            §\C{// cannot change what cr points to}§
+®&®cr = &cx;                                            §\C{// can change cr}§
+cr = 7;                                                         §\C{// error, cannot change cx}§
+int & const rc = x;                                     §\C{// must be initialized}§
+®&®rc = &x;                                                     §\C{// error, cannot change rc}§
+const int & const crc = cx;                     §\C{// must be initialized}§
+crc = 7;                                                        §\C{// error, cannot change cx}§
+®&®crc = &cx;                                           §\C{// error, cannot change crc}§
+\end{cfa}
+Hence, for type ©& const©, there is no pointer assignment, so ©&rc = &x© is disallowed, and \emph{the address value cannot be the null pointer unless an arbitrary pointer is coerced\index{coercion} into the reference}:
+\begin{cfa}
+int & const cr = *0;                            §\C{// where 0 is the int * zero}§
+\end{cfa}
+Note, constant reference-types do not prevent \Index{addressing errors} because of explicit storage-management:
 \begin{cfa}
 int & const cr = *malloc();
 cr = 5;
 delete &cr;
 cr = 7;                                                 §\C{// unsound pointer dereference}§
 \end{cfa}
 Finally, the position of the ©const© qualifier \emph{after} the pointer/reference qualifier causes confuse for C programmers.
+free( &cr );
+cr = 7;                                                         §\C{// unsound pointer dereference}§
+\end{cfa}
+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:
+\CFA-style declarations (see \VRef{s:Declarations}) attempt to address this issue:
 \begin{quote2}
 \begin{tabular}{@{}l@{\hspace{3em}}l@{}}
 …
 \end{tabular}
 \end{quote2}
+where the \CFA declaration is read left-to-right (see \VRef{s:Declarations}).
+where the \CFA declaration is read left-to-right.
+Finally, like pointers, references are usable and composable with other type operators and generators.
+\begin{cfa}
+int w, x, y, z, & ar[3] = { x, y, z }; §\C{// initialize array of references}§
+&ar[1] = &w;                                            §\C{// change reference array element}§
+typeof( ar[1] ) p;                                      §\C{// (gcc) is int, i.e., the type of referenced object}§
+typeof( &ar[1] ) q;                                     §\C{// (gcc) is int \&, i.e., the type of reference}§
+sizeof( ar[1] ) == sizeof( int );       §\C{// is true, i.e., the size of referenced object}§
+sizeof( &ar[1] ) == sizeof( int *)      §\C{// is true, i.e., the size of a reference}§
+\end{cfa}
 In contrast to \CFA reference types, \Index*[C++]{\CC{}}'s reference types are all ©const© references, preventing changes to the reference address, so only value assignment is possible, which eliminates half of the \Index{address duality}.
+Also, \CC does not allow \Index{array}s\index{array!reference} of reference\footnote{
+The reason for disallowing arrays of reference is unknown, but possibly comes from references being ethereal (like a textual macro), and hence, replaceable by the referant object.}
 \Index*{Java}'s reference types to objects (all Java objects are on the heap) are like C pointers, which always manipulate the address, and there is no (bit-wise) object assignment, so objects are explicitly cloned by shallow or deep copying, which eliminates half of the address duality.
+\subsection{Initialization}
 \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.
 …
 Because the object being initialized has no value, there is only one meaningful semantics with respect to address duality: it must mean address as there is no pointed-to value.
 In contrast, the left-hand side of assignment has an address that has a duality.
+Therefore, for pointer/reference initialization, the initializing value must be an address (\Index{lvalue}) not a value (\Index{rvalue}).
+\begin{cfa}
+int * p = &x;                           §\C{// must have address of x}§
+int & r = x;                            §\C{// must have address of x}§
+\end{cfa}
+Therefore, it is superfluous to require explicitly taking the address of the initialization object, even though the type is incorrect.
+Hence, \CFA allows ©r© to be assigned ©x© because it infers a reference for ©x©, by implicitly inserting a address-of operator, ©&©, and it is an error to put an ©&© because the types no longer match.
+Unfortunately, C allows ©p© to be assigned with ©&x© or ©x©, by value, but most compilers warn about the latter assignment as being potentially incorrect.
+(\CFA extends pointer initialization so a variable name is automatically referenced, eliminating the unsafe assignment.)
+Therefore, for pointer/reference initialization, the initializing value must be an address not a value.
+\begin{cfa}
+int * p = &x;                                           §\C{// assign address of x}§
+®int * p = x;®                                          §\C{// assign value of x}§
+int & r = x;                                            §\C{// must have address of x}§
+\end{cfa}
+Like the previous example with C pointer-arithmetic, it is unlikely assigning the value of ©x© into a pointer is meaningful (again, a warning is usually given).
+Therefore, for safety, this context requires an address, so it is superfluous to require explicitly taking the address of the initialization object, even though the type is incorrect.
+Note, this is strictly a convenience and safety feature for a programmer.
+Hence, \CFA allows ©r© to be assigned ©x© because it infers a reference for ©x©, by implicitly inserting a address-of operator, ©&©, and it is an error to put an ©&© because the types no longer match due to the implicit dereference.
+Unfortunately, C allows ©p© to be assigned with ©&x© (address) or ©x© (value), but most compilers warn about the latter assignment as being potentially incorrect.
 Similarly, when a reference type is used for a parameter/return type, the call-site argument does not require a reference operator for the same reason.
 \begin{cfa}
 int & f( int & r );                             §\C{// reference parameter and return}§
 z = f( x ) + f( y );                    §\C{// reference operator added, temporaries needed for call results}§
+int & f( int & r );                                     §\C{// reference parameter and return}§
+z = f( x ) + f( y );                            §\C{// reference operator added, temporaries needed for call results}§
 \end{cfa}
 Within routine ©f©, it is possible to change the argument by changing the corresponding parameter, and parameter ©r© can be locally reassigned within ©f©.
 …
 z = temp1 + temp2;
 \end{cfa}
 This implicit referencing is crucial for reducing the syntactic burden for programmers when using references;
+This \Index{implicit referencing} is crucial for reducing the syntactic burden for programmers when using references;
 otherwise references have the same syntactic  burden as pointers in these contexts.
 …
 void f( ®const® int & cr );
 void g( ®const® int * cp );
 f( 3 );                   g( &3 );
 f( x + y );             g( &(x + y) );
+f( 3 );                   g( ®&®3 );
+f( x + y );             g( ®&®(x + y) );
 \end{cfa}
 Here, the compiler passes the address to the literal 3 or the temporary for the expression ©x + y©, knowing the argument cannot be changed through the parameter.
+(The ©&© is necessary for the pointer-type parameter to make the types match, and is a common requirement for a C programmer.)
+The ©&© before the constant/expression for the pointer-type parameter (©g©) is a \CFA extension necessary to type match and is a common requirement before a variable in C (\eg ©scanf©).
+Importantly, ©&3© may not be equal to ©&3©, where the references occur across calls because the temporaries maybe different on each call.
 \CFA \emph{extends} this semantics to a mutable pointer/reference parameter, and the compiler implicitly creates the necessary temporary (copying the argument), which is subsequently pointed-to by the reference parameter and can be changed.\footnote{
 If whole program analysis is possible, and shows the parameter is not assigned, \ie it is ©const©, the temporary is unnecessary.}
 …
 void f( int & r );
 void g( int * p );
 f( 3 );                   g( &3 );              §\C{// compiler implicit generates temporaries}§
 f( x + y );             g( &(x + y) );  §\C{// compiler implicit generates temporaries}§
+f( 3 );                   g( ®&®3 );            §\C{// compiler implicit generates temporaries}§
+f( x + y );             g( ®&®(x + y) );        §\C{// compiler implicit generates temporaries}§
 \end{cfa}
 Essentially, there is an implicit \Index{rvalue} to \Index{lvalue} conversion in this case.\footnote{
 …
 %\CFA attempts to handle pointers and references in a uniform, symmetric manner.
 However, C handles routine objects in an inconsistent way.
 A routine object is both a pointer and a reference (particle and wave).
+Finally, C handles \Index{routine object}s in an inconsistent way.
+A routine object is both a pointer and a reference (\Index{particle and wave}).
 \begin{cfa}
 void f( int i );
+void (*fp)( int );
+fp = f;                                                 §\C{// reference initialization}§
+fp = &f;                                                §\C{// pointer initialization}§
+fp = *f;                                                §\C{// reference initialization}§
+fp(3);                                                  §\C{// reference invocation}§
+(*fp)(3);                                               §\C{// pointer invocation}§
+\end{cfa}
+A routine object is best described by a ©const© reference:
+\begin{cfa}
+const void (&fr)( int ) = f;
+fr = ...                                                §\C{// error, cannot change code}§
+&fr = ...;                                              §\C{// changing routine reference}§
+fr( 3 );                                                §\C{// reference call to f}§
+(*fr)(3);                                               §\C{// error, incorrect type}§
+void (*fp)( int );                                      §\C{// routine pointer}§
+fp = f;                                                         §\C{// reference initialization}§
+fp = &f;                                                        §\C{// pointer initialization}§
+fp = *f;                                                        §\C{// reference initialization}§
+fp(3);                                                          §\C{// reference invocation}§
+(*fp)(3);                                                       §\C{// pointer invocation}§
+\end{cfa}
+While C's treatment of routine objects has similarity to inferring a reference type in initialization contexts, the examples are assignment not initialization, and all possible forms of assignment are possible (©f©, ©&f©, ©*f©) without regard for type.
+Instead, a routine object should be referenced by a ©const© reference:
+\begin{cfa}
+®const® void (®&® fr)( int ) = f;       §\C{// routine reference}§
+fr = ...                                                        §\C{// error, cannot change code}§
+&fr = ...;                                                      §\C{// changing routine reference}§
+fr( 3 );                                                        §\C{// reference call to f}§
+(*fr)(3);                                                       §\C{// error, incorrect type}§
 \end{cfa}
 because the value of the routine object is a routine literal, \ie the routine code is normally immutable during execution.\footnote{
 …
 \CFA allows this additional use of references for routine objects in an attempt to give a more consistent meaning for them.
+This situation is different from inferring with reference type being used ...
+\subsection{Address-of Semantics}
+In C, ©&E© is an rvalue for any expression ©E©.
+\CFA extends the ©&© (address-of) operator as follows:
+\begin{itemize}
+\item
+if ©R© is an \Index{rvalue} of type ©T &$_1$...&$_r$© where $r \ge 1$ references (©&© symbols) than ©&R© has type ©T ®*®&$_{\color{red}2}$...&$_{\color{red}r}$©, \ie ©T© pointer with $r-1$ references (©&© symbols).
+\item
+if ©L© is an \Index{lvalue} of type ©T &$_1$...&$_l$© where $l \ge 0$ references (©&© symbols) then ©&L© has type ©T ®*®&$_{\color{red}1}$...&$_{\color{red}l}$©, \ie ©T© pointer with $l$ references (©&© symbols).
+\end{itemize}
+The following example shows the first rule applied to different \Index{rvalue} contexts:
+\begin{cfa}
+int x, * px, ** ppx, *** pppx, **** ppppx;
+int & rx = x, && rrx = rx, &&& rrrx = rrx ;
+x = rrrx;               // rrrx is an lvalue with type int &&& (equivalent to x)
+px = &rrrx;             // starting from rrrx, &rrrx is an rvalue with type int *&&& (&x)
+ppx = &&rrrx;   // starting from &rrrx, &&rrrx is an rvalue with type int **&& (&rx)
+pppx = &&&rrrx; // starting from &&rrrx, &&&rrrx is an rvalue with type int ***& (&rrx)
+ppppx = &&&&rrrx; // starting from &&&rrrx, &&&&rrrx is an rvalue with type int **** (&rrrx)
+\end{cfa}
+The following example shows the second rule applied to different \Index{lvalue} contexts:
+\begin{cfa}
+int x, * px, ** ppx, *** pppx;
+int & rx = x, && rrx = rx, &&& rrrx = rrx ;
+rrrx = 2;               // rrrx is an lvalue with type int &&& (equivalent to x)
+&rrrx = px;             // starting from rrrx, &rrrx is an rvalue with type int *&&& (rx)
+&&rrrx = ppx;   // starting from &rrrx, &&rrrx is an rvalue with type int **&& (rrx)
+&&&rrrx = pppx; // starting from &&rrrx, &&&rrrx is an rvalue with type int ***& (rrrx)
+\end{cfa}
+\subsection{Conversions}
+C provides a basic implicit conversion to simplify variable usage:
+\begin{enumerate}
+\setcounter{enumi}{-1}
+\item
+lvalue to rvalue conversion: ©cv T© converts to ©T©, which allows implicit variable dereferencing.
+\begin{cfa}
+int x;
+x + 1;                  // lvalue variable (int) converts to rvalue for expression
+\end{cfa}
+An rvalue has no type qualifiers (©cv©), so the lvalue qualifiers are dropped.
+\end{enumerate}
+\CFA provides three new implicit conversion for reference types to simplify reference usage.
+\begin{enumerate}
+\item
+reference to rvalue conversion: ©cv T &© converts to ©T©, which allows implicit reference dereferencing.
+\begin{cfa}
+int x, &r = x, f( int p );
+x = ®r® + f( ®r® );  // lvalue reference converts to rvalue
+\end{cfa}
+An rvalue has no type qualifiers (©cv©), so the reference qualifiers are dropped.
+\item
+lvalue to reference conversion: \lstinline[deletekeywords={lvalue}]@lvalue-type cv1 T@ converts to ©cv2 T &©, which allows implicitly converting variables to references.
+\begin{cfa}
+int x, &r = ®x®, f( int & p ); // lvalue variable (int) convert to reference (int &)
+f( ®x® );               // lvalue variable (int) convert to reference (int &)
+\end{cfa}
+Conversion can restrict a type, where ©cv1© $\le$ ©cv2©, \eg passing an ©int© to a ©const volatile int &©, which has low cost.
+Conversion can expand a type, where ©cv1© $>$ ©cv2©, \eg passing a ©const volatile int© to an ©int &©, which has high cost (\Index{warning});
+furthermore, if ©cv1© has ©const© but not ©cv2©, a temporary variable is created to preserve the immutable lvalue.
+\item
+rvalue to reference conversion: ©T© converts to ©cv T &©, which allows binding references to temporaries.
+\begin{cfa}
+int x, & f( int & p );
+f( ®x + 3® );   // rvalue parameter (int) implicitly converts to lvalue temporary reference (int &)
+®&f®(...) = &x; // rvalue result (int &) implicitly converts to lvalue temporary reference (int &)
+\end{cfa}
+In both case, modifications to the temporary are inaccessible (\Index{warning}).
+Conversion expands the temporary-type with ©cv©, which is low cost since the temporary is inaccessible.
+\end{enumerate}
 \begin{comment}
-\section{References}
-By introducing references in parameter types, users are given an easy way to pass a value by reference, without the need for NULL pointer checks.
-In structures, a reference can replace a pointer to an object that should always have a valid value.
-When a structure contains a reference, all of its constructors must initialize the reference and all instances of this structure must initialize it upon definition.
-The syntax for using references in \CFA is the same as \CC with the exception of reference initialization.
-Use ©&© to specify a reference, and access references just like regular objects, not like pointers (use dot notation to access fields).
-When initializing a reference, \CFA uses a different syntax which differentiates reference initialization from assignment to a reference.
-The ©&© is used on both sides of the expression to clarify that the address of the reference is being set to the address of the variable to which it refers.
 From: Richard Bilson <rcbilson@gmail.com>
 Date: Wed, 13 Jul 2016 01:58:58 +0000
 …
 \section{Routine Definition}
 \CFA also supports a new syntax for routine definition, as well as ISO C and K\&R routine syntax.
+\CFA also supports a new syntax for routine definition, as well as \Celeven and K\&R routine syntax.
 The point of the new syntax is to allow returning multiple values from a routine~\cite{Galletly96,CLU}, \eg:
 \begin{cfa}
 …
 in both cases the type is assumed to be void as opposed to old style C defaults of int return type and unknown parameter types, respectively, as in:
 \begin{cfa}
 [§\,§] g();                                             §\C{// no input or output parameters}§
 [ void ] g( void );                             §\C{// no input or output parameters}§
+[§\,§] g();                                                     §\C{// no input or output parameters}§
+[ void ] g( void );                                     §\C{// no input or output parameters}§
 \end{cfa}
 …
 \begin{cfa}
 typedef int foo;
 int f( int (* foo) );                   §\C{// foo is redefined as a parameter name}§
+int f( int (* foo) );                           §\C{// foo is redefined as a parameter name}§
 \end{cfa}
 The string ``©int (* foo)©'' declares a C-style named-parameter of type pointer to an integer (the parenthesis are superfluous), while the same string declares a \CFA style unnamed parameter of type routine returning integer with unnamed parameter of type pointer to foo.
 …
 C-style declarations can be used to declare parameters for \CFA style routine definitions, \eg:
 \begin{cfa}
 [ int ] f( * int, int * );              §\C{// returns an integer, accepts 2 pointers to integers}§
 [ * int, int * ] f( int );              §\C{// returns 2 pointers to integers, accepts an integer}§
+[ int ] f( * int, int * );                      §\C{// returns an integer, accepts 2 pointers to integers}§
+[ * int, int * ] f( int );                      §\C{// returns 2 pointers to integers, accepts an integer}§
 \end{cfa}
 The reason for allowing both declaration styles in the new context is for backwards compatibility with existing preprocessor macros that generate C-style declaration-syntax, as in:
 \begin{cfa}
 #define ptoa( n, d ) int (*n)[ d ]
 int f( ptoa( p, 5 ) ) ...               §\C{// expands to int f( int (*p)[ 5 ] )}§
 [ int ] f( ptoa( p, 5 ) ) ...   §\C{// expands to [ int ] f( int (*p)[ 5 ] )}§
+int f( ptoa( p, 5 ) ) ...                       §\C{// expands to int f( int (*p)[ 5 ] )}§
+[ int ] f( ptoa( p, 5 ) ) ...           §\C{// expands to [ int ] f( int (*p)[ 5 ] )}§
 \end{cfa}
 Again, programmers are highly encouraged to use one declaration form or the other, rather than mixing the forms.
 …
         int z;
         ... x = 0; ... y = z; ...
         ®return;® §\C{// implicitly return x, y}§
+        ®return;®                                                       §\C{// implicitly return x, y}§
+}
 \end{cfa}
 …
 [ int x, int y ] f() {
         ...
 } §\C{// implicitly return x, y}§
+}                                                                               §\C{// implicitly return x, y}§
 \end{cfa}
 In this case, the current values of ©x© and ©y© are returned to the calling routine just as if a ©return© had been encountered.
+Named return values may be used in conjunction with named parameter values;
+specifically, a return and parameter can have the same name.
+\begin{cfa}
+[ int x, int y ] f( int, x, int y ) {
+        ...
+}                                                                               §\C{// implicitly return x, y}§
+\end{cfa}
+This notation allows the compiler to eliminate temporary variables in nested routine calls.
+\begin{cfa}
+[ int x, int y ] f( int, x, int y );    §\C{// prototype declaration}§
+int a, b;
+[a, b] = f( f( f( a, b ) ) );
+\end{cfa}
+While the compiler normally ignores parameters names in prototype declarations, here they are used to eliminate temporary return-values by inferring that the results of each call are the inputs of the next call, and ultimately, the left-hand side of the assignment.
+Hence, even without the body of routine ©f© (separate compilation), it is possible to perform a global optimization across routine calls.
+The compiler warns about naming inconsistencies between routine prototype and definition in this case, and behaviour is \Index{undefined} if the programmer is inconsistent.
 …
 as well, parameter names are optional, \eg:
 \begin{cfa}
 [ int x ] f ();                                 §\C{// returning int with no parameters}§
 [ * int ] g (int y);                    §\C{// returning pointer to int with int parameter}§
 [ ] h (int,char);                               §\C{// returning no result with int and char parameters}§
 [ * int,int ] j (int);                  §\C{// returning pointer to int and int, with int parameter}§
+[ int x ] f ();                                                 §\C{// returning int with no parameters}§
+[ * int ] g (int y);                                    §\C{// returning pointer to int with int parameter}§
+[ ] h ( int, char );                                    §\C{// returning no result with int and char parameters}§
+[ * int, int ] j ( int );                               §\C{// returning pointer to int and int, with int parameter}§
 \end{cfa}
 This syntax allows a prototype declaration to be created by cutting and pasting source text from the routine definition header (or vice versa).
 …
 \multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c}{\textbf{C}}        \\
 \begin{cfa}
 [ int ] f(int), g;
+[ int ] f( int ), g;
 \end{cfa}
+&
 \begin{cfa}
 int f(int), g(int);
+int f( int ), g( int );
 \end{cfa}
 \end{tabular}
 …
 Declaration qualifiers can only appear at the start of a \CFA routine declaration,\footref{StorageClassSpecifier} \eg:
 \begin{cfa}
 extern [ int ] f (int);
 static [ int ] g (int);
+extern [ int ] f ( int );
+static [ int ] g ( int );
 \end{cfa}
 …
 The syntax for pointers to \CFA routines specifies the pointer name on the right, \eg:
 \begin{cfa}
 * [ int x ] () fp;                      §\C{// pointer to routine returning int with no parameters}§
 * [ * int ] (int y) gp;         §\C{// pointer to routine returning pointer to int with int parameter}§
 * [ ] (int,char) hp;            §\C{// pointer to routine returning no result with int and char parameters}§
 * [ * int,int ] (int) jp;       §\C{// pointer to routine returning pointer to int and int, with int parameter}§
+* [ int x ] () fp;                                              §\C{// pointer to routine returning int with no parameters}§
+* [ * int ] (int y) gp;                                 §\C{// pointer to routine returning pointer to int with int parameter}§
+* [ ] (int,char) hp;                                    §\C{// pointer to routine returning no result with int and char parameters}§
+* [ * int,int ] ( int ) jp;                             §\C{// pointer to routine returning pointer to int and int, with int parameter}§
 \end{cfa}
 While parameter names are optional, \emph{a routine name cannot be specified};
 for example, the following is incorrect:
 \begin{cfa}
 * [ int x ] f () fp;            §\C{// routine name "f" is not allowed}§
+* [ int x ] f () fp;                                    §\C{// routine name "f" is not allowed}§
 \end{cfa}
 …
 \section{Named and Default Arguments}
 Named and default arguments~\cite{Hardgrave76}\footnote{
+Named\index{named arguments}\index{arguments!named} and default\index{default arguments}\index{arguments!default} arguments~\cite{Hardgrave76}\footnote{
 Francez~\cite{Francez77} proposed a further extension to the named-parameter passing style, which specifies what type of communication (by value, by reference, by name) the argument is passed to the routine.}
 are two mechanisms to simplify routine call.
 …
         int ;                                   §\C{// disallowed, unnamed field}§
         int *;                                  §\C{// disallowed, unnamed field}§
         int (*)(int);                   §\C{// disallowed, unnamed field}§
+        int (*)( int );                 §\C{// disallowed, unnamed field}§
 };
 \end{cfa}
 …
+}
 int main() {
         * [int](int) fp = foo();        §\C{// int (*fp)(int)}§
+        * [int]( int ) fp = foo();      §\C{// int (*fp)( int )}§
         sout | fp( 3 ) | endl;
+}
 …
 \subsection{Constructors and Destructors}
+\section{Constructors and Destructors}
 \CFA supports C initialization of structures, but it also adds constructors for more advanced initialization.
 …
+\begin{comment}
 \section{Generics}
 …
+        }
 \end{cfa}
+\end{comment}
 …
         Complex *p3 = new(0.5, 1.0); // allocate + 2 param constructor
+}
 \end{cfa}
 …
+\begin{comment}
 \subsection{Unsafe C Constructs}
 …
 The exact set of unsafe C constructs that will be disallowed in \CFA has not yet been decided, but is sure to include pointer arithmetic, pointer casting, etc.
 Once the full set is decided, the rules will be listed here.
+\end{comment}
 \section{Concurrency}
-Today's processors for nearly all use cases, ranging from embedded systems to large cloud computing servers, are composed of multiple cores, often heterogeneous.
-As machines grow in complexity, it becomes more difficult for a program to make the most use of the hardware available.
-\CFA includes built-in concurrency features to enable high performance and improve programmer productivity on these multi-/many-core machines.
 Concurrency support in \CFA is implemented on top of a highly efficient runtime system of light-weight, M:N, user level threads.
 …
 This enables a very familiar interface to all programmers, even those with no parallel programming experience.
 It also allows the compiler to do static type checking of all communication, a very important safety feature.
+This controlled communication with type safety has some similarities with channels in \Index*{Go}, and can actually implement
+channels exactly, as well as create additional communication patterns that channels cannot.
+This controlled communication with type safety has some similarities with channels in \Index*{Go}, and can actually implement channels exactly, as well as create additional communication patterns that channels cannot.
 Mutex objects, monitors, are used to contain mutual exclusion within an object and synchronization across concurrent threads.
+Three new keywords are added to support these features:
+monitor creates a structure with implicit locking when accessing fields
+mutex implies use of a monitor requiring the implicit locking
+task creates a type with implicit locking, separate stack, and a thread
+\begin{figure}
+\begin{cfa}
+#include <fstream>
+#include <coroutine>
+coroutine Fibonacci {
+        int fn;                                                         §\C{// used for communication}§
+};
+void ?{}( Fibonacci * this ) {
+        this->fn = 0;
+}
+void main( Fibonacci * this ) {
+        int fn1, fn2;                                           §\C{// retained between resumes}§
+        this->fn = 0;                                           §\C{// case 0}§
+        fn1 = this->fn;
+        suspend();                                                      §\C{// return to last resume}§
+        this->fn = 1;                                           §\C{// case 1}§
+        fn2 = fn1;
+        fn1 = this->fn;
+        suspend();                                                      §\C{// return to last resume}§
+        for ( ;; ) {                                            §\C{// general case}§
+                this->fn = fn1 + fn2;
+                fn2 = fn1;
+                fn1 = this->fn;
+                suspend();                                              §\C{// return to last resume}§
+        } // for
+}
+int next( Fibonacci * this ) {
+        resume( this );                                         §\C{// transfer to last suspend}§
+        return this->fn;
+}
+int main() {
+        Fibonacci f1, f2;
+        for ( int i = 1; i <= 10; i += 1 ) {
+                sout | next( &f1 ) | ' ' | next( &f2 ) | endl;
+        } // for
+}
+\end{cfa}
+\caption{Fibonacci Coroutine}
+\label{f:FibonacciCoroutine}
+\end{figure}
+\subsection{Coroutine}
+\Index{Coroutines} are the precursor to tasks.
+\VRef[Figure]{f:FibonacciCoroutine} shows a coroutine that computes the \Index*{Fibonacci} numbers.
 …
 \end{cfa}
+\begin{figure}
+\begin{cfa}
+#include <fstream>
+#include <kernel>
+#include <monitor>
+#include <thread>
+monitor global_t {
+        int value;
+};
+void ?{}(global_t * this) {
+        this->value = 0;
+}
+static global_t global;
+void increment3( global_t * mutex this ) {
+        this->value += 1;
+}
+void increment2( global_t * mutex this ) {
+        increment3( this );
+}
+void increment( global_t * mutex this ) {
+        increment2( this );
+}
+thread MyThread {};
+void main( MyThread* this ) {
+        for(int i = 0; i < 1_000_000; i++) {
+                increment( &global );
+        }
+}
+int main(int argc, char* argv[]) {
+        processor p;
+        {
+                MyThread f[4];
+        }
+        sout | global.value | endl;
+}
+\end{cfa}
+\caption{Atomic-Counter Monitor}
+\caption{f:AtomicCounterMonitor}
+\end{figure}
+\begin{comment}
 Since a monitor structure includes an implicit locking mechanism, it does not make sense to copy a monitor;
 it is always passed by reference.
 …
+}
 \end{cfa}
+\end{comment}
 …
 A task provides mutual exclusion like a monitor, and also has its own execution state and a thread of control.
 Similar to a monitor, a task is defined like a structure:
+\begin{figure}
+\begin{cfa}
+#include <fstream>
+#include <kernel>
+#include <stdlib>
+#include <thread>
+thread First  { signal_once * lock; };
+thread Second { signal_once * lock; };
+void ?{}( First * this, signal_once* lock ) { this->lock = lock; }
+void ?{}( Second * this, signal_once* lock ) { this->lock = lock; }
+void main( First * this ) {
+        for ( int i = 0; i < 10; i += 1 ) {
+                sout | "First : Suspend No." | i + 1 | endl;
+                yield();
+        }
+        signal( this->lock );
+}
+void main( Second * this ) {
+        wait( this->lock );
+        for ( int i = 0; i < 10; i += 1 ) {
+                sout | "Second : Suspend No." | i + 1 | endl;
+                yield();
+        }
+}
+int main( void ) {
+        signal_once lock;
+        sout | "User main begin" | endl;
+        {
+                processor p;
+                {
+                        First  f = { &lock };
+                        Second s = { &lock };
+                }
+        }
+        sout | "User main end" | endl;
+}
+\end{cfa}
+\caption{Simple Tasks}
+\label{f:SimpleTasks}
+\end{figure}
+\begin{comment}
 \begin{cfa}
 type Adder = task {
 …
 \end{cfa}
 \subsection{Cooperative Scheduling}
 …
+}
 \end{cfa}
+\end{comment}
+\begin{comment}
 \section{Modules and Packages }
-\begin{comment}
 High-level encapsulation is useful for organizing code into reusable units, and accelerating compilation speed.
 \CFA provides a convenient mechanism for creating, building and sharing groups of functionality that enhances productivity and improves compile time.
 …
+\begin{comment}
 \subsection[Comparing Key Features of CFA]{Comparing Key Features of \CFA}
 …
-\begin{comment}
 \subsubsection{Modules / Packages}
 …
+}
 \end{cfa}
-\end{comment}
 …
 \subsection{Summary of Language Comparison}
+\subsubsection[C++]{\CC}
+\end{comment}
+\subsection[C++]{\CC}
 \Index*[C++]{\CC{}} is a general-purpose programming language.
 …
 \subsubsection{Go}
+\subsection{Go}
 \Index*{Go}, also commonly referred to as golang, is a programming language developed at Google in 2007 [.].
 …
 \subsubsection{Rust}
+\subsection{Rust}
 \Index*{Rust} is a general-purpose, multi-paradigm, compiled programming language developed by Mozilla Research.
 …
 \subsubsection{D}
+\subsection{D}
 The \Index*{D} programming language is an object-oriented, imperative, multi-paradigm system programming
 …
 \item[Rationale:] keywords added to implement new semantics of \CFA.
 \item[Effect on original feature:] change to semantics of well-defined feature. \\
 Any ISO C programs using these keywords as identifiers are invalid \CFA programs.
+Any \Celeven programs using these keywords as identifiers are invalid \CFA programs.
 \item[Difficulty of converting:] keyword clashes are accommodated by syntactic transformations using the \CFA backquote escape-mechanism (see~\VRef{s:BackquoteIdentifiers}).
 \item[How widely used:] clashes among new \CFA keywords and existing identifiers are rare.
 …
 hence, names in these include files are not mangled\index{mangling!name} (see~\VRef{s:Interoperability}).
 All other C header files must be explicitly wrapped in ©extern "C"© to prevent name mangling.
+For \Index*[C++]{\CC{}}, the name-mangling issue is handled implicitly because most C header-files are augmented with checks for preprocessor variable ©__cplusplus©, which adds appropriate ©extern "C"© qualifiers.
 …
+}
 // §\CFA§ safe initialization/copy
+// §\CFA§ safe initialization/copy, i.e., implicit size specification
 forall( dtype T | sized(T) ) T * memset( T * dest, char c );§\indexc{memset}§
 forall( dtype T | sized(T) ) T * memcpy( T * dest, const T * src );§\indexc{memcpy}§
 …
 \leavevmode
 \begin{cfa}[aboveskip=0pt,belowskip=0pt]
+forall( otype T | { int ?<?( T, T ); } )
+T min( T t1, T t2 );§\indexc{min}§
+forall( otype T | { int ?>?( T, T ); } )
+T max( T t1, T t2 );§\indexc{max}§
+forall( otype T | { T min( T, T ); T max( T, T ); } )
+T clamp( T value, T min_val, T max_val );§\indexc{clamp}§
+forall( otype T )
+void swap( T * t1, T * t2 );§\indexc{swap}§
+forall( otype T | { int ?<?( T, T ); } ) T min( T t1, T t2 );§\indexc{min}§
+forall( otype T | { int ?>?( T, T ); } ) T max( T t1, T t2 );§\indexc{max}§
+forall( otype T | { T min( T, T ); T max( T, T ); } ) T clamp( T value, T min_val, T max_val );§\indexc{clamp}§
+forall( otype T ) void swap( T * t1, T * t2 );§\indexc{swap}§
 \end{cfa}

doc/working/exception/design.txt

-                      re4d829b
+                      r579263a
 Design of Exceptions and EHM in Cforall:
+Currently this is a combination of ideas and big questions that still have to
+be addressed. It also includes some other error handling options, how they
+interact and compare to exceptions.
+Exception Instances:
+Currently, exceptions are integers (like errno).
+They are planned to be the new "tagged structures", which allows them to
+exist in a simple hierarchy which shared functionality throughout. However
+the tagged structures are not yet implemented so that will wait.
+A single built in exception is at the top of the hierarchy and all other
+exceptions are its children. When you match against an exception, you match
+for an exception and its children, so the top of the hierarchy is used as a
+catch-all option.
+The shared functionality across exceptions has not been finalized, but will
+probably include things like human readable descriptions and default handlers.
+What is an Exception:
+Throwing:
+There are currently two kinds of throws, "throw" for termination and
+"throwResume" for resumption. Both keywords can be used to create a throw
+statement. The kind of throw decides what handlers may catch the exception
+and weither control flow can return to the throw site.
+In other words what do we throw? What is matched against, how does it carry
+data with it? A very important question that has not been answered.
+Syntax
+"throw" exception ";"
+"throwResume" exception ";"
+Option 1: Strutures
+Non-local throws are allowed for resumption only. A target is an object with
+a stack, with which it may propagate and handle the exception.
+Considering the current state of Cforall the most natural form of the
+exception would likely be a struture, implementing a trait repersenting the
+minimum features of an exception. This has many advantages, including arbitray
+fields, some polymorphism and it matches exceptations of many current systems.
+Syntax
+"throwResume" exception "_At" target ";"
+The main issue with this is matching, without OOP inheritance there is no
+exception hierarchy. Meaning all handling has to happen on the exact exception
+without the ease of grouping parents. There are several ways to attempt to
+recover this.
+The first is with conditional matching (a check after the type has been
+matched) which allows for matching particular values of a known type. However
+this does not dynamically expand and requires an extra step (as opposed to
+mearly allowing one). I would not recomend this as the primary method.
+Second is to try and use type casts/conversions to create an implicate
+hierachy, so that a catch clause catches anything of the given type or
+anything that converts to the given type.
+Plan9 (from what I know of it) would be a powerful tool here. Even with it,
+creating a hierarchy of types at runtime might be too expencive. Esecially
+since they are less likely to be tree like at that point.
+Option 2: Tags
+The other option is to introduce a new construct into the language. A tag
+repersents a type of exception, it is not a structure or variable (or even
+a normal type). It may be usable in some of those contexts.
+Tags can declare an existing tag as its parent. Tags can be caught by handlers
+that catch their parents. (There is a single base_exception that all other
+exceptions are children of eventually.) This allows for grouping of exceptions
+that repersent similar errors.
+Tags should also have some assotiated data, where and on what did the error
+occur. Keeping with the otherness of exception tags and allowing them to be
+expanded, using a parameter list. Each exception can have a list of paramters
+given to it on a throw. Each tag would have a declared list of parameters
+(which could be treated more like a set of fields as well). Child tags must
+use their parent's list as a prefix to their own, so that the parameters can
+be accessed when the child tag is matched against the parent.
+Option N: ...
+This list is not complete.
+Termination throws unwind the stack until a handler is reached, control moves
+onwards from the end of the handler. Resumption throws do not unwind, if a
+handler is found and control will return to the throw after the exception is
+handled.
+Seperating Termination and Resumption:
+Catching:
+The catch and handle of an exception is preformed with a try statement, which
+also can have finally clauses to exceute on exit from the scope.
+Differentating the types of exceptions based on exception would be hard with
+exceptions as structures. It is possible with exceptions as tags by having
+two base exceptions, one for each type of throw. However recompining them
+to dual types would be harder.
+Syntax
+"try"
+        try-block
+( ("catch" | "catchResume")
+  "(" exception_type [identifier] [";" conditional_expression] ")"
+        catch-block
+)*
+("finally"
+        finally-block
+)?
+Reguardless, using different keywords would also be useful for clarity, even
+if it does not add functality. Using the C++ like keywords would be a good
+base. Resumption exceptions could use a different set (ex. raise->handle) or
+use resume as a qualifier on the existing statements.
+Either at least 1 handler clause or the finally clasue must be given on each
+try block. Each handler clause handles 1 of the two types of throws. Each
+handler also specifies a type of exception it handles, and will handle all
+children exceptions as well. In addition, a conditional expression which, if
+included, must be true for the handler to catch the exception.
+The two types of handlers may be intermixed. Multiple handlers catching the
+same type may also be used, to allow for fallbacks on false conditionals.
 Conditional Matching:
+Implementation Overview:
+A possible useful feature, it allows for arbitrary checks on a catch block
+instead of merely matching a type. However there are few use cases that
+cannot be avoided with proper use of a type hierarchy, and this shrinks even
 further with a good use of re-throws.
+The implementation has two main parts. The first is just a collection of the
+support definitions we need, the data types and functions used within the
+exception handling code. Second is a translation from Cforall code to C code
+that uses those definitions to throw, catch and handle exceptions.
+Also it assumes one sweep, that might also be a problem. But might also give
+it an advantage over re-throws.
+Termination handlers call a specially annotated function, passing it inner
+functions that act as the varius sub-blocks. Termination throws use the
+unwind library that checks the underlying code for those annotations. Each
+time one is found some magic is used to check for a matching handler, if one
+is found control goes to the special function which excecutes the handler and
+returns.
+Resumption handlers maintain a linked list of stack allocated nodes that have
+the handler functions attached. Throwing a resumption exception traverses this
+list, and calls each handler, the handlers handle the exception if they can
+and return if they did or not.
+Finally clauses just use stack cleanup to force a nested function, which has
+the code from the finally clause, to execute when we leave that section.
 Alternatives: Implicate Handlers & Return Unions
+Alternative Error Handling: Return Unions
+Both act as a kind of local version of an exception. Implicate handlers act as
+resumption exceptions and return unions like termination exceptions. By local
+I mean they work well at one or two levels of calls, but do not cover N levels
+as cleanly.
+Return unions (Maybe and Result), are types that can encode a success or
+other result in a single value. Maybe stores a value or nothing, Result stores
+a value or an error.
+Implicate handles require a growing number of function pointers (which should
+not be used very often) to be passed to functions, creating and additional
+preformance cost. Return unions have to be checked and handled at every level,
+which has some preformance cost, but also can significantly clutter code.
+Proper tools can help with the latter.
+For errors that are usually handled quite close to where they occur, these
+can replace exceptions.
+However, they may work better at that local level as they do not require stack
+walking or unwinding. In addition they are closer to regular control flow and
+are easier to staticly check. So even if they can't replace exceptions
+(directly) they may still be worth using together.
+For instance, consider the Python iterator interface. It uses a single
+function, __next__, to access the next value and to signal the end of the
+sequence. If a value is returned, it is the next value, if the StopIteration
+exception is thrown the sequence has finished.
+However almost every use of an iterator will add a try-except block around the
+call site (possibly through for or next) to catch and handle the exception
+immediately, ignoring the advantages of more distant exception handling.
+In this case it may be cleaner to use a Maybe for both cases (as in Rust)
+which gives similar results without having to jump to the exception handler.
+This will likely handle the error case more efficiently and the success case a
+bit less so.
+It also mixes the error and regular control flow, which can hurt readablity,
+but very little if the handling is simple, for instance providing a default
+value. Similarly, if the error (or alternate outcome) is common enough
+encoding it in the function signature may be good commuication.
+They tend to be faster and require similar or less amounts of code to handle.
+However they can slow down the normal path with some extra conditionals and
+can mix the normal and exceptional control flow path. If handling the error
+is simple, and happens relatively frequently, this might be prefered but in
+other cases it just hurts speed and readability.
 In short, these errors seem to be more effective when errors are likely and
 …
 be handled locally, might be better off using these instead of exceptions.
+Also the implicate handlers and return unions could use exceptions as well.
+For instance, a useful default might handler might be to throw an exception,
+seaching up the stack for a solution if one is not locally provided.
+Or here is a possible helper for unpacking a Result value:
+Also the return unions could use exceptions as well. Getting the improper
+side of a return union might throw an exception. Or we can provide helpers
+for results withe exceptions as in:
                 forall(otype T, otype E | exception(E))
                 T get_or_throw (Result(T, E) * this) {
                         if (is_success(this)) {
                                 return get_success(this);
+                        if (has_value(this)) {
+                                return get_value(this);
                         } else {
                                 throw get_failure(this);
+                                throw get_error(this);
+                        }
+                }
-So they can feed off of each other.

src/CodeGen/CodeGenerator.cc

-                      re4d829b
+                      r579263a
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Wed May 10 14:45:00 2017
 // Update Count     : 484
+// Last Modified On : Thu Jun  8 16:00:00 2017
+// Update Count     : 485
 //
 …
         CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ) {}
-        CodeGenerator::CodeGenerator( std::ostream & os, std::string init, int indentation, bool infunp )
-                        : indent( *this), cur_indent( indentation ), insideFunction( infunp ), output( os ), printLabels( *this ) {
-                //output << std::string( init );
+        }
-        CodeGenerator::CodeGenerator( std::ostream & os, char * init, int indentation, bool infunp )
-                        : indent( *this ), cur_indent( indentation ), insideFunction( infunp ), output( os ), printLabels( *this ) {
-                //output << std::string( init );
+        }
         string CodeGenerator::mangleName( DeclarationWithType * decl ) {
 …
+        }
+        void CodeGenerator::visit( ThrowStmt * throwStmt ) {
+                assertf( ! genC, "Throw statements should not reach code generation." );
+                output << ((throwStmt->get_kind() == ThrowStmt::Terminate) ?
+                           "throw" : "throwResume");
+                if (throwStmt->get_expr()) {
+                        output << " ";
+                        throwStmt->get_expr()->accept( *this );
+                }
+                if (throwStmt->get_target()) {
+                        output << " _At ";
+                        throwStmt->get_target()->accept( *this );
+                }
+                output << ";";
+        }
         void CodeGenerator::visit( WhileStmt * whileStmt ) {
                 if ( whileStmt->get_isDoWhile() ) {

src/CodeGen/CodeGenerator.h

-                      re4d829b
+                      r579263a
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Wed May 10 10:57:00 2017
 // Update Count     : 51
+// Last Modified On : Thu Jun  8 15:48:00 2017
+// Update Count     : 52
 //
 …
                 virtual void visit( BranchStmt * );
                 virtual void visit( ReturnStmt * );
+                virtual void visit( ThrowStmt * );
                 virtual void visit( WhileStmt * );
                 virtual void visit( ForStmt * );

src/CodeGen/FixNames.cc

-                      re4d829b
+                      r579263a
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Mar 16 07:50:30 2017
 // Update Count     : 16
+// Last Modified On : Wed Jun 21 14:22:59 2017
+// Update Count     : 19
 //
 …
                                 throw SemanticError("Main expected to have 0, 2 or 3 arguments\n", functionDecl);
+                        }
                         functionDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new ConstantExpr( Constant( new BasicType( Type::Qualifiers(), BasicType::SignedInt ), "0") ) ) );
+                        functionDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new ConstantExpr( Constant::from_int( 0 ) ) ) );
                         CodeGen::FixMain::registerMain( functionDecl );
+                }

src/Common/PassVisitor.h

-                      re4d829b
+                      r579263a
 #include "SynTree/Expression.h"
 #include "SynTree/Constant.h"
+#include "SynTree/TypeSubstitution.h"
 #include "PassVisitor.proto.h"
 …
 // Templated visitor type
 // To use declare a PassVisitor< YOUR VISITOR TYPE >
+// The visitor type should specify the previsit/postvisit for types that are desired.
+// The visitor type should specify the previsit/postvisit/premutate/postmutate for types that are desired.
+// Note: previsit/postvisit/premutate/postmutate must be **public** members
+//
+// Several additional features are available through inheritance
+// | WithTypeSubstitution - provides polymorphic TypeSubstitution * env for the current expression
+// | WithStmtsToAdd       - provides the ability to insert statements before or after the current statement by adding new statements into
+//                          stmtsToAddBefore or stmtsToAddAfter respectively.
+// | WithShortCircuiting  - provides the ability to skip visiting child nodes; set visit_children to false in pre{visit,mutate} to skip visiting children
+// | WithGuards           - provides the ability to save/restore data like a LIFO stack; to save, call GuardValue with the variable to save, the variable
+//                          will automatically be restored to its previous value after the corresponding postvisit/postmutate teminates.
 //-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 template< typename pass_type >
 class PassVisitor final : public Visitor, public Mutator {
 public:
-        PassVisitor() = default;
         template< typename... Args >
         PassVisitor(Args &&... args)
                 : pass( std::forward<Args>( args )... )
+        {}
+        {
+                typedef PassVisitor<pass_type> this_t;
+                this_t * const * visitor = visitor_impl(pass, 0);
+                if(visitor) {
+                        *const_cast<this_t **>( visitor ) = this;
+                }
+        }
         virtual ~PassVisitor() = default;
 …
         virtual void visit( BranchStmt *branchStmt ) override final;
         virtual void visit( ReturnStmt *returnStmt ) override final;
+        virtual void visit( ThrowStmt *throwStmt ) override final;
         virtual void visit( TryStmt *tryStmt ) override final;
         virtual void visit( CatchStmt *catchStmt ) override final;
 …
         virtual void visit( ConstructorExpr * ctorExpr ) override final;
         virtual void visit( CompoundLiteralExpr *compLitExpr ) override final;
-        virtual void visit( UntypedValofExpr *valofExpr ) override final;
         virtual void visit( RangeExpr *rangeExpr ) override final;
         virtual void visit( UntypedTupleExpr *tupleExpr ) override final;
         virtual void visit( TupleExpr *tupleExpr ) override final;
         virtual void visit( TupleIndexExpr *tupleExpr ) override final;
-        virtual void visit( MemberTupleExpr *tupleExpr ) override final;
         virtual void visit( TupleAssignExpr *assignExpr ) override final;
         virtual void visit( StmtExpr * stmtExpr ) override final;
 …
         virtual Statement* mutate( BranchStmt *branchStmt ) override final;
         virtual Statement* mutate( ReturnStmt *returnStmt ) override final;
+        virtual Statement* mutate( ThrowStmt *throwStmt ) override final;
         virtual Statement* mutate( TryStmt *returnStmt ) override final;
         virtual Statement* mutate( CatchStmt *catchStmt ) override final;
 …
         virtual Expression* mutate( ConstructorExpr *ctorExpr ) override final;
         virtual Expression* mutate( CompoundLiteralExpr *compLitExpr ) override final;
-        virtual Expression* mutate( UntypedValofExpr *valofExpr ) override final;
         virtual Expression* mutate( RangeExpr *rangeExpr ) override final;
         virtual Expression* mutate( UntypedTupleExpr *tupleExpr ) override final;
         virtual Expression* mutate( TupleExpr *tupleExpr ) override final;
         virtual Expression* mutate( TupleIndexExpr *tupleExpr ) override final;
-        virtual Expression* mutate( MemberTupleExpr *tupleExpr ) override final;
         virtual Expression* mutate( TupleAssignExpr *assignExpr ) override final;
         virtual Expression* mutate( StmtExpr * stmtExpr ) override final;
 …
 private:
+        template<typename pass_t> friend void acceptAll( std::list< Declaration* > &decls, PassVisitor< pass_t >& visitor );
+        template<typename pass_t> friend void mutateAll( std::list< Declaration* > &decls, PassVisitor< pass_t >& visitor );
         template<typename node_type> void call_previsit ( node_type * node ) { previsit_impl ( pass, node, 0 ); }
         template<typename node_type> void call_postvisit( node_type * node ) { postvisit_impl( pass, node, 0 ); }
 …
         void set_env( TypeSubstitution * env ) { set_env_impl( pass, env, 0); }
+        void visitStatementList( std::list< Statement* > &statements );
+        template< typename func_t >
+        void handleStatementList( std::list< Statement * > & statements, func_t func );
+        void visitStatementList ( std::list< Statement* > &statements );
         void mutateStatementList( std::list< Statement* > &statements );
+        Statement * visitStatement( Statement * stmt );
+        template< typename func_t >
+        Statement * handleStatement( Statement * stmt, func_t func );
+        Statement * visitStatement ( Statement * stmt );
         Statement * mutateStatement( Statement * stmt );
+        void visitExpression( Expression * expr );
+        template< typename func_t >
+        Expression * handleExpression( Expression * expr, func_t func );
+        Expression * visitExpression ( Expression * expr );
         Expression * mutateExpression( Expression * expr );
 …
         std::list< Statement* > *       get_beforeStmts() { return stmtsToAddBefore_impl( pass, 0); }
         std::list< Statement* > *       get_afterStmts () { return stmtsToAddAfter_impl ( pass, 0); }
+        bool visit_children() { bool* skip = skip_children_impl(pass, 0); return ! (skip && *skip); }
+        std::list< Declaration* > *     get_beforeDecls() { return declsToAddBefore_impl( pass, 0); }
+        std::list< Declaration* > *     get_afterDecls () { return declsToAddAfter_impl ( pass, 0); }
+        void set_visit_children( bool& ref ) { bool_ref * ptr = visit_children_impl(pass, 0); if(ptr) ptr->set( ref ); }
+        guard_value_impl init_guard() {
+                guard_value_impl guard;
+                auto at_cleanup = at_cleanup_impl(pass, 0);
+                if( at_cleanup ) {
+                        *at_cleanup = [&guard]( cleanup_func_t && func, void* val ) {
+                                guard.push( std::move( func ), val );
+                        };
+                }
+                return guard;
+        }
+};
+template<typename pass_type, typename T>
+void GuardValue( pass_type * pass, T& val ) {
+        pass->at_cleanup( [ val ]( void * newVal ) {
+                * static_cast< T * >( newVal ) = val;
+        }, static_cast< void * >( & val ) );
+}
+class WithTypeSubstitution {
+protected:
+        WithTypeSubstitution() = default;
+        ~WithTypeSubstitution() = default;
+public:
+        TypeSubstitution * env = nullptr;
+};
+class WithStmtsToAdd {
+protected:
+        WithStmtsToAdd() = default;
+        ~WithStmtsToAdd() = default;
+public:
+        std::list< Statement* > stmtsToAddBefore;
+        std::list< Statement* > stmtsToAddAfter;
+};
+class WithDeclsToAdd {
+protected:
+        WithDeclsToAdd() = default;
+        ~WithDeclsToAdd() = default;
+public:
+        std::list< Declaration* > declsToAddBefore;
+        std::list< Declaration* > declsToAddAfter;
+};
+class WithShortCircuiting {
+protected:
+        WithShortCircuiting() = default;
+        ~WithShortCircuiting() = default;
+public:
+        bool_ref visit_children;
+};
+class WithGuards {
+protected:
+        WithGuards() = default;
+        ~WithGuards() = default;
+public:
+        at_cleanup_t at_cleanup;
+        template< typename T >
+        void GuardValue( T& val ) {
+                at_cleanup( [ val ]( void * newVal ) {
+                        * static_cast< T * >( newVal ) = val;
+                }, static_cast< void * >( & val ) );
+        }
+        template< typename T >
+        void GuardScope( T& val ) {
+                val.beginScope();
+                at_cleanup( []( void * val ) {
+                        static_cast< T * >( val )->endScope();
+                }, static_cast< void * >( & val ) );
+        }
+        template< typename Func >
+        void GuardAction( Func func ) {
+                at_cleanup( [func](__attribute__((unused)) void *) { func(); }, nullptr );
+        }
+};
+template<typename pass_type>
+class WithVisitorRef {
+protected:
+        WithVisitorRef() {}
+        ~WithVisitorRef() {}
+public:
+        PassVisitor<pass_type> * const visitor = nullptr;
 };

src/Common/PassVisitor.impl.h

-                      re4d829b
+                      r579263a
 #pragma once
+#define VISIT_START( node )  \
+        call_previsit( node ); \
+        if( visit_children() ) { \
+#define VISIT_END( node )            \
+        }                              \
+        return call_postvisit( node ); \
+#define MUTATE_START( node )  \
+        call_premutate( node ); \
+        if( visit_children() ) { \
+#define VISIT_START( node )                     \
+        __attribute__((unused))                   \
+        const auto & guard = init_guard();        \
+        bool visit_children = true;               \
+        set_visit_children( visit_children );   \
+        call_previsit( node );                    \
+        if( visit_children ) {                    \
+#define VISIT_END( node )                       \
+        }                                         \
+        call_postvisit( node );                   \
+#define MUTATE_START( node )                    \
+        __attribute__((unused))                   \
+        const auto & guard = init_guard();        \
+        bool visit_children = true;               \
+        set_visit_children( visit_children );   \
+        call_premutate( node );                   \
+        if( visit_children ) {                    \
 #define MUTATE_END( type, node )                \
 …
 #define VISIT_BODY( node )    \
         VISIT_START( node );  \
         Visitor::visit( node ); \
         VISIT_END( node ); \
+#define VISIT_BODY( node )        \
+        VISIT_START( node );        \
+        Visitor::visit( node );     \
+        VISIT_END( node );          \
 …
+}
+typedef std::list< Statement * > StmtList_t;
+template< typename pass_type >
+void PassVisitor< pass_type >::visitStatementList( std::list< Statement * > & statements ) {
+typedef std::list< Statement   * > StmtList_t;
+typedef std::list< Declaration * > DeclList_t;
+template<typename iterator_t>
+static inline void splice( iterator_t it, DeclList_t * decls ) {
+        std::transform(
+                decls->begin(),
+                decls->end(),
+                it,
+                [](Declaration * decl) -> auto {
+                        return new DeclStmt( noLabels, decl );
+                }
+        );
+        decls->clear();
+}
+template< typename pass_type >
+static inline void acceptAll( std::list< Declaration* > &decls, PassVisitor< pass_type >& visitor ) {
+        DeclList_t* beforeDecls = visitor.get_beforeDecls();
+        DeclList_t* afterDecls  = visitor.get_afterDecls();
+        for ( std::list< Declaration* >::iterator i = decls.begin(); ; ++i ) {
+                // splice in new declarations after previous decl
+                if ( !empty( afterDecls ) ) { decls.splice( i, *afterDecls ); }
+                if ( i == decls.end() ) break;
+                // run mutator on declaration
+                maybeAccept( *i, visitor );
+                // splice in new declarations before current decl
+                if ( !empty( beforeDecls ) ) { decls.splice( i, *beforeDecls ); }
+        }
+}
+template< typename pass_type >
+static inline void mutateAll( std::list< Declaration* > &decls, PassVisitor< pass_type >& mutator ) {
+        DeclList_t* beforeDecls = mutator.get_beforeDecls();
+        DeclList_t* afterDecls  = mutator.get_afterDecls();
+        for ( std::list< Declaration* >::iterator i = decls.begin(); ; ++i ) {
+                // splice in new declarations after previous decl
+                if ( !empty( afterDecls ) ) { decls.splice( i, *afterDecls ); }
+                if ( i == decls.end() ) break;
+                // run mutator on declaration
+                *i = maybeMutate( *i, mutator );
+                // splice in new declarations before current decl
+                if ( !empty( beforeDecls ) ) { decls.splice( i, *beforeDecls ); }
+        }
+}
+template< typename pass_type >
+template< typename func_t >
+void PassVisitor< pass_type >::handleStatementList( std::list< Statement * > & statements, func_t func ) {
         SemanticError errors;
+        // don't want statements from outer CompoundStmts to be added to this CompoundStmt
+        ValueGuardPtr< StmtList_t > oldBeforeStmts( get_beforeStmts() );
+        ValueGuardPtr< StmtList_t > oldAfterStmts ( get_afterStmts () );
+        ValueGuardPtr< DeclList_t > oldBeforeDecls( get_beforeDecls() );
+        ValueGuardPtr< DeclList_t > oldAfterDecls ( get_afterDecls () );
         StmtList_t* beforeStmts = get_beforeStmts();
         StmtList_t* afterStmts  = get_afterStmts();
+        DeclList_t* beforeDecls = get_beforeDecls();
+        DeclList_t* afterDecls  = get_afterDecls();
         for ( std::list< Statement* >::iterator i = statements.begin(); i != statements.end(); ++i ) {
+                if ( !empty( afterDecls ) ) { splice( std::inserter( statements, i ), afterDecls ); }
                 if ( !empty( afterStmts ) ) { statements.splice( i, *afterStmts ); }
                 try {
+                        (*i)->accept( *this );
+                        func( *i );
+                        assert(( empty( beforeStmts ) && empty( afterStmts ))
+                            || ( empty( beforeDecls ) && empty( afterDecls )) );
                 } catch ( SemanticError &e ) {
                         errors.append( e );
+                }
+                if ( !empty( beforeDecls ) ) { splice( std::inserter( statements, i ), beforeDecls ); }
                 if ( !empty( beforeStmts ) ) { statements.splice( i, *beforeStmts ); }
+        }
+        if ( !empty( afterDecls ) ) { splice( std::back_inserter( statements ), afterDecls); }
         if ( !empty( afterStmts ) ) { statements.splice( statements.end(), *afterStmts ); }
         if ( !errors.isEmpty() ) { throw errors; }
 …
 template< typename pass_type >
+void PassVisitor< pass_type >::visitStatementList( std::list< Statement * > & statements ) {
+        handleStatementList( statements, [this]( Statement * stmt) {
+                stmt->accept( *this );
+        });
+}
+template< typename pass_type >
 void PassVisitor< pass_type >::mutateStatementList( std::list< Statement * > & statements ) {
+        SemanticError errors;
+        handleStatementList( statements, [this]( Statement *& stmt) {
+                stmt = stmt->acceptMutator( *this );
+        });
+}
+template< typename pass_type >
+template< typename func_t >
+Statement * PassVisitor< pass_type >::handleStatement( Statement * stmt, func_t func ) {
+        // don't want statements from outer CompoundStmts to be added to this CompoundStmt
+        ValueGuardPtr< TypeSubstitution * >  oldEnv        ( get_env_ptr    () );
+        ValueGuardPtr< DeclList_t >          oldBeforeDecls( get_beforeDecls() );
+        ValueGuardPtr< DeclList_t >          oldAfterDecls ( get_afterDecls () );
+        ValueGuardPtr< StmtList_t >          oldBeforeStmts( get_beforeStmts() );
+        ValueGuardPtr< StmtList_t >          oldAfterStmts ( get_afterStmts () );
+        Statement *newStmt = func( stmt );
         StmtList_t* beforeStmts = get_beforeStmts();
         StmtList_t* afterStmts  = get_afterStmts();
+        for ( std::list< Statement* >::iterator i = statements.begin(); i != statements.end(); ++i ) {
+                if ( !empty( afterStmts ) ) { statements.splice( i, *afterStmts ); }
+                try {
+                        *i = (*i)->acceptMutator( *this );
+                } catch ( SemanticError &e ) {
+                        errors.append( e );
+                }
+                if ( !empty( beforeStmts ) ) { statements.splice( i, *beforeStmts ); }
+        }
+        if ( !empty( afterStmts ) ) { statements.splice( statements.end(), *afterStmts ); }
+        if ( !errors.isEmpty() ) { throw errors; }
+}
+template< typename pass_type >
+Statement * PassVisitor< pass_type >::visitStatement( Statement * stmt ) {
+        // don't want statements from outer CompoundStmts to be added to this CompoundStmt
+        ValueGuardPtr< TypeSubstitution * >      oldEnv        ( get_env_ptr() );
+        ValueGuardPtr< std::list< Statement* > > oldBeforeStmts( get_beforeStmts() );
+        ValueGuardPtr< std::list< Statement* > > oldAfterStmts ( get_afterStmts () );
+        maybeAccept( stmt, *this );
+        StmtList_t* beforeStmts = get_beforeStmts();
+        StmtList_t* afterStmts  = get_afterStmts();
+        if( empty(beforeStmts) && empty(afterStmts) ) { return stmt; }
+        DeclList_t* beforeDecls = get_beforeDecls();
+        DeclList_t* afterDecls  = get_afterDecls();
+        if( empty(beforeStmts) && empty(afterStmts) && empty(beforeDecls) && empty(afterDecls) ) { return newStmt; }
+        assert(( empty( beforeStmts ) && empty( afterStmts ))
+            || ( empty( beforeDecls ) && empty( afterDecls )) );
         CompoundStmt *compound = new CompoundStmt( noLabels );
+        if( !empty(beforeDecls) ) { splice( std::back_inserter( compound->get_kids() ), beforeDecls ); }
         if( !empty(beforeStmts) ) { compound->get_kids().splice( compound->get_kids().end(), *beforeStmts ); }
+        compound->get_kids().push_back( stmt );
+        compound->get_kids().push_back( newStmt );
+        if( !empty(afterDecls) ) { splice( std::back_inserter( compound->get_kids() ), afterDecls ); }
         if( !empty(afterStmts) ) { compound->get_kids().splice( compound->get_kids().end(), *afterStmts ); }
         return compound;
 …
 template< typename pass_type >
+Statement * PassVisitor< pass_type >::visitStatement( Statement * stmt ) {
+        return handleStatement( stmt, [this]( Statement * stmt ) {
+                maybeAccept( stmt, *this );
+                return stmt;
+        });
+}
+template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutateStatement( Statement * stmt ) {
+        // don't want statements from outer CompoundStmts to be added to this CompoundStmt
+        ValueGuardPtr< TypeSubstitution * >      oldEnv        ( get_env_ptr() );
+        ValueGuardPtr< std::list< Statement* > > oldBeforeStmts( get_beforeStmts() );
+        ValueGuardPtr< std::list< Statement* > > oldAfterStmts ( get_afterStmts () );
+        Statement *newStmt = maybeMutate( stmt, *this );
+        StmtList_t* beforeStmts = get_beforeStmts();
+        StmtList_t* afterStmts  = get_afterStmts();
+        if( empty(beforeStmts) && empty(afterStmts) ) { return newStmt; }
+        CompoundStmt *compound = new CompoundStmt( noLabels );
+        if( !empty(beforeStmts) ) { compound->get_kids().splice( compound->get_kids().end(), *beforeStmts ); }
+        compound->get_kids().push_back( newStmt );
+        if( !empty(afterStmts) ) { compound->get_kids().splice( compound->get_kids().end(), *afterStmts ); }
+        return compound;
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visitExpression( Expression * expr ) {
+        if( !expr ) return;
+        return handleStatement( stmt, [this]( Statement * stmt ) {
+                return maybeMutate( stmt, *this );
+        });
+}
+template< typename pass_type >
+template< typename func_t >
+Expression * PassVisitor< pass_type >::handleExpression( Expression * expr, func_t func ) {
+        if( !expr ) return nullptr;
         auto env_ptr = get_env_ptr();
 …
                 *env_ptr = expr->get_env();
+        }
+        // xxx - should env be cloned (or moved) onto the result of the mutate?
+        expr->accept( *this );
+        // should env be cloned (or moved) onto the result of the mutate?
+        return func( expr );
+}
+template< typename pass_type >
+Expression * PassVisitor< pass_type >::visitExpression( Expression * expr ) {
+        return handleExpression(expr, [this]( Expression * expr ) {
+                expr->accept( *this );
+                return expr;
+        });
+}
 template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutateExpression( Expression * expr ) {
+        if( !expr ) return nullptr;
+        auto env_ptr = get_env_ptr();
+        if ( env_ptr && expr->get_env() ) {
+                *env_ptr = expr->get_env();
+        }
+        // xxx - should env be cloned (or moved) onto the result of the mutate?
+        return expr->acceptMutator( *this );
+}
+        return handleExpression(expr, [this]( Expression * expr ) {
+                return expr->acceptMutator( *this );
+        });
+}
 //------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ObjectDecl * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( FunctionDecl * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( StructDecl * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( UnionDecl * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( EnumDecl * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( TraitDecl * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( TypeDecl * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( TypedefDecl * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( AsmDecl * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 …
 void PassVisitor< pass_type >::visit( ExprStmt * node ) {
         VISIT_START( node );
-        call_beginScope();
         visitExpression( node->get_expr() );
-        call_endScope();
         VISIT_END( node );
+}
 …
+}
+//--------------------------------------------------------------------------
+// AsmStmt
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( AsmStmt * node ) {
+        VISIT_BODY( node );
+        VISIT_BODY( node );
+}
+template< typename pass_type >
+Statement * PassVisitor< pass_type >::mutate( AsmStmt * node ) {
+        MUTATE_BODY( Statement, node );
+}
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( IfStmt * node ) {
         VISIT_START( node );
+        VISIT_START( node );
         visitExpression( node->get_condition() );
 …
 template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( IfStmt * node ) {
         MUTATE_START( node );
+        MUTATE_START( node );
         node->set_condition( mutateExpression( node->get_condition() ) );
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( WhileStmt * node ) {
         VISIT_START( node );
+        VISIT_START( node );
         visitExpression( node->get_condition() );
 …
 template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( WhileStmt * node ) {
         MUTATE_START( node );
+        MUTATE_START( node );
         node->set_condition( mutateExpression( node->get_condition() ) );
 …
 //--------------------------------------------------------------------------
 // WhileStmt
+// ForStmt
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ForStmt * node ) {
         VISIT_START( node );
+        VISIT_START( node );
         acceptAll( node->get_initialization(), *this );
 …
 template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( ForStmt * node ) {
         MUTATE_START( node );
+        MUTATE_START( node );
         mutateAll( node->get_initialization(), *this );
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( SwitchStmt * node ) {
         VISIT_START( node );
+        VISIT_START( node );
         visitExpression( node->get_condition() );
 …
 template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( SwitchStmt * node ) {
         MUTATE_START( node );
+        MUTATE_START( node );
         node->set_condition( mutateExpression( node->get_condition() ) );
         mutateStatementList( node->get_statements() );
         MUTATE_END( Statement, node );
+}
 //--------------------------------------------------------------------------
 // SwitchStmt
+// CaseStmt
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( CaseStmt * node ) {
         VISIT_START( node );
+        VISIT_START( node );
         visitExpression( node->get_condition() );
         visitStatementList( node->get_statements() );
         VISIT_END( node );
+}
 …
 template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( CaseStmt * node ) {
         MUTATE_START( node );
+        MUTATE_START( node );
         node->set_condition(  mutateExpression( node->get_condition() ) );
         mutateStatementList( node->get_statements() );
         MUTATE_END( Statement, node );
+}
+//--------------------------------------------------------------------------
+// BranchStmt
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( BranchStmt * node ) {
+        VISIT_BODY( node );
+        VISIT_BODY( node );
+}
+template< typename pass_type >
+Statement * PassVisitor< pass_type >::mutate( BranchStmt * node ) {
+        MUTATE_BODY( Statement, node );
+}
 …
         MUTATE_END( Statement, node );
+}
+//--------------------------------------------------------------------------
+// ThrowStmt
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( ThrowStmt * node ) {
+        VISIT_BODY( node );
+}
+template< typename pass_type >
+Statement * PassVisitor< pass_type >::mutate( ThrowStmt * node ) {
+        MUTATE_BODY( Statement, node );
+}
 …
         maybeAccept( node->get_block(), *this );
         acceptAll( node->get_catchers(), *this );
+        maybeAccept( node->get_finally(), *this );
         VISIT_END( node );
 …
         node->set_block(  maybeMutate( node->get_block(), *this ) );
         mutateAll( node->get_catchers(), *this );
+        node->set_finally( maybeMutate( node->get_finally(), *this ) );
         MUTATE_END( Statement, node );
+}
 …
         VISIT_START( node );
+        maybeAccept( node->get_decl(), *this );
+        node->set_cond( visitExpression( node->get_cond() ) );
         node->set_body( visitStatement( node->get_body() ) );
-        maybeAccept( node->get_decl(), *this );
         VISIT_END( node );
 …
 Statement * PassVisitor< pass_type >::mutate( CatchStmt * node ) {
         MUTATE_START( node );
+        node->set_body(  mutateStatement( node->get_body() ) );
+        node->set_decl(  maybeMutate( node->get_decl(), *this ) );
+        node->set_decl( maybeMutate( node->get_decl(), *this ) );
+        node->set_cond( mutateExpression( node->get_cond() ) );
+        node->set_body( mutateStatement( node->get_body() ) );
         MUTATE_END( Statement, node );
+}
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( FinallyStmt * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( NullStmt * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( DeclStmt * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ImplicitCtorDtorStmt * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ApplicationExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 …
 void PassVisitor< pass_type >::visit( UntypedExpr * node ) {
         VISIT_START( node );
+        // maybeAccept( node->get_env(), *this );
+        maybeAccept( node->get_result(), *this );
         for ( auto expr : node->get_args() ) {
 …
         MUTATE_START( node );
+        node->set_env( maybeMutate( node->get_env(), *this ) );
+        node->set_result( maybeMutate( node->get_result(), *this ) );
         for ( auto& expr : node->get_args() ) {
                 expr = mutateExpression( expr );
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( NameExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( CastExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( AddressExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( LabelAddressExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( UntypedMemberExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( MemberExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( VariableExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ConstantExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( SizeofExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( AlignofExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( UntypedOffsetofExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( OffsetofExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( OffsetPackExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( AttrExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( LogicalExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ConditionalExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( CommaExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( TypeExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( AsmExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ImplicitCopyCtorExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ConstructorExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( CompoundLiteralExpr * node ) {
+        VISIT_BODY( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( UntypedValofExpr * node ) {
+        VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( RangeExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( UntypedTupleExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( TupleExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( TupleIndexExpr * node ) {
+        VISIT_BODY( node );
+}
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( MemberTupleExpr * node ) {
+        VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( TupleAssignExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 …
 Expression * PassVisitor< pass_type >::mutate( StmtExpr * node ) {
         MUTATE_START( node );
         // don't want statements from outer CompoundStmts to be added to this StmtExpr
         ValueGuardPtr< TypeSubstitution * >      oldEnv        ( get_env_ptr() );
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( UniqueExpr * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( VoidType * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( BasicType * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( PointerType * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ArrayType * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( FunctionType * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( StructInstType * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( UnionInstType * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( EnumInstType * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( TraitInstType * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( TypeInstType * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( TupleType * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( TypeofType * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( AttrType * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( VarArgsType * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ZeroType * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( OneType * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ListInit * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ConstructorInit * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( Subrange * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( Constant * node ) {
         VISIT_BODY( node );
+        VISIT_BODY( node );
+}
 …
 template< typename pass_type >
-Statement * PassVisitor< pass_type >::mutate( AsmStmt * node ) {
-        MUTATE_BODY( Statement, node );
+}
-template< typename pass_type >
-Statement * PassVisitor< pass_type >::mutate( BranchStmt * node ) {
-        MUTATE_BODY( Statement, node );
+}
-template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( FinallyStmt * node ) {
         MUTATE_BODY( Statement, node );
 …
 template< typename pass_type >
-Expression * PassVisitor< pass_type >::mutate( UntypedValofExpr * node ) {
-        MUTATE_BODY( Expression, node );
+}
-template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( RangeExpr * node ) {
         MUTATE_BODY( Expression, node );
 …
 template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( TupleIndexExpr * node ) {
-        MUTATE_BODY( Expression, node );
+}
-template< typename pass_type >
-Expression * PassVisitor< pass_type >::mutate( MemberTupleExpr * node ) {
         MUTATE_BODY( Expression, node );
+}

src/Common/PassVisitor.proto.h

-                      re4d829b
+                      r579263a
 #pragma once
+template<typename pass_type>
+class PassVisitor;
+typedef std::function<void( void * )> cleanup_func_t;
+class guard_value_impl {
+public:
+        guard_value_impl() = default;
+        ~guard_value_impl() {
+                while( !cleanups.empty() ) {
+                        auto& cleanup = cleanups.top();
+                        cleanup.func( cleanup.val );
+                        cleanups.pop();
+                }
+        }
+        void push( cleanup_func_t && func, void* val ) {
+                cleanups.emplace( std::move(func), val );
+        }
+private:
+        struct cleanup_t {
+                cleanup_func_t func;
+                void * val;
+                cleanup_t( cleanup_func_t&& func, void * val ) : func(func), val(val) {}
+        };
+        std::stack< cleanup_t > cleanups;
+};
+typedef std::function< void( cleanup_func_t, void * ) > at_cleanup_t;
+class bool_ref {
+public:
+        bool_ref() = default;
+        ~bool_ref() = default;
+        operator bool() { return *m_ref; }
+        bool operator=( bool val ) { return *m_ref = val; }
+private:
+        template<typename pass>
+        friend class PassVisitor;
+        void set( bool & val ) { m_ref = &val; };
+        bool * m_ref;
+};
 //-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 // Deep magic (a.k.a template meta programming) to make the templated visitor work
 // Basically the goal is to make 2 previsit_impl
 // 1 - Use when a pass implements a valid previsit. This uses overloading which means the any overload of
+// 1 - Use when a pass implements a valid previsit. This uses overloading which means the any overload of
 //     'pass.previsit( node )' that compiles will be used for that node for that type
 //     This requires that this option only compile for passes that actually define an appropriate visit.
 …
 // Visit
 template<typename pass_type, typename node_type>
 static inline auto previsit_impl( pass_type& pass, node_type * node, __attribute__((unused)) int unused ) ->decltype( pass.previsit( node ), void() ) {
+static inline auto previsit_impl( pass_type& pass, node_type * node, __attribute__((unused)) int unused ) -> decltype( pass.previsit( node ), void() ) {
         pass.previsit( node );
+}
 …
 template<typename pass_type, typename node_type>
 static inline auto postvisit_impl( pass_type& pass, node_type * node, __attribute__((unused)) int unused ) ->decltype( pass.postvisit( node ), void() ) {
+static inline auto postvisit_impl( pass_type& pass, node_type * node, __attribute__((unused)) int unused ) -> decltype( pass.postvisit( node ), void() ) {
         pass.postvisit( node );
+}
 …
 // Mutate
 template<typename pass_type, typename node_type>
 static inline auto premutate_impl( pass_type& pass, node_type * node, __attribute__((unused)) int unused ) ->decltype( pass.premutate( node ), void() ) {
+static inline auto premutate_impl( pass_type& pass, node_type * node, __attribute__((unused)) int unused ) -> decltype( pass.premutate( node ), void() ) {
         return pass.premutate( node );
+}
 …
 template<typename return_type, typename pass_type, typename node_type>
 static inline auto postmutate_impl( pass_type& pass, node_type * node, __attribute__((unused)) int unused ) ->decltype( pass.postmutate( node ) ) {
+static inline auto postmutate_impl( pass_type& pass, node_type * node, __attribute__((unused)) int unused ) -> decltype( pass.postmutate( node ) ) {
         return pass.postmutate( node );
+}
 …
 // Begin/End scope
 template<typename pass_type>
 static inline auto begin_scope_impl( pass_type& pass, __attribute__((unused)) int unused ) ->decltype( pass.beginScope(), void() ) {
+static inline auto begin_scope_impl( pass_type& pass, __attribute__((unused)) int unused ) -> decltype( pass.beginScope(), void() ) {
         pass.beginScope();
+}
 …
 template<typename pass_type>
 static inline auto end_scope_impl( pass_type& pass, __attribute__((unused)) int unused ) ->decltype( pass.endScope(), void() ) {
+static inline auto end_scope_impl( pass_type& pass, __attribute__((unused)) int unused ) -> decltype( pass.endScope(), void() ) {
         pass.endScope();
+}
 …
 #define FIELD_PTR( type, name )                                                                                                        \
 template<typename pass_type>                                                                                                           \
 static inline auto name##_impl( pass_type& pass, __attribute__((unused)) int unused ) ->decltype( &pass.name ) { return &pass.name; }  \
+static inline auto name##_impl( pass_type& pass, __attribute__((unused)) int unused ) -> decltype( &pass.name ) { return &pass.name; } \
+                                                                                                                                       \
 template<typename pass_type>                                                                                                           \
 …
 FIELD_PTR( std::list< Statement* >, stmtsToAddBefore )
 FIELD_PTR( std::list< Statement* >, stmtsToAddAfter  )
+FIELD_PTR( bool, skip_children )
+FIELD_PTR( std::list< Declaration* >, declsToAddBefore )
+FIELD_PTR( std::list< Declaration* >, declsToAddAfter  )
+FIELD_PTR( bool_ref, visit_children )
+FIELD_PTR( at_cleanup_t, at_cleanup )
+FIELD_PTR( PassVisitor<pass_type> * const, visitor )

src/GenPoly/Box.cc

-                      re4d829b
+                      r579263a
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat May 13 09:26:38 2017
 // Update Count     : 341
+// Last Modified On : Wed Jun 21 15:49:59 2017
+// Update Count     : 346
 //
 …
                         Type *replaceWithConcrete( ApplicationExpr *appExpr, Type *type, bool doClone = true );
                         /// wraps a function application returning a polymorphic type with a new temporary for the out-parameter return value
                         Expression *addDynRetParam( ApplicationExpr *appExpr, FunctionType *function, Type *polyType, std::list< Expression *>::iterator &arg );
+                        Expression *addDynRetParam( ApplicationExpr *appExpr, Type *polyType, std::list< Expression *>::iterator &arg );
                         Expression *applyAdapter( ApplicationExpr *appExpr, FunctionType *function, std::list< Expression *>::iterator &arg, const TyVarMap &exprTyVars );
                         void boxParam( Type *formal, Expression *&arg, const TyVarMap &exprTyVars );
 …
         Statement *makeAlignTo( Expression *lhs, Expression *rhs ) {
                 // check that the lhs is zeroed out to the level of rhs
                 Expression *ifCond = makeOp( "?&?", lhs, makeOp( "?-?", rhs, new ConstantExpr( Constant( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), "1" ) ) ) );
+                Expression *ifCond = makeOp( "?&?", lhs, makeOp( "?-?", rhs, new ConstantExpr( Constant::from_ulong( 1 ) ) ) );
                 // if not aligned, increment to alignment
                 Expression *ifExpr = makeOp( "?+=?", lhs->clone(), makeOp( "?-?", rhs->clone(), ifCond->clone() ) );
 …
                 // initialize size and alignment to 0 and 1 (will have at least one member to re-edit size)
                 addExpr( layoutDecl->get_statements(), makeOp( "?=?", derefVar( sizeParam ), new ConstantExpr( Constant( sizeAlignType->clone(), "0" ) ) ) );
                 addExpr( layoutDecl->get_statements(), makeOp( "?=?", derefVar( alignParam ), new ConstantExpr( Constant( sizeAlignType->clone(), "1" ) ) ) );
+                addExpr( layoutDecl->get_statements(), makeOp( "?=?", derefVar( sizeParam ), new ConstantExpr( Constant::from_ulong( 0 ) ) ) );
+                addExpr( layoutDecl->get_statements(), makeOp( "?=?", derefVar( alignParam ), new ConstantExpr( Constant::from_ulong( 1 ) ) ) );
                 unsigned long n_members = 0;
                 bool firstMember = true;
 …
                 // calculate union layout in function body
                 addExpr( layoutDecl->get_statements(), makeOp( "?=?", derefVar( sizeParam ), new ConstantExpr( Constant( sizeAlignType->clone(), "1" ) ) ) );
                 addExpr( layoutDecl->get_statements(), makeOp( "?=?", derefVar( alignParam ), new ConstantExpr( Constant( sizeAlignType->clone(), "1" ) ) ) );
+                addExpr( layoutDecl->get_statements(), makeOp( "?=?", derefVar( sizeParam ), new ConstantExpr( Constant::from_ulong( 1 ) ) ) );
+                addExpr( layoutDecl->get_statements(), makeOp( "?=?", derefVar( alignParam ), new ConstantExpr( Constant::from_ulong( 1 ) ) ) );
                 for ( std::list< Declaration* >::const_iterator member = unionDecl->get_members().begin(); member != unionDecl->get_members().end(); ++member ) {
                         DeclarationWithType *dwt = dynamic_cast< DeclarationWithType * >( *member );
 …
                 DeclarationWithType *Pass1::mutate( FunctionDecl *functionDecl ) {
                         if ( functionDecl->get_statements() ) {         // empty routine body ?
+                                // std::cerr << "mutating function: " << functionDecl->get_mangleName() << std::endl;
                                 doBeginScope();
                                 scopeTyVars.beginScope();
 …
                                 retval = oldRetval;
                                 doEndScope();
+                                // std::cerr << "end function: " << functionDecl->get_mangleName() << std::endl;
                         } // if
                         return functionDecl;
 …
+                }
                 Expression *Pass1::addDynRetParam( ApplicationExpr *appExpr, FunctionType *function, Type *dynType, std::list< Expression *>::iterator &arg ) {
+                Expression *Pass1::addDynRetParam( ApplicationExpr *appExpr, Type *dynType, std::list< Expression *>::iterator &arg ) {
                         assert( env );
                         Type *concrete = replaceWithConcrete( appExpr, dynType );
 …
                 Expression *Pass1::mutate( ApplicationExpr *appExpr ) {
                         // std::cerr << "mutate appExpr: ";
+                        // std::cerr << "mutate appExpr: " << InitTweak::getFunctionName( appExpr ) << std::endl;
                         // for ( TyVarMap::iterator i = scopeTyVars.begin(); i != scopeTyVars.end(); ++i ) {
                         //      std::cerr << i->first << " ";
 …
                         ReferenceToType *dynRetType = isDynRet( function, exprTyVars );
+                        // std::cerr << function << std::endl;
+                        // std::cerr << "scopeTyVars: ";
+                        // printTyVarMap( std::cerr, scopeTyVars );
+                        // std::cerr << "exprTyVars: ";
+                        // printTyVarMap( std::cerr, exprTyVars );
+                        // std::cerr << "env: " << *env << std::endl;
+                        // std::cerr << needsAdapter( function, scopeTyVars ) << ! needsAdapter( function, exprTyVars) << std::endl;
                         // NOTE: addDynRetParam needs to know the actual (generated) return type so it can make a temp variable, so pass the result type from the appExpr
                         // passTypeVars needs to know the program-text return type (i.e. the distinction between _conc_T30 and T3(int))
                         // concRetType may not be a good name in one or both of these places. A more appropriate name change is welcome.
                         if ( dynRetType ) {
+                                // std::cerr << "dynRetType: " << dynRetType << std::endl;
                                 Type *concRetType = appExpr->get_result()->isVoid() ? nullptr : appExpr->get_result();
                                 ret = addDynRetParam( appExpr, function, concRetType, arg ); // xxx - used to use dynRetType instead of concRetType
+                                ret = addDynRetParam( appExpr, concRetType, arg ); // xxx - used to use dynRetType instead of concRetType
                         } else if ( needsAdapter( function, scopeTyVars ) && ! needsAdapter( function, exprTyVars) ) { // xxx - exprTyVars is used above...?
                                 // xxx - the ! needsAdapter check may be incorrect. It seems there is some situation where an adapter is applied where it shouldn't be, and this fixes it for some cases. More investigation is needed.
 …
                 /// Returns an index expression into the offset array for a type
                 Expression *makeOffsetIndex( Type *objectType, long i ) {
+                        std::stringstream offset_namer;
+                        offset_namer << i;
+                        ConstantExpr *fieldIndex = new ConstantExpr( Constant( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), offset_namer.str() ) );
+                        ConstantExpr *fieldIndex = new ConstantExpr( Constant::from_ulong( i ) );
                         UntypedExpr *fieldOffset = new UntypedExpr( new NameExpr( "?[?]" ) );
                         fieldOffset->get_args().push_back( new NameExpr( offsetofName( mangleType( objectType ) ) ) );
 …
                                 // all union members are at offset zero
                                 delete offsetofExpr;
                                 return new ConstantExpr( Constant( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), "0" ) );
+                                return new ConstantExpr( Constant::from_ulong( 0 ) );
                         } else return offsetofExpr;
+                }

src/GenPoly/DeclMutator.cc

-                      re4d829b
+                      r579263a
 // Author           : Aaron B. Moss
 // Created On       : Fri Nov 27 14:44:00 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Aug  4 11:16:43 2016
 // Update Count     : 3
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Jun 22 13:49:00 2017
+// Update Count     : 4
 //
 …
         Statement* DeclMutator::mutate(CatchStmt *catchStmt) {
                 catchStmt->set_decl( maybeMutate( catchStmt->get_decl(), *this ) );
+                catchStmt->set_cond( maybeMutate( catchStmt->get_cond(), *this ) );
                 catchStmt->set_body( mutateStatement( catchStmt->get_body() ) );
                 return catchStmt;

src/GenPoly/InstantiateGeneric.cc

-                      re4d829b
+                      r579263a
 #include "InstantiateGeneric.h"
-#include "DeclMutator.h"
 #include "GenPoly.h"
 #include "ScopedSet.h"
 #include "ScrubTyVars.h"
+#include "PolyMutator.h"
+#include "Common/PassVisitor.h"
+#include "Common/ScopedMap.h"
+#include "Common/UniqueName.h"
+#include "Common/utility.h"
 #include "ResolvExpr/typeops.h"
 …
 #include "SynTree/Type.h"
+#include "Common/ScopedMap.h"
 #include "Common/UniqueName.h"
+#include "Common/utility.h"
+#include "InitTweak/InitTweak.h"
 namespace GenPoly {
 …
+        }
-        // collect the environments of each TypeInstType so that type variables can be replaced
-        // xxx - possibly temporary solution. Access to type environments is required in GenericInstantiator, but it needs to be a DeclMutator which does not provide easy access to the type environments.
-        class EnvFinder final : public GenPoly::PolyMutator {
-        public:
-                using GenPoly::PolyMutator::mutate;
-                virtual Type * mutate( TypeInstType * inst ) override {
-                        if ( env ) envMap[inst] = env;
-                        return inst;
+                }
-                // don't want to associate an environment with TypeInstTypes that occur in function types - this may actually only apply to function types belonging to DeclarationWithTypes (or even just FunctionDecl)?
-                virtual Type * mutate( FunctionType * ftype ) override {
-                        return ftype;
+                }
-                std::unordered_map< ReferenceToType *, TypeSubstitution * > envMap;
-        };
         /// Mutator pass that replaces concrete instantiations of generic types with actual struct declarations, scoped appropriately
         class GenericInstantiator final : public DeclMutator {
+        struct GenericInstantiator final : public WithTypeSubstitution, public WithDeclsToAdd, public WithVisitorRef<GenericInstantiator>, public WithGuards {
                 /// Map of (generic type, parameter list) pairs to concrete type instantiations
                 InstantiationMap< AggregateDecl, AggregateDecl > instantiations;
 …
                 /// Namer for concrete types
                 UniqueName typeNamer;
+                /// Reference to mapping of environments
+                const std::unordered_map< ReferenceToType *, TypeSubstitution * > & envMap;
+        public:
+                GenericInstantiator( const std::unordered_map< ReferenceToType *, TypeSubstitution * > & envMap ) : DeclMutator(), instantiations(), dtypeStatics(), typeNamer("_conc_"), envMap( envMap ) {}
+                using DeclMutator::mutate;
+                virtual Type* mutate( StructInstType *inst ) override;
+                virtual Type* mutate( UnionInstType *inst ) override;
+                virtual void doBeginScope() override;
+                virtual void doEndScope() override;
+                /// Should not make use of type environment to replace types of function parameter and return values.
+                bool inFunctionType = false;
+                GenericInstantiator() : instantiations(), dtypeStatics(), typeNamer("_conc_") {}
+                Type* postmutate( StructInstType *inst );
+                Type* postmutate( UnionInstType *inst );
+                void premutate( FunctionType * ftype ) {
+                        GuardValue( inFunctionType );
+                        inFunctionType = true;
+                }
+                void beginScope();
+                void endScope();
         private:
                 /// Wrap instantiation lookup for structs
 …
         void instantiateGeneric( std::list< Declaration* > &translationUnit ) {
+                EnvFinder finder;
+                mutateAll( translationUnit, finder );
+                GenericInstantiator instantiator( finder.envMap );
+                instantiator.mutateDeclarationList( translationUnit );
+                PassVisitor<GenericInstantiator> instantiator;
+                mutateAll( translationUnit, instantiator );
+        }
 …
         Type *GenericInstantiator::replaceWithConcrete( Type *type, bool doClone ) {
                 if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( type ) ) {
+                        if ( envMap.count( typeInst ) ) {
+                                TypeSubstitution * env = envMap.at( typeInst );
+                        if ( env && ! inFunctionType ) {
                                 Type *concrete = env->lookup( typeInst->get_name() );
                                 if ( concrete ) {
 …
+        Type* GenericInstantiator::mutate( StructInstType *inst ) {
+                // mutate subtypes
+                Type *mutated = Mutator::mutate( inst );
+                inst = dynamic_cast< StructInstType* >( mutated );
+                if ( ! inst ) return mutated;
+        Type* GenericInstantiator::postmutate( StructInstType *inst ) {
                 // exit early if no need for further mutation
                 if ( inst->get_parameters().empty() ) return inst;
 …
                                 substituteMembers( inst->get_baseStruct()->get_members(), *inst->get_baseParameters(), typeSubs, concDecl->get_members() );
                                 insert( inst, typeSubs, concDecl ); // must insert before recursion
                                 concDecl->acceptMutator( *this ); // recursively instantiate members
                                 DeclMutator::addDeclaration( concDecl ); // must occur before declaration is added so that member instantiations appear first
+                                concDecl->acceptMutator( *visitor ); // recursively instantiate members
+                                declsToAddBefore.push_back( concDecl ); // must occur before declaration is added so that member instantiations appear first
+                        }
                         StructInstType *newInst = new StructInstType( inst->get_qualifiers(), concDecl->get_name() );
 …
+        }
+        Type* GenericInstantiator::mutate( UnionInstType *inst ) {
+                // mutate subtypes
+                Type *mutated = Mutator::mutate( inst );
+                inst = dynamic_cast< UnionInstType* >( mutated );
+                if ( ! inst ) return mutated;
+        Type* GenericInstantiator::postmutate( UnionInstType *inst ) {
                 // exit early if no need for further mutation
                 if ( inst->get_parameters().empty() ) return inst;
 …
                                 substituteMembers( inst->get_baseUnion()->get_members(), *inst->get_baseParameters(), typeSubs, concDecl->get_members() );
                                 insert( inst, typeSubs, concDecl ); // must insert before recursion
                                 concDecl->acceptMutator( *this ); // recursively instantiate members
                                 DeclMutator::addDeclaration( concDecl ); // must occur before declaration is added so that member instantiations appear first
+                                concDecl->acceptMutator( *visitor ); // recursively instantiate members
+                                declsToAddBefore.push_back( concDecl ); // must occur before declaration is added so that member instantiations appear first
+                        }
                         UnionInstType *newInst = new UnionInstType( inst->get_qualifiers(), concDecl->get_name() );
 …
+        }
+        void GenericInstantiator::doBeginScope() {
+                DeclMutator::doBeginScope();
+        void GenericInstantiator::beginScope() {
                 instantiations.beginScope();
                 dtypeStatics.beginScope();
+        }
+        void GenericInstantiator::doEndScope() {
+                DeclMutator::doEndScope();
+        void GenericInstantiator::endScope() {
                 instantiations.endScope();
                 dtypeStatics.endScope();

src/GenPoly/PolyMutator.cc

-                      re4d829b
+                      r579263a
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Aug  4 11:26:22 2016
 // Update Count     : 16
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Jun 22 13:47:00 2017
+// Update Count     : 17
 //
 …
         Statement * PolyMutator::mutate(TryStmt *tryStmt) {
                 tryStmt->set_block(  maybeMutate( tryStmt->get_block(), *this ) );
+                tryStmt->set_block( maybeMutate( tryStmt->get_block(), *this ) );
                 mutateAll( tryStmt->get_catchers(), *this );
+                tryStmt->set_finally( maybeMutate( tryStmt->get_finally(), *this ) );
                 return tryStmt;
+        }
         Statement * PolyMutator::mutate(CatchStmt *cathStmt) {
+                cathStmt->set_body(  mutateStatement( cathStmt->get_body() ) );
+                cathStmt->set_decl(  maybeMutate( cathStmt->get_decl(), *this ) );
+                cathStmt->set_body( mutateStatement( cathStmt->get_body() ) );
+                cathStmt->set_cond( maybeMutate( cathStmt->get_cond(), *this ) );
+                cathStmt->set_decl( maybeMutate( cathStmt->get_decl(), *this ) );
                 return cathStmt;
+        }

src/GenPoly/Specialize.cc

-                      re4d829b
+                      r579263a
+        }
         bool needsTupleSpecialization( Type *formalType, Type *actualType, TypeSubstitution *env ) {
+        bool needsTupleSpecialization( Type *formalType, Type *actualType ) {
                 // Needs tuple specialization if the structure of the formal type and actual type do not match.
                 // This is the case if the formal type has ttype polymorphism, or if the structure  of tuple types
 …
                 if ( FunctionType * fftype = getFunctionType( formalType ) ) {
                         if ( fftype->isTtype() ) return true;
+                        // conversion of 0 (null) to function type does not require tuple specialization
+                        if ( dynamic_cast< ZeroType * >( actualType ) ) return false;
                         FunctionType * aftype = getFunctionType( actualType );
                         assertf( aftype, "formal type is a function type, but actual type is not." );
 …
         bool needsSpecialization( Type *formalType, Type *actualType, TypeSubstitution *env ) {
                 return needsPolySpecialization( formalType, actualType, env ) || needsTupleSpecialization( formalType, actualType, env );
+                return needsPolySpecialization( formalType, actualType, env ) || needsTupleSpecialization( formalType, actualType );
+        }

src/InitTweak/FixInit.cc

-                      re4d829b
+                      r579263a
 // Created On       : Wed Jan 13 16:29:30 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Mar 17 09:13:47 2017
 // Update Count     : 71
+// Last Modified On : Wed Jun 21 17:35:05 2017
+// Update Count     : 74
 //
 …
                 typedef std::unordered_map< int, int > UnqCount;
                 class InsertImplicitCalls {
+                class InsertImplicitCalls : public WithTypeSubstitution {
                 public:
                         /// wrap function application expressions as ImplicitCopyCtorExpr nodes so that it is easy to identify which
 …
                         // collects environments for relevant nodes
                         EnvMap & envMap;
-                        TypeSubstitution * env; //Magically populated by the PassVisitor
                 };
 …
                 };
                 class FixInit {
+                class FixInit : public WithStmtsToAdd {
                   public:
                         /// expand each object declaration to use its constructor after it is declared.
 …
                         std::list< Declaration * > staticDtorDecls;
-                        std::list< Statement * > stmtsToAddAfter; // found by PassVisitor
                 };
 …
                                                 // static bool __objName_uninitialized = true
                                                 BasicType * boolType = new BasicType( Type::Qualifiers(), BasicType::Bool );
                                                 SingleInit * boolInitExpr = new SingleInit( new ConstantExpr( Constant( boolType->clone(), "1" ) ) );
+                                                SingleInit * boolInitExpr = new SingleInit( new ConstantExpr( Constant::from_int( 1 ) ) );
                                                 ObjectDecl * isUninitializedVar = new ObjectDecl( objDecl->get_mangleName() + "_uninitialized", Type::StorageClasses( Type::Static ), LinkageSpec::Cforall, 0, boolType, boolInitExpr );
                                                 isUninitializedVar->fixUniqueId();
 …
                                                 UntypedExpr * setTrue = new UntypedExpr( new NameExpr( "?=?" ) );
                                                 setTrue->get_args().push_back( new VariableExpr( isUninitializedVar ) );
                                                 setTrue->get_args().push_back( new ConstantExpr( Constant( boolType->clone(), "0" ) ) );
+                                                setTrue->get_args().push_back( new ConstantExpr( Constant::from_int( 0 ) ) );
                                                 // generate body of if
 …
+                }
                 void InsertDtors::visit( ReturnStmt * returnStmt ) {
+                void InsertDtors::visit( __attribute((unused)) ReturnStmt * returnStmt ) {
                         // return exits all scopes, so dump destructors for all scopes
                         for ( OrderedDecls & od : reverseDeclOrder ) {

src/InitTweak/GenInit.cc

-                      re4d829b
+                      r579263a
 namespace InitTweak {
+        class ReturnFixer final : public GenPoly::PolyMutator {
+          public:
+        namespace {
+                const std::list<Label> noLabels;
+                const std::list<Expression *> noDesignators;
+        }
+        struct ReturnFixer : public WithStmtsToAdd, public WithGuards {
                 /// consistently allocates a temporary variable for the return value
                 /// of a function so that anything which the resolver decides can be constructed
 …
                 static void makeReturnTemp( std::list< Declaration * > &translationUnit );
+                typedef GenPoly::PolyMutator Parent;
+                using Parent::mutate;
+                virtual DeclarationWithType * mutate( FunctionDecl *functionDecl ) override;
+                virtual Statement * mutate( ReturnStmt * returnStmt ) override;
+                void premutate( FunctionDecl *functionDecl );
+                void premutate( ReturnStmt * returnStmt );
           protected:
 …
         };
+        class CtorDtor final : public GenPoly::PolyMutator {
+          public:
+                typedef GenPoly::PolyMutator Parent;
+                using Parent::mutate;
+        struct CtorDtor : public WithGuards, public WithShortCircuiting  {
                 /// create constructor and destructor statements for object declarations.
                 /// the actual call statements will be added in after the resolver has run
 …
                 static void generateCtorDtor( std::list< Declaration * > &translationUnit );
+                virtual DeclarationWithType * mutate( ObjectDecl * ) override;
+                virtual DeclarationWithType * mutate( FunctionDecl *functionDecl ) override;
+                void previsit( ObjectDecl * );
+                void previsit( FunctionDecl *functionDecl );
                 // should not traverse into any of these declarations to find objects
                 // that need to be constructed or destructed
                 virtual Declaration* mutate( StructDecl *aggregateDecl ) override;
                 virtual Declaration* mutate( UnionDecl *aggregateDecl ) override { return aggregateDecl; }
                 virtual Declaration* mutate( EnumDecl *aggregateDecl ) override { return aggregateDecl; }
                 virtual Declaration* mutate( TraitDecl *aggregateDecl ) override { return aggregateDecl; }
                 virtual TypeDecl* mutate( TypeDecl *typeDecl ) override { return typeDecl; }
                 virtual Declaration* mutate( TypedefDecl *typeDecl ) override { return typeDecl; }
                 virtual Type * mutate( FunctionType *funcType ) override { return funcType; }
                 virtual CompoundStmt * mutate( CompoundStmt * compoundStmt ) override;
+                void previsit( StructDecl *aggregateDecl );
+                void previsit( UnionDecl *aggregateDecl ) { visit_children = false; }
+                void previsit( EnumDecl *aggregateDecl ) { visit_children = false; }
+                void previsit( TraitDecl *aggregateDecl ) { visit_children = false; }
+                void previsit( TypeDecl *typeDecl ) { visit_children = false; }
+                void previsit( TypedefDecl *typeDecl ) { visit_children = false; }
+                void previsit( FunctionType *funcType ) { visit_children = false; }
+                void previsit( CompoundStmt * compoundStmt );
           private:
 …
         void ReturnFixer::makeReturnTemp( std::list< Declaration * > & translationUnit ) {
                 ReturnFixer fixer;
+                PassVisitor<ReturnFixer> fixer;
                 mutateAll( translationUnit, fixer );
+        }
         Statement *ReturnFixer::mutate( ReturnStmt *returnStmt ) {
+        void ReturnFixer::premutate( ReturnStmt *returnStmt ) {
                 std::list< DeclarationWithType * > & returnVals = ftype->get_returnVals();
                 assert( returnVals.size() == 0 || returnVals.size() == 1 );
 …
                         construct->get_args().push_back( new AddressExpr( new VariableExpr( returnVals.front() ) ) );
                         construct->get_args().push_back( returnStmt->get_expr() );
                         stmtsToAdd.push_back(new ExprStmt(noLabels, construct));
+                        stmtsToAddBefore.push_back(new ExprStmt(noLabels, construct));
                         // return the retVal object
                         returnStmt->set_expr( new VariableExpr( returnVals.front() ) );
                 } // if
+                return returnStmt;
+        }
+        DeclarationWithType* ReturnFixer::mutate( FunctionDecl *functionDecl ) {
+                ValueGuard< FunctionType * > oldFtype( ftype );
+                ValueGuard< std::string > oldFuncName( funcName );
+        }
+        void ReturnFixer::premutate( FunctionDecl *functionDecl ) {
+                GuardValue( ftype );
+                GuardValue( funcName );
                 ftype = functionDecl->get_functionType();
                 funcName = functionDecl->get_name();
-                return Parent::mutate( functionDecl );
+        }
 …
         void CtorDtor::generateCtorDtor( std::list< Declaration * > & translationUnit ) {
                 CtorDtor ctordtor;
                 mutateAll( translationUnit, ctordtor );
+                PassVisitor<CtorDtor> ctordtor;
+                acceptAll( translationUnit, ctordtor );
+        }
 …
+        }
         DeclarationWithType * CtorDtor::mutate( ObjectDecl * objDecl ) {
+        void CtorDtor::previsit( ObjectDecl * objDecl ) {
                 handleDWT( objDecl );
                 // hands off if @=, extern, builtin, etc.
 …
                         objDecl->set_init( genCtorInit( objDecl ) );
+                }
+                return Parent::mutate( objDecl );
+        }
+        DeclarationWithType * CtorDtor::mutate( FunctionDecl *functionDecl ) {
+                ValueGuard< bool > oldInFunc = inFunction;
+        }
+        void CtorDtor::previsit( FunctionDecl *functionDecl ) {
+                GuardValue( inFunction );
                 inFunction = true;
                 handleDWT( functionDecl );
                 managedTypes.beginScope();
+                GuardScope( managedTypes );
                 // go through assertions and recursively add seen ctor/dtors
                 for ( auto & tyDecl : functionDecl->get_functionType()->get_forall() ) {
 …
+                        }
+                }
+                // parameters should not be constructed and destructed, so don't mutate FunctionType
+                functionDecl->set_statements( maybeMutate( functionDecl->get_statements(), *this ) );
+                managedTypes.endScope();
+                return functionDecl;
+        }
+        Declaration* CtorDtor::mutate( StructDecl *aggregateDecl ) {
+                PassVisitor<CtorDtor> newCtorDtor;
+                newCtorDtor.pass = *this;
+                maybeAccept( functionDecl->get_statements(), newCtorDtor );
+                visit_children = false;  // do not try and construct parameters or forall parameters - must happen after maybeAccept
+        }
+        void CtorDtor::previsit( StructDecl *aggregateDecl ) {
+                visit_children = false; // do not try to construct and destruct aggregate members
                 // don't construct members, but need to take note if there is a managed member,
                 // because that means that this type is also managed
 …
+                        }
+                }
+                return aggregateDecl;
+        }
+        CompoundStmt * CtorDtor::mutate( CompoundStmt * compoundStmt ) {
+                managedTypes.beginScope();
+                CompoundStmt * stmt = Parent::mutate( compoundStmt );
+                managedTypes.endScope();
+                return stmt;
+        }
+        }
+        void CtorDtor::previsit( CompoundStmt * compoundStmt ) {
+                GuardScope( managedTypes );
+        }
 } // namespace InitTweak

src/InitTweak/InitTweak.cc

re4d829b	r579263a
471	471	public:
472	472	ConstExprChecker() : isConstExpr( true ) {}
	473
	474	using Visitor::visit;
473	475
474	476	virtual void visit( __attribute((unused)) ApplicationExpr *applicationExpr ) { isConstExpr = false; }

src/Parser/ExpressionNode.cc

-                      re4d829b
+                      r579263a
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed May 17 21:31:01 2017
 // Update Count     : 527
+// Last Modified On : Wed Jun 21 16:44:46 2017
+// Update Count     : 541
 //
 …
         bool dec = true, Unsigned = false;                                      // decimal, unsigned constant
         int size;                                                                                       // 0 => int, 1 => long, 2 => long long
         unsigned long long v;                                                           // converted integral value
+        unsigned long long int v;                                                               // converted integral value
         size_t last = str.length() - 1;                                         // last character of constant
 …
         } // if
         Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[Unsigned][size] ), str ) );
+        Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[Unsigned][size] ), str, v ) );
         delete &str;                                                                            // created by lex
         return ret;
 …
         // floating-point constant has minimum of 2 characters: 1. or .1
         size_t last = str.length() - 1;
+        double v;
+        sscanf( str.c_str(), "%lg", &v );
         if ( checkI( str[last] ) ) {                                            // imaginary ?
 …
         } // if
         Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[complx][size] ), str ) );
+        Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[complx][size] ), str, v ) );
         delete &str;                                                                            // created by lex
         return ret;
 …
 Expression *build_constantChar( const std::string & str ) {
         Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::Char ), str ) );
+        Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::Char ), str, (unsigned long long int)(unsigned char)str[1] ) );
         delete &str;                                                                            // created by lex
         return ret;
 …
         // string should probably be a primitive type
         ArrayType *at = new ArrayType( emptyQualifiers, new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char ),
+                                new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::UnsignedInt ),
+                                                                                        toString( str.size()+1-2 ) ) ),  // +1 for '\0' and -2 for '"'
+                                                                   new ConstantExpr( Constant::from_ulong( str.size() + 1 - 2 ) ),  // +1 for '\0' and -2 for '"'
                                                                    false, false );
+        ConstantExpr * ret = new ConstantExpr( Constant( at, str ) );
+        // constant 0 is ignored for pure string value
+        ConstantExpr * ret = new ConstantExpr( Constant( at, str, (unsigned long long int)0 ) );
         delete &str;                                                                            // created by lex
         return ret;
 …
 Expression *build_constantZeroOne( const std::string & str ) {
+        Expression * ret = new ConstantExpr( Constant( str == "0" ? (Type *)new ZeroType( emptyQualifiers ) : (Type*)new OneType( emptyQualifiers ), str ) );
+        Expression * ret = new ConstantExpr( Constant( str == "0" ? (Type *)new ZeroType( emptyQualifiers ) : (Type*)new OneType( emptyQualifiers ), str,
+                                                                                                   str == "0" ? (unsigned long long int)0 : (unsigned long long int)1 ) );
         delete &str;                                                                            // created by lex
         return ret;
 …
         std::stringstream ss( str );
         ss >> a >> dot >> b;
+        UntypedMemberExpr * ret = new UntypedMemberExpr(
+                new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::SignedInt ), toString( b ) ) ),
+                new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::SignedInt ), toString( a ) ) ) );
+        UntypedMemberExpr * ret = new UntypedMemberExpr( new ConstantExpr( Constant::from_int( b ) ), new ConstantExpr( Constant::from_int( a ) ) );
         delete &str;
         return ret;
 …
 } // build_field_name_REALDECIMALconstant
 NameExpr * build_varref( const string *name, bool labelp ) {
+NameExpr * build_varref( const string *name ) {
         NameExpr *expr = new NameExpr( *name, nullptr );
         delete name;
 …
 Expression *build_valexpr( StatementNode *s ) {
         return new UntypedValofExpr( maybeMoveBuild< Statement >(s), nullptr );
+        return new StmtExpr( dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >(s) ) );
+}
 Expression *build_typevalue( DeclarationNode *decl ) {

src/Parser/ParseNode.h

-                      re4d829b
+                      r579263a
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Mar 17 15:42:18 2017
 // Update Count     : 777
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Jun 12 13:00:00 2017
+// Update Count     : 779
 //
 …
 Expression * build_field_name_REALDECIMALconstant( const std::string & str );
 NameExpr * build_varref( const std::string * name, bool labelp = false );
+NameExpr * build_varref( const std::string * name );
 Expression * build_typevalue( DeclarationNode * decl );
 …
 Statement * build_return( ExpressionNode * ctl );
 Statement * build_throw( ExpressionNode * ctl );
+Statement * build_resume( ExpressionNode * ctl );
+Statement * build_resume_at( ExpressionNode * ctl , ExpressionNode * target );
 Statement * build_try( StatementNode * try_stmt, StatementNode * catch_stmt, StatementNode * finally_stmt );
 Statement * build_catch( DeclarationNode * decl, StatementNode * stmt, bool catchAny = false );
+Statement * build_catch( CatchStmt::Kind kind, DeclarationNode *decl, ExpressionNode *cond, StatementNode *body );
 Statement * build_finally( StatementNode * stmt );
 Statement * build_compound( StatementNode * first );
 …
                                 result->location = cur->location;
                                 * out++ = result;
+                        } else {
+                                assertf(false, "buildList unknown type");
                         } // if
                 } catch( SemanticError &e ) {

src/Parser/StatementNode.cc

-                      re4d829b
+                      r579263a
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Feb  2 22:16:40 2017
 // Update Count     : 327
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Jun 12 13:03:00 2017
+// Update Count     : 329
 //
 …
         return new ReturnStmt( noLabels, exps.size() > 0 ? exps.back() : nullptr );
+}
 Statement *build_throw( ExpressionNode *ctl ) {
         std::list< Expression * > exps;
         buildMoveList( ctl, exps );
         assertf( exps.size() < 2, "This means we are leaking memory");
+        return new ReturnStmt( noLabels, !exps.empty() ? exps.back() : nullptr, true );
+        return new ThrowStmt( noLabels, ThrowStmt::Terminate, !exps.empty() ? exps.back() : nullptr );
+}
+Statement *build_resume( ExpressionNode *ctl ) {
+        std::list< Expression * > exps;
+        buildMoveList( ctl, exps );
+        assertf( exps.size() < 2, "This means we are leaking memory");
+        return new ThrowStmt( noLabels, ThrowStmt::Resume, !exps.empty() ? exps.back() : nullptr );
+}
+Statement *build_resume_at( ExpressionNode *ctl, ExpressionNode *target ) {
+        (void)ctl;
+        (void)target;
+        assertf( false, "resume at (non-local throw) is not yet supported," );
+}
 Statement *build_try( StatementNode *try_stmt, StatementNode *catch_stmt, StatementNode *finally_stmt ) {
         std::list< Statement * > branches;
         buildMoveList< Statement, StatementNode >( catch_stmt, branches );
+        std::list< CatchStmt * > branches;
+        buildMoveList< CatchStmt, StatementNode >( catch_stmt, branches );
         CompoundStmt *tryBlock = safe_dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >(try_stmt));
         FinallyStmt *finallyBlock = dynamic_cast< FinallyStmt * >(maybeMoveBuild< Statement >(finally_stmt) );
         return new TryStmt( noLabels, tryBlock, branches, finallyBlock );
+}
 Statement *build_catch( DeclarationNode *decl, StatementNode *stmt, bool catchAny ) {
         std::list< Statement * > branches;
         buildMoveList< Statement, StatementNode >( stmt, branches );
         assert( branches.size() == 1 );
         return new CatchStmt( noLabels, maybeMoveBuild< Declaration >(decl), branches.front(), catchAny );
+Statement *build_catch( CatchStmt::Kind kind, DeclarationNode *decl, ExpressionNode *cond, StatementNode *body ) {
+        std::list< Statement * > branches;
+        buildMoveList< Statement, StatementNode >( body, branches );
+        assert( branches.size() == 1 );
+        return new CatchStmt( noLabels, kind, maybeMoveBuild< Declaration >(decl), maybeMoveBuild< Expression >(cond), branches.front() );
+}
 Statement *build_finally( StatementNode *stmt ) {

src/Parser/parser.yy

-                      re4d829b
+                      r579263a
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu May 25 15:21:59 2017
 // Update Count     : 2398
+// Last Modified On : Mon Jun 12 12:59:00 2017
+// Update Count     : 2402
 //
 …
 %type<sn> case_value_list                               case_label                                      case_label_list
 %type<sn> switch_clause_list_opt                switch_clause_list                      choose_clause_list_opt          choose_clause_list
 %type<sn> handler_list                                  handler_clause                          finally_clause
+%type<sn> /* handler_list */                    handler_clause                          finally_clause
 // declarations
 …
                 { $$ = new ExpressionNode( build_attrtype( build_varref( $1 ), $3 ) ); }
 //      | ANDAND IDENTIFIER                                                                     // GCC, address of label
 //              { $$ = new ExpressionNode( new OperatorNode( OperKinds::LabelAddress ), new ExpressionNode( build_varref( $2, true ) ); }
+//              { $$ = new ExpressionNode( new OperatorNode( OperKinds::LabelAddress ), new ExpressionNode( build_varref( $2 ) ); }
+        ;
 …
                 { $$ = new StatementNode( build_throw( $2 ) ); }
         | THROWRESUME assignment_expression_opt ';'                     // handles reresume
                 { $$ = new StatementNode( build_throw( $2 ) ); }
+                { $$ = new StatementNode( build_resume( $2 ) ); }
         | THROWRESUME assignment_expression_opt AT assignment_expression ';' // handles reresume
                 { $$ = new StatementNode( build_throw( $2 ) ); }
+                { $$ = new StatementNode( build_resume_at( $2, $4 ) ); }
+        ;
 exception_statement:
         TRY compound_statement handler_list
+        TRY compound_statement handler_clause
                 { $$ = new StatementNode( build_try( $2, $3, 0 ) ); }
         | TRY compound_statement finally_clause
                 { $$ = new StatementNode( build_try( $2, 0, $3 ) ); }
         | TRY compound_statement handler_list finally_clause
+        | TRY compound_statement handler_clause finally_clause
                 { $$ = new StatementNode( build_try( $2, $3, $4 ) ); }
+        ;
 handler_list:
         handler_clause
                 // ISO/IEC 9899:1999 Section 15.3(6 ) If present, a "..." handler shall be the last handler for its try block.
         | CATCH '(' ELLIPSIS ')' compound_statement
                 { $$ = new StatementNode( build_catch( 0, $5, true ) ); }
         | handler_clause CATCH '(' ELLIPSIS ')' compound_statement
                 { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( 0, $6, true ) ) ); }
         | CATCHRESUME '(' ELLIPSIS ')' compound_statement
                 { $$ = new StatementNode( build_catch( 0, $5, true ) ); }
         | handler_clause CATCHRESUME '(' ELLIPSIS ')' compound_statement
                 { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( 0, $6, true ) ) ); }
+        ;
+//handler_list:
+//      handler_clause
+//              // ISO/IEC 9899:1999 Section 15.3(6 ) If present, a "..." handler shall be the last handler for its try block.
+//      | CATCH '(' ELLIPSIS ')' compound_statement
+//              { $$ = new StatementNode( build_catch( 0, $5, true ) ); }
+//      | handler_clause CATCH '(' ELLIPSIS ')' compound_statement
+//              { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( 0, $6, true ) ) ); }
+//      | CATCHRESUME '(' ELLIPSIS ')' compound_statement
+//              { $$ = new StatementNode( build_catch( 0, $5, true ) ); }
+//      | handler_clause CATCHRESUME '(' ELLIPSIS ')' compound_statement
+//              { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( 0, $6, true ) ) ); }
+//      ;
 handler_clause:
         CATCH '(' push push exception_declaration pop ')' compound_statement pop
                 { $$ = new StatementNode( build_catch( $5, $8 ) ); }
+                { $$ = new StatementNode( build_catch( CatchStmt::Terminate, $5, nullptr, $8 ) ); }
         | handler_clause CATCH '(' push push exception_declaration pop ')' compound_statement pop
                 { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $6, $9 ) ) ); }
+                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( CatchStmt::Terminate, $6, nullptr, $9 ) ) ); }
         | CATCHRESUME '(' push push exception_declaration pop ')' compound_statement pop
                 { $$ = new StatementNode( build_catch( $5, $8 ) ); }
+                { $$ = new StatementNode( build_catch( CatchStmt::Resume, $5, nullptr, $8 ) ); }
         | handler_clause CATCHRESUME '(' push push exception_declaration pop ')' compound_statement pop
                 { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $6, $9 ) ) ); }
+                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( CatchStmt::Resume, $6, nullptr, $9 ) ) ); }
+        ;

src/Parser/parseutility.cc

-                      re4d829b
+                      r579263a
 // Created On       : Sat May 16 15:30:39 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sun Aug 14 23:45:03 2016
 // Update Count     : 3
+// Last Modified On : Wed Jun 21 15:33:41 2017
+// Update Count     : 5
 //
 …
         UntypedExpr *comparison = new UntypedExpr( new NameExpr( "?!=?" ) );
         comparison->get_args().push_back( orig );
         comparison->get_args().push_back( new ConstantExpr( Constant( new ZeroType( emptyQualifiers ), "0" ) ) );
+        comparison->get_args().push_back( new ConstantExpr( Constant( new ZeroType( emptyQualifiers ), "0", (unsigned long long int)0 ) ) );
         return new CastExpr( comparison, new BasicType( Type::Qualifiers(), BasicType::SignedInt ) );
+}

src/ResolvExpr/AlternativeFinder.cc

-                      re4d829b
+                      r579263a
                 /// Prunes a list of alternatives down to those that have the minimum conversion cost for a given return type; skips ambiguous interpretations
                 template< typename InputIterator, typename OutputIterator >
                 void pruneAlternatives( InputIterator begin, InputIterator end, OutputIterator out, const SymTab::Indexer &indexer ) {
+                void pruneAlternatives( InputIterator begin, InputIterator end, OutputIterator out ) {
                         // select the alternatives that have the minimum conversion cost for a particular set of result types
                         std::map< std::string, PruneStruct > selected;
 …
+                        )
                         AltList::iterator oldBegin = alternatives.begin();
                         pruneAlternatives( alternatives.begin(), alternatives.end(), front_inserter( alternatives ), indexer );
+                        pruneAlternatives( alternatives.begin(), alternatives.end(), front_inserter( alternatives ) );
                         if ( alternatives.begin() == oldBegin ) {
                                 std::ostringstream stream;

src/ResolvExpr/CommonType.cc

-                      re4d829b
+                      r579263a
         void CommonType::visit( PointerType *pointerType ) {
                 if ( PointerType *otherPointer = dynamic_cast< PointerType* >( type2 ) ) {
                         if ( widenFirst && dynamic_cast< VoidType* >( otherPointer->get_base() ) && ! isFtype(pointerType->get_base(), indexer) ) {
+                        if ( widenFirst && dynamic_cast< VoidType* >( otherPointer->get_base() ) && ! isFtype(pointerType->get_base()) ) {
                                 getCommonWithVoidPointer( otherPointer, pointerType );
                         } else if ( widenSecond && dynamic_cast< VoidType* >( pointerType->get_base() ) && ! isFtype(otherPointer->get_base(), indexer) ) {
+                        } else if ( widenSecond && dynamic_cast< VoidType* >( pointerType->get_base() ) && ! isFtype(otherPointer->get_base()) ) {
                                 getCommonWithVoidPointer( pointerType, otherPointer );
                         } else if ( ( pointerType->get_base()->get_qualifiers() >= otherPointer->get_base()->get_qualifiers() || widenFirst )

src/ResolvExpr/PtrsCastable.cc

-                      re4d829b
+                      r579263a
+        }
+        void PtrsCastable::visit(TraitInstType *inst) {
+                // I definitely don't think we should be doing anything here
+        }
+        void PtrsCastable::visit( __attribute__((unused)) TraitInstType *inst ) {}
         void PtrsCastable::visit(TypeInstType *inst) {

src/ResolvExpr/Unify.cc

-                      re4d829b
+                      r579263a
+        }
         bool isFtype( Type *type, const SymTab::Indexer &indexer ) {
+        bool isFtype( Type *type ) {
                 if ( dynamic_cast< FunctionType* >( type ) ) {
                         return true;
 …
+        }
         bool tyVarCompatible( const TypeDecl::Data & data, Type *type, const SymTab::Indexer &indexer ) {
+        bool tyVarCompatible( const TypeDecl::Data & data, Type *type ) {
                 switch ( data.kind ) {
                   case TypeDecl::Any:
 …
                         // type must also be complete
                         // xxx - should this also check that type is not a tuple type and that it's not a ttype?
                         return ! isFtype( type, indexer ) && (! data.isComplete || type->isComplete() );
+                        return ! isFtype( type ) && (! data.isComplete || type->isComplete() );
                   case TypeDecl::Ftype:
                         return isFtype( type, indexer );
+                        return isFtype( type );
                   case TypeDecl::Ttype:
                         // ttype unifies with any tuple type
 …
                 OpenVarSet::const_iterator tyvar = openVars.find( typeInst->get_name() );
                 assert( tyvar != openVars.end() );
                 if ( ! tyVarCompatible( tyvar->second, other, indexer ) ) {
+                if ( ! tyVarCompatible( tyvar->second, other ) ) {
                         return false;
                 } // if
 …
+        }
         void Unify::visit(VoidType *voidType) {
+        void Unify::visit( __attribute__((unused)) VoidType *voidType) {
                 result = dynamic_cast< VoidType* >( type2 );
+        }
 …
         template< typename Iterator1, typename Iterator2 >
         bool unifyList( Iterator1 list1Begin, Iterator1 list1End, Iterator2 list2Begin, Iterator2 list2End, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer ) {
+        bool unifyList( Iterator1 list1Begin, Iterator1 list1End, Iterator2 list2Begin, Iterator2 list2End, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, const SymTab::Indexer &indexer ) {
                 auto get_type = [](Type * t) { return t; };
                 for ( ; list1Begin != list1End && list2Begin != list2End; ++list1Begin, ++list2Begin ) {
 …
                         flatten( flat2.get(), back_inserter( types2 ) );
                         result = unifyList( types1.begin(), types1.end(), types2.begin(), types2.end(), env, needAssertions, haveAssertions, openVars, widenMode, indexer );
                 } // if
+        }
         void Unify::visit(VarArgsType *varArgsType) {
+                        result = unifyList( types1.begin(), types1.end(), types2.begin(), types2.end(), env, needAssertions, haveAssertions, openVars, indexer );
+                } // if
+        }
+        void Unify::visit( __attribute__((unused)) VarArgsType *varArgsType ) {
                 result = dynamic_cast< VarArgsType* >( type2 );
+        }
         void Unify::visit(ZeroType *zeroType) {
+        void Unify::visit( __attribute__((unused)) ZeroType *zeroType ) {
                 result = dynamic_cast< ZeroType* >( type2 );
+        }
         void Unify::visit(OneType *oneType) {
+        void Unify::visit( __attribute__((unused)) OneType *oneType ) {
                 result = dynamic_cast< OneType* >( type2 );
+        }

src/ResolvExpr/typeops.h

re4d829b	r579263a
118	118
119	119	// in Unify.cc
120		bool isFtype( Type *type~~, const SymTab::Indexer &indexer~~ );
	120	bool isFtype( Type *type );
121	121	bool typesCompatible( Type , Type , const SymTab::Indexer &indexer, const TypeEnvironment &env );
122	122	bool typesCompatibleIgnoreQualifiers( Type , Type , const SymTab::Indexer &indexer, const TypeEnvironment &env );

src/SymTab/Autogen.cc

-                      re4d829b
+                      r579263a
         // E ?=?(E volatile*, int),
         //   ?=?(E _Atomic volatile*, int);
         void makeEnumFunctions( EnumDecl *enumDecl, EnumInstType *refType, unsigned int functionNesting, std::list< Declaration * > &declsToAdd ) {
+        void makeEnumFunctions( EnumInstType *refType, unsigned int functionNesting, std::list< Declaration * > &declsToAdd ) {
                 // T ?=?(E *, E);
 …
         /// generates the body of a union assignment/copy constructor/field constructor
         void makeUnionAssignBody( FunctionDecl * funcDecl, bool isDynamicLayout ) {
+        void makeUnionAssignBody( FunctionDecl * funcDecl ) {
                 FunctionType * ftype = funcDecl->get_functionType();
                 assert( ftype->get_parameters().size() == 2 );
 …
                 // Make function polymorphic in same parameters as generic union, if applicable
                 const std::list< TypeDecl* > & typeParams = aggregateDecl->get_parameters(); // List of type variables to be placed on the generated functions
+                bool isDynamicLayout = hasDynamicLayout( aggregateDecl );  // NOTE this flag is an incredibly ugly kludge; we should fix the assignment signature instead (ditto for struct)
                 // default ctor/dtor need only first parameter
                 // void ?{}(T *); void ^?{}(T *);
 …
                 FunctionDecl *dtorDecl = genFunc( "^?{}", dtorType, functionNesting );
                 makeUnionAssignBody( assignDecl, isDynamicLayout );
+                makeUnionAssignBody( assignDecl );
                 // body of assignment and copy ctor is the same
                 makeUnionAssignBody( copyCtorDecl, isDynamicLayout );
+                makeUnionAssignBody( copyCtorDecl );
                 // create a constructor which takes the first member type as a parameter.
 …
                                 FunctionDecl * ctor = genFunc( "?{}", memCtorType, functionNesting );
                                 makeUnionAssignBody( ctor, isDynamicLayout );
+                                makeUnionAssignBody( ctor );
                                 memCtors.push_back( ctor );
                                 // only generate a ctor for the first field
 …
                         EnumInstType *enumInst = new EnumInstType( Type::Qualifiers(), enumDecl->get_name() );
                         // enumInst->set_baseEnum( enumDecl );
                         makeEnumFunctions( enumDecl, enumInst, functionNesting, declsToAddAfter );
+                        makeEnumFunctions( enumInst, functionNesting, declsToAddAfter );
+                }
+        }

src/SymTab/Autogen.h

-                      re4d829b
+                      r579263a
 // Created On       : Sun May 17 21:53:34 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Mar 17 09:10:41 2017
 // Update Count     : 9
+// Last Modified On : Wed Jun 21 17:25:26 2017
+// Update Count     : 14
 //
 …
         template< typename OutputIterator >
         Statement * genScalarCall( InitTweak::InitExpander & srcParam, Expression *dstParam, const std::string & fname, OutputIterator out, Type * type, bool addCast = false ) {
                 // want to be able to generate assignment, ctor, and dtor generically,
                 // so fname is either ?=?, ?{}, or ^?{}
                 UntypedExpr *fExpr = new UntypedExpr( new NameExpr( fname ) );
+        // want to be able to generate assignment, ctor, and dtor generically,
+        // so fname is either ?=?, ?{}, or ^?{}
+        UntypedExpr *fExpr = new UntypedExpr( new NameExpr( fname ) );
+                // do something special for unnamed members
+                dstParam = new AddressExpr( dstParam );
+                if ( addCast ) {
+                        // cast to T* with qualifiers removed, so that qualified objects can be constructed
+                        // and destructed with the same functions as non-qualified objects.
+                        // unfortunately, lvalue is considered a qualifier. For AddressExpr to resolve, its argument
+                        // must have an lvalue qualified type, so remove all qualifiers except lvalue. If we ever
+                        // remove lvalue as a qualifier, this can change to
+                        //   type->get_qualifiers() = Type::Qualifiers();
+                        assert( type );
+                        Type * castType = type->clone();
+//                      castType->get_qualifiers() -= Type::Qualifiers(true, true, true, false, true, false);
+                        castType->get_qualifiers() -= Type::Qualifiers( Type::Const | Type::Volatile | Type::Restrict | Type::Atomic );
+                        castType->set_lvalue( true ); // xxx - might not need this
+                        dstParam = new CastExpr( dstParam, new PointerType( Type::Qualifiers(), castType ) );
+                }
+                fExpr->get_args().push_back( dstParam );
+        // do something special for unnamed members
+        dstParam = new AddressExpr( dstParam );
+        if ( addCast ) {
+                // cast to T* with qualifiers removed, so that qualified objects can be constructed
+                // and destructed with the same functions as non-qualified objects.
+                // unfortunately, lvalue is considered a qualifier. For AddressExpr to resolve, its argument
+                // must have an lvalue qualified type, so remove all qualifiers except lvalue. If we ever
+                // remove lvalue as a qualifier, this can change to
+                //   type->get_qualifiers() = Type::Qualifiers();
+                assert( type );
+                Type * castType = type->clone();
+                castType->get_qualifiers() -= Type::Qualifiers( Type::Const | Type::Volatile | Type::Restrict | Type::Atomic );
+                castType->set_lvalue( true ); // xxx - might not need this
+                dstParam = new CastExpr( dstParam, new PointerType( Type::Qualifiers(), castType ) );
+        }
+        fExpr->get_args().push_back( dstParam );
                 Statement * listInit = srcParam.buildListInit( fExpr );
+        Statement * listInit = srcParam.buildListInit( fExpr );
                 std::list< Expression * > args = *++srcParam;
                 fExpr->get_args().splice( fExpr->get_args().end(), args );
+        std::list< Expression * > args = *++srcParam;
+        fExpr->get_args().splice( fExpr->get_args().end(), args );
                 *out++ = new ExprStmt( noLabels, fExpr );
+        *out++ = new ExprStmt( noLabels, fExpr );
                 srcParam.clearArrayIndices();
+        srcParam.clearArrayIndices();
                 return listInit;
+        return listInit;
+        }
 …
                 Expression * begin, * end, * update, * cmp;
                 if ( forward ) {
                         // generate: for ( int i = 0; i < 0; ++i )
                         begin = new ConstantExpr( Constant( new ZeroType( emptyQualifiers ), "0" ) );
+                        // generate: for ( int i = 0; i < N; ++i )
+                        begin = new ConstantExpr( Constant::from_int( 0 ) );
                         end = array->get_dimension()->clone();
                         cmp = new NameExpr( "?<?" );
 …
                         begin = new UntypedExpr( new NameExpr( "?-?" ) );
                         ((UntypedExpr*)begin)->get_args().push_back( array->get_dimension()->clone() );
                         ((UntypedExpr*)begin)->get_args().push_back( new ConstantExpr( Constant( new OneType( emptyQualifiers ), "1" ) ) );
                         end = new ConstantExpr( Constant( new ZeroType( emptyQualifiers ), "0" ) );
+                        ((UntypedExpr*)begin)->get_args().push_back( new ConstantExpr( Constant::from_int( 1 ) ) );
+                        end = new ConstantExpr( Constant::from_int( 0 ) );
                         cmp = new NameExpr( "?>=?" );
                         update = new NameExpr( "--?" );

src/SymTab/ImplementationType.cc

-                      re4d829b
+                      r579263a
+        }
+        void ImplementationType::visit(FunctionType *functionType) {
+///   FunctionType *newType = functionType->clone();
+///   for ( std::list< DeclarationWithType* >::iterator i = newType->get_parameters().begin(); i != newType->get_parameters().end(); ++i ) {
+///     i->set_type( implementationType( i->get_type(), indexer ) );
+///   }
+///   for ( std::list< DeclarationWithType* >::iterator i = newType->get_parameters().begin(); i != newType->get_parameters().end(); ++i ) {
+///     i->set_type( implementationType( i->get_type(), indexer ) );
+///   }
+        }
+        void ImplementationType::visit( __attribute__((unused)) FunctionType *functionType ) {}
         void ImplementationType::visit( __attribute__((unused)) StructInstType * aggregateUseType ) {}
         void ImplementationType::visit( __attribute__((unused)) UnionInstType * aggregateUseType ) {}

src/SymTab/Indexer.cc

-                      re4d829b
+                      r579263a
+        }
-        void Indexer::visit( UntypedValofExpr *valofExpr ) {
-                acceptNewScope( valofExpr->get_result(), *this );
-                maybeAccept( valofExpr->get_body(), *this );
+        }
         void Indexer::visit( RangeExpr *rangeExpr ) {
                 maybeAccept( rangeExpr->get_low(), *this );
 …
                 acceptNewScope( tupleExpr->get_result(), *this );
                 maybeAccept( tupleExpr->get_tuple(), *this );
+        }
-        void Indexer::visit( MemberTupleExpr *tupleExpr ) {
-                acceptNewScope( tupleExpr->get_result(), *this );
-                maybeAccept( tupleExpr->get_member(), *this );
-                maybeAccept( tupleExpr->get_aggregate(), *this );
+        }

src/SymTab/Indexer.h

-                      re4d829b
+                      r579263a
                 virtual void visit( ConstructorExpr * ctorExpr );
                 virtual void visit( CompoundLiteralExpr *compLitExpr );
-                virtual void visit( UntypedValofExpr *valofExpr );
                 virtual void visit( RangeExpr *rangeExpr );
                 virtual void visit( UntypedTupleExpr *tupleExpr );
                 virtual void visit( TupleExpr *tupleExpr );
                 virtual void visit( TupleIndexExpr *tupleExpr );
-                virtual void visit( MemberTupleExpr *tupleExpr );
                 virtual void visit( TupleAssignExpr *tupleExpr );
                 virtual void visit( StmtExpr * stmtExpr );

src/SymTab/Mangler.cc

re4d829b	r579263a
236	236	}
237	237
238		void Mangler::visit( ZeroType *zeroType ) {
	238	void Mangler::visit( __attribute__((unused)) ZeroType *zeroType ) {
239	239	mangleName << "Z";
240	240	}
241	241
242		void Mangler::visit( OneType *oneType ) {
	242	void Mangler::visit( __attribute__((unused)) OneType *oneType ) {
243	243	mangleName << "O";
244	244	}

src/SymTab/Validate.cc

-                      re4d829b
+                      r579263a
         /// Fix return types so that every function returns exactly one value
+        class ReturnTypeFixer {
+          public:
+        struct ReturnTypeFixer {
                 static void fix( std::list< Declaration * > &translationUnit );
 …
         /// Replaces enum types by int, and function or array types in function parameter and return lists by appropriate pointers.
+        class EnumAndPointerDecayPass final : public Visitor {
+                typedef Visitor Parent;
+                virtual void visit( EnumDecl *aggregateDecl );
+                virtual void visit( FunctionType *func );
+        struct EnumAndPointerDecay {
+                void previsit( EnumDecl *aggregateDecl );
+                void previsit( FunctionType *func );
         };
 …
           public:
                 LinkReferenceToTypes( bool doDebug, const Indexer *indexer );
-          private:
                 using Parent::visit;
                 void visit( EnumInstType *enumInst ) final;
 …
                 void visit( UnionDecl *unionDecl ) final;
                 void visit( TypeInstType *typeInst ) final;
+          private:
                 const Indexer *indexer;
 …
         };
         /// Replaces array and function types in forall lists by appropriate pointer type
         class Pass3 final : public Indexer {
+        /// Replaces array and function types in forall lists by appropriate pointer type and assigns each Object and Function declaration a unique ID.
+        class ForallPointerDecay final : public Indexer {
                 typedef Indexer Parent;
           public:
                 using Parent::visit;
                 Pass3( const Indexer *indexer );
+          private:
+                ForallPointerDecay( const Indexer *indexer );
                 virtual void visit( ObjectDecl *object ) override;
                 virtual void visit( FunctionDecl *func ) override;
 …
         };
+        class ReturnChecker {
+          public:
+        struct ReturnChecker : public WithGuards {
                 /// Checks that return statements return nothing if their return type is void
                 /// and return something if the return type is non-void.
                 static void checkFunctionReturns( std::list< Declaration * > & translationUnit );
+          private:
                 void previsit( FunctionDecl * functionDecl );
-                void postvisit( FunctionDecl * functionDecl );
                 void previsit( ReturnStmt * returnStmt );
                 typedef std::list< DeclarationWithType * > ReturnVals;
                 ReturnVals returnVals;
-                std::stack< ReturnVals > returnValsStack;
         };
 …
         };
+        class VerifyCtorDtorAssign {
+        public:
+        struct VerifyCtorDtorAssign {
                 /// ensure that constructors, destructors, and assignment have at least one
                 /// parameter, the first of which must be a pointer, and that ctor/dtors have no
 …
         /// ensure that generic types have the correct number of type arguments
+        class ValidateGenericParameters {
+        public:
+        struct ValidateGenericParameters {
                 void previsit( StructInstType * inst );
                 void previsit( UnionInstType * inst );
         };
+        class ArrayLength {
+        public:
+        struct ArrayLength {
                 /// for array types without an explicit length, compute the length and store it so that it
                 /// is known to the rest of the phases. For example,
 …
         };
         class CompoundLiteral final : public GenPoly::DeclMutator {
+        struct CompoundLiteral final : public WithDeclsToAdd, public WithVisitorRef<CompoundLiteral> {
                 Type::StorageClasses storageClasses;
+                using GenPoly::DeclMutator::mutate;
+                DeclarationWithType * mutate( ObjectDecl *objectDecl ) final;
+                Expression *mutate( CompoundLiteralExpr *compLitExpr ) final;
+                void premutate( ObjectDecl *objectDecl );
+                Expression * postmutate( CompoundLiteralExpr *compLitExpr );
         };
         void validate( std::list< Declaration * > &translationUnit, bool doDebug ) {
                 EnumAndPointerDecayPass epc;
+                PassVisitor<EnumAndPointerDecay> epc;
                 LinkReferenceToTypes lrt( doDebug, 0 );
                 Pass3 pass3( 0 );
                 CompoundLiteral compoundliteral;
+                ForallPointerDecay fpd( 0 );
+                PassVisitor<CompoundLiteral> compoundliteral;
                 PassVisitor<ValidateGenericParameters> genericParams;
 …
                 VerifyCtorDtorAssign::verify( translationUnit );  // must happen before autogen, because autogen examines existing ctor/dtors
                 Concurrency::applyKeywords( translationUnit );
                 autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs EnumAndPointerDecayPass
+                autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs EnumAndPointerDecay
                 Concurrency::implementMutexFuncs( translationUnit );
                 Concurrency::implementThreadStarter( translationUnit );
                 ReturnChecker::checkFunctionReturns( translationUnit );
                 compoundliteral.mutateDeclarationList( translationUnit );
                 acceptAll( translationUnit, pass3 );
+                mutateAll( translationUnit, compoundliteral );
+                acceptAll( translationUnit, fpd );
                 ArrayLength::computeLength( translationUnit );
+        }
         void validateType( Type *type, const Indexer *indexer ) {
                 EnumAndPointerDecayPass epc;
+                PassVisitor<EnumAndPointerDecay> epc;
                 LinkReferenceToTypes lrt( false, indexer );
                 Pass3 pass3( indexer );
+                ForallPointerDecay fpd( indexer );
                 type->accept( epc );
                 type->accept( lrt );
                 type->accept( pass3 );
+                type->accept( fpd );
+        }
 …
+        }
         void EnumAndPointerDecayPass::visit( EnumDecl *enumDecl ) {
+        void EnumAndPointerDecay::previsit( EnumDecl *enumDecl ) {
                 // Set the type of each member of the enumeration to be EnumConstant
                 for ( std::list< Declaration * >::iterator i = enumDecl->get_members().begin(); i != enumDecl->get_members().end(); ++i ) {
 …
                         obj->set_type( new EnumInstType( Type::Qualifiers( Type::Const ), enumDecl->get_name() ) );
                 } // for
-                Parent::visit( enumDecl );
+        }
 …
                 void fixFunctionList( DWTList & dwts, FunctionType * func ) {
                         // the only case in which "void" is valid is where it is the only one in the list; then it should be removed
                         // entirely other fix ups are handled by the FixFunction class
+                        // entirely. other fix ups are handled by the FixFunction class
                         typedef typename DWTList::iterator DWTIterator;
                         DWTIterator begin( dwts.begin() ), end( dwts.end() );
 …
                                 for ( ; i != end; ++i ) {
                                         FixFunction fixer;
                                         *i = (*i )->acceptMutator( fixer );
+                                        *i = (*i)->acceptMutator( fixer );
                                         if ( fixer.get_isVoid() ) {
                                                 throw SemanticError( "invalid type void in function type ", func );
 …
+        }
         void EnumAndPointerDecayPass::visit( FunctionType *func ) {
+        void EnumAndPointerDecay::previsit( FunctionType *func ) {
                 // Fix up parameters and return types
                 fixFunctionList( func->get_parameters(), func );
                 fixFunctionList( func->get_returnVals(), func );
-                Visitor::visit( func );
+        }
 …
+        }
         Pass3::Pass3( const Indexer *other_indexer ) :  Indexer( false ) {
+        ForallPointerDecay::ForallPointerDecay( const Indexer *other_indexer ) :  Indexer( false ) {
                 if ( other_indexer ) {
                         indexer = other_indexer;
 …
+        }
         void Pass3::visit( ObjectDecl *object ) {
+        void ForallPointerDecay::visit( ObjectDecl *object ) {
                 forallFixer( object->get_type() );
                 if ( PointerType *pointer = dynamic_cast< PointerType * >( object->get_type() ) ) {
 …
+        }
         void Pass3::visit( FunctionDecl *func ) {
+        void ForallPointerDecay::visit( FunctionDecl *func ) {

Context Navigation

Legend: