Diff [32cab5b7850de1e6632f51e472d84eee06963594:b2fe1c9d25e114799af78eb5b8a1aecb4313c62b] for / – Cforall

doc/LaTeXmacros/common.tex

-              r32cab5b
+              rb2fe1c9
 %% Created On       : Sat Apr  9 10:06:17 2016
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Mon Mar 19 17:18:23 2018
 %% Update Count     : 379
+%% Last Modified On : Sat Feb 17 21:58:43 2018
+%% Update Count     : 369
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 …
 % index macros
 \newcommand{\italic}[1]{\emph{\hyperpage{#1}}}
 \newcommand{\Definition}[1]{\textbf{\hyperpage{#1}}}
+\newcommand{\definition}[1]{\textbf{\hyperpage{#1}}}
 \newcommand{\see}[1]{\emph{see}~#1}
 …
 \def\impl{\@bsphack\begingroup
           \def\protect##1{\string##1\space}\@sanitize
           \@wrxref{|Definition}}
+          \@wrxref{|definition}}
 \newcommand{\indexcode}[1]{{\lstinline$#1$}}
 \def\use{\@bsphack\begingroup
 …
     \if@nobreak \ifvmode\nobreak\fi\fi\@esphack}
 %\newcommand{\use}[1]{\index{#1@{\lstinline$#1$}}}
 %\newcommand{\impl}[1]{\index{\protect#1@{\lstinline$\protect#1$}|Definition}}
+%\newcommand{\impl}[1]{\index{\protect#1@{\lstinline$\protect#1$}|definition}}
 % inline text and lowercase index: \Index{inline and lowercase index text}
 …
 % Latin abbreviation
 \newcommand{\abbrevFont}{\textit}                       % set empty for no italics
-\@ifundefined{eg}{
 \newcommand{\EG}{\abbrevFont{e}.\abbrevFont{g}.}
 \newcommand*{\eg}{%
 …
                 {\@ifnextchar{:}{\EG}%
                         {\EG,\xspace}}%
+}}{}%
+\@ifundefined{ie}{
+}%
 \newcommand{\IE}{\abbrevFont{i}.\abbrevFont{e}.}
 \newcommand*{\ie}{%
 …
                 {\@ifnextchar{:}{\IE}%
                         {\IE,\xspace}}%
+}}{}%
+\@ifundefined{etc}{
+}%
 \newcommand{\ETC}{\abbrevFont{etc}}
 \newcommand*{\etc}{%
         \@ifnextchar{.}{\ETC}%
         {\ETC.\xspace}%
+}}{}%
+\@ifundefined{etal}{
+}%
 \newcommand{\ETAL}{\abbrevFont{et}~\abbrevFont{al}}
 \newcommand*{\etal}{%
         \@ifnextchar{.}{\protect\ETAL}%
                 {\protect\ETAL.\xspace}%
+}}{}%
+\@ifundefined{viz}{
+}%
 \newcommand{\VIZ}{\abbrevFont{viz}}
 \newcommand*{\viz}{%
         \@ifnextchar{.}{\VIZ}%
                 {\VIZ.\xspace}%
 }}{}%
+}%
 \makeatother

doc/LaTeXmacros/lstlang.sty

-              r32cab5b
+              rb2fe1c9
 %% Created On       : Sat May 13 16:34:42 2017
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Fri Apr  6 23:44:50 2018
 %% Update Count     : 20
+%% Last Modified On : Wed Aug 30 22:11:14 2017
+%% Update Count     : 14
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 …
 \lstdefinelanguage{sml} {
         morekeywords= {
+                EQUAL, GREATER, LESS, NONE, SOME, abstraction, abstype, and, andalso, array, as, before,
+                bool, case, char, datatype, do, else, end, eqtype, exception, exn, false, fn, fun, functor,
+                handle, if, in, include, infix, infixr, int, let, list, local, nil, nonfix, not, o, of, op,
+                open, option, orelse, overload, print, raise, real, rec, ref, sharing, sig, signature,
+                string, struct, structure, substring, then, true, type, unit, val, vector, where, while,
+                with, withtype, word
+    },
+    morestring=[b]",
+    morecomment=[s]{(*}{*)},
+                EQUAL, GREATER, LESS, NONE, SOME, abstraction, abstype, and, andalso, array, as, before, bool,
+                case, char, datatype, do, else, end, eqtype, exception, exn, false, fn, fun, functor, handle,
+                if, in, include, infix, infixr, int, let, list, local, nil, nonfix, not, o, of, op, open,
+                option, orelse, overload, print, raise, real, rec, ref, sharing, sig, signature, string, struct,
+                structure, substring, then, true, type, unit, val, vector, where, while, with, withtype, word
+        },
+        morestring=[b]",
+        morecomment=[s]{(*}{*)},
+}
 …
 \lstdefinelanguage{rust}{
-        % Keywords
         morekeywords=[1]{
                 abstract, alignof, as, become, box, break, const, continue, crate, do, else, enum, extern,
                 false, final, fn, for, if, impl, in, let, loop, macro, match, mod, move, mut, offsetof,
                 override, priv, proc, pub, pure, ref, return, Self, self, sizeof, static, struct, super,
                 trait, true, type, typeof, unsafe, unsized, use, virtual, where, while, yield
+        false, final, fn, for, if, impl, in, let, loop, macro, match, mod, move, mut, offsetof,
+        override, priv, proc, pub, pure, ref, return, Self, self, sizeof, static, struct, super,
+        trait, true, type, typeof, unsafe, unsized, use, virtual, where, while, yield
         },
-        % Strings
         morestring=[b]{"},
-        % Comments
         comment=[l]{//},
         morecomment=[s]{/*}{*/},
-        % Options
         sensitive=true
+}
 \lstdefinelanguage{pseudo}{
+\lstdefinelanguage{Pseudo}{
         morekeywords={string,uint,int,bool,float},
         sensitive=true,
 …
 \lstdefinelanguage{CFA}[ANSI]{C}{
         morekeywords={
                 _Alignas, _Alignof, __alignof, __alignof__, asm, __asm, __asm__, __attribute, __attribute__,
                 auto, _Bool, catch, catchResume, choose, _Complex, __complex, __complex__, __const, __const__,
                 coroutine, disable, dtype, enable, __extension__, exception, fallthrough, fallthru, finally,
                 __float80, float80, __float128, float128, forall, ftype, _Generic, _Imaginary, __imag, __imag__,
                 inline, __inline, __inline__, __int128, int128, __label__, monitor, mutex, _Noreturn, one_t, or,
                 otype, restrict, __restrict, __restrict__, __signed, __signed__, _Static_assert, thread,
                 _Thread_local, throw, throwResume, timeout, trait, try, ttype, typeof, __typeof, __typeof__,
                 virtual, __volatile, __volatile__, waitfor, when, with, zero_t,
     },
+                _Alignas, _Alignof, __alignof, __alignof__, asm, __asm, __asm__, _At, __attribute,
+                __attribute__, auto, _Bool, catch, catchResume, choose, _Complex, __complex, __complex__,
+                __const, __const__, disable, dtype, enable, __extension__, fallthrough, fallthru,
+                finally, forall, ftype, _Generic, _Imaginary, inline, __label__, lvalue, _Noreturn, one_t,
+                otype, restrict, _Static_assert, throw, throwResume, trait, try, ttype, typeof, __typeof,
+                __typeof__, virtual, with, zero_t},
+        morekeywords=[2]{
+                _Atomic, coroutine, is_coroutine, is_monitor, is_thread, monitor, mutex, nomutex, or,
+                resume, suspend, thread, _Thread_local, waitfor, when, yield},
         moredirectives={defined,include_next}%
+}

doc/bibliography/pl.bib

-              r32cab5b
+              rb2fe1c9
     title       = {Boost Coroutine Library},
     year        = 2015,
+    howpublished= {\href{http://www.boost.org/doc/libs/1_61_0/libs/coroutine/doc/html/index.html}
+                  {{http://www.boost.org/\-doc/\-libs/1\_61\_0/\-libs/\-coroutine/\-doc/\-html/\-index.html}}},
+    note        = {Accessed: 2016-09},
+    note        = {\href{http://www.boost.org/doc/libs/1_61_0/libs/coroutine/doc/html/index.html}
+                  {{http://www.boost.org/\-doc/\-libs/1\_61\_0/\-libs/\-coroutine/\-doc/\-html/\-index.html}} [Accessed September 2016]},
+}
 …
     keywords    = {ISO/IEC C 11},
     contributer = {pabuhr@plg},
     key         = {C11},
     title       = {C Programming Language {ISO/IEC} 9889:2011-12},
+    author      = {C11},
+    title       = {Programming Languages -- {C} {ISO/IEC} 9889:2011-12},
     edition     = {3rd},
     publisher   = {International Standard Organization},
 …
+}
+@manual{C++Concepts,
+@techreport{C++Concepts,
+    type        = {International Standard},
     keywords    = {ISO/IEC TS 19217:2015},
     contributer = {a3moss@uwaterloo.ca},
     key         = {Concepts},
     title       = {{C}{\kern-.1em\hbox{\large\texttt{+\kern-.25em+}}} Programming language -- Extensions for concepts {ISO/IEC} {TS} 19217:2015},
+    title       = {Information technology -- Programming languages -- {C}{\kern-.1em\hbox{\large\texttt{+\kern-.25em+}}} Extensions for concepts {ISO/IEC} {TS} 19217:2015},
     publisher   = {International Standard Organization},
     address     = {\href{https://www.iso.org/standard/64031.html}{https://\-www.iso.org/\-standard/\-64031.html}},
     year        = 2015,
+    year        = 2015
+}
 @misc{Cforall,
     key         = {Cforall},
     title       = {\textsf{C}{$\mathbf{\forall}$} Features},
+    title       = {C$\forall$ Features},
     howpublished= {\url{https://plg.uwaterloo.ca/~cforall/features}},
     note        = {Accessed: 2018-01-01},
 …
     contributer = {pabuhr@plg},
     author      = {Rodolfo Gabriel Esteves},
     title       = {\textsf{C}$\mathbf{\forall}$, a Study in Evolutionary Design in Programming Languages},
+    title       = {C$\forall$, a Study in Evolutionary Design in Programming Languages},
     school      = {School of Computer Science, University of Waterloo},
     year        = 2004,
 …
+}
-@inproceedings{Necula02,
-    author      = {Necula, George C. and McPeak, Scott and Weimer, Westley},
-    title       = {{CCured}: Type-safe Retrofitting of Legacy Code},
-    booktitle   = {Proceedings of the 29th ACM SIGPLAN-SIGACT Symposium on Principles of Programming Languages},
-    series      = {POPL '02},
-    year        = {2002},
-    location    = {Portland, Oregon},
-    pages       = {128-139},
-    publisher   = {ACM},
-    address     = {New York, NY, USA},
+}
 @techreport{cforall-ug,
     keywords    = {cforall, user guide},
     contributer = {pabuhr@plg},
     author      = {Peter A. Buhr and Glen Ditchfield and David Till and Charles R. Zarnke},
     title       = {\textsf{C}$\mathbf{\forall}$ Users Guide, Version 0.1},
+    title       = {{\mbox{\mdseries\sffamily C{$\mathbf{\forall}$}}}\ Users Guide, Version 0.1},
     institution = {Department of Computer Science, University of Waterloo},
     address     = {Waterloo, Ontario, Canada, N2L 3G1},
 …
     title       = {Programming Languages -- {Cobol} ISO/IEC 1989:2014},
     edition     = {2nd},
     institution = {International Standard Organization},
+    institution = {International Standard Organization},
     address     = {\href{https://www.iso.org/standard/51416.html}{https://\-www.iso.org/\-standard/\-51416.html}},
     year        = 2014,
 …
     journal     = sigplan,
     year        = 1984,
+    month       = jun,
+    volume      = 19,
+    number      = 6,
+    pages       = {1-12},
+    month       = jun, volume = 19, number = 6, pages = {1-12},
     note        = {Proceedings of the ACM SIGPLAN '84 Symposium on Compiler Construction},
     abstract    = {
 …
 @mastersthesis{Delisle18,
     author      = {Thierry Delisle },
     title       = {Concurrency in \textsf{C}$\mathbf{\forall}$},
+    title       = {Concurrency in {C}$\mathbf{\forall}$},
     school      = {School of Computer Science, University of Waterloo},
     year        = 2018,
 …
     contributer = {a3moss@uwaterloo.ca},
     author      = {Glen Ditchfield},
     title       = {Conversions for \textsf{C}$\mathbf{\forall}$},
+    title       = {Conversions for {Cforall}},
     note        = {\href{http://plg.uwaterloo.ca/~cforall/Conversions/index.html}{http://\-plg.uwaterloo.ca/\-\textasciitilde cforall/\-Conversions/\-index.html}},
     month       = {Nov},
 …
 @book{Stroustrup94,
     keywords    = {C++},
     contributor = {wyrmok@plg},
     author      = {Bjarne Stroustrup},
     title       = {The Design and Evolution of {C}{\kern-.1em\hbox{\large\texttt{+\kern-.25em+}}}},
     publisher   = {Addison-Wesley},
+    keywords    = {C++},
+    contributor = {wyrmok@plg},
+    author      = {Bjarne Stroustrup},
+    title       = {The Design and Evolution of {C}{\kern-.1em\hbox{\large\texttt{+\kern-.25em+}}}},
+    publisher   = {Addison-Wesley},
     address     = {Boston},
     year        = 1994
+    year        = 1994
+}
 …
+}
 @misc{GCCExtensions,
+@online{GCCExtensions,
     contributer = {a3moss@uwaterloo.ca},
     key         = {{GNU}},
 …
     title       = {Extensions to the {C} Language Family},
     year        = 2014,
     howpublished= {\href{https://gcc.gnu.org/onlinedocs/gcc-4.7.2/gcc/C-Extensions.html}{https://\-gcc.gnu.org/\-onlinedocs/\-gcc-4.7.2/\-gcc/\-C\-Extensions.html}},
     note        = {Accessed: 2017-04-02},
+    note        = {\href{https://gcc.gnu.org/onlinedocs/gcc-4.7.2/gcc/C-Extensions.html}{https://\-gcc.gnu.org/\-onlinedocs/\-gcc-4.7.2/\-gcc/\-C\-Extensions.html}},
+    urldate     = {2017-04-02}
+}
 …
     keywords    = {GMP arbitrary-precision library},
     contributer = {pabuhr@plg},
-    key         = {GMP},
     title       = {{GNU} Multiple Precision Arithmetic Library},
+    address     = {GNU},
+    author      = {GMP},
+    organization= {GNU},
     year        = 2016,
     note        = {\href{https://gmplib.org}{https://\-gmplib.org}},
 …
+}
 @misc{GObject,
+@online{GObject,
     keywords    = {GObject},
     contributor = {a3moss@uwaterloo.ca},
     key         = {GObject},
     organization= {The {GNOME} Project},
     title       = {{GO}bject Reference Manual},
+    author      = {{GObject}},
+    organization= {The GNOME Project},
+    title       = {{GObject} Reference Manual},
     year        = 2014,
     howpublished= {https://developer.gnome.org/gobject/stable/},
     note        = {Accessed: 2017-04},
+    url         = {https://developer.gnome.org/gobject/stable/},
+    urldate     = {2017-04-04}
+}
 …
     contributer = {pabuhr@plg},
     author      = {Richard C. Bilson},
     title       = {Implementing Overloading and Polymorphism in \textsf{C}$\mathbf{\forall}$},
+    title       = {Implementing Overloading and Polymorphism in Cforall},
     school      = {School of Computer Science, University of Waterloo},
     year        = 2003,
 …
+}
-@inproceedings{Pharr12,
-    title       = {ispc: A {SPMD} compiler for high-performance CPU programming},
-    author      = {Pharr, Matt and Mark, William R},
-    booktitle   = {Innovative Parallel Computing (InPar), 2012},
-    pages       = {1--13},
-    year        = {2012},
-    month       = may,
-    address     = {San Jose, CA, USA},
-    publisher   = {IEEE},
+}
-@inproceedings{DeLozier13,
-    keywords    = {C++, local pointers, memory safety, type-safety},
-    author      = {DeLozier, Christian and Eisenberg, Richard and Nagarakatte, Santosh and Osera, Peter-Michael and Martin, Milo M.K. and Zdancewic, Steve},
-    title       = {{I}ronclad {C++}: A Library-augmented Type-safe Subset of {C++}},
-    booktitle   = {Proceedings of the 2013 ACM SIGPLAN International Conference on Object Oriented Programming Systems Languages \& Applications},
-    series      = {OOPSLA'13},
-    year        = {2013},
-    address     = {Indianapolis, Indiana, USA},
-    pages       = {287-304},
-    publisher   = {ACM},
+}
 @inproceedings{Hibbard77,
     keywords    = {algol-68, concurrency},
 …
 @book{Java,
     keywords    = {Java},
     contributer = {pabuhr@plg},
     author      = {James Gosling and Bill Joy and Guy Steele and Gilad Bracha},
     title       = {The {Java} Language Specification},
+    keywords    = {Java},
+    contributer = {pabuhr@plg},
+    author      = {James Gosling and Bill Joy and Guy Steele and Gilad Bracha},
+    title       = {The {Java} Language Specification},
     publisher   = {Addison-Wesley},
     address     = {Reading},
     year        = 2000,
+    year        = 2000,
     edition     = {2nd},
+}
 @manual{Java8,
     keywords    = {Java SE 8},
     contributer = {pabuhr@plg},
     author      = {James Gosling and Bill Joy and Guy Steele and Gilad Bracha and Alex Buckley},
     title       = {{Java} Language Specification},
+    keywords    = {Java SE 8},
+    contributer = {pabuhr@plg},
+    author      = {James Gosling and Bill Joy and Guy Steele and Gilad Bracha and Alex Buckley},
+    title       = {{Java} Language Specification},
     publisher   = {Oracle},
     year        = 2015,
     edition     = {{J}ava {SE} 8},
+    year        = 2015,
+    edition     = {Java SE 8},
+}
 …
+}
 @misc{obj-c-book,
+@manual{obj-c-book,
     keywords    = {objective-c},
     contributor = {a3moss@uwaterloo.ca},
+    key         = {Objective-C},
+    title       = {Objective-C},
+    publisher   = {Apple Inc.},
+    year        = 2015,
+    howpublished= {\href{https://developer.apple.com/library/content/documentation/General/Conceptual/DevPedia-CocoaCore/ObjectiveC.html}{https://developer.apple.com/\-library/\-content/\-documentation/\-General/\-Conceptual/\-DevPedia-\-CocoaCore/\-ObjectiveC.html}},
+    note        = {Accessed: 2018-03}
+}
+@misc{xcode7,
+    author      = {{Objective-C}},
+    title       = {The {Objective-C} Programming Language},
+    organization= {Apple Computer Inc.},
+    address     = {Cupertino, CA},
+    year        = 2003
+}
+@online{xcode7,
     keywords    = {objective-c},
     contributor = {a3moss@uwaterloo.ca},
     key         = {Xcode},
     title       = {{X}code 7 Release Notes},
+    author      = {{Xcode}},
+    title       = {{Xcode} 7 Release Notes},
     year        = 2015,
     howpublished= {\href{https://developer.apple.com/library/content/documentation/Xcode/Conceptual/RN-Xcode-Archive/Chapters/xc7_release_notes.html}{https://developer.apple.com/\-library/\-content/\-documentation/\-Xcode/\-Conceptual/\-RN-Xcode-Archive/\-Chapters/\-xc7\_release\_notes.html}},
     note        = {Accessed: 2017-04}
+    note        = {\href{https://developer.apple.com/library/content/documentation/Xcode/Conceptual/RN-Xcode-Archive/Chapters/xc7_release_notes.html}{https://developer.apple.com/\-library/\-content/\-documentation/\-Xcode/\-Conceptual/\-RN-Xcode-Archive/\-Chapters/\-xc7\_release\_notes.html}},
+    urldate     = {2017-04-04}
+}
 …
     year        = 1984,
     series      = {Computers and their Applications},
+    address     = {Market Cross House, Cooper Street, Chichester, West Sussex, PO19 1EB, England},
+    address     = {Market Cross House, Cooper Street, Chichester, West Sussex,
+        PO19 1EB, England},
     summary     = {
         The principles of Procedural Abstraction, Data Type Completeness,
 …
+}
+@inproceedings{Rafkind09,
+    keywords    = {accurate, C programming language, conservative, garbage collection, precise},
+    contributer = {pabuhr@plg},
+    author      = {Rafkind, Jon and Wick, Adam and Regehr, John and Flatt, Matthew},
+    title       = {Precise Garbage Collection for C},
+    booktitle   = {Proceedings of the 2009 International Symposium on Memory Management},
+    series      = {ISMM '09},
+    year        = {2009},
+    location    = {Dublin, Ireland},
+    pages       = {39-48},
+    publisher   = {ACM},
+    address     = {New York, NY, USA},
+@book{PowerPC,
+    key         = {PowerPC processor},
+    title       = {Programming Environments Manual for 32-Bit Implementations of the PowerPC ArchitectureARM Architecture},
+    publisher   = {Freescale Semiconductor},
+    volume      = {MPCFPE32B},
+    edition     = {Rev. 3},
+    month       = 9,
+    year        = 2005,
+}
 …
 @article{psa:persistence,
+    keywords    = {persistence, first-class procedures, closure, PS-Algol, Abstract Data Types},
+    keywords    = {persistence, first-class procedures, closure, PS-Algol,
+        Abstract Data Types},
     contributer = {gjditchfield@plg},
     author      = {Malcolm P. Atkinson and Ronald Morrison},
 …
 @article{Procol89,
+    keywords    = {active objects, object-oriented languages, object-based languages, explicit per-object protocol},
+    keywords    = {active objects, object-oriented languages,
+        object-based languages, explicit per-object protocol},
     contributer = {akgoel@plg},
     author      = {Jan van den Bos and Chris Laffra},
 …
+}
-@book{PowerPC,
-    key         = {PowerPC processor},
-    title       = {Programming Environments Manual for 32-Bit Implementations of the PowerPC ArchitectureARM Architecture},
-    publisher   = {Freescale Semiconductor},
-    volume      = {MPCFPE32B},
-    edition     = {Rev. 3},
-    month       = 9,
-    year        = 2005,
+}
 @book{Butenhof97,
     keywords    = {PThreads, concurrency},
 …
     contributer = {pabuhr@plg},
     key         = {C++98},
     title       = {{C}{\kern-.1em\hbox{\large\texttt{+\kern-.25em+}}} Programming Language ISO/IEC 14882:1998},
     edition     = {1st},
     publisher   = {International Standard Organization},
     address     = {\href{https://www.iso.org/standard/25845.html}{https://\-www.iso.org/\-standard/\-25845.html}},
+    title       = {Programming Languages -- {C}{\kern-.1em\hbox{\large\texttt{+\kern-.25em+}}}},
+    organization= {International Standard ISO/IEC 14882:1998 (E)},
+    publisher   = {American National Standards Institute},
+    address     = {www.ansi.org},
     year        = 1998,
+}
 …
     keywords    = {ISO/IEC C++ 14},
     contributer = {pabuhr@plg},
     key         = {C++14},
     title       = {{C}{\kern-.1em\hbox{\large\texttt{+\kern-.25em+}}} Programming Language ISO/IEC 14882:2014},
+    author      = {C++14},
+    title       = {Programming Languages -- {C}{\kern-.1em\hbox{\large\texttt{+\kern-.25em+}}} ISO/IEC 14882:2014},
     edition     = {4th},
     publisher   = {International Standard Organization},
 …
 @mastersthesis{Schluntz17,
-    keywords    = {constructors, destructors, tuples},
     author      = {Robert Schluntz},
     title       = {Resource Management and Tuples in \textsf{C}$\mathbf{\forall}$},
+    title       = {Resource Management and Tuples in {C}$\mathbf{\forall}$},
     school      = {School of Computer Science, University of Waterloo},
     year        = 2017,
 …
     keywords    = {Rust programming language},
     contributer = {pabuhr@plg},
     key         = {Rust},
     title       = {The {R}ust Programming Language},
     address     = {The Rust Project Developers},
+    author      = {{Rust}},
+    title       = {The {Rust} Programming Language},
+    organization= {The Rust Project Developers},
     year        = 2015,
     note        = {\href{https://doc.rust-lang.org/reference.html}{https://\-doc.rust-lang\-.org/\-reference.html}},
 …
     keywords    = {Scala programming language},
     contributer = {pabuhr@plg},
     key         = {Scala},
     title       = {{S}cala Language Specification, Version 2.11},
     address     = {\'{E}cole Polytechnique F\'{e}d\'{e}rale de Lausanne},
+    author      = {{Scala}},
+    title       = {{Scala} Language Specification, Version 2.11},
+    organization= {\'{E}cole Polytechnique F\'{e}d\'{e}rale de Lausanne},
     year        = 2016,
     note        = {\href{http://www.scala-lang.org/files/archive/spec/2.11}{http://\-www.scala-lang.org/\-files/\-archive/\-spec/\-2.11}},
 …
     number      = 12,
     pages       = {66-76},
+}
-@article{Nickolls08,
-    author      = {Nickolls, John and Buck, Ian and Garland, Michael and Skadron, Kevin},
-    title       = {Scalable Parallel Programming with CUDA},
-    journal     = {Queue},
-    volume      = {6},
-    number      = {2},
-    month       = mar,
-    year        = 2008,
-    pages       = {40-53},
-    publisher   = {ACM},
-    address     = {New York, NY, USA},
+}
-@inproceedings{Leissa14,
-    title       = {{S}ierra: a {SIMD} extension for {C}++},
-    author      = {Lei{\ss}a, Roland and Haffner, Immanuel and Hack, Sebastian},
-    booktitle   = {Proceedings of the 2014 Workshop on Workshop on programming models for SIMD/Vector processing},
-    pages       = {17-24},
-    year        = {2014},
-    organization= {ACM}
+}
 …
 @article{Smith98,
     keywords    = {Polymorphic C},
     contributor = {a3moss@uwaterloo.ca},
     title       = {A sound polymorphic type system for a dialect of {C}},
+    contributor = {a3moss@uwaterloo.ca},
+    title       = {A sound polymorphic type system for a dialect of C},
     author      = {Smith, Geoffrey and Volpano, Dennis},
     journal     = {Science of computer programming},
 …
+}
 @misc{Sutter15,
+@online{Sutter15,
     contributer = {pabuhr@plg},
     author      = {Herb Sutter and Bjarne Stroustrup and Gabriel Dos Reis},
 …
     month       = oct,
     year        = 2015,
     pages       = {1-6},
+    pages       = {1--6},
     numpages    = {6},
     howpublished= {\href{http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/p0144r0.pdf}{http://\-www.open-std.org/\-jtc1/\-sc22/\-wg21/\-docs/\-papers/\-2015/\-p0144r0.pdf}},
+    note        = {\href{http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/p0144r0.pdf}{http://\-www.open-std.org/\-jtc1/\-sc22/\-wg21/\-docs/\-papers/\-2015/\-p0144r0.pdf}},
+}
 …
+}
+@misc{TIOBE,
+    contributer = {pabuhr@plg},
+    key         = {TIOBE Index},
+    title       = {{TIOBE} Index},
+    howpublished= {\href{http://www.tiobe.com/tiobe_index}{http://\-www.tiobe.com/\-tiobe\_index}},
+    note        = {Accessed: 2018-09},
+@online{TIOBE,
+    contributer = {pabuhr@plg},
+    author      = {{TIOBE Index}},
+    year        = {February 2018},
+    url         = {http://www.tiobe.com/tiobe_index},
+}
 …
     month       = sep,
     year        = 1990,
+    note        = {}
+}
 …
+}
 @misc{Vala,
+@online{Vala,
     keywords    = {GObject, Vala},
     contributor = {a3moss@uwaterloo.ca},
     key         = {Vala},
     organization= {The {GNOME} Project},
     title       = {{V}ala Reference Manual},
+    author      = {{Vala}},
+    organization= {The GNOME Project},
+    title       = {Vala Reference Manual},
     year        = 2017,
     howpublished= {\url{https://wiki.gnome.org/Projects/Vala/Manual}},
     note        = {Accessed: 2017-04}
+    url         = {https://wiki.gnome.org/Projects/Vala/Manual},
+    urldate     = {2017-04-04}
+}

doc/papers/concurrency/.gitignore

r32cab5b	rb2fe1c9
3	3	*.pdf
4	4	*.ps
5
6		~~Paper.out.ps~~
7		~~WileyNJD-AMA.bst~~

doc/papers/concurrency/Makefile

-              r32cab5b
+              rb2fe1c9
 Build = build
 Figures = figures
 Macros = AMA/AMA-stix/ama
 TeXLIB = .:annex:../../LaTeXmacros:${Macros}:${Build}:../../bibliography:
+Macros = ../../LaTeXmacros
+TeXLIB = .:style:annex:${Macros}:${Build}:../../bibliography:
 LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build}
 BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex
 MAKEFLAGS = --no-print-directory # --silent
+MAKEFLAGS = --no-print-directory --silent #
 VPATH = ${Build} ${Figures}
 …
 DOCUMENT = Paper.pdf
-BASE = ${basename ${DOCUMENT}}
 # Directives #
 …
 clean :
         @rm -frv ${DOCUMENT} ${BASE}.ps WileyNJD-AMA.bst ${BASE}.out.ps ${Build}
+        @rm -frv ${DOCUMENT} ${basename ${DOCUMENT}}.ps ${Build}
 # File Dependencies #
 ${DOCUMENT} : ${BASE}.ps
+${DOCUMENT} : ${basename ${DOCUMENT}}.ps
         ps2pdf $<
 ${BASE}.ps : ${BASE}.dvi
+${basename ${DOCUMENT}}.ps : ${basename ${DOCUMENT}}.dvi
         dvips ${Build}/$< -o $@
 ${BASE}.dvi : Makefile ${Build} ${BASE}.out.ps WileyNJD-AMA.bst ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
                 annex/local.bib ../../bibliography/pl.bib
+${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
+                ${Macros}/common.tex ${Macros}/indexstyle annex/local.bib ../../bibliography/pl.bib
         # Must have *.aux file containing citations for bibtex
         if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename $@}.tex ; fi
         ${BibTeX} ${Build}/${basename $@}
+        -${BibTeX} ${Build}/${basename $@}
         # Some citations reference others so run again to resolve these citations
         ${LaTeX} ${basename $@}.tex
         ${BibTeX} ${Build}/${basename $@}
+        -${BibTeX} ${Build}/${basename $@}
         # Run again to finish citations
         ${LaTeX} ${basename $@}.tex
 …
 ${Build}:
         mkdir -p ${Build}
-${BASE}.out.ps:
-        ln -fs build/Paper.out.ps .
-WileyNJD-AMA.bst:
-        ln -fs AMA/AMA-stix/ama/WileyNJD-AMA.bst .
 %.tex : %.fig

doc/papers/concurrency/Paper.tex

-              r32cab5b
+              rb2fe1c9
+\documentclass[AMA,STIX1COL]{WileyNJD-v2}
+\articletype{RESEARCH ARTICLE}%
+\received{26 April 2016}
+\revised{6 June 2016}
+\accepted{6 June 2016}
 \raggedbottom
+% inline code ©...© (copyright symbol) emacs: C-q M-)
+% red highlighting ®...® (registered trademark symbol) emacs: C-q M-.
+% blue highlighting ß...ß (sharp s symbol) emacs: C-q M-_
+% green highlighting ¢...¢ (cent symbol) emacs: C-q M-"
+% LaTex escape §...§ (section symbol) emacs: C-q M-'
+% keyword escape ¶...¶ (pilcrow symbol) emacs: C-q M-^
+% math escape $...$ (dollar symbol)
+\documentclass[10pt]{article}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Latex packages used in the document.
+\usepackage[T1]{fontenc}                                        % allow Latin1 (extended ASCII) characters
+\usepackage{textcomp}
+\usepackage[latin1]{inputenc}
+\usepackage{fullpage,times,comment}
 \usepackage{epic,eepic}
+\usepackage{upquote}                                            % switch curled `'" to straight
+\usepackage{calc}
 \usepackage{xspace}
+\usepackage{comment}
+\usepackage{upquote}                                            % switch curled `'" to straight
+\usepackage[labelformat=simple]{subfig}
+\renewcommand{\thesubfigure}{(\alph{subfigure})}
+\usepackage{graphicx}
+\usepackage{tabularx}
+\usepackage{multicol}
+\usepackage{varioref}
 \usepackage{listings}                                           % format program code
+\usepackage[labelformat=simple,aboveskip=0pt,farskip=0pt]{subfig}
+\renewcommand{\thesubfigure}{(\alph{subfigure})}
+\usepackage[flushmargin]{footmisc}                              % support label/reference in footnote
+\usepackage{latexsym}                                           % \Box glyph
+\usepackage{mathptmx}                                           % better math font with "times"
+\usepackage[usenames]{color}
+\usepackage[pagewise]{lineno}
+\renewcommand{\linenumberfont}{\scriptsize\sffamily}
+\usepackage{fancyhdr}
+\usepackage{float}
 \usepackage{siunitx}
 \sisetup{ binary-units=true }
+%\input{style}                                                          % bespoke macros used in the document
+\hypersetup{breaklinks=true}
+\definecolor{OliveGreen}{cmyk}{0.64 0 0.95 0.40}
+\definecolor{Mahogany}{cmyk}{0 0.85 0.87 0.35}
+\definecolor{Plum}{cmyk}{0.50 1 0 0}
+\usepackage[pagewise]{lineno}
+\renewcommand{\linenumberfont}{\scriptsize\sffamily}
+\lefthyphenmin=4                                                        % hyphen only after 4 characters
+\righthyphenmin=4
+\input{style}                                                   % bespoke macros used in the document
+\usepackage{url}
+\usepackage[dvips,plainpages=false,pdfpagelabels,pdfpagemode=UseNone,colorlinks=true,pagebackref=true,linkcolor=blue,citecolor=blue,urlcolor=blue,pagebackref=true,breaklinks=true]{hyperref}
+\usepackage{breakurl}
+\urlstyle{rm}
+\setlength{\topmargin}{-0.45in}                         % move running title into header
+\setlength{\headsep}{0.25in}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 …
 % Names used in the document.
+\newcommand{\CFAIcon}{\textsf{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
+\newcommand{\CC}{\textrm{C}\kern-.1em\hbox{+\kern-.25em+}\xspace} % C++ symbolic name
+\newcommand{\CCeleven}{\textrm{C}\kern-.1em\hbox{+\kern-.25em+}11\xspace} % C++11 symbolic name
+\newcommand{\CCfourteen}{\textrm{C}\kern-.1em\hbox{+\kern-.25em+}14\xspace} % C++14 symbolic name
+\newcommand{\CCseventeen}{\textrm{C}\kern-.1em\hbox{+\kern-.25em+}17\xspace} % C++17 symbolic name
+\newcommand{\CCtwenty}{\textrm{C}\kern-.1em\hbox{+\kern-.25em+}20\xspace} % C++20 symbolic name
+\newcommand{\Csharp}{C\raisebox{-0.7ex}{\Large$^\sharp$}\xspace} % C# symbolic name
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newcommand{\Version}{1.0.0}
+\newcommand{\CS}{C\raisebox{-0.9ex}{\large$^\sharp$}\xspace}
 \newcommand{\Textbf}[2][red]{{\color{#1}{\textbf{#2}}}}
 …
 \newcommand{\TODO}{{\Textbf{TODO}}}
+\newsavebox{\LstBox}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Default underscore is too low and wide. Cannot use lstlisting "literate" as replacing underscore
+% removes it as a variable-name character so keywords in variables are highlighted. MUST APPEAR
+% AFTER HYPERREF.
+%\DeclareTextCommandDefault{\textunderscore}{\leavevmode\makebox[1.2ex][c]{\rule{1ex}{0.1ex}}}
+\renewcommand{\textunderscore}{\leavevmode\makebox[1.2ex][c]{\rule{1ex}{0.075ex}}}
+\makeatletter
+% parindent is relative, i.e., toggled on/off in environments like itemize, so store the value for
+% use rather than use \parident directly.
+\newlength{\parindentlnth}
+\setlength{\parindentlnth}{\parindent}
+\newcommand{\LstBasicStyle}[1]{{\lst@basicstyle{\lst@basicstyle{#1}}}}
+\newcommand{\LstKeywordStyle}[1]{{\lst@basicstyle{\lst@keywordstyle{#1}}}}
+\newcommand{\LstCommentStyle}[1]{{\lst@basicstyle{\lst@commentstyle{#1}}}}
+\newlength{\gcolumnposn}                                        % temporary hack because lstlisting does not handle tabs correctly
+\newlength{\columnposn}
+\setlength{\gcolumnposn}{3.5in}
+\setlength{\columnposn}{\gcolumnposn}
+\newcommand{\C}[2][\@empty]{\ifx#1\@empty\else\global\setlength{\columnposn}{#1}\global\columnposn=\columnposn\fi\hfill\makebox[\textwidth-\columnposn][l]{\lst@basicstyle{\LstCommentStyle{#2}}}}
+\newcommand{\CRT}{\global\columnposn=\gcolumnposn}
+% Denote newterms in particular font and index them without particular font and in lowercase, e.g., \newterm{abc}.
+% The option parameter provides an index term different from the new term, e.g., \newterm[\texttt{abc}]{abc}
+% The star version does not lowercase the index information, e.g., \newterm*{IBM}.
+\newcommand{\newtermFontInline}{\emph}
+\newcommand{\newterm}{\@ifstar\@snewterm\@newterm}
+\newcommand{\@newterm}[2][\@empty]{\lowercase{\def\temp{#2}}{\newtermFontInline{#2}}\ifx#1\@empty\index{\temp}\else\index{#1@{\protect#2}}\fi}
+\newcommand{\@snewterm}[2][\@empty]{{\newtermFontInline{#2}}\ifx#1\@empty\index{#2}\else\index{#1@{\protect#2}}\fi}
+% Latin abbreviation
+\newcommand{\abbrevFont}{\textit}                       % set empty for no italics
+\@ifundefined{eg}{
+\newcommand{\EG}{\abbrevFont{e}.\abbrevFont{g}.}
+\newcommand*{\eg}{%
+        \@ifnextchar{,}{\EG}%
+                {\@ifnextchar{:}{\EG}%
+                        {\EG,\xspace}}%
+}}{}%
+\@ifundefined{ie}{
+\newcommand{\IE}{\abbrevFont{i}.\abbrevFont{e}.}
+\newcommand*{\ie}{%
+        \@ifnextchar{,}{\IE}%
+                {\@ifnextchar{:}{\IE}%
+                        {\IE,\xspace}}%
+}}{}%
+\@ifundefined{etc}{
+\newcommand{\ETC}{\abbrevFont{etc}}
+\newcommand*{\etc}{%
+        \@ifnextchar{.}{\ETC}%
+        {\ETC.\xspace}%
+}}{}%
+\@ifundefined{etal}{
+\newcommand{\ETAL}{\abbrevFont{et}~\abbrevFont{al}}
+\newcommand*{\etal}{%
+        \@ifnextchar{.}{\protect\ETAL}%
+                {\protect\ETAL.\xspace}%
+}}{}%
+\@ifundefined{viz}{
+\newcommand{\VIZ}{\abbrevFont{viz}}
+\newcommand*{\viz}{%
+        \@ifnextchar{.}{\VIZ}%
+                {\VIZ.\xspace}%
+}}{}%
+\makeatother
+\newenvironment{cquote}{%
+        \list{}{\lstset{resetmargins=true,aboveskip=0pt,belowskip=0pt}\topsep=3pt\parsep=0pt\leftmargin=\parindentlnth\rightmargin\leftmargin}%
+        \item\relax
+}{%
+        \endlist
+}% cquote
+% CFA programming language, based on ANSI C (with some gcc additions)
+\lstdefinelanguage{CFA}[ANSI]{C}{
+        morekeywords={
+                _Alignas, _Alignof, __alignof, __alignof__, asm, __asm, __asm__, __attribute, __attribute__,
+                auto, _Bool, catch, catchResume, choose, _Complex, __complex, __complex__, __const, __const__,
+                coroutine, disable, dtype, enable, __extension__, exception, fallthrough, fallthru, finally,
+                __float80, float80, __float128, float128, forall, ftype, _Generic, _Imaginary, __imag, __imag__,
+                inline, __inline, __inline__, __int128, int128, __label__, monitor, mutex, _Noreturn, one_t, or,
+                otype, restrict, __restrict, __restrict__, __signed, __signed__, _Static_assert, thread,
+                _Thread_local, throw, throwResume, timeout, trait, try, ttype, typeof, __typeof, __typeof__,
+                virtual, __volatile, __volatile__, waitfor, when, with, zero_t},
+        moredirectives={defined,include_next}%
+}
+\lstset{
+language=CFA,
+columns=fullflexible,
+basicstyle=\linespread{0.9}\sf,                                                 % reduce line spacing and use sanserif font
+stringstyle=\tt,                                                                                % use typewriter font
+tabsize=5,                                                                                              % N space tabbing
+xleftmargin=\parindentlnth,                                                             % indent code to paragraph indentation
+%mathescape=true,                                                                               % LaTeX math escape in CFA code $...$
+escapechar=\$,                                                                                  % LaTeX escape in CFA code
+keepspaces=true,                                                                                %
+showstringspaces=false,                                                                 % do not show spaces with cup
+showlines=true,                                                                                 % show blank lines at end of code
+aboveskip=4pt,                                                                                  % spacing above/below code block
+belowskip=3pt,
+% replace/adjust listing characters that look bad in sanserif
+literate={-}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.8ex}{0.1ex}}}}1 {^}{\raisebox{0.6ex}{$\scriptstyle\land\,$}}1
+        {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 % {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1
+        {<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2 {->}{\makebox[1ex][c]{\raisebox{0.5ex}{\rule{0.8ex}{0.075ex}}}\kern-0.2ex{\textgreater}}2,
+moredelim=**[is][\color{red}]{`}{`},
+}% lstset
+% uC++ programming language, based on ANSI C++
+\lstdefinelanguage{uC++}[ANSI]{C++}{
+        morekeywords={
+                _Accept, _AcceptReturn, _AcceptWait, _Actor, _At, _CatchResume, _Cormonitor, _Coroutine, _Disable,
+                _Else, _Enable, _Event, _Finally, _Monitor, _Mutex, _Nomutex, _PeriodicTask, _RealTimeTask,
+                _Resume, _Select, _SporadicTask, _Task, _Timeout, _When, _With, _Throw},
+}
+\lstdefinelanguage{Golang}{
+        morekeywords=[1]{package,import,func,type,struct,return,defer,panic,recover,select,var,const,iota,},
+        morekeywords=[2]{string,uint,uint8,uint16,uint32,uint64,int,int8,int16,int32,int64,
+                bool,float32,float64,complex64,complex128,byte,rune,uintptr, error,interface},
+        morekeywords=[3]{map,slice,make,new,nil,len,cap,copy,close,true,false,delete,append,real,imag,complex,chan,},
+        morekeywords=[4]{for,break,continue,range,goto,switch,case,fallthrough,if,else,default,},
+        morekeywords=[5]{Println,Printf,Error,},
+        sensitive=true,
+        morecomment=[l]{//},
+        morecomment=[s]{/*}{*/},
+        morestring=[b]',
+        morestring=[b]",
+        morestring=[s]{`}{`},
+}
+\lstnewenvironment{cfa}[1][]
+{\lstset{#1}}
+{}
+\lstnewenvironment{C++}[1][]                            % use C++ style
+{\lstset{language=C++,moredelim=**[is][\protect\color{red}]{`}{`},#1}\lstset{#1}}
+{}
+\lstnewenvironment{uC++}[1][]
+{\lstset{#1}}
+{}
+\lstnewenvironment{Go}[1][]
+{\lstset{#1}}
+{}
+% inline code @...@
+\lstMakeShortInline@%
+\title{\texorpdfstring{Concurrency in \protect\CFA}{Concurrency in Cforall}}
+\author[1]{Thierry Delisle}
+\author[1]{Peter A. Buhr*}
+\authormark{Thierry Delisle \textsc{et al}}
+\address[1]{\orgdiv{Cheriton School of Computer Science}, \orgname{University of Waterloo}, \orgaddress{\state{Ontario}, \country{Canada}}}
+\corres{*Peter A. Buhr, \email{pabuhr{\char`\@}uwaterloo.ca}}
+\presentaddress{Cheriton School of Computer Science, University of Waterloo, Waterloo, ON, N2L 3G1, Canada}
+\abstract[Summary]{
+\CFA is a modern, polymorphic, \emph{non-object-oriented} extension of the C programming language.
+This paper discusses the design of the concurrency and parallelism features in \CFA, and the concurrent runtime-system.
+These features are created from scratch as ISO C lacks concurrency, relying largely on pthreads.
+Coroutines and lightweight (user) threads are introduced into the language.
+In addition, monitors are added as a high-level mechanism for mutual exclusion and synchronization.
+A unique contribution is allowing multiple monitors to be safely acquired simultaneously.
+All features respect the expectations of C programmers, while being fully integrate with the \CFA polymorphic type-system and other language features.
+Finally, experimental results are presented to compare the performance of the new features with similar mechanisms in other concurrent programming-languages.
+}%
+\keywords{concurrency, parallelism, coroutines, threads, monitors, runtime, C, Cforall}
+\setcounter{secnumdepth}{2}                           % number subsubsections
+\setcounter{tocdepth}{2}                              % subsubsections in table of contents
+% \linenumbers                                          % comment out to turn off line numbering
+\title{Concurrency in \CFA}
+\author{Thierry Delisle and Peter A. Buhr, Waterloo, Ontario, Canada}
 \begin{document}
-\linenumbers                                            % comment out to turn off line numbering
 \maketitle
+% ======================================================================
+\begin{abstract}
+\CFA is a modern, \emph{non-object-oriented} extension of the C programming language.
+This paper serves as a definition and an implementation for the concurrency and parallelism \CFA offers. These features are created from scratch due to the lack of concurrency in ISO C. Lightweight threads are introduced into the language. In addition, monitors are introduced as a high-level tool for control-flow based synchronization and mutual-exclusion. The main contributions of this paper are two-fold: it extends the existing semantics of monitors introduce by~\cite{Hoare74} to handle monitors in groups and also details the engineering effort needed to introduce these features as core language features. Indeed, these features are added with respect to expectations of C programmers, and integrate with the \CFA type-system and other language features.
+\end{abstract}
+%----------------------------------------------------------------------
+% MAIN BODY
+%----------------------------------------------------------------------
 % ======================================================================
 \section{Introduction}
 % ======================================================================
+% ======================================================================
+This paper provides a minimal concurrency \newterm{Abstract Program Interface} (API) that is simple, efficient and can be used to build other concurrency features.
+While the simplest concurrency system is a thread and a lock, this low-level approach is hard to master.
+An easier approach for programmers is to support higher-level constructs as the basis of concurrency.
+Indeed, for highly productive concurrent programming, high-level approaches are much more popular~\cite{Hochstein05}.
+Examples of high-level approaches are task based~\cite{TBB}, message passing~\cite{Erlang,MPI}, and implicit threading~\cite{OpenMP}.
+This paper used the following terminology.
+A \newterm{thread} is a fundamental unit of execution that runs a sequence of code and requires a stack to maintain state.
+Multiple simultaneous threads gives rise to \newterm{concurrency}, which requires locking to ensure safe communication and access to shared data.
+% Correspondingly, concurrency is defined as the concepts and challenges that occur when multiple independent (sharing memory, timing dependencies, \etc) concurrent threads are introduced.
+\newterm{Locking}, and by extension locks, are defined as a mechanism to prevent progress of threads to provide safety.
+\newterm{Parallelism} is running multiple threads simultaneously.
+Parallelism implies \emph{actual} simultaneous execution, where concurrency only requires \emph{apparent} simultaneous execution.
+As such, parallelism is only observable in differences in performance, which is observed through differences in timing.
+Hence, there are two problems to be solved in the design of concurrency for a programming language: concurrency and parallelism.
+While these two concepts are often combined, they are in fact distinct, requiring different tools~\cite[\S~2]{Buhr05a}.
+Concurrency tools handle synchronization and mutual exclusion, while parallelism tools handle performance, cost and resource utilization.
+The proposed concurrency API is implemented in a dialect of C, called \CFA.
+The paper discusses how the language features are added to the \CFA translator with respect to parsing, semantic, and type checking, and the corresponding high-perforamnce runtime-library to implement the concurrency features.
+This paper provides a minimal concurrency \textbf{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 concurrency. Indeed, for highly productive concurrent programming, high-level approaches are much more popular~\cite{HPP:Study}. Examples are task based, message passing and implicit threading. The high-level approach and its minimal \textbf{api} are tested in a dialect of C, called \CFA. Furthermore, the proposed \textbf{api} doubles as an early definition of the \CFA language and library. This paper also provides an implementation of the concurrency library for \CFA as well as all the required language features added to the source-to-source translator.
+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 programmer. While these two concepts are often combined, they are in fact distinct, requiring different tools~\cite{Buhr05a}. Concurrency tools need to handle mutual exclusion and synchronization, while parallelism tools are about performance, cost and resource utilization.
+In the context of this paper, a \textbf{thread} is a fundamental unit of execution that runs a sequence of code, generally on a program stack. Having multiple simultaneous threads gives rise to concurrency and generally requires some kind of locking mechanism to ensure proper execution. Correspondingly, \textbf{concurrency} is defined as the concepts and challenges that occur when multiple independent (sharing memory, timing dependencies, etc.) concurrent threads are introduced. Accordingly, \textbf{locking} (and by extension locks) are defined as a mechanism that prevents the progress of certain threads in order to avoid problems due to concurrency. Finally, in this paper \textbf{parallelism} is distinct from concurrency and is defined as running multiple threads simultaneously. More precisely, parallelism implies \emph{actual} simultaneous execution as opposed to concurrency which only requires \emph{apparent} simultaneous execution. As such, parallelism is only observable in the differences in performance or, more generally, differences in timing.
 % ======================================================================
 …
 The following is a quick introduction to the \CFA language, specifically tailored to the features needed to support concurrency.
+\CFA is an extension of ISO-C and therefore supports all of the same paradigms as C.
+It is a non-object-oriented system-language, meaning most of the major abstractions have either no runtime overhead or can be opted out easily.
+Like C, the basics of \CFA revolve around structures and routines, which are thin abstractions over machine code.
+The vast majority of the code produced by the \CFA translator respects memory layouts and calling conventions laid out by C.
+Interestingly, while \CFA is not an object-oriented language, lacking the concept of a receiver (\eg {\tt this}), it does have some notion of objects\footnote{C defines the term objects as : ``region of data storage in the execution environment, the contents of which can represent
+values''~\cite[3.15]{C11}}, most importantly construction and destruction of objects.
+Most of the following code examples can be found on the \CFA website~\cite{Cforall}.
+\CFA is an extension of ISO-C and therefore supports all of the same paradigms as C. It is a non-object-oriented system-language, meaning most of the major abstractions have either no runtime overhead or can be opted out easily. Like C, the basics of \CFA revolve around structures and routines, which are thin abstractions over machine code. The vast majority of the code produced by the \CFA translator respects memory layouts and calling conventions laid out by C. Interestingly, while \CFA is not an object-oriented language, lacking the concept of a receiver (e.g., {\tt this}), it does have some notion of objects\footnote{C defines the term objects as : ``region of data storage in the execution environment, the contents of which can represent
+values''~\cite[3.15]{C11}}, most importantly construction and destruction of objects. Most of the following code examples can be found on the \CFA website~\cite{www-cfa}.
+% ======================================================================
 \subsection{References}
+Like \CC, \CFA introduces rebind-able references providing multiple dereferencing as an alternative to pointers.
+In regards to concurrency, the semantic difference between pointers and references are not particularly relevant, but since this document uses mostly references, here is a quick overview of the semantics:
+\begin{cfa}
+Like \CC, \CFA introduces rebind-able references providing multiple dereferencing as an alternative to pointers. In regards to concurrency, the semantic difference between pointers and references are not particularly relevant, but since this document uses mostly references, here is a quick overview of the semantics:
+\begin{cfacode}
 int x, *p1 = &x, **p2 = &p1, ***p3 = &p2,
         &r1 = x,    &&r2 = r1,   &&&r3 = r2;
 ***p3 = 3;                                                      $\C{// change x}$
 r3    = 3;                                                      $\C{// change x, ***r3}$
 **p3  = ...;                                            $\C{// change p1}$
 *p3   = ...;                                            $\C{// change p2}$
 int y, z, & ar[3] = {x, y, z};          $\C{// initialize array of references}$
 typeof( ar[1]) p;                                       $\C{// is int, referenced object type}$
 typeof(&ar[1]) q;                                       $\C{// is int \&, reference type}$
 sizeof( ar[1]) == sizeof(int);          $\C{// is true, referenced object size}$
 sizeof(&ar[1]) == sizeof(int *);        $\C{// is true, reference size}$
 \end{cfa}
+***p3 = 3;                                                      //change x
+r3    = 3;                                                      //change x, ***r3
+**p3  = ...;                                            //change p1
+*p3   = ...;                                            //change p2
+int y, z, & ar[3] = {x, y, z};          //initialize array of references
+typeof( ar[1]) p;                                       //is int, referenced object type
+typeof(&ar[1]) q;                                       //is int &, reference type
+sizeof( ar[1]) == sizeof(int);          //is true, referenced object size
+sizeof(&ar[1]) == sizeof(int *);        //is true, reference size
+\end{cfacode}
 The important take away from this code example is that a reference offers a handle to an object, much like a pointer, but which is automatically dereferenced for convenience.
 …
 \subsection{Overloading}
+Another important feature of \CFA is function overloading as in Java and \CC, where routines with the same name are selected based on the number and type of the arguments.
+As well, \CFA uses the return type as part of the selection criteria, as in Ada~\cite{Ada}.
+For routines with multiple parameters and returns, the selection is complex.
+\begin{cfa}
+// selection based on type and number of parameters
+void f(void);                   $\C{// (1)}$
+void f(char);                   $\C{// (2)}$
+void f(int, double);    $\C{// (3)}$
+f();                                    $\C{// select (1)}$
+f('a');                                 $\C{// select (2)}$
+f(3, 5.2);                              $\C{// select (3)}$
+// selection based on  type and number of returns
+char   f(int);                  $\C{// (1)}$
+double f(int);                  $\C{// (2)}$
+char   c = f(3);                $\C{// select (1)}$
+double d = f(4);                $\C{// select (2)}$
+\end{cfa}
+This feature is particularly important for concurrency since the runtime system relies on creating different types to represent concurrency objects.
+Therefore, overloading is necessary to prevent the need for long prefixes and other naming conventions that prevent name clashes.
+As seen in section \ref{basics}, routine @main@ is an example that benefits from overloading.
+Another important feature of \CFA is function overloading as in Java and \CC, where routines with the same name are selected based on the number and type of the arguments. As well, \CFA uses the return type as part of the selection criteria, as in Ada~\cite{Ada}. For routines with multiple parameters and returns, the selection is complex.
+\begin{cfacode}
+//selection based on type and number of parameters
+void f(void);                   //(1)
+void f(char);                   //(2)
+void f(int, double);    //(3)
+f();                                    //select (1)
+f('a');                                 //select (2)
+f(3, 5.2);                              //select (3)
+//selection based on  type and number of returns
+char   f(int);                  //(1)
+double f(int);                  //(2)
+char   c = f(3);                //select (1)
+double d = f(4);                //select (2)
+\end{cfacode}
+This feature is particularly important for concurrency since the runtime system relies on creating different types to represent concurrency objects. Therefore, overloading is necessary to prevent the need for long prefixes and other naming conventions that prevent name clashes. As seen in section \ref{basics}, routine \code{main} is an example that benefits from overloading.
 % ======================================================================
 \subsection{Operators}
+Overloading also extends to operators.
+The syntax for denoting operator-overloading is to name a routine with the symbol of the operator and question marks where the arguments of the operation appear, \eg:
+\begin{cfa}
+int ++? (int op);                       $\C{// unary prefix increment}$
+int ?++ (int op);                       $\C{// unary postfix increment}$
+int ?+? (int op1, int op2);             $\C{// binary plus}$
+int ?<=?(int op1, int op2);             $\C{// binary less than}$
+int ?=? (int & op1, int op2);           $\C{// binary assignment}$
+int ?+=?(int & op1, int op2);           $\C{// binary plus-assignment}$
+Overloading also extends to operators. The syntax for denoting operator-overloading is to name a routine with the symbol of the operator and question marks where the arguments of the operation appear, e.g.:
+\begin{cfacode}
+int ++? (int op);                       //unary prefix increment
+int ?++ (int op);                       //unary postfix increment
+int ?+? (int op1, int op2);             //binary plus
+int ?<=?(int op1, int op2);             //binary less than
+int ?=? (int & op1, int op2);           //binary assignment
+int ?+=?(int & op1, int op2);           //binary plus-assignment
 struct S {int i, j;};
 S ?+?(S op1, S op2) {                           $\C{// add two structures}$
+S ?+?(S op1, S op2) {                           //add two structures
         return (S){op1.i + op2.i, op1.j + op2.j};
+}
 S s1 = {1, 2}, s2 = {2, 3}, s3;
 s3 = s1 + s2;                                           $\C{// compute sum: s3 == {2, 5}}$
 \end{cfa}
+s3 = s1 + s2;                                           //compute sum: s3 == {2, 5}
+\end{cfacode}
 While concurrency does not use operator overloading directly, this feature is more important as an introduction for the syntax of constructors.
 % ======================================================================
 \subsection{Constructors/Destructors}
+Object lifetime is often a challenge in concurrency. \CFA uses the approach of giving concurrent meaning to object lifetime as a means of synchronization and/or mutual exclusion.
+Since \CFA relies heavily on the lifetime of objects, constructors and destructors is a core feature required for concurrency and parallelism. \CFA uses the following syntax for constructors and destructors:
+\begin{cfa}
+Object lifetime is often a challenge in concurrency. \CFA uses the approach of giving concurrent meaning to object lifetime as a means of synchronization and/or mutual exclusion. Since \CFA relies heavily on the lifetime of objects, constructors and destructors is a core feature required for concurrency and parallelism. \CFA uses the following syntax for constructors and destructors:
+\begin{cfacode}
 struct S {
         size_t size;
         int * ia;
 };
 void ?{}(S & s, int asize) {    $\C{// constructor operator}$
         s.size = asize;                         $\C{// initialize fields}$
+void ?{}(S & s, int asize) {    //constructor operator
+        s.size = asize;                         //initialize fields
         s.ia = calloc(size, sizeof(S));
+}
 void ^?{}(S & s) {                              $\C{// destructor operator}$
         free(ia);                                       $\C{// de-initialization fields}$
+void ^?{}(S & s) {                              //destructor operator
+        free(ia);                                       //de-initialization fields
+}
 int main() {
+        S x = {10}, y = {100};          $\C{// implicit calls: ?\{\}(x, 10), ?\{\}(y, 100)}$
+        ...                                                     $\C{// use x and y}$
+        ^x{};  ^y{};                            $\C{// explicit calls to de-initialize}$
+        x{20};  y{200};                         $\C{// explicit calls to reinitialize}$
+        ...                                                     $\C{// reuse x and y}$
+}                                                               $\C{// implicit calls: \^?\{\}(y), \^?\{\}(x)}$
+\end{cfa}
+The language guarantees that every object and all their fields are constructed.
+Like \CC, construction of an object is automatically done on allocation and destruction of the object is done on deallocation.
+Allocation and deallocation can occur on the stack or on the heap.
+\begin{cfa}
+        S x = {10}, y = {100};          //implicit calls: ?{}(x, 10), ?{}(y, 100)
+        ...                                                     //use x and y
+        ^x{};  ^y{};                            //explicit calls to de-initialize
+        x{20};  y{200};                         //explicit calls to reinitialize
+        ...                                                     //reuse x and y
+}                                                               //implicit calls: ^?{}(y), ^?{}(x)
+\end{cfacode}
+The language guarantees that every object and all their fields are constructed. Like \CC, construction of an object is automatically done on allocation and destruction of the object is done on deallocation. Allocation and deallocation can occur on the stack or on the heap.
+\begin{cfacode}
+{
         struct S s = {10};      $\C{// allocation, call constructor}$
+        struct S s = {10};      //allocation, call constructor
         ...
 }                                               $\C{// deallocation, call destructor}$
 struct S * s = new();   $\C{// allocation, call constructor}$
+}                                               //deallocation, call destructor
+struct S * s = new();   //allocation, call constructor
 ...
 delete(s);                              $\C{// deallocation, call destructor}$
 \end{cfa}
 Note that like \CC, \CFA introduces @new@ and @delete@, which behave like @malloc@ and @free@ in addition to constructing and destructing objects, after calling @malloc@ and before calling @free@, respectively.
+delete(s);                              //deallocation, call destructor
+\end{cfacode}
+Note that like \CC, \CFA introduces \code{new} and \code{delete}, which behave like \code{malloc} and \code{free} in addition to constructing and destructing objects, after calling \code{malloc} and before calling \code{free}, respectively.
 % ======================================================================
 \subsection{Parametric Polymorphism}
 \label{s:ParametricPolymorphism}
+Routines in \CFA can also be reused for multiple types.
+This capability is done using the @forall@ clauses, which allow separately compiled routines to support generic usage over multiple types.
+For example, the following sum function works for any type that supports construction from 0 and addition:
+\begin{cfa}
+// constraint type, 0 and +
+Routines in \CFA can also be reused for multiple types. This capability is done using the \code{forall} clauses, which allow separately compiled routines to support generic usage over multiple types. For example, the following sum function works for any type that supports construction from 0 and addition:
+\begin{cfacode}
+//constraint type, 0 and +
 forall(otype T | { void ?{}(T *, zero_t); T ?+?(T, T); })
 T sum(T a[ ], size_t size) {
         T total = 0;                            $\C{// construct T from 0}$
+        T total = 0;                            //construct T from 0
         for(size_t i = 0; i < size; i++)
                 total = total + a[i];   $\C{// select appropriate +}$
+                total = total + a[i];   //select appropriate +
         return total;
+}
 S sa[5];
+int i = sum(sa, 5);                             $\C{// use S's 0 construction and +}$
+\end{cfa}
+Since writing constraints on types can become cumbersome for more constrained functions, \CFA also has the concept of traits.
+Traits are named collection of constraints that can be used both instead and in addition to regular constraints:
+\begin{cfa}
+int i = sum(sa, 5);                             //use S's 0 construction and +
+\end{cfacode}
+Since writing constraints on types can become cumbersome for more constrained functions, \CFA also has the concept of traits. Traits are named collection of constraints that can be used both instead and in addition to regular constraints:
+\begin{cfacode}
 trait summable( otype T ) {
         void ?{}(T *, zero_t);          $\C{// constructor from 0 literal}$
         T ?+?(T, T);                            $\C{// assortment of additions}$
+        void ?{}(T *, zero_t);          //constructor from 0 literal
+        T ?+?(T, T);                            //assortment of additions
         T ?+=?(T *, T);
         T ++?(T *);
         T ?++(T *);
 };
 forall( otype T | summable(T) ) $\C{// use trait}$
+forall( otype T | summable(T) ) //use trait
 T sum(T a[], size_t size);
+\end{cfa}
+Note that the type use for assertions can be either an @otype@ or a @dtype@.
+Types declared as @otype@ refer to ``complete'' objects, \ie objects with a size, a default constructor, a copy constructor, a destructor and an assignment operator.
+Using @dtype@, on the other hand, has none of these assumptions but is extremely restrictive, it only guarantees the object is addressable.
+\end{cfacode}
+Note that the type use for assertions can be either an \code{otype} or a \code{dtype}. Types declared as \code{otype} refer to ``complete'' objects, i.e., objects with a size, a default constructor, a copy constructor, a destructor and an assignment operator. Using \code{dtype,} on the other hand, has none of these assumptions but is extremely restrictive, it only guarantees the object is addressable.
 % ======================================================================
 \subsection{with Clause/Statement}
+Since \CFA lacks the concept of a receiver, certain functions end up needing to repeat variable names often.
+To remove this inconvenience, \CFA provides the @with@ statement, which opens an aggregate scope making its fields directly accessible (like Pascal).
+\begin{cfa}
+Since \CFA lacks the concept of a receiver, certain functions end up needing to repeat variable names often. To remove this inconvenience, \CFA provides the \code{with} statement, which opens an aggregate scope making its fields directly accessible (like Pascal).
+\begin{cfacode}
 struct S { int i, j; };
 int mem(S & this) with (this)           $\C{// with clause}$
         i = 1;                                                  $\C{// this->i}$
         j = 2;                                                  $\C{// this->j}$
+int mem(S & this) with (this)           //with clause
+        i = 1;                                                  //this->i
+        j = 2;                                                  //this->j
+}
 int foo() {
         struct S1 { ... } s1;
         struct S2 { ... } s2;
         with (s1)                                               $\C{// with statement}$
+        with (s1)                                               //with statement
+        {
                 // access fields of s1 without qualification
                 with (s2)                                       $\C{// nesting}$
+                //access fields of s1 without qualification
+                with (s2)                                       //nesting
+                {
                         // access fields of s1 and s2 without qualification
+                        //access fields of s1 and s2 without qualification
+                }
+        }
         with (s1, s2)                                   $\C{// scopes open in parallel}$
+        with (s1, s2)                                   //scopes open in parallel
+        {
                 // access fields of s1 and s2 without qualification
+        }
+}
 \end{cfa}
 For more information on \CFA see \cite{cforall-ug,Schluntz17,www-cfa}.
+                //access fields of s1 and s2 without qualification
+        }
+}
+\end{cfacode}
+For more information on \CFA see \cite{cforall-ug,rob-thesis,www-cfa}.
 % ======================================================================
 …
 % ======================================================================
 % ======================================================================
+At its core, concurrency is based on having multiple call-stacks and scheduling among threads of execution executing on these stacks.
+Multiple call stacks (or contexts) and a single thread of execution does \emph{not} imply concurrency.
+Execution with a single thread and multiple stacks where the thread is deterministically self-scheduling across the stacks is called \newterm{coroutining};
+execution with a single thread and multiple stacks but where the thread is scheduled by an oracle (non-deterministic from the thread's perspective) across the stacks is called concurrency~\cite[\S~3]{Buhr05a}.
+Therefore, a minimal concurrency system can be achieved using coroutines (see Section \ref{coroutine}), which instead of context-switching among each other, always defer to an oracle for where to context-switch next.
+While coroutines can execute on the caller's stack-frame, stack-full coroutines allow full generality and are sufficient as the basis for concurrency.
+The aforementioned oracle is a scheduler and the whole system now follows a cooperative threading-model (a.k.a., non-preemptive scheduling).
+The oracle/scheduler can either be a stack-less or stack-full 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.
+A scheduler introduces order of execution uncertainty, while preemption introduces uncertainty about where context switches occur.
+Mutual exclusion and synchronization are ways of limiting non-determinism in a concurrent system.
+Now it is important to understand that uncertainty is desirable; uncertainty can be used by runtime 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.
+\subsection{\protect\CFA's Thread Building Blocks}
+One of the important features that are missing in C is threading\footnote{While the C11 standard defines a ``threads.h'' header, it is minimal and defined as optional.
+As such, library support for threading is far from widespread.
+At the time of writing the paper, neither \protect\lstinline|gcc| nor \protect\lstinline|clang| support ``threads.h'' in their standard libraries.}.
+On modern architectures, a lack of threading is unacceptable~\cite{Sutter05, Sutter05b}, and therefore modern programming languages must have the proper tools to allow users to write efficient concurrent programs to take advantage of parallelism.
+As an extension of C, \CFA needs to express these concepts in a way that is as natural as possible to programmers familiar with 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.
+\subsection{Coroutines: A Stepping Stone}\label{coroutine}
+While the focus of this proposal is concurrency and parallelism, it is important to address coroutines, which are a significant building block of a concurrency system.
+\newterm{Coroutine}s are generalized routines with points where execution is suspended and resumed at a later time.
+Suspend/resume is a context switche and coroutines have other context-management operations.
+Many design challenges of threads are partially present in designing coroutines, which makes the design effort relevant.
+The core \textbf{api} of coroutines has two features: independent call-stacks and @suspend@/@resume@.
+A coroutine handles the class of problems that need to retain state between calls (\eg plugin, device driver, finite-state machine).
+For example, a problem made easier with coroutines is unbounded generators, \eg generating an infinite sequence of Fibonacci numbers:
+\begin{displaymath}
+f(n) = \left \{
+\begin{array}{ll}
+                               & n = 0         \\
+                               & n = 1         \\
+f(n-1) + f(n-2) & n \ge 2       \\
+\end{array}
+\right.
+\end{displaymath}
+Figure~\ref{f:C-fibonacci} shows conventional approaches for writing a Fibonacci generator in C.
+Figure~\ref{f:GlobalVariables} illustrates the following problems:
+unencapsulated global variables necessary to retain state between calls;
+only one fibonacci generator can run at a time;
+execution state must be explicitly retained.
+Figure~\ref{f:ExternalState} addresses these issues:
+unencapsulated program global variables become encapsulated structure variables;
+multiple fibonacci generators can run at a time by declaring multiple fibonacci objects;
+explicit execution state is removed by precomputing the first two Fibonacci numbers and returning $f(n-2)$.
+Before any detailed discussion of the concurrency and parallelism in \CFA, it is important to describe the basics of concurrency and how they are expressed in \CFA user code.
+\section{Basics of concurrency}
+At its core, concurrency is based on having multiple call-stacks and scheduling among threads of execution executing on these stacks. Concurrency without parallelism only requires having multiple call stacks (or contexts) for a single thread of execution.
+Execution with a single thread and multiple stacks where the thread is self-scheduling deterministically across the stacks is called coroutining. Execution with a single and multiple stacks but where the thread is scheduled by an oracle (non-deterministic from the thread's perspective) across the stacks is called concurrency.
+Therefore, a minimal concurrency system can be achieved by creating coroutines (see Section \ref{coroutine}), which instead of context-switching among each other, always ask an oracle where to context-switch next. While coroutines can execute on the caller's stack-frame, stack-full coroutines allow full generality and are sufficient as the basis for concurrency. The aforementioned oracle is a scheduler and the whole system now follows a cooperative threading-model (a.k.a., non-preemptive scheduling). The oracle/scheduler can either be a stack-less or stack-full 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.
+A scheduler introduces order of execution uncertainty, while preemption introduces uncertainty about where context switches occur. Mutual exclusion and synchronization are ways of limiting non-determinism in a concurrent system. Now it is important to understand that uncertainty is desirable; uncertainty can be used by runtime 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.
+\section{\protect\CFA's Thread Building Blocks}
+One of the important features that are missing in C is threading\footnote{While the C11 standard defines a ``threads.h'' header, it is minimal and defined as optional. As such, library support for threading is far from widespread. At the time of writing the paper, neither \texttt{gcc} nor \texttt{clang} support ``threads.h'' in their respective standard libraries.}. On modern architectures, a lack of threading is unacceptable~\cite{Sutter05, Sutter05b}, and therefore modern programming languages must have the proper tools to allow users to write efficient concurrent programs to take advantage of parallelism. As an extension of C, \CFA needs to express these concepts in a way that is as natural as possible to programmers familiar with 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, it is important to address coroutines, which are actually a significant building block of a concurrency system. \textbf{Coroutine}s are generalized routines which have predefined points where execution is suspended and can be resumed at a later time. Therefore, they need to deal with context switches and other context-management operations. 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 \textbf{api} of coroutines revolves around two features: independent call-stacks and \code{suspend}/\code{resume}.
+\begin{table}
+\begin{center}
+\begin{tabular}{c @{\hskip 0.025in}|@{\hskip 0.025in} c @{\hskip 0.025in}|@{\hskip 0.025in} c}
+\begin{ccode}[tabsize=2]
+//Using callbacks
+void fibonacci_func(
+        int n,
+        void (*callback)(int)
+) {
+        int first = 0;
+        int second = 1;
+        int next, i;
+        for(i = 0; i < n; i++)
+        {
+                if(i <= 1)
+                        next = i;
+                else {
+                        next = f1 + f2;
+                        f1 = f2;
+                        f2 = next;
+                }
+                callback(next);
+        }
+}
+int main() {
+        void print_fib(int n) {
+                printf("%d\n", n);
+        }
+        fibonacci_func(
+, print_fib
+        );
+}
+\end{ccode}&\begin{ccode}[tabsize=2]
+//Using output array
+void fibonacci_array(
+        int n,
+        int* array
+) {
+        int f1 = 0; int f2 = 1;
+        int next, i;
+        for(i = 0; i < n; i++)
+        {
+                if(i <= 1)
+                        next = i;
+                else {
+                        next = f1 + f2;
+                        f1 = f2;
+                        f2 = next;
+                }
+                array[i] = next;
+        }
+}
+int main() {
+        int a[10];
+        fibonacci_func(
+, a
+        );
+        for(int i=0;i<10;i++){
+                printf("%d\n", a[i]);
+        }
+}
+\end{ccode}&\begin{ccode}[tabsize=2]
+//Using external state
+typedef struct {
+        int f1, f2;
+} Iterator_t;
+int fibonacci_state(
+        Iterator_t* it
+) {
+        int f;
+        f = it->f1 + it->f2;
+        it->f2 = it->f1;
+        it->f1 = max(f,1);
+        return f;
+}
+int main() {
+        Iterator_t it={0,0};
+        for(int i=0;i<10;i++){
+                printf("%d\n",
+                        fibonacci_state(
+                                &it
+                        );
+                );
+        }
+}
+\end{ccode}
+\end{tabular}
+\end{center}
+\caption{Different implementations of a Fibonacci sequence generator in C.}
+\label{lst:fibonacci-c}
+\end{table}
+A good example of a problem made easier with coroutines is generators, e.g., generating the Fibonacci sequence. This problem comes with the challenge of decoupling how a sequence is generated and how it is used. Listing \ref{lst:fibonacci-c} shows conventional approaches to writing generators in C. All three of these approach suffer from strong coupling. The left and centre approaches require that the generator have knowledge of how the sequence is used, while the rightmost approach requires holding internal state between calls on behalf of the generator and makes it much harder to handle corner cases like the Fibonacci seed.
+Listing \ref{lst:fibonacci-cfa} is an example of a solution to the Fibonacci problem using \CFA coroutines, where the coroutine stack holds sufficient state for the next generation. This solution has the advantage of having very strong decoupling between how the sequence is generated and how it is used. Indeed, this version is as easy to use as the \code{fibonacci_state} solution, while the implementation is very similar to the \code{fibonacci_func} example.
 \begin{figure}
+\centering
+\newbox\myboxA
+\begin{lrbox}{\myboxA}
+\begin{lstlisting}[aboveskip=0pt,belowskip=0pt]
+`int f1, f2, state = 1;`   // single global variables
+int fib() {
+        int fn;
+        `switch ( state )` {  // explicit execution state
+          case 1: fn = 0;  f1 = fn;  state = 2;  break;
+          case 2: fn = 1;  f2 = f1;  f1 = fn;  state = 3;  break;
+          case 3: fn = f1 + f2;  f2 = f1;  f1 = fn;  break;
+        }
+        return fn;
+}
+int main() {
+        for ( int i = 0; i < 10; i += 1 ) {
+                printf( "%d\n", fib() );
+        }
+}
+\end{lstlisting}
+\end{lrbox}
+\newbox\myboxB
+\begin{lrbox}{\myboxB}
+\begin{lstlisting}[aboveskip=0pt,belowskip=0pt]
+#define FIB_INIT `{ 0, 1 }`
+typedef struct { int f2, f1; } Fib;
+int fib( Fib * f ) {
+        int ret = f->f2;
+        int fn = f->f1 + f->f2;
+        f->f2 = f->f1; f->f1 = fn;
+        return ret;
+}
+int main() {
+        Fib f1 = FIB_INIT, f2 = FIB_INIT;
+        for ( int i = 0; i < 10; i += 1 ) {
+                printf( "%d %d\n", fib( &f1 ), fib( &f2 ) );
+        }
+}
+\end{lstlisting}
+\end{lrbox}
+\subfloat[3 States: global variables]{\label{f:GlobalVariables}\usebox\myboxA}
+\qquad
+\subfloat[1 State: external variables]{\label{f:ExternalState}\usebox\myboxB}
+\caption{C Fibonacci Implementations}
+\label{f:C-fibonacci}
+\bigskip
+\newbox\myboxA
+\begin{lrbox}{\myboxA}
+\begin{lstlisting}[aboveskip=0pt,belowskip=0pt]
+`coroutine` Fib { int fn; };
+void main( Fib & f ) with( f ) {
+        int f1, f2;
+        fn = 0;  f1 = fn;  `suspend()`;
+        fn = 1;  f2 = f1;  f1 = fn;  `suspend()`;
+\begin{cfacode}[caption={Implementation of Fibonacci using coroutines},label={lst:fibonacci-cfa}]
+coroutine Fibonacci {
+        int fn; //used for communication
+};
+void ?{}(Fibonacci& this) { //constructor
+        this.fn = 0;
+}
+//main automatically called on first resume
+void main(Fibonacci& this) with (this) {
+        int fn1, fn2;           //retained between resumes
+        fn  = 0;
+        fn1 = fn;
+        suspend(this);          //return to last resume
+        fn  = 1;
+        fn2 = fn1;
+        fn1 = fn;
+        suspend(this);          //return to last resume
         for ( ;; ) {
+                fn = f1 + f2;  f2 = f1;  f1 = fn;  `suspend()`;
+        }
+}
+int next( Fib & fib ) with( fib ) {
+        `resume( fib );`
+        return fn;
+}
+int main() {
+        Fib f1, f2;
+                fn  = fn1 + fn2;
+                fn2 = fn1;
+                fn1 = fn;
+                suspend(this);  //return to last resume
+        }
+}
+int next(Fibonacci& this) {
+        resume(this); //transfer to last suspend
+        return this.fn;
+}
+void main() { //regular program main
+        Fibonacci f1, f2;
         for ( int i = 1; i <= 10; i += 1 ) {
                 sout | next( f1 ) | next( f2 ) | endl;
+        }
+}
+\end{lstlisting}
+\end{lrbox}
+\newbox\myboxB
+\begin{lrbox}{\myboxB}
+\begin{lstlisting}[aboveskip=0pt,belowskip=0pt]
+`coroutine` Fib { int ret; };
+void main( Fib & f ) with( f ) {
+        int fn, f1 = 1, f2 = 0;
+        for ( ;; ) {
+                ret = f2;
+                fn = f1 + f2;  f2 = f1;  f1 = fn; `suspend();`
+        }
+}
+int next( Fib & fib ) with( fib ) {
+        `resume( fib );`
+        return ret;
+}
+\end{lstlisting}
+\end{lrbox}
+\subfloat[3 States, internal variables]{\label{f:Coroutine3States}\usebox\myboxA}
+\qquad
+\subfloat[1 State, internal variables]{\label{f:Coroutine1State}\usebox\myboxB}
+\caption{\CFA Coroutine Fibonacci Implementations}
+\label{f:fibonacci-cfa}
+\end{cfacode}
 \end{figure}
+Figure~\ref{f:Coroutine3States} creates a @coroutine@ type, which provides communication for multiple interface functions, and the \newterm{coroutine main}, which runs on the coroutine stack.
+\begin{cfa}
+`coroutine C { char c; int i; _Bool s; };`      $\C{// used for communication}$
+void ?{}( C & c ) { s = false; }                        $\C{// constructor}$
+void main( C & cor ) with( cor ) {                      $\C{// actual coroutine}$
+        while ( ! s ) // process c
+        if ( v == ... ) s = false;
+}
+// interface functions
+char cont( C & cor, char ch ) { c = ch; resume( cor ); return c; }
+_Bool stop( C & cor, int v ) { s = true; i = v; resume( cor ); return s; }
+\end{cfa}
+encapsulates the Fibonacci state in the  shows is an example of a solution to the Fibonacci problem using \CFA coroutines, where the coroutine stack holds sufficient state for the next generation.
+This solution has the advantage of having very strong decoupling between how the sequence is generated and how it is used.
+Indeed, this version is as easy to use as the @fibonacci_state@ solution, while the implementation is very similar to the @fibonacci_func@ example.
+Figure~\ref{f:fmt-line} shows the @Format@ coroutine for restructuring text into groups of character blocks of fixed size.
+The example takes advantage of resuming coroutines in the constructor to simplify the code and highlights the idea that interesting control flow can occur in the constructor.
+Listing \ref{lst:fmt-line} shows the \code{Format} coroutine for restructuring text into groups of character blocks of fixed size. The example takes advantage of resuming coroutines in the constructor to simplify the code and highlights the idea that interesting control flow can occur in the constructor.
 \begin{figure}
 \centering
+\begin{cfa}
 `coroutine` Format {
         char ch;                                                                $\C{// used for communication}$
         int g, b;                                                               $\C{// global because used in destructor}$
+\begin{cfacode}[tabsize=3,caption={Formatting text into lines of 5 blocks of 4 characters.},label={lst:fmt-line}]
+//format characters into blocks of 4 and groups of 5 blocks per line
+coroutine Format {
+        char ch;                                                                        //used for communication
+        int g, b;                                                               //global because used in destructor
 };
+void ?{}( Format & fmt ) { `resume( fmt );` } $\C{// prime (start) coroutine}$
+void ^?{}( Format & fmt ) with( fmt ) { if ( g != 0 || b != 0 ) sout | endl; }
+void main( Format & fmt ) with( fmt ) {
+        for ( ;; ) {                                                    $\C{// for as many characters}$
+                for ( g = 0; g < 5; g += 1 ) {          $\C{// groups of 5 blocks}$
+                        for ( b = 0; b < 4; b += 1 ) {  $\C{// blocks of 4 characters}$
+                                `suspend();`
+                                sout | ch;                                      $\C{// print character}$
+void  ?{}(Format& fmt) {
+        resume( fmt );                                                  //prime (start) coroutine
+}
+void ^?{}(Format& fmt) with fmt {
+        if ( fmt.g != 0 || fmt.b != 0 )
+        sout | endl;
+}
+void main(Format& fmt) with fmt {
+        for ( ;; ) {                                                    //for as many characters
+                for(g = 0; g < 5; g++) {                //groups of 5 blocks
+                        for(b = 0; b < 4; fb++) {       //blocks of 4 characters
+                                suspend();
+                                sout | ch;                                      //print character
+                        }
                         sout | "  ";                                    $\C{// print block separator}$
+                        sout | "  ";                                    //print block separator
+                }
+                sout | endl;                                            $\C{// print group separator}$
+        }
+}
+void prt( Format & fmt, char ch ) {
+                sout | endl;                                            //print group separator
+        }
+}
+void prt(Format & fmt, char ch) {
         fmt.ch = ch;
+        `resume( fmt );`
+}
+        resume(fmt);
+}
 int main() {
         Format fmt;
         char ch;
+        for ( ;; ) {                                                    $\C{// read until end of file}$
+                sin | ch;                                                       $\C{// read one character}$
+          if ( eof( sin ) ) break;                              $\C{// eof ?}$
+                prt( fmt, ch );                                         $\C{// push character for formatting}$
+        }
+}
+\end{cfa}
+\caption{Formatting text into lines of 5 blocks of 4 characters.}
+\label{f:fmt-line}
+        Eof: for ( ;; ) {                                               //read until end of file
+                sin | ch;                                                       //read one character
+                if(eof(sin)) break Eof;                 //eof ?
+                prt(fmt, ch);                                           //push character for formatting
+        }
+}
+\end{cfacode}
 \end{figure}
+\begin{figure}
+\centering
+\lstset{language=CFA,escapechar={},moredelim=**[is][\protect\color{red}]{`}{`}}
+\begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{}}
+\begin{cfa}
+`coroutine` Prod {
+        Cons & c;
+        int N, money, receipt;
+};
+void main( Prod & prod ) with( prod ) {
+        // 1st resume starts here
+        for ( int i = 0; i < N; i += 1 ) {
+                int p1 = random( 100 ), p2 = random( 100 );
+                sout | p1 | " " | p2 | endl;
+                int status = delivery( c, p1, p2 );
+                sout | " $" | money | endl | status | endl;
+                receipt += 1;
+        }
+        stop( c );
+        sout | "prod stops" | endl;
+}
+int payment( Prod & prod, int money ) {
+        prod.money = money;
+        `resume( prod );`
+        return prod.receipt;
+}
+void start( Prod & prod, int N, Cons &c ) {
+        &prod.c = &c;
+        prod.[N, receipt] = [N, 0];
+        `resume( prod );`
+}
+int main() {
+        Prod prod;
+        Cons cons = { prod };
+        srandom( getpid() );
+        start( prod, 5, cons );
+}
+\end{cfa}
+&
+\begin{cfa}
+`coroutine` Cons {
+        Prod & p;
+        int p1, p2, status;
+        _Bool done;
+};
+void ?{}( Cons & cons, Prod & p ) {
+        &cons.p = &p;
+        cons.[status, done ] = [0, false];
+}
+void ^?{}( Cons & cons ) {}
+void main( Cons & cons ) with( cons ) {
+        // 1st resume starts here
+        int money = 1, receipt;
+        for ( ; ! done; ) {
+                sout | p1 | " " | p2 | endl | " $" | money | endl;
+                status += 1;
+                receipt = payment( p, money );
+                sout | " #" | receipt | endl;
+                money += 1;
+        }
+        sout | "cons stops" | endl;
+}
+int delivery( Cons & cons, int p1, int p2 ) {
+        cons.[p1, p2] = [p1, p2];
+        `resume( cons );`
+        return cons.status;
+}
+void stop( Cons & cons ) {
+        cons.done = true;
+        `resume( cons );`
+}
+\end{cfa}
+\end{tabular}
+\caption{Producer / consumer: resume-resume cycle, bi-directional communication}
+\label{f:ProdCons}
+\end{figure}
+\subsubsection{Construction}
+One important design challenge for implementing coroutines and threads (shown in section \ref{threads}) is that the runtime system needs to run code after the user-constructor runs to connect the fully constructed object into the system.
+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 expect both to have fully constructed objects once execution enters the coroutine main and to be able to resume the coroutine from the constructor.
+There are several solutions to this problem but the chosen option effectively forces the design of the coroutine.
+Furthermore, \CFA faces an extra challenge as polymorphic routines create invisible thunks when cast 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{cfa}
+// async: Runs function asynchronously on another thread
+\subsection{Construction}
+One important design challenge for implementing coroutines and threads (shown in section \ref{threads}) is that the runtime system needs to run code after the user-constructor runs to connect the fully constructed object into the system. 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 expect both to have fully constructed objects once execution enters the coroutine main and to be able to resume the coroutine from the constructor. There are several solutions to this problem but the chosen option effectively forces the design of the coroutine.
+Furthermore, \CFA faces an extra challenge as polymorphic routines create invisible thunks when cast 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}
+//async: Runs function asynchronously on another thread
 forall(otype T)
 extern void async(void (*func)(T*), T* obj);
 …
 void bar() {
         int a;
         async(noop, &a); // start thread running noop with argument a
+}
 \end{cfa}
+        async(noop, &a); //start thread running noop with argument a
+}
+\end{cfacode}
 The generated C code\footnote{Code trimmed down for brevity} creates a local thunk to hold type information:
 \begin{cfa}
+\begin{ccode}
 extern void async(/* omitted */, void (*func)(void*), void* obj);
 …
         async(/* omitted */, ((void (*)(void*))(&_thunk0)), (&a));
+}
+\end{cfa}
+The problem in this example is a storage management issue, the function pointer @_thunk0@ is only valid until the end of the block, which limits the viable solutions because storing the function pointer for too long causes undefined behaviour; \ie the stack-based thunk being destroyed before it can be used.
+This challenge is an extension of challenges that come with second-class routines.
+Indeed, GCC nested routines also have the limitation that nested routine cannot be passed outside of the declaration scope.
+The case of coroutines and threads is simply an extension of this problem to multiple call stacks.
+\subsubsection{Alternative: Composition}
+\end{ccode}
+The problem in this example is a storage management issue, the function pointer \code{_thunk0} is only valid until the end of the block, which limits the viable solutions because storing the function pointer for too long causes undefined behaviour; i.e., the stack-based thunk being destroyed before it can be used. This challenge is an extension of challenges that come with second-class routines. Indeed, GCC nested routines also have the limitation that nested routine cannot be passed outside of the declaration scope. 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 is to use composition/containment, where coroutine fields are added to manage the coroutine.
 \begin{cfa}
+\begin{cfacode}
 struct Fibonacci {
         int fn; // used for communication
         coroutine c; // composition
+        int fn; //used for communication
+        coroutine c; //composition
 };
 …
 void ?{}(Fibonacci& this) {
         this.fn = 0;
         // Call constructor to initialize coroutine
+        //Call constructor to initialize coroutine
         (this.c){myMain};
+}
+\end{cfa}
+The downside of this approach is that users need to correctly construct the coroutine handle before using it.
+Like any other objects, the user must carefully choose construction order to prevent usage of objects not yet constructed.
+However, in the case of coroutines, users must also pass to the coroutine information about the coroutine main, like in the previous example.
+This opens the door for user errors and requires extra runtime storage to pass at runtime information that can be known statically.
+\subsubsection{Alternative: Reserved keyword}
+\end{cfacode}
+The downside of this approach is that users need to correctly construct the coroutine handle before using it. Like any other objects, the user must carefully choose construction order to prevent usage of objects not yet constructed. However, in the case of coroutines, users must also pass to the coroutine information about the coroutine main, like in the previous example. This opens the door for user errors and requires extra runtime storage to pass at runtime information that can be known statically.
+\subsection{Alternative: Reserved keyword}
 The next alternative is to use language support to annotate coroutines as follows:
+\begin{cfa}
+\begin{cfacode}
 coroutine Fibonacci {
         int fn; // used for communication
+        int fn; //used for communication
 };
+\end{cfa}
+The @coroutine@ keyword means the compiler can find and inject code where needed.
+The downside of this approach is that it makes coroutine a special case in the language.
+Users wanting 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 the programming language used.
+While this is ultimately the option used for idiomatic \CFA code, coroutines and threads can still be constructed by users without using the language support.
+The reserved keywords are only present to improve ease of use for the common cases.
+\subsubsection{Alternative: Lambda Objects}
+For coroutines as for threads, many implementations are based on routine pointers or function objects~\cite{Butenhof97, C++14, MS:VisualC++, BoostCoroutines15}.
+For example, Boost implements coroutines in terms of four functor object types:
+\begin{cfa}
+\end{cfacode}
+The \code{coroutine} keyword means the compiler can find and inject code where needed. The downside of this approach is that it makes coroutine a special case in the language. Users wanting 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 the programming language used. While this is ultimately the option used for idiomatic \CFA code, coroutines and threads can still 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: Lambda Objects}
+For coroutines as for threads, many implementations are based on routine pointers or function objects~\cite{Butenhof97, C++14, MS:VisualC++, BoostCoroutines15}. 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{cfa}
+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 a simple function pointer in the same way @pthread@ does for threads:
+\begin{cfa}
+\end{cfacode}
+Often, the canonical threading paradigm in languages is based on function pointers, \texttt{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 a simple function pointer in the same way \texttt{pthread} does for threads:
+\begin{cfacode}
 void foo( coroutine_t cid, void* arg ) {
         int* value = (int*)arg;
         // Coroutine body
+        //Coroutine body
+}
 …
         coroutine_resume( &cid );
+}
+\end{cfa}
+This semantics is more common for thread interfaces but coroutines work equally well.
+As discussed in section \ref{threads}, this approach is superseded by static approaches in terms of expressivity.
+\subsubsection{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 @is_coroutine@ (as defined below) and is used as a coroutine.
+\begin{cfa}
+\end{cfacode}
+This semantics is more common for thread interfaces but coroutines work equally well. As discussed in section \ref{threads}, this approach is superseded 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} (as defined below) and is used as a coroutine.
+\begin{cfacode}
 trait is_coroutine(dtype T) {
       void main(T& this);
 …
 forall( dtype T | is_coroutine(T) ) void suspend(T&);
 forall( dtype T | is_coroutine(T) ) void resume (T&);
+\end{cfa}
+This ensures that an object is not a coroutine until @resume@ is called on the object.
+Correspondingly, any object that is passed to @resume@ is a coroutine since it must satisfy the @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 layout of a coroutine is trivial when implementing the @get_coroutine@ routine.
+The \CFA keyword @coroutine@ simply has the effect of implementing the getter and forward declarations required for users to implement the main routine.
+\end{cfacode}
+This ensures that an object is not a coroutine until \code{resume} 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 layout of a coroutine is trivial when implementing the \code{get_coroutine} routine. The \CFA keyword \code{coroutine} simply has the effect of implementing the getter and forward declarations required for users to implement the main routine.
 \begin{center}
 \begin{tabular}{c c c}
 \begin{cfa}[tabsize=3]
+\begin{cfacode}[tabsize=3]
 coroutine MyCoroutine {
         int someValue;
 };
 \end{cfa} & == & \begin{cfa}[tabsize=3]
+\end{cfacode} & == & \begin{cfacode}[tabsize=3]
 struct MyCoroutine {
         int someValue;
 …
 void main(struct MyCoroutine* this);
 \end{cfa}
+\end{cfacode}
 \end{tabular}
 \end{center}
 …
 The combination of these two approaches allows users new to coroutining and concurrency to have an easy and concise specification, while more advanced users have tighter control on memory layout and initialization.
+\subsection{Thread Interface}\label{threads}
+The basic building blocks of multithreading in \CFA are \textbf{cfathread}.
+Both user 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 @thread@ as follows:
+\begin{cfa}
+\section{Thread Interface}\label{threads}
+The basic building blocks of multithreading in \CFA are \textbf{cfathread}. Both user 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}
 thread foo {};
 \end{cfa}
+\end{cfacode}
 As for coroutines, the keyword is a thin wrapper around a \CFA trait:
 \begin{cfa}
+\begin{cfacode}
 trait is_thread(dtype T) {
       void ^?{}(T & mutex this);
 …
       thread_desc* get_thread(T & this);
 };
+\end{cfa}
+Obviously, for this thread implementation to be useful it must run some user code.
+Several other threading interfaces use a function-pointer representation as the interface of threads (for example \Csharp~\cite{Csharp} and Scala~\cite{Scala}).
+However, this proposal considers that statically tying a @main@ routine to a thread supersedes this approach.
+Since the @main@ routine is already a special routine in \CFA (where the program begins), it is a natural extension of the semantics to use overloading to declare mains for different threads (the normal main being the main of the initial thread).
+As such the @main@ routine of a thread can be defined as
+\begin{cfa}
+\end{cfacode}
+Obviously, for this thread implementation to be useful it must run some user code. Several other threading interfaces use a function-pointer representation as the interface of threads (for example \Csharp~\cite{Csharp} and Scala~\cite{Scala}). However, this proposal considers that statically tying a \code{main} routine to a thread supersedes this approach. Since the \code{main} routine is already a special routine in \CFA (where the program begins), it is a natural extension of the semantics to use overloading to declare mains for different threads (the normal main being the main of the initial thread). As such the \code{main} routine of a thread can be defined as
+\begin{cfacode}
 thread foo {};
 …
         sout | "Hello World!" | endl;
+}
+\end{cfa}
+In this example, threads of type @foo@ start execution in the @void main(foo &)@ routine, which prints @"Hello World!".@ While this paper encourages this approach to enforce strongly typed programming, users may prefer to use the routine-based thread semantics for the sake of simplicity.
+With the static semantics it is trivial to write a thread type that takes a function pointer as a parameter and executes it on its stack asynchronously.
+\begin{cfa}
+\end{cfacode}
+In this example, threads of type \code{foo} start execution in the \code{void main(foo &)} routine, which prints \code{"Hello World!".} While this paper encourages this approach to enforce strongly typed programming, users may prefer to use the routine-based thread semantics for the sake of simplicity. With the static semantics it is trivial to write a thread type that takes a function pointer as a parameter and executes it on its stack asynchronously.
+\begin{cfacode}
 typedef void (*voidFunc)(int);
 …
 void main(FuncRunner & this) {
         // thread starts here and runs the function
+        //thread starts here and runs the function
         this.func( this.arg );
+}
 …
         return 0?
+}
 \end{cfa}
+\end{cfacode}
 A consequence of the strongly typed approach to main is that memory layout of parameters and return values to/from a thread are now explicitly specified in the \textbf{api}.
+Of course, for threads to be useful, it must be possible to start and stop threads and wait for them to complete execution.
+While using an \textbf{api} such as @fork@ and @join@ is relatively common in the literature, such an interface is unnecessary.
+Indeed, the simplest approach is to use \textbf{raii} principles and have threads @fork@ after the constructor has completed and @join@ before the destructor runs.
+\begin{cfa}
+Of course, for threads to be useful, it must be possible to start and stop threads and wait for them to complete execution. While using an \textbf{api} such as \code{fork} and \code{join} is relatively common in the literature, such an interface is unnecessary. Indeed, the simplest approach is to use \textbf{raii} principles and have threads \code{fork} after the constructor has completed and \code{join} before the destructor runs.
+\begin{cfacode}
 thread World;
 …
 void main() {
         World w;
         // Thread forks here
         // Printing "Hello " and "World!" are run concurrently
+        //Thread forks here
+        //Printing "Hello " and "World!" are run concurrently
         sout | "Hello " | endl;
         // Implicit join at end of scope
+}
 \end{cfa}
+        //Implicit join at end of scope
+}
+\end{cfacode}
 This semantic has several advantages over explicit semantics: a thread is always started and stopped exactly once, users cannot make any programming errors, and it naturally scales to multiple threads meaning basic synchronization is very simple.
 \begin{cfa}
+\begin{cfacode}
 thread MyThread {
         //...
 };
 // main
+//main
 void main(MyThread& this) {
         //...
 …
 void foo() {
         MyThread thrds[10];
         // Start 10 threads at the beginning of the scope
+        //Start 10 threads at the beginning of the scope
         DoStuff();
+        // Wait for the 10 threads to finish
+}
+\end{cfa}
+However, one of the drawbacks of this approach is that threads always form a tree where nodes must always outlive their children, \ie they are always destroyed in the opposite order of construction because of C scoping rules.
+This restriction is relaxed by using dynamic allocation, so threads can outlive the scope in which they are created, much like dynamically allocating memory lets objects outlive the scope in which they are created.
+\begin{cfa}
+        //Wait for the 10 threads to finish
+}
+\end{cfacode}
+However, one of the drawbacks of this approach is that threads always form a tree where nodes must always outlive their children, i.e., they are always destroyed in the opposite order of construction because of C scoping rules. This restriction is relaxed by using dynamic allocation, so threads can outlive the scope in which they are created, much like dynamically allocating memory lets objects outlive the scope in which they are created.
+\begin{cfacode}
 thread MyThread {
         //...
 …
         MyThread* long_lived;
+        {
                 // Start a thread at the beginning of the scope
+                //Start a thread at the beginning of the scope
                 MyThread short_lived;
                 // create another thread that will outlive the thread in this scope
+                //create another thread that will outlive the thread in this scope
                 long_lived = new MyThread;
                 DoStuff();
                 // Wait for the thread short_lived to finish
+                //Wait for the thread short_lived to finish
+        }
         DoMoreStuff();
         // Now wait for the long_lived to finish
+        //Now wait for the long_lived to finish
         delete long_lived;
+}
 \end{cfa}
+\end{cfacode}
 …
 % ======================================================================
 % ======================================================================
+Several tools 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 closely relate to networking concepts (channels~\cite{CSP,Go} 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 (\ie message passing versus routine calls).
+This distinction in turn means that, in order to be effective, programmers need to learn two sets of design patterns.
+While this distinction can be hidden away in library code, effective use of the library 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 desirable to have a higher-level construct be the core concurrency paradigm~\cite{Hochstein05}.
+An approach that is worth mentioning because it is gaining in popularity is transactional memory~\cite{Herlihy93}.
+While this approach is even pursued by system languages like \CC~\cite{Cpp-Transactions}, the performance and feature set is currently too restrictive to be the main concurrency paradigm for system languages, 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---\eg 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.
+\subsection{Basics}
+Non-determinism requires concurrent systems to offer support for mutual-exclusion and synchronization.
+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 provide numerous mechanisms to establish timing relationships among threads.
+\subsubsection{Mutual-Exclusion}
+As mentioned above, mutual-exclusion is the guarantee that only a fix number of threads can enter a critical section at once.
+However, many solutions exist 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 concurrency techniques, which sacrifice some performance in order to improve ease of use.
+Ease of use comes by either guaranteeing some problems cannot occur (\eg being deadlock free) or by offering a more explicit coupling between data and corresponding critical section.
+For example, the \CC @std::atomic<T>@ offers an easy way to express mutual-exclusion on a restricted set of operations (\eg reading/writing large types atomically).
+Another challenge with low-level locks is composability.
+Locks have restricted composability because it takes careful organizing for multiple locks to be used while preventing deadlocks.
+Easing composability is another feature higher-level mutual-exclusion mechanisms often offer.
+\subsubsection{Synchronization}
+As with mutual-exclusion, low-level synchronization primitives often offer good performance and good flexibility at the cost of ease of use.
+Again, higher-level mechanisms often simplify usage by adding either better coupling between synchronization and data (\eg message passing) or offering a simpler solution to otherwise involved challenges.
+As mentioned above, synchronization can be expressed as guaranteeing that event \textit{X} always happens before \textit{Y}.
+Most of the time, synchronization happens within a critical section, where threads must acquire mutual-exclusion in a certain order.
+However, it may also be desirable to guarantee that event \textit{Z} does not occur between \textit{X} and \textit{Y}.
+Not satisfying this property is called \textbf{barging}.
+For example, where event \textit{X} tries to effect event \textit{Y} but another thread acquires the critical section and emits \textit{Z} before \textit{Y}.
+The classic example is the thread that finishes using a resource and unblocks a thread waiting to use the resource, but the unblocked thread must compete to acquire the resource.
+Preventing or detecting barging is an involved challenge with low-level locks, which can be made much easier by higher-level constructs.
+This challenge is often split into two different methods, barging avoidance and barging prevention.
+Algorithms that use flag variables to detect barging threads are said to be using barging avoidance, while algorithms that baton-pass locks~\cite{Andrews89} between threads instead of releasing the locks are said to be using barging prevention.
+Several tools 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 closely relate to networking concepts (channels~\cite{CSP,Go} 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 calls). This distinction in turn means that, in order to be effective, programmers need to learn two sets of design patterns. While this distinction can be hidden away in library code, effective use of the library 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 desirable to have a higher-level construct be the core concurrency paradigm~\cite{HPP:Study}.
+An approach that is worth mentioning because it is gaining in popularity is transactional memory~\cite{Herlihy93}. While this approach is even pursued by system languages like \CC~\cite{Cpp-Transactions}, the performance and feature set is currently too restrictive to be the main concurrency paradigm for system languages, 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}
+Non-determinism requires concurrent systems to offer support for mutual-exclusion and synchronization. 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 provide numerous mechanisms to establish timing relationships among threads.
+\subsection{Mutual-Exclusion}
+As mentioned above, mutual-exclusion is the guarantee that only a fix number of threads can enter a critical section at once. However, many solutions exist 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 concurrency techniques, 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>} offers 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 have restricted composability because it takes careful organizing for multiple locks to be used while preventing deadlocks. Easing composability is another feature higher-level mutual-exclusion mechanisms often offer.
+\subsection{Synchronization}
+As with mutual-exclusion, low-level synchronization primitives often offer good performance and good flexibility at the cost of ease of use. Again, higher-level mechanisms often simplify usage by adding either better coupling between synchronization and data (e.g., message passing) or offering a simpler solution to otherwise involved challenges. As mentioned above, synchronization can be expressed as guaranteeing that event \textit{X} always happens before \textit{Y}. Most of the time, synchronization happens within a critical section, where threads must acquire mutual-exclusion in a certain order. However, it may also be desirable to guarantee that event \textit{Z} does not occur between \textit{X} and \textit{Y}. Not satisfying this property is called \textbf{barging}. For example, where event \textit{X} tries to effect event \textit{Y} but another thread acquires the critical section and emits \textit{Z} before \textit{Y}. The classic example is the thread that finishes using a resource and unblocks a thread waiting to use the resource, but the unblocked thread must compete to acquire the resource. Preventing or detecting barging is an involved challenge with low-level locks, which can be made much easier by higher-level constructs. This challenge is often split into two different methods, barging avoidance and barging prevention. Algorithms that use flag variables to detect barging threads are said to be using barging avoidance, while algorithms that baton-pass locks~\cite{Andrews89} between threads instead of releasing the locks are said to be using barging prevention.
 % ======================================================================
 …
 % ======================================================================
 % ======================================================================
+A \textbf{monitor} is a set of routines that ensure mutual-exclusion when accessing shared state.
+More precisely, a monitor is a programming technique that associates mutual-exclusion to routine scopes, as opposed to mutex locks, where mutual-exclusion is defined by lock/release calls independently of any scoping of the calling routine.
+This strong association eases readability and maintainability, at the cost of flexibility.
+Note that both monitors and mutex locks, require an abstract handle to identify them.
+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 requirement is the ability to declare a handle to a shared object and a set of routines that act on it:
+\begin{cfa}
+A \textbf{monitor} is a set of routines that ensure mutual-exclusion when accessing shared state. More precisely, a monitor is a programming technique that associates mutual-exclusion to routine scopes, as opposed to mutex locks, where mutual-exclusion is defined by lock/release calls independently of any scoping of the calling routine. This strong association eases readability and maintainability, at the cost of flexibility. Note that both monitors and mutex locks, require an abstract handle to identify them. 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 requirement 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;
 int f(monitor & m);
 int main() {
         monitor m;  // Handle m
         f(m);       // Routine using handle
+}
 \end{cfa}
+        monitor m;  //Handle m
+        f(m);       //Routine using handle
+}
+\end{cfacode}
 % ======================================================================
 …
 % ======================================================================
 % ======================================================================
+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 non-copy-able objects (@dtype@).
+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.
+Passthrough can occur for generic helper routines (@swap@, @sort@, \etc) or specific helper routines like the following to implement an atomic counter:
+\begin{cfa}
+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 non-copy-able objects (\code{dtype}).
+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. Passthrough 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}
 monitor counter_t { /*...see section $\ref{data}$...*/ };
 void ?{}(counter_t & nomutex this); // constructor
 size_t ++?(counter_t & mutex this); // increment
 // need for mutex is platform dependent
 void ?{}(size_t * this, counter_t & mutex cnt); // conversion
 \end{cfa}
+void ?{}(counter_t & nomutex this); //constructor
+size_t ++?(counter_t & mutex this); //increment
+//need for mutex is platform dependent
+void ?{}(size_t * this, counter_t & mutex cnt); //conversion
+\end{cfacode}
 This counter is used as follows:
 \begin{center}
 \begin{tabular}{c @{\hskip 0.35in} c @{\hskip 0.35in} c}
 \begin{cfa}
 // shared counter
+\begin{cfacode}
+//shared counter
 counter_t cnt1, cnt2;
 // multiple threads access counter
+//multiple threads access counter
 thread 1 : cnt1++; cnt2++;
 thread 2 : cnt1++; cnt2++;
 …
         ...
 thread N : cnt1++; cnt2++;
 \end{cfa}
+\end{cfacode}
 \end{tabular}
 \end{center}
+Notice how the counter is used without any explicit synchronization and yet supports thread-safe semantics for both reading and writing, which is similar in usage to the \CC template @std::atomic@.
+Here, the constructor (@?{}@) uses the @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.
+Furthermore, it allows the implementation greater freedom when it initializes the monitor locking.
+The prefix increment operator uses @mutex@ to protect the incrementing process from race conditions.
+Finally, there is a conversion operator from @counter_t@ to @size_t@.
+This conversion may or may not require the @mutex@ keyword depending on whether or not reading a @size_t@ is an atomic operation.
+For maximum usability, monitors use \textbf{multi-acq} semantics, which means a single thread can acquire the same monitor multiple times without deadlock.
+For example, listing \ref{fig:search} uses recursion and \textbf{multi-acq} to print values inside a binary tree.
+Notice how the counter is used without any explicit synchronization and yet supports thread-safe semantics for both reading and writing, which is similar in usage to the \CC template \code{std::atomic}.
+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 con\-structed should never be shared and therefore does not require mutual exclusion. Furthermore, it allows the implementation greater freedom when it initializes the monitor locking. 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 a \code{size_t} is an atomic operation.
+For maximum usability, monitors use \textbf{multi-acq} semantics, which means a single thread can acquire the same monitor multiple times without deadlock. For example, listing \ref{fig:search} uses recursion and \textbf{multi-acq} to print values inside a binary tree.
 \begin{figure}
 \begin{cfa}[caption={Recursive printing algorithm using \textbf{multi-acq}.},label={fig:search}]
+\begin{cfacode}[caption={Recursive printing algorithm using \textbf{multi-acq}.},label={fig:search}]
 monitor printer { ... };
 struct tree {
 …
         print(p, t->right);
+}
 \end{cfa}
+\end{cfacode}
 \end{figure}
+Having both @mutex@ and @nomutex@ keywords can be redundant, depending on the meaning of a routine having neither of these keywords.
+For example, it is reasonable that it should default to the safest option (@mutex@) when given a routine without qualifiers @void foo(counter_t & this)@, whereas assuming @nomutex@ is unsafe and may cause subtle errors.
+On the other hand, @nomutex@ is the ``normal'' parameter behaviour, it effectively states explicitly that ``this routine is not special''.
+Another alternative is making exactly one of these keywords mandatory, which provides the same semantics but without the ambiguity of supporting routines with 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 doubt whether 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 @mutex@ keyword and uses no keyword to mean @nomutex@.
+The next semantic decision is to establish when @mutex@ may be used as a type qualifier.
+Consider the following declarations:
+\begin{cfa}
+Having both \code{mutex} and \code{nomutex} keywords can be redundant, depending on the meaning of a routine having neither of these keywords. For example, it is reasonable that it should default to the safest option (\code{mutex}) when given a routine without qualifiers \code{void foo(counter_t & this)}, whereas assuming \code{nomutex} is unsafe and may cause subtle errors. On the other hand, \code{nomutex} is the ``normal'' parameter behaviour, it effectively states explicitly that ``this routine is not special''. Another alternative is making exactly one of these keywords mandatory, which provides the same semantics but without the ambiguity of supporting routines with 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 doubt whether 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 and uses no keyword to mean \code{nomutex}.
+The next semantic decision is to establish when \code{mutex} may be used as a type qualifier. Consider the following declarations:
+\begin{cfacode}
 int f1(monitor & mutex m);
 int f2(const monitor & mutex m);
 …
 int f4(monitor * mutex m []);
 int f5(graph(monitor *) & mutex m);
+\end{cfa}
+The problem is to identify which object(s) should be acquired.
+Furthermore, each object needs to be acquired only once.
+In the case of simple routines like @f1@ and @f2@ it is easy to identify an exhaustive list of objects to acquire on entry.
+Adding indirections (@f3@) still allows the compiler and programmer to identify which object is acquired.
+However, adding in arrays (@f4@) makes it much harder.
+Array lengths are not necessarily known in C, and even then, making sure objects are only acquired once becomes none-trivial.
+This problem can be extended to absurd limits like @f5@, which uses a graph of monitors.
+To make the issue tractable, this project imposes the requirement that a routine may only acquire one monitor per parameter and it must be the type of the parameter with at most one level of indirection (ignoring potential qualifiers).
+Also note that while routine @f3@ can be supported, meaning that monitor @**m@ is acquired, passing an array to this routine would be type-safe and yet result in undefined behaviour because only the first element of the array is acquired.
+However, this ambiguity is part of the C type-system with respects to arrays.
+For this reason, @mutex@ is disallowed in the context where arrays may be passed:
+\begin{cfa}
+int f1(monitor & mutex m);    // Okay : recommended case
+int f2(monitor * mutex m);    // Not Okay : Could be an array
+int f3(monitor mutex m []);  // Not Okay : Array of unknown length
+int f4(monitor ** mutex m);   // Not Okay : Could be an array
+int f5(monitor * mutex m []); // Not Okay : Array of unknown length
+\end{cfa}
+Note that not all array functions are actually distinct in the type system.
+However, even if the code generation could tell the difference, the extra information is still not sufficient to extend meaningfully the monitor call semantic.
+Unlike object-oriented monitors, where calling a mutex member \emph{implicitly} acquires mutual-exclusion of the receiver object, \CFA uses an explicit mechanism to specify the object that acquires mutual-exclusion.
+A consequence of this approach is that it extends naturally to multi-monitor calls.
+\begin{cfa}
+\end{cfacode}
+The problem is to identify which object(s) should be acquired. Furthermore, each object needs to be acquired only once. In the case of simple routines like \code{f1} and \code{f2} it is easy to identify an exhaustive list of objects to acquire on entry. Adding indirections (\code{f3}) still allows the compiler and programmer to identify which object is acquired. However, adding in arrays (\code{f4}) makes it much harder. Array lengths are not necessarily known in C, and even then, making sure objects are only acquired once becomes none-trivial. This problem can be extended to absurd limits like \code{f5}, which uses a graph of monitors. To make the issue tractable, this project imposes the requirement that a routine may only acquire one monitor per parameter and it must be the type of the parameter with at most one level of indirection (ignoring potential qualifiers). Also note that while routine \code{f3} can be supported, meaning that monitor \code{**m} is acquired, passing an array to this routine would be type-safe and yet result in undefined behaviour because only the first element of the array is acquired. However, this ambiguity is part of the C type-system with respects to arrays. For this reason, \code{mutex} is disallowed in the context where arrays may be passed:
+\begin{cfacode}
+int f1(monitor & mutex m);    //Okay : recommended case
+int f2(monitor * mutex m);    //Not Okay : Could be an array
+int f3(monitor mutex m []);  //Not Okay : Array of unknown length
+int f4(monitor ** mutex m);   //Not Okay : Could be an array
+int f5(monitor * mutex m []); //Not Okay : Array of unknown length
+\end{cfacode}
+Note that not all array functions are actually distinct in the type system. However, even if the code generation could tell the difference, the extra information is still not sufficient to extend meaningfully the monitor call semantic.
+Unlike object-oriented monitors, where calling a mutex member \emph{implicitly} acquires mutual-exclusion of the receiver object, \CFA uses an explicit mechanism to specify the object that acquires mutual-exclusion. A consequence of this approach is that it extends naturally to multi-monitor calls.
+\begin{cfacode}
 int f(MonitorA & mutex a, MonitorB & mutex b);
 …
 MonitorB b;
 f(a,b);
+\end{cfa}
+While OO monitors could be extended with a mutex qualifier for multiple-monitor calls, no example of this feature could be found.
+The capability to acquire multiple locks before entering a critical section is called \emph{\textbf{bulk-acq}}.
+In practice, writing multi-locking routines that do not lead to deadlocks is tricky.
+Having language support for such a feature is therefore a significant asset for \CFA.
+In the case presented above, \CFA guarantees that the order of acquisition is consistent across calls to different routines using the same monitors as arguments.
+This consistent ordering means acquiring multiple monitors is safe from deadlock when using \textbf{bulk-acq}.
+However, users can still force the acquiring order.
+For example, notice which routines use @mutex@/@nomutex@ and how this affects acquiring order:
+\begin{cfa}
+void foo(A& mutex a, B& mutex b) { // acquire a & b
+\end{cfacode}
+While OO monitors could be extended with a mutex qualifier for multiple-monitor calls, no example of this feature could be found. The capability to acquire multiple locks before entering a critical section is called \emph{\textbf{bulk-acq}}. In practice, writing multi-locking routines that do not lead to deadlocks is tricky. Having language support for such a feature is therefore a significant asset for \CFA. In the case presented above, \CFA guarantees that the order of acquisition is consistent across calls to different routines using the same monitors as arguments. This consistent ordering means acquiring multiple monitors is safe from deadlock when using \textbf{bulk-acq}. However, users can still force the acquiring order. For example, notice which routines use \code{mutex}/\code{nomutex} and how this affects acquiring order:
+\begin{cfacode}
+void foo(A& mutex a, B& mutex b) { //acquire a & b
         ...
+}
+void bar(A& mutex a, B& /*nomutex*/ b) { // acquire a
+        ... foo(a, b); ... // acquire b
+}
+void baz(A& /*nomutex*/ a, B& mutex b) { // acquire b
+        ... foo(a, b); ... // acquire a
+}
+\end{cfa}
+The \textbf{multi-acq} monitor lock allows a monitor lock to be acquired by both @bar@ or @baz@ and acquired again in @foo@.
+In the calls to @bar@ and @baz@ the monitors are acquired in opposite order.
+However, such use leads to lock acquiring order problems.
+In the example above, the user uses implicit ordering in the case of function @foo@ but explicit ordering in the case of @bar@ and @baz@.
+This subtle difference means that calling these routines concurrently may lead to deadlock and is therefore undefined behaviour.
+As shown~\cite{Lister77}, solving this problem requires:
+void bar(A& mutex a, B& /*nomutex*/ b) { //acquire a
+        ... foo(a, b); ... //acquire b
+}
+void baz(A& /*nomutex*/ a, B& mutex b) { //acquire b
+        ... foo(a, b); ... //acquire a
+}
+\end{cfacode}
+The \textbf{multi-acq} monitor lock allows a monitor lock to be acquired by both \code{bar} or \code{baz} and acquired again in \code{foo}. In the calls to \code{bar} and \code{baz} the monitors are acquired in opposite order.
+However, such use leads to lock acquiring order problems. In the example above, the user uses implicit ordering in the case of function \code{foo} but explicit ordering in the case of \code{bar} and \code{baz}. This subtle difference means that calling these routines concurrently may lead to deadlock and is therefore undefined behaviour. As shown~\cite{Lister77}, solving this problem requires:
 \begin{enumerate}
         \item Dynamically tracking the monitor-call order.
         \item Implement rollback semantics.
 \end{enumerate}
+While the first requirement is already a significant constraint on the system, implementing a general rollback semantics in a C-like language is still prohibitively complex~\cite{Dice10}.
+In \CFA, users simply need to be careful when acquiring multiple monitors at the same time or only use \textbf{bulk-acq} of all the monitors.
+While \CFA provides only a partial solution, most systems provide no solution and the \CFA partial solution handles many useful cases.
+While the first requirement is already a significant constraint on the system, implementing a general rollback semantics in a C-like language is still prohibitively complex~\cite{Dice10}. In \CFA, users simply need to be careful when acquiring multiple monitors at the same time or only use \textbf{bulk-acq} of all the monitors. While \CFA provides only a partial solution, most systems provide no solution and the \CFA partial solution handles many useful cases.
 For example, \textbf{multi-acq} and \textbf{bulk-acq} can be used together in interesting ways:
 \begin{cfa}
+\begin{cfacode}
 monitor bank { ... };
 …
         deposit( yourbank, me2you );
+}
+\end{cfa}
+This example shows a trivial solution to the bank-account transfer problem~\cite{BankTransfer}.
+Without \textbf{multi-acq} and \textbf{bulk-acq}, the solution to this problem is much more involved and requires careful engineering.
+\subsection{\protect\lstinline|mutex| statement} \label{mutex-stmt}
+The call semantics discussed above have one software engineering issue: only a routine can acquire the mutual-exclusion of a set of monitor. \CFA offers the @mutex@ statement to work around the need for unnecessary names, avoiding a major software engineering problem~\cite{2FTwoHardThings}.
+Table \ref{f:mutex-stmt} shows an example of the @mutex@ statement, which introduces a new scope in which the mutual-exclusion of a set of monitor is acquired.
+Beyond naming, the @mutex@ statement has no semantic difference from a routine call with @mutex@ parameters.
+\end{cfacode}
+This example shows a trivial solution to the bank-account transfer problem~\cite{BankTransfer}. Without \textbf{multi-acq} and \textbf{bulk-acq}, the solution to this problem is much more involved and requires careful engineering.
+\subsection{\code{mutex} statement} \label{mutex-stmt}
+The call semantics discussed above have one software engineering issue: only a routine can acquire the mutual-exclusion of a set of monitor. \CFA offers the \code{mutex} statement to work around the need for unnecessary names, avoiding a major software engineering problem~\cite{2FTwoHardThings}. Table \ref{lst:mutex-stmt} shows an example of the \code{mutex} statement, which introduces a new scope in which the mutual-exclusion of a set of monitor is acquired. Beyond naming, the \code{mutex} statement has no semantic difference from a routine call with \code{mutex} parameters.
 \begin{table}
 \begin{center}
 \begin{tabular}{|c|c|}
 function call & @mutex@ statement \\
+function call & \code{mutex} statement \\
 \hline
 \begin{cfa}[tabsize=3]
+\begin{cfacode}[tabsize=3]
 monitor M {};
 void foo( M & mutex m1, M & mutex m2 ) {
         // critical section
+        //critical section
+}
 …
         foo( m1, m2 );
+}
 \end{cfa}&\begin{cfa}[tabsize=3]
+\end{cfacode}&\begin{cfacode}[tabsize=3]
 monitor M {};
 void bar( M & m1, M & m2 ) {
         mutex(m1, m2) {
                 // critical section
+        }
+}
 \end{cfa}
+                //critical section
+        }
+}
+\end{cfacode}
 \end{tabular}
 \end{center}
 \caption{Regular call semantics vs. \protect\lstinline|mutex| statement}
 \label{f:mutex-stmt}
+\caption{Regular call semantics vs. \code{mutex} statement}
+\label{lst:mutex-stmt}
 \end{table}
 …
 % ======================================================================
 % ======================================================================
+Once the call semantics are established, the next step is to establish data semantics.
+Indeed, until now a monitor is used simply as a generic handle but in most cases monitors contain shared data.
+This data should be intrinsic to the monitor declaration to prevent any accidental use of data without its appropriate protection.
+For example, here is a complete version of the counter shown in section \ref{call}:
+\begin{cfa}
+Once the call semantics are established, the next step is to establish data semantics. Indeed, until now a monitor is used simply as a generic handle but in most cases monitors contain shared data. This data should be intrinsic to the monitor declaration to prevent any accidental use of data without its appropriate protection. For example, here is a complete version of the counter shown in section \ref{call}:
+\begin{cfacode}
 monitor counter_t {
         int value;
 …
+}
 // need for mutex is platform dependent here
+//need for mutex is platform dependent here
 void ?{}(int * this, counter_t & mutex cnt) {
         *this = (int)cnt;
+}
+\end{cfa}
+Like threads and coroutines, monitors are defined in terms of traits with some additional language support in the form of the @monitor@ keyword.
+The monitor trait is:
+\begin{cfa}
+\end{cfacode}
+Like threads and coroutines, monitors are defined in terms of traits with some additional language support in the form of the \code{monitor} keyword. The monitor trait is:
+\begin{cfacode}
 trait is_monitor(dtype T) {
         monitor_desc * get_monitor( T & );
         void ^?{}( T & mutex );
 };
+\end{cfa}
+Note that the destructor of a monitor must be a @mutex@ routine to prevent deallocation while a thread is accessing the monitor.
+As with any object, calls to a monitor, using @mutex@ or otherwise, is undefined behaviour after the destructor has run.
+\end{cfacode}
+Note that the destructor of a monitor must be a \code{mutex} routine to prevent deallocation while a thread is accessing the monitor. As with any object, calls to a monitor, using \code{mutex} or otherwise, is undefined behaviour after the destructor has run.
 % ======================================================================
 …
 % ======================================================================
 % ======================================================================
+In addition to mutual exclusion, the monitors at the core of \CFA's concurrency can also be used to achieve synchronization.
+With monitors, this capability is generally achieved with internal or external scheduling as in~\cite{Hoare74}.
+With \textbf{scheduling} loosely defined as deciding which thread acquires the critical section next, \textbf{internal scheduling} means making the decision from inside the critical section (\ie with access to the shared state), while \textbf{external scheduling} means making the decision when entering the critical section (\ie without access to the shared state).
+Since internal scheduling within a single monitor is mostly a solved problem, this paper concentrates on extending internal scheduling to multiple monitors.
+Indeed, like the \textbf{bulk-acq} semantics, internal scheduling extends to multiple monitors in a way that is natural to the user but requires additional complexity on the implementation side.
+In addition to mutual exclusion, the monitors at the core of \CFA's concurrency can also be used to achieve synchronization. With monitors, this capability is generally achieved with internal or external scheduling as in~\cite{Hoare74}. With \textbf{scheduling} loosely defined as deciding which thread acquires the critical section next, \textbf{internal scheduling} means making the decision from inside the critical section (i.e., with access to the shared state), while \textbf{external scheduling} means making the decision when entering the critical section (i.e., without access to the shared state). Since internal scheduling within a single monitor is mostly a solved problem, this paper concentrates on extending internal scheduling to multiple monitors. Indeed, like the \textbf{bulk-acq} semantics, internal scheduling extends to multiple monitors in a way that is natural to the user but requires additional complexity on the implementation side.
 First, here is a simple example of internal scheduling:
 \begin{cfa}
+\begin{cfacode}
 monitor A {
         condition e;
 …
 void foo(A& mutex a1, A& mutex a2) {
         ...
         // Wait for cooperation from bar()
+        //Wait for cooperation from bar()
         wait(a1.e);
         ...
 …
 void bar(A& mutex a1, A& mutex a2) {
         // Provide cooperation for foo()
+        //Provide cooperation for foo()
         ...
         // Unblock foo
+        //Unblock foo
         signal(a1.e);
+}
+\end{cfa}
+There are two details to note here.
+First, @signal@ is a delayed operation; it only unblocks the waiting thread when it reaches the end of the critical section.
+This semantics is needed to respect mutual-exclusion, \ie the signaller and signalled thread cannot be in the monitor simultaneously.
+The alternative is to return immediately after the call to @signal@, which is significantly more restrictive.
+Second, in \CFA, while it is common to store a @condition@ as a field of the monitor, a @condition@ variable can be stored/created independently of a monitor.
+Here routine @foo@ waits for the @signal@ from @bar@ before making further progress, ensuring a basic ordering.
+An important aspect of the implementation is that \CFA does not allow barging, which means that once function @bar@ releases the monitor, @foo@ is guaranteed to be the next thread to acquire the monitor (unless some other thread waited on the same condition).
+This guarantee offers the benefit of not having to loop around waits to recheck that a condition is met.
+The main reason \CFA offers this guarantee is that users can easily introduce barging if it becomes a necessity but adding barging prevention or barging avoidance is more involved without language support.
+Supporting barging prevention as well as extending internal scheduling to multiple monitors is the main source of complexity in the design and implementation of \CFA concurrency.
+\end{cfacode}
+There are two details to note here. First, \code{signal} is a delayed operation; it only unblocks the waiting thread when it reaches the end of the critical section. This semantics is needed to respect mutual-exclusion, i.e., the signaller and signalled thread cannot be in the monitor simultaneously. The alternative is to return immediately after the call to \code{signal}, which is significantly more restrictive. Second, in \CFA, while it is common to store a \code{condition} as a field of the monitor, a \code{condition} variable can be stored/created independently of a monitor. Here routine \code{foo} waits for the \code{signal} from \code{bar} before making further progress, ensuring a basic ordering.
+An important aspect of the implementation is that \CFA does not allow barging, which means that once function \code{bar} releases the monitor, \code{foo} is guaranteed to be the next thread to acquire the monitor (unless some other thread waited on the same condition). This guarantee offers the benefit of not having to loop around waits to recheck that a condition is met. The main reason \CFA offers this guarantee is that users can easily introduce barging if it becomes a necessity but adding barging prevention or barging avoidance is more involved without language support. Supporting barging prevention as well as extending internal scheduling to multiple monitors is the main source of complexity in the design and implementation of \CFA concurrency.
 % ======================================================================
 …
 % ======================================================================
 % ======================================================================
+It is easy to understand the problem of multi-monitor scheduling using a series of pseudo-code examples.
+Note that for simplicity in the following snippets of pseudo-code, waiting and signalling is done using an implicit condition variable, like Java built-in monitors.
+Indeed, @wait@ statements always use the implicit condition variable as parameters and explicitly name the monitors (A and B) associated with the condition.
+Note that in \CFA, condition variables are tied to a \emph{group} of monitors on first use (called branding), which means that using internal scheduling with distinct sets of monitors requires one condition variable per set of monitors.
+The example below shows the simple case of having two threads (one for each column) and a single monitor A.
+It is easy to understand the problem of multi-monitor scheduling using a series of pseudo-code examples. Note that for simplicity in the following snippets of pseudo-code, waiting and signalling is done using an implicit condition variable, like Java built-in monitors. Indeed, \code{wait} statements always use the implicit condition variable as parameters and explicitly name the monitors (A and B) associated with the condition. Note that in \CFA, condition variables are tied to a \emph{group} of monitors on first use (called branding), which means that using internal scheduling with distinct sets of monitors requires one condition variable per set of monitors. The example below shows the simple case of having two threads (one for each column) and a single monitor A.
 \begin{multicols}{2}
 thread 1
 \begin{cfa}
+\begin{pseudo}
 acquire A
         wait A
 release A
 \end{cfa}
+\end{pseudo}
 \columnbreak
 thread 2
 \begin{cfa}
+\begin{pseudo}
 acquire A
         signal A
 release A
 \end{cfa}
+\end{pseudo}
 \end{multicols}
+One thread acquires before waiting (atomically blocking and releasing A) and the other acquires before signalling.
+It is important to note here that both @wait@ and @signal@ must be called with the proper monitor(s) already acquired.
+This semantic is a logical requirement for barging prevention.
+One thread acquires before waiting (atomically blocking and releasing A) and the other acquires before signalling. It is important to note here that both \code{wait} and \code{signal} must be called with the proper monitor(s) already acquired. This semantic is a logical requirement for barging prevention.
 A direct extension of the previous example is a \textbf{bulk-acq} version:
 \begin{multicols}{2}
 \begin{cfa}
+\begin{pseudo}
 acquire A & B
         wait A & B
 release A & B
 \end{cfa}
+\end{pseudo}
 \columnbreak
 \begin{cfa}
+\begin{pseudo}
 acquire A & B
         signal A & B
 release A & B
 \end{cfa}
+\end{pseudo}
 \end{multicols}
+\noindent This version uses \textbf{bulk-acq} (denoted using the {\sf\&} symbol), but the presence of multiple monitors does not add a particularly new meaning.
+Synchronization happens between the two threads in exactly the same way and order.
+The only difference is that mutual exclusion covers a group of monitors.
+On the implementation side, handling multiple monitors does add a degree of complexity as the next few examples demonstrate.
+While deadlock issues can occur when nesting monitors, these issues are only a symptom of the fact that locks, and by extension monitors, are not perfectly composable.
+For monitors, a well-known deadlock problem is the Nested Monitor Problem~\cite{Lister77}, which occurs when a @wait@ is made by a thread that holds more than one monitor.
+For example, the following cfa-code runs into the nested-monitor problem:
+\noindent This version uses \textbf{bulk-acq} (denoted using the {\sf\&} symbol), but the presence of multiple monitors does not add a particularly new meaning. Synchronization happens between the two threads in exactly the same way and order. The only difference is that mutual exclusion covers a group of monitors. On the implementation side, handling multiple monitors does add a degree of complexity as the next few examples demonstrate.
+While deadlock issues can occur when nesting monitors, these issues are only a symptom of the fact that locks, and by extension monitors, are not perfectly composable. For monitors, a well-known deadlock problem is the Nested Monitor Problem~\cite{Lister77}, which occurs when a \code{wait} is made by a thread that holds more than one monitor. For example, the following pseudo-code runs into the nested-monitor problem:
 \begin{multicols}{2}
 \begin{cfa}
+\begin{pseudo}
 acquire A
         acquire B
 …
         release B
 release A
 \end{cfa}
+\end{pseudo}
 \columnbreak
 \begin{cfa}
+\begin{pseudo}
 acquire A
         acquire B
 …
         release B
 release A
 \end{cfa}
+\end{pseudo}
 \end{multicols}
+\noindent The @wait@ only releases monitor @B@ so the signalling thread cannot acquire monitor @A@ to get to the @signal@.
+Attempting release of all acquired monitors at the @wait@ introduces a different set of problems, such as releasing monitor @C@, which has nothing to do with the @signal@.
+However, for monitors as for locks, it is possible to write a program using nesting without encountering any problems if nesting is done correctly.
+For example, the next cfa-code snippet acquires monitors {\sf A} then {\sf B} before waiting, while only acquiring {\sf B} when signalling, effectively avoiding the Nested Monitor Problem~\cite{Lister77}.
+\noindent The \code{wait} only releases monitor \code{B} so the signalling thread cannot acquire monitor \code{A} to get to the \code{signal}. Attempting release of all acquired monitors at the \code{wait} introduces a different set of problems, such as releasing monitor \code{C}, which has nothing to do with the \code{signal}.
+However, for monitors as for locks, it is possible to write a program using nesting without encountering any problems if nesting is done correctly. For example, the next pseudo-code snippet acquires monitors {\sf A} then {\sf B} before waiting, while only acquiring {\sf B} when signalling, effectively avoiding the Nested Monitor Problem~\cite{Lister77}.
 \begin{multicols}{2}
 \begin{cfa}
+\begin{pseudo}
 acquire A
         acquire B
 …
         release B
 release A
 \end{cfa}
+\end{pseudo}
 \columnbreak
 \begin{cfa}
+\begin{pseudo}
 acquire B
 …
 release B
 \end{cfa}
+\end{pseudo}
 \end{multicols}
 …
 % ======================================================================
+A larger example is presented to show complex issues for \textbf{bulk-acq} and its implementation options are analyzed.
+Figure~\ref{f:int-bulk-cfa} shows an example where \textbf{bulk-acq} adds a significant layer of complexity to the internal signalling semantics, and listing \ref{f:int-bulk-cfa} shows the corresponding \CFA code to implement the cfa-code in listing \ref{f:int-bulk-cfa}.
+For the purpose of translating the given cfa-code into \CFA-code, any method of introducing a monitor is acceptable, \eg @mutex@ parameters, global variables, pointer parameters, or using locals with the @mutex@ statement.
+\begin{figure}
+A larger example is presented to show complex issues for \textbf{bulk-acq} and its implementation options are analyzed. Listing \ref{lst:int-bulk-pseudo} shows an example where \textbf{bulk-acq} adds a significant layer of complexity to the internal signalling semantics, and listing \ref{lst:int-bulk-cfa} shows the corresponding \CFA code to implement the pseudo-code in listing \ref{lst:int-bulk-pseudo}. For the purpose of translating the given pseudo-code into \CFA-code, any method of introducing a monitor is acceptable, e.g., \code{mutex} parameters, global variables, pointer parameters, or using locals with the \code{mutex} statement.
+\begin{figure}[!t]
 \begin{multicols}{2}
 Waiting thread
 \begin{cfa}[numbers=left]
+\begin{pseudo}[numbers=left]
 acquire A
         // Code Section 1
+        //Code Section 1
         acquire A & B
                 // Code Section 2
+                //Code Section 2
                 wait A & B
                 // Code Section 3
+                //Code Section 3
         release A & B
         // Code Section 4
+        //Code Section 4
 release A
 \end{cfa}
+\end{pseudo}
 \columnbreak
 Signalling thread
 \begin{cfa}[numbers=left, firstnumber=10,escapechar=|]
+\begin{pseudo}[numbers=left, firstnumber=10,escapechar=|]
 acquire A
         // Code Section 5
+        //Code Section 5
         acquire A & B
                 // Code Section 6
+                //Code Section 6
                 |\label{line:signal1}|signal A & B
                 // Code Section 7
+                //Code Section 7
         |\label{line:releaseFirst}|release A & B
         // Code Section 8
+        //Code Section 8
 |\label{line:lastRelease}|release A
 \end{cfa}
+\end{pseudo}
 \end{multicols}
 \begin{cfa}[caption={Internal scheduling with \textbf{bulk-acq}},label={f:int-bulk-cfa}]
 \end{cfa}
+\begin{cfacode}[caption={Internal scheduling with \textbf{bulk-acq}},label={lst:int-bulk-pseudo}]
+\end{cfacode}
 \begin{center}
 \begin{cfa}[xleftmargin=.4\textwidth]
+\begin{cfacode}[xleftmargin=.4\textwidth]
 monitor A a;
 monitor B b;
 condition c;
 \end{cfa}
+\end{cfacode}
 \end{center}
 \begin{multicols}{2}
 Waiting thread
 \begin{cfa}
+\begin{cfacode}
 mutex(a) {
         // Code Section 1
+        //Code Section 1
         mutex(a, b) {
                 // Code Section 2
+                //Code Section 2
                 wait(c);
                 // Code Section 3
+        }
         // Code Section 4
+}
 \end{cfa}
+                //Code Section 3
+        }
+        //Code Section 4
+}
+\end{cfacode}
 \columnbreak
 Signalling thread
 \begin{cfa}
+\begin{cfacode}
 mutex(a) {
         // Code Section 5
+        //Code Section 5
         mutex(a, b) {
                 // Code Section 6
+                //Code Section 6
                 signal(c);
                 // Code Section 7
+        }
         // Code Section 8
+}
 \end{cfa}
+                //Code Section 7
+        }
+        //Code Section 8
+}
+\end{cfacode}
 \end{multicols}
 \begin{cfa}[caption={Equivalent \CFA code for listing \ref{f:int-bulk-cfa}},label={f:int-bulk-cfa}]
 \end{cfa}
+\begin{cfacode}[caption={Equivalent \CFA code for listing \ref{lst:int-bulk-pseudo}},label={lst:int-bulk-cfa}]
+\end{cfacode}
 \begin{multicols}{2}
 Waiter
 \begin{cfa}[numbers=left]
+\begin{pseudo}[numbers=left]
 acquire A
         acquire A & B
 …
         release A & B
 release A
 \end{cfa}
+\end{pseudo}
 \columnbreak
 Signaller
 \begin{cfa}[numbers=left, firstnumber=6,escapechar=|]
+\begin{pseudo}[numbers=left, firstnumber=6,escapechar=|]
 acquire A
         acquire A & B
                 signal A & B
         release A & B
         |\label{line:secret}|// Secretly keep B here
+        |\label{line:secret}|//Secretly keep B here
 release A
 // Wakeup waiter and transfer A & B
 \end{cfa}
+//Wakeup waiter and transfer A & B
+\end{pseudo}
 \end{multicols}
 \begin{cfa}[caption={Figure~\ref{f:int-bulk-cfa}, with delayed signalling comments},label={f:int-secret}]
 \end{cfa}
+\begin{cfacode}[caption={Listing \ref{lst:int-bulk-pseudo}, with delayed signalling comments},label={lst:int-secret}]
+\end{cfacode}
 \end{figure}
+The complexity begins at code sections 4 and 8 in listing \ref{f:int-bulk-cfa}, which are where the existing semantics of internal scheduling needs to be extended for multiple monitors.
+The root of the problem is that \textbf{bulk-acq} is used in a context where one of the monitors is already acquired, which is why it is important to define the behaviour of the previous cfa-code.
+When the signaller thread reaches the location where it should ``release @A & B@'' (listing \ref{f:int-bulk-cfa} line \ref{line:releaseFirst}), it must actually transfer ownership of monitor @B@ to the waiting thread.
+This ownership transfer is required in order to prevent barging into @B@ by another thread, since both the signalling and signalled threads still need monitor @A@.
+There are three options:
+The complexity begins at code sections 4 and 8 in listing \ref{lst:int-bulk-pseudo}, which are where the existing semantics of internal scheduling needs to be extended for multiple monitors. The root of the problem is that \textbf{bulk-acq} is used in a context where one of the monitors is already acquired, which is why it is important to define the behaviour of the previous pseudo-code. When the signaller thread reaches the location where it should ``release \code{A & B}'' (listing \ref{lst:int-bulk-pseudo} line \ref{line:releaseFirst}), it must actually transfer ownership of monitor \code{B} to the waiting thread. This ownership transfer is required in order to prevent barging into \code{B} by another thread, since both the signalling and signalled threads still need monitor \code{A}. There are three options:
 \subsubsection{Delaying Signals}
+The obvious solution to the problem of multi-monitor scheduling is to keep ownership of all locks until the last lock is ready to be transferred.
+It can be argued that that moment is when the last lock is no longer needed, because this semantics fits most closely to the behaviour of single-monitor scheduling.
+This solution has the main benefit of transferring ownership of groups of monitors, which simplifies the semantics from multiple objects to a single group of objects, effectively making the existing single-monitor semantic viable by simply changing monitors to monitor groups.
+This solution releases the monitors once every monitor in a group can be released.
+However, since some monitors are never released (\eg the monitor of a thread), this interpretation means a group might never be released.
+A more interesting interpretation is to transfer the group until all its monitors are released, which means the group is not passed further and a thread can retain its locks.
+However, listing \ref{f:int-secret} shows this solution can become much more complicated depending on what is executed while secretly holding B at line \ref{line:secret}, while avoiding the need to transfer ownership of a subset of the condition monitors.
+Figure~\ref{f:dependency} shows a slightly different example where a third thread is waiting on monitor @A@, using a different condition variable.
+Because the third thread is signalled when secretly holding @B@, the goal  becomes unreachable.
+Depending on the order of signals (listing \ref{f:dependency} line \ref{line:signal-ab} and \ref{line:signal-a}) two cases can happen:
+\paragraph{Case 1: thread $\alpha$ goes first.} In this case, the problem is that monitor @A@ needs to be passed to thread $\beta$ when thread $\alpha$ is done with it.
+\paragraph{Case 2: thread $\beta$ goes first.} In this case, the problem is that monitor @B@ needs to be retained and passed to thread $\alpha$ along with monitor @A@, which can be done directly or possibly using thread $\beta$ as an intermediate.
+The obvious solution to the problem of multi-monitor scheduling is to keep ownership of all locks until the last lock is ready to be transferred. It can be argued that that moment is when the last lock is no longer needed, because this semantics fits most closely to the behaviour of single-monitor scheduling. This solution has the main benefit of transferring ownership of groups of monitors, which simplifies the semantics from multiple objects to a single group of objects, effectively making the existing single-monitor semantic viable by simply changing monitors to monitor groups. This solution releases the monitors once every monitor in a group can be released. However, since some monitors are never released (e.g., the monitor of a thread), this interpretation means a group might never be released. A more interesting interpretation is to transfer the group until all its monitors are released, which means the group is not passed further and a thread can retain its locks.
+However, listing \ref{lst:int-secret} shows this solution can become much more complicated depending on what is executed while secretly holding B at line \ref{line:secret}, while avoiding the need to transfer ownership of a subset of the condition monitors. Listing \ref{lst:dependency} shows a slightly different example where a third thread is waiting on monitor \code{A}, using a different condition variable. Because the third thread is signalled when secretly holding \code{B}, the goal  becomes unreachable. Depending on the order of signals (listing \ref{lst:dependency} line \ref{line:signal-ab} and \ref{line:signal-a}) two cases can happen:
+\paragraph{Case 1: thread $\alpha$ goes first.} In this case, the problem is that monitor \code{A} needs to be passed to thread $\beta$ when thread $\alpha$ is done with it.
+\paragraph{Case 2: thread $\beta$ goes first.} In this case, the problem is that monitor \code{B} needs to be retained and passed to thread $\alpha$ along with monitor \code{A}, which can be done directly or possibly using thread $\beta$ as an intermediate.
 \\
+Note that ordering is not determined by a race condition but by whether signalled threads are enqueued in FIFO or FILO order.
+However, regardless of the answer, users can move line \ref{line:signal-a} before line \ref{line:signal-ab} and get the reverse effect for listing \ref{f:dependency}.
+Note that ordering is not determined by a race condition but by whether signalled threads are enqueued in FIFO or FILO order. However, regardless of the answer, users can move line \ref{line:signal-a} before line \ref{line:signal-ab} and get the reverse effect for listing \ref{lst:dependency}.
 In both cases, the threads need to be able to distinguish, on a per monitor basis, which ones need to be released and which ones need to be transferred, which means knowing when to release a group becomes complex and inefficient (see next section) and therefore effectively precludes this approach.
 …
 \begin{multicols}{3}
 Thread $\alpha$
 \begin{cfa}[numbers=left, firstnumber=1]
+\begin{pseudo}[numbers=left, firstnumber=1]
 acquire A
         acquire A & B
 …
         release A & B
 release A
 \end{cfa}
+\end{pseudo}
 \columnbreak
 Thread $\gamma$
 \begin{cfa}[numbers=left, firstnumber=6, escapechar=|]
+\begin{pseudo}[numbers=left, firstnumber=6, escapechar=|]
 acquire A
         acquire A & B
 …
         |\label{line:signal-a}|signal A
 |\label{line:release-a}|release A
 \end{cfa}
+\end{pseudo}
 \columnbreak
 Thread $\beta$
 \begin{cfa}[numbers=left, firstnumber=12, escapechar=|]
+\begin{pseudo}[numbers=left, firstnumber=12, escapechar=|]
 acquire A
         wait A
 |\label{line:release-aa}|release A
 \end{cfa}
+\end{pseudo}
 \end{multicols}
 \begin{cfa}[caption={Pseudo-code for the three thread example.},label={f:dependency}]
 \end{cfa}
+\begin{cfacode}[caption={Pseudo-code for the three thread example.},label={lst:dependency}]
+\end{cfacode}
 \begin{center}
 \input{dependency}
 \end{center}
 \caption{Dependency graph of the statements in listing \ref{f:dependency}}
+\caption{Dependency graph of the statements in listing \ref{lst:dependency}}
 \label{fig:dependency}
 \end{figure}
+In listing \ref{f:int-bulk-cfa}, there is a solution that satisfies both barging prevention and mutual exclusion.
+If ownership of both monitors is transferred to the waiter when the signaller releases @A & B@ and then the waiter transfers back ownership of @A@ back to the signaller when it releases it, then the problem is solved (@B@ is no longer in use at this point).
+Dynamically finding the correct order is therefore the second possible solution.
+The problem is effectively resolving a dependency graph of ownership requirements.
+Here even the simplest of code snippets requires two transfers and has a super-linear complexity.
+This complexity can be seen in listing \ref{f:explosion}, which is just a direct extension to three monitors, requires at least three ownership transfer and has multiple solutions.
+Furthermore, the presence of multiple solutions for ownership transfer can cause deadlock problems if a specific solution is not consistently picked; In the same way that multiple lock acquiring order can cause deadlocks.
+In listing \ref{lst:int-bulk-pseudo}, there is a solution that satisfies both barging prevention and mutual exclusion. If ownership of both monitors is transferred to the waiter when the signaller releases \code{A & B} and then the waiter transfers back ownership of \code{A} back to the signaller when it releases it, then the problem is solved (\code{B} is no longer in use at this point). Dynamically finding the correct order is therefore the second possible solution. The problem is effectively resolving a dependency graph of ownership requirements. Here even the simplest of code snippets requires two transfers and has a super-linear complexity. This complexity can be seen in listing \ref{lst:explosion}, which is just a direct extension to three monitors, requires at least three ownership transfer and has multiple solutions. Furthermore, the presence of multiple solutions for ownership transfer can cause deadlock problems if a specific solution is not consistently picked; In the same way that multiple lock acquiring order can cause deadlocks.
 \begin{figure}
 \begin{multicols}{2}
 \begin{cfa}
+\begin{pseudo}
 acquire A
         acquire B
 …
         release B
 release A
 \end{cfa}
+\end{pseudo}
 \columnbreak
 \begin{cfa}
+\begin{pseudo}
 acquire A
         acquire B
 …
         release B
 release A
 \end{cfa}
+\end{pseudo}
 \end{multicols}
 \begin{cfa}[caption={Extension to three monitors of listing \ref{f:int-bulk-cfa}},label={f:explosion}]
 \end{cfa}
+\begin{cfacode}[caption={Extension to three monitors of listing \ref{lst:int-bulk-pseudo}},label={lst:explosion}]
+\end{cfacode}
 \end{figure}
+Given the three threads example in listing \ref{f:dependency}, figure \ref{fig:dependency} shows the corresponding dependency graph that results, where every node is a statement of one of the three threads, and the arrows the dependency of that statement (\eg $\alpha1$ must happen before $\alpha2$).
+The extra challenge is that this dependency graph is effectively post-mortem, but the runtime system needs to be able to build and solve these graphs as the dependencies unfold.
+Resolving dependency graphs being a complex and expensive endeavour, this solution is not the preferred one.
+Given the three threads example in listing \ref{lst:dependency}, figure \ref{fig:dependency} shows the corresponding dependency graph that results, where every node is a statement of one of the three threads, and the arrows the dependency of that statement (e.g., $\alpha1$ must happen before $\alpha2$). The extra challenge is that this dependency graph is effectively post-mortem, but the runtime system needs to be able to build and solve these graphs as the dependencies unfold. Resolving dependency graphs being a complex and expensive endeavour, this solution is not the preferred one.
 \subsubsection{Partial Signalling} \label{partial-sig}
+Finally, the solution that is chosen for \CFA is to use partial signalling.
+Again using listing \ref{f:int-bulk-cfa}, the partial signalling solution transfers ownership of monitor @B@ at lines \ref{line:signal1} to the waiter but does not wake the waiting thread since it is still using monitor @A@.
+Only when it reaches line \ref{line:lastRelease} does it actually wake up the waiting thread.
+This solution has the benefit that complexity is encapsulated into only two actions: passing monitors to the next owner when they should be released and conditionally waking threads if all conditions are met.
+This solution has a much simpler implementation than a dependency graph solving algorithms, which is why it was chosen.
+Furthermore, after being fully implemented, this solution does not appear to have any significant downsides.
+Using partial signalling, listing \ref{f:dependency} can be solved easily:
+Finally, the solution that is chosen for \CFA is to use partial signalling. Again using listing \ref{lst:int-bulk-pseudo}, the partial signalling solution transfers ownership of monitor \code{B} at lines \ref{line:signal1} to the waiter but does not wake the waiting thread since it is still using monitor \code{A}. Only when it reaches line \ref{line:lastRelease} does it actually wake up the waiting thread. This solution has the benefit that complexity is encapsulated into only two actions: passing monitors to the next owner when they should be released and conditionally waking threads if all conditions are met. This solution has a much simpler implementation than a dependency graph solving algorithms, which is why it was chosen. Furthermore, after being fully implemented, this solution does not appear to have any significant downsides.
+Using partial signalling, listing \ref{lst:dependency} can be solved easily:
 \begin{itemize}
         \item When thread $\gamma$ reaches line \ref{line:release-ab} it transfers monitor @B@ to thread $\alpha$ and continues to hold monitor @A@.
         \item When thread $\gamma$ reaches line \ref{line:release-a}  it transfers monitor @A@ to thread $\beta$  and wakes it up.
         \item When thread $\beta$  reaches line \ref{line:release-aa} it transfers monitor @A@ to thread $\alpha$ and wakes it up.
+        \item When thread $\gamma$ reaches line \ref{line:release-ab} it transfers monitor \code{B} to thread $\alpha$ and continues to hold monitor \code{A}.
+        \item When thread $\gamma$ reaches line \ref{line:release-a}  it transfers monitor \code{A} to thread $\beta$  and wakes it up.
+        \item When thread $\beta$  reaches line \ref{line:release-aa} it transfers monitor \code{A} to thread $\alpha$ and wakes it up.
 \end{itemize}
 …
 \begin{table}
 \begin{tabular}{|c|c|}
 @signal@ & @signal_block@ \\
+\code{signal} & \code{signal_block} \\
 \hline
+\begin{cfa}[tabsize=3]
+monitor DatingService {
+        // compatibility codes
+\begin{cfacode}[tabsize=3]
+monitor DatingService
+{
+        //compatibility codes
         enum{ CCodes = 20 };
 …
 condition exchange;
+int girl(int phoneNo, int cfa) {
+        // no compatible boy ?
+        if(empty(boys[cfa])) {
+                wait(girls[cfa]);               // wait for boy
+                girlPhoneNo = phoneNo;          // make phone number available
+                signal(exchange);               // wake boy from chair
+        } else {
+                girlPhoneNo = phoneNo;          // make phone number available
+                signal(boys[cfa]);              // wake boy
+                wait(exchange);         // sit in chair
+int girl(int phoneNo, int ccode)
+{
+        //no compatible boy ?
+        if(empty(boys[ccode]))
+        {
+                //wait for boy
+                wait(girls[ccode]);
+                //make phone number available
+                girlPhoneNo = phoneNo;
+                //wake boy from chair
+                signal(exchange);
+        }
+        else
+        {
+                //make phone number available
+                girlPhoneNo = phoneNo;
+                //wake boy
+                signal(boys[ccode]);
+                //sit in chair
+                wait(exchange);
+        }
         return boyPhoneNo;
+}
+int boy(int phoneNo, int cfa) {
+        // same as above
+        // with boy/girl interchanged
+}
+\end{cfa}&\begin{cfa}[tabsize=3]
+monitor DatingService {
+        enum{ CCodes = 20 };    // compatibility codes
+int boy(int phoneNo, int ccode)
+{
+        //same as above
+        //with boy/girl interchanged
+}
+\end{cfacode}&\begin{cfacode}[tabsize=3]
+monitor DatingService
+{
+        //compatibility codes
+        enum{ CCodes = 20 };
         int girlPhoneNo;
 …
 condition girls[CCodes];
 condition boys [CCodes];
+// exchange is not needed
+int girl(int phoneNo, int cfa) {
+        // no compatible boy ?
+        if(empty(boys[cfa])) {
+                wait(girls[cfa]);               // wait for boy
+                girlPhoneNo = phoneNo;          // make phone number available
+                signal(exchange);               // wake boy from chair
+        } else {
+                girlPhoneNo = phoneNo;          // make phone number available
+                signal_block(boys[cfa]);                // wake boy
+                // second handshake unnecessary
+//exchange is not needed
+int girl(int phoneNo, int ccode)
+{
+        //no compatible boy ?
+        if(empty(boys[ccode]))
+        {
+                //wait for boy
+                wait(girls[ccode]);
+                //make phone number available
+                girlPhoneNo = phoneNo;
+                //wake boy from chair
+                signal(exchange);
+        }
+        else
+        {
+                //make phone number available
+                girlPhoneNo = phoneNo;
+                //wake boy
+                signal_block(boys[ccode]);
+                //second handshake unnecessary
+        }
 …
+}
+int boy(int phoneNo, int cfa) {
+        // same as above
+        // with boy/girl interchanged
+}
+\end{cfa}
+int boy(int phoneNo, int ccode)
+{
+        //same as above
+        //with boy/girl interchanged
+}
+\end{cfacode}
 \end{tabular}
 \caption{Dating service example using \protect\lstinline|signal| and \protect\lstinline|signal_block|. }
+\caption{Dating service example using \code{signal} and \code{signal_block}. }
 \label{tbl:datingservice}
 \end{table}
+An important note is that, until now, signalling a monitor was a delayed operation.
+The ownership of the monitor is transferred only when the monitor would have otherwise been released, not at the point of the @signal@ statement.
+However, in some cases, it may be more convenient for users to immediately transfer ownership to the thread that is waiting for cooperation, which is achieved using the @signal_block@ routine.
+The example in table \ref{tbl:datingservice} highlights the difference in behaviour.
+As mentioned, @signal@ only transfers ownership once the current critical section exits; this behaviour requires additional synchronization when a two-way handshake is needed.
+To avoid this explicit synchronization, the @condition@ type offers the @signal_block@ routine, which handles the two-way handshake as shown in the example.
+This feature removes the need for a second condition variables and simplifies programming.
+Like every other monitor semantic, @signal_block@ uses barging prevention, which means mutual-exclusion is baton-passed both on the front end and the back end of the call to @signal_block@, meaning no other thread can acquire the monitor either before or after the call.
+An important note is that, until now, signalling a monitor was a delayed operation. The ownership of the monitor is transferred only when the monitor would have otherwise been released, not at the point of the \code{signal} statement. However, in some cases, it may be more convenient for users to immediately transfer ownership to the thread that is waiting for cooperation, which is achieved using the \code{signal_block} routine.
+The example in table \ref{tbl:datingservice} highlights the difference in behaviour. As mentioned, \code{signal} only transfers ownership once the current critical section exits; this behaviour requires additional synchronization when a two-way handshake is needed. To avoid this explicit synchronization, the \code{condition} type offers the \code{signal_block} routine, which handles the two-way handshake as shown in the example. This feature removes the need for a second condition variables and simplifies programming. Like every other monitor semantic, \code{signal_block} uses barging prevention, which means mutual-exclusion is baton-passed both on the front end and the back end of the call to \code{signal_block}, meaning no other thread can acquire the monitor either before or after the call.
 % ======================================================================
 …
 Internal Scheduling & External Scheduling & Go\\
 \hline
 \begin{uC++}[tabsize=3]
+\begin{ucppcode}[tabsize=3]
 _Monitor Semaphore {
         condition c;
 …
+        }
+}
 \end{uC++}&\begin{uC++}[tabsize=3]
+\end{ucppcode}&\begin{ucppcode}[tabsize=3]
 _Monitor Semaphore {
 …
+        }
+}
 \end{uC++}&\begin{Go}[tabsize=3]
+\end{ucppcode}&\begin{gocode}[tabsize=3]
 type MySem struct {
         inUse bool
 …
         s.inUse = false
         // This actually deadlocks
         // when single thread
+        //This actually deadlocks
+        //when single thread
         s.c <- false
+}
 \end{Go}
+\end{gocode}
 \end{tabular}
 \caption{Different forms of scheduling.}
 \label{tbl:sched}
 \end{table}
+This method is more constrained and explicit, which helps users reduce the non-deterministic nature of concurrency.
+Indeed, as the following examples demonstrate, external scheduling allows users to wait for events from other threads without the concern of unrelated events occurring.
+External scheduling can generally be done either in terms of control flow (\eg Ada with @accept@, \uC with @_Accept@) or in terms of data (\eg Go with channels).
+Of course, both of these paradigms have their own strengths and weaknesses, but for this project, control-flow semantics was chosen to stay consistent with the rest of the languages semantics.
+Two challenges specific to \CFA arise when trying to add external scheduling with loose object definitions and multiple-monitor routines.
+The previous example shows a simple use @_Accept@ versus @wait@/@signal@ and its advantages.
+Note that while other languages often use @accept@/@select@ as the core external scheduling keyword, \CFA uses @waitfor@ to prevent name collisions with existing socket \textbf{api}s.
+For the @P@ member above using internal scheduling, the call to @wait@ only guarantees that @V@ is the last routine to access the monitor, allowing a third routine, say @isInUse()@, acquire mutual exclusion several times while routine @P@ is waiting.
+On the other hand, external scheduling guarantees that while routine @P@ is waiting, no other routine than @V@ can acquire the monitor.
+This method is more constrained and explicit, which helps users reduce the non-deterministic nature of concurrency. Indeed, as the following examples demonstrate, external scheduling allows users to wait for events from other threads without the concern of unrelated events occurring. External scheduling can generally be done either in terms of control flow (e.g., Ada with \code{accept}, \uC with \code{_Accept}) or in terms of data (e.g., Go with channels). Of course, both of these paradigms have their own strengths and weaknesses, but for this project, control-flow semantics was chosen to stay consistent with the rest of the languages semantics. Two challenges specific to \CFA arise when trying to add external scheduling with loose object definitions and multiple-monitor routines. The previous example shows a simple use \code{_Accept} versus \code{wait}/\code{signal} and its advantages. Note that while other languages often use \code{accept}/\code{select} as the core external scheduling keyword, \CFA uses \code{waitfor} to prevent name collisions with existing socket \textbf{api}s.
+For the \code{P} member above using internal scheduling, the call to \code{wait} only guarantees that \code{V} is the last routine to access the monitor, allowing a third routine, say \code{isInUse()}, acquire mutual exclusion several times while routine \code{P} is waiting. On the other hand, external scheduling guarantees that while routine \code{P} is waiting, no other routine than \code{V} can acquire the monitor.
 % ======================================================================
 …
 % ======================================================================
 % ======================================================================
+In \uC, a monitor class declaration includes an exhaustive list of monitor operations.
+Since \CFA is not object oriented, monitors become both more difficult to implement and less clear for a user:
+\begin{cfa}
+In \uC, a monitor class declaration includes an exhaustive list of monitor operations. Since \CFA is not object oriented, monitors become both more difficult to implement and less clear for a user:
+\begin{cfacode}
 monitor A {};
 void f(A & mutex a);
 void g(A & mutex a) {
         waitfor(f); // Obvious which f() to wait for
+}
 void f(A & mutex a, int); // New different F added in scope
+        waitfor(f); //Obvious which f() to wait for
+}
+void f(A & mutex a, int); //New different F added in scope
 void h(A & mutex a) {
+        waitfor(f); // Less obvious which f() to wait for
+}
+\end{cfa}
+Furthermore, external scheduling is an example where implementation constraints become visible from the interface.
+Here is the cfa-code for the entering phase of a monitor:
+        waitfor(f); //Less obvious which f() to wait for
+}
+\end{cfacode}
+Furthermore, external scheduling is an example where implementation constraints become visible from the interface. Here is the pseudo-code for the entering phase of a monitor:
 \begin{center}
 \begin{tabular}{l}
 \begin{cfa}
+\begin{pseudo}
         if monitor is free
                 enter
 …
         else
                 block
 \end{cfa}
+\end{pseudo}
 \end{tabular}
 \end{center}
+For the first two conditions, it is easy to implement a check that can evaluate the condition in a few instructions.
+However, a fast check for @monitor accepts me@ is much harder to implement depending on the constraints put on the monitors.
+Indeed, monitors are often expressed as an entry queue and some acceptor queue as in Figure~\ref{fig:ClassicalMonitor}.
+For the first two conditions, it is easy to implement a check that can evaluate the condition in a few instructions. However, a fast check for \pscode{monitor accepts me} is much harder to implement depending on the constraints put on the monitors. Indeed, monitors are often expressed as an entry queue and some acceptor queue as in Figure~\ref{fig:ClassicalMonitor}.
 \begin{figure}
 …
 \end{figure}
+There are other alternatives to these pictures, but in the case of the left picture, implementing a fast accept check is relatively easy.
+Restricted to a fixed number of mutex members, N, the accept check reduces to updating a bitmask when the acceptor queue changes, a check that executes in a single instruction even with a fairly large number (\eg 128) of mutex members.
+This approach requires a unique dense ordering of routines with an upper-bound and that ordering must be consistent across translation units.
+For OO languages these constraints are common, since objects only offer adding member routines consistently across translation units via inheritance.
+However, in \CFA users can extend objects with mutex routines that are only visible in certain translation unit.
+This means that establishing a program-wide dense-ordering among mutex routines can only be done in the program linking phase, and still could have issues when using dynamically shared objects.
+There are other alternatives to these pictures, but in the case of the left picture, implementing a fast accept check is relatively easy. Restricted to a fixed number of mutex members, N, the accept check reduces to updating a bitmask when the acceptor queue changes, a check that executes in a single instruction even with a fairly large number (e.g., 128) of mutex members. This approach requires a unique dense ordering of routines with an upper-bound and that ordering must be consistent across translation units. For OO languages these constraints are common, since objects only offer adding member routines consistently across translation units via inheritance. However, in \CFA users can extend objects with mutex routines that are only visible in certain translation unit. This means that establishing a program-wide dense-ordering among mutex routines can only be done in the program linking phase, and still could have issues when using dynamically shared objects.
 The alternative is to alter the implementation as in Figure~\ref{fig:BulkMonitor}.
+Here, the mutex routine called is associated with a thread on the entry queue while a list of acceptable routines is kept separate.
+Generating a mask dynamically means that the storage for the mask information can vary between calls to @waitfor@, allowing for more flexibility and extensions.
+Storing an array of accepted function pointers replaces the single instruction bitmask comparison with dereferencing a pointer followed by a linear search.
+Furthermore, supporting nested external scheduling (\eg listing \ref{f:nest-ext}) may now require additional searches for the @waitfor@ statement to check if a routine is already queued.
+Here, the mutex routine called is associated with a thread on the entry queue while a list of acceptable routines is kept separate. Generating a mask dynamically means that the storage for the mask information can vary between calls to \code{waitfor}, allowing for more flexibility and extensions. Storing an array of accepted function pointers replaces the single instruction bitmask comparison with dereferencing a pointer followed by a linear search. Furthermore, supporting nested external scheduling (e.g., listing \ref{lst:nest-ext}) may now require additional searches for the \code{waitfor} statement to check if a routine is already queued.
 \begin{figure}
 \begin{cfa}[caption={Example of nested external scheduling},label={f:nest-ext}]
+\begin{cfacode}[caption={Example of nested external scheduling},label={lst:nest-ext}]
 monitor M {};
 void foo( M & mutex a ) {}
 void bar( M & mutex b ) {
         // Nested in the waitfor(bar, c) call
+        //Nested in the waitfor(bar, c) call
         waitfor(foo, b);
+}
 …
+}
 \end{cfa}
+\end{cfacode}
 \end{figure}
+Note that in the right picture, tasks need to always keep track of the monitors associated with mutex routines, and the routine mask needs to have both a function pointer and a set of monitors, as is discussed in the next section.
+These details are omitted from the picture for the sake of simplicity.
+At this point, a decision must be made between flexibility and performance.
+Many design decisions in \CFA achieve both flexibility and performance, for example polymorphic routines add significant flexibility but inlining them means the optimizer can easily remove any runtime cost.
+Here, however, the cost of flexibility cannot be trivially removed.
+In the end, the most flexible approach has been chosen since it allows users to write programs that would otherwise be  hard to write.
+This decision is based on the assumption that writing fast but inflexible locks is closer to a solved problem than writing locks that are as flexible as external scheduling in \CFA.
+Note that in the right picture, tasks need to always keep track of the monitors associated with mutex routines, and the routine mask needs to have both a function pointer and a set of monitors, as is discussed in the next section. These details are omitted from the picture for the sake of simplicity.
+At this point, a decision must be made between flexibility and performance. Many design decisions in \CFA achieve both flexibility and performance, for example polymorphic routines add significant flexibility but inlining them means the optimizer can easily remove any runtime cost. Here, however, the cost of flexibility cannot be trivially removed. In the end, the most flexible approach has been chosen since it allows users to write programs that would otherwise be  hard to write. This decision is based on the assumption that writing fast but inflexible locks is closer to a solved problem than writing locks that are as flexible as external scheduling in \CFA.
 % ======================================================================
 …
 % ======================================================================
+External scheduling, like internal scheduling, becomes significantly more complex when introducing multi-monitor syntax.
+Even in the simplest possible case, some new semantics needs to be established:
+\begin{cfa}
+External scheduling, like internal scheduling, becomes significantly more complex when introducing multi-monitor syntax. Even in the simplest possible case, some new semantics needs to be established:
+\begin{cfacode}
 monitor M {};
 …
 void g(M & mutex b, M & mutex c) {
         waitfor(f); // two monitors M => unknown which to pass to f(M & mutex)
+}
 \end{cfa}
+        waitfor(f); //two monitors M => unknown which to pass to f(M & mutex)
+}
+\end{cfacode}
 The obvious solution is to specify the correct monitor as follows:
 \begin{cfa}
+\begin{cfacode}
 monitor M {};
 …
 void g(M & mutex a, M & mutex b) {
         // wait for call to f with argument b
+        //wait for call to f with argument b
         waitfor(f, b);
+}
+\end{cfa}
+This syntax is unambiguous.
+Both locks are acquired and kept by @g@.
+When routine @f@ is called, the lock for monitor @b@ is temporarily transferred from @g@ to @f@ (while @g@ still holds lock @a@).
+This behaviour can be extended to the multi-monitor @waitfor@ statement as follows.
+\begin{cfa}
+\end{cfacode}
+This syntax is unambiguous. Both locks are acquired and kept by \code{g}. When routine \code{f} is called, the lock for monitor \code{b} is temporarily transferred from \code{g} to \code{f} (while \code{g} still holds lock \code{a}). This behaviour can be extended to the multi-monitor \code{waitfor} statement as follows.
+\begin{cfacode}
 monitor M {};
 …
 void g(M & mutex a, M & mutex b) {
         // wait for call to f with arguments a and b
+        //wait for call to f with arguments a and b
         waitfor(f, a, b);
+}
 \end{cfa}
 Note that the set of monitors passed to the @waitfor@ statement must be entirely contained in the set of monitors already acquired in the routine. @waitfor@ used in any other context is undefined behaviour.
+\end{cfacode}
+Note that the set of monitors passed to the \code{waitfor} statement must be entirely contained in the set of monitors already acquired in the routine. \code{waitfor} used in any other context is undefined behaviour.
 An important behaviour to note is when a set of monitors only match partially:
 \begin{cfa}
+\begin{cfacode}
 mutex struct A {};
 …
 void foo() {
         g(a1, b); // block on accept
+        g(a1, b); //block on accept
+}
 void bar() {
+        f(a2, b); // fulfill cooperation
+}
+\end{cfa}
+While the equivalent can happen when using internal scheduling, the fact that conditions are specific to a set of monitors means that users have to use two different condition variables.
+In both cases, partially matching monitor sets does not wakeup the waiting thread.
+It is also important to note that in the case of external scheduling the order of parameters is irrelevant; @waitfor(f,a,b)@ and @waitfor(f,b,a)@ are indistinguishable waiting condition.
+% ======================================================================
+% ======================================================================
+\subsection{\protect\lstinline|waitfor| Semantics}
+% ======================================================================
+% ======================================================================
+Syntactically, the @waitfor@ statement takes a function identifier and a set of monitors.
+While the set of monitors can be any list of expressions, the function name is more restricted because the compiler validates at compile time the validity of the function type and the parameters used with the @waitfor@ statement.
+It checks that the set of monitors passed in matches the requirements for a function call.
+Figure~\ref{f:waitfor} shows various usages of the waitfor statement and which are acceptable.
+The choice of the function type is made ignoring any non-@mutex@ parameter.
+One limitation of the current implementation is that it does not handle overloading, but overloading is possible.
+        f(a2, b); //fulfill cooperation
+}
+\end{cfacode}
+While the equivalent can happen when using internal scheduling, the fact that conditions are specific to a set of monitors means that users have to use two different condition variables. In both cases, partially matching monitor sets does not wakeup the waiting thread. It is also important to note that in the case of external scheduling the order of parameters is irrelevant; \code{waitfor(f,a,b)} and \code{waitfor(f,b,a)} are indistinguishable waiting condition.
+% ======================================================================
+% ======================================================================
+\subsection{\code{waitfor} Semantics}
+% ======================================================================
+% ======================================================================
+Syntactically, the \code{waitfor} statement takes a function identifier and a set of monitors. While the set of monitors can be any list of expressions, the function name is more restricted because the compiler validates at compile time the validity of the function type and the parameters used with the \code{waitfor} statement. It checks that the set of monitors passed in matches the requirements for a function call. Listing \ref{lst:waitfor} shows various usages of the waitfor statement and which are acceptable. The choice of the function type is made ignoring any non-\code{mutex} parameter. One limitation of the current implementation is that it does not handle overloading, but overloading is possible.
 \begin{figure}
 \begin{cfa}[caption={Various correct and incorrect uses of the waitfor statement},label={f:waitfor}]
+\begin{cfacode}[caption={Various correct and incorrect uses of the waitfor statement},label={lst:waitfor}]
 monitor A{};
 monitor B{};
 …
         void (*fp)( A & mutex ) = f1;
         waitfor(f1, a1);     // Correct : 1 monitor case
         waitfor(f2, a1, b1); // Correct : 2 monitor case
         waitfor(f3, a1);     // Correct : non-mutex arguments are ignored
         waitfor(f1, *ap);    // Correct : expression as argument
         waitfor(f1, a1, b1); // Incorrect : Too many mutex arguments
         waitfor(f2, a1);     // Incorrect : Too few mutex arguments
         waitfor(f2, a1, a2); // Incorrect : Mutex arguments don't match
         waitfor(f1, 1);      // Incorrect : 1 not a mutex argument
         waitfor(f9, a1);     // Incorrect : f9 function does not exist
         waitfor(*fp, a1 );   // Incorrect : fp not an identifier
         waitfor(f4, a1);     // Incorrect : f4 ambiguous
         waitfor(f2, a1, b2); // Undefined behaviour : b2 not mutex
+}
 \end{cfa}
+        waitfor(f1, a1);     //Correct : 1 monitor case
+        waitfor(f2, a1, b1); //Correct : 2 monitor case
+        waitfor(f3, a1);     //Correct : non-mutex arguments are ignored
+        waitfor(f1, *ap);    //Correct : expression as argument
+        waitfor(f1, a1, b1); //Incorrect : Too many mutex arguments
+        waitfor(f2, a1);     //Incorrect : Too few mutex arguments
+        waitfor(f2, a1, a2); //Incorrect : Mutex arguments don't match
+        waitfor(f1, 1);      //Incorrect : 1 not a mutex argument
+        waitfor(f9, a1);     //Incorrect : f9 function does not exist
+        waitfor(*fp, a1 );   //Incorrect : fp not an identifier
+        waitfor(f4, a1);     //Incorrect : f4 ambiguous
+        waitfor(f2, a1, b2); //Undefined behaviour : b2 not mutex
+}
+\end{cfacode}
 \end{figure}
+Finally, for added flexibility, \CFA supports constructing a complex @waitfor@ statement using the @or@, @timeout@ and @else@.
+Indeed, multiple @waitfor@ clauses can be chained together using @or@; this chain forms a single statement that uses baton pass to any function that fits one of the function+monitor set passed in.
+To enable users to tell which accepted function executed, @waitfor@s are followed by a statement (including the null statement @;@) or a compound statement, which is executed after the clause is triggered.
+A @waitfor@ chain can also be followed by a @timeout@, to signify an upper bound on the wait, or an @else@, to signify that the call should be non-blocking, which checks for a matching function call already arrived and otherwise continues.
+Any and all of these clauses can be preceded by a @when@ condition to dynamically toggle the accept clauses on or off based on some current state.
+Figure~\ref{f:waitfor2} demonstrates several complex masks and some incorrect ones.
+Finally, for added flexibility, \CFA supports constructing a complex \code{waitfor} statement using the \code{or}, \code{timeout} and \code{else}. Indeed, multiple \code{waitfor} clauses can be chained together using \code{or}; this chain forms a single statement that uses baton pass to any function that fits one of the function+monitor set passed in. To enable users to tell which accepted function executed, \code{waitfor}s are followed by a statement (including the null statement \code{;}) or a compound statement, which is executed after the clause is triggered. A \code{waitfor} chain can also be followed by a \code{timeout}, to signify an upper bound on the wait, or an \code{else}, to signify that the call should be non-blocking, which checks for a matching function call already arrived and otherwise continues. Any and all of these clauses can be preceded by a \code{when} condition to dynamically toggle the accept clauses on or off based on some current state. Listing \ref{lst:waitfor2} demonstrates several complex masks and some incorrect ones.
 \begin{figure}
+\lstset{language=CFA,deletedelim=**[is][]{`}{`}}
+\begin{cfa}
+\begin{cfacode}[caption={Various correct and incorrect uses of the or, else, and timeout clause around a waitfor statement},label={lst:waitfor2}]
 monitor A{};
 …
 void foo( A & mutex a, bool b, int t ) {
+        waitfor(f1, a);                                                 $\C{// Correct : blocking case}$
+        waitfor(f1, a) {                                                $\C{// Correct : block with statement}$
+        //Correct : blocking case
+        waitfor(f1, a);
+        //Correct : block with statement
+        waitfor(f1, a) {
                 sout | "f1" | endl;
+        }
+        waitfor(f1, a) {                                                $\C{// Correct : block waiting for f1 or f2}$
+        //Correct : block waiting for f1 or f2
+        waitfor(f1, a) {
                 sout | "f1" | endl;
         } or waitfor(f2, a) {
                 sout | "f2" | endl;
+        }
+        waitfor(f1, a); or else;                                $\C{// Correct : non-blocking case}$
+        waitfor(f1, a) {                                                $\C{// Correct : non-blocking case}$
+        //Correct : non-blocking case
+        waitfor(f1, a); or else;
+        //Correct : non-blocking case
+        waitfor(f1, a) {
                 sout | "blocked" | endl;
         } or else {
                 sout | "didn't block" | endl;
+        }
+        waitfor(f1, a) {                                                $\C{// Correct : block at most 10 seconds}$
+        //Correct : block at most 10 seconds
+        waitfor(f1, a) {
                 sout | "blocked" | endl;
         } or timeout( 10`s) {
                 sout | "didn't block" | endl;
+        }
+        // Correct : block only if b == true if b == false, don't even make the call
+        //Correct : block only if b == true
+        //if b == false, don't even make the call
         when(b) waitfor(f1, a);
+        // Correct : block only if b == true if b == false, make non-blocking call
+        //Correct : block only if b == true
+        //if b == false, make non-blocking call
         waitfor(f1, a); or when(!b) else;
         // Correct : block only of t > 1
+        //Correct : block only of t > 1
         waitfor(f1, a); or when(t > 1) timeout(t); or else;
         // Incorrect : timeout clause is dead code
+        //Incorrect : timeout clause is dead code
         waitfor(f1, a); or timeout(t); or else;
+        // Incorrect : order must be waitfor [or waitfor... [or timeout] [or else]]
+        //Incorrect : order must be
+        //waitfor [or waitfor... [or timeout] [or else]]
         timeout(t); or waitfor(f1, a); or else;
+}
+\end{cfa}
+\caption{Correct and incorrect uses of the or, else, and timeout clause around a waitfor statement}
+\label{f:waitfor2}
+\end{cfacode}
 \end{figure}
 …
 % ======================================================================
 % ======================================================================
+An interesting use for the @waitfor@ statement is destructor semantics.
+Indeed, the @waitfor@ statement can accept any @mutex@ routine, which includes the destructor (see section \ref{data}).
+However, with the semantics discussed until now, waiting for the destructor does not make any sense, since using an object after its destructor is called is undefined behaviour.
+The simplest approach is to disallow @waitfor@ on a destructor.
+However, a more expressive approach is to flip ordering of execution when waiting for the destructor, meaning that waiting for the destructor allows the destructor to run after the current @mutex@ routine, similarly to how a condition is signalled.
+An interesting use for the \code{waitfor} statement is destructor semantics. Indeed, the \code{waitfor} statement can accept any \code{mutex} routine, which includes the destructor (see section \ref{data}). However, with the semantics discussed until now, waiting for the destructor does not make any sense, since using an object after its destructor is called is undefined behaviour. The simplest approach is to disallow \code{waitfor} on a destructor. However, a more expressive approach is to flip ordering of execution when waiting for the destructor, meaning that waiting for the destructor allows the destructor to run after the current \code{mutex} routine, similarly to how a condition is signalled.
 \begin{figure}
 \begin{cfa}[caption={Example of an executor which executes action in series until the destructor is called.},label={f:dtor-order}]
+\begin{cfacode}[caption={Example of an executor which executes action in series until the destructor is called.},label={lst:dtor-order}]
 monitor Executer {};
 struct  Action;
 …
+        }
+}
 \end{cfa}
+\end{cfacode}
 \end{figure}
+For example, listing \ref{f:dtor-order} shows an example of an executor with an infinite loop, which waits for the destructor to break out of this loop.
+Switching the semantic meaning introduces an idiomatic way to terminate a task and/or wait for its termination via destruction.
+For example, listing \ref{lst:dtor-order} shows an example of an executor with an infinite loop, which waits for the destructor to break out of this loop. Switching the semantic meaning introduces an idiomatic way to terminate a task and/or wait for its termination via destruction.
 …
 % #       #     # #     # #     # ####### ####### ####### ####### ###  #####  #     #
 \section{Parallelism}
+Historically, computer performance was about processor speeds and instruction counts.
+However, with heat dissipation being a direct consequence of speed increase, parallelism has become the new source for increased performance~\cite{Sutter05, Sutter05b}.
+In this decade, it is no longer reasonable to create a high-performance application without caring about parallelism.
+Indeed, parallelism is an important aspect of performance and more specifically throughput and hardware utilization.
+The lowest-level approach of parallelism is to use \textbf{kthread} in combination with semantics like @fork@, @join@, \etc.
+However, since these have significant costs and limitations, \textbf{kthread} are now mostly used as an implementation tool rather than a user oriented one.
+There are several alternatives to solve these issues that all have strengths and weaknesses.
+While there are many variations of the presented paradigms, most of these variations do not actually change the guarantees or the semantics, they simply move costs in order to achieve better performance for certain workloads.
+Historically, computer performance was about processor speeds and instruction counts. However, with heat dissipation being a direct consequence of speed increase, parallelism has become the new source for increased performance~\cite{Sutter05, Sutter05b}. In this decade, it is no longer reasonable to create a high-performance application without caring about parallelism. Indeed, parallelism is an important aspect of performance and more specifically throughput and hardware utilization. The lowest-level approach of parallelism is to use \textbf{kthread} in combination with semantics like \code{fork}, \code{join}, etc. However, since these have significant costs and limitations, \textbf{kthread} are now mostly used as an implementation tool rather than a user oriented one. There are several alternatives to solve these issues that all have strengths and weaknesses. While there are many variations of the presented paradigms, most of these variations do not actually change the guarantees or the semantics, they simply move costs in order to achieve better performance for certain workloads.
 \section{Paradigms}
 \subsection{User-Level Threads}
+A direct improvement on the \textbf{kthread} approach is to use \textbf{uthread}.
+These threads offer most of the same features that the operating system already provides but can be used on a much larger scale.
+This approach is the most powerful solution as it allows all the features of multithreading, while removing several of the more expensive costs of kernel threads.
+The downside is that almost none of the low-level threading problems are hidden; users still have to think about data races, deadlocks and synchronization issues.
+These issues can be somewhat alleviated by a concurrency toolkit with strong guarantees, but the parallelism toolkit offers very little to reduce complexity in itself.
+A direct improvement on the \textbf{kthread} approach is to use \textbf{uthread}. These threads offer most of the same features that the operating system already provides but can be used on a much larger scale. This approach is the most powerful solution as it allows all the features of multithreading, while removing several of the more expensive costs of kernel threads. The downside is that almost none of the low-level threading problems are hidden; users still have to think about data races, deadlocks and synchronization issues. These issues can be somewhat alleviated by a concurrency toolkit with strong guarantees, but the parallelism toolkit offers very little to reduce complexity in itself.
 Examples of languages that support \textbf{uthread} are Erlang~\cite{Erlang} and \uC~\cite{uC++book}.
 \subsection{Fibers : User-Level Threads Without Preemption} \label{fibers}
+A popular variant of \textbf{uthread} is what is often referred to as \textbf{fiber}.
+However, \textbf{fiber} do not present meaningful semantic differences with \textbf{uthread}.
+The significant difference between \textbf{uthread} and \textbf{fiber} is the lack of \textbf{preemption} in the latter.
+Advocates of \textbf{fiber} list their high performance and ease of implementation as major strengths, but the performance difference between \textbf{uthread} and \textbf{fiber} is controversial, and the ease of implementation, while true, is a weak argument in the context of language design.
+Therefore this proposal largely ignores fibers.
+A popular variant of \textbf{uthread} is what is often referred to as \textbf{fiber}. However, \textbf{fiber} do not present meaningful semantic differences with \textbf{uthread}. The significant difference between \textbf{uthread} and \textbf{fiber} is the lack of \textbf{preemption} in the latter. Advocates of \textbf{fiber} list their high performance and ease of implementation as major strengths, but the performance difference between \textbf{uthread} and \textbf{fiber} is controversial, and the ease of implementation, while true, is a weak argument in the context of language design. Therefore this proposal largely ignores fibers.
 An example of a language that uses fibers is Go~\cite{Go}
 \subsection{Jobs and Thread Pools}
+An approach on the opposite end of the spectrum is to base parallelism on \textbf{pool}.
+Indeed, \textbf{pool} offer limited flexibility but at the benefit of a simpler user interface.
+In \textbf{pool} based systems, users express parallelism as units of work, called jobs, and a dependency graph (either explicit or implicit) that ties them together.
+This approach means users need not worry about concurrency but significantly limit the interaction that can occur among jobs.
+Indeed, any \textbf{job} that blocks also block the underlying worker, which effectively means the CPU utilization, and therefore throughput, suffers noticeably.
+It can be argued that a solution to this problem is to use more workers than available cores.
+However, unless the number of jobs and the number of workers are comparable, having a significant number of blocked jobs always results in idles cores.
+An approach on the opposite end of the spectrum is to base parallelism on \textbf{pool}. Indeed, \textbf{pool} offer limited flexibility but at the benefit of a simpler user interface. In \textbf{pool} based systems, users express parallelism as units of work, called jobs, and a dependency graph (either explicit or implicit) that ties them together. This approach means users need not worry about concurrency but significantly limit the interaction that can occur among jobs. Indeed, any \textbf{job} that blocks also block the underlying worker, which effectively means the CPU utilization, and therefore throughput, suffers noticeably. It can be argued that a solution to this problem is to use more workers than available cores. However, unless the number of jobs and the number of workers are comparable, having a significant number of blocked jobs always results in idles cores.
 The gold standard of this implementation is Intel's TBB library~\cite{TBB}.
 \subsection{Paradigm Performance}
+While the choice between the three paradigms listed above may have significant performance implications, it is difficult to pin down the performance implications of choosing a model at the language level.
+Indeed, in many situations one of these paradigms may show better performance but it all strongly depends on the workload.
+Having a large amount of mostly independent units of work to execute almost guarantees equivalent performance across paradigms and that the \textbf{pool}-based system has the best efficiency thanks to the lower memory overhead (\ie no thread stack per job).
+However, interactions among jobs can easily exacerbate contention.
+User-level threads allow fine-grain context switching, which results in better resource utilization, but a context switch is more expensive and the extra control means users need to tweak more variables to get the desired performance.
+Finally, if the units of uninterrupted work are large, enough the paradigm choice is largely amortized by the actual work done.
+While the choice between the three paradigms listed above may have significant performance implications, it is difficult to pin down the performance implications of choosing a model at the language level. Indeed, in many situations one of these paradigms may show better performance but it all strongly depends on the workload. Having a large amount of mostly independent units of work to execute almost guarantees equivalent performance across paradigms and that the \textbf{pool}-based system has the best efficiency thanks to the lower memory overhead (i.e., no thread stack per job). However, interactions among jobs can easily exacerbate contention. User-level threads allow fine-grain context switching, which results in better resource utilization, but a context switch is more expensive and the extra control means users need to tweak more variables to get the desired performance. Finally, if the units of uninterrupted work are large, enough the paradigm choice is largely amortized by the actual work done.
 \section{The \protect\CFA\ Kernel : Processors, Clusters and Threads}\label{kernel}
+A \textbf{cfacluster} is a group of \textbf{kthread} executed in isolation. \textbf{uthread} are scheduled on the \textbf{kthread} of a given \textbf{cfacluster}, allowing organization between \textbf{uthread} and \textbf{kthread}.
+It is important that \textbf{kthread} belonging to a same \textbf{cfacluster} have homogeneous settings, otherwise migrating a \textbf{uthread} from one \textbf{kthread} to the other can cause issues.
+A \textbf{cfacluster} also offers a pluggable scheduler that can optimize the workload generated by the \textbf{uthread}.
+\textbf{cfacluster} have not been fully implemented in the context of this paper.
+Currently \CFA only supports one \textbf{cfacluster}, the initial one.
+A \textbf{cfacluster} is a group of \textbf{kthread} executed in isolation. \textbf{uthread} are scheduled on the \textbf{kthread} of a given \textbf{cfacluster}, allowing organization between \textbf{uthread} and \textbf{kthread}. It is important that \textbf{kthread} belonging to a same \textbf{cfacluster} have homogeneous settings, otherwise migrating a \textbf{uthread} from one \textbf{kthread} to the other can cause issues. A \textbf{cfacluster} also offers a pluggable scheduler that can optimize the workload generated by the \textbf{uthread}.
+\textbf{cfacluster} have not been fully implemented in the context of this paper. Currently \CFA only supports one \textbf{cfacluster}, the initial one.
 \subsection{Future Work: Machine Setup}\label{machine}
+While this was not done in the context of this paper, another important aspect of clusters is affinity.
+While many common desktop and laptop PCs have homogeneous CPUs, other devices often have more heterogeneous setups.
+For example, a system using \textbf{numa} configurations may benefit from users being able to tie clusters and/or kernel threads to certain CPU cores.
+OS support for CPU affinity is now common~\cite{affinityLinux, affinityWindows, affinityFreebsd, affinityNetbsd, affinityMacosx}, which means it is both possible and desirable for \CFA to offer an abstraction mechanism for portable CPU affinity.
+While this was not done in the context of this paper, another important aspect of clusters is affinity. While many common desktop and laptop PCs have homogeneous CPUs, other devices often have more heterogeneous setups. For example, a system using \textbf{numa} configurations may benefit from users being able to tie clusters and/or kernel threads to certain CPU cores. OS support for CPU affinity is now common~\cite{affinityLinux, affinityWindows, affinityFreebsd, affinityNetbsd, affinityMacosx}, which means it is both possible and desirable for \CFA to offer an abstraction mechanism for portable CPU affinity.
 \subsection{Paradigms}\label{cfaparadigms}
+Given these building blocks, it is possible to reproduce all three of the popular paradigms.
+Indeed, \textbf{uthread} is the default paradigm in \CFA.
+However, disabling \textbf{preemption} on the \textbf{cfacluster} means \textbf{cfathread} effectively become \textbf{fiber}.
+Since several \textbf{cfacluster} with different scheduling policy can coexist in the same application, this allows \textbf{fiber} and \textbf{uthread} to coexist in the runtime of an application.
+Finally, it is possible to build executors for thread pools from \textbf{uthread} or \textbf{fiber}, which includes specialized jobs like actors~\cite{Actors}.
+Given these building blocks, it is possible to reproduce all three of the popular paradigms. Indeed, \textbf{uthread} is the default paradigm in \CFA. However, disabling \textbf{preemption} on the \textbf{cfacluster} means \textbf{cfathread} effectively become \textbf{fiber}. Since several \textbf{cfacluster} with different scheduling policy can coexist in the same application, this allows \textbf{fiber} and \textbf{uthread} to coexist in the runtime of an application. Finally, it is possible to build executors for thread pools from \textbf{uthread} or \textbf{fiber}, which includes specialized jobs like actors~\cite{Actors}.
 \section{Behind the Scenes}
+There are several challenges specific to \CFA when implementing concurrency.
+These challenges are a direct result of \textbf{bulk-acq} and loose object definitions.
+These two constraints are the root cause of most design decisions in the implementation.
+Furthermore, to avoid contention from dynamically allocating memory in a concurrent environment, the internal-scheduling design is (almost) entirely free of mallocs.
+This approach avoids the chicken and egg problem~\cite{Chicken} of having a memory allocator that relies on the threading system and a threading system that relies on the runtime.
+This extra goal means that memory management is a constant concern in the design of the system.
+The main memory concern for concurrency is queues.
+All blocking operations are made by parking threads onto queues and all queues are designed with intrusive nodes, where each node has pre-allocated link fields for chaining, to avoid the need for memory allocation.
+Since several concurrency operations can use an unbound amount of memory (depending on \textbf{bulk-acq}), statically defining information in the intrusive fields of threads is insufficient.The only way to use a variable amount of memory without requiring memory allocation is to pre-allocate large buffers of memory eagerly and store the information in these buffers.
+Conveniently, the call stack fits that description and is easy to use, which is why it is used heavily in the implementation of internal scheduling, particularly variable-length arrays.
+Since stack allocation is based on scopes, the first step of the implementation is to identify the scopes that are available to store the information, and which of these can have a variable-length array.
+The threads and the condition both have a fixed amount of memory, while @mutex@ routines and blocking calls allow for an unbound amount, within the stack size.
+There are several challenges specific to \CFA when implementing concurrency. These challenges are a direct result of \textbf{bulk-acq} and loose object definitions. These two constraints are the root cause of most design decisions in the implementation. Furthermore, to avoid contention from dynamically allocating memory in a concurrent environment, the internal-scheduling design is (almost) entirely free of mallocs. This approach avoids the chicken and egg problem~\cite{Chicken} of having a memory allocator that relies on the threading system and a threading system that relies on the runtime. This extra goal means that memory management is a constant concern in the design of the system.
+The main memory concern for concurrency is queues. All blocking operations are made by parking threads onto queues and all queues are designed with intrusive nodes, where each node has pre-allocated link fields for chaining, to avoid the need for memory allocation. Since several concurrency operations can use an unbound amount of memory (depending on \textbf{bulk-acq}), statically defining information in the intrusive fields of threads is insufficient.The only way to use a variable amount of memory without requiring memory allocation is to pre-allocate large buffers of memory eagerly and store the information in these buffers. Conveniently, the call stack fits that description and is easy to use, which is why it is used heavily in the implementation of internal scheduling, particularly variable-length arrays. Since stack allocation is based on scopes, the first step of the implementation is to identify the scopes that are available to store the information, and which of these can have a variable-length array. The threads and the condition both have a fixed amount of memory, while \code{mutex} routines and blocking calls allow for an unbound amount, within the stack size.
 Note that since the major contributions of this paper are extending monitor semantics to \textbf{bulk-acq} and loose object definitions, any challenges that are not resulting of these characteristics of \CFA are considered as solved problems and therefore not discussed.
 …
 % ======================================================================
+The first step towards the monitor implementation is simple @mutex@ routines.
+In the single monitor case, mutual-exclusion is done using the entry/exit procedure in listing \ref{f:entry1}.
+The entry/exit procedures do not have to be extended to support multiple monitors.
+Indeed it is sufficient to enter/leave monitors one-by-one as long as the order is correct to prevent deadlock~\cite{Havender68}.
+In \CFA, ordering of monitor acquisition relies on memory ordering.
+This approach is sufficient because all objects are guaranteed to have distinct non-overlapping memory layouts and mutual-exclusion for a monitor is only defined for its lifetime, meaning that destroying a monitor while it is acquired is undefined behaviour.
+When a mutex call is made, the concerned monitors are aggregated into a variable-length pointer array and sorted based on pointer values.
+This array persists for the entire duration of the mutual-exclusion and its ordering reused extensively.
+The first step towards the monitor implementation is simple \code{mutex} routines. In the single monitor case, mutual-exclusion is done using the entry/exit procedure in listing \ref{lst:entry1}. The entry/exit procedures do not have to be extended to support multiple monitors. Indeed it is sufficient to enter/leave monitors one-by-one as long as the order is correct to prevent deadlock~\cite{Havender68}. In \CFA, ordering of monitor acquisition relies on memory ordering. This approach is sufficient because all objects are guaranteed to have distinct non-overlapping memory layouts and mutual-exclusion for a monitor is only defined for its lifetime, meaning that destroying a monitor while it is acquired is undefined behaviour. When a mutex call is made, the concerned monitors are aggregated into a variable-length pointer array and sorted based on pointer values. This array persists for the entire duration of the mutual-exclusion and its ordering reused extensively.
 \begin{figure}
 \begin{multicols}{2}
 Entry
 \begin{cfa}
+\begin{pseudo}
 if monitor is free
         enter
 …
         block
 increment recursions
 \end{cfa}
+\end{pseudo}
 \columnbreak
 Exit
 \begin{cfa}
+\begin{pseudo}
 decrement recursion
 if recursion == 0
         if entry queue not empty
                 wake-up thread
 \end{cfa}
+\end{pseudo}
 \end{multicols}
 \begin{cfa}[caption={Initial entry and exit routine for monitors},label={f:entry1}]
 \end{cfa}
+\begin{pseudo}[caption={Initial entry and exit routine for monitors},label={lst:entry1}]
+\end{pseudo}
 \end{figure}
 \subsection{Details: Interaction with polymorphism}
+Depending on the choice of semantics for when monitor locks are acquired, interaction between monitors and \CFA's concept of polymorphism can be more complex to support.
+However, it is shown that entry-point locking solves most of the issues.
+First of all, interaction between @otype@ polymorphism (see Section~\ref{s:ParametricPolymorphism}) and monitors is impossible since monitors do not support copying.
+Therefore, the main question is how to support @dtype@ polymorphism.
+It is important to present the difference between the two acquiring options: \textbf{callsite-locking} and entry-point locking, \ie acquiring the monitors before making a mutex routine-call or as the first operation of the mutex routine-call.
+For example:
+\begin{table}
+Depending on the choice of semantics for when monitor locks are acquired, interaction between monitors and \CFA's concept of polymorphism can be more complex to support. However, it is shown that entry-point locking solves most of the issues.
+First of all, interaction between \code{otype} polymorphism (see Section~\ref{s:ParametricPolymorphism}) and monitors is impossible since monitors do not support copying. Therefore, the main question is how to support \code{dtype} polymorphism. It is important to present the difference between the two acquiring options: \textbf{callsite-locking} and entry-point locking, i.e., acquiring the monitors before making a mutex routine-call or as the first operation of the mutex routine-call. For example:
+\begin{table}[H]
 \begin{center}
 \begin{tabular}{|c|c|c|}
 Mutex & \textbf{callsite-locking} & \textbf{entry-point-locking} \\
 call & cfa-code & cfa-code \\
+call & pseudo-code & pseudo-code \\
 \hline
 \begin{cfa}[tabsize=3]
+\begin{cfacode}[tabsize=3]
 void foo(monitor& mutex a){
         // Do Work
+        //Do Work
         //...
 …
+}
 \end{cfa} & \begin{cfa}[tabsize=3]
+\end{cfacode} & \begin{pseudo}[tabsize=3]
 foo(& a) {
         // Do Work
+        //Do Work
         //...
 …
         release(a);
+}
 \end{cfa} & \begin{cfa}[tabsize=3]
+\end{pseudo} & \begin{pseudo}[tabsize=3]
 foo(& a) {
         acquire(a);
         // Do Work
+        //Do Work
         //...
         release(a);
 …
+}
 \end{cfa}
+\end{pseudo}
 \end{tabular}
 \end{center}
 …
 \end{table}
 Note the @mutex@ keyword relies on the type system, which means that in cases where a generic monitor-routine is desired, writing the mutex routine is possible with the proper trait, \eg:
 \begin{cfa}
 // Incorrect: T may not be monitor
+Note the \code{mutex} keyword relies on the type system, which means that in cases where a generic monitor-routine is desired, writing the mutex routine is possible with the proper trait, e.g.:
+\begin{cfacode}
+//Incorrect: T may not be monitor
 forall(dtype T)
 void foo(T * mutex t);
 // Correct: this function only works on monitors (any monitor)
+//Correct: this function only works on monitors (any monitor)
 forall(dtype T | is_monitor(T))
 void bar(T * mutex t));
+\end{cfa}
+Both entry point and \textbf{callsite-locking} are feasible implementations.
+The current \CFA implementation uses entry-point locking because it requires less work when using \textbf{raii}, effectively transferring the burden of implementation to object construction/destruction.
+It is harder to use \textbf{raii} for call-site locking, as it does not necessarily have an existing scope that matches exactly the scope of the mutual exclusion, \ie the function body.
+For example, the monitor call can appear in the middle of an expression.
+Furthermore, entry-point locking requires less code generation since any useful routine is called multiple times but there is only one entry point for many call sites.
+\end{cfacode}
+Both entry point and \textbf{callsite-locking} are feasible implementations. The current \CFA implementation uses entry-point locking because it requires less work when using \textbf{raii}, effectively transferring the burden of implementation to object construction/destruction. It is harder to use \textbf{raii} for call-site locking, as it does not necessarily have an existing scope that matches exactly the scope of the mutual exclusion, i.e., the function body. For example, the monitor call can appear in the middle of an expression. Furthermore, entry-point locking requires less code generation since any useful routine is called multiple times but there is only one entry point for many call sites.
 % ======================================================================
 …
 % ======================================================================
+Figure \ref{fig:system1} shows a high-level picture if the \CFA runtime system in regards to concurrency.
+Each component of the picture is explained in detail in the flowing sections.
+Figure \ref{fig:system1} shows a high-level picture if the \CFA runtime system in regards to concurrency. Each component of the picture is explained in detail in the flowing sections.
 \begin{figure}
 …
 \subsection{Processors}
+Parallelism in \CFA is built around using processors to specify how much parallelism is desired. \CFA processors are object wrappers around kernel threads, specifically @pthread@s in the current implementation of \CFA.
+Indeed, any parallelism must go through operating-system libraries.
+However, \textbf{uthread} are still the main source of concurrency, processors are simply the underlying source of parallelism.
+Indeed, processor \textbf{kthread} simply fetch a \textbf{uthread} from the scheduler and run it; they are effectively executers for user-threads.
+The main benefit of this approach is that it offers a well-defined boundary between kernel code and user code, for example, kernel thread quiescing, scheduling and interrupt handling.
+Processors internally use coroutines to take advantage of the existing context-switching semantics.
+Parallelism in \CFA is built around using processors to specify how much parallelism is desired. \CFA processors are object wrappers around kernel threads, specifically \texttt{pthread}s in the current implementation of \CFA. Indeed, any parallelism must go through operating-system libraries. However, \textbf{uthread} are still the main source of concurrency, processors are simply the underlying source of parallelism. Indeed, processor \textbf{kthread} simply fetch a \textbf{uthread} from the scheduler and run it; they are effectively executers for user-threads. The main benefit of this approach is that it offers a well-defined boundary between kernel code and user code, for example, kernel thread quiescing, scheduling and interrupt handling. Processors internally use coroutines to take advantage of the existing context-switching semantics.
 \subsection{Stack Management}
+One of the challenges of this system is to reduce the footprint as much as possible.
+Specifically, all @pthread@s created also have a stack created with them, which should be used as much as possible.
+Normally, coroutines also create their own stack to run on, however, in the case of the coroutines used for processors, these coroutines run directly on the \textbf{kthread} stack, effectively stealing the processor stack.
+The exception to this rule is the Main Processor, \ie the initial \textbf{kthread} that is given to any program.
+In order to respect C user expectations, the stack of the initial kernel thread, the main stack of the program, is used by the main user thread rather than the main processor, which can grow very large.
+One of the challenges of this system is to reduce the footprint as much as possible. Specifically, all \texttt{pthread}s created also have a stack created with them, which should be used as much as possible. Normally, coroutines also create their own stack to run on, however, in the case of the coroutines used for processors, these coroutines run directly on the \textbf{kthread} stack, effectively stealing the processor stack. The exception to this rule is the Main Processor, i.e., the initial \textbf{kthread} that is given to any program. In order to respect C user expectations, the stack of the initial kernel thread, the main stack of the program, is used by the main user thread rather than the main processor, which can grow very large.
 \subsection{Context Switching}
+As mentioned in section \ref{coroutine}, coroutines are a stepping stone for implementing threading, because they share the same mechanism for context-switching between different stacks.
+To improve performance and simplicity, context-switching is implemented using the following assumption: all context-switches happen inside a specific function call.
+This assumption means that the context-switch only has to copy the callee-saved registers onto the stack and then switch the stack registers with the ones of the target coroutine/thread.
+Note that the instruction pointer can be left untouched since the context-switch is always inside the same function.
+Threads, however, do not context-switch between each other directly.
+They context-switch to the scheduler.
+This method is called a 2-step context-switch and has the advantage of having a clear distinction between user code and the kernel where scheduling and other system operations happen.
+Obviously, this doubles the context-switch cost because threads must context-switch to an intermediate stack.
+The alternative 1-step context-switch uses the stack of the ``from'' thread to schedule and then context-switches directly to the ``to'' thread.
+However, the performance of the 2-step context-switch is still superior to a @pthread_yield@ (see section \ref{results}).
+Additionally, for users in need for optimal performance, it is important to note that having a 2-step context-switch as the default does not prevent \CFA from offering a 1-step context-switch (akin to the Microsoft @SwitchToFiber@~\cite{switchToWindows} routine).
+This option is not currently present in \CFA, but the changes required to add it are strictly additive.
+As mentioned in section \ref{coroutine}, coroutines are a stepping stone for implementing threading, because they share the same mechanism for context-switching between different stacks. To improve performance and simplicity, context-switching is implemented using the following assumption: all context-switches happen inside a specific function call. This assumption means that the context-switch only has to copy the callee-saved registers onto the stack and then switch the stack registers with the ones of the target coroutine/thread. Note that the instruction pointer can be left untouched since the context-switch is always inside the same function. Threads, however, do not context-switch between each other directly. They context-switch to the scheduler. This method is called a 2-step context-switch and has the advantage of having a clear distinction between user code and the kernel where scheduling and other system operations happen. Obviously, this doubles the context-switch cost because threads must context-switch to an intermediate stack. The alternative 1-step context-switch uses the stack of the ``from'' thread to schedule and then context-switches directly to the ``to'' thread. However, the performance of the 2-step context-switch is still superior to a \code{pthread_yield} (see section \ref{results}). Additionally, for users in need for optimal performance, it is important to note that having a 2-step context-switch as the default does not prevent \CFA from offering a 1-step context-switch (akin to the Microsoft \code{SwitchToFiber}~\cite{switchToWindows} routine). This option is not currently present in \CFA, but the changes required to add it are strictly additive.
 \subsection{Preemption} \label{preemption}
+Finally, an important aspect for any complete threading system is preemption.
+As mentioned in section \ref{basics}, preemption introduces an extra degree of uncertainty, which enables users to have multiple threads interleave transparently, rather than having to cooperate among threads for proper scheduling and CPU distribution.
+Indeed, preemption is desirable because it adds a degree of isolation among threads.
+In a fully cooperative system, any thread that runs a long loop can starve other threads, while in a preemptive system, starvation can still occur but it does not rely on every thread having to yield or block on a regular basis, which reduces significantly a programmer burden.
+Obviously, preemption is not optimal for every workload.
+However any preemptive system can become a cooperative system by making the time slices extremely large.
+Therefore, \CFA uses a preemptive threading system.
+Preemption in \CFA\footnote{Note that the implementation of preemption is strongly tied with the underlying threading system.
+For this reason, only the Linux implementation is cover, \CFA does not run on Windows at the time of writting} is based on kernel timers, which are used to run a discrete-event simulation.
+Every processor keeps track of the current time and registers an expiration time with the preemption system.
+When the preemption system receives a change in preemption, it inserts the time in a sorted order and sets a kernel timer for the closest one, effectively stepping through preemption events on each signal sent by the timer.
+These timers use the Linux signal {\tt SIGALRM}, which is delivered to the process rather than the kernel-thread.
+This results in an implementation problem, because when delivering signals to a process, the kernel can deliver the signal to any kernel thread for which the signal is not blocked, \ie:
+Finally, an important aspect for any complete threading system is preemption. As mentioned in section \ref{basics}, preemption introduces an extra degree of uncertainty, which enables users to have multiple threads interleave transparently, rather than having to cooperate among threads for proper scheduling and CPU distribution. Indeed, preemption is desirable because it adds a degree of isolation among threads. In a fully cooperative system, any thread that runs a long loop can starve other threads, while in a preemptive system, starvation can still occur but it does not rely on every thread having to yield or block on a regular basis, which reduces significantly a programmer burden. Obviously, preemption is not optimal for every workload. However any preemptive system can become a cooperative system by making the time slices extremely large. Therefore, \CFA uses a preemptive threading system.
+Preemption in \CFA\footnote{Note that the implementation of preemption is strongly tied with the underlying threading system. For this reason, only the Linux implementation is cover, \CFA does not run on Windows at the time of writting} is based on kernel timers, which are used to run a discrete-event simulation. Every processor keeps track of the current time and registers an expiration time with the preemption system. When the preemption system receives a change in preemption, it inserts the time in a sorted order and sets a kernel timer for the closest one, effectively stepping through preemption events on each signal sent by the timer. These timers use the Linux signal {\tt SIGALRM}, which is delivered to the process rather than the kernel-thread. This results in an implementation problem, because when delivering signals to a process, the kernel can deliver the signal to any kernel thread for which the signal is not blocked, i.e.:
 \begin{quote}
+A process-directed signal may be delivered to any one of the threads that does not currently have the signal blocked.
+If more than one of the threads has the signal unblocked, then the kernel chooses an arbitrary thread to which to deliver the signal.
+A process-directed signal may be delivered to any one of the threads that does not currently have the signal blocked. If more than one of the threads has the signal unblocked, then the kernel chooses an arbitrary thread to which to deliver the signal.
 SIGNAL(7) - Linux Programmer's Manual
 \end{quote}
 For the sake of simplicity, and in order to prevent the case of having two threads receiving alarms simultaneously, \CFA programs block the {\tt SIGALRM} signal on every kernel thread except one.
+Now because of how involuntary context-switches are handled, the kernel thread handling {\tt SIGALRM} cannot also be a processor thread.
+Hence, involuntary context-switching is done by sending signal {\tt SIGUSR1} to the corresponding proces\-sor and having the thread yield from inside the signal handler.
+This approach effectively context-switches away from the signal handler back to the kernel and the signal handler frame is eventually unwound when the thread is scheduled again.
+As a result, a signal handler can start on one kernel thread and terminate on a second kernel thread (but the same user thread).
+It is important to note that signal handlers save and restore signal masks because user-thread migration can cause a signal mask to migrate from one kernel thread to another.
+This behaviour is only a problem if all kernel threads, among which a user thread can migrate, differ in terms of signal masks\footnote{Sadly, official POSIX documentation is silent on what distinguishes ``async-signal-safe'' functions from other functions.}.
+However, since the kernel thread handling preemption requires a different signal mask, executing user threads on the kernel-alarm thread can cause deadlocks.
+For this reason, the alarm thread is in a tight loop around a system call to @sigwaitinfo@, requiring very little CPU time for preemption.
+One final detail about the alarm thread is how to wake it when additional communication is required (\eg on thread termination).
+This unblocking is also done using {\tt SIGALRM}, but sent through the @pthread_sigqueue@.
+Indeed, @sigwait@ can differentiate signals sent from @pthread_sigqueue@ from signals sent from alarms or the kernel.
+Now because of how involuntary context-switches are handled, the kernel thread handling {\tt SIGALRM} cannot also be a processor thread. Hence, involuntary context-switching is done by sending signal {\tt SIGUSR1} to the corresponding proces\-sor and having the thread yield from inside the signal handler. This approach effectively context-switches away from the signal handler back to the kernel and the signal handler frame is eventually unwound when the thread is scheduled again. As a result, a signal handler can start on one kernel thread and terminate on a second kernel thread (but the same user thread). It is important to note that signal handlers save and restore signal masks because user-thread migration can cause a signal mask to migrate from one kernel thread to another. This behaviour is only a problem if all kernel threads, among which a user thread can migrate, differ in terms of signal masks\footnote{Sadly, official POSIX documentation is silent on what distinguishes ``async-signal-safe'' functions from other functions.}. However, since the kernel thread handling preemption requires a different signal mask, executing user threads on the kernel-alarm thread can cause deadlocks. For this reason, the alarm thread is in a tight loop around a system call to \code{sigwaitinfo}, requiring very little CPU time for preemption. One final detail about the alarm thread is how to wake it when additional communication is required (e.g., on thread termination). This unblocking is also done using {\tt SIGALRM}, but sent through the \code{pthread_sigqueue}. Indeed, \code{sigwait} can differentiate signals sent from \code{pthread_sigqueue} from signals sent from alarms or the kernel.
 \subsection{Scheduler}
+Finally, an aspect that was not mentioned yet is the scheduling algorithm.
+Currently, the \CFA scheduler uses a single ready queue for all processors, which is the simplest approach to scheduling.
+Further discussion on scheduling is present in section \ref{futur:sched}.
+Finally, an aspect that was not mentioned yet is the scheduling algorithm. Currently, the \CFA scheduler uses a single ready queue for all processors, which is the simplest approach to scheduling. Further discussion on scheduling is present in section \ref{futur:sched}.
 % ======================================================================
 …
 The following figure is the traditional illustration of a monitor (repeated from page~\pageref{fig:ClassicalMonitor} for convenience):
 \begin{figure}
+\begin{figure}[H]
 \begin{center}
 {\resizebox{0.4\textwidth}{!}{\input{monitor}}}
 …
 \end{figure}
+This picture has several components, the two most important being the entry queue and the AS-stack.
+The entry queue is an (almost) FIFO list where threads waiting to enter are parked, while the acceptor/signaller (AS) stack is a FILO list used for threads that have been signalled or otherwise marked as running next.
+For \CFA, this picture does not have support for blocking multiple monitors on a single condition.
+To support \textbf{bulk-acq} two changes to this picture are required.
+First, it is no longer helpful to attach the condition to \emph{a single} monitor.
+Secondly, the thread waiting on the condition has to be separated across multiple monitors, seen in figure \ref{fig:monitor_cfa}.
+\begin{figure}
+This picture has several components, the two most important being the entry queue and the AS-stack. The entry queue is an (almost) FIFO list where threads waiting to enter are parked, while the acceptor/signaller (AS) stack is a FILO list used for threads that have been signalled or otherwise marked as running next.
+For \CFA, this picture does not have support for blocking multiple monitors on a single condition. To support \textbf{bulk-acq} two changes to this picture are required. First, it is no longer helpful to attach the condition to \emph{a single} monitor. Secondly, the thread waiting on the condition has to be separated across multiple monitors, seen in figure \ref{fig:monitor_cfa}.
+\begin{figure}[H]
 \begin{center}
 {\resizebox{0.8\textwidth}{!}{\input{int_monitor}}}
 …
 \end{figure}
+This picture and the proper entry and leave algorithms (see listing \ref{f:entry2}) is the fundamental implementation of internal scheduling.
+Note that when a thread is moved from the condition to the AS-stack, it is conceptually split into N pieces, where N is the number of monitors specified in the parameter list.
+The thread is woken up when all the pieces have popped from the AS-stacks and made active.
+In this picture, the threads are split into halves but this is only because there are two monitors.
+For a specific signalling operation every monitor needs a piece of thread on its AS-stack.
+\begin{figure}
+This picture and the proper entry and leave algorithms (see listing \ref{lst:entry2}) is the fundamental implementation of internal scheduling. Note that when a thread is moved from the condition to the AS-stack, it is conceptually split into N pieces, where N is the number of monitors specified in the parameter list. The thread is woken up when all the pieces have popped from the AS-stacks and made active. In this picture, the threads are split into halves but this is only because there are two monitors. For a specific signalling operation every monitor needs a piece of thread on its AS-stack.
+\begin{figure}[b]
 \begin{multicols}{2}
 Entry
 \begin{cfa}
+\begin{pseudo}
 if monitor is free
         enter
 …
 increment recursion
 \end{cfa}
+\end{pseudo}
 \columnbreak
 Exit
 \begin{cfa}
+\begin{pseudo}
 decrement recursion
 if recursion == 0
 …
         if entry queue not empty
                 wake-up thread
 \end{cfa}
+\end{pseudo}
 \end{multicols}
 \begin{cfa}[caption={Entry and exit routine for monitors with internal scheduling},label={f:entry2}]
 \end{cfa}
+\begin{pseudo}[caption={Entry and exit routine for monitors with internal scheduling},label={lst:entry2}]
+\end{pseudo}
 \end{figure}
+The solution discussed in \ref{intsched} can be seen in the exit routine of listing \ref{f:entry2}.
+Basically, the solution boils down to having a separate data structure for the condition queue and the AS-stack, and unconditionally transferring ownership of the monitors but only unblocking the thread when the last monitor has transferred ownership.
+This solution is deadlock safe as well as preventing any potential barging.
+The data structures used for the AS-stack are reused extensively for external scheduling, but in the case of internal scheduling, the data is allocated using variable-length arrays on the call stack of the @wait@ and @signal_block@ routines.
+\begin{figure}
+The solution discussed in \ref{intsched} can be seen in the exit routine of listing \ref{lst:entry2}. Basically, the solution boils down to having a separate data structure for the condition queue and the AS-stack, and unconditionally transferring ownership of the monitors but only unblocking the thread when the last monitor has transferred ownership. This solution is deadlock safe as well as preventing any potential barging. The data structures used for the AS-stack are reused extensively for external scheduling, but in the case of internal scheduling, the data is allocated using variable-length arrays on the call stack of the \code{wait} and \code{signal_block} routines.
+\begin{figure}[H]
 \begin{center}
 {\resizebox{0.8\textwidth}{!}{\input{monitor_structs.pstex_t}}}
 …
 \end{figure}
+Figure \ref{fig:structs} shows a high-level representation of these data structures.
+The main idea behind them is that, a thread cannot contain an arbitrary number of intrusive ``next'' pointers for linking onto monitors.
+The @condition node@ is the data structure that is queued onto a condition variable and, when signalled, the condition queue is popped and each @condition criterion@ is moved to the AS-stack.
+Once all the criteria have been popped from their respective AS-stacks, the thread is woken up, which is what is shown in listing \ref{f:entry2}.
+Figure \ref{fig:structs} shows a high-level representation of these data structures. The main idea behind them is that, a thread cannot contain an arbitrary number of intrusive ``next'' pointers for linking onto monitors. The \code{condition node} is the data structure that is queued onto a condition variable and, when signalled, the condition queue is popped and each \code{condition criterion} is moved to the AS-stack. Once all the criteria have been popped from their respective AS-stacks, the thread is woken up, which is what is shown in listing \ref{lst:entry2}.
 % ======================================================================
 …
 % ======================================================================
 % ======================================================================
+Similarly to internal scheduling, external scheduling for multiple monitors relies on the idea that waiting-thread queues are no longer specific to a single monitor, as mentioned in section \ref{extsched}.
+For internal scheduling, these queues are part of condition variables, which are still unique for a given scheduling operation (\ie no signal statement uses multiple conditions).
+However, in the case of external scheduling, there is no equivalent object which is associated with @waitfor@ statements.
+This absence means the queues holding the waiting threads must be stored inside at least one of the monitors that is acquired.
+These monitors being the only objects that have sufficient lifetime and are available on both sides of the @waitfor@ statement.
+This requires an algorithm to choose which monitor holds the relevant queue.
+It is also important that said algorithm be independent of the order in which users list parameters.
+The proposed algorithm is to fall back on monitor lock ordering (sorting by address) and specify that the monitor that is acquired first is the one with the relevant waiting queue.
+This assumes that the lock acquiring order is static for the lifetime of all concerned objects but that is a reasonable constraint.
+Similarly to internal scheduling, external scheduling for multiple monitors relies on the idea that waiting-thread queues are no longer specific to a single monitor, as mentioned in section \ref{extsched}. For internal scheduling, these queues are part of condition variables, which are still unique for a given scheduling operation (i.e., no signal statement uses multiple conditions). However, in the case of external scheduling, there is no equivalent object which is associated with \code{waitfor} statements. This absence means the queues holding the waiting threads must be stored inside at least one of the monitors that is acquired. These monitors being the only objects that have sufficient lifetime and are available on both sides of the \code{waitfor} statement. This requires an algorithm to choose which monitor holds the relevant queue. It is also important that said algorithm be independent of the order in which users list parameters. The proposed algorithm is to fall back on monitor lock ordering (sorting by address) and specify that the monitor that is acquired first is the one with the relevant waiting queue. This assumes that the lock acquiring order is static for the lifetime of all concerned objects but that is a reasonable constraint.
 This algorithm choice has two consequences:
 \begin{itemize}
+        \item The queue of the monitor with the lowest address is no longer a true FIFO queue because threads can be moved to the front of the queue.
+These queues need to contain a set of monitors for each of the waiting threads.
+Therefore, another thread whose set contains the same lowest address monitor but different lower priority monitors may arrive first but enter the critical section after a thread with the correct pairing.
+        \item The queue of the lowest priority monitor is both required and potentially unused.
+Indeed, since it is not known at compile time which monitor is the monitor which has the lowest address, every monitor needs to have the correct queues even though it is possible that some queues go unused for the entire duration of the program, for example if a monitor is only used in a specific pair.
+        \item The queue of the monitor with the lowest address is no longer a true FIFO queue because threads can be moved to the front of the queue. These queues need to contain a set of monitors for each of the waiting threads. Therefore, another thread whose set contains the same lowest address monitor but different lower priority monitors may arrive first but enter the critical section after a thread with the correct pairing.
+        \item The queue of the lowest priority monitor is both required and potentially unused. Indeed, since it is not known at compile time which monitor is the monitor which has the lowest address, every monitor needs to have the correct queues even though it is possible that some queues go unused for the entire duration of the program, for example if a monitor is only used in a specific pair.
 \end{itemize}
 Therefore, the following modifications need to be made to support external scheduling:
 \begin{itemize}
+        \item The threads waiting on the entry queue need to keep track of which routine they are trying to enter, and using which set of monitors.
+The @mutex@ routine already has all the required information on its stack, so the thread only needs to keep a pointer to that information.
+        \item The monitors need to keep a mask of acceptable routines.
+This mask contains for each acceptable routine, a routine pointer and an array of monitors to go with it.
+It also needs storage to keep track of which routine was accepted.
+Since this information is not specific to any monitor, the monitors actually contain a pointer to an integer on the stack of the waiting thread.
+Note that if a thread has acquired two monitors but executes a @waitfor@ with only one monitor as a parameter, setting the mask of acceptable routines to both monitors will not cause any problems since the extra monitor will not change ownership regardless.
+This becomes relevant when @when@ clauses affect the number of monitors passed to a @waitfor@ statement.
+        \item The entry/exit routines need to be updated as shown in listing \ref{f:entry3}.
+        \item The threads waiting on the entry queue need to keep track of which routine they are trying to enter, and using which set of monitors. The \code{mutex} routine already has all the required information on its stack, so the thread only needs to keep a pointer to that information.
+        \item The monitors need to keep a mask of acceptable routines. This mask contains for each acceptable routine, a routine pointer and an array of monitors to go with it. It also needs storage to keep track of which routine was accepted. Since this information is not specific to any monitor, the monitors actually contain a pointer to an integer on the stack of the waiting thread. Note that if a thread has acquired two monitors but executes a \code{waitfor} with only one monitor as a parameter, setting the mask of acceptable routines to both monitors will not cause any problems since the extra monitor will not change ownership regardless. This becomes relevant when \code{when} clauses affect the number of monitors passed to a \code{waitfor} statement.
+        \item The entry/exit routines need to be updated as shown in listing \ref{lst:entry3}.
 \end{itemize}
 \subsection{External Scheduling - Destructors}
+Finally, to support the ordering inversion of destructors, the code generation needs to be modified to use a special entry routine.
+This routine is needed because of the storage requirements of the call order inversion.
+Indeed, when waiting for the destructors, storage is needed for the waiting context and the lifetime of said storage needs to outlive the waiting operation it is needed for.
+For regular @waitfor@ statements, the call stack of the routine itself matches this requirement but it is no longer the case when waiting for the destructor since it is pushed on to the AS-stack for later.
+The @waitfor@ semantics can then be adjusted correspondingly, as seen in listing \ref{f:entry-dtor}
+Finally, to support the ordering inversion of destructors, the code generation needs to be modified to use a special entry routine. This routine is needed because of the storage requirements of the call order inversion. Indeed, when waiting for the destructors, storage is needed for the waiting context and the lifetime of said storage needs to outlive the waiting operation it is needed for. For regular \code{waitfor} statements, the call stack of the routine itself matches this requirement but it is no longer the case when waiting for the destructor since it is pushed on to the AS-stack for later. The \code{waitfor} semantics can then be adjusted correspondingly, as seen in listing \ref{lst:entry-dtor}
 \begin{figure}
 \begin{multicols}{2}
 Entry
 \begin{cfa}
+\begin{pseudo}
 if monitor is free
         enter
 …
         block
 increment recursion
 \end{cfa}
+\end{pseudo}
 \columnbreak
 Exit
 \begin{cfa}
+\begin{pseudo}
 decrement recursion
 if recursion == 0
 …
                 wake-up thread
         endif
 \end{cfa}
+\end{pseudo}
 \end{multicols}
 \begin{cfa}[caption={Entry and exit routine for monitors with internal scheduling and external scheduling},label={f:entry3}]
 \end{cfa}
+\begin{pseudo}[caption={Entry and exit routine for monitors with internal scheduling and external scheduling},label={lst:entry3}]
+\end{pseudo}
 \end{figure}
 …
 \begin{multicols}{2}
 Destructor Entry
 \begin{cfa}
+\begin{pseudo}
 if monitor is free
         enter
 …
         wait
 increment recursion
 \end{cfa}
+\end{pseudo}
 \columnbreak
 Waitfor
 \begin{cfa}
+\begin{pseudo}
 if matching thread is already there
         if found destructor
 …
 block
 return
 \end{cfa}
+\end{pseudo}
 \end{multicols}
 \begin{cfa}[caption={Pseudo code for the \protect\lstinline|waitfor| routine and the \protect\lstinline|mutex| entry routine for destructors},label={f:entry-dtor}]
 \end{cfa}
+\begin{pseudo}[caption={Pseudo code for the \code{waitfor} routine and the \code{mutex} entry routine for destructors},label={lst:entry-dtor}]
+\end{pseudo}
 \end{figure}
 …
 \section{Threads As Monitors}
+As it was subtly alluded in section \ref{threads}, @thread@s in \CFA are in fact monitors, which means that all monitor features are available when using threads.
+For example, here is a very simple two thread pipeline that could be used for a simulator of a game engine:
+\begin{figure}
+\begin{cfa}[caption={Toy simulator using \protect\lstinline|thread|s and \protect\lstinline|monitor|s.},label={f:engine-v1}]
+As it was subtly alluded in section \ref{threads}, \code{thread}s in \CFA are in fact monitors, which means that all monitor features are available when using threads. For example, here is a very simple two thread pipeline that could be used for a simulator of a game engine:
+\begin{figure}[H]
+\begin{cfacode}[caption={Toy simulator using \code{thread}s and \code{monitor}s.},label={lst:engine-v1}]
 // Visualization declaration
 thread Renderer {} renderer;
 …
+        }
+}
 \end{cfa}
+\end{cfacode}
 \end{figure}
+One of the obvious complaints of the previous code snippet (other than its toy-like simplicity) is that it does not handle exit conditions and just goes on forever.
+Luckily, the monitor semantics can also be used to clearly enforce a shutdown order in a concise manner:
+\begin{figure}
+\begin{cfa}[caption={Same toy simulator with proper termination condition.},label={f:engine-v2}]
+One of the obvious complaints of the previous code snippet (other than its toy-like simplicity) is that it does not handle exit conditions and just goes on forever. Luckily, the monitor semantics can also be used to clearly enforce a shutdown order in a concise manner:
+\begin{figure}[H]
+\begin{cfacode}[caption={Same toy simulator with proper termination condition.},label={lst:engine-v2}]
 // Visualization declaration
 thread Renderer {} renderer;
 …
 // Call destructor for simulator once simulator finishes
 // Call destructor for renderer to signify shutdown
 \end{cfa}
+\end{cfacode}
 \end{figure}
 \section{Fibers \& Threads}
+As mentioned in section \ref{preemption}, \CFA uses preemptive threads by default but can use fibers on demand.
+Currently, using fibers is done by adding the following line of code to the program~:
+\begin{cfa}
+As mentioned in section \ref{preemption}, \CFA uses preemptive threads by default but can use fibers on demand. Currently, using fibers is done by adding the following line of code to the program~:
+\begin{cfacode}
 unsigned int default_preemption() {
         return 0;
+}
+\end{cfa}
+This function is called by the kernel to fetch the default preemption rate, where 0 signifies an infinite time-slice, \ie no preemption.
+However, once clusters are fully implemented, it will be possible to create fibers and \textbf{uthread} in the same system, as in listing \ref{f:fiber-uthread}
+\end{cfacode}
+This function is called by the kernel to fetch the default preemption rate, where 0 signifies an infinite time-slice, i.e., no preemption. However, once clusters are fully implemented, it will be possible to create fibers and \textbf{uthread} in the same system, as in listing \ref{lst:fiber-uthread}
 \begin{figure}
+\lstset{language=CFA,deletedelim=**[is][]{`}{`}}
+\begin{cfa}[caption={Using fibers and \textbf{uthread} side-by-side in \CFA},label={f:fiber-uthread}]
+// Cluster forward declaration
+\begin{cfacode}[caption={Using fibers and \textbf{uthread} side-by-side in \CFA},label={lst:fiber-uthread}]
+//Cluster forward declaration
 struct cluster;
 // Processor forward declaration
+//Processor forward declaration
 struct processor;
 // Construct clusters with a preemption rate
+//Construct clusters with a preemption rate
 void ?{}(cluster& this, unsigned int rate);
 // Construct processor and add it to cluster
+//Construct processor and add it to cluster
 void ?{}(processor& this, cluster& cluster);
 // Construct thread and schedule it on cluster
+//Construct thread and schedule it on cluster
 void ?{}(thread& this, cluster& cluster);
 // Declare two clusters
 cluster thread_cluster = { 10`ms };                     // Preempt every 10 ms
 cluster fibers_cluster = { 0 };                         // Never preempt
 // Construct 4 processors
+//Declare two clusters
+cluster thread_cluster = { 10`ms };                     //Preempt every 10 ms
+cluster fibers_cluster = { 0 };                         //Never preempt
+//Construct 4 processors
 processor processors[4] = {
         //2 for the thread cluster
 …
 };
 // Declares thread
+//Declares thread
 thread UThread {};
 void ?{}(UThread& this) {
         // Construct underlying thread to automatically
         // be scheduled on the thread cluster
+        //Construct underlying thread to automatically
+        //be scheduled on the thread cluster
         (this){ thread_cluster }
+}
 …
 void main(UThread & this);
 // Declares fibers
+//Declares fibers
 thread Fiber {};
 void ?{}(Fiber& this) {
         // Construct underlying thread to automatically
         // be scheduled on the fiber cluster
+        //Construct underlying thread to automatically
+        //be scheduled on the fiber cluster
         (this.__thread){ fibers_cluster }
+}
 void main(Fiber & this);
 \end{cfa}
+\end{cfacode}
 \end{figure}
 …
 % ======================================================================
 \section{Machine Setup}
+Table \ref{tab:machine} shows the characteristics of the machine used to run the benchmarks.
+All tests were made on this machine.
+\begin{table}
+Table \ref{tab:machine} shows the characteristics of the machine used to run the benchmarks. All tests were made on this machine.
+\begin{table}[H]
 \begin{center}
 \begin{tabular}{| l | r | l | r |}
 …
 \section{Micro Benchmarks}
+All benchmarks are run using the same harness to produce the results, seen as the @BENCH()@ macro in the following examples.
+This macro uses the following logic to benchmark the code:
+\begin{cfa}
+All benchmarks are run using the same harness to produce the results, seen as the \code{BENCH()} macro in the following examples. This macro uses the following logic to benchmark the code:
+\begin{pseudo}
 #define BENCH(run, result) \
         before = gettime(); \
 …
         after  = gettime(); \
         result = (after - before) / N;
+\end{cfa}
+The method used to get time is @clock_gettime(CLOCK_THREAD_CPUTIME_ID);@.
+Each benchmark is using many iterations of a simple call to measure the cost of the call.
+The specific number of iterations depends on the specific benchmark.
+\end{pseudo}
+The method used to get time is \code{clock_gettime(CLOCK_THREAD_CPUTIME_ID);}. Each benchmark is using many iterations of a simple call to measure the cost of the call. The specific number of iterations depends on the specific benchmark.
 \subsection{Context-Switching}
+The first interesting benchmark is to measure how long context-switches take.
+The simplest approach to do this is to yield on a thread, which executes a 2-step context switch.
+Yielding causes the thread to context-switch to the scheduler and back, more precisely: from the \textbf{uthread} to the \textbf{kthread} then from the \textbf{kthread} back to the same \textbf{uthread} (or a different one in the general case).
+In order to make the comparison fair, coroutines also execute a 2-step context-switch by resuming another coroutine which does nothing but suspending in a tight loop, which is a resume/suspend cycle instead of a yield.
+Figure~\ref{f:ctx-switch} shows the code for coroutines and threads with the results in table \ref{tab:ctx-switch}.
+All omitted tests are functionally identical to one of these tests.
+The difference between coroutines and threads can be attributed to the cost of scheduling.
+The first interesting benchmark is to measure how long context-switches take. The simplest approach to do this is to yield on a thread, which executes a 2-step context switch. Yielding causes the thread to context-switch to the scheduler and back, more precisely: from the \textbf{uthread} to the \textbf{kthread} then from the \textbf{kthread} back to the same \textbf{uthread} (or a different one in the general case). In order to make the comparison fair, coroutines also execute a 2-step context-switch by resuming another coroutine which does nothing but suspending in a tight loop, which is a resume/suspend cycle instead of a yield. Listing \ref{lst:ctx-switch} shows the code for coroutines and threads with the results in table \ref{tab:ctx-switch}. All omitted tests are functionally identical to one of these tests. The difference between coroutines and threads can be attributed to the cost of scheduling.
 \begin{figure}
 \begin{multicols}{2}
 \CFA Coroutines
 \begin{cfa}
+\begin{cfacode}
 coroutine GreatSuspender {};
 void main(GreatSuspender& this) {
 …
         printf("%llu\n", result);
+}
 \end{cfa}
+\end{cfacode}
 \columnbreak
 \CFA Threads
 \begin{cfa}
+\begin{cfacode}
 …
         printf("%llu\n", result);
+}
 \end{cfa}
+\end{cfacode}
 \end{multicols}
 \begin{cfa}[caption={\CFA benchmark code used to measure context-switches for coroutines and threads.},label={f:ctx-switch}]
 \end{cfa}
+\begin{cfacode}[caption={\CFA benchmark code used to measure context-switches for coroutines and threads.},label={lst:ctx-switch}]
+\end{cfacode}
 \end{figure}
 …
 \end{tabular}
 \end{center}
+\caption{Context Switch comparison.
+All numbers are in nanoseconds(\si{\nano\second})}
+\caption{Context Switch comparison. All numbers are in nanoseconds(\si{\nano\second})}
 \label{tab:ctx-switch}
 \end{table}
 \subsection{Mutual-Exclusion}
+The next interesting benchmark is to measure the overhead to enter/leave a critical-section.
+For monitors, the simplest approach is to measure how long it takes to enter and leave a monitor routine.
+Figure~\ref{f:mutex} shows the code for \CFA.
+To put the results in context, the cost of entering a non-inline function and the cost of acquiring and releasing a @pthread_mutex@ lock is also measured.
+The results can be shown in table \ref{tab:mutex}.
+The next interesting benchmark is to measure the overhead to enter/leave a critical-section. For monitors, the simplest approach is to measure how long it takes to enter and leave a monitor routine. Listing \ref{lst:mutex} shows the code for \CFA. To put the results in context, the cost of entering a non-inline function and the cost of acquiring and releasing a \code{pthread_mutex} lock is also measured. The results can be shown in table \ref{tab:mutex}.
 \begin{figure}
 \begin{cfa}[caption={\CFA benchmark code used to measure mutex routines.},label={f:mutex}]
+\begin{cfacode}[caption={\CFA benchmark code used to measure mutex routines.},label={lst:mutex}]
 monitor M {};
 void __attribute__((noinline)) call( M & mutex m /*, m2, m3, m4*/ ) {}
 …
         printf("%llu\n", result);
+}
 \end{cfa}
+\end{cfacode}
 \end{figure}
 …
 FetchAdd + FetchSub                             & 26            & 26            & 0    \\
 Pthreads Mutex Lock                             & 31            & 31.86 & 0.99 \\
 \uC @monitor@ member routine            & 30            & 30            & 0    \\
 \CFA @mutex@ routine, 1 argument        & 41            & 41.57 & 0.9  \\
 \CFA @mutex@ routine, 2 argument        & 76            & 76.96 & 1.57 \\
 \CFA @mutex@ routine, 4 argument        & 145           & 146.68        & 3.85 \\
+\uC \code{monitor} member routine               & 30            & 30            & 0    \\
+\CFA \code{mutex} routine, 1 argument   & 41            & 41.57 & 0.9  \\
+\CFA \code{mutex} routine, 2 argument   & 76            & 76.96 & 1.57 \\
+\CFA \code{mutex} routine, 4 argument   & 145           & 146.68        & 3.85 \\
 Java synchronized routine                       & 27            & 28.57 & 2.6  \\
 \hline
 \end{tabular}
 \end{center}
+\caption{Mutex routine comparison.
+All numbers are in nanoseconds(\si{\nano\second})}
+\caption{Mutex routine comparison. All numbers are in nanoseconds(\si{\nano\second})}
 \label{tab:mutex}
 \end{table}
 \subsection{Internal Scheduling}
+The internal-scheduling benchmark measures the cost of waiting on and signalling a condition variable.
+Figure~\ref{f:int-sched} shows the code for \CFA, with results table \ref{tab:int-sched}.
+As with all other benchmarks, all omitted tests are functionally identical to one of these tests.
+The internal-scheduling benchmark measures the cost of waiting on and signalling a condition variable. Listing \ref{lst:int-sched} shows the code for \CFA, with results table \ref{tab:int-sched}. As with all other benchmarks, all omitted tests are functionally identical to one of these tests.
 \begin{figure}
 \begin{cfa}[caption={Benchmark code for internal scheduling},label={f:int-sched}]
+\begin{cfacode}[caption={Benchmark code for internal scheduling},label={lst:int-sched}]
 volatile int go = 0;
 condition c;
 …
         return do_wait(m1);
+}
 \end{cfa}
+\end{cfacode}
 \end{figure}
 …
 \hline
 Pthreads Condition Variable                     & 5902.5        & 6093.29       & 714.78 \\
 \uC @signal@                                    & 322           & 323   & 3.36   \\
 \CFA @signal@, 1 @monitor@      & 352.5 & 353.11        & 3.66   \\
 \CFA @signal@, 2 @monitor@      & 430           & 430.29        & 8.97   \\
 \CFA @signal@, 4 @monitor@      & 594.5 & 606.57        & 18.33  \\
 Java @notify@                           & 13831.5       & 15698.21      & 4782.3 \\
+\uC \code{signal}                                       & 322           & 323   & 3.36   \\
+\CFA \code{signal}, 1 \code{monitor}    & 352.5 & 353.11        & 3.66   \\
+\CFA \code{signal}, 2 \code{monitor}    & 430           & 430.29        & 8.97   \\
+\CFA \code{signal}, 4 \code{monitor}    & 594.5 & 606.57        & 18.33  \\
+Java \code{notify}                              & 13831.5       & 15698.21      & 4782.3 \\
 \hline
 \end{tabular}
 \end{center}
+\caption{Internal scheduling comparison.
+All numbers are in nanoseconds(\si{\nano\second})}
+\caption{Internal scheduling comparison. All numbers are in nanoseconds(\si{\nano\second})}
 \label{tab:int-sched}
 \end{table}
 \subsection{External Scheduling}
+The Internal scheduling benchmark measures the cost of the @waitfor@ statement (@_Accept@ in \uC).
+Figure~\ref{f:ext-sched} shows the code for \CFA, with results in table \ref{tab:ext-sched}.
+As with all other benchmarks, all omitted tests are functionally identical to one of these tests.
+The Internal scheduling benchmark measures the cost of the \code{waitfor} statement (\code{_Accept} in \uC). Listing \ref{lst:ext-sched} shows the code for \CFA, with results in table \ref{tab:ext-sched}. As with all other benchmarks, all omitted tests are functionally identical to one of these tests.
 \begin{figure}
 \begin{cfa}[caption={Benchmark code for external scheduling},label={f:ext-sched}]
+\begin{cfacode}[caption={Benchmark code for external scheduling},label={lst:ext-sched}]
 volatile int go = 0;
 monitor M {};
 …
         return do_wait(m1);
+}
 \end{cfa}
+\end{cfacode}
 \end{figure}
 …
 \multicolumn{1}{c |}{} & \multicolumn{1}{c |}{ Median } &\multicolumn{1}{c |}{ Average } & \multicolumn{1}{c |}{ Standard Deviation} \\
 \hline
 \uC @Accept@                                    & 350           & 350.61        & 3.11  \\
 \CFA @waitfor@, 1 @monitor@     & 358.5 & 358.36        & 3.82  \\
 \CFA @waitfor@, 2 @monitor@     & 422           & 426.79        & 7.95  \\
 \CFA @waitfor@, 4 @monitor@     & 579.5 & 585.46        & 11.25 \\
+\uC \code{Accept}                                       & 350           & 350.61        & 3.11  \\
+\CFA \code{waitfor}, 1 \code{monitor}   & 358.5 & 358.36        & 3.82  \\
+\CFA \code{waitfor}, 2 \code{monitor}   & 422           & 426.79        & 7.95  \\
+\CFA \code{waitfor}, 4 \code{monitor}   & 579.5 & 585.46        & 11.25 \\
 \hline
 \end{tabular}
 \end{center}
+\caption{External scheduling comparison.
+All numbers are in nanoseconds(\si{\nano\second})}
+\caption{External scheduling comparison. All numbers are in nanoseconds(\si{\nano\second})}
 \label{tab:ext-sched}
 \end{table}
 \subsection{Object Creation}
+Finally, the last benchmark measures the cost of creation for concurrent objects.
+Figure~\ref{f:creation} shows the code for @pthread@s and \CFA threads, with results shown in table \ref{tab:creation}.
+As with all other benchmarks, all omitted tests are functionally identical to one of these tests.
+The only note here is that the call stacks of \CFA coroutines are lazily created, therefore without priming the coroutine, the creation cost is very low.
+Finally, the last benchmark measures the cost of creation for concurrent objects. Listing \ref{lst:creation} shows the code for \texttt{pthread}s and \CFA threads, with results shown in table \ref{tab:creation}. As with all other benchmarks, all omitted tests are functionally identical to one of these tests. The only note here is that the call stacks of \CFA coroutines are lazily created, therefore without priming the coroutine, the creation cost is very low.
 \begin{figure}
 \begin{center}
+@pthread@
 \begin{cfa}
+\texttt{pthread}
+\begin{ccode}
 int main() {
         BENCH(
 …
         printf("%llu\n", result);
+}
 \end{cfa}
+\end{ccode}
 \CFA Threads
 \begin{cfa}
+\begin{cfacode}
 int main() {
         BENCH(
 …
         printf("%llu\n", result);
+}
 \end{cfa}
+\end{cfacode}
 \end{center}
 \caption{Benchmark code for \protect\lstinline|pthread|s and \CFA to measure object creation}
 \label{f:creation}
+\begin{cfacode}[caption={Benchmark code for \texttt{pthread}s and \CFA to measure object creation},label={lst:creation}]
+\end{cfacode}
 \end{figure}
 …
 \end{tabular}
 \end{center}
+\caption{Creation comparison.
+All numbers are in nanoseconds(\si{\nano\second}).}
+\caption{Creation comparison. All numbers are in nanoseconds(\si{\nano\second}).}
 \label{tab:creation}
 \end{table}
 …
 \section{Conclusion}
+This paper has achieved a minimal concurrency \textbf{api} that is simple, efficient and usable as the basis for higher-level features.
+The approach presented is based on a lightweight thread-system for parallelism, which sits on top of clusters of processors.
+This M:N model is judged to be both more efficient and allow more flexibility for users.
+Furthermore, this document introduces monitors as the main concurrency tool for users.
+This paper also offers a novel approach allowing multiple monitors to be accessed simultaneously without running into the Nested Monitor Problem~\cite{Lister77}.
+It also offers a full implementation of the concurrency runtime written entirely in \CFA, effectively the largest \CFA code base to date.
+This paper has achieved a minimal concurrency \textbf{api} that is simple, efficient and usable as the basis for higher-level features. The approach presented is based on a lightweight thread-system for parallelism, which sits on top of clusters of processors. This M:N model is judged to be both more efficient and allow more flexibility for users. Furthermore, this document introduces monitors as the main concurrency tool for users. This paper also offers a novel approach allowing multiple monitors to be accessed simultaneously without running into the Nested Monitor Problem~\cite{Lister77}. It also offers a full implementation of the concurrency runtime written entirely in \CFA, effectively the largest \CFA code base to date.
 …
 \subsection{Performance} \label{futur:perf}
+This paper presents a first implementation of the \CFA concurrency runtime.
+Therefore, there is still significant work to improve performance.
+Many of the data structures and algorithms may change in the future to more efficient versions.
+For example, the number of monitors in a single \textbf{bulk-acq} is only bound by the stack size, this is probably unnecessarily generous.
+It may be possible that limiting the number helps increase performance.
+However, it is not obvious that the benefit would be significant.
+This paper presents a first implementation of the \CFA concurrency runtime. Therefore, there is still significant work to improve performance. Many of the data structures and algorithms may change in the future to more efficient versions. For example, the number of monitors in a single \textbf{bulk-acq} is only bound by the stack size, this is probably unnecessarily generous. It may be possible that limiting the number helps increase performance. However, it is not obvious that the benefit would be significant.
 \subsection{Flexible Scheduling} \label{futur:sched}
+An important part of concurrency is scheduling.
+Different scheduling algorithms can affect performance (both in terms of average and variation).
+However, no single scheduler is optimal for all workloads and therefore there is value in being able to change the scheduler for given programs.
+One solution is to offer various tweaking options to users, allowing the scheduler to be adjusted to the requirements of the workload.
+However, in order to be truly flexible, it would be interesting to allow users to add arbitrary data and arbitrary scheduling algorithms.
+For example, a web server could attach Type-of-Service information to threads and have a ``ToS aware'' scheduling algorithm tailored to this specific web server.
+This path of flexible schedulers will be explored for \CFA.
+An important part of concurrency is scheduling. Different scheduling algorithms can affect performance (both in terms of average and variation). However, no single scheduler is optimal for all workloads and therefore there is value in being able to change the scheduler for given programs. One solution is to offer various tweaking options to users, allowing the scheduler to be adjusted to the requirements of the workload. However, in order to be truly flexible, it would be interesting to allow users to add arbitrary data and arbitrary scheduling algorithms. For example, a web server could attach Type-of-Service information to threads and have a ``ToS aware'' scheduling algorithm tailored to this specific web server. This path of flexible schedulers will be explored for \CFA.
 \subsection{Non-Blocking I/O} \label{futur:nbio}
+While most of the parallelism tools are aimed at data parallelism and control-flow parallelism, many modern workloads are not bound on computation but on IO operations, a common case being web servers and XaaS (anything as a service).
+These types of workloads often require significant engineering around amortizing costs of blocking IO operations.
+At its core, non-blocking I/O is an operating system level feature that allows queuing IO operations (\eg network operations) and registering for notifications instead of waiting for requests to complete.
+In this context, the role of the language makes Non-Blocking IO easily available and with low overhead.
+The current trend is to use asynchronous programming using tools like callbacks and/or futures and promises, which can be seen in frameworks like Node.js~\cite{NodeJs} for JavaScript, Spring MVC~\cite{SpringMVC} for Java and Django~\cite{Django} for Python.
+However, while these are valid solutions, they lead to code that is harder to read and maintain because it is much less linear.
+While most of the parallelism tools are aimed at data parallelism and control-flow parallelism, many modern workloads are not bound on computation but on IO operations, a common case being web servers and XaaS (anything as a service). These types of workloads often require significant engineering around amortizing costs of blocking IO operations. At its core, non-blocking I/O is an operating system level feature that allows queuing IO operations (e.g., network operations) and registering for notifications instead of waiting for requests to complete. In this context, the role of the language makes Non-Blocking IO easily available and with low overhead. The current trend is to use asynchronous programming using tools like callbacks and/or futures and promises, which can be seen in frameworks like Node.js~\cite{NodeJs} for JavaScript, Spring MVC~\cite{SpringMVC} for Java and Django~\cite{Django} for Python. However, while these are valid solutions, they lead to code that is harder to read and maintain because it is much less linear.
 \subsection{Other Concurrency Tools} \label{futur:tools}
+While monitors offer a flexible and powerful concurrent core for \CFA, other concurrency tools are also necessary for a complete multi-paradigm concurrency package.
+Examples of such tools can include simple locks and condition variables, futures and promises~\cite{promises}, executors and actors.
+These additional features are useful when monitors offer a level of abstraction that is inadequate for certain tasks.
+While monitors offer a flexible and powerful concurrent core for \CFA, other concurrency tools are also necessary for a complete multi-paradigm concurrency package. Examples of such tools can include simple locks and condition variables, futures and promises~\cite{promises}, executors and actors. These additional features are useful when monitors offer a level of abstraction that is inadequate for certain tasks.
 \subsection{Implicit Threading} \label{futur:implcit}
+Simpler applications can benefit greatly from having implicit parallelism.
+That is, parallelism that does not rely on the user to write concurrency.
+This type of parallelism can be achieved both at the language level and at the library level.
+The canonical example of implicit parallelism is parallel for loops, which are the simplest example of a divide and conquer algorithms~\cite{uC++book}.
+Table \ref{f:parfor} shows three different code examples that accomplish point-wise sums of large arrays.
+Note that none of these examples explicitly declare any concurrency or parallelism objects.
+Simpler applications can benefit greatly from having implicit parallelism. That is, parallelism that does not rely on the user to write concurrency. This type of parallelism can be achieved both at the language level and at the library level. The canonical example of implicit parallelism is parallel for loops, which are the simplest example of a divide and conquer algorithms~\cite{uC++book}. Table \ref{lst:parfor} shows three different code examples that accomplish point-wise sums of large arrays. Note that none of these examples explicitly declare any concurrency or parallelism objects.
 \begin{table}
 …
 \begin{tabular}[t]{|c|c|c|}
 Sequential & Library Parallel & Language Parallel \\
 \begin{cfa}[tabsize=3]
+\begin{cfacode}[tabsize=3]
 void big_sum(
         int* a, int* b,
 …
 //... fill in a & b
 big_sum(a,b,c,10000);
 \end{cfa} &\begin{cfa}[tabsize=3]
+\end{cfacode} &\begin{cfacode}[tabsize=3]
 void big_sum(
         int* a, int* b,
 …
 //... fill in a & b
 big_sum(a,b,c,10000);
 \end{cfa}&\begin{cfa}[tabsize=3]
+\end{cfacode}&\begin{cfacode}[tabsize=3]
 void big_sum(
         int* a, int* b,
 …
 //... fill in a & b
 big_sum(a,b,c,10000);
 \end{cfa}
+\end{cfacode}
 \end{tabular}
 \end{center}
 \caption{For loop to sum numbers: Sequential, using library parallelism and language parallelism.}
 \label{f:parfor}
+\label{lst:parfor}
 \end{table}
+Implicit parallelism is a restrictive solution and therefore has its limitations.
+However, it is a quick and simple approach to parallelism, which may very well be sufficient for smaller applications and reduces the amount of boilerplate needed to start benefiting from parallelism in modern CPUs.
+Implicit parallelism is a restrictive solution and therefore has its limitations. However, it is a quick and simple approach to parallelism, which may very well be sufficient for smaller applications and reduces the amount of boilerplate needed to start benefiting from parallelism in modern CPUs.
 …
 % B I B L I O G R A P H Y
 % -----------------------------
 %\bibliographystyle{plain}
+\bibliographystyle{plain}
 \bibliography{pl,local}

doc/papers/concurrency/annex/local.bib

-              r32cab5b
+              rb2fe1c9
 @string{pldi="Programming Language Design and Implementation"}
+@inproceedings{Hochstein05,
+    keywords    = {Application software; Computer aided software engineering; Concurrent computing; Educational
+                  institutions; High performance computing; Humans; Instruments; Productivity; Programming profession;
+                  Software engineering},
+    author      = {Lorin Hochstein and Jeff Carver and Forrest Shull and Sima Asgari and Victor Basili and Jeffrey K. Hollingsworth and Marvin V. Zelkowitz},
+    title       = {Parallel Programmer Productivity: A Case Study of Novice Parallel Programmers},
+    booktitle   = {Supercomputing, 2005. Proceedings of the ACM/IEEE SC 2005 Conference},
+    publisher   = {IEEE},
+    year        = {2005},
+    pages       = {35-35},
+    month       = nov,
+@article{HPP:Study,
+        keywords        = {Parallel, Productivity},
+        author  = {Lorin Hochstein and Jeff Carver and Forrest Shull and Sima Asgari and Victor Basili and Jeffrey K. Hollingsworth and Marvin V. Zelkowitz },
+        title   = {Parallel Programmer Productivity: A Case Study of Novice Parallel Programmers},
+}
 …
+}
+@misc{TBB,
+    keywords    = {Intel, TBB},
+    key         = {TBB},
+    title       = {Thread Building Blocks},
+    howpublished= {Intel, \url{https://www.threadingbuildingblocks.org}},
+    note        = {Accessed: 2018-3},
+@article{TBB,
+        key     = {TBB},
+        keywords        = {Intel, TBB},
+        title   = {Intel Thread Building Blocks},
+        note            = "\url{https://www.threadingbuildingblocks.org/}"
+}
 …
         title   = {C$\forall$ Programmming Language},
         note    = {\url{https://plg.uwaterloo.ca/~cforall}},
+}
+@mastersthesis{rob-thesis,
+        keywords        = {Constructors, Destructors, Tuples},
+        author  = {Rob Schluntz},
+        title   = {Resource Management and Tuples in Cforall},
+        year            = 2017,
+        school  = {University of Waterloo},
+        note    = {\url{https://uwspace.uwaterloo.ca/handle/10012/11830}},
+}

doc/papers/concurrency/style/cfa-format.tex

-              r32cab5b
+              rb2fe1c9
 %\usepackage[usenames,dvipsnames]{xcolor}
+\usepackage[usenames,dvipsnames]{xcolor}
 \usepackage{listings}
 \usepackage{inconsolata}
 …
 % from https://gist.github.com/nikolajquorning/92bbbeef32e1dd80105c9bf2daceb89a
 \lstdefinelanguage{sml} {
+        morekeywords= {
+                EQUAL, GREATER, LESS, NONE, SOME, abstraction, abstype, and, andalso, array, as, before,
+                bool, case, char, datatype, do, else, end, eqtype, exception, exn, false, fn, fun, functor,
+                handle, if, in, include, infix, infixr, int, let, list, local, nil, nonfix, not, o, of, op,
+                open, option, orelse, overload, print, raise, real, rec, ref, sharing, sig, signature,
+                string, struct, structure, substring, then, true, type, unit, val, vector, where, while,
+                with, withtype, word
+    },
+    morestring=[b]",
+    morecomment=[s]{(*}{*)},
+  morekeywords= {
+    EQUAL, GREATER, LESS, NONE, SOME, abstraction, abstype, and, andalso, array, as, before, bool, case, char, datatype, do, else, end, eqtype, exception, exn, false, fn, fun, functor, handle, if, in, include, infix, infixr, int, let, list, local, nil, nonfix, not, o, of, op, open, option, orelse, overload, print, raise, real, rec, ref, sharing, sig, signature, string, struct, structure, substring, then, true, type, unit, val, vector, where, while, with, withtype, word
+  },
+  morestring=[b]",
+  morecomment=[s]{(*}{*)},
+}
 \lstdefinelanguage{D}{
+        % Keywords
+        morekeywords=[1]{
+                abstract, alias, align, auto, body, break, cast, catch, class, const, continue, debug,
+                delegate, delete, deprecated, do, else, enum, export, false, final, finally, for, foreach,
+                foreach_reverse, function, goto, if, immutable, import, in, inout, interface, invariant, is,
+                lazy, macro, mixin, module, new, nothrow, null, out, override, package, pragma, private,
+                protected, public, pure, ref, return, shared, static, struct, super, switch, synchronized,
+                template, this, throw, true, try, typedef, typeid, typeof, union, unittest, volatile, while,
+                with
+        },
+        % Special identifiers, common functions
+        morekeywords=[2]{enforce},
+        % Ugly identifiers
+        morekeywords=[3]{
+                __DATE__, __EOF__, __FILE__, __LINE__, __TIMESTAMP__, __TIME__, __VENDOR__,
+                __VERSION__, __ctfe, __gshared, __monitor, __thread, __vptr, _argptr,
+                _arguments, _ctor, _dtor
+        },
+        % Basic types
+        morekeywords=[4]{
+                byte, ubyte, short, ushort, int, uint, long, ulong, cent, ucent, void, bool, bit, float,
+                double, real, ushort, int, uint, long, ulong, float, char, wchar, dchar, string, wstring,
+                dstring, ireal, ifloat, idouble, creal, cfloat, cdouble, size_t, ptrdiff_t, sizediff_t,
+                equals_t, hash_t
+        },
+        % Strings
+        morestring=[b]{"},
+        morestring=[b]{'},
+        morestring=[b]{`},
+        % Comments
+        comment=[l]{//},
+        morecomment=[s]{/*}{*/},
+        morecomment=[s][\color{blue}]{/**}{*/},
+        morecomment=[n]{/+}{+/},
+        morecomment=[n][\color{blue}]{/++}{+/},
+        % Options
+        sensitive=true
+  % Keywords
+  morekeywords=[1]{
+    abstract, alias, align, auto, body, break, cast, catch, class, const,
+    continue, debug, delegate, delete, deprecated, do, else, enum, export,
+    false, final, finally, for, foreach, foreach_reverse, function, goto, if,
+    immutable, import, in, inout, interface, invariant, is, lazy, macro, mixin,
+    module, new, nothrow, null, out, override, package, pragma, private,
+    protected, public, pure, ref, return, shared, static, struct, super,
+    switch, synchronized, template, this, throw, true, try, typedef, typeid,
+    typeof, union, unittest, volatile, while, with
+  },
+  % Special identifiers, common functions
+  morekeywords=[2]{enforce},
+  % Ugly identifiers
+  morekeywords=[3]{
+    __DATE__, __EOF__, __FILE__, __LINE__, __TIMESTAMP__, __TIME__, __VENDOR__,
+    __VERSION__, __ctfe, __gshared, __monitor, __thread, __vptr, _argptr,
+    _arguments, _ctor, _dtor
+  },
+  % Basic types
+  morekeywords=[4]{
+     byte, ubyte, short, ushort, int, uint, long, ulong, cent, ucent, void,
+     bool, bit, float, double, real, ushort, int, uint, long, ulong, float,
+     char, wchar, dchar, string, wstring, dstring, ireal, ifloat, idouble,
+     creal, cfloat, cdouble, size_t, ptrdiff_t, sizediff_t, equals_t, hash_t
+  },
+  % Strings
+  morestring=[b]{"},
+  morestring=[b]{'},
+  morestring=[b]{`},
+  % Comments
+  comment=[l]{//},
+  morecomment=[s]{/*}{*/},
+  morecomment=[s][\color{blue}]{/**}{*/},
+  morecomment=[n]{/+}{+/},
+  morecomment=[n][\color{blue}]{/++}{+/},
+  % Options
+  sensitive=true
+}
 \lstdefinelanguage{rust}{
+        % Keywords
+        morekeywords=[1]{
+                abstract, alignof, as, become, box, break, const, continue, crate, do, else, enum, extern,
+                false, final, fn, for, if, impl, in, let, loop, macro, match, mod, move, mut, offsetof,
+                override, priv, proc, pub, pure, ref, return, Self, self, sizeof, static, struct, super,
+                trait, true, type, typeof, unsafe, unsized, use, virtual, where, while, yield
+        },
+        % Strings
+        morestring=[b]{"},
+        % Comments
+        comment=[l]{//},
+        morecomment=[s]{/*}{*/},
+        % Options
+        sensitive=true
+  % Keywords
+  morekeywords=[1]{
+    abstract, alignof, as, become, box,
+    break, const, continue, crate, do,
+    else, enum, extern, false, final,
+    fn, for, if, impl, in,
+    let, loop, macro, match, mod,
+    move, mut, offsetof, override, priv,
+    proc, pub, pure, ref, return,
+    Self, self, sizeof, static, struct,
+    super, trait, true,  type, typeof,
+    unsafe, unsized, use, virtual, where,
+    while, yield
+  },
+  % Strings
+  morestring=[b]{"},
+  % Comments
+  comment=[l]{//},
+  morecomment=[s]{/*}{*/},
+  % Options
+  sensitive=true
+}
 \lstdefinelanguage{pseudo}{
         morekeywords={string,uint,int,bool,float},
         sensitive=true,
         morecomment=[l]{//},
         morecomment=[s]{/*}{*/},
         morestring=[b]',
         morestring=[b]",
         morestring=[s]{`}{`},
+}
+        morekeywords={string,uint,int,bool,float},%
+        sensitive=true,%
+        morecomment=[l]{//},%
+        morecomment=[s]{/*}{*/},%
+        morestring=[b]',%
+        morestring=[b]",%
+        morestring=[s]{`}{`},%
+}%
 \newcommand{\KWC}{K-W C\xspace}
 \lstdefinestyle{pseudoStyle}{
         escapeinside={@@},
         basicstyle=\linespread{0.9}\sf\footnotesize,            % reduce line spacing and use typewriter font
         keywordstyle=\bfseries\color{blue},
         keywordstyle=[2]\bfseries\color{Plum},
         commentstyle=\itshape\color{OliveGreen},                    % green and italic comments
         identifierstyle=\color{identifierCol},
         stringstyle=\sf\color{Mahogany},                                          % use sanserif font
         mathescape=true,
         columns=fixed,
         aboveskip=4pt,                                                            % spacing above/below code block
         belowskip=3pt,
         keepspaces=true,
         tabsize=4,
         % frame=lines,
         literate=,
         showlines=true,                                                          % show blank lines at end of code
         showspaces=false,
         showstringspaces=false,
         escapechar=\$,
         xleftmargin=\parindentlnth,                                  % indent code to paragraph indentation
         moredelim=[is][\color{red}\bfseries]{**R**}{**R**},    % red highlighting
         % moredelim=* detects keywords, comments, strings, and other delimiters and applies their formatting
         % moredelim=** allows cumulative application
+  escapeinside={@@},
+  basicstyle=\linespread{0.9}\sf\footnotesize,          % reduce line spacing and use typewriter font
+  keywordstyle=\bfseries\color{blue},
+  keywordstyle=[2]\bfseries\color{Plum},
+  commentstyle=\itshape\color{OliveGreen},                  % green and italic comments
+  identifierstyle=\color{identifierCol},
+  stringstyle=\sf\color{Mahogany},                                % use sanserif font
+  mathescape=true,
+  columns=fixed,
+  aboveskip=4pt,                                  % spacing above/below code block
+  belowskip=3pt,
+  keepspaces=true,
+  tabsize=4,
+  % frame=lines,
+  literate=,
+  showlines=true,                                 % show blank lines at end of code
+  showspaces=false,
+  showstringspaces=false,
+  escapechar=\$,
+  xleftmargin=\parindentlnth,                     % indent code to paragraph indentation
+  moredelim=[is][\color{red}\bfseries]{**R**}{**R**},    % red highlighting
+  % moredelim=* detects keywords, comments, strings, and other delimiters and applies their formatting
+  % moredelim=** allows cumulative application
+}
 \lstdefinestyle{defaultStyle}{
         escapeinside={@@},
         basicstyle=\linespread{0.9}\tt\footnotesize,            % reduce line spacing and use typewriter font
         keywordstyle=\bfseries\color{blue},
         keywordstyle=[2]\bfseries\color{Plum},
         commentstyle=\itshape\color{OliveGreen},                    % green and italic comments
         identifierstyle=\color{identifierCol},
         stringstyle=\sf\color{Mahogany},                                          % use sanserif font
         mathescape=true,
         columns=fixed,
         aboveskip=4pt,                                                            % spacing above/below code block
         belowskip=3pt,
         keepspaces=true,
         tabsize=4,
         % frame=lines,
         literate=,
         showlines=true,                                                          % show blank lines at end of code
         showspaces=false,
         showstringspaces=false,
         escapechar=\$,
         xleftmargin=\parindentlnth,                                  % indent code to paragraph indentation
         moredelim=[is][\color{red}\bfseries]{**R**}{**R**},    % red highlighting
         % moredelim=* detects keywords, comments, strings, and other delimiters and applies their formatting
         % moredelim=** allows cumulative application
+  escapeinside={@@},
+  basicstyle=\linespread{0.9}\tt\footnotesize,          % reduce line spacing and use typewriter font
+  keywordstyle=\bfseries\color{blue},
+  keywordstyle=[2]\bfseries\color{Plum},
+  commentstyle=\itshape\color{OliveGreen},                  % green and italic comments
+  identifierstyle=\color{identifierCol},
+  stringstyle=\sf\color{Mahogany},                                % use sanserif font
+  mathescape=true,
+  columns=fixed,
+  aboveskip=4pt,                                  % spacing above/below code block
+  belowskip=3pt,
+  keepspaces=true,
+  tabsize=4,
+  % frame=lines,
+  literate=,
+  showlines=true,                                 % show blank lines at end of code
+  showspaces=false,
+  showstringspaces=false,
+  escapechar=\$,
+  xleftmargin=\parindentlnth,                     % indent code to paragraph indentation
+  moredelim=[is][\color{red}\bfseries]{**R**}{**R**},    % red highlighting
+  % moredelim=* detects keywords, comments, strings, and other delimiters and applies their formatting
+  % moredelim=** allows cumulative application
+}
 \lstdefinestyle{cfaStyle}{
+        escapeinside={@@},
+        basicstyle=\linespread{0.9}\sf,         % reduce line spacing and use typewriter font
+%  keywordstyle=\bfseries\color{blue},
+        keywordstyle=[2]\bfseries\color{red},
+%  commentstyle=\sf\itshape\color{OliveGreen},            % green and italic comments
+        identifierstyle=\color{identifierCol},
+%  stringstyle=\sf\color{Mahogany},                                       % use sanserif font
+        stringstyle=\tt,                                                                                % use typewriter font
+        mathescape=true,
+        columns=fixed,
+        aboveskip=4pt,                                                            % spacing above/below code block
+        belowskip=3pt,
+        keepspaces=true,
+        tabsize=4,
+        % frame=lines,
+        literate=,
+        showlines=true,                                                          % show blank lines at end of code
+        showspaces=false,
+        showstringspaces=false,
+        escapechar=\$,
+        xleftmargin=\parindentlnth,                                  % indent code to paragraph indentation
+        moredelim=[is][\color{red}\bfseries]{**R**}{**R**},    % red highlighting
+        morekeywords=[2]{accept, signal, signal_block, wait, waitfor},
+  escapeinside={@@},
+  basicstyle=\linespread{0.9}\tt\footnotesize,          % reduce line spacing and use typewriter font
+  keywordstyle=\bfseries\color{blue},
+  keywordstyle=[2]\bfseries\color{Plum},
+  commentstyle=\sf\itshape\color{OliveGreen},             % green and italic comments
+  identifierstyle=\color{identifierCol},
+  stringstyle=\sf\color{Mahogany},                                % use sanserif font
+  mathescape=true,
+  columns=fixed,
+  aboveskip=4pt,                                  % spacing above/below code block
+  belowskip=3pt,
+  keepspaces=true,
+  tabsize=4,
+  % frame=lines,
+  literate=,
+  showlines=true,                                 % show blank lines at end of code
+  showspaces=false,
+  showstringspaces=false,
+  escapechar=\$,
+  xleftmargin=\parindentlnth,                     % indent code to paragraph indentation
+  moredelim=[is][\color{red}\bfseries]{**R**}{**R**},    % red highlighting
+  morekeywords=[2]{accept, signal, signal_block, wait, waitfor},
+}
 …
 \lstnewenvironment{ccode}[1][]{
         \lstset{
                 language = C,
                 style=defaultStyle,
                 captionpos=b,
                 #1
+        }
+  \lstset{
+    language = C,
+    style=defaultStyle,
+    captionpos=b,
+    #1
+  }
 }{}
 \lstnewenvironment{cfacode}[1][]{
         \lstset{
                 language = CFA,
                 style=cfaStyle,
                 captionpos=b,
                 #1
+        }
+  \lstset{
+    language = CFA,
+    style=cfaStyle,
+    captionpos=b,
+    #1
+  }
 }{}
 \lstnewenvironment{pseudo}[1][]{
         \lstset{
                 language = pseudo,
                 style=pseudoStyle,
                 captionpos=b,
                 #1
+        }
+  \lstset{
+    language = pseudo,
+    style=pseudoStyle,
+    captionpos=b,
+    #1
+  }
 }{}
 \lstnewenvironment{cppcode}[1][]{
         \lstset{
                 language = c++,
                 style=defaultStyle,
                 captionpos=b,
                 #1
+        }
+  \lstset{
+    language = c++,
+    style=defaultStyle,
+    captionpos=b,
+    #1
+  }
 }{}
 \lstnewenvironment{ucppcode}[1][]{
         \lstset{
                 language = c++,
                 style=defaultStyle,
                 captionpos=b,
                 #1
+        }
+  \lstset{
+    language = c++,
+    style=defaultStyle,
+    captionpos=b,
+    #1
+  }
 }{}
 \lstnewenvironment{javacode}[1][]{
         \lstset{
                 language = java,
                 style=defaultStyle,
                 captionpos=b,
                 #1
+        }
+  \lstset{
+    language = java,
+    style=defaultStyle,
+    captionpos=b,
+    #1
+  }
 }{}
 \lstnewenvironment{scalacode}[1][]{
         \lstset{
                 language = scala,
                 style=defaultStyle,
                 captionpos=b,
                 #1
+        }
+  \lstset{
+    language = scala,
+    style=defaultStyle,
+    captionpos=b,
+    #1
+  }
 }{}
 \lstnewenvironment{smlcode}[1][]{
         \lstset{
                 language = sml,
                 style=defaultStyle,
                 captionpos=b,
                 #1
+        }
+  \lstset{
+    language = sml,
+    style=defaultStyle,
+    captionpos=b,
+    #1
+  }
 }{}
 \lstnewenvironment{dcode}[1][]{
         \lstset{
                 language = D,
                 style=defaultStyle,
                 captionpos=b,
                 #1
+        }
+  \lstset{
+    language = D,
+    style=defaultStyle,
+    captionpos=b,
+    #1
+  }
 }{}
 \lstnewenvironment{rustcode}[1][]{
         \lstset{
                 language = rust,
                 style=defaultStyle,
                 captionpos=b,
                 #1
+        }
+  \lstset{
+    language = rust,
+    style=defaultStyle,
+    captionpos=b,
+    #1
+  }
 }{}
 \lstnewenvironment{gocode}[1][]{
         \lstset{
                 language = Golang,
                 style=defaultStyle,
                 captionpos=b,
                 #1
+        }
+  \lstset{
+    language = Golang,
+    style=defaultStyle,
+    captionpos=b,
+    #1
+  }
 }{}
 …
 \newcommand{\code}[1]{\lstinline[language=CFA,style=cfaStyle]{#1}}
 \newcommand{\pscode}[1]{\lstinline[language=pseudo,style=pseudoStyle]{#1}}
-% Local Variables: %
-% tab-width: 4 %
-% fill-column: 100 %
-% End: %

doc/papers/general/.gitignore

-              r32cab5b
+              rb2fe1c9
 *.pdf
 *.ps
-Paper.tex.plain
-mail
-Paper.out.ps
-WileyNJD-AMA.bst

doc/papers/general/Makefile

-              r32cab5b
+              rb2fe1c9
 Build = build
 Figures = figures
 Macros = AMA/AMA-stix/ama
+Macros = ../../LaTeXmacros
 TeXLIB = .:${Macros}:${Build}:../../bibliography:
 LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build}
 BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex
 MAKEFLAGS = --no-print-directory # --silent
+MAKEFLAGS = --no-print-directory --silent #
 VPATH = ${Build} ${Figures} evaluation
 …
 DOCUMENT = Paper.pdf
-BASE = ${basename ${DOCUMENT}}
 # Directives #
 …
 clean :
         @rm -frv ${DOCUMENT} ${BASE}.ps WileyNJD-AMA.bst ${BASE}.out.ps ${Build}
+        @rm -frv ${DOCUMENT} ${basename ${DOCUMENT}}.ps ${Build}
 # File Dependencies #
 ${DOCUMENT} : ${BASE}.ps
+${DOCUMENT} : ${basename ${DOCUMENT}}.ps
         ps2pdf $<
 ${BASE}.ps : ${BASE}.dvi
+${basename ${DOCUMENT}}.ps : ${basename ${DOCUMENT}}.dvi
         dvips ${Build}/$< -o $@
 ${BASE}.dvi : Makefile ${Build} ${BASE}.out.ps WileyNJD-AMA.bst ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
                 ../../bibliography/pl.bib
+${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
+                ${Macros}/common.tex ${Macros}/indexstyle ../../bibliography/pl.bib
         # Must have *.aux file containing citations for bibtex
         if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename $@}.tex ; fi
         ${BibTeX} ${Build}/${basename $@}
+        -${BibTeX} ${Build}/${basename $@}
         # Some citations reference others so run again to resolve these citations
         ${LaTeX} ${basename $@}.tex
         ${BibTeX} ${Build}/${basename $@}
+        -${BibTeX} ${Build}/${basename $@}
         # Run again to finish citations
         ${LaTeX} ${basename $@}.tex
 …
 ${Build}:
         mkdir -p ${Build}
-${BASE}.out.ps:
-        ln -fs build/Paper.out.ps .
-WileyNJD-AMA.bst:
-        ln -fs AMA/AMA-stix/ama/WileyNJD-AMA.bst .
 ${GRAPHS} : timing.gp timing.dat

doc/papers/general/Paper.tex

-              r32cab5b
+              rb2fe1c9
+\documentclass[AMA,STIX1COL]{WileyNJD-v2}
+\articletype{RESEARCH ARTICLE}%
+\received{26 April 2016}
+\revised{6 June 2016}
+\accepted{6 June 2016}
+\raggedbottom
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Latex packages used in the document.
+\documentclass{article}
+\usepackage{fullpage}
 \usepackage{epic,eepic}
+\usepackage{xspace}
+\usepackage{comment}
+\usepackage{xspace,calc,comment}
 \usepackage{upquote}                                            % switch curled `'" to straight
 \usepackage{listings}                                           % format program code
+%\usepackage{enumitem}
+%\setlist[itemize]{topsep=3pt,itemsep=2pt,parsep=0pt}% global
+%\usepackage{rotating}
+\hypersetup{breaklinks=true}
+\definecolor{ForestGreen}{cmyk}{1, 0, 0.99995, 0}
+\usepackage[pagewise]{lineno}
+\renewcommand{\linenumberfont}{\scriptsize\sffamily}
+\usepackage{enumitem}
+\setlist[itemize]{topsep=3pt,itemsep=2pt,parsep=0pt}% global
+\usepackage[flushmargin]{footmisc}                      % support label/reference in footnote
+\usepackage{rotating}
+\usepackage[usenames]{color}
+\usepackage{pslatex}                                            % reduce size of san serif font
+\usepackage[plainpages=false,pdfpagelabels,pdfpagemode=UseNone,pagebackref=true,breaklinks=true,colorlinks=true,linkcolor=blue,citecolor=blue,urlcolor=blue]{hyperref}
+\urlstyle{sf}
+\usepackage{breakurl}
+\setlength{\textheight}{9in}
+%\oddsidemargin 0.0in
+\renewcommand{\topfraction}{0.8}                        % float must be greater than X of the page before it is forced onto its own page
+\renewcommand{\bottomfraction}{0.8}                     % float must be greater than X of the page before it is forced onto its own page
+\renewcommand{\floatpagefraction}{0.8}          % float must be greater than X of the page before it is forced onto its own page
+\renewcommand{\textfraction}{0.0}                       % the entire page maybe devoted to floats with no text on the page at all
 \lefthyphenmin=4                                                        % hyphen only after 4 characters
 \righthyphenmin=4
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Names used in the document.
 …
 \newlength{\gcolumnposn}                                        % temporary hack because lstlisting does not handle tabs correctly
 \newlength{\columnposn}
 \setlength{\gcolumnposn}{3.5in}
+\setlength{\gcolumnposn}{2.75in}
 \setlength{\columnposn}{\gcolumnposn}
 \newcommand{\C}[2][\@empty]{\ifx#1\@empty\else\global\setlength{\columnposn}{#1}\global\columnposn=\columnposn\fi\hfill\makebox[\textwidth-\columnposn][l]{\lst@basicstyle{\LstCommentStyle{#2}}}}
 …
 }%
 \newcommand{\ETAL}{\abbrevFont{et}~\abbrevFont{al}}
 \renewcommand*{\etal}{%
+\newcommand*{\etal}{%
         \@ifnextchar{.}{\protect\ETAL}%
                 {\protect\ETAL.\xspace}%
 …
 belowskip=3pt,
 % replace/adjust listing characters that look bad in sanserif
 literate={-}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.8ex}{0.1ex}}}}1 {^}{\raisebox{0.6ex}{$\scriptstyle\land\,$}}1
         {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 % {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1
         {<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2 {->}{\makebox[1ex][c]{\raisebox{0.5ex}{\rule{0.8ex}{0.075ex}}}\kern-0.2ex{\textgreater}}2,
+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 {@}{\small{@}}1 % {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1
+        {<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2 {->}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.8ex}{0.075ex}}}\kern-0.2ex\textgreater}2,
 moredelim=**[is][\color{red}]{`}{`},
 }% lstset
+% inline code @...@
+\lstMakeShortInline@%
 \lstnewenvironment{cfa}[1][]
 …
 {}
+% inline code @...@
+\lstMakeShortInline@%
+\title{\texorpdfstring{\protect\CFA : Adding Modern Programming Language Features to C}{Cforall : Adding Modern Programming Language Features to C}}
+\author[1]{Aaron Moss}
+\author[1]{Robert Schluntz}
+\author[1]{Peter A. Buhr*}
+\authormark{Aaron Moss \textsc{et al}}
+\address[1]{\orgdiv{David R. Cheriton School of Computer Science}, \orgname{University of Waterloo}, \orgaddress{\state{Ontario}, \country{Canada}}}
+\corres{*Peter A. Buhr, \email{pabuhr{\char`\@}uwaterloo.ca}}
+\presentaddress{David R. Cheriton School of Computer Science, University of Waterloo, Waterloo, ON, N2L 3G1, Canada}
+\abstract[Summary]{
+\title{\protect\CFA : Adding Modern Programming Language Features to C}
+\author{Aaron Moss, Robert Schluntz, Peter Buhr}
+% \email{a3moss@uwaterloo.ca}
+% \email{rschlunt@uwaterloo.ca}
+% \email{pabuhr@uwaterloo.ca}
+% \affiliation{%
+%       \institution{University of Waterloo}
+%       \department{David R. Cheriton School of Computer Science}
+%       \streetaddress{Davis Centre, University of Waterloo}
+%       \city{Waterloo}
+%       \state{ON}
+%       \postcode{N2L 3G1}
+%       \country{Canada}
+% }
+%\terms{generic, tuple, variadic, types}
+%\keywords{generic types, tuple types, variadic types, polymorphic functions, C, Cforall}
+\begin{document}
+\maketitle
+\begin{abstract}
 The C programming language is a foundational technology for modern computing with millions of lines of code implementing everything from commercial operating-systems to hobby projects.
 This installation base and the programmers producing it represent a massive software-engineering investment spanning decades and likely to continue for decades more.
 …
 This paper presents a quick tour of \CFA features showing how their design avoids shortcomings of similar features in C and other C-like languages.
 Finally, experimental results are presented to validate several of the new features.
+}%
+\keywords{generic types, tuple types, variadic types, polymorphic functions, C, Cforall}
+\begin{document}
+\linenumbers                                            % comment out to turn off line numbering
+\maketitle
+\end{abstract}
 …
 Love it or hate it, C is extremely popular, highly used, and one of the few systems languages.
 In many cases, \CC is often used solely as a better C.
 Nevertheless, C, first standardized over thirty years ago, lacks many features that make programming in more modern languages safer and more productive.
+Nonetheless, C, first standardized over thirty years ago, lacks many features that make programming in more modern languages safer and more productive.
 \CFA (pronounced ``C-for-all'', and written \CFA or Cforall) is an evolutionary extension of the C programming language that aims to add modern language features to C while maintaining both source compatibility with C and a familiar programming model for programmers.
 …
 \CFA is currently implemented as a source-to-source translator from \CFA to the gcc-dialect of C~\cite{GCCExtensions}, allowing it to leverage the portability and code optimizations provided by gcc, meeting goals (1)--(3).
 Ultimately, a compiler is necessary for advanced features and optimal performance.
 All features discussed in this paper are working, unless otherwise stated as under construction.
+All of the features discussed in this paper are working, unless a feature states it is a future feature for completion.
 Finally, it is impossible to describe a programming language without usages before definitions.
 …
 \begin{cfa}
 int max = 2147483647;                                   $\C[4in]{// (1)}$
+int max = 2147483647;                                           $\C[3.75in]{// (1)}$
 double max = 1.7976931348623157E+308;   $\C{// (2)}$
 int max( int a, int b ) { return a < b ? b : a; }  $\C{// (3)}$
 double max( double a, double b ) { return a < b ? b : a; }  $\C{// (4)}\CRT$
 max( 7, -max );                                         $\C[2.75in]{// uses (3) and (1), by matching int from constant 7}$
 max( max, 3.14 );                                       $\C{// uses (4) and (2), by matching double from constant 3.14}$
 max( max, -max );                                       $\C{// ERROR: ambiguous}$
 int m = max( max, -max );                       $\C{// uses (3) and (1) twice, by matching return type}\CRT$
+max( 7, -max );                                                         $\C{// uses (3) and (1), by matching int from constant 7}$
+max( max, 3.14 );                                                       $\C{// uses (4) and (2), by matching double from constant 3.14}$
+max( max, -max );                                                       $\C{// ERROR: ambiguous}$
+int m = max( max, -max );                                       $\C{// uses (3) and (1) twice, by matching return type}$
 \end{cfa}
 …
 \begin{cfa}
 `forall( otype T )` T identity( T val ) { return val; }
 int forty_two = identity( 42 );         $\C{// T is bound to int, forty\_two == 42}$
+int forty_two = identity( 42 );                         $\C{// T is bound to int, forty\_two == 42}$
 \end{cfa}
 This @identity@ function can be applied to any complete \newterm{object type} (or @otype@).
 …
 For example, the function @twice@ can be defined using the \CFA syntax for operator overloading:
 \begin{cfa}
 forall( otype T `| { T ?+?(T, T); }` ) T twice( T x ) { return x `+` x; }  $\C{// ? denotes operands}$
+forall( otype T `| { T ?+?(T, T); }` ) T twice( T x ) { return x `+` x; }       $\C{// ? denotes operands}$
 int val = twice( twice( 3.7 ) );
 \end{cfa}
 …
+}
 double key = 5.0, vals[10] = { /* 10 sorted float values */ };
 double * val = (double *)bsearch( &key, vals, 10, sizeof(vals[0]), comp ); $\C{// search sorted array}$
+double * val = (double *)bsearch( &key, vals, 10, sizeof(vals[0]), comp );      $\C{// search sorted array}$
 \end{cfa}
 which can be augmented simply with a generalized, type-safe, \CFA-overloaded wrappers:
 …
 forall( otype T | { int ?<?( T, T ); } ) unsigned int bsearch( T key, const T * arr, size_t size ) {
         T * result = bsearch( key, arr, size ); $\C{// call first version}$
         return result ? result - arr : size; $\C{// pointer subtraction includes sizeof(T)}$
+}
 double * val = bsearch( 5.0, vals, 10 ); $\C{// selection based on return type}$
+        return result ? result - arr : size;    $\C{// pointer subtraction includes sizeof(T)}$
+}
+double * val = bsearch( 5.0, vals, 10 );        $\C{// selection based on return type}$
 int posn = bsearch( 5.0, vals, 10 );
 \end{cfa}
 …
 forall( otype T | { int ?<?( T, T ); } ) void qsort( const T * arr, size_t size ) { /* use C qsort */ }
+{
         int ?<?( double x, double y ) { return x `>` y; } $\C{// locally override behaviour}$
+        int ?<?( double x, double y ) { return x `>` y; }       $\C{// locally override behaviour}$
         qsort( vals, size );                                    $\C{// descending sort}$
+}
 …
 Within the block, the nested version of @?<?@ performs @?>?@ and this local version overrides the built-in @?<?@ so it is passed to @qsort@.
 Hence, programmers can easily form local environments, adding and modifying appropriate functions, to maximize reuse of other existing functions and types.
-Under construction is a mechanism to distribute @forall@ over routines/types, where each block declaration is prefixed with the initial @forall@ clause significantly reducing duplication (see @stack@ examples in Section~\ref{sec:eval}):
-\begin{cfa}
-forall( otype `T` ) {                                                   $\C{// forall block}$
-        struct stack { stack_node(`T`) * head; };       $\C{// generic type}$
-        void push( stack(`T`) & s, `T` value ) ...      $\C{// generic operations}$
-        T pop( stack(`T`) & s ) ...
+}
-\end{cfa}
 …
         T ?+=?( T *, T );
         T ++?( T * );
         T ?++( T * );
+};
+        T ?++( T * ); };
 forall( otype T `| summable( T )` ) T sum( T a[$\,$], size_t size ) {  // use trait
         `T` total = { `0` };                                    $\C{// instantiate T from 0 by calling its constructor}$
         for ( unsigned int i = 0; i < size; i += 1 ) total `+=` a[i]; $\C{// select appropriate +}$
+        return total;
+}
+        return total; }
 \end{cfa}
 …
         void ?{}( T &, T );                                             $\C{// copy constructor}$
         void ?=?( T &, T );                                             $\C{// assignment operator}$
+        void ^?{}( T & );                                               $\C{// destructor}$
+};
+        void ^?{}( T & ); };                                    $\C{// destructor}$
 \end{cfa}
 Given the information provided for an @otype@, variables of polymorphic type can be treated as if they were a complete type: stack-allocatable, default or copy-initialized, assigned, and deleted.
 …
 One approach is to write bespoke data-structures for each context in which they are needed.
 While this approach is flexible and supports integration with the C type-checker and tooling, it is also tedious and error-prone, especially for more complex data structures.
 A second approach is to use @void *@-based polymorphism, \eg the C standard-library functions @bsearch@ and @qsort@, which allow reuse of code with common functionality.
+A second approach is to use @void *@ based polymorphism, \eg the C standard-library functions @bsearch@ and @qsort@, which allow reuse of code with common functionality.
 However, basing all polymorphism on @void *@ eliminates the type-checker's ability to ensure that argument types are properly matched, often requiring a number of extra function parameters, pointer indirection, and dynamic allocation that is not otherwise needed.
 A third approach to generic code is to use preprocessor macros, which does allow the generated code to be both generic and type-checked, but errors may be difficult to interpret.
 …
 Results of these layout functions are cached so that they are only computed once per type per function. %, as in the example below for @pair@.
 Layout functions also allow generic types to be used in a function definition without reflecting them in the function signature.
 For instance, a function that strips duplicate values from an unsorted @vector(T)@ likely has a pointer to the vector as its only explicit parameter, but uses some sort of @set(T)@ internally to test for duplicate values.
+For instance, a function that strips duplicate values from an unsorted @vector(T)@ would likely have a pointer to the vector as its only explicit parameter, but use some sort of @set(T)@ internally to test for duplicate values.
 This function could acquire the layout for @set(T)@ by calling its layout function with the layout of @T@ implicitly passed into the function.
 …
 struct litres {};
 forall( dtype U ) scalar(U) ?+?( scalar(U) a, scalar(U) b ) {
+forall( dtype U) scalar(U) ?+?( scalar(U) a, scalar(U) b ) {
         return (scalar(U)){ a.value + b.value };
+}
 …
 [ q, r ] = div( 13.5, 5.2 );                            $\C{// assign into tuple}$
 \end{cfa}
 This approach is straightforward to understand and use;
+Clearly, this approach is straightforward to understand and use;
 therefore, why do few programming languages support this obvious feature or provide it awkwardly?
 To answer, there are complex consequences that cascade through multiple aspects of the language, especially the type-system.
+The answer is that there are complex consequences that cascade through multiple aspects of the language, especially the type-system.
 This section show these consequences and how \CFA handles them.
 …
 p`->0` = 5;                                                                     $\C{// change quotient}$
 bar( qr`.1`, qr );                                                      $\C{// pass remainder and quotient/remainder}$
 rem = [div( 13, 5 ), 42]`.0.1`;                         $\C{// access 2nd component of 1st component}$
+rem = [div( 13, 5 ), 42]`.0.1`;                         $\C{// access 2nd component of 1st component of tuple expression}$
 \end{cfa}
 …
 Tuple flattening recursively expands a tuple into the list of its basic components.
 Tuple structuring packages a list of expressions into a value of tuple type, \eg:
+%\lstDeleteShortInline@%
+%\par\smallskip
+%\begin{tabular}{@{}l@{\hspace{1.5\parindent}}||@{\hspace{1.5\parindent}}l@{}}
 \begin{cfa}
 int f( int, int );
 [int] g( [int, int] );
 [int] h( int, [int, int] );
+int g( [int, int] );
+int h( int, [int, int] );
 [int, int] x;
 int y;
+f( x );                                                                         $\C{// flatten}$
+g( y, 10 );                                                                     $\C{// structure}$
+h( x, y );                                                                      $\C{// flatten and structure}$
+\end{cfa}
+f( x );                 $\C{// flatten}$
+g( y, 10 );             $\C{// structure}$
+h( x, y );              $\C{// flatten and structure}$
+\end{cfa}
+%\end{cfa}
+%&
+%\begin{cfa}
+%\end{tabular}
+%\smallskip\par\noindent
+%\lstMakeShortInline@%
 In the call to @f@, @x@ is implicitly flattened so the components of @x@ are passed as the two arguments.
 In the call to @g@, the values @y@ and @10@ are structured into a single argument of type @[int, int]@ to match the parameter type of @g@.
 …
 An assignment where the left side is a tuple type is called \newterm{tuple assignment}.
 There are two kinds of tuple assignment depending on whether the right side of the assignment operator has a tuple type or a non-tuple type, called \newterm{multiple} and \newterm{mass assignment}, respectively.
+%\lstDeleteShortInline@%
+%\par\smallskip
+%\begin{tabular}{@{}l@{\hspace{1.5\parindent}}||@{\hspace{1.5\parindent}}l@{}}
 \begin{cfa}
 int x = 10;
 …
 [y, x] = 3.14;                                                          $\C{// mass assignment}$
 \end{cfa}
+%\end{cfa}
+%&
+%\begin{cfa}
+%\end{tabular}
+%\smallskip\par\noindent
+%\lstMakeShortInline@%
 Both kinds of tuple assignment have parallel semantics, so that each value on the left and right side is evaluated before any assignments occur.
 As a result, it is possible to swap the values in two variables without explicitly creating any temporary variables or calling a function, \eg, @[x, y] = [y, x]@.
 …
 This example shows mass, multiple, and cascading assignment used in one expression:
 \begin{cfa}
 [void] f( [int, int] );
+void f( [int, int] );
 f( [x, y] = z = 1.5 );                                          $\C{// assignments in parameter list}$
 \end{cfa}
 …
 Here, the mass assignment sets all members of @s@ to zero.
 Since tuple-index expressions are a form of member-access expression, it is possible to use tuple-index expressions in conjunction with member tuple expressions to manually restructure a tuple (\eg rearrange, drop, and duplicate components).
+%\lstDeleteShortInline@%
+%\par\smallskip
+%\begin{tabular}{@{}l@{\hspace{1.5\parindent}}||@{\hspace{1.5\parindent}}l@{}}
 \begin{cfa}
 [int, int, long, double] x;
 …
 [int, int, int] y = x.[2, 0, 2];                        $\C{// duplicate: [y.0, y.1, y.2] = [x.2, x.0.x.2]}$
 \end{cfa}
+%\end{cfa}
+%&
+%\begin{cfa}
+%\end{tabular}
+%\smallskip\par\noindent
+%\lstMakeShortInline@%
 It is also possible for a member access to contain other member accesses, \eg:
 \begin{cfa}
 …
 Since @void@ is effectively a 0-element tuple, (3) discards the first and third return values, which is effectively equivalent to @[(int)(g().1.0), (int)(g().1.1)]@).
 Note that a cast is not a function call in \CFA, so flattening and structuring conversions do not occur for cast expressions\footnote{User-defined conversions have been considered, but for compatibility with C and the existing use of casts as type ascription, any future design for such conversions requires more precise matching of types than allowed for function arguments and parameters.}.
+Note that a cast is not a function call in \CFA, so flattening and structuring conversions do not occur for cast expressions\footnote{User-defined conversions have been considered, but for compatibility with C and the existing use of casts as type ascription, any future design for such conversions would require more precise matching of types than allowed for function arguments and parameters.}.
 As such, (4) is invalid because the cast target type contains 4 components, while the source type contains only 3.
 Similarly, (5) is invalid because the cast @([int, int, int])(g().1)@ is invalid.
 …
 where @[5, "hello"]@ is flattened, giving argument list @5, "hello"@, and @T@ binds to @int@ and @U@ binds to @const char@.
 Tuples, however, may contain polymorphic components.
 For example, a plus operator can be written to sum two triples.
+For example, a plus operator can be written to add two triples together.
 \begin{cfa}
 forall( otype T | { T ?+?( T, T ); } ) [T, T, T] ?+?( [T, T, T] x, [T, T, T] y ) {
 …
 Flattening and restructuring conversions are also applied to tuple types in polymorphic type assertions.
 \begin{cfa}
 [int] f( [int, double], double );
+int f( [int, double], double );
 forall( otype T, otype U | { T f( T, U, U ); } ) void g( T, U );
 g( 5, 10.21 );
 …
 % \end{cfa}
 % so the thunk provides flattening and structuring conversions to inferred functions, improving the compatibility of tuples and polymorphism.
 % These thunks are generated locally using gcc nested-functions, rather hoisting them to the external scope, so they can easily access local state.
+% These thunks are generated locally using gcc nested-functions, rather hositing them to the external scope, so they can easily access local state.
 …
 As such, @ttype@ variables are also called \newterm{argument packs}.
 Like variadic templates, @ttype@ polymorphic functions are primarily manipulated via recursion.
+Like variadic templates, the main way to manipulate @ttype@ polymorphic functions is via recursion.
 Since nothing is known about a parameter pack by default, assertion parameters are key to doing anything meaningful.
 Unlike variadic templates, @ttype@ polymorphic functions can be separately compiled.
 For example, a generalized @sum@ function:
+For example, a generalized @sum@ function written using @ttype@:
 \begin{cfa}
 int sum$\(_0\)$() { return 0; }
 …
 \begin{cquote}
 \lstDeleteShortInline@%
 \begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{}}
 \multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{\CFA}}    & \multicolumn{1}{c}{\textbf{C}}        \\
+\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}}
+\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}}     & \multicolumn{1}{c}{\textbf{C}}        \\
 \begin{cfa}
 case 2, 10, 34, 42:
 …
 \lstMakeShortInline@%
 \end{cquote}
 for a contiguous list:\footnote{gcc has the same mechanism but awkward syntax, \lstinline@2 ...42@, as a space is required after a number, otherwise the first period is a decimal point.}
+for a contiguous list:\footnote{gcc has the same mechanism but awkward syntax, \lstinline@2 ...42@, because a space is required after a number, otherwise the period is a decimal point.}
 \begin{cquote}
 \lstDeleteShortInline@%
 \begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{}}
 \multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{\CFA}}    & \multicolumn{1}{c}{\textbf{C}}        \\
+\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}}
+\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}}     & \multicolumn{1}{c}{\textbf{C}}        \\
 \begin{cfa}
 case 2~42:
 …
 \end{cfa}
 C allows placement of @case@ clauses \emph{within} statements nested in the @switch@ body (called Duff's device~\cite{Duff83});
+C allows placement of @case@ clauses \emph{within} statements nested in the @switch@ body (see Duff's device~\cite{Duff83});
 \begin{cfa}
 switch ( i ) {
 …
+}
 \end{cfa}
 \CFA precludes this form of transfer \emph{into} a control structure because it causes undefined behaviour, especially with respect to missed initialization, and provides very limited functionality.
+\CFA precludes this form of transfer into a control structure because it causes undefined behaviour, especially with respect to missed initialization, and provides very limited functionality.
 C allows placement of declaration within the @switch@ body and unreachable code at the start, resulting in undefined behaviour:
 …
 \end{figure}
+Finally, Figure~\ref{f:FallthroughStatement} shows @fallthrough@ may appear in contexts other than terminating a @case@ clause, and have an explicit transfer label allowing separate cases but common final-code for a set of cases.
+The target label must be below the @fallthrough@ and may not be nested in a control structure, \ie @fallthrough@ cannot form a loop, and the target label must be at the same or higher level as the containing @case@ clause and located at the same level as a @case@ clause;
+the target label may be case @default@, but only associated with the current @switch@/@choose@ statement.
+\begin{figure}
+\centering
+Finally, @fallthrough@ may appear in contexts other than terminating a @case@ clause, and have an explicit transfer label allowing separate cases but common final-code for a set of cases:
+\begin{cquote}
 \lstDeleteShortInline@%
 \begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{}}
 …
   case 4:
         ... `fallthrough common;`
   `common`: // below fallthrough at same level as case clauses
+  common:
         ...      // common code for cases 3 and 4
         // implicit break
 …
 \end{tabular}
 \lstMakeShortInline@%
+\caption{\lstinline|fallthrough| Statement}
+\label{f:FallthroughStatement}
+\end{figure}
+\end{cquote}
+The target label may be case @default@.
+Collectively, these control-structure enhancements reduce programmer burden and increase readability and safety.
 …
         R r;
         ... `resume( r );` ...
         ... r.fix // control returns here after handler
+        ... r.fix // control does return here after handler
+}
 `try` {
 …
 \subsection{\texorpdfstring{\protect\lstinline{with} Statement}{with Statement}}
 \label{s:WithStatement}
+\subsection{\texorpdfstring{\protect\lstinline{with} Clause / Statement}{with Clause / Statement}}
+\label{s:WithClauseStatement}
 Grouping heterogeneous data into \newterm{aggregate}s (structure/union) is a common programming practice, and an aggregate can be further organized into more complex structures, such as arrays and containers:
 …
 A similar situation occurs in object-oriented programming, \eg \CC:
 \begin{C++}
 struct S {
+class C {
         char c;                                                                 $\C{// fields}$
         int i;
         double d;
         void f() {                                                              $\C{// implicit ``this'' aggregate}$
+        int f() {                                                               $\C{// implicit ``this'' aggregate}$
                 `this->`c; `this->`i; `this->`d;        $\C{// access containing fields}$
+        }
+}
 \end{C++}
 Object-oriented nesting of member functions in a \lstinline[language=C++]@class/struct@ allows eliding \lstinline[language=C++]@this->@ because of lexical scoping.
+Object-oriented nesting of member functions in a \lstinline[language=C++]@class@ allows eliding \lstinline[language=C++]@this->@ because of lexical scoping.
 However, for other aggregate parameters, qualification is necessary:
 \begin{cfa}
 struct T { double m, n; };
 int S::f( T & t ) {                                                     $\C{// multiple aggregate parameters}$
         c; i; d;                                                                $\C{\color{red}// this--{\textgreater}.c, this--{\textgreater}.i, this--{\textgreater}.d}$
+int C::f( T & t ) {                                                     $\C{// multiple aggregate parameters}$
+        c; i; d;                                                                $\C{\color{red}// this-\textgreater.c, this-\textgreater.i, this-\textgreater.d}$
         `t.`m; `t.`n;                                                   $\C{// must qualify}$
+}
 …
 with the generality of opening multiple aggregate-parameters:
 \begin{cfa}
 void f( S & s, T & t ) `with ( s, t )` {                $\C{// multiple aggregate parameters}$
+int f( S & s, T & t ) `with ( s, t )` {         $\C{// multiple aggregate parameters}$
         c; i; d;                                                                $\C{\color{red}// s.c, s.i, s.d}$
         m; n;                                                                   $\C{\color{red}// t.m, t.n}$
 …
 \begin{cfa}
 struct S { int i, j; } sv;
 with ( sv ) {                                                           $\C{// implicit reference}$
+with ( sv ) {                                                           $\C{implicit reference}$
         S & sr = sv;
         with ( sr ) {                                                   $\C{// explicit reference}$
+        with ( sr ) {                                                   $\C{explicit reference}$
                 S * sp = &sv;
                 with ( *sp ) {                                          $\C{// computed reference}$
                         i = 3; j = 4;                                   $\C{\color{red}// sp--{\textgreater}i, sp--{\textgreater}j}$
+                with ( *sp ) {                                          $\C{computed reference}$
+                        i = 3; j = 4;                                   $\C{\color{red}// sp-{\textgreater}i, sp-{\textgreater}j}$
+                }
                 i = 2; j = 3;                                           $\C{\color{red}// sr.i, sr.j}$
 …
+}
 \end{cfa}
-Collectively, these control-structure enhancements reduce programmer burden and increase readability and safety.
 …
 \begin{cquote}
 \lstDeleteShortInline@%
 \begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{\hspace{2\parindentlnth}}l@{}}
 \multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{\CFA}}    & \multicolumn{1}{c}{\textbf{C}}        \\
+\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{\hspace{\parindentlnth}}l@{}}
+\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}}     & \multicolumn{1}{c}{\textbf{C}}        \\
 \begin{cfa}
 `[5] *` int x1;
 …
 \begin{cfa}
 // array of 5 pointers to int
 // pointer to array of 5 int
 // function returning pointer to array of 5 int and taking int
+// pointer to an array of 5 int
+// function returning pointer to an array of 5 int and taking an int
 \end{cfa}
 \end{tabular}
 …
 \begin{cquote}
 \lstDeleteShortInline@%
 \begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{}}
 \multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{\CFA}}    & \multicolumn{1}{c}{\textbf{C}}        \\
+\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}}
+\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}}     & \multicolumn{1}{c}{\textbf{C}}        \\
 \begin{cfa}
 `*` int x, y;
 …
 \begin{cquote}
 \lstDeleteShortInline@%
 \begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{\hspace{2\parindentlnth}}l@{}}
 \multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{\CFA}}    & \multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{C}}     \\
+\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{\hspace{\parindentlnth}}l@{}}
+\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}}     & \multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{C}}      \\
 \begin{cfa}
 [ 5 ] int z;
 …
 \begin{cquote}
 \lstDeleteShortInline@%
 \begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{\hspace{2\parindentlnth}}l@{}}
 \multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{\CFA}}    & \multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{C}}     \\
+\begin{tabular}{@{}l@{\hspace{1em}}l@{\hspace{1em}}l@{}}
+\multicolumn{1}{c@{\hspace{1em}}}{\textbf{\CFA}}        & \multicolumn{1}{c@{\hspace{1em}}}{\textbf{C}} \\
 \begin{cfa}
 extern const * const int x;
 static const * [5] const int y;
+static const * [ 5 ] const int y;
 \end{cfa}
+&
 \begin{cfa}
 int extern const * const x;
 static const int (* const y)[5]
+static const int (* const y)[ 5 ]
 \end{cfa}
+&
 …
 \begin{cquote}
 \lstDeleteShortInline@%
 \begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{}}
 \multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{\CFA}}    & \multicolumn{1}{c}{\textbf{C}}        \\
+\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}}
+\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}}     & \multicolumn{1}{c}{\textbf{C}}        \\
 \begin{cfa}
 y = (* int)x;
 …
 as well, parameter names are optional, \eg:
 \begin{cfa}
 [ int x ] f ( /* void */ );             $\C[2.5in]{// returning int with no parameters}$
 [ int x ] f (...);                              $\C{// returning int with unknown parameters}$
 [ * int ] g ( int y );                  $\C{// returning pointer to int with int parameter}$
 [ void ] 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 ( /* void */ );                                     $\C{// returning int with no parameters}$
+[ int x ] f (...);                                                      $\C{// returning int with unknown parameters}$
+[ * int ] g ( int y );                                          $\C{// returning pointer to int with int parameter}$
+[ void ] 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 function-definition header (or vice versa).
 …
 \begin{cquote}
 \lstDeleteShortInline@%
 \begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{}}
 \multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{\CFA}}    & \multicolumn{1}{c}{\textbf{C}}        \\
+\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}}
+\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}}     & \multicolumn{1}{c}{\textbf{C}}        \\
 \begin{cfa}
 [double] foo(), foo( int ), foo( double ) {...}
 …
 The syntax for pointers to \CFA functions specifies the pointer name on the right, \eg:
 \begin{cfa}
 * [ int x ] () fp;                              $\C{// pointer to function returning int with no parameters}$
 * [ * int ] ( int y ) gp;               $\C{// pointer to function returning pointer to int with int parameter}$
 * [ ] ( int, char ) hp;                 $\C{// pointer to function returning no result with int and char parameters}$
 * [ * int, int ] ( int ) jp;    $\C{// pointer to function returning pointer to int and int with int parameter}$
+* [ int x ] () fp;                                                      $\C{// pointer to function returning int with no parameters}$
+* [ * int ] ( int y ) gp;                                       $\C{// pointer to function returning pointer to int with int parameter}$
+* [ ] ( int, char ) hp;                                         $\C{// pointer to function returning no result with int and char parameters}$
+* [ * int, int ] ( int ) jp;                            $\C{// pointer to function returning pointer to int and int, with int parameter}$
 \end{cfa}
 Note, a function name cannot be specified:
 \begin{cfa}
 * [ int x ] f () fp;                    $\C{// function name "f" is disallowed}\CRT$
+* [ int x ] f () fp;                                            $\C{// function name "f" is disallowed}$
 \end{cfa}
 …
 \begin{cfa}
 struct S { double x, y; };
 int x, y;
+int i, j;
 void f( int & i, int & j, S & s, int v[] );
 f( 3, x + y, (S){ 1.0, 7.0 }, (int [3]){ 1, 2, 3 } ); $\C{// pass rvalue to lvalue \(\Rightarrow\) implicit temporary}$
+f( 3, i + j, (S){ 1.0, 7.0 }, (int [3]){ 1, 2, 3 } );   $\C{// pass rvalue to lvalue \(\Rightarrow\) implicit temporary}$
 \end{cfa}
 This allows complex values to be succinctly and efficiently passed to functions, without the syntactic overhead of explicit definition of a temporary variable or the runtime cost of pass-by-value.
 …
 One of the strengths (and weaknesses) of C is memory-management control, allowing resource release to be precisely specified versus unknown release with garbage-collected memory-management.
 However, this manual approach is verbose, and it is useful to manage resources other than memory (\eg file handles) using the same mechanism as memory.
+However, this manual approach is often verbose, and it is useful to manage resources other than memory (\eg file handles) using the same mechanism as memory.
 \CC addresses these issues using Resource Aquisition Is Initialization (RAII), implemented by means of \newterm{constructor} and \newterm{destructor} functions;
 \CFA adopts constructors and destructors (and @finally@) to facilitate RAII.
 …
+{
         VLA  x,            y = { 20, 0x01 },     z = y; $\C{// z points to y}$
         //    ?{}( x );   ?{}( y, 20, 0x01 );    ?{}( z, y );
+        //      ?{}( x );  ?{}( y, 20, 0x01 );  ?{}( z, y );
         ^x{};                                                                   $\C{// deallocate x}$
         x{};                                                                    $\C{// reallocate x}$
 …
 \begin{cquote}
 \lstDeleteShortInline@%
 \begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{\hspace{2\parindentlnth}}l@{}}
+\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{\hspace{\parindentlnth}}l@{}}
 \begin{cfa}
 _`hh`     // signed char
 …
 For readability, it is useful to associate units to scale literals, \eg weight (stone, pound, kilogram) or time (seconds, minutes, hours).
 The left of Figure~\ref{f:UserLiteral} shows the \CFA alternative call-syntax (postfix: literal argument before function name), using the backquote, to convert basic literals into user literals.
+The left of Figure~\ref{f:UserLiteral} shows the \CFA alternative call-syntax (literal argument before function name), using the backquote, to convert basic literals into user literals.
 The backquote is a small character, making the unit (function name) predominate.
 For examples, the multi-precision integer-type in Section~\ref{s:MultiPrecisionIntegers} has user literals:
 …
 y = "12345678901234567890123456789"|`mp| + "12345678901234567890123456789"|`mp|;
 \end{cfa}
 Because \CFA uses a standard function, all types and literals are applicable, as well as overloading and conversions, where @?`@ denotes a postfix-function name and @`@ denotes a postfix-function call.
+Because \CFA uses a standard function, all types and literals are applicable, as well as overloading and conversions.
 }%
-\begin{cquote}
-\lstset{language=CFA,moredelim=**[is][\color{red}]{|}{|},deletedelim=**[is][]{`}{`}}
-\lstDeleteShortInline@%
-\begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{\hspace{2\parindentlnth}}l@{\hspace{2\parindentlnth}}l@{}}
-\multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{postfix function}}        & \multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{constant}}      & \multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{variable/expression}}   & \multicolumn{1}{c}{\textbf{postfix pointer}}  \\
-\begin{cfa}
-int ?`h( int s );
-int ?`h( double s );
-int ?`m( char c );
-int ?`m( const char * s );
-int ?`t( int a, int b, int c );
-\end{cfa}
+&
-\begin{cfa}
-`h;
-.5`h;
-'1'`m;
-"123" "456"`m;
-[1,2,3]`t;
-\end{cfa}
+&
-\begin{cfa}
-int i = 7;
-i`h;
-(i + 3)`h;
-(i + 3.5)`h;
-\end{cfa}
+&
-\begin{cfa}
-int (* ?`p)( int i );
-?`p = ?`h;
-`p;
-i`p;
-(i + 3)`p;
-\end{cfa}
-\end{tabular}
-\lstMakeShortInline@%
-\end{cquote}
 The right of Figure~\ref{f:UserLiteral} shows the equivalent \CC version using the underscore for the call-syntax.
 …
         return (W){ l.stones + r.stones };
+}
 W |?`st|(double w) { return (W){ w }; }
 W |?`lb|(double w) { return (W){ w/14.0 }; }
 W |?`kg|(double w) { return (W){ w*0.16 }; }
+W |?`st|( double w ) { return (W){ w }; }
+W |?`lb|( double w ) { return (W){ w / 14.0 }; }
+W |?`kg|( double w ) { return (W) { w * 0.16 }; }
 …
 \begin{cfa}
 struct W {
         double stones;
         W() { stones = 0.0; }
         W( double w ) { stones = w; }
+    double stones;
+    W() { stones = 0.0; }
+    W( double w ) { stones = w; }
 };
 W operator+( W l, W r ) {
         return W( l.stones + r.stones );
+}
 W |operator""_st|(unsigned long long int w) {return W(w); }
 W |operator""_lb|(unsigned long long int w) {return W(w/14.0); }
 W |operator""_kg|(unsigned long long int w) {return W(w*0.16); }
 W |operator""_st|(long double w ) { return W( w ); }
 W |operator""_lb|(long double w ) { return W( w / 14.0 ); }
 W |operator""_kg|(long double w ) { return W( w * 0.16 ); }
+W |operator"" _st|( unsigned long long int w ) { return W( w ); }
+W |operator"" _lb|( unsigned long long int w ) { return W( w / 14.0 ); }
+W |operator"" _kg|( unsigned long long int w ) { return W( w * 0.16 ); }
+W |operator"" _st|( long double w ) { return W( w ); }
+W |operator"" _lb|( long double w ) { return W( w / 14.0 ); }
+W |operator"" _kg|( long double w ) { return W( w * 0.16 ); }
 int main() {
         W w, heavy = { 20 };
 …
 \begin{cquote}
 \lstDeleteShortInline@%
 \begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{}}
 \multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{Definition}}      & \multicolumn{1}{c}{\textbf{Usage}}    \\
+\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}}
+\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{Definition}}       & \multicolumn{1}{c}{\textbf{Usage}}    \\
 \begin{cfa}
 const short int `MIN` = -32768;
 …
 \begin{cquote}
 \lstDeleteShortInline@%
+\begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{}}
+\multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{\CFA}}    & \multicolumn{1}{c}{\textbf{C}}        \\
+\lstset{basicstyle=\linespread{0.9}\sf\small}
+\begin{tabular}{@{}l@{\hspace{0.5\parindentlnth}}l@{}}
+\multicolumn{1}{c@{\hspace{0.5\parindentlnth}}}{\textbf{\CFA}}  & \multicolumn{1}{c}{\textbf{C}}        \\
 \begin{cfa}
 MIN
 MAX
 PI
+E
 …
+&
 \begin{cfa}
+SCHAR_MIN, CHAR_MIN, SHRT_MIN, INT_MIN, LONG_MIN, LLONG_MIN,
+                FLT_MIN, DBL_MIN, LDBL_MIN
+SCHAR_MAX, UCHAR_MAX, SHRT_MAX, INT_MAX, LONG_MAX, LLONG_MAX,
+                FLT_MAX, DBL_MAX, LDBL_MAX
+SCHAR_MIN, CHAR_MIN, SHRT_MIN, INT_MIN, LONG_MIN, LLONG_MIN, FLT_MIN, DBL_MIN, LDBL_MIN
+SCHAR_MAX, UCHAR_MAX, SHRT_MAX, INT_MAX, LONG_MAX, LLONG_MAX, FLT_MAX, DBL_MAX, LDBL_MAX
 M_PI, M_PIl
 M_E, M_El
 …
 \begin{cquote}
 \lstDeleteShortInline@%
 \begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{}}
 \multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{Definition}}      & \multicolumn{1}{c}{\textbf{Usage}}    \\
+\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}}
+\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{Definition}}       & \multicolumn{1}{c}{\textbf{Usage}}    \\
 \begin{cfa}
 float `log`( float x );
 …
 \begin{cquote}
 \lstDeleteShortInline@%
 \begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{}}
 \multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{\CFA}}    & \multicolumn{1}{c}{\textbf{C}}        \\
+\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}}
+\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}}     & \multicolumn{1}{c}{\textbf{C}}        \\
 \begin{cfa}
 log
 …
 \begin{cquote}
 \lstDeleteShortInline@%
 \begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{}}
 \multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{Definition}}      & \multicolumn{1}{c}{\textbf{Usage}}    \\
+\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}}
+\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{Definition}}       & \multicolumn{1}{c}{\textbf{Usage}}    \\
 \begin{cfa}
 unsigned int `abs`( int );
 …
 \begin{cquote}
 \lstDeleteShortInline@%
 \begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{}}
 \multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{\CFA}}    & \multicolumn{1}{c}{\textbf{C}}        \\
+\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}}
+\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}}     & \multicolumn{1}{c}{\textbf{C}}        \\
 \begin{cfa}
 abs
 …
 The following shows one example where \CFA \emph{extends} an existing standard C interface to reduce complexity and provide safety.
 C/\Celeven provide a number of complex and overlapping storage-management operation to support the following capabilities:
 \begin{description}%[topsep=3pt,itemsep=2pt,parsep=0pt]
+\begin{description}[topsep=3pt,itemsep=2pt,parsep=0pt]
 \item[fill]
 an allocation with a specified character.
 …
 \end{cfa}
 \lstDeleteShortInline@%
 \begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{}}
 \multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{\CFA}}    & \multicolumn{1}{c}{\textbf{C}}        \\
+\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}}
+\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}}     & \multicolumn{1}{c}{\textbf{C}}        \\
 \begin{cfa}
 ip = alloc();
 …
 ip = (int *)malloc( sizeof( int ) ); memset( ip, fill, dim * sizeof( int ) );
 ip = (int *)realloc( ip, 2 * dim * sizeof( int ) );
 ip = (int *)realloc( ip, 4 * dim * sizeof( int ) );
+                        memset( ip, fill, 4 * dim * sizeof( int ) );
+ip = (int *)realloc( ip, 4 * dim * sizeof( int ) ); memset( ip, fill, 4 * dim * sizeof( int ) );
 ip = memalign( 16, sizeof( int ) );
 ip = memalign( 16, sizeof( int ) ); memset( ip, fill, sizeof( int ) );
 …
 \begin{cquote}
 \lstDeleteShortInline@%
 \begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{}}
 \multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{\CFA}}    & \multicolumn{1}{c}{\textbf{\CC}}      \\
+\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}}
+\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}}     & \multicolumn{1}{c}{\textbf{\CC}}      \\
 \begin{cfa}
 int x = 1, y = 2, z = 3;
 …
 The \CFA interface wraps GMP functions into operator functions to make programming with multi-precision integers identical to using fixed-sized integers.
 The \CFA type name for multi-precision signed-integers is @Int@ and the header file is @gmp@.
+Figure~\ref{f:GMPInterface} shows a multi-precision factorial-program contrasting the GMP interface in \CFA and C.
+\begin{figure}
+\centering
+The following multi-precision factorial programs contrast using GMP with the \CFA and C interfaces.
+\begin{cquote}
 \lstDeleteShortInline@%
 \begin{tabular}{@{}l@{\hspace{2\parindentlnth}}@{\hspace{2\parindentlnth}}l@{}}
 \multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{\CFA}}    & \multicolumn{1}{@{\hspace{2\parindentlnth}}c}{\textbf{C}}     \\
+\begin{tabular}{@{}l@{\hspace{\parindentlnth}}@{\hspace{\parindentlnth}}l@{}}
+\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}}     & \multicolumn{1}{@{\hspace{\parindentlnth}}c}{\textbf{C}}      \\
 \begin{cfa}
 #include <gmp>
 …
 \end{tabular}
 \lstMakeShortInline@%
+\caption{GMP Interface \CFA versus C}
+\label{f:GMPInterface}
+\end{figure}
+\end{cquote}
 …
 In fact, \CFA's features for generic programming can enable faster runtime execution than idiomatic @void *@-based C code.
 This claim is demonstrated through a set of generic-code-based micro-benchmarks in C, \CFA, and \CC (see stack implementations in Appendix~\ref{sec:BenchmarkStackImplementation}).
 Since all these languages share a subset essentially comprising standard C, maximal-performance benchmarks should show little runtime variance, differing only in length and clarity of source code.
 A more illustrative comparison measures the costs of idiomatic usage of each language's features.
 Figure~\ref{fig:BenchmarkTest} shows the \CFA benchmark tests for a generic stack based on a singly linked-list.
 The benchmark test is similar for the other languages.
 The experiment uses element types @int@ and @pair(short, char)@, and pushes $N=40M$ elements on a generic stack, copies the stack, clears one of the stacks, and finds the maximum value in the other stack.
+Since all these languages share a subset essentially comprising standard C, maximal-performance benchmarks would show little runtime variance, other than in length and clarity of source code.
+A more illustrative benchmark measures the costs of idiomatic usage of each language's features.
+Figure~\ref{fig:BenchmarkTest} shows the \CFA benchmark tests for a generic stack based on a singly linked-list, a generic pair-data-structure, and a variadic @print@ function similar to that in Section~\ref{sec:variadic-tuples}.
+The benchmark test is similar for C and \CC.
+The experiment uses element types @int@ and @pair(_Bool, char)@, and pushes $N=40M$ elements on a generic stack, copies the stack, clears one of the stacks, finds the maximum value in the other stack, and prints $N/2$ (to reduce graph height) constants.
 \begin{figure}
 \begin{cfa}[xleftmargin=3\parindentlnth,aboveskip=0pt,belowskip=0pt]
 int main() {
+int main( int argc, char * argv[] ) {
         int max = 0, val = 42;
         stack( int ) si, ti;
         REPEAT_TIMED( "push_int", N, push( si, val ); )
         TIMED( "copy_int", ti{ si }; )
+        TIMED( "copy_int", ti = si; )
         TIMED( "clear_int", clear( si ); )
         REPEAT_TIMED( "pop_int", N, int x = pop( ti ); if ( x > max ) max = x; )
         pair( short, char ) max = { 0h, '\0' }, val = { 42h, 'a' };
         stack( pair( short, char ) ) sp, tp;
+        pair( _Bool, char ) max = { (_Bool)0, '\0' }, val = { (_Bool)1, 'a' };
+        stack( pair( _Bool, char ) ) sp, tp;
         REPEAT_TIMED( "push_pair", N, push( sp, val ); )
         TIMED( "copy_pair", tp{ sp }; )
+        TIMED( "copy_pair", tp = sp; )
         TIMED( "clear_pair", clear( sp ); )
         REPEAT_TIMED( "pop_pair", N, pair(short, char) x = pop( tp ); if ( x > max ) max = x; )
+        REPEAT_TIMED( "pop_pair", N, pair(_Bool, char) x = pop( tp ); if ( x > max ) max = x; )
+}
 \end{cfa}
 …
 hence runtime checks are necessary to safely down-cast objects.
 The most notable difference among the implementations is in memory layout of generic types: \CFA and \CC inline the stack and pair elements into corresponding list and pair nodes, while C and \CCV lack such a capability and instead must store generic objects via pointers to separately-allocated objects.
+Note that the C benchmark uses unchecked casts as there is no runtime mechanism to perform such checks, while \CFA and \CC provide type-safety statically.
+For the print benchmark, idiomatic printing is used: the C and \CFA variants used @stdio.h@, while the \CC and \CCV variants used @iostream@; preliminary tests show this distinction has negligible runtime impact.
+Note, the C benchmark uses unchecked casts as there is no runtime mechanism to perform such checks, while \CFA and \CC provide type-safety statically.
 Figure~\ref{fig:eval} and Table~\ref{tab:eval} show the results of running the benchmark in Figure~\ref{fig:BenchmarkTest} and its C, \CC, and \CCV equivalents.
 The graph plots the median of 5 consecutive runs of each program, with an initial warm-up run omitted.
 All code is compiled at \texttt{-O2} by gcc or g++ 6.3.0, with all \CC code compiled as \CCfourteen.
+All code is compiled at \texttt{-O2} by gcc or g++ 6.2.0, with all \CC code compiled as \CCfourteen.
 The benchmarks are run on an Ubuntu 16.04 workstation with 16 GB of RAM and a 6-core AMD FX-6300 CPU with 3.5 GHz maximum clock frequency.
 …
 \begin{tabular}{rrrrr}
                                                                         & \CT{C}        & \CT{\CFA}     & \CT{\CC}      & \CT{\CCV}             \\ \hline
 maximum memory usage (MB)                       & 10,001        & 2,502         & 2,503         & 11,253                \\
 source code size (lines)                        & 196           & 186           & 125           & 290                   \\
 redundant type annotations (lines)      & 27            & 0                     & 2                     & 16                    \\
 binary size (KB)                                        & 14            & 257           & 14            & 37                    \\
+maximum memory usage (MB)                       & 10001         & 2502          & 2503          & 11253                 \\
+source code size (lines)                        & 247           & 222           & 165           & 339                   \\
+redundant type annotations (lines)      & 39            & 2                     & 2                     & 15                    \\
+binary size (KB)                                        & 14            & 229           & 18            & 38                    \\
 \end{tabular}
 \end{table}
 The C and \CCV variants are generally the slowest with the largest memory footprint, because of their less-efficient memory layout and the pointer-indirection necessary to implement generic types;
 this inefficiency is exacerbated by the second level of generic types in the pair benchmarks.
 By contrast, the \CFA and \CC variants run in roughly equivalent time for both the integer and pair of @short@ and @char@ because the storage layout is equivalent, with the inlined libraries (\ie no separate compilation) and greater maturity of the \CC compiler contributing to its lead.
+this inefficiency is exacerbated by the second level of generic types in the pair-based benchmarks.
+By contrast, the \CFA and \CC variants run in roughly equivalent time for both the integer and pair of @_Bool@ and @char@ because the storage layout is equivalent, with the inlined libraries (\ie no separate compilation) and greater maturity of the \CC compiler contributing to its lead.
 \CCV is slower than C largely due to the cost of runtime type-checking of down-casts (implemented with @dynamic_cast@);
+The outlier in the graph for \CFA, pop @pair@, results from the complexity of the generated-C polymorphic code.
+The gcc compiler is unable to optimize some dead code and condense nested calls; a compiler designed for \CFA could easily perform these optimizations.
+There are two outliers in the graph for \CFA: all prints and pop of @pair@.
+Both of these cases result from the complexity of the C-generated polymorphic code, so that the gcc compiler is unable to optimize some dead code and condense nested calls.
+A compiler designed for \CFA could easily perform these optimizations.
 Finally, the binary size for \CFA is larger because of static linking with the \CFA libraries.
+\CFA is also competitive in terms of source code size, measured as a proxy for programmer effort. The line counts in Table~\ref{tab:eval} include implementations of @pair@ and @stack@ types for all four languages for purposes of direct comparison, though it should be noted that \CFA and \CC have pre-written data structures in their standard libraries that programmers would generally use instead. Use of these standard library types has minimal impact on the performance benchmarks, but shrinks the \CFA and \CC benchmarks to 39 and 42 lines, respectively.
+The difference between the \CFA and \CC line counts is primarily declaration duplication to implement separate compilation; a header-only \CFA library would be similar in length to the \CC version.
+\CFA is also competitive in terms of source code size, measured as a proxy for programmer effort. The line counts in Table~\ref{tab:eval} include implementations of @pair@ and @stack@ types for all four languages for purposes of direct comparison, though it should be noted that \CFA and \CC have pre-written data structures in their standard libraries that programmers would generally use instead. Use of these standard library types has minimal impact on the performance benchmarks, but shrinks the \CFA and \CC benchmarks to 73 and 54 lines, respectively.
 On the other hand, C does not have a generic collections-library in its standard distribution, resulting in frequent reimplementation of such collection types by C programmers.
 \CCV does not use the \CC standard template library by construction, and in fact includes the definition of @object@ and wrapper classes for @char@, @short@, and @int@ in its line count, which inflates this count somewhat, as an actual object-oriented language would include these in the standard library;
+\CCV does not use the \CC standard template library by construction, and in fact includes the definition of @object@ and wrapper classes for @bool@, @char@, @int@, and @const char *@ in its line count, which inflates this count somewhat, as an actual object-oriented language would include these in the standard library;
 with their omission, the \CCV line count is similar to C.
 We justify the given line count by noting that many object-oriented languages do not allow implementing new interfaces on library types without subclassing or wrapper types, which may be similarly verbose.
 Line-count is a fairly rough measure of code complexity;
 another important factor is how much type information the programmer must specify manually, especially where that information is not compiler-checked.
 Such unchecked type information produces a heavier documentation burden and increased potential for runtime bugs, and is much less common in \CFA than C, with its manually specified function pointer arguments and format codes, or \CCV, with its extensive use of untype-checked downcasts, \eg @object@ to @integer@ when popping a stack.
 To quantify this manual typing, the ``redundant type annotations'' line in Table~\ref{tab:eval} counts the number of lines on which the type of a known variable is respecified, either as a format specifier, explicit downcast, type-specific function, or by name in a @sizeof@, struct literal, or @new@ expression.
+Raw line-count, however, is a fairly rough measure of code complexity;
+another important factor is how much type information the programmer must manually specify, especially where that information is not checked by the compiler.
+Such unchecked type information produces a heavier documentation burden and increased potential for runtime bugs, and is much less common in \CFA than C, with its manually specified function pointers arguments and format codes, or \CCV, with its extensive use of un-type-checked downcasts (\eg @object@ to @integer@ when popping a stack, or @object@ to @printable@ when printing the elements of a @pair@).
+To quantify this, the ``redundant type annotations'' line in Table~\ref{tab:eval} counts the number of lines on which the type of a known variable is re-specified, either as a format specifier, explicit downcast, type-specific function, or by name in a @sizeof@, struct literal, or @new@ expression.
 The \CC benchmark uses two redundant type annotations to create a new stack nodes, while the C and \CCV benchmarks have several such annotations spread throughout their code.
+The \CFA benchmark is able to eliminate all redundant type annotations through use of the polymorphic @alloc@ function discussed in Section~\ref{sec:libraries}.
+The two instances in which the \CFA benchmark still uses redundant type specifiers are to cast the result of a polymorphic @malloc@ call (the @sizeof@ argument is inferred by the compiler).
+These uses are similar to the @new@ expressions in \CC, though the \CFA compiler's type resolver should shortly render even these type casts superfluous.
 …
 \subsection{Polymorphism}
+\CC provides three disjoint polymorphic extensions to C: overloading, inheritance, and templates.
+\CC is the most similar language to \CFA;
+both are extensions to C with source and runtime backwards compatibility.
+The fundamental difference is the engineering approach to maintain C compatibility and programmer expectation.
+While \CC provides good compatibility with C, it has a steep learning curve for many of its extensions.
+For example, polymorphism is provided via three disjoint mechanisms: overloading, inheritance, and templates.
 The overloading is restricted because resolution does not use the return type, inheritance requires learning object-oriented programming and coping with a restricted nominal-inheritance hierarchy, templates cannot be separately compiled resulting in compilation/code bloat and poor error messages, and determining how these mechanisms interact and which to use is confusing.
 In contrast, \CFA has a single facility for polymorphic code supporting type-safe separate-compilation of polymorphic functions and generic (opaque) types, which uniformly leverage the C procedural paradigm.
 …
-\subsection{C Extensions}
-\CC is the best known C-based language, and is similar to \CFA in that both are extensions to C with source and runtime backwards compatibility.
-Specific difference between \CFA and \CC have been identified in prior sections, with a final observation that \CFA has equal or fewer tokens to express the same notion in many cases.
-The key difference in design philosophies is that \CFA is easier for C programmers to understand by maintaining a procedural paradigm and avoiding complex interactions among extensions.
-\CC, on the other hand, has multiple overlapping features (such as the three forms of polymorphism), many of which have complex interactions with its object-oriented design.
-As a result, \CC has a steep learning curve for even experienced C programmers, especially when attempting to maintain performance equivalent to C legacy-code.
-There are several other C extension-languages with less usage and even more dramatic changes than \CC.
-Objective-C and Cyclone are two other extensions to C with different design goals than \CFA, as discussed above.
-Other languages extend C with more focused features.
-$\mu$\CC~\cite{uC++book}, CUDA~\cite{Nickolls08}, ispc~\cite{Pharr12}, and Sierra~\cite{Leissa14} add concurrent or data-parallel primitives to C or \CC;
-data-parallel features have not yet been added to \CFA, but are easily incorporated within its design, while concurrency primitives similar to those in $\mu$\CC have already been added~\cite{Delisle18}.
-Finally, CCured~\cite{Necula02} and Ironclad \CC~\cite{DeLozier13} attempt to provide a more memory-safe C by annotating pointer types with garbage collection information; type-checked polymorphism in \CFA covers several of C's memory-safety issues, but more aggressive approaches such as annotating all pointer types with their nullability or requiring runtime garbage collection are contradictory to \CFA's backwards compatibility goals.
-\begin{comment}
 \subsection{Control Structures / Declarations / Literals}
 …
 /1 Literals \\
 user defined: D, Objective-C
-\end{comment}
 …
 Finally, we demonstrate that \CFA performance for some idiomatic cases is better than C and close to \CC, showing the design is practically applicable.
 There is ongoing work on a wide range of \CFA features, including arrays with size, runtime type-information, virtual functions, user-defined conversions, concurrent primitives, and modules.
+While all examples in the paper compile and run, a public beta-release of \CFA will take another 8--12 months to finalize these extensions.
 There are also interesting future directions for the polymorphism design.
+There is ongoing work on a wide range of \CFA feature extensions, including arrays with size, runtime type-information, virtual functions, user-defined conversions, concurrent primitives, and modules.
+(While all examples in the paper compile and run, a public beta-release of \CFA will take another 8--12 months to finalize these additional extensions.)
+In addition, there are interesting future directions for the polymorphism design.
 Notably, \CC template functions trade compile time and code bloat for optimal runtime of individual instantiations of polymorphic functions.
 \CFA polymorphic functions use dynamic virtual-dispatch;
 …
 \section{Acknowledgments}
+The authors would like to recognize the design assistance of Glen Ditchfield, Richard Bilson, Thierry Delisle, Andrew Beach and Brice Dobry on the features described in this paper, and thank Magnus Madsen for feedback on the writing.
+This work is supported by a corporate partnership with Huawei Ltd.\ (\url{http://www.huawei.com}), and Aaron Moss and Peter Buhr are partially funded by the Natural Sciences and Engineering Research Council of Canada.
+The authors would like to recognize the design assistance of Glen Ditchfield, Richard Bilson, Thierry Delisle, and Andrew Beach on the features described in this paper, and thank Magnus Madsen for feedback in the writing.
+This work is supported through a corporate partnership with Huawei Ltd.\ (\url{http://www.huawei.com}), and Aaron Moss and Peter Buhr are partially funded by the Natural Sciences and Engineering Research Council of Canada.
+% the first author's \grantsponsor{NSERC-PGS}{NSERC PGS D}{http://www.nserc-crsng.gc.ca/Students-Etudiants/PG-CS/BellandPostgrad-BelletSuperieures_eng.asp} scholarship.
+\bibliographystyle{plain}
 \bibliography{pl}
 …
 \label{sec:BenchmarkStackImplementation}
+Throughout, @/***/@ designates a counted redundant type annotation; code reformatted for brevity.
+\lstset{basicstyle=\linespread{0.9}\sf\small}
+Throughout, @/***/@ designates a counted redundant type annotation.
 \smallskip\noindent
+C
-\begin{cfa}[xleftmargin=2\parindentlnth,aboveskip=0pt,belowskip=0pt]
-struct stack_node {
-        void * value;
-        struct stack_node * next;
-};
-struct stack { struct stack_node* head; };
-void clear_stack( struct stack * s, void (*free_el)( void * ) ) {
-        for ( struct stack_node * next = s->head; next; ) {
-                struct stack_node * crnt = next;
-                next = crnt->next;
-                free_el( crnt->value );
-                free( crnt );
+        }
-        s->head = NULL;
+}
-struct stack new_stack() { return (struct stack){ NULL }; /***/ }
-void copy_stack( struct stack * s, const struct stack * t, void * (*copy)( const void * ) ) {
-        struct stack_node ** crnt = &s->head;
-        for ( struct stack_node * next = t->head; next; next = next->next ) {
-                *crnt = malloc( sizeof(struct stack_node) ); /***/
-                (*crnt)->value = copy( next->value );
-                crnt = &(*crnt)->next;
+        }
-        *crnt = NULL;
+}
-struct stack * assign_stack( struct stack * s, const struct stack * t,
-                void * (*copy_el)( const void * ), void (*free_el)( void * ) ) {
-        if ( s->head == t->head ) return s;
-        clear_stack( s, free_el ); /***/
-        copy_stack( s, t, copy_el ); /***/
-        return s;
+}
-_Bool stack_empty( const struct stack * s ) { return s->head == NULL; }
-void push_stack( struct stack * s, void * v ) {
-        struct stack_node * n = malloc( sizeof(struct stack_node) ); /***/
-        *n = (struct stack_node){ v, s->head }; /***/
-        s->head = n;
+}
-void * pop_stack( struct stack * s ) {
-        struct stack_node * n = s->head;
-        s->head = n->next;
-        void * v = n->value;
-        free( n );
-        return v;
+}
-\end{cfa}
-\medskip\noindent
 \CFA
 \begin{cfa}[xleftmargin=2\parindentlnth,aboveskip=0pt,belowskip=0pt]
+forall( otype T ) struct stack_node;
+forall( otype T ) struct stack {
+        stack_node(T) * head;
+};
 forall( otype T ) struct stack_node {
         T value;
         stack_node(T) * next;
 };
+forall( otype T ) struct stack { stack_node(T) * head; };
+forall( otype T ) void clear( stack(T) & s ) with( s ) {
+        for ( stack_node(T) * next = head; next; ) {
+                stack_node(T) * crnt = next;
+                next = crnt->next;
+                ^(*crnt){};
+                free(crnt);
+        }
+        head = 0;
+}
+forall( otype T ) void ?{}( stack(T) & s ) { (s.head){ 0 }; }
+forall( otype T ) void ?{}( stack(T) & s, stack(T) t ) {
+forall( otype T) void ?{}( stack(T) & s ) { (s.head){ 0 }; }
+forall( otype T) void ?{}( stack(T) & s, stack(T) t ) {
         stack_node(T) ** crnt = &s.head;
         for ( stack_node(T) * next = t.head; next; next = next->next ) {
+                *crnt = alloc();
+                ((*crnt)->value){ next->value };
+                crnt = &(*crnt)->next;
+                stack_node(T) * new_node = ((stack_node(T)*)malloc());
+                (*new_node){ next->value }; /***/
+                *crnt = new_node;
+                stack_node(T) * acrnt = *crnt;
+                crnt = &acrnt->next;
+        }
         *crnt = 0;
 …
 forall( otype T ) void ^?{}( stack(T) & s) { clear( s ); }
 forall( otype T ) _Bool empty( const stack(T) & s ) { return s.head == 0; }
 forall( otype T ) void push( stack(T) & s, T value ) with( s ) {
         stack_node(T) * n = alloc();
         (*n){ value, head };
         head = n;
+}
 forall( otype T ) T pop( stack(T) & s ) with( s ) {
         stack_node(T) * n = head;
         head = n->next;
+forall( otype T ) void push( stack(T) & s, T value ) {
+        stack_node(T) * new_node = ((stack_node(T)*)malloc());
+        (*new_node){ value, s.head }; /***/
+        s.head = new_node;
+}
+forall( otype T ) T pop( stack(T) & s ) {
+        stack_node(T) * n = s.head;
+        s.head = n->next;
         T v = n->value;
+        ^(*n){};
+        free( n );
+        delete( n );
         return v;
+}
+\end{cfa}
+\begin{comment}
+forall( otype T ) {
+        struct stack_node {
+                T value;
+                stack_node(T) * next;
+        };
+        struct stack { stack_node(T) * head; };
+        void clear( stack(T) & s ) with( s ) {
+                for ( stack_node(T) * next = head; next; ) {
+                        stack_node(T) * crnt = next;
+                        next = crnt->next;
+                        ^(*crnt){};
+                        free(crnt);
+                }
+                head = 0;
+forall( otype T ) void clear( stack(T) & s ) {
+        for ( stack_node(T) * next = s.head; next; ) {
+                stack_node(T) * crnt = next;
+                next = crnt->next;
+                delete( crnt );
+        }
+        void ?{}( stack(T) & s ) { (s.head){ 0 }; }
+        void ?{}( stack(T) & s, stack(T) t ) {
+                stack_node(T) ** crnt = &s.head;
+                for ( stack_node(T) * next = t.head; next; next = next->next ) {
+                        *crnt = alloc();
+                        ((*crnt)->value){ next->value };
+                        crnt = &(*crnt)->next;
+                }
+                *crnt = 0;
+        }
+        stack(T) ?=?( stack(T) & s, stack(T) t ) {
+                if ( s.head == t.head ) return s;
+                clear( s );
+                s{ t };
+                return s;
+        }
+        void ^?{}( stack(T) & s) { clear( s ); }
+        _Bool empty( const stack(T) & s ) { return s.head == 0; }
+        void push( stack(T) & s, T value ) with( s ) {
+                stack_node(T) * n = alloc();
+                (*n){ value, head };
+                head = n;
+        }
+        T pop( stack(T) & s ) with( s ) {
+                stack_node(T) * n = head;
+                head = n->next;
+                T v = n->value;
+                ^(*n){};
+                free( n );
+                return v;
+        }
+}
+\end{comment}
+        s.head = 0;
+}
+\end{cfa}
 \medskip\noindent
 \CC
 \begin{cfa}[xleftmargin=2\parindentlnth,aboveskip=0pt,belowskip=0pt]
 template<typename T> struct stack {
+template<typename T> class stack {
         struct node {
                 T value;
                 node * next;
                 node( const T & v, node * n = nullptr ) : value( v ), next( n ) {}
+                node( const T & v, node * n = nullptr ) : value(v), next(n) {}
         };
         node * head;
+        stack() : head( nullptr ) {}
+        stack( const stack<T> & o ) { copy( o ); }
+        void copy(const stack<T>& o) {
+                node ** crnt = &head;
+                for ( node * next = o.head;; next; next = next->next ) {
+                        *crnt = new node{ next->value }; /***/
+                        crnt = &(*crnt)->next;
+                }
+                *crnt = nullptr;
+        }
+  public:
+        stack() : head(nullptr) {}
+        stack(const stack<T>& o) { copy(o); }
+        stack(stack<T> && o) : head(o.head) { o.head = nullptr; }
+        ~stack() { clear(); }
+        stack & operator= (const stack<T>& o) {
+                if ( this == &o ) return *this;
+                clear();
+                copy(o);
+                return *this;
+        }
+        stack & operator= (stack<T> && o) {
+                if ( this == &o ) return *this;
+                head = o.head;
+                o.head = nullptr;
+                return *this;
+        }
+        bool empty() const { return head == nullptr; }
+        void push(const T & value) { head = new node{ value, head };  /***/ }
+        T pop() {
+                node * n = head;
+                head = n->next;
+                T x = std::move(n->value);
+                delete n;
+                return x;
+        }
         void clear() {
                 for ( node * next = head; next; ) {
 …
                 head = nullptr;
+        }
+        void copy( const stack<T> & o ) {
+                node ** crnt = &head;
+                for ( node * next = o.head; next; next = next->next ) {
+                        *crnt = new node{ next->value }; /***/
+                        crnt = &(*crnt)->next;
+                }
+                *crnt = nullptr;
+};
+\end{cfa}
+\medskip\noindent
+C
+\begin{cfa}[xleftmargin=2\parindentlnth,aboveskip=0pt,belowskip=0pt]
+struct stack_node {
+        void * value;
+        struct stack_node * next;
+};
+struct stack new_stack() { return (struct stack){ NULL }; /***/ }
+void copy_stack(struct stack * s, const struct stack * t, void * (*copy)(const void *)) {
+        struct stack_node ** crnt = &s->head;
+        for ( struct stack_node * next = t->head; next; next = next->next ) {
+                *crnt = malloc(sizeof(struct stack_node)); /***/
+                **crnt = (struct stack_node){ copy(next->value) }; /***/
+                crnt = &(*crnt)->next;
+        }
+        ~stack() { clear(); }
+        stack & operator= ( const stack<T> & o ) {
+                if ( this == &o ) return *this;
+                clear();
+                copy( o );
+                return *this;
+        *crnt = 0;
+}
+_Bool stack_empty(const struct stack * s) { return s->head == NULL; }
+void push_stack(struct stack * s, void * value) {
+        struct stack_node * n = malloc(sizeof(struct stack_node)); /***/
+        *n = (struct stack_node){ value, s->head }; /***/
+        s->head = n;
+}
+void * pop_stack(struct stack * s) {
+        struct stack_node * n = s->head;
+        s->head = n->next;
+        void * x = n->value;
+        free(n);
+        return x;
+}
+void clear_stack(struct stack * s, void (*free_el)(void *)) {
+        for ( struct stack_node * next = s->head; next; ) {
+                struct stack_node * crnt = next;
+                next = crnt->next;
+                free_el(crnt->value);
+                free(crnt);
+        }
+        bool empty() const { return head == nullptr; }
+        void push( const T & value ) { head = new node{ value, head };  /***/ }
+        T pop() {
+                node * n = head;
+                head = n->next;
+                T v = std::move( n->value );
+                delete n;
+                return v;
+        }
+};
+        s->head = NULL;
+}
 \end{cfa}
 …
 \CCV
 \begin{cfa}[xleftmargin=2\parindentlnth,aboveskip=0pt,belowskip=0pt]
+struct stack {
+        struct node {
+                ptr<object> value;
+                node * next;
+                node( const object & v, node * n = nullptr ) : value( v.new_copy() ), next( n ) {}
+        };
+        node * head;
+        void clear() {
+                for ( node * next = head; next; ) {
+                        node * crnt = next;
+                        next = crnt->next;
+                        delete crnt;
+                }
+                head = nullptr;
+stack::node::node( const object & v, node * n ) : value( v.new_copy() ), next( n ) {}
+void stack::copy(const stack & o) {
+        node ** crnt = &head;
+        for ( node * next = o.head; next; next = next->next ) {
+                *crnt = new node{ *next->value };
+                crnt = &(*crnt)->next;
+        }
+        void copy( const stack & o ) {
+                node ** crnt = &head;
+                for ( node * next = o.head; next; next = next->next ) {
+                        *crnt = new node{ *next->value }; /***/
+                        crnt = &(*crnt)->next;
+                }
+                *crnt = nullptr;
+        *crnt = nullptr;
+}
+stack::stack() : head(nullptr) {}
+stack::stack(const stack & o) { copy(o); }
+stack::stack(stack && o) : head(o.head) { o.head = nullptr; }
+stack::~stack() { clear(); }
+stack & stack::operator= (const stack & o) {
+        if ( this == &o ) return *this;
+        clear();
+        copy(o);
+        return *this;
+}
+stack & stack::operator= (stack && o) {
+        if ( this == &o ) return *this;
+        head = o.head;
+        o.head = nullptr;
+        return *this;
+}
+bool stack::empty() const { return head == nullptr; }
+void stack::push(const object & value) { head = new node{ value, head }; /***/ }
+ptr<object> stack::pop() {
+        node * n = head;
+        head = n->next;
+        ptr<object> x = std::move(n->value);
+        delete n;
+        return x;
+}
+void stack::clear() {
+        for ( node * next = head; next; ) {
+                node * crnt = next;
+                next = crnt->next;
+                delete crnt;
+        }
+        stack() : head( nullptr ) {}
+        stack( const stack & o ) { copy( o ); }
+        ~stack() { clear(); }
+        stack & operator= ( const stack & o ) {
+                if ( this == &o ) return *this;
+                clear();
+                copy( o );
+                return *this;
+        }
+        bool empty() const { return head == nullptr; }
+        void push( const object & value ) { head = new node{ value, head }; /***/ }
+        ptr<object> pop() {
+                node * n = head;
+                head = n->next;
+                ptr<object> v = std::move( n->value );
+                delete n;
+                return v;
+        }
+};
+        head = nullptr;
+}
 \end{cfa}

doc/papers/general/evaluation/c-bench.c

-              r32cab5b
+              rb2fe1c9
 #include "c-stack.h"
+_Bool* new_bool( _Bool b ) {
+        _Bool* q = malloc(sizeof(_Bool)); /***/
+        *q = b;
+        return q;
+}
 char* new_char( char c ) {
         char* q = malloc(sizeof(char)); /***/
         *q = c;
-        return q;
+}
-short* new_short( short s ) {
-        short* q = malloc(sizeof(short)); /***/
-        *q = s;
         return q;
+}
 …
+}
+void* copy_bool( const void* p ) { return new_bool( *(const _Bool*)p ); } /***/
 void* copy_char( const void* p ) { return new_char( *(const char*)p ); } /***/
-void* copy_short( const void* p ) { return new_short( *(const short*)p ); } /***/
 void* copy_int( const void* p ) { return new_int( *(const int*)p ); } /***/
+void* copy_pair_short_char( const void* p ) { return copy_pair( p, copy_short, copy_char ); } /***/
+void free_pair_short_char( void* p ) { free_pair( p, free, free ); } /***/
+void* copy_pair_bool_char( const void* p ) { return copy_pair( p, copy_bool, copy_char ); } /***/
+void free_pair_bool_char( void* p ) { free_pair( p, free, free ); } /***/
+int cmp_bool( const void* a, const void* b ) { /***/
+        return *(const _Bool*)a == *(const _Bool*)b ? 0 : *(const _Bool*)a < *(const _Bool*)b ? -1 : 1;
+}
 int cmp_char( const void* a, const void* b ) { /***/
         return *(const char*)a == *(const char*)b ? 0 : *(const char*)a < *(const char*)b ? -1 : 1;
+}
-int cmp_short( const void* a, const void* b ) { /***/
-        return *(const short*)a == *(const short*)b ? 0 : *(const short*)a < *(const short*)b ? -1 : 1;
+}
 …
                 free(xi); )
         struct pair * maxp = new_pair( new_short(0), new_char('\0') ),
                 * valp = new_pair( new_short(42), new_char('a') );
+        struct pair * maxp = new_pair( new_bool(0), new_char('\0') ),
+                * valp = new_pair( new_bool(1), new_char('a') );
         struct stack sp = new_stack(), tp;
         REPEAT_TIMED( "push_pair", N, push_stack( &sp, copy_pair_short_char( valp ) ); )
         TIMED( "copy_pair", copy_stack( &tp, &sp, copy_pair_short_char ); /***/ )
         TIMED( "clear_pair", clear_stack( &sp, free_pair_short_char ); /***/ )
+        REPEAT_TIMED( "push_pair", N, push_stack( &sp, copy_pair_bool_char( valp ) ); )
+        TIMED( "copy_pair", copy_stack( &tp, &sp, copy_pair_bool_char ); /***/ )
+        TIMED( "clear_pair", clear_stack( &sp, free_pair_bool_char ); /***/ )
         REPEAT_TIMED( "pop_pair", N,
                 struct pair * xp = pop_stack( &tp );
                 if ( cmp_pair( xp, maxp, cmp_short, cmp_char /***/ ) > 0 ) {
                         free_pair_short_char( maxp ); /***/
+                if ( cmp_pair( xp, maxp, cmp_bool, cmp_char /***/ ) > 0 ) {
+                        free_pair_bool_char( maxp ); /***/
                         maxp = xp;
                 } else {
                         free_pair_short_char( xp ); /***/
+                        free_pair_bool_char( xp ); /***/
                 } )
         free_pair_short_char( maxp ); /***/
         free_pair_short_char( valp ); /***/
+        free_pair_bool_char( maxp ); /***/
+        free_pair_bool_char( valp ); /***/
+}

doc/papers/general/evaluation/c-stack.c

-              r32cab5b
+              rb2fe1c9
 struct stack_node {
         void * value;
         struct stack_node * next;
+        void* value;
+        struct stack_node* next;
 };
+void clear_stack( struct stack * s, void (*free_el)( void * ) ) {
+        for ( struct stack_node * next = s->head; next; ) {
+                struct stack_node * crnt = next;
+struct stack new_stack() { return (struct stack){ NULL }; /***/ }
+void copy_stack(struct stack* s, const struct stack* t, void* (*copy)(const void*)) {
+        struct stack_node** crnt = &s->head;
+        for ( struct stack_node* next = t->head; next; next = next->next ) {
+                *crnt = malloc(sizeof(struct stack_node)); /***/
+                **crnt = (struct stack_node){ copy(next->value) }; /***/
+                crnt = &(*crnt)->next;
+        }
+        *crnt = 0;
+}
+void clear_stack(struct stack* s, void (*free_el)(void*)) {
+    for ( struct stack_node* next = s->head; next; ) {
+                struct stack_node* crnt = next;
                 next = crnt->next;
                 free_el( crnt->value );
                 free( crnt );
+                free_el(crnt->value);
+                free(crnt);
+        }
         s->head = NULL;
+}
 struct stack new_stack() { return (struct stack){ NULL }; /***/ }
+_Bool stack_empty(const struct stack* s) { return s->head == NULL; }
+void copy_stack( struct stack * s, const struct stack * t, void * (*copy)( const void * ) ) {
+        struct stack_node ** crnt = &s->head;
+        for ( struct stack_node * next = t->head; next; next = next->next ) {
+                *crnt = malloc( sizeof(struct stack_node) ); /***/
+                (*crnt)->value = copy( next->value );
+                crnt = &(*crnt)->next;
+        }
+        *crnt = NULL;
+}
+struct stack * assign_stack( struct stack * s, const struct stack * t,
+                void * (*copy_el)( const void * ), void (*free_el)( void * ) ) {
+        if ( s->head == t->head ) return s;
+        clear_stack( s, free_el ); /***/
+        copy_stack( s, t, copy_el ); /***/
+        return s;
+}
+_Bool stack_empty( const struct stack * s ) { return s->head == NULL; }
+void push_stack( struct stack * s, void * v ) {
+        struct stack_node * n = malloc( sizeof(struct stack_node) ); /***/
+        *n = (struct stack_node){ v, s->head }; /***/
+void push_stack(struct stack* s, void* value) {
+        struct stack_node* n = malloc(sizeof(struct stack_node)); /***/
+        *n = (struct stack_node){ value, s->head }; /***/
         s->head = n;
+}
 void * pop_stack( struct stack * s ) {
         struct stack_node * n = s->head;
+void* pop_stack(struct stack* s) {
+        struct stack_node* n = s->head;
         s->head = n->next;
         void * v = n->value;
         free( n );
         return v;
+        void* x = n->value;
+        free(n);
+        return x;
+}

doc/papers/general/evaluation/c-stack.h

r32cab5b	rb2fe1c9
8	8	struct stack new_stack();
9	9	void copy_stack(struct stack* dst, const struct stack* src, void* (copy)(const void));
10		~~struct stack* assign_stack(struct stack* dst, const struct stack* src,~~
11		~~void* (copy_el)(const void), void (free_el)(void));~~
12	10	void clear_stack(struct stack* s, void (free_el)(void));
13	11

doc/papers/general/evaluation/cfa-bench.c

-              r32cab5b
+              rb2fe1c9
 #include "cfa-pair.h"
 int main() {
+int main( int argc, char * argv[] ) {
         int max = 0, val = 42;
         stack( int ) si, ti;
         REPEAT_TIMED( "push_int", N, push( si, val ); )
         TIMED( "copy_int", ti{ si }; )
+        TIMED( "copy_int", ti = si; )
         TIMED( "clear_int", clear( si ); )
+        REPEAT_TIMED( "pop_int", N, int x = pop( ti ); if ( x > max ) max = x; )
+        REPEAT_TIMED( "pop_int", N,
+                int x = pop( ti ); if ( x > max ) max = x; )
         pair( short, char ) max = { 0h, '\0' }, val = { 42h, 'a' };
         stack( pair( short, char ) ) sp, tp;
+        pair( _Bool, char ) max = { (_Bool)0 /***/, '\0' }, val = { (_Bool)1 /***/, 'a' };
+        stack( pair( _Bool, char ) ) sp, tp;
         REPEAT_TIMED( "push_pair", N, push( sp, val ); )
         TIMED( "copy_pair", tp{ sp }; )
+        TIMED( "copy_pair", tp = sp; )
         TIMED( "clear_pair", clear( sp ); )
+        REPEAT_TIMED( "pop_pair", N, pair(short, char) x = pop( tp ); if ( x > max ) max = x; )
+        REPEAT_TIMED( "pop_pair", N,
+                pair(_Bool, char) x = pop( tp ); if ( x > max ) max = x; )
+}

doc/papers/general/evaluation/cfa-stack.c

-              r32cab5b
+              rb2fe1c9
 #include "cfa-stack.h"
 forall( otype T ) struct stack_node {
+forall(otype T) struct stack_node {
         T value;
         stack_node(T) * next;
 };
+forall( otype T ) void clear( stack(T) & s ) with( s ) {
+        for ( stack_node(T) * next = head; next; ) {
+                stack_node(T) * crnt = next;
+                next = crnt->next;
+                ^(*crnt){};
+                free(crnt);
+        }
+        head = 0;
+}
+forall(otype T) void ?{}( stack(T) & s ) { (s.head){ 0 }; }
+forall( otype T ) void ?{}( stack(T) & s ) { (s.head){ 0 }; }
+forall( otype T ) void ?{}( stack(T) & s, stack(T) t ) {
+forall(otype T) void ?{}( stack(T) & s, stack(T) t ) {
         stack_node(T) ** crnt = &s.head;
         for ( stack_node(T) * next = t.head; next; next = next->next ) {
+                *crnt = alloc();
+                ((*crnt)->value){ next->value };
+                stack_node(T)* new_node = (stack_node(T)*)malloc(); /***/
+                (*new_node){ next->value };
+                *crnt = new_node;
                 crnt = &(*crnt)->next;
+        }
 …
+}
 forall( otype T ) stack(T) ?=?( stack(T) & s, stack(T) t ) {
+forall(otype T) stack(T) ?=?( stack(T) & s, stack(T) t ) {
         if ( s.head == t.head ) return s;
         clear( s );
 …
+}
 forall( otype T ) void ^?{}( stack(T) & s) { clear( s ); }
+forall(otype T) void ^?{}( stack(T) & s) { clear( s ); }
 forall( otype T ) _Bool empty( const stack(T) & s ) { return s.head == 0; }
+forall(otype T) _Bool empty( const stack(T) & s ) { return s.head == 0; }
 forall( otype T ) void push( stack(T) & s, T value ) with( s ) {
         stack_node(T) * n = alloc();
         (*n){ value, head };
         head = n;
+forall(otype T) void push( stack(T) & s, T value ) {
+        stack_node(T)* new_node = (stack_node(T)*)malloc(); /***/
+        (*new_node){ value, s.head };
+        s.head = new_node;
+}
 forall( otype T ) T pop( stack(T) & s ) with( s ) {
         stack_node(T) * n = head;
         head = n->next;
+forall(otype T) T pop( stack(T) & s ) {
+        stack_node(T) * n = s.head;
+        s.head = n->next;
         T v = n->value;
         ^(*n){};
 …
         return v;
+}
+forall(otype T) void clear( stack(T) & s ) {
+        for ( stack_node(T) * next = s.head; next; ) {
+                stack_node(T) * crnt = next;
+                next = crnt->next;
+                ^(*crnt){};
+                free(crnt);
+        }
+        s.head = 0;
+}

doc/papers/general/evaluation/cfa-stack.h

-              r32cab5b
+              rb2fe1c9
 #pragma once
 forall( otype T ) struct stack_node;
 forall( otype T ) struct stack {
+forall(otype T) struct stack_node;
+forall(otype T) struct stack {
         stack_node(T) * head;
 };
 forall( otype T ) void ?{}( stack(T) & s );
 forall( otype T ) void ?{}( stack(T) & s, stack(T) t );
 forall( otype T ) stack(T) ?=?( stack(T) & s, stack(T) t );
 forall( otype T ) void ^?{}( stack(T) & s);
+forall(otype T) void ?{}( stack(T) & s );
+forall(otype T) void ?{}( stack(T) & s, stack(T) t );
+forall(otype T) stack(T) ?=?( stack(T) & s, stack(T) t );
+forall(otype T) void ^?{}( stack(T) & s);
 forall( otype T ) _Bool empty( const stack(T) & s );
 forall( otype T ) void push( stack(T) & s, T value );
 forall( otype T ) T pop( stack(T) & s );
 forall( otype T ) void clear( stack(T) & s );
+forall(otype T) _Bool empty( const stack(T) & s );
+forall(otype T) void push( stack(T) & s, T value );
+forall(otype T) T pop( stack(T) & s );
+forall(otype T) void clear( stack(T) & s );

doc/papers/general/evaluation/cpp-bench.cpp

-              r32cab5b
+              rb2fe1c9
         REPEAT_TIMED( "pop_int", N, maxi = std::max( maxi, ti.pop() ); )
         pair<short, char> maxp = { 0, '\0' }, valp = { 42, 'a' };
         stack<pair<short, char>> sp, tp;
+        pair<bool, char> maxp = { false, '\0' }, valp = { true, 'a' };
+        stack<pair<bool, char>> sp, tp;
         REPEAT_TIMED( "push_pair", N, sp.push( valp ); )

doc/papers/general/evaluation/cpp-stack.hpp

-              r32cab5b
+              rb2fe1c9
 #include <utility>
 template<typename T> struct stack {
+template<typename T> class stack {
         struct node {
                 T value;
+                node * next;
+                node( const T & v, node * n = nullptr ) : value( v ), next( n ) {}
+                node* next;
+                node( const T& v, node* n = nullptr ) : value(v), next(n) {}
         };
         node * head;
+        node* head;
+        stack() : head( nullptr ) {}
+        stack( const stack<T> & o ) { copy( o ); }
+        void copy(const stack<T>& o) {
+                node** crnt = &head;
+                for ( node* next = o.head; next; next = next->next ) {
+                        *crnt = new node{ next->value }; /***/
+                        crnt = &(*crnt)->next;
+                }
+                *crnt = nullptr;
+        }
+public:
         void clear() {
                 for ( node * next = head; next; ) {
                         node * crnt = next;
+            for ( node* next = head; next; ) {
+                        node* crnt = next;
                         next = crnt->next;
                         delete crnt;
 …
+        }
+        void copy( const stack<T> & o ) {
+                node ** crnt = &head;
+                for ( node * next = o.head; next; next = next->next ) {
+                        *crnt = new node{ next->value }; /***/
+                        crnt = &(*crnt)->next;
+                }
+                *crnt = nullptr;
+        stack() : head(nullptr) {}
+        stack(const stack<T>& o) { copy(o); }
+        stack(stack<T>&& o) : head(o.head) { o.head = nullptr; }
+        ~stack() { clear(); }
+        stack& operator= (const stack<T>& o) {
+                if ( this == &o ) return *this;
+                clear();
+                copy(o);
+                return *this;
+        }
+        ~stack() { clear(); }
+        stack & operator= ( const stack<T> & o ) {
+        stack& operator= (stack<T>&& o) {
                 if ( this == &o ) return *this;
                 clear();
                 copy( o );
+                head = o.head;
+                o.head = nullptr;
                 return *this;
+        }
 …
         bool empty() const { return head == nullptr; }
         void push( const T & value ) { head = new node{ value, head };  /***/ }
+        void push(const T& value) { head = new node{ value, head };  /***/ }
         T pop() {
                 node * n = head;
+                node* n = head;
                 head = n->next;
                 T v = std::move( n->value );
+                T x = std::move(n->value);
                 delete n;
                 return v;
+                return x;
+        }
 };

doc/papers/general/evaluation/cpp-vbench.cpp

-              r32cab5b
+              rb2fe1c9
         REPEAT_TIMED( "pop_int", N, maxi = std::max( maxi, ti.pop()->as<integer>() ); /***/ )
         ptr<pair> maxp = make<pair>( make<short_integer>(0), make<character>('\0') );
         pair valp{ make<short_integer>(42), make<character>('a') };
+        ptr<pair> maxp = make<pair>( make<boolean>(false), make<character>('\0') );
+        pair valp{ make<boolean>(true), make<character>('a') };
         stack sp, tp;

doc/papers/general/evaluation/cpp-vstack.cpp

-              r32cab5b
+              rb2fe1c9
 #include <utility>
+stack::node::node( const object & v, node * n ) : value( v.new_copy() ), next( n ) {}
+stack::node::node( const object& v, node* n ) : value( v.new_copy() ), next( n ) {}
+void stack::copy(const stack& o) {
+        node** crnt = &head;
+        for ( node* next = o.head; next; next = next->next ) {
+                *crnt = new node{ *next->value };
+                crnt = &(*crnt)->next;
+        }
+        *crnt = nullptr;
+}
+stack::stack() : head(nullptr) {}
+stack::stack(const stack& o) { copy(o); }
+stack::stack(stack&& o) : head(o.head) { o.head = nullptr; }
+stack::~stack() { clear(); }
+stack& stack::operator= (const stack& o) {
+        if ( this == &o ) return *this;
+        clear();
+        copy(o);
+        return *this;
+}
+stack& stack::operator= (stack&& o) {
+        if ( this == &o ) return *this;
+        head = o.head;
+        o.head = nullptr;
+        return *this;
+}
 void stack::clear() {
         for ( node * next = head; next; ) {
                 node * crnt = next;
+    for ( node* next = head; next; ) {
+                node* crnt = next;
                 next = crnt->next;
                 delete crnt;
 …
+}
-void stack::copy( const stack & o ) {
-        node ** crnt = &head;
-        for ( node * next = o.head; next; next = next->next ) {
-                *crnt = new node{ *next->value }; /***/
-                crnt = &(*crnt)->next;
+        }
-        *crnt = nullptr;
+}
-stack::stack() : head( nullptr ) {}
-stack::stack( const stack & o ) { copy( o ); }
-stack::~stack() { clear(); }
-stack & stack::operator=( const stack & o ) {
-        if ( this == &o ) return *this;
-        clear();
-        copy( o );
-        return *this;
+}
 bool stack::empty() const { return head == nullptr; }
 void stack::push( const object & value ) { head = new node{ value, head }; /***/ }
+void stack::push(const object& value) { head = new node{ value, head }; /***/ }
 ptr<object> stack::pop() {
         node * n = head;
+        node* n = head;
         head = n->next;
         ptr<object> v = std::move( n->value );
+        ptr<object> x = std::move(n->value);
         delete n;
         return v;
+        return x;
+}

doc/papers/general/evaluation/cpp-vstack.hpp

-              r32cab5b
+              rb2fe1c9
 #include "object.hpp"
 struct stack {
+class stack {
         struct node {
                 ptr<object> value;
+                node * next;
+                node( const object & v, node * n = nullptr );
+                node* next;
+                node( const object& v, node* n = nullptr );
         };
+        node * head;
+        node* head;
+        void copy(const stack& o);
+public:
+        stack();
+        stack(const stack& o);
+        stack(stack&& o);
+        ~stack();
+        stack& operator= (const stack& o);
+        stack& operator= (stack&& o);
         void clear();
-        void copy( const stack & o );
-        stack();
-        stack( const stack & o );
-        ~stack();
-        stack & operator=( const stack& o );
         bool empty() const;
         void push( const object & value );
+        void push(const object& value);
         ptr<object> pop();
 };

doc/papers/general/evaluation/object.hpp

-              r32cab5b
+              rb2fe1c9
 };
+class boolean : public ordered, public printable {
+        bool x;
+public:
+        boolean() = default;
+        boolean(bool x) : x(x) {}
+        boolean(const boolean&) = default;
+        boolean(boolean&&) = default;
+        ptr<object> new_inst() const override { return make<boolean>(); }
+        ptr<object> new_copy() const override { return make<boolean>(*this); }
+        boolean& operator= (const boolean& that) {
+                x = that.x;
+                return *this;
+        }
+        object& operator= (const object& that) override { return *this = that.as<boolean>(); } /***/
+        boolean& operator= (boolean&&) = default;
+        ~boolean() override = default;
+        int cmp(const boolean& that) const { return x == that.x ? 0 : x == false ? -1 : 1; }
+        int cmp(const ordered& that) const override { return cmp( that.as<boolean>() ); } /***/
+        void print(std::ostream& out) const override { out << (x ? "true" : "false"); }
+};
 class character : public ordered, public printable {
         char x;
 …
 };
-class short_integer : public ordered, public printable {
-        short x;
-public:
-        short_integer() = default;
-        short_integer(short x) : x(x) {}
-        short_integer(const short_integer&) = default;
-        short_integer(short_integer&&) = default;
-        ptr<object> new_inst() const override { return make<short_integer>(); }
-        ptr<object> new_copy() const override { return make<short_integer>(*this); }
-        short_integer& operator= (const short_integer& that) {
-                x = that.x;
-                return *this;
+        }
-        object& operator= (const object& that) override { return *this = that.as<short_integer>(); } /***/
-        short_integer& operator= (short_integer&&) = default;
-        ~short_integer() override = default;
-        int cmp(const short_integer& that) const { return x == that.x ? 0 : x < that.x ? -1 : 1; }
-        int cmp(const ordered& that) const override { return cmp( that.as<short_integer>() ); } /***/
-        void print(std::ostream& out) const override { out << x; }
-};
 class integer : public ordered, public printable {
         int x;
 …
         void print(std::ostream& out) const override { out << x; }
+};
+class c_string : public printable {
+        static constexpr const char* empty = "";
+        const char* s;
+public:
+        c_string() : s(empty) {}
+        c_string(const char* s) : s(s) {}
+        c_string(const c_string&) = default;
+        c_string(c_string&&) = default;
+        ptr<object> new_inst() const override { return make<c_string>(); }
+        ptr<object> new_copy() const override { return make<c_string>(s); }
+        c_string& operator= (const c_string& that) {
+                s = that.s;
+                return *this;
+        }
+        object& operator= (const object& that) override { return *this = that.as<c_string>(); } /***/
+        c_string& operator= (c_string&&) = default;
+        ~c_string() override = default;
+        void print(std::ostream& out) const override { out << s; }
 };
 …
                 return y->as<ordered>().cmp( that.y->as<ordered>() ); /***/
+        }
         int cmp(const ordered& that) const override { return cmp( that.as<pair>() ); } /***/
+        int cmp(const ordered& that) const override { return cmp( that.as<pair>() ); }
         void print(std::ostream& out) const override {

doc/papers/general/evaluation/timing.dat

-              r32cab5b
+              rb2fe1c9
 "400 million repetitions"       "C"     "\\CFA{}"       "\\CC{}"        "\\CC{obj}"
+"push\nint"     3002    2459    1542    3269
+"copy\nint"     2985    2057    1539    3083
+"clear\nint"    1374    827     756     1469
+"pop\nint"      1416    1221    760     5098
+"push\npair"    4214    2752    950     6873
+"copy\npair"    6127    2105    987     7293
+"clear\npair"   2881    885     751     3460
+"pop\npair"     3046    5434    822     24962
+"push\nint"     2976    2225    1522    3266
+"copy\nnt"      2932    7072    1526    3110
+"clear\nint"    1380    731     750     1488
+"pop\nint"      1444    1196    756     5156
+"push\npair"    3695    2257    953     6840
+"copy\npair"    6034    6650    994     7224
+"clear\npair"   2832    848     742     3297
+"pop\npair"     3009    5348    797     25235

doc/papers/general/evaluation/timing.gp

-              r32cab5b
+              rb2fe1c9
 SCALE=1000
 set ylabel "seconds"
-set yrange [0:10]
-set label "25.0" at 7.125,10.5
 # set datafile separator ","

doc/refrat/keywords.tex

-              r32cab5b
+              rb2fe1c9
 %% Created On       : Sun Aug  6 08:17:27 2017
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Fri Apr  6 15:16:11 2018
 %% Update Count     : 7
+%% Last Modified On : Wed Aug 30 22:10:10 2017
+%% Update Count     : 5
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \begin{tabular}{@{}llllll@{}}
 \begin{tabular}{@{}l@{}}
+©_At©                   \\
 ©catch©                 \\
 ©catchResume©   \\
 ©choose©                \\
 ©coroutine©             \\
-©disable©               \\
 \end{tabular}
+&
 \begin{tabular}{@{}l@{}}
+©disable©               \\
 ©dtype©                 \\
 ©enable©                \\
-©exception©             \\
 ©fallthrough©   \\
 ©fallthru©              \\
 …
 ©forall©                \\
 ©ftype©                 \\
+©lvalue©                \\
 ©monitor©               \\
-©mutex©                 \\
 \end{tabular}
+&
 \begin{tabular}{@{}l@{}}
+©mutex©                 \\
 ©one_t©                 \\
 ©otype©                 \\
 ©throw©                 \\
 ©throwResume©   \\
-©trait©                 \\
 \end{tabular}
+&
 \begin{tabular}{@{}l@{}}
+©trait©                 \\
 ©try©                   \\
 ©ttype©                 \\
 ©virtual©               \\
 ©waitfor©               \\
-©when©                  \\
 \end{tabular}
+&
 \begin{tabular}{@{}l@{}}
+©when©                  \\
 ©with©                  \\
 ©zero_t©                \\
-                                \\
                                 \\
                                 \\

doc/user/user.tex

-              r32cab5b
+              rb2fe1c9
 %% Created On       : Wed Apr  6 14:53:29 2016
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Sat Apr 14 19:04:30 2018
 %% Update Count     : 3318
+%% Last Modified On : Tue Feb 13 08:31:21 2018
+%% Update Count     : 3161
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 …
 double key = 5.0, vals[10] = { /* 10 sorted floating values */ };
 double * val = (double *)bsearch( &key, vals, 10, sizeof(vals[0]), comp );      §\C{// search sorted array}§
+double * val = (double *)bsearch( &key, vals, 10, sizeof(vals[0]), comp );      $\C{// search sorted array}$
 \end{lstlisting}
 which can be augmented simply with a polymorphic, type-safe, \CFA-overloaded wrappers:
 …
 forall( otype T | { int ?<?( T, T ); } ) unsigned int bsearch( T key, const T * arr, size_t size ) {
         T * result = bsearch( key, arr, size ); §\C{// call first version}§
         return result ? result - arr : size; }  §\C{// pointer subtraction includes sizeof(T)}§
 double * val = bsearch( 5.0, vals, 10 );        §\C{// selection based on return type}§
+        T * result = bsearch( key, arr, size ); $\C{// call first version}$
+        return result ? result - arr : size; }  $\C{// pointer subtraction includes sizeof(T)}$
+double * val = bsearch( 5.0, vals, 10 );        $\C{// selection based on return type}$
 int posn = bsearch( 5.0, vals, 10 );
 \end{lstlisting}
 …
 The 1999 C standard plus GNU extensions.
 \item
 \Indexc[deletekeywords=inline]{-fgnu89-inline}\index{compilation option!-fgnu89-inline@{\lstinline[deletekeywords=inline]@-fgnu89-inline@}}
+\Indexc[deletekeywords=inline]{-fgnu89-inline}\index{compilation option!-fgnu89-inline@{\lstinline[deletekeywords=inline]$-fgnu89-inline$}}
 Use the traditional GNU semantics for inline routines in C99 mode, which allows inline routines in header files.
 \end{description}
 …
 C, \CC, and Java (and many other programming languages) have no exponentiation operator\index{exponentiation!operator}\index{operator!exponentiation}, \ie $x^y$, and instead use a routine, like \Indexc{pow}, to perform the exponentiation operation.
 \CFA extends the basic operators with the exponentiation operator ©?\?©\index{?\\?@\lstinline@?\?@} and ©?\=?©\index{?\\=?@\lstinline@?\=?@}, as in, ©x \ y© and ©x \= y©, which means $x^y$ and $x \leftarrow x^y$.
+\CFA extends the basic operators with the exponentiation operator ©?\?©\index{?\\?@\lstinline$?\?$} and ©?\=?©\index{?\\=?@\lstinline$?\=?$}, as in, ©x \ y© and ©x \= y©, which means $x^y$ and $x \leftarrow x^y$.
 The priority of the exponentiation operator is between the cast and multiplicative operators, so that ©w * (int)x \ (int)y * z© is parenthesized as ©((w * (((int)x) \ ((int)y))) * z)©.
 …
 \section{\texorpdfstring{Labelled \protect\lstinline@continue@ / \protect\lstinline@break@}{Labelled continue / break}}
+\section{\texorpdfstring{Labelled \LstKeywordStyle{continue} / \LstKeywordStyle{break}}{Labelled continue / break}}
 While C provides ©continue© and ©break© statements for altering control flow, both are restricted to one level of nesting for a particular control structure.
 Unfortunately, this restriction forces programmers to use \Indexc{goto} to achieve the equivalent control-flow for more than one level of nesting.
 To prevent having to switch to the ©goto©, \CFA extends the \Indexc{continue}\index{continue@\lstinline@continue@!labelled}\index{labelled!continue@©continue©} and \Indexc{break}\index{break@\lstinline@break@!labelled}\index{labelled!break@©break©} with a target label to support static multi-level exit\index{multi-level exit}\index{static multi-level exit}~\cite{Buhr85}, as in Java.
+To prevent having to switch to the ©goto©, \CFA extends the \Indexc{continue}\index{continue@\lstinline $continue$!labelled}\index{labelled!continue@©continue©} and \Indexc{break}\index{break@\lstinline $break$!labelled}\index{labelled!break@©break©} with a target label to support static multi-level exit\index{multi-level exit}\index{static multi-level exit}~\cite{Buhr85}, as in Java.
 For both ©continue© and ©break©, the target label must be directly associated with a ©for©, ©while© or ©do© statement;
 for ©break©, the target label can also be associated with a ©switch©, ©if© or compound (©{}©) statement.
 …
 \end{figure}
 Both labelled ©continue© and ©break© are a ©goto©\index{goto@\lstinline@goto@!restricted} restricted in the following ways:
+Both labelled ©continue© and ©break© are a ©goto©\index{goto@\lstinline $goto$!restricted} restricted in the following ways:
 \begin{itemize}
 \item
 …
 \section{\texorpdfstring{\protect\lstinline@switch@ Statement}{switch Statement}}
+\section{\texorpdfstring{\LstKeywordStyle{switch} Statement}{switch Statement}}
 C allows a number of questionable forms for the ©switch© statement:
 …
 \section{\texorpdfstring{\protect\lstinline@case@ Clause}{case Clause}}
+\section{\texorpdfstring{\LstKeywordStyle{case} Clause}{case Clause}}
 C restricts the ©case© clause of a ©switch© statement to a single value.
 …
 \end{tabular}
 \end{cquote}
+In addition, subranges are allowed to specify case values.\footnote{
+gcc has the same mechanism but awkward syntax, \lstinline@2 ...42@, because a space is required after a number, otherwise the period is a decimal point.}
+In addition, two forms of subranges are allowed to specify case values: a new \CFA form and an existing GNU C form.\footnote{
+The GNU C form \emph{requires} spaces around the ellipse.}
+\begin{cquote}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{\hspace{2em}}l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c@{\hspace{2em}}}{\textbf{GNU C}}     \\
 \begin{cfa}
 switch ( i ) {
   case ®1~5:®                                   §\C{// 1, 2, 3, 4, 5}§
+  case ®1~5:®
         ...
   case ®10~15:®                                 §\C{// 10, 11, 12, 13, 14, 15}§
+  case ®10~15:®
         ...
+}
 \end{cfa}
+&
+\begin{cfa}
+switch ( i )
+  case ®1 ... 5®:
+        ...
+  case ®10 ... 15®:
+        ...
+}
+\end{cfa}
+&
+\begin{cfa}
+// 1, 2, 3, 4, 5
+// 10, 11, 12, 13, 14, 15
+\end{cfa}
+\end{tabular}
+\end{cquote}
 Lists of subranges are also allowed.
 \begin{cfa}
 …
+\section{\texorpdfstring{\protect\lstinline@with@ Statement}{with Statement}}
+\label{s:WithStatement}
+Grouping heterogeneous data into \newterm{aggregate}s (structure/union) is a common programming practice, and an aggregate can be further organized into more complex structures, such as arrays and containers:
+\begin{cfa}
+struct S {                                                                      §\C{// aggregate}§
+        char c;                                                                 §\C{// fields}§
+        int i;
+        double d;
+};
+S s, as[10];
+\end{cfa}
+However, functions manipulating aggregates must repeat the aggregate name to access its containing fields:
+\begin{cfa}
+void f( S s ) {
+        `s.`c; `s.`i; `s.`d;                                    §\C{// access containing fields}§
+}
+\end{cfa}
+which extends to multiple levels of qualification for nested aggregates.
+A similar situation occurs in object-oriented programming, \eg \CC:
+\begin{C++}
+struct S {
+        char c;                                                                 §\C{// fields}§
+        int i;
+        double d;
+        void f() {                                                              §\C{// implicit ``this'' aggregate}§
+                `this->`c; `this->`i; `this->`d;        §\C{// access containing fields}§
+        }
+}
+\end{C++}
+Object-oriented nesting of member functions in a \lstinline[language=C++]@class/struct@ allows eliding \lstinline[language=C++]$this->$ because of lexical scoping.
+However, for other aggregate parameters, qualification is necessary:
+\begin{cfa}
+struct T { double m, n; };
+int S::f( T & t ) {                                                     §\C{// multiple aggregate parameters}§
+        c; i; d;                                                                §\C{\color{red}// this--{\textgreater}.c, this--{\textgreater}.i, this--{\textgreater}.d}§
+        `t.`m; `t.`n;                                                   §\C{// must qualify}§
+}
+\end{cfa}
+To simplify the programmer experience, \CFA provides a @with@ statement (see Pascal~\cite[\S~4.F]{Pascal}) to elide aggregate qualification to fields by opening a scope containing the field identifiers.
+Hence, the qualified fields become variables with the side-effect that it is easier to optimizing field references in a block.
+\begin{cfa}
+void f( S & this ) `with ( this )` {            §\C{// with statement}§
+        c; i; d;                                                                §\C{\color{red}// this.c, this.i, this.d}§
+}
+\end{cfa}
+with the generality of opening multiple aggregate-parameters:
+\begin{cfa}
+void f( S & s, T & t ) `with ( s, t )` {                §\C{// multiple aggregate parameters}§
+        c; i; d;                                                                §\C{\color{red}// s.c, s.i, s.d}§
+        m; n;                                                                   §\C{\color{red}// t.m, t.n}§
+}
+\end{cfa}
+In detail, the @with@ statement has the form:
+\begin{cfa}
+§\emph{with-statement}§:
+        'with' '(' §\emph{expression-list}§ ')' §\emph{compound-statement}§
+\end{cfa}
+and may appear as the body of a function or nested within a function body.
+Each expression in the expression-list provides a type and object.
+The type must be an aggregate type.
+(Enumerations are already opened.)
+The object is the implicit qualifier for the open structure-fields.
+All expressions in the expression list are open in parallel within the compound statement.
+This semantic is different from Pascal, which nests the openings from left to right.
+The difference between parallel and nesting occurs for fields with the same name and type:
+\begin{cfa}
+struct S { int `i`; int j; double m; } s, w;
+struct T { int `i`; int k; int m; } t, w;
+with ( s, t ) {
+        j + k;                                                                  §\C{// unambiguous, s.j + t.k}§
+        m = 5.0;                                                                §\C{// unambiguous, t.m = 5.0}§
+        m = 1;                                                                  §\C{// unambiguous, s.m = 1}§
+        int a = m;                                                              §\C{// unambiguous, a = s.i }§
+        double b = m;                                                   §\C{// unambiguous, b = t.m}§
+        int c = s.i + t.i;                                              §\C{// unambiguous, qualification}§
+        (double)m;                                                              §\C{// unambiguous, cast}§
+}
+\end{cfa}
+For parallel semantics, both @s.i@ and @t.i@ are visible, so @i@ is ambiguous without qualification;
+for nested semantics, @t.i@ hides @s.i@, so @i@ implies @t.i@.
+\CFA's ability to overload variables means fields with the same name but different types are automatically disambiguated, eliminating most qualification when opening multiple aggregates.
+Qualification or a cast is used to disambiguate.
+There is an interesting problem between parameters and the function-body @with@, \eg:
+\begin{cfa}
+void ?{}( S & s, int i ) with ( s ) {           §\C{// constructor}§
+        `s.i = i;`  j = 3;  m = 5.5;                    §\C{// initialize fields}§
+}
+\end{cfa}
+Here, the assignment @s.i = i@ means @s.i = s.i@, which is meaningless, and there is no mechanism to qualify the parameter @i@, making the assignment impossible using the function-body @with@.
+To solve this problem, parameters are treated like an initialized aggregate:
+\begin{cfa}
+struct Params {
+        S & s;
+        int i;
+} params;
+\end{cfa}
+and implicitly opened \emph{after} a function-body open, to give them higher priority:
+\begin{cfa}
+void ?{}( S & s, int `i` ) with ( s ) `with( §\emph{\color{red}params}§ )` {
+        s.i = `i`; j = 3; m = 5.5;
+}
+\end{cfa}
+Finally, a cast may be used to disambiguate among overload variables in a @with@ expression:
+\begin{cfa}
+with ( w ) { ... }                                                      §\C{// ambiguous, same name and no context}§
+with ( (S)w ) { ... }                                           §\C{// unambiguous, cast}§
+\end{cfa}
+and @with@ expressions may be complex expressions with type reference (see Section~\ref{s:References}) to aggregate:
+% \begin{cfa}
+% struct S { int i, j; } sv;
+% with ( sv ) {                                                         §\C{// implicit reference}§
+%       S & sr = sv;
+%       with ( sr ) {                                                   §\C{// explicit reference}§
+%               S * sp = &sv;
+%               with ( *sp ) {                                          §\C{// computed reference}§
+%                       i = 3; j = 4;                                   §\C{\color{red}// sp--{\textgreater}i, sp--{\textgreater}j}§
+%               }
+%               i = 2; j = 3;                                           §\C{\color{red}// sr.i, sr.j}§
+%       }
+%       i = 1; j = 2;                                                   §\C{\color{red}// sv.i, sv.j}§
+% }
+% \end{cfa}
+\section{\texorpdfstring{\LstKeywordStyle{with} Clause / Statement}{with Clause / Statement}}
+\label{s:WithClauseStatement}
 In \Index{object-oriented} programming, there is an implicit first parameter, often names \textbf{©self©} or \textbf{©this©}, which is elided.
 …
 \CFA provides a ©with© clause/statement (see Pascal~\cite[\S~4.F]{Pascal}) to elided the "©this.©" by opening a scope containing field identifiers, changing the qualified fields into variables and giving an opportunity for optimizing qualified references.
 \begin{cfa}
 int mem( S & this ) ®with( this )® { §\C{// with clause}§
+int mem( S & this ) ®with this® { §\C{// with clause}§
         i = 1;                                          §\C{\color{red}// this.i}§
         j = 2;                                          §\C{\color{red}// this.j}§
 …
 \begin{cfa}
 struct T { double m, n; };
 int mem2( S & this1, T & this2 ) ®with( this1, this2 )® {
+int mem2( S & this1, T & this2 ) ®with this1, this2® {
         i = 1; j = 2;
         m = 1.0; n = 2.0;
 …
         struct S1 { ... } s1;
         struct S2 { ... } s2;
         ®with( s1 )® {                          §\C{// with statement}§
+        ®with s1® {                                     §\C{// with statement}§
                 // access fields of s1 without qualification
                 ®with s2® {                             §\C{// nesting}§
 …
 struct S { int i; int j; double m; } a, c;
 struct T { int i; int k; int m } b, c;
+with( a, b )
+{
+}
+\end{cfa}
+\begin{comment}
+®with a, b® {
+        j + k;                                          §\C{// unambiguous, unique names define unique types}§
+        i;                                                      §\C{// ambiguous, same name and type}§
+        a.i + b.i;                                      §\C{// unambiguous, qualification defines unique names}§
+        m;                                                      §\C{// ambiguous, same name and no context to define unique type}§
+        m = 5.0;                                        §\C{// unambiguous, same name and context defines unique type}§
+        m = 1;                                          §\C{// unambiguous, same name and context defines unique type}§
+}
+®with c® { ... }                                §\C{// ambiguous, same name and no context}§
+®with (S)c® { ... }                             §\C{// unambiguous, same name and cast defines unique type}§
+\end{cfa}
 The components in the "with" clause
 …
 the "with" to be implemented because I hate having to type all those object
 names for fields. It's a great way to drive people away from the language.
-\end{comment}
 …
 \item
 lvalue to reference conversion: \lstinline[deletekeywords=lvalue]@lvalue-type cv1 T@ converts to ©cv2 T &©, which allows implicitly converting variables to references.
+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 &)
 …
-\section{Time}
-\label{s:TimeLib}
-%\subsection{\texorpdfstring{\protect\lstinline@Duration@}{Duration}}
-\subsection{\texorpdfstring{\LstKeywordStyle{\textmd{Duration}}}{Duration}}
-\label{s:Duration}
-\leavevmode
-\begin{cfa}[aboveskip=0pt,belowskip=0pt]
-struct Duration {
-        int64_t tv;                                                     §\C{// nanoseconds}§
-};
-void ?{}( Duration & dur );
-void ?{}( Duration & dur, zero_t );
-Duration ?=?( Duration & dur, zero_t );
-Duration +?( Duration rhs );
-Duration ?+?( Duration & lhs, Duration rhs );
-Duration ?+=?( Duration & lhs, Duration rhs );
-Duration -?( Duration rhs );
-Duration ?-?( Duration & lhs, Duration rhs );
-Duration ?-=?( Duration & lhs, Duration rhs );
-Duration ?*?( Duration lhs, int64_t rhs );
-Duration ?*?( int64_t lhs, Duration rhs );
-Duration ?*=?( Duration & lhs, int64_t rhs );
-int64_t ?/?( Duration lhs, Duration rhs );
-Duration ?/?( Duration lhs, int64_t rhs );
-Duration ?/=?( Duration & lhs, int64_t rhs );
-double div( Duration lhs, Duration rhs );
-Duration ?%?( Duration lhs, Duration rhs );
-Duration ?%=?( Duration & lhs, Duration rhs );
-_Bool ?==?( Duration lhs, Duration rhs );
-_Bool ?!=?( Duration lhs, Duration rhs );
-_Bool ?<? ( Duration lhs, Duration rhs );
-_Bool ?<=?( Duration lhs, Duration rhs );
-_Bool ?>? ( Duration lhs, Duration rhs );
-_Bool ?>=?( Duration lhs, Duration rhs );
-_Bool ?==?( Duration lhs, zero_t );
-_Bool ?!=?( Duration lhs, zero_t );
-_Bool ?<? ( Duration lhs, zero_t );
-_Bool ?<=?( Duration lhs, zero_t );
-_Bool ?>? ( Duration lhs, zero_t );
-_Bool ?>=?( Duration lhs, zero_t );
-Duration abs( Duration rhs );
-forall( dtype ostype | ostream( ostype ) ) ostype & ?|?( ostype & os, Duration dur );
-Duration ?`ns( int64_t nsec );
-Duration ?`us( int64_t usec );
-Duration ?`ms( int64_t msec );
-Duration ?`s( int64_t sec );
-Duration ?`s( double sec );
-Duration ?`m( int64_t min );
-Duration ?`m( double min );
-Duration ?`h( int64_t hours );
-Duration ?`h( double hours );
-Duration ?`d( int64_t days );
-Duration ?`d( double days );
-Duration ?`w( int64_t weeks );
-Duration ?`w( double weeks );
-int64_t ?`ns( Duration dur );
-int64_t ?`us( Duration dur );
-int64_t ?`ms( Duration dur );
-int64_t ?`s( Duration dur );
-int64_t ?`m( Duration dur );
-int64_t ?`h( Duration dur );
-int64_t ?`d( Duration dur );
-int64_t ?`w( Duration dur );
-\end{cfa}
-%\subsection{\texorpdfstring{\protect\lstinline@\timeval@}{timeval}}
-\subsection{\texorpdfstring{\LstKeywordStyle{\textmd{timeval}}}{timeval}}
-\label{s:timeval}
-\leavevmode
-\begin{cfa}[aboveskip=0pt,belowskip=0pt]
-void ?{}( timeval & t );
-void ?{}( timeval & t, time_t sec, suseconds_t usec );
-void ?{}( timeval & t, time_t sec );
-void ?{}( timeval & t, zero_t );
-void ?{}( timeval & t, Time time );
-timeval ?=?( timeval & t, zero_t );
-timeval ?+?( timeval & lhs, timeval rhs );
-timeval ?-?( timeval & lhs, timeval rhs );
-_Bool ?==?( timeval lhs, timeval rhs );
-_Bool ?!=?( timeval lhs, timeval rhs );
-\end{cfa}
-\subsection{\texorpdfstring{\protect\lstinline@timespec@}{timespec}}
-\label{s:timespec}
-\leavevmode
-\begin{cfa}[aboveskip=0pt,belowskip=0pt]
-void ?{}( timespec & t );
-void ?{}( timespec & t, time_t sec, __syscall_slong_t nsec );
-void ?{}( timespec & t, time_t sec );
-void ?{}( timespec & t, zero_t );
-void ?{}( timespec & t, Time time );
-timespec ?=?( timespec & t, zero_t );
-timespec ?+?( timespec & lhs, timespec rhs );
-timespec ?-?( timespec & lhs, timespec rhs );
-_Bool ?==?( timespec lhs, timespec rhs );
-_Bool ?!=?( timespec lhs, timespec rhs );
-\end{cfa}
-\subsection{\texorpdfstring{\protect\lstinline@itimerval@}{itimerval}}
-\label{s:itimerval}
-\leavevmode
-\begin{cfa}[aboveskip=0pt,belowskip=0pt]
-void ?{}( itimerval & itv, Duration alarm );
-void ?{}( itimerval & itv, Duration alarm, Duration interval );
-\end{cfa}
-\subsection{\texorpdfstring{\protect\lstinline@Time@}{Time}}
-\label{s:Time}
-\leavevmode
-\begin{cfa}[aboveskip=0pt,belowskip=0pt]
-struct Time {
-        uint64_t tv;                                            §\C{// nanoseconds since UNIX epoch}§
-};
-void ?{}( Time & time );
-void ?{}( Time & time, zero_t );
-void ?{}( Time & time, int year, int month = 0, int day = 0, int hour = 0, int min = 0, int sec = 0, int nsec = 0 );
-Time ?=?( Time & time, zero_t );
-void ?{}( Time & time, timeval t );
-Time ?=?( Time & time, timeval t );
-void ?{}( Time & time, timespec t );
-Time ?=?( Time & time, timespec t );
-Time ?+?( Time & lhs, Duration rhs ) { return (Time)@{ lhs.tv + rhs.tv }; }
-Time ?+?( Duration lhs, Time rhs ) { return rhs + lhs; }
-Time ?+=?( Time & lhs, Duration rhs ) { lhs = lhs + rhs; return lhs; }
-Duration ?-?( Time lhs, Time rhs ) { return (Duration)@{ lhs.tv - rhs.tv }; }
-Time ?-?( Time lhs, Duration rhs ) { return (Time)@{ lhs.tv - rhs.tv }; }
-Time ?-=?( Time & lhs, Duration rhs ) { lhs = lhs - rhs; return lhs; }
-_Bool ?==?( Time lhs, Time rhs ) { return lhs.tv == rhs.tv; }
-_Bool ?!=?( Time lhs, Time rhs ) { return lhs.tv != rhs.tv; }
-_Bool ?<?( Time lhs, Time rhs ) { return lhs.tv < rhs.tv; }
-_Bool ?<=?( Time lhs, Time rhs ) { return lhs.tv <= rhs.tv; }
-_Bool ?>?( Time lhs, Time rhs ) { return lhs.tv > rhs.tv; }
-_Bool ?>=?( Time lhs, Time rhs ) { return lhs.tv >= rhs.tv; }
-forall( dtype ostype | ostream( ostype ) ) ostype & ?|?( ostype & os, Time time );
-char * yy_mm_dd( Time time, char * buf );
-char * ?`ymd( Time time, char * buf ) { // short form
-        return yy_mm_dd( time, buf );
-} // ymd
-char * mm_dd_yy( Time time, char * buf );
-char * ?`mdy( Time time, char * buf ) { // short form
-        return mm_dd_yy( time, buf );
-} // mdy
-char * dd_mm_yy( Time time, char * buf );
-char * ?`dmy( Time time, char * buf ) { // short form
-        return dd_mm_yy( time, buf );;
-} // dmy
-size_t strftime( char * buf, size_t size, const char * fmt, Time time );
-\end{cfa}
-\section{Clock}
-\subsection{C time}
-\label{s:Ctime}
-\leavevmode
-\begin{cfa}[aboveskip=0pt,belowskip=0pt]
-char * ctime( time_t tp );
-char * ctime_r( time_t tp, char * buf );
-tm * gmtime( time_t tp );
-tm * gmtime_r( time_t tp, tm * result );
-tm * localtime( time_t tp );
-tm * localtime_r( time_t tp, tm * result );
-\end{cfa}
-%\subsection{\texorpdfstring{\protect\lstinline@Clock@}{Clock}}
-\subsection{\texorpdfstring{\LstKeywordStyle{\textmd{Clock}}}{Clock}}
-\label{s:Clock}
-\leavevmode
-\begin{cfa}[aboveskip=0pt,belowskip=0pt]
-struct Clock {
-        Duration offset;                                        §\C{// for virtual clock: contains offset from real-time}§
-        int clocktype;                                          §\C{// implementation only -1 (virtual), CLOCK\_REALTIME}§
-};
-void resetClock( Clock & clk );
-void resetClock( Clock & clk, Duration adj );
-void ?{}( Clock & clk );
-void ?{}( Clock & clk, Duration adj );
-Duration getRes();
-Time getTimeNsec();                                             §\C{// with nanoseconds}§
-Time getTime();                                                 §\C{// without nanoseconds}§
-Time getTime( Clock & clk );
-Time ?()( Clock & clk );
-timeval getTime( Clock & clk );
-tm getTime( Clock & clk );
-\end{cfa}
 \section{Multi-precision Integers}
 \label{s:MultiPrecisionIntegers}
 …
 \end{cfa}
 \bibliographystyle{plain}
 \bibliography{pl}

src/CodeGen/CodeGenerator.cc

-              r32cab5b
+              rb2fe1c9
         void CodeGenerator::handleAggregate( AggregateDecl * aggDecl, const std::string & kind ) {
+                genAttributes( aggDecl->get_attributes() );
                 if( ! aggDecl->get_parameters().empty() && ! genC ) {
                         // assertf( ! genC, "Aggregate type parameters should not reach code generation." );
 …
+                }
+                output << kind;
+                genAttributes( aggDecl->get_attributes() );
+                output << aggDecl->get_name();
+                output << kind << aggDecl->get_name();
                 if ( aggDecl->has_body() ) {
 …
                         output << " }";
+                }
+        }
-        void CodeGenerator::postvisit( StaticAssertDecl * assertDecl ) {
-                output << "_Static_assert(";
-                assertDecl->condition->accept( *visitor );
-                output << ", ";
-                assertDecl->message->accept( *visitor );
-                output << ")";
+        }
 …
                         output << "continue";
                         break;
-                  case BranchStmt::FallThrough:
-                  case BranchStmt::FallThroughDefault:
-                        assertf( ! genC, "fallthru should not reach code generation." );
-                  output << "fallthru";
-                        break;
                 } // switch
-                // print branch target for labelled break/continue/fallthru in debug mode
-                if ( ! genC && branchStmt->get_type() != BranchStmt::Goto ) {
-                        if ( ! branchStmt->get_target().empty() ) {
-                                output << " " << branchStmt->get_target();
-                        } else if ( branchStmt->get_type() == BranchStmt::FallThrough ) {
-                                output << " default";
+                        }
+                }
                 output << ";";
+        }

src/CodeGen/CodeGenerator.h

-              r32cab5b
+              rb2fe1c9
                 void postvisit( FunctionDecl * );
                 void postvisit( ObjectDecl * );
+                void postvisit( UnionDecl * aggregateDecl );
+                void postvisit( EnumDecl * aggregateDecl );
+                void postvisit( TraitDecl * aggregateDecl );
+                void postvisit( TypedefDecl * typeDecl );
+                void postvisit( TypeDecl * typeDecl );
+                void postvisit( StaticAssertDecl * assertDecl );
+                void postvisit( UnionDecl *aggregateDecl );
+                void postvisit( EnumDecl *aggregateDecl );
+                void postvisit( TraitDecl *aggregateDecl );
+                void postvisit( TypedefDecl *typeDecl );
+                void postvisit( TypeDecl *typeDecl );
                 //*** Initializer

src/CodeGen/OperatorTable.cc

-              r32cab5b
+              rb2fe1c9
         } // namespace
         bool operatorLookup( const std::string & funcName, OperatorInfo & info ) {
+        bool operatorLookup( std::string funcName, OperatorInfo &info ) {
                 static bool init = false;
                 if ( ! init ) {
 …
                         return true;
                 } // if
+        }
-        bool isOperator( const std::string & funcName ) {
-                OperatorInfo info;
-                return operatorLookup( funcName, info );
+        }

src/CodeGen/OperatorTable.h

-              r32cab5b
+              rb2fe1c9
         };
+        bool isOperator( const std::string & funcName );
+        bool operatorLookup( const std::string & funcName, OperatorInfo & info );
+        bool operatorLookup( std::string funcName, OperatorInfo &info );
         bool isConstructor( const std::string & );

src/Common/Debug.h

-              r32cab5b
+              rb2fe1c9
 namespace Debug {
         /// debug codegen a translation unit
         static inline void codeGen( __attribute__((unused)) const std::list< Declaration * > & translationUnit, __attribute__((unused)) const std::string & label, __attribute__((unused)) LinkageSpec::Spec linkageFilter = LinkageSpec::Compiler ) {
+        static inline void codeGen( __attribute__((unused)) const std::list< Declaration * > & translationUnit, __attribute__((unused)) const std::string & label ) {
         #ifdef DEBUG
                 std::list< Declaration * > decls;
                 filter( translationUnit.begin(), translationUnit.end(), back_inserter( decls ), [linkageFilter]( Declaration * decl ) {
                         return ! (decl->linkage & linkageFilter);
+                filter( translationUnit.begin(), translationUnit.end(), back_inserter( decls ), []( Declaration * decl ) {
+                        return ! LinkageSpec::isBuiltin( decl->get_linkage() );
                 });
                 std::cerr << "======" << label << "======" << std::endl;
                 CodeGen::generate( decls, std::cerr, true, true );
+                CodeGen::generate( decls, std::cerr, false, true );
         #endif
         } // dump
         static inline void treeDump( __attribute__((unused)) const std::list< Declaration * > & translationUnit, __attribute__((unused)) const std::string & label, __attribute__((unused)) LinkageSpec::Spec linkageFilter = LinkageSpec::Compiler ) {
+        static inline void treeDump( __attribute__((unused)) const std::list< Declaration * > & translationUnit, __attribute__((unused)) const std::string & label ) {
         #ifdef DEBUG
                 std::list< Declaration * > decls;
                 filter( translationUnit.begin(), translationUnit.end(), back_inserter( decls ), [linkageFilter]( Declaration * decl ) {
                         return ! (decl->linkage & linkageFilter);
+                filter( translationUnit.begin(), translationUnit.end(), back_inserter( decls ), []( Declaration * decl ) {
+                        return ! LinkageSpec::isBuiltin( decl->get_linkage() );
                 });

src/Common/ErrorObjects.h

r32cab5b	rb2fe1c9
35	35	class SemanticErrorException : public std::exception {
36	36	public:
37		SemanticErrorException() = default;
	37	SemanticErrorException() = default;
38	38	SemanticErrorException( CodeLocation location, std::string error );
39	39	~SemanticErrorException() throw() {}

src/Common/PassVisitor.h

-              r32cab5b
+              rb2fe1c9
         virtual void visit( TypedefDecl * typeDecl ) override final;
         virtual void visit( AsmDecl * asmDecl ) override final;
-        virtual void visit( StaticAssertDecl * assertDecl ) override final;
         virtual void visit( CompoundStmt * compoundStmt ) override final;
 …
         virtual Declaration * mutate( TypedefDecl * typeDecl ) override final;
         virtual AsmDecl * mutate( AsmDecl * asmDecl ) override final;
-        virtual StaticAssertDecl * mutate( StaticAssertDecl * assertDecl ) override final;
         virtual CompoundStmt * mutate( CompoundStmt * compoundStmt ) override final;

src/Common/PassVisitor.impl.h

-              r32cab5b
+              rb2fe1c9
 //--------------------------------------------------------------------------
-// StaticAssertDecl
-template< typename pass_type >
-void PassVisitor< pass_type >::visit( StaticAssertDecl * node ) {
-        VISIT_START( node );
-        maybeAccept_impl( node->condition, *this );
-        maybeAccept_impl( node->message  , *this );
-        VISIT_END( node );
+}
-template< typename pass_type >
-StaticAssertDecl * PassVisitor< pass_type >::mutate( StaticAssertDecl * node ) {
-        MUTATE_START( node );
-        maybeMutate_impl( node->condition, *this );
-        maybeMutate_impl( node->message  , *this );
-        MUTATE_END( StaticAssertDecl, node );
+}
-//--------------------------------------------------------------------------
 // CompoundStmt
 template< typename pass_type >
 …
         indexerScopedAccept( node->result, *this );
         maybeAccept_impl   ( node->type  , *this );
+        maybeAccept_impl   ( node->member, *this );
         VISIT_END( node );
 …
         indexerScopedMutate( node->result, *this );
         maybeMutate_impl   ( node->type  , *this );
+        maybeMutate_impl   ( node->member, *this );
         MUTATE_END( Expression, node );

src/Common/SemanticError.h

-              r32cab5b
+              rb2fe1c9
 constexpr const char * const WarningFormats[] = {
         "self assignment of expression: %s",
-        "rvalue to reference conversion of rvalue: %s",
 };
 enum class Warning {
         SelfAssignment,
-        RvalueToReferenceConversion,
         NUMBER_OF_WARNINGS, //This MUST be the last warning
 };
 …
 );
+// ## used here to allow empty __VA_ARGS__
+#define SemanticWarning(loc, id, ...) SemanticWarningImpl(loc, id, WarningFormats[(int)id], ## __VA_ARGS__)
+#define SemanticWarning(loc, id, ...) SemanticWarningImpl(loc, id, WarningFormats[(int)id], __VA_ARGS__)
 void SemanticWarningImpl (CodeLocation loc, Warning warn, const char * const fmt, ...) __attribute__((format(printf, 3, 4)));

src/ControlStruct/ExceptTranslate.cc

-              r32cab5b
+              rb2fe1c9
 #include "SynTree/Statement.h"        // for CompoundStmt, CatchStmt, ThrowStmt
 #include "SynTree/Type.h"             // for FunctionType, Type, noQualifiers
 #include "SynTree/DeclReplacer.h"     // for DeclReplacer
+#include "SynTree/VarExprReplacer.h"  // for VarExprReplacer, VarExprReplace...
 #include "SynTree/Visitor.h"          // for acceptAll
 …
                         // Update variables in the body to point to this local copy.
+                        {
                                 DeclReplacer::DeclMap mapping;
+                                VarExprReplacer::DeclMap mapping;
                                 mapping[ handler_decl ] = local_except;
                                 DeclReplacer::replace( handler->body, mapping );
+                                VarExprReplacer::replace( handler->body, mapping );
+                        }

src/ControlStruct/MLEMutator.cc

-              r32cab5b
+              rb2fe1c9
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Mar  8 17:08:25 2018
 // Update Count     : 219
+// Last Modified On : Thu Aug  4 11:21:32 2016
+// Update Count     : 202
 //
 …
+        }
         namespace {
+                bool isLoop( const MLEMutator::Entry & e ) { return dynamic_cast< WhileStmt * >( e.get_controlStructure() ) || dynamic_cast< ForStmt * >( e.get_controlStructure() ); }
+                bool isSwitch( const MLEMutator::Entry & e ) { return dynamic_cast< SwitchStmt *>( e.get_controlStructure() ); }
+                bool isBreakTarget( const MLEMutator::Entry & e ) { return isLoop( e ) || isSwitch( e ) || dynamic_cast< CompoundStmt *>( e.get_controlStructure() ); }
+                bool isContinueTarget( const MLEMutator::Entry & e ) { return isLoop( e ); }
+                bool isFallthroughTarget( const MLEMutator::Entry & e ) { return dynamic_cast< CaseStmt *>( e.get_controlStructure() );; }
+                bool isFallthroughDefaultTarget( const MLEMutator::Entry & e ) { return isSwitch( e ); }
+        } // namespace
+                Statement * isLoop( Statement * stmt ) { return dynamic_cast< WhileStmt * >( stmt ) ? stmt : dynamic_cast< ForStmt * >( stmt ) ? stmt : 0; }
+        }
         // break labels have to come after the statement they break out of, so mutate a statement, then if they inform us
         // through the breakLabel field tha they need a place to jump to on a break statement, add the break label to the
         // body of statements
+        void MLEMutator::fixBlock( std::list< Statement * > &kids, bool caseClause ) {
+                SemanticErrorException errors;
+        void MLEMutator::fixBlock( std::list< Statement * > &kids ) {
                 for ( std::list< Statement * >::iterator k = kids.begin(); k != kids.end(); k++ ) {
+                        if ( caseClause ) {
+                                // once a label is seen, it's no longer a valid fallthrough target
+                                for ( Label & l : (*k)->labels ) {
+                                        fallthroughLabels.erase( l );
+                                }
+                        }
+                        // aggregate errors since the PassVisitor mutate loop was unrollled
+                        try {
+                                *k = (*k)->acceptMutator(*visitor);
+                        } catch( SemanticErrorException &e ) {
+                                errors.append( e );
+                        }
+                        *k = (*k)->acceptMutator(*visitor);
                         if ( ! get_breakLabel().empty() ) {
 …
                         } // if
                 } // for
-                if ( ! errors.isEmpty() ) {
-                        throw errors;
+                }
+        }
 …
                         Label brkLabel = generator->newLabel("blockBreak", cmpndStmt);
                         enclosingControlStructures.push_back( Entry( cmpndStmt, brkLabel ) );
-                        GuardAction( [this]() { enclosingControlStructures.pop_back(); } );
                 } // if
 …
                                 set_breakLabel( enclosingControlStructures.back().useBreakExit() );
                         } // if
+                        enclosingControlStructures.pop_back();
                 } // if
+        }
 …
                                         if ( isContinue ) {
                                                 // continue target is outermost loop
                                                 targetEntry = std::find_if( enclosingControlStructures.rbegin(), enclosingControlStructures.rend(), isContinueTarget );
+                                                targetEntry = std::find_if( enclosingControlStructures.rbegin(), enclosingControlStructures.rend(), [](Entry &e) { return isLoop( e.get_controlStructure() ); } );
                                         } else {
                                                 // break target is outermost loop, switch, or block control structure
                                                 if ( enclosingControlStructures.empty() ) SemanticError( branchStmt->location, "'break' outside a loop, 'switch', or labelled block" );
                                                 targetEntry = std::find_if( enclosingControlStructures.rbegin(), enclosingControlStructures.rend(), isBreakTarget );
+                                                // break target is outmost control structure
+                                                if ( enclosingControlStructures.empty() ) SemanticError( branchStmt->location, "'break' outside a loop, switch, or labelled block" );
+                                                targetEntry = enclosingControlStructures.rbegin();
                                         } // if
                                 } else {
 …
                                 } // if
                                 // ensure that selected target is valid
                                 if ( targetEntry == enclosingControlStructures.rend() || (isContinue && ! isContinueTarget( *targetEntry ) ) ) {
+                                if ( targetEntry == enclosingControlStructures.rend() || (isContinue && ! isLoop( targetEntry->get_controlStructure() ) ) ) {
                                         SemanticError( branchStmt->location, toString( (isContinue ? "'continue'" : "'break'"), " target must be an enclosing ", (isContinue ? "loop: " : "control structure: "), originalTarget ) );
                                 } // if
                                 break;
+                        }
-                        case BranchStmt::FallThrough:
-                                targetEntry = std::find_if( enclosingControlStructures.rbegin(), enclosingControlStructures.rend(), isFallthroughTarget );
-                                // ensure that selected target is valid
-                                if ( targetEntry == enclosingControlStructures.rend() ) {
-                                        SemanticError( branchStmt->location, "'fallthrough' must be enclosed in a 'switch' or 'choose'" );
-                                } // if
-                                if ( branchStmt->get_target() != "" ) {
-                                        // labelled fallthrough
-                                        // target must be in the set of valid fallthrough labels
-                                        if ( ! fallthroughLabels.count( branchStmt->get_target() ) ) {
-                                                SemanticError( branchStmt->location, toString( "'fallthrough' target must be a later case statement: ", originalTarget ) );
+                                        }
-                                        return new BranchStmt( originalTarget, BranchStmt::Goto );
+                                }
-                                break;
-                        case BranchStmt::FallThroughDefault: {
-                                // fallthrough default
-                                targetEntry = std::find_if( enclosingControlStructures.rbegin(), enclosingControlStructures.rend(), isFallthroughDefaultTarget );
-                                // ensure that fallthrough is within a switch or choose
-                                if ( targetEntry == enclosingControlStructures.rend() ) {
-                                        SemanticError( branchStmt->location, "'fallthrough' must be enclosed in a 'switch' or 'choose'" );
-                                } // if
-                                // ensure that switch or choose has a default clause
-                                SwitchStmt * switchStmt = strict_dynamic_cast< SwitchStmt * >( targetEntry->get_controlStructure() );
-                                bool foundDefault = false;
-                                for ( Statement * stmt : switchStmt->statements ) {
-                                        CaseStmt * caseStmt = strict_dynamic_cast< CaseStmt * >( stmt );
-                                        if ( caseStmt->isDefault() ) {
-                                                foundDefault = true;
-                                        } // if
-                                } // for
-                                if ( ! foundDefault ) {
-                                        SemanticError( branchStmt->location, "'fallthrough default' must be enclosed in a 'switch' or 'choose' control structure with a 'default' clause" );
+                                }
-                                break;
+                        }
                         default:
                                 assert( false );
 …
                                 exitLabel = targetEntry->useContExit();
                                 break;
-                  case BranchStmt::FallThrough:
-                                assert( targetEntry->useFallExit() != "");
-                                exitLabel = targetEntry->useFallExit();
-                                break;
-                  case BranchStmt::FallThroughDefault:
-                                assert( targetEntry->useFallDefaultExit() != "");
-                                exitLabel = targetEntry->useFallDefaultExit();
-                                // check that fallthrough default comes before the default clause
-                                if ( ! targetEntry->isFallDefaultValid() ) {
-                                        SemanticError( branchStmt->location, "'fallthrough default' must precede the 'default' clause" );
+                                }
-                                break;
                   default:
                                 assert(0);                                      // shouldn't be here
 …
                 Label contLabel = generator->newLabel("loopContinue", loopStmt);
                 enclosingControlStructures.push_back( Entry( loopStmt, brkLabel, contLabel ) );
-                GuardAction( [this]() { enclosingControlStructures.pop_back(); } );
+        }
 …
                 // this will take the necessary steps to add definitions of the previous two labels, if they are used.
+                loopStmt->body = mutateLoop( loopStmt->get_body(), e );
+                loopStmt->set_body( mutateLoop( loopStmt->get_body(), e ) );
+                enclosingControlStructures.pop_back();
                 return loopStmt;
+        }
 …
                         Label brkLabel = generator->newLabel("blockBreak", ifStmt);
                         enclosingControlStructures.push_back( Entry( ifStmt, brkLabel ) );
-                        GuardAction( [this]() { enclosingControlStructures.pop_back(); } );
                 } // if
+        }
 …
                                 set_breakLabel( enclosingControlStructures.back().useBreakExit() );
                         } // if
+                        enclosingControlStructures.pop_back();
                 } // if
                 return ifStmt;
 …
         void MLEMutator::premutate( CaseStmt *caseStmt ) {
                 visit_children = false;
-                // mark default as seen before visiting its statements to catch default loops
-                if ( caseStmt->isDefault() ) {
-                        enclosingControlStructures.back().seenDefault();
-                } // if
                 caseStmt->condition = maybeMutate( caseStmt->condition, *visitor );
+                Label fallLabel = generator->newLabel( "fallThrough", caseStmt );
+                {
+                        // ensure that stack isn't corrupted by exceptions in fixBlock
+                        auto guard = makeFuncGuard( [&]() { enclosingControlStructures.push_back( Entry( caseStmt, fallLabel ) ); }, [this]() { enclosingControlStructures.pop_back(); } );
+                        // empty case statement
+                        if( ! caseStmt->stmts.empty() ) {
+                                // the parser ensures that all statements in a case are grouped into a block
+                                CompoundStmt * block = strict_dynamic_cast< CompoundStmt * >( caseStmt->stmts.front() );
+                                fixBlock( block->kids, true );
+                                // add fallthrough label if necessary
+                                assert( ! enclosingControlStructures.empty() );
+                                if ( enclosingControlStructures.back().isFallUsed() ) {
+                                        std::list<Label> ls{ enclosingControlStructures.back().useFallExit() };
+                                        caseStmt->stmts.push_back( new NullStmt( ls ) );
+                                } // if
+                        } // if
+                }
+                assert( ! enclosingControlStructures.empty() );
+                assertf( dynamic_cast<SwitchStmt *>( enclosingControlStructures.back().get_controlStructure() ), "Control structure enclosing a case clause must be a switch, but is: %s", toCString( enclosingControlStructures.back().get_controlStructure() ) );
+                if ( caseStmt->isDefault() ) {
+                        if ( enclosingControlStructures.back().isFallDefaultUsed() ) {
+                                // add fallthrough default label if necessary
+                                std::list<Label> ls{ enclosingControlStructures.back().useFallDefaultExit() };
+                                caseStmt->stmts.push_front( new NullStmt( ls ) );
+                        } // if
+                } // if
+                fixBlock( caseStmt->stmts );
+        }
 …
                 // generate a label for breaking out of a labeled switch
                 Label brkLabel = generator->newLabel("switchBreak", switchStmt);
+                auto it = std::find_if( switchStmt->statements.rbegin(), switchStmt->statements.rend(), [](Statement * stmt) {
+                        CaseStmt * caseStmt = strict_dynamic_cast< CaseStmt * >( stmt );
+                        return caseStmt->isDefault();
+                });
+                CaseStmt * defaultCase = it != switchStmt->statements.rend() ? strict_dynamic_cast<CaseStmt *>( *it ) : nullptr;
+                Label fallDefaultLabel = defaultCase ? generator->newLabel( "fallThroughDefault", defaultCase ) : "";
+                enclosingControlStructures.push_back( Entry(switchStmt, brkLabel, fallDefaultLabel) );
+                GuardAction( [this]() { enclosingControlStructures.pop_back(); } );
+                // Collect valid labels for fallthrough. This is initially all labels at the same level as a case statement.
+                // As labels are seen during traversal, they are removed, since fallthrough is not allowed to jump backwards.
+                for ( Statement * stmt : switchStmt->statements ) {
+                        CaseStmt * caseStmt = strict_dynamic_cast< CaseStmt * >( stmt );
+                        if ( caseStmt->stmts.empty() ) continue;
+                        CompoundStmt * block = dynamic_cast< CompoundStmt * >( caseStmt->stmts.front() );
+                        for ( Statement * stmt : block->kids ) {
+                                for ( Label & l : stmt->labels ) {
+                                        fallthroughLabels.insert( l );
+                                }
+                        }
+                }
+                enclosingControlStructures.push_back( Entry(switchStmt, brkLabel) );
+        }
 …
                 assert ( enclosingControlStructures.back() == switchStmt );
+                enclosingControlStructures.pop_back();
                 return switchStmt;
+        }

src/ControlStruct/MLEMutator.h

-              r32cab5b
+              rb2fe1c9
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Mar  8 16:42:32 2018
 // Update Count     : 41
+// Last Modified On : Sat Jul 22 09:19:59 2017
+// Update Count     : 35
 //
 …
 #include <map>                     // for map
 #include <string>                  // for string
-#include <set>                     // for unordered_set
 #include "Common/PassVisitor.h"
 …
         class LabelGenerator;
+        class MLEMutator : public WithVisitorRef<MLEMutator>, public WithShortCircuiting, public WithGuards {
+        class MLEMutator : public WithVisitorRef<MLEMutator>, public WithShortCircuiting {
+                class Entry;
           public:
-                class Entry;
                 MLEMutator( std::map<Label, Statement *> *t, LabelGenerator *gen = 0 ) : targetTable( t ), breakLabel(std::string("")), generator( gen ) {}
                 ~MLEMutator();
 …
                 Label &get_breakLabel() { return breakLabel; }
                 void set_breakLabel( Label newValue ) { breakLabel = newValue; }
+          private:
                 class Entry {
                   public:
+                        // specialized constructors for each combination of statement with labelled break/continue/fallthrough that is valid to cleanup the use cases
+                        explicit Entry( ForStmt *stmt, Label breakExit, Label contExit ) :
+                                stmt( stmt ), breakExit( breakExit ), contExit( contExit ) {}
+                        explicit Entry( Statement *_loop, Label _breakExit, Label _contExit = Label("") ) :
+                                loop( _loop ), breakExit( _breakExit ), contExit( _contExit ), breakUsed(false), contUsed(false) {}
                         explicit Entry( WhileStmt *stmt, Label breakExit, Label contExit ) :
                                 stmt( stmt ), breakExit( breakExit ), contExit( contExit ) {}
+                        bool operator==( const Statement *stmt ) { return loop == stmt; }
+                        bool operator!=( const Statement *stmt ) { return loop != stmt; }
+                        explicit Entry( CompoundStmt *stmt, Label breakExit ) :
+                                stmt( stmt ), breakExit( breakExit ) {}
+                        bool operator==( const Entry &other ) { return loop == other.get_controlStructure(); }
+                        explicit Entry( IfStmt *stmt, Label breakExit ) :
+                                stmt( stmt ), breakExit( breakExit ) {}
+                        explicit Entry( CaseStmt *stmt, Label fallExit ) :
+                                stmt( stmt ), fallExit( fallExit ) {}
+                        explicit Entry( SwitchStmt *stmt, Label breakExit, Label fallDefaultExit ) :
+                                stmt( stmt ), breakExit( breakExit ), fallDefaultExit( fallDefaultExit ) {}
+                        bool operator==( const Statement *other ) { return stmt == other; }
+                        bool operator!=( const Statement *other ) { return stmt != other; }
+                        bool operator==( const Entry &other ) { return stmt == other.get_controlStructure(); }
+                        Statement *get_controlStructure() const { return stmt; }
+                        Statement *get_controlStructure() const { return loop; }
                         Label useContExit() { contUsed = true; return contExit; }
                         Label useBreakExit() { breakUsed = true; return breakExit; }
-                        Label useFallExit() { fallUsed = true; return fallExit; }
-                        Label useFallDefaultExit() { fallDefaultUsed = true; return fallDefaultExit; }
                         bool isContUsed() const { return contUsed; }
                         bool isBreakUsed() const { return breakUsed; }
-                        bool isFallUsed() const { return fallUsed; }
-                        bool isFallDefaultUsed() const { return fallDefaultUsed; }
-                        void seenDefault() { fallDefaultValid = false; }
-                        bool isFallDefaultValid() const { return fallDefaultValid; }
                   private:
+                        Statement *stmt;
+                        Label breakExit, contExit, fallExit, fallDefaultExit;
+                        bool breakUsed = false, contUsed = false, fallUsed = false, fallDefaultUsed = false;
+                        bool fallDefaultValid = true;
+                        Statement *loop;
+                        Label breakExit, contExit;
+                        bool breakUsed, contUsed;
                 };
-          private:
                 std::map< Label, Statement * > *targetTable;
-                std::set< Label > fallthroughLabels;
                 std::list< Entry > enclosingControlStructures;
                 Label breakLabel;
 …
                 Statement * posthandleLoopStmt( LoopClass * loopStmt );
                 void fixBlock( std::list< Statement * > &kids, bool caseClause = false );
+                void fixBlock( std::list< Statement * > &kids );
         };
 } // namespace ControlStruct

src/GenPoly/GenPoly.cc

-              r32cab5b
+              rb2fe1c9
                 if ( dynamic_cast< TypeInstType * >( type ) ) {
                         return type;
-                } else if ( ArrayType * arrayType = dynamic_cast< ArrayType * >( type ) ) {
-                        return isPolyType( arrayType->base, env );
                 } else if ( StructInstType *structType = dynamic_cast< StructInstType* >( type ) ) {
                         if ( hasPolyParams( structType->get_parameters(), env ) ) return type;
 …
                                 return type;
+                        }
-                } else if ( ArrayType * arrayType = dynamic_cast< ArrayType * >( type ) ) {
-                        return isPolyType( arrayType->base, tyVars, env );
                 } else if ( StructInstType *structType = dynamic_cast< StructInstType* >( type ) ) {
                         if ( hasPolyParams( structType->get_parameters(), tyVars, env ) ) return type;

src/GenPoly/Lvalue.cc

-              r32cab5b
+              rb2fe1c9
                 Expression * mkDeref( Expression * arg ) {
                         if ( SymTab::dereferenceOperator ) {
-                                // note: reference depth can be arbitrarily deep here, so peel off the outermost pointer/reference, not just pointer because they are effecitvely equivalent in this pass
                                 VariableExpr * deref = new VariableExpr( SymTab::dereferenceOperator );
                                 deref->result = new PointerType( Type::Qualifiers(), deref->result );
 …
+                }
                 struct ReferenceConversions final : public WithStmtsToAdd {
+                struct ReferenceConversions final {
                         Expression * postmutate( CastExpr * castExpr );
                         Expression * postmutate( AddressExpr * addrExpr );
 …
+        }
         void convertLvalue( std::list< Declaration* > & translationUnit ) {
+        void convertLvalue( std::list< Declaration* >& translationUnit ) {
                 PassVisitor<ReferenceConversions> refCvt;
                 PassVisitor<ReferenceTypeElimination> elim;
 …
                                         // use type of return variable rather than expr result type, since it may have been changed to a pointer type
                                         FunctionType * ftype = GenPoly::getFunctionType( func->get_type() );
                                         Type * ret = ftype->returnVals.empty() ? nullptr : ftype->returnVals.front()->get_type();
                                         return func->linkage == LinkageSpec::Intrinsic && dynamic_cast<ReferenceType *>( ret );
+                                        Type * ret = ftype->get_returnVals().empty() ? nullptr : ftype->get_returnVals().front()->get_type();
+                                        return func->get_linkage() == LinkageSpec::Intrinsic && dynamic_cast<ReferenceType *>( ret );
+                                }
+                        }
 …
                         if ( isIntrinsicReference( appExpr ) ) {
                                 // eliminate reference types from intrinsic applications - now they return lvalues
                                 Type * result = appExpr->result;
                                 appExpr->result = result->stripReferences()->clone();
                                 appExpr->result->set_lvalue( true );
+                                Type * result = appExpr->get_result();
+                                appExpr->set_result( result->stripReferences()->clone() );
+                                appExpr->get_result()->set_lvalue( true );
                                 if ( ! inIntrinsic ) {
                                         // when not in an intrinsic function, add a cast to
                                         // don't add cast when in an intrinsic function, since they already have the cast
                                         Expression * ret = new CastExpr( appExpr, result );
+                                        std::swap( ret->env, appExpr->env );
+                                        ret->set_env( appExpr->get_env() );
+                                        appExpr->set_env( nullptr );
                                         return ret;
+                                }
 …
                                 assertf( ftype, "Function declaration does not have function type." );
                                 // can be of differing lengths only when function is variadic
                                 assertf( ftype->parameters.size() == appExpr->args.size() || ftype->isVarArgs, "ApplicationExpr args do not match formal parameter type." );
+                                assertf( ftype->get_parameters().size() == appExpr->get_args().size() || ftype->get_isVarArgs(), "ApplicationExpr args do not match formal parameter type." );
                                 unsigned int i = 0;
                                 const unsigned int end = ftype->parameters.size();
                                 for ( auto p : unsafe_group_iterate( appExpr->args, ftype->parameters ) ) {
+                                const unsigned int end = ftype->get_parameters().size();
+                                for ( auto p : unsafe_group_iterate( appExpr->get_args(), ftype->get_parameters() ) ) {
                                         if (i == end) break;
                                         Expression *& arg = std::get<0>( p );
 …
                                         PRINT(
                                                 std::cerr << "pair<0>: " << arg << std::endl;
-                                                std::cerr << " -- " << arg->result << std::endl;
                                                 std::cerr << "pair<1>: " << formal << std::endl;
+                                        )
                                         if ( dynamic_cast<ReferenceType*>( formal ) ) {
+                                                PRINT(
+                                                        std::cerr << "===formal is reference" << std::endl;
+                                                )
+                                                // TODO: it's likely that the second condition should be ... && ! isIntrinsicReference( arg ), but this requires investigation.
+                                                if ( function->get_linkage() != LinkageSpec::Intrinsic && isIntrinsicReference( arg ) ) {
+                                                        // if argument is dereference or array subscript, the result isn't REALLY a reference, but non-intrinsic functions expect a reference: take address
+                                                        PRINT(
+                                                                std::cerr << "===is intrinsic arg in non-intrinsic call - adding address" << std::endl;
+                                                        )
+                                                        arg = new AddressExpr( arg );
+                                                } else if ( function->get_linkage() == LinkageSpec::Intrinsic && arg->result->referenceDepth() != 0 ) {
+                                                        // argument is a 'real' reference, but function expects a C lvalue: add a dereference to the reference-typed argument
+                                                        PRINT(
+                                                                std::cerr << "===is non-intrinsic arg in intrinsic call - adding deref to arg" << std::endl;
+                                                        )
+                                                        Type * baseType = InitTweak::getPointerBase( arg->result );
+                                                        assertf( baseType, "parameter is reference, arg must be pointer or reference: %s", toString( arg->result ).c_str() );
+                                                if ( isIntrinsicReference( arg ) ) { // do not combine conditions, because that changes the meaning of the else if
+                                                        if ( function->get_linkage() != LinkageSpec::Intrinsic ) { // intrinsic functions that turn pointers into references
+                                                                // if argument is dereference or array subscript, the result isn't REALLY a reference, so it's not necessary to fix the argument
+                                                                PRINT(
+                                                                        std::cerr << "===is intrinsic arg in non-intrinsic call - adding address" << std::endl;
+                                                                )
+                                                                arg = new AddressExpr( arg );
+                                                        }
+                                                } else if ( function->get_linkage() == LinkageSpec::Intrinsic ) {
+                                                        // std::cerr << "===adding deref to arg" << std::endl;
+                                                        // if the parameter is a reference, add a dereference to the reference-typed argument.
+                                                        Type * baseType = InitTweak::getPointerBase( arg->get_result() );
+                                                        assertf( baseType, "parameter is reference, arg must be pointer or reference: %s", toString( arg->get_result() ).c_str() );
                                                         PointerType * ptrType = new PointerType( Type::Qualifiers(), baseType->clone() );
                                                         delete arg->result;
+                                                        delete arg->get_result();
                                                         arg->set_result( ptrType );
                                                         arg = mkDeref( arg );
-                                                        assertf( arg->result->referenceDepth() == 0, "Reference types should have been eliminated from intrinsic function calls, but weren't: %s", toCString( arg->result ) );
+                                                }
+                                        }
 …
                 Expression * AddrRef::postmutate( AddressExpr * addrExpr ) {
                         if ( refDepth == 0 ) {
                                 if ( ! isIntrinsicReference( addrExpr->arg ) ) {
+                                if ( ! isIntrinsicReference( addrExpr->get_arg() ) ) {
                                         // try to avoid ?[?]
                                         refDepth = addrExpr->arg->result->referenceDepth();
+                                        refDepth = addrExpr->get_arg()->get_result()->referenceDepth();
+                                }
+                        }
 …
                         // pointer casts in the right places.
+                        // Note: reference depth difference is the determining factor in what code is run, rather than whether something is
+                        // reference type or not, since conversion still needs to occur when both types are references that differ in depth.
+                        Type * destType = castExpr->result;
+                        Type * srcType = castExpr->arg->result;
+                        int depth1 = destType->referenceDepth();
+                        int depth2 = srcType->referenceDepth();
+                        int diff = depth1 - depth2;
+                        if ( diff > 0 && ! srcType->get_lvalue() ) {
+                                // rvalue to reference conversion -- introduce temporary
+                                // know that reference depth of cast argument is 0, need to introduce n temporaries for reference depth of n, e.g.
+                                //   (int &&&)3;
+                                // becomes
+                                //   int __ref_tmp_0 = 3;
+                                //   int & __ref_tmp_1 = _&_ref_tmp_0;
+                                //   int && __ref_tmp_2 = &__ref_tmp_1;
+                                //   &__ref_tmp_2;
+                                // the last & comes from the remaining reference conversion code
+                                SemanticWarning( castExpr->arg->location, Warning::RvalueToReferenceConversion, toCString( castExpr->arg ) );
+                                static UniqueName tempNamer( "__ref_tmp_" );
+                                ObjectDecl * temp = ObjectDecl::newObject( tempNamer.newName(), castExpr->arg->result->clone(), new SingleInit( castExpr->arg ) );
+                                PRINT( std::cerr << "made temp: " << temp << std::endl; )
+                                stmtsToAddBefore.push_back( new DeclStmt( temp ) );
+                                for ( int i = 0; i < depth1-1; i++ ) { // xxx - maybe this should be diff-1? check how this works with reference type for srcType
+                                        ObjectDecl * newTemp = ObjectDecl::newObject( tempNamer.newName(), new ReferenceType( Type::Qualifiers(), temp->type->clone() ), new SingleInit( new AddressExpr( new VariableExpr( temp ) ) ) );
+                                        PRINT( std::cerr << "made temp" << i << ": " << newTemp << std::endl; )
+                                        stmtsToAddBefore.push_back( new DeclStmt( newTemp ) );
+                                        temp = newTemp;
+                                }
+                                // update diff so that remaining code works out correctly
+                                castExpr->arg = new VariableExpr( temp );
+                                PRINT( std::cerr << "update cast to: " << castExpr << std::endl; )
+                                srcType = castExpr->arg->result;
+                                depth2 = srcType->referenceDepth();
+                                diff = depth1 - depth2;
+                                assert( diff == 1 );
+                        }
+                        // handle conversion between different depths
+                        PRINT (
+                                if ( depth1 || depth2 ) {
+                                        std::cerr << "destType: " << destType << " / srcType: " << srcType << std::endl;
+                                        std::cerr << "depth: " << depth1 << " / " << depth2 << std::endl;
+                                }
+                        )
+                        if ( diff > 0 ) {
+                                // conversion to type with more depth (e.g. int & -> int &&): add address-of for each level of difference
+                        // conversion to reference type
+                        if ( ReferenceType * refType = dynamic_cast< ReferenceType * >( castExpr->get_result() ) ) {
+                                (void)refType;
+                                if ( ReferenceType * otherRef = dynamic_cast< ReferenceType * >( castExpr->get_arg()->get_result() ) ) {
+                                        // nothing to do if casting from reference to reference.
+                                        (void)otherRef;
+                                        PRINT( std::cerr << "convert reference to reference -- nop" << std::endl; )
+                                        if ( isIntrinsicReference( castExpr->get_arg() ) ) {
+                                                Expression * callExpr = castExpr->get_arg();
+                                                PRINT(
+                                                        std::cerr << "but arg is deref -- &" << std::endl;
+                                                        std::cerr << callExpr << std::endl;
+                                                )
+                                                callExpr = new AddressExpr( callExpr ); // this doesn't work properly for multiple casts
+                                                delete callExpr->get_result();
+                                                callExpr->set_result( refType->clone() );
+                                                // move environment out to new top-level
+                                                callExpr->set_env( castExpr->get_env() );
+                                                castExpr->set_arg( nullptr );
+                                                castExpr->set_env( nullptr );
+                                                delete castExpr;
+                                                return callExpr;
+                                        }
+                                        int depth1 = refType->referenceDepth();
+                                        int depth2 = otherRef->referenceDepth();
+                                        int diff = depth1-depth2;
+                                        if ( diff == 0 ) {
+                                                // conversion between references of the same depth
+                                                assertf( depth1 == depth2, "non-intrinsic reference with cast of reference to reference not yet supported: %d %d %s", depth1, depth2, toString( castExpr ).c_str() );
+                                                PRINT( std::cerr << castExpr << std::endl; )
+                                                return castExpr;
+                                        } else if ( diff < 0 ) {
+                                                // conversion from reference to reference with less depth (e.g. int && -> int &): add dereferences
+                                                Expression * ret = castExpr->arg;
+                                                for ( int i = 0; i < diff; ++i ) {
+                                                        ret = mkDeref( ret );
+                                                }
+                                                ret->env = castExpr->env;
+                                                delete ret->result;
+                                                ret->result = castExpr->result;
+                                                ret->result->set_lvalue( true ); // ensure result is lvalue
+                                                castExpr->env = nullptr;
+                                                castExpr->arg = nullptr;
+                                                castExpr->result = nullptr;
+                                                delete castExpr;
+                                                return ret;
+                                        } else if ( diff > 0 ) {
+                                                // conversion from reference to reference with more depth (e.g. int & -> int &&): add address-of
+                                                Expression * ret = castExpr->arg;
+                                                for ( int i = 0; i < diff; ++i ) {
+                                                        ret = new AddressExpr( ret );
+                                                }
+                                                ret->env = castExpr->env;
+                                                delete ret->result;
+                                                ret->result = castExpr->result;
+                                                castExpr->env = nullptr;
+                                                castExpr->arg = nullptr;
+                                                castExpr->result = nullptr;
+                                                delete castExpr;
+                                                return ret;
+                                        }
+                                        assertf( depth1 == depth2, "non-intrinsic reference with cast of reference to reference not yet supported: %d %d %s", depth1, depth2, toString( castExpr ).c_str() );
+                                        PRINT( std::cerr << castExpr << std::endl; )
+                                        return castExpr;
+                                } else if ( castExpr->arg->result->get_lvalue() ) {
+                                        // conversion from lvalue to reference
+                                        // xxx - keep cast, but turn into pointer cast??
+                                        // xxx - memory
+                                        PRINT(
+                                                std::cerr << "convert lvalue to reference -- &" << std::endl;
+                                                std::cerr << castExpr->arg << std::endl;
+                                        )
+                                        AddressExpr * ret = new AddressExpr( castExpr->arg );
+                                        if ( refType->base->get_qualifiers() != castExpr->arg->result->get_qualifiers() ) {
+                                                // must keep cast if cast-to type is different from the actual type
+                                                castExpr->arg = ret;
+                                                return castExpr;
+                                        }
+                                        ret->env = castExpr->env;
+                                        delete ret->result;
+                                        ret->result = castExpr->result;
+                                        castExpr->env = nullptr;
+                                        castExpr->arg = nullptr;
+                                        castExpr->result = nullptr;
+                                        delete castExpr;
+                                        return ret;
+                                } else {
+                                        // rvalue to reference conversion -- introduce temporary
+                                }
+                                assertf( false, "Only conversions to reference from lvalue are currently supported: %s", toString( castExpr ).c_str() );
+                        } else if ( ReferenceType * refType = dynamic_cast< ReferenceType * >( castExpr->arg->result ) ) {
+                                (void)refType;
+                                // conversion from reference to rvalue
+                                PRINT(
+                                        std::cerr << "convert reference to rvalue -- *" << std::endl;
+                                        std::cerr << "was = " << castExpr << std::endl;
+                                )
                                 Expression * ret = castExpr->arg;
+                                for ( int i = 0; i < diff; ++i ) {
+                                        ret = new AddressExpr( ret );
+                                }
+                                if ( srcType->get_lvalue() && srcType->get_qualifiers() != strict_dynamic_cast<ReferenceType *>( destType )->base->get_qualifiers() ) {
+                                        // must keep cast if cast-to type is different from the actual type
+                                        castExpr->arg = ret;
+                                        return castExpr;
+                                }
+                                ret->env = castExpr->env;
+                                delete ret->result;
+                                ret->result = castExpr->result;
+                                castExpr->env = nullptr;
+                                castExpr->arg = nullptr;
+                                castExpr->result = nullptr;
+                                delete castExpr;
+                                return ret;
+                        } else if ( diff < 0 ) {
+                                // conversion to type with less depth (e.g. int && -> int &): add dereferences for each level of difference
+                                diff = -diff; // care only about magnitude now
+                                Expression * ret = castExpr->arg;
+                                for ( int i = 0; i < diff; ++i ) {
+                                TypeSubstitution * env = castExpr->env;
+                                castExpr->set_env( nullptr );
+                                if ( ! isIntrinsicReference( ret ) ) {
+                                        // dereference if not already dereferenced
                                         ret = mkDeref( ret );
+                                }
+                                if ( ! ResolvExpr::typesCompatibleIgnoreQualifiers( destType->stripReferences(), srcType->stripReferences(), SymTab::Indexer() ) ) {
+                                if ( ResolvExpr::typesCompatibleIgnoreQualifiers( castExpr->result, castExpr->arg->result->stripReferences(), SymTab::Indexer() ) ) {
+                                        // can remove cast if types are compatible, changing expression type to value type
+                                        ret->result = castExpr->result->clone();
+                                        ret->result->set_lvalue( true );  // ensure result is lvalue
+                                        castExpr->arg = nullptr;
+                                        delete castExpr;
+                                } else {
                                         // must keep cast if types are different
                                         castExpr->arg = ret;
+                                        return castExpr;
+                                }
+                                ret->env = castExpr->env;
+                                delete ret->result;
+                                ret->result = castExpr->result;
+                                ret->result->set_lvalue( true ); // ensure result is lvalue
+                                castExpr->env = nullptr;
+                                castExpr->arg = nullptr;
+                                castExpr->result = nullptr;
+                                delete castExpr;
+                                        ret = castExpr;
+                                }
+                                ret->set_env( env );
+                                PRINT( std::cerr << "now: " << ret << std::endl; )
                                 return ret;
+                        } else {
+                                assert( diff == 0 );
+                                // conversion between references of the same depth
+                                return castExpr;
+                        }
+                        }
+                        return castExpr;
+                }
                 Type * ReferenceTypeElimination::postmutate( ReferenceType * refType ) {
                         Type * base = refType->base;
+                        Type * base = refType->get_base();
                         Type::Qualifiers qualifiers = refType->get_qualifiers();
                         refType->base = nullptr;
+                        refType->set_base( nullptr );
                         delete refType;
                         return new PointerType( qualifiers, base );
 …
                 Expression * GeneralizedLvalue::applyTransformation( Expression * expr, Expression * arg, Func mkExpr ) {
                         if ( CommaExpr * commaExpr = dynamic_cast< CommaExpr * >( arg ) ) {
                                 Expression * arg1 = commaExpr->arg1->clone();
                                 Expression * arg2 = commaExpr->arg2->clone();
+                                Expression * arg1 = commaExpr->get_arg1()->clone();
+                                Expression * arg2 = commaExpr->get_arg2()->clone();
                                 Expression * ret = new CommaExpr( arg1, mkExpr( arg2 )->acceptMutator( *visitor ) );
                                 ret->env = expr->env;
                                 expr->env = nullptr;
+                                ret->set_env( expr->get_env() );
+                                expr->set_env( nullptr );
                                 delete expr;
                                 return ret;
                         } else if ( ConditionalExpr * condExpr = dynamic_cast< ConditionalExpr * >( arg ) ) {
                                 Expression * arg1 = condExpr->arg1->clone();
                                 Expression * arg2 = condExpr->arg2->clone();
                                 Expression * arg3 = condExpr->arg3->clone();
+                                Expression * arg1 = condExpr->get_arg1()->clone();
+                                Expression * arg2 = condExpr->get_arg2()->clone();
+                                Expression * arg3 = condExpr->get_arg3()->clone();
                                 ConditionalExpr * ret = new ConditionalExpr( arg1, mkExpr( arg2 )->acceptMutator( *visitor ), mkExpr( arg3 )->acceptMutator( *visitor ) );
                                 ret->env = expr->env;
                                 expr->env = nullptr;
+                                ret->set_env( expr->get_env() );
+                                expr->set_env( nullptr );
                                 delete expr;
 …
                                 AssertionSet needAssertions, haveAssertions;
                                 OpenVarSet openVars;
                                 unify( ret->arg2->result, ret->arg3->result, newEnv, needAssertions, haveAssertions, openVars, SymTab::Indexer(), commonType );
                                 ret->result = commonType ? commonType : ret->arg2->result->clone();
+                                unify( ret->get_arg2()->get_result(), ret->get_arg3()->get_result(), newEnv, needAssertions, haveAssertions, openVars, SymTab::Indexer(), commonType );
+                                ret->set_result( commonType ? commonType : ret->get_arg2()->get_result()->clone() );
                                 return ret;
+                        }
 …
                 Expression * GeneralizedLvalue::postmutate( MemberExpr * memExpr ) {
                         return applyTransformation( memExpr, memExpr->aggregate, [=]( Expression * aggr ) { return new MemberExpr( memExpr->member, aggr ); } );
+                        return applyTransformation( memExpr, memExpr->get_aggregate(), [=]( Expression * aggr ) { return new MemberExpr( memExpr->get_member(), aggr ); } );
+                }
                 Expression * GeneralizedLvalue::postmutate( AddressExpr * addrExpr ) {
                         return applyTransformation( addrExpr, addrExpr->arg, []( Expression * arg ) { return new AddressExpr( arg ); } );
+                        return applyTransformation( addrExpr, addrExpr->get_arg(), []( Expression * arg ) { return new AddressExpr( arg ); } );
+                }
                 Expression * CollapseAddrDeref::postmutate( AddressExpr * addrExpr ) {
                         Expression * arg = addrExpr->arg;
+                        Expression * arg = addrExpr->get_arg();
                         if ( isIntrinsicReference( arg ) ) {
                                 std::string fname = InitTweak::getFunctionName( arg );
 …
                                         Expression *& arg0 = InitTweak::getCallArg( arg, 0 );
                                         Expression * ret = arg0;
                                         ret->set_env( addrExpr->env );
+                                        ret->set_env( addrExpr->get_env() );
                                         arg0 = nullptr;
                                         addrExpr->env = nullptr;
+                                        addrExpr->set_env( nullptr );
                                         delete addrExpr;
                                         return ret;
 …
                                         // }
                                         if ( AddressExpr * addrExpr = dynamic_cast< AddressExpr * >( arg ) ) {
                                                 Expression * ret = addrExpr->arg;
                                                 ret->env = appExpr->env;
                                                 addrExpr->arg = nullptr;
                                                 appExpr->env = nullptr;
+                                                Expression * ret = addrExpr->get_arg();
+                                                ret->set_env( appExpr->get_env() );
+                                                addrExpr->set_arg( nullptr );
+                                                appExpr->set_env( nullptr );
                                                 delete appExpr;
                                                 return ret;

src/Makefile.in

-              r32cab5b
+              rb2fe1c9
         SynTree/driver_cfa_cpp-TypeSubstitution.$(OBJEXT) \
         SynTree/driver_cfa_cpp-Attribute.$(OBJEXT) \
         SynTree/driver_cfa_cpp-DeclReplacer.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-VarExprReplacer.$(OBJEXT) \
         Tuples/driver_cfa_cpp-TupleAssignment.$(OBJEXT) \
         Tuples/driver_cfa_cpp-TupleExpansion.$(OBJEXT) \
 …
         SynTree/NamedTypeDecl.cc SynTree/TypeDecl.cc \
         SynTree/Initializer.cc SynTree/TypeSubstitution.cc \
         SynTree/Attribute.cc SynTree/DeclReplacer.cc \
+        SynTree/Attribute.cc SynTree/VarExprReplacer.cc \
         Tuples/TupleAssignment.cc Tuples/TupleExpansion.cc \
         Tuples/Explode.cc Virtual/ExpandCasts.cc
 …
 SynTree/driver_cfa_cpp-Attribute.$(OBJEXT): SynTree/$(am__dirstamp) \
         SynTree/$(DEPDIR)/$(am__dirstamp)
 SynTree/driver_cfa_cpp-DeclReplacer.$(OBJEXT):  \
+SynTree/driver_cfa_cpp-VarExprReplacer.$(OBJEXT):  \
         SynTree/$(am__dirstamp) SynTree/$(DEPDIR)/$(am__dirstamp)
 Tuples/$(am__dirstamp):
 …
 @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-CompoundStmt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-Constant.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-DeclReplacer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-DeclStmt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-Declaration.Po@am__quote@
 …
 @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-TypeofType.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-VarArgsType.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-VarExprReplacer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-VoidType.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-ZeroOneType.Po@am__quote@
 …
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SynTree/driver_cfa_cpp-Attribute.obj `if test -f 'SynTree/Attribute.cc'; then $(CYGPATH_W) 'SynTree/Attribute.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/Attribute.cc'; fi`
 SynTree/driver_cfa_cpp-DeclReplacer.o: SynTree/DeclReplacer.cc
 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-DeclReplacer.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-DeclReplacer.Tpo -c -o SynTree/driver_cfa_cpp-DeclReplacer.o `test -f 'SynTree/DeclReplacer.cc' || echo '$(srcdir)/'`SynTree/DeclReplacer.cc
 @am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-DeclReplacer.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-DeclReplacer.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/DeclReplacer.cc' object='SynTree/driver_cfa_cpp-DeclReplacer.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SynTree/driver_cfa_cpp-DeclReplacer.o `test -f 'SynTree/DeclReplacer.cc' || echo '$(srcdir)/'`SynTree/DeclReplacer.cc
 SynTree/driver_cfa_cpp-DeclReplacer.obj: SynTree/DeclReplacer.cc
 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-DeclReplacer.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-DeclReplacer.Tpo -c -o SynTree/driver_cfa_cpp-DeclReplacer.obj `if test -f 'SynTree/DeclReplacer.cc'; then $(CYGPATH_W) 'SynTree/DeclReplacer.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/DeclReplacer.cc'; fi`
 @am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-DeclReplacer.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-DeclReplacer.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/DeclReplacer.cc' object='SynTree/driver_cfa_cpp-DeclReplacer.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SynTree/driver_cfa_cpp-DeclReplacer.obj `if test -f 'SynTree/DeclReplacer.cc'; then $(CYGPATH_W) 'SynTree/DeclReplacer.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/DeclReplacer.cc'; fi`
+SynTree/driver_cfa_cpp-VarExprReplacer.o: SynTree/VarExprReplacer.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-VarExprReplacer.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-VarExprReplacer.Tpo -c -o SynTree/driver_cfa_cpp-VarExprReplacer.o `test -f 'SynTree/VarExprReplacer.cc' || echo '$(srcdir)/'`SynTree/VarExprReplacer.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-VarExprReplacer.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-VarExprReplacer.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/VarExprReplacer.cc' object='SynTree/driver_cfa_cpp-VarExprReplacer.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SynTree/driver_cfa_cpp-VarExprReplacer.o `test -f 'SynTree/VarExprReplacer.cc' || echo '$(srcdir)/'`SynTree/VarExprReplacer.cc
+SynTree/driver_cfa_cpp-VarExprReplacer.obj: SynTree/VarExprReplacer.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-VarExprReplacer.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-VarExprReplacer.Tpo -c -o SynTree/driver_cfa_cpp-VarExprReplacer.obj `if test -f 'SynTree/VarExprReplacer.cc'; then $(CYGPATH_W) 'SynTree/VarExprReplacer.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/VarExprReplacer.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-VarExprReplacer.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-VarExprReplacer.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/VarExprReplacer.cc' object='SynTree/driver_cfa_cpp-VarExprReplacer.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SynTree/driver_cfa_cpp-VarExprReplacer.obj `if test -f 'SynTree/VarExprReplacer.cc'; then $(CYGPATH_W) 'SynTree/VarExprReplacer.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/VarExprReplacer.cc'; fi`
 Tuples/driver_cfa_cpp-TupleAssignment.o: Tuples/TupleAssignment.cc

src/Parser/DeclarationNode.cc

-              r32cab5b
+              rb2fe1c9
         attr.expr = nullptr;
         attr.type = nullptr;
-        assert.condition = nullptr;
-        assert.message = nullptr;
+}
 …
         // asmName, no delete, passed to next stage
         delete initializer;
-        delete assert.condition;
-        delete assert.message;
+}
 …
         newnode->attr.expr = maybeClone( attr.expr );
         newnode->attr.type = maybeClone( attr.type );
-        newnode->assert.condition = maybeClone( assert.condition );
-        newnode->assert.message = maybeClone( assert.message );
         return newnode;
 } // DeclarationNode::clone
 …
         return newnode;
+}
-DeclarationNode * DeclarationNode::newStaticAssert( ExpressionNode * condition, Expression * message ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->assert.condition = condition;
-        newnode->assert.message = message;
-        return newnode;
+}
 void appendError( string & dst, const string & src ) {
 …
         } // if
-        if ( assert.condition ) {
-                return new StaticAssertDecl( maybeBuild< Expression >( assert.condition ), strict_dynamic_cast< ConstantExpr * >( maybeClone( assert.message ) ) );
+        }
         // SUE's cannot have function specifiers, either
         //

src/Parser/ExpressionNode.cc

-              r32cab5b
+              rb2fe1c9
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Mar 22 11:57:39 2018
 // Update Count     : 801
+// Last Modified On : Sat Mar  3 18:22:33 2018
+// Update Count     : 796
 //
 …
 } // checkLNInt
+static void sepNumeric( string & str, string & units ) {
+        string::size_type posn = str.find_first_of( "`" );
+        if ( posn != string::npos ) {
+                units = "?" + str.substr( posn );                               // extract units
+                str.erase( posn );                                                              // remove units
+        } // if
+} // sepNumeric
 Expression * build_constantInteger( string & str ) {
         static const BasicType::Kind kind[2][6] = {
 …
                 { BasicType::ShortUnsignedInt, BasicType::UnsignedChar, BasicType::UnsignedInt, BasicType::LongUnsignedInt, BasicType::LongLongUnsignedInt, BasicType::UnsignedInt128, },
         };
+        string units;
+        sepNumeric( str, units );                                                       // separate constant from units
         bool dec = true, Unsigned = false;                                      // decimal, unsigned constant
 …
         } // if
   CLEANUP:
+        if ( units.length() != 0 ) {
+                ret = new UntypedExpr( new NameExpr( units ), { ret } );
+        } // if
         delete &str;                                                                            // created by lex
 …
         };
+        string units;
+        sepNumeric( str, units );                                                       // separate constant from units
         bool complx = false;                                                            // real, complex
         int size = 1;                                                                           // 0 => float, 1 => double, 2 => long double
 …
         if ( lnth != -1 ) {                                                                     // explicit length ?
                 ret = new CastExpr( ret, new BasicType( Type::Qualifiers(), kind[complx][size] ) );
+        } // if
+        if ( units.length() != 0 ) {
+                ret = new UntypedExpr( new NameExpr( units ), { ret } );
         } // if

src/Parser/ParseNode.h

-              r32cab5b
+              rb2fe1c9
         static DeclarationNode * newAttribute( std::string *, ExpressionNode * expr = nullptr ); // gcc attributes
         static DeclarationNode * newAsmStmt( StatementNode * stmt ); // gcc external asm statement
-        static DeclarationNode * newStaticAssert( ExpressionNode * condition, Expression * message );
         DeclarationNode();
 …
         Attr_t attr;
-        struct StaticAssert_t {
-                ExpressionNode * condition;
-                Expression * message;
-        };
-        StaticAssert_t assert;
         BuiltinType builtin;
 …
 Statement * build_if( IfCtl * ctl, StatementNode * then_stmt, StatementNode * else_stmt );
 Statement * build_switch( bool isSwitch, ExpressionNode * ctl, StatementNode * stmt );
+Statement * build_switch( ExpressionNode * ctl, StatementNode * stmt );
 Statement * build_case( ExpressionNode * ctl );
 Statement * build_default();

src/Parser/StatementNode.cc

-              r32cab5b
+              rb2fe1c9
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Mar  8 14:31:32 2018
 // Update Count     : 348
+// Last Modified On : Fri Sep  1 23:25:23 2017
+// Update Count     : 346
 //
 …
+}
 Statement *build_switch( bool isSwitch, ExpressionNode *ctl, StatementNode *stmt ) {
+Statement *build_switch( ExpressionNode *ctl, StatementNode *stmt ) {
         std::list< Statement * > branches;
         buildMoveList< Statement, StatementNode >( stmt, branches );
-        if ( ! isSwitch ) {                                                                             // choose statement
-                for ( Statement * stmt : branches ) {
-                        CaseStmt * caseStmt = strict_dynamic_cast< CaseStmt * >( stmt );
-                        if ( ! caseStmt->stmts.empty() ) {                      // code after "case" => end of case list
-                                CompoundStmt * block = strict_dynamic_cast< CompoundStmt * >( caseStmt->stmts.front() );
-                                block->kids.push_back( new BranchStmt( "", BranchStmt::Break ) );
-                        } // if
-                } // for
-        } // if
         // branches.size() == 0 for switch (...) {}, i.e., no declaration or statements
         return new SwitchStmt( maybeMoveBuild< Expression >(ctl), branches );

src/Parser/lex.ll

-              r32cab5b
+              rb2fe1c9
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
  * Last Modified On : Fri Apr  6 15:16:15 2018
  * Update Count     : 670
+ * Last Modified On : Sat Mar  3 18:38:16 2018
+ * Update Count     : 640
  */
 …
 void rm_underscore() {
         // SKULLDUGGERY: remove underscores (ok to shorten?)
+        // Remove underscores in numeric constant by copying the non-underscore characters to the front of the string.
         yyleng = 0;
+        for ( int i = 0; yytext[i] != '\0'; i += 1 ) {          // copying non-underscore characters to front of string
+        for ( int i = 0; yytext[i] != '\0'; i += 1 ) {
+                if ( yytext[i] == '`' ) {
+                        // copy user suffix
+                        for ( ; yytext[i] != '\0'; i += 1 ) {
+                                yytext[yyleng] = yytext[i];
+                                yyleng += 1;
+                        } // for
+                        break;
+                } // if
                 if ( yytext[i] != '_' ) {
                         yytext[yyleng] = yytext[i];
 …
         } // for
         yytext[yyleng] = '\0';
 } // rm_underscore
+}
 // Stop warning due to incorrectly generated flex code.
 …
 attr_identifier "@"{identifier}
+user_suffix_opt ("`"{identifier})?
                                 // numeric constants, CFA: '_' in constant
 hex_quad {hex}("_"?{hex}){3}
 size_opt (8|16|32|64|128)?
 length ("ll"|"LL"|[lL]{size_opt})|("hh"|"HH"|[hH])
 integer_suffix_opt ("_"?(([uU]({length}?[iI]?)|([iI]{length}))|([iI]({length}?[uU]?)|([uU]{length}))|({length}([iI]?[uU]?)|([uU][iI]))|[zZ]))?
+integer_suffix_opt ("_"?(([uU]({length}?[iI]?)|([iI]{length}))|([iI]({length}?[uU]?)|([uU]{length}))|({length}([iI]?[uU]?)|([uU][iI]))|[zZ]))?{user_suffix_opt}
 octal_digits ({octal})|({octal}({octal}|"_")*{octal})
 …
 floating_length ([fFdDlL]|[lL]{floating_size})
 floating_suffix ({floating_length}?[iI]?)|([iI]{floating_length})
 floating_suffix_opt ("_"?({floating_suffix}|"DL"))?
+floating_suffix_opt ("_"?({floating_suffix}|"DL"))?{user_suffix_opt}
 decimal_digits ({decimal})|({decimal}({decimal}|"_")*{decimal})
 floating_decimal {decimal_digits}"."{exponent}?{floating_suffix_opt}
 …
 binary_exponent "_"?[pP]"_"?[+-]?{decimal_digits}
 hex_floating_suffix_opt ("_"?({floating_suffix}))?
+hex_floating_suffix_opt ("_"?({floating_suffix}))?{user_suffix_opt}
 hex_floating_fraction ({hex_digits}?"."{hex_digits})|({hex_digits}".")
 hex_floating_constant {hex_prefix}(({hex_floating_fraction}{binary_exponent})|({hex_digits}{binary_exponent})){hex_floating_suffix_opt}
 …
 __asm                   { KEYWORD_RETURN(ASM); }                                // GCC
 __asm__                 { KEYWORD_RETURN(ASM); }                                // GCC
+_At                             { KEYWORD_RETURN(AT); }                                 // CFA
 _Atomic                 { KEYWORD_RETURN(ATOMIC); }                             // C11
 __attribute             { KEYWORD_RETURN(ATTRIBUTE); }                  // GCC
 …
 exception               { KEYWORD_RETURN(EXCEPTION); }                  // CFA
 extern                  { KEYWORD_RETURN(EXTERN); }
+fallthru                { KEYWORD_RETURN(FALLTHRU); }                   // CFA
 fallthrough             { KEYWORD_RETURN(FALLTHROUGH); }                // CFA
-fallthru                { KEYWORD_RETURN(FALLTHRU); }                   // CFA
 finally                 { KEYWORD_RETURN(FINALLY); }                    // CFA
 float                   { KEYWORD_RETURN(FLOAT); }
 …
 __builtin_offsetof { KEYWORD_RETURN(OFFSETOF); }                // GCC
 one_t                   { NUMERIC_RETURN(ONE_T); }                              // CFA
-or                              { QKEYWORD_RETURN(WOR); }                               // CFA
 otype                   { KEYWORD_RETURN(OTYPE); }                              // CFA
 register                { KEYWORD_RETURN(REGISTER); }
 …
 __volatile__    { KEYWORD_RETURN(VOLATILE); }                   // GCC
 waitfor                 { KEYWORD_RETURN(WAITFOR); }
+or                              { QKEYWORD_RETURN(WOR); }                               // CFA
 when                    { KEYWORD_RETURN(WHEN); }
 while                   { KEYWORD_RETURN(WHILE); }
 …
                                 /* identifier */
 {identifier}    { IDENTIFIER_RETURN(); }
-"`"{identifier}"`" {                                                                    // CFA
-        yytext[yyleng - 1] = '\0'; yytext += 1;                         // SKULLDUGGERY: remove backquotes (ok to shorten?)
-        IDENTIFIER_RETURN();
+}
 {attr_identifier} { ATTRIBUTE_RETURN(); }
+"`"                             { BEGIN BKQUOTE; }
+<BKQUOTE>{identifier} { IDENTIFIER_RETURN(); }
+<BKQUOTE>"`"    { BEGIN 0; }
                                 /* numeric constants */
 …
 ({cwide_prefix}[_]?)?['] { BEGIN QUOTE; rm_underscore(); strtext = new string( yytext, yyleng ); }
 <QUOTE>[^'\\\n]* { strtext->append( yytext, yyleng ); }
 <QUOTE>['\n]    { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(CHARACTERconstant); }
+<QUOTE>['\n]{user_suffix_opt}   { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(CHARACTERconstant); }
                                 /* ' stop editor highlighting */
 …
 ({swide_prefix}[_]?)?["] { BEGIN STRING; rm_underscore(); strtext = new string( yytext, yyleng ); }
 <STRING>[^"\\\n]* { strtext->append( yytext, yyleng ); }
 <STRING>["\n]   { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(STRINGliteral); }
+<STRING>["\n]{user_suffix_opt}  { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(STRINGliteral); }
                                 /* " stop editor highlighting */
 …
                                 /* punctuation */
 "@"                             { ASCIIOP_RETURN(); }
-"`"                             { ASCIIOP_RETURN(); }
 "["                             { ASCIIOP_RETURN(); }
 "]"                             { ASCIIOP_RETURN(); }
 …
 "?"({op_unary_pre_post}|"()"|"[?]"|"{}") { IDENTIFIER_RETURN(); }
 "^?{}"                  { IDENTIFIER_RETURN(); }
 "?`"{identifier} { IDENTIFIER_RETURN(); }                               // postfix operator
+"?`"{identifier} { IDENTIFIER_RETURN(); }                               // unit operator
 "?"{op_binary_over}"?"  { IDENTIFIER_RETURN(); }                // binary
         /*

src/Parser/parser.yy

-              r32cab5b
+              rb2fe1c9
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed Mar 28 17:52:24 2018
 // Update Count     : 3130
+// Last Modified On : Thu Feb 22 17:48:54 2018
+// Update Count     : 3028
 //
 …
         } // if
 } // rebindForall
-NameExpr * build_postfix_name( const string * name ) {
-        NameExpr * new_name = build_varref( new string( "?`" + *name ) );
-        delete name;
-        return new_name;
-} // build_postfix_name
 bool forall = false;                                                                    // aggregate have one or more forall qualifiers ?
 …
 %type<sn> statement_decl                                statement_decl_list                     statement_list_nodecl
 %type<sn> selection_statement
 %type<sn> switch_clause_list_opt                switch_clause_list
+%type<sn> switch_clause_list_opt                switch_clause_list                      choose_clause_list_opt          choose_clause_list
 %type<en> case_value
 %type<sn> case_clause                                   case_value_list                         case_label                                      case_label_list
+%type<sn> fall_through                                  fall_through_opt
 %type<sn> iteration_statement                   jump_statement
 %type<sn> expression_statement                  asm_statement
 …
         | '(' compound_statement ')'                                            // GCC, lambda expression
                 { $$ = new ExpressionNode( new StmtExpr( dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >($2) ) ) ); }
-        | constant '`' IDENTIFIER                                                       // CFA, postfix call
-                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), $1 ) ); }
-        | string_literal '`' IDENTIFIER                                         // CFA, postfix call
-                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), new ExpressionNode( $1 ) ) ); }
-        | IDENTIFIER '`' IDENTIFIER                                                     // CFA, postfix call
-                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), new ExpressionNode( build_varref( $1 ) ) ) ); }
-        | tuple '`' IDENTIFIER                                                          // CFA, postfix call
-                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), $1 ) ); }
-        | '(' comma_expression ')' '`' IDENTIFIER                       // CFA, postfix call
-                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $5 ) ), $2 ) ); }
         | type_name '.' no_attr_identifier                                      // CFA, nested type
                 { SemanticError( yylloc, "Qualified names are currently unimplemented." ); $$ = nullptr; }
+                { SemanticError( yylloc, "Qualified names are currently unimplemented." ); $$ = nullptr; } // FIX ME
         | type_name '.' '[' push field_list pop ']'                     // CFA, nested type / tuple field selector
                 { SemanticError( yylloc, "Qualified names are currently unimplemented." ); $$ = nullptr; }
+                { SemanticError( yylloc, "Qualified names are currently unimplemented." ); $$ = nullptr; } // FIX ME
         | GENERIC '(' assignment_expression ',' generic_assoc_list ')' // C11
                 { SemanticError( yylloc, "_Generic is currently unimplemented." ); $$ = nullptr; }
+                { SemanticError( yylloc, "_Generic is currently unimplemented." ); $$ = nullptr; } // FIX ME
+        ;
 …
         | '(' type_no_function ')' '{' initializer_list comma_opt '}' // C99, compound-literal
                 { $$ = new ExpressionNode( build_compoundLiteral( $2, new InitializerNode( $5, true ) ) ); }
-        | '(' type_no_function ')' '@' '{' initializer_list comma_opt '}' // CFA, explicit C compound-literal
-                { $$ = new ExpressionNode( build_compoundLiteral( $2, (new InitializerNode( $6, true ))->set_maybeConstructed( false ) ) ); }
         | '^' primary_expression '{' argument_expression_list '}' // CFA
+                {
 …
         | '(' type_no_function ')' cast_expression
                 { $$ = new ExpressionNode( build_cast( $2, $4 ) ); }
-        | '(' COROUTINE '&' ')' cast_expression                         // CFA
-                { SemanticError( yylloc, "coroutine cast is currently unimplemented." ); $$ = nullptr; }
-        | '(' THREAD '&' ')' cast_expression                            // CFA
-                { SemanticError( yylloc, "monitor cast is currently unimplemented." ); $$ = nullptr; }
-        | '(' MONITOR '&' ')' cast_expression                           // CFA
-                { SemanticError( yylloc, "thread cast is currently unimplemented." ); $$ = nullptr; }
                 // VIRTUAL cannot be opt because of look ahead issues
         | '(' VIRTUAL ')' cast_expression                                       // CFA
+        | '(' VIRTUAL ')' cast_expression
                 { $$ = new ExpressionNode( new VirtualCastExpr( maybeMoveBuild< Expression >( $4 ), maybeMoveBuildType( nullptr ) ) ); }
         | '(' VIRTUAL type_no_function ')' cast_expression      // CFA
+        | '(' VIRTUAL type_no_function ')' cast_expression
                 { $$ = new ExpressionNode( new VirtualCastExpr( maybeMoveBuild< Expression >( $5 ), maybeMoveBuildType( $3 ) ) ); }
 //      | '(' type_no_function ')' tuple
 …
         | logical_OR_expression '?' comma_expression ':' conditional_expression
                 { $$ = new ExpressionNode( build_cond( $1, $3, $5 ) ); }
                 // FIX ME: computes $1 twice
+                // FIX ME: this hack computes $1 twice
         | logical_OR_expression '?' /* empty */ ':' conditional_expression // GCC, omitted first operand
                 { $$ = new ExpressionNode( build_cond( $1, $1, $4 ) ); }
 …
                 { $$ = new ExpressionNode( build_binary_val( $2, $1, $3 ) ); }
         | unary_expression '=' '{' initializer_list comma_opt '}'
                 { SemanticError( yylloc, "Initializer assignment is currently unimplemented." ); $$ = nullptr; }
+                { SemanticError( yylloc, "Initializer assignment is currently unimplemented." ); $$ = nullptr; } // FIX ME
+        ;
 …
         | exception_statement
         | enable_disable_statement
                 { SemanticError( yylloc, "enable/disable statement is currently unimplemented." ); $$ = nullptr; }
+                { SemanticError( yylloc, "enable/disable statement is currently unimplemented." ); $$ = nullptr; } // FIX ME
         | asm_statement
+        ;
 …
                 { $$ = new StatementNode( build_if( $4, $6, $8 ) ); }
         | SWITCH '(' comma_expression ')' case_clause
                 { $$ = new StatementNode( build_switch( true, $3, $5 ) ); }
+                { $$ = new StatementNode( build_switch( $3, $5 ) ); }
         | SWITCH '(' comma_expression ')' '{' push declaration_list_opt switch_clause_list_opt '}' // CFA
+                {
                         StatementNode *sw = new StatementNode( build_switch( true, $3, $8 ) );
+                        StatementNode *sw = new StatementNode( build_switch( $3, $8 ) );
                         // The semantics of the declaration list is changed to include associated initialization, which is performed
                         // *before* the transfer to the appropriate case clause by hoisting the declarations into a compound
 …
+                }
         | CHOOSE '(' comma_expression ')' case_clause           // CFA
                 { $$ = new StatementNode( build_switch( false, $3, $5 ) ); }
         | CHOOSE '(' comma_expression ')' '{' push declaration_list_opt switch_clause_list_opt '}' // CFA
+                {
                         StatementNode *sw = new StatementNode( build_switch( false, $3, $8 ) );
+                { $$ = new StatementNode( build_switch( $3, $5 ) ); }
+        | CHOOSE '(' comma_expression ')' '{' push declaration_list_opt choose_clause_list_opt '}' // CFA
+                {
+                        StatementNode *sw = new StatementNode( build_switch( $3, $8 ) );
                         $$ = $7 ? new StatementNode( build_compound( (StatementNode *)((new StatementNode( $7 ))->set_last( sw )) ) ) : sw;
+                }
 …
+        ;
-//label_list_opt:
-//      // empty
-//      | identifier_or_type_name ':'
-//      | label_list_opt identifier_or_type_name ':'
-//      ;
 case_label_list:                                                                                // CFA
         case_label
 …
         | switch_clause_list case_label_list statement_list_nodecl
                 { $$ = (StatementNode *)( $1->set_last( $2->append_last_case( new StatementNode( build_compound( $3 ) ) ) ) ); }
+        ;
+choose_clause_list_opt:                                                                 // CFA
+        // empty
+                { $$ = nullptr; }
+        | choose_clause_list
+        ;
+choose_clause_list:                                                                             // CFA
+        case_label_list fall_through
+                { $$ = $1->append_last_case( $2 ); }
+        | case_label_list statement_list_nodecl fall_through_opt
+                { $$ = $1->append_last_case( new StatementNode( build_compound( (StatementNode *)$2->set_last( $3 ) ) ) ); }
+        | choose_clause_list case_label_list fall_through
+                { $$ = (StatementNode *)( $1->set_last( $2->append_last_case( $3 ))); }
+        | choose_clause_list case_label_list statement_list_nodecl fall_through_opt
+                { $$ = (StatementNode *)( $1->set_last( $2->append_last_case( new StatementNode( build_compound( (StatementNode *)$3->set_last( $4 ) ) ) ) ) ); }
+        ;
+fall_through_opt:                                                                               // CFA
+        // empty
+                { $$ = new StatementNode( build_branch( BranchStmt::Break ) ); } // insert implicit break
+        | fall_through
+        ;
+fall_through_name:                                                                              // CFA
+        FALLTHRU
+        | FALLTHROUGH
+        ;
+fall_through:                                                                                   // CFA
+        fall_through_name
+                { $$ = nullptr; }
+        | fall_through_name ';'
+                { $$ = nullptr; }
+        ;
 …
                 // whereas normal operator precedence yields goto (*i)+3;
                 { $$ = new StatementNode( build_computedgoto( $3 ) ); }
-                // A semantic check is required to ensure fallthru appears only in the body of a choose statement.
-    | fall_through_name ';'                                                             // CFA
-                { $$ = new StatementNode( build_branch( BranchStmt::FallThrough ) ); }
-    | fall_through_name identifier_or_type_name ';'             // CFA
-                { $$ = new StatementNode( build_branch( $2, BranchStmt::FallThrough ) ); }
-        | fall_through_name DEFAULT ';'                                         // CFA
-                { $$ = new StatementNode( build_branch( BranchStmt::FallThroughDefault ) ); }
         | CONTINUE ';'
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement.
 …
                 { $$ = new StatementNode( build_return( $2 ) ); }
         | RETURN '{' initializer_list comma_opt '}'
                 { SemanticError( yylloc, "Initializer return is currently unimplemented." ); $$ = nullptr; }
+                { SemanticError( yylloc, "Initializer return is currently unimplemented." ); $$ = nullptr; } // FIX ME
         | THROW assignment_expression_opt ';'                           // handles rethrow
                 { $$ = new StatementNode( build_throw( $2 ) ); }
 …
+        ;
-fall_through_name:                                                                              // CFA
-        FALLTHRU
-        | FALLTHROUGH
+        ;
 with_statement:
         WITH '(' tuple_expression_list ')' statement
 …
 mutex_statement:
         MUTEX '(' argument_expression_list ')' statement
                 { SemanticError( yylloc, "Mutex statement is currently unimplemented." ); $$ = nullptr; }
+                { SemanticError( yylloc, "Mutex statement is currently unimplemented." ); $$ = nullptr; } // FIX ME
+        ;
 when_clause:
+        WHEN '(' comma_expression ')'                           { $$ = $3; }
+        WHEN '(' comma_expression ')'
+                { $$ = $3; }
+        ;
 …
 timeout:
+        TIMEOUT '(' comma_expression ')'                        { $$ = $3; }
+        TIMEOUT '(' comma_expression ')'
+                { $$ = $3; }
+        ;
 …
         //empty
                 { $$ = nullptr; }
+        | ';' conditional_expression                            { $$ = $2; }
+        | ';' conditional_expression
+                { $$ = $2; }
+        ;
 handler_key:
+        CATCH                                                                           { $$ = CatchStmt::Terminate; }
+        | CATCHRESUME                                                           { $$ = CatchStmt::Resume; }
+        CATCH
+                { $$ = CatchStmt::Terminate; }
+        | CATCHRESUME
+                { $$ = CatchStmt::Resume; }
+        ;
 finally_clause:
+        FINALLY compound_statement                                      { $$ = new StatementNode( build_finally( $2 ) ); }
+        FINALLY compound_statement
+                {
+                        $$ = new StatementNode( build_finally( $2 ) );
+                }
+        ;
 …
 static_assert:
         STATICASSERT '(' constant_expression ',' string_literal ')' ';' // C11
                 { $$ = DeclarationNode::newStaticAssert( $3, $5 ); }
+                { SemanticError( yylloc, "Static assert is currently unimplemented." ); $$ = nullptr; } // FIX ME
 // C declaration syntax is notoriously confusing and error prone. Cforall provides its own type, variable and function
 …
                         $$ = $2;
+                }
         | type_qualifier_list '{' external_definition_list '}'                  // CFA, namespace
+        | forall '{' external_definition_list '}'                       // CFA, namespace
+        ;

src/ResolvExpr/CommonType.cc

-              r32cab5b
+              rb2fe1c9
 // #define DEBUG
-#ifdef DEBUG
-#define PRINT(x) x
-#else
-#define PRINT(x)
-#endif
 namespace ResolvExpr {
 …
                 // need unify to bind type variables
                 if ( unify( t1, t2, env, have, need, newOpen, indexer, common ) ) {
+                        PRINT(
+                                std::cerr << "unify success: " << widenFirst << " " << widenSecond << std::endl;
+                        )
+                        // std::cerr << "unify success: " << widenFirst << " " << widenSecond << std::endl;
                         if ( (widenFirst || t2->get_qualifiers() <= t1->get_qualifiers()) && (widenSecond || t1->get_qualifiers() <= t2->get_qualifiers()) ) {
+                                PRINT(
+                                        std::cerr << "widen okay" << std::endl;
+                                )
+                                // std::cerr << "widen okay" << std::endl;
                                 common->get_qualifiers() |= t1->get_qualifiers();
                                 common->get_qualifiers() |= t2->get_qualifiers();
 …
+                        }
+                }
+                PRINT(
+                        std::cerr << "exact unify failed: " << t1 << " " << t2 << std::endl;
+                )
+                // std::cerr << "exact unify failed: " << t1 << " " << t2 << std::endl;
                 return nullptr;
+        }
 …
                         // special case where one type has a reference depth of 1 larger than the other
                         if ( diff > 0 || diff < 0 ) {
+                                PRINT(
+                                        std::cerr << "reference depth diff: " << diff << std::endl;
+                                )
+                                // std::cerr << "reference depth diff: " << diff << std::endl;
                                 Type * result = nullptr;
                                 ReferenceType * ref1 = dynamic_cast< ReferenceType * >( type1 );
 …
                                 if ( result && ref1 ) {
                                         // formal is reference, so result should be reference
+                                        PRINT(
+                                                std::cerr << "formal is reference; result should be reference" << std::endl;
+                                        )
+                                        // std::cerr << "formal is reference; result should be reference" << std::endl;
                                         result = new ReferenceType( ref1->get_qualifiers(), result );
+                                }
+                                PRINT(
+                                        std::cerr << "common type of reference [" << type1 << "] and [" << type2 << "] is [" << result << "]" << std::endl;
+                                )
+                                // std::cerr << "common type of reference [" << type1 << "] and [" << type2 << "] is [" << result << "]" << std::endl;
                                 return result;
+                        }

src/ResolvExpr/ConversionCost.cc

-              r32cab5b
+              rb2fe1c9
                         // xxx - not positive this is correct, but appears to allow casting int => enum
                         cost = Cost::unsafe;
+                } // if
+                // no cases for zero_t/one_t because it should not be possible to convert int, etc. to zero_t/one_t.
+                } else if ( dynamic_cast< ZeroType* >( dest ) != nullptr || dynamic_cast< OneType* >( dest ) != nullptr ) {
+                        cost = Cost::unsafe;
+                } // if
+        }
 …
                                 // assignResult == 0 means Cost::Infinity
                         } // if
+                        // case case for zero_t because it should not be possible to convert pointers to zero_t.
+                } else if ( dynamic_cast< ZeroType * >( dest ) ) {
+                        cost = Cost::unsafe;
                 } // if
+        }

src/ResolvExpr/Resolver.cc

-              r32cab5b
+              rb2fe1c9
                 void previsit( TypeDecl *typeDecl );
                 void previsit( EnumDecl * enumDecl );
-                void previsit( StaticAssertDecl * assertDecl );
                 void previsit( ArrayType * at );
 …
                 GuardValue( inEnumDecl );
                 inEnumDecl = true;
+        }
-        void Resolver::previsit( StaticAssertDecl * assertDecl ) {
-                findIntegralExpression( assertDecl->condition, indexer );
+        }

src/SymTab/Validate.cc

-              r32cab5b
+              rb2fe1c9
                 void previsit( StructDecl * aggregateDecl );
                 void previsit( UnionDecl * aggregateDecl );
-                void previsit( StaticAssertDecl * assertDecl );
           private:
 …
                 void previsit( ObjectDecl * object );
                 void previsit( FunctionDecl * func );
-                void previsit( FunctionType * ftype );
                 void previsit( StructDecl * aggrDecl );
                 void previsit( UnionDecl * aggrDecl );
 …
+        }
         bool shouldHoist( Declaration *decl ) {
                 return dynamic_cast< StructDecl * >( decl ) || dynamic_cast< UnionDecl * >( decl ) || dynamic_cast< StaticAssertDecl * >( decl );
+        bool isStructOrUnion( Declaration *decl ) {
+                return dynamic_cast< StructDecl * >( decl ) || dynamic_cast< UnionDecl * >( decl );
+        }
 …
                 } // if
                 // Always remove the hoisted aggregate from the inner structure.
                 GuardAction( [aggregateDecl]() { filter( aggregateDecl->members, shouldHoist, false ); } );
+                GuardAction( [aggregateDecl]() { filter( aggregateDecl->members, isStructOrUnion, false ); } );
+        }
 …
                 if ( inst->baseUnion ) {
                         declsToAddBefore.push_front( inst->baseUnion );
+                }
+        }
-        void HoistStruct::previsit( StaticAssertDecl * assertDecl ) {
-                if ( parentAggr ) {
-                        declsToAddBefore.push_back( assertDecl );
+                }
+        }
 …
         void ForallPointerDecay::previsit( ObjectDecl *object ) {
                 // ensure that operator names only apply to functions or function pointers
                 if ( CodeGen::isOperator( object->name ) && ! dynamic_cast< FunctionType * >( object->type->stripDeclarator() ) ) {
                         SemanticError( object->location, toCString( "operator ", object->name.c_str(), " is not a function or function pointer." )  );
+                }
+                forallFixer( object->type->forall, object );
+                if ( PointerType *pointer = dynamic_cast< PointerType * >( object->type ) ) {
+                        forallFixer( pointer->base->forall, object );
+                } // if
                 object->fixUniqueId();
+        }
         void ForallPointerDecay::previsit( FunctionDecl *func ) {
+                forallFixer( func->type->forall, func );
                 func->fixUniqueId();
+        }
-        void ForallPointerDecay::previsit( FunctionType * ftype ) {
-                forallFixer( ftype->forall, ftype );
+        }

src/SynTree/CompoundStmt.cc

-              r32cab5b
+              rb2fe1c9
 #include "Statement.h"                // for CompoundStmt, Statement, DeclStmt
 #include "SynTree/Label.h"            // for Label
 #include "SynTree/DeclReplacer.h"     // for DeclReplacer
+#include "SynTree/VarExprReplacer.h"  // for VarExprReplacer, VarExprReplace...
 using std::string;
 …
         // recursively execute this routine. There may be more efficient ways of doing
         // this.
         DeclReplacer::DeclMap declMap;
+        VarExprReplacer::DeclMap declMap;
         std::list< Statement * >::const_iterator origit = other.kids.begin();
         for ( Statement * s : kids ) {
 …
+        }
         if ( ! declMap.empty() ) {
                 DeclReplacer::replace( this, declMap );
+                VarExprReplacer::replace( this, declMap );
+        }
+}

src/SynTree/Declaration.cc

-              r32cab5b
+              rb2fe1c9
-StaticAssertDecl::StaticAssertDecl( Expression * condition, ConstantExpr * message ) : Declaration( "", Type::StorageClasses(), LinkageSpec::C ), condition( condition ), message( message )  {
+}
-StaticAssertDecl::StaticAssertDecl( const StaticAssertDecl & other ) : Declaration( other ), condition( maybeClone( other.condition ) ), message( maybeClone( other.message ) )  {
+}
-StaticAssertDecl::~StaticAssertDecl() {
-        delete condition;
-        delete message;
+}
-void StaticAssertDecl::print( std::ostream &os, Indenter indent ) const {
-        os << "Static Assert with condition: ";
-        condition->print( os, indent+1 );
-        os << std::endl << indent << "and message: ";
-        message->print( os, indent+1 );
-os << std::endl;
+}
-void StaticAssertDecl::printShort( std::ostream &os, Indenter indent ) const {
-        print( os, indent );
+}
 // Local Variables: //
 // tab-width: 4 //

src/SynTree/Declaration.h

-              r32cab5b
+              rb2fe1c9
 };
-class StaticAssertDecl : public Declaration {
-public:
-        Expression * condition;
-        ConstantExpr * message;   // string literal
-        StaticAssertDecl( Expression * condition, ConstantExpr * message );
-        StaticAssertDecl( const StaticAssertDecl & other );
-        virtual ~StaticAssertDecl();
-        virtual StaticAssertDecl * clone() const override { return new StaticAssertDecl( *this ); }
-        virtual void accept( Visitor &v ) override { v.visit( this ); }
-        virtual StaticAssertDecl * acceptMutator( Mutator &m )  override { return m.mutate( this ); }
-        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
-        virtual void printShort( std::ostream &os, Indenter indent = {} ) const override;
-};
 std::ostream & operator<<( std::ostream & os, const TypeDecl::Data & data );

src/SynTree/FunctionDecl.cc

-              r32cab5b
+              rb2fe1c9
 #include "Statement.h"           // for CompoundStmt
 #include "Type.h"                // for Type, FunctionType, Type::FuncSpecif...
 #include "DeclReplacer.h"
+#include "VarExprReplacer.h"
 extern bool translation_unit_nomain;
 …
                 : Parent( other ), type( maybeClone( other.type ) ), statements( maybeClone( other.statements ) ) {
         DeclReplacer::DeclMap declMap;
+        VarExprReplacer::DeclMap declMap;
         for ( auto p : group_iterate( other.type->parameters, type->parameters ) ) {
                 declMap[ std::get<0>(p) ] = std::get<1>(p);
 …
+        }
         if ( ! declMap.empty() ) {
                 DeclReplacer::replace( this, declMap );
+                VarExprReplacer::replace( this, declMap );
+        }
         cloneAll( other.withExprs, withExprs );

src/SynTree/Mutator.h

r32cab5b	rb2fe1c9
34	34	virtual Declaration * mutate( TypedefDecl * typeDecl ) = 0;
35	35	virtual AsmDecl * mutate( AsmDecl * asmDecl ) = 0;
36		~~virtual StaticAssertDecl * mutate( StaticAssertDecl * assertDecl ) = 0;~~
37	36
38	37	virtual CompoundStmt * mutate( CompoundStmt * compoundStmt ) = 0;

src/SynTree/Statement.cc

-              r32cab5b
+              rb2fe1c9
 Statement::Statement( const std::list<Label> & labels ) : labels( labels ) {}
 void Statement::print( std::ostream & os, Indenter indent ) const {
+void Statement::print( std::ostream & os, Indenter ) const {
         if ( ! labels.empty() ) {
                 os << indent << "... Labels: {";
+                os << "Labels: {";
                 for ( const Label & l : labels ) {
                         os << l << ",";
 …
 void CaseStmt::print( std::ostream &os, Indenter indent ) const {
         if ( isDefault() ) os << indent << "Default ";
+        if ( isDefault() ) os << "Default ";
         else {
                 os << indent << "Case ";
+                os << "Case ";
                 condition->print( os, indent );
         } // if
 …
         for ( Statement * stmt : stmts ) {
-                os << indent+1;
                 stmt->print( os, indent+1 );
+        }
 …
+}
 void NullStmt::print( std::ostream &os, Indenter indent ) const {
+void NullStmt::print( std::ostream &os, Indenter ) const {
         os << "Null Statement" << endl;
-        Statement::print( os, indent );
+}

src/SynTree/Statement.h

-              r32cab5b
+              rb2fe1c9
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Mar  8 14:53:02 2018
 // Update Count     : 78
+// Last Modified On : Sun Sep  3 20:46:46 2017
+// Update Count     : 77
 //
 …
 class BranchStmt : public Statement {
   public:
         enum Type { Goto = 0, Break, Continue, FallThrough, FallThroughDefault };
+        enum Type { Goto = 0, Break, Continue };
         // originalTarget kept for error messages.

src/SynTree/SynTree.h

r32cab5b	rb2fe1c9
38	38	class TypedefDecl;
39	39	class AsmDecl;
40		~~class StaticAssertDecl;~~
41	40
42	41	class Statement;

src/SynTree/TypeSubstitution.cc

-              r32cab5b
+              rb2fe1c9
                 return inst;
         } else {
+                // cut off infinite loop for the case where a type is bound to itself.
+                // Note: this does not prevent cycles in the general case, so it may be necessary to do something more sophisticated here.
+                // TODO: investigate preventing type variables from being bound to themselves in the first place.
+                if ( TypeInstType * replacement = dynamic_cast< TypeInstType * >( i->second ) ) {
+                        if ( inst->name == replacement->name ) {
+                                return inst;
+                        }
+                }
+                // std::cerr << "found " << inst->name << ", replacing with " << i->second << std::endl;
+///         std::cerr << "found " << inst->get_name() << ", replacing with ";
+///         i->second->print( std::cerr );
+///         std::cerr << std::endl;
                 subCount++;
                 Type * newtype = i->second->clone();
                 newtype->get_qualifiers() |= inst->get_qualifiers();
                 delete inst;
+                // Note: need to recursively apply substitution to the new type because normalize does not substitute bound vars, but bound vars must be substituted when not in freeOnly mode.
+                return newtype->acceptMutator( *visitor );
+                return newtype;
         } // if
+}

src/SynTree/TypeSubstitution.h

r32cab5b	rb2fe1c9
129	129
130	130	// definitition must happen after PassVisitor is included so that WithGuards can be used
131		struct TypeSubstitution::Substituter : public WithGuards~~, public WithVisitorRef<Substituter>~~ {
	131	struct TypeSubstitution::Substituter : public WithGuards {
132	132	Substituter( TypeSubstitution & sub, bool freeOnly ) : sub( sub ), freeOnly( freeOnly ) {}
133	133

src/SynTree/Visitor.h

r32cab5b	rb2fe1c9
36	36	virtual void visit( TypedefDecl * typeDecl ) = 0;
37	37	virtual void visit( AsmDecl * asmDecl ) = 0;
38		~~virtual void visit( StaticAssertDecl * assertDecl ) = 0;~~
39	38
40	39	virtual void visit( CompoundStmt * compoundStmt ) = 0;

src/SynTree/module.mk

r32cab5b	rb2fe1c9
48	48	SynTree/TypeSubstitution.cc \
49	49	SynTree/Attribute.cc \
50		SynTree/~~Decl~~Replacer.cc
	50	SynTree/VarExprReplacer.cc
51	51

src/benchmark/bench.h

r32cab5b	rb2fe1c9
10	10	#if defined(__cforall)
11	11	}
12		//#include <bits/cfatime.h>
	12	#include <bits/cfatime.h>
13	13	#endif
14	14

src/libcfa/Makefile.am

-              r32cab5b
+              rb2fe1c9
 ## Created On       : Sun May 31 08:54:01 2015
 ## Last Modified By : Peter A. Buhr
 ## Last Modified On : Thu Apr 12 14:38:34 2018
 ## Update Count     : 231
+## Last Modified On : Fri Feb  9 15:51:24 2018
+## Update Count     : 223
 ###############################################################################
 …
 CC = ${abs_top_srcdir}/src/driver/cfa
 headers = fstream iostream iterator limits rational time stdlib \
+headers = fstream iostream iterator limits rational stdlib \
           containers/maybe containers/pair containers/result containers/vector
 …
         math                            \
         gmp                             \
-        time_t.h                        \
-        clock                   \
         bits/align.h            \
+        bits/cfatime.h          \
         bits/containers.h               \
         bits/defs.h             \

src/libcfa/Makefile.in

-              r32cab5b
+              rb2fe1c9
 am__libcfa_d_a_SOURCES_DIST = libcfa-prelude.c interpose.c \
         bits/debug.c fstream.c iostream.c iterator.c limits.c \
         rational.c time.c stdlib.c containers/maybe.c \
         containers/pair.c containers/result.c containers/vector.c \
+        rational.c stdlib.c containers/maybe.c containers/pair.c \
+        containers/result.c containers/vector.c \
         concurrency/coroutine.c concurrency/thread.c \
         concurrency/kernel.c concurrency/monitor.c assert.c \
 …
         libcfa_d_a-iostream.$(OBJEXT) libcfa_d_a-iterator.$(OBJEXT) \
         libcfa_d_a-limits.$(OBJEXT) libcfa_d_a-rational.$(OBJEXT) \
         libcfa_d_a-time.$(OBJEXT) libcfa_d_a-stdlib.$(OBJEXT) \
+        libcfa_d_a-stdlib.$(OBJEXT) \
         containers/libcfa_d_a-maybe.$(OBJEXT) \
         containers/libcfa_d_a-pair.$(OBJEXT) \
 …
 libcfa_a_LIBADD =
 am__libcfa_a_SOURCES_DIST = libcfa-prelude.c interpose.c bits/debug.c \
+        fstream.c iostream.c iterator.c limits.c rational.c time.c \
+        stdlib.c containers/maybe.c containers/pair.c \
+        containers/result.c containers/vector.c \
+        concurrency/coroutine.c concurrency/thread.c \
+        concurrency/kernel.c concurrency/monitor.c assert.c \
+        exception.c virtual.c concurrency/CtxSwitch-@MACHINE_TYPE@.S \
+        concurrency/alarm.c concurrency/invoke.c \
+        concurrency/preemption.c
+        fstream.c iostream.c iterator.c limits.c rational.c stdlib.c \
+        containers/maybe.c containers/pair.c containers/result.c \
+        containers/vector.c concurrency/coroutine.c \
+        concurrency/thread.c concurrency/kernel.c \
+        concurrency/monitor.c assert.c exception.c virtual.c \
+        concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/alarm.c \
+        concurrency/invoke.c concurrency/preemption.c
 @BUILD_CONCURRENCY_TRUE@am__objects_5 = concurrency/libcfa_a-coroutine.$(OBJEXT) \
 @BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-thread.$(OBJEXT) \
 …
 am__objects_6 = libcfa_a-fstream.$(OBJEXT) libcfa_a-iostream.$(OBJEXT) \
         libcfa_a-iterator.$(OBJEXT) libcfa_a-limits.$(OBJEXT) \
         libcfa_a-rational.$(OBJEXT) libcfa_a-time.$(OBJEXT) \
         libcfa_a-stdlib.$(OBJEXT) containers/libcfa_a-maybe.$(OBJEXT) \
+        libcfa_a-rational.$(OBJEXT) libcfa_a-stdlib.$(OBJEXT) \
+        containers/libcfa_a-maybe.$(OBJEXT) \
         containers/libcfa_a-pair.$(OBJEXT) \
         containers/libcfa_a-result.$(OBJEXT) \
 …
   esac
 am__nobase_cfa_include_HEADERS_DIST = fstream iostream iterator limits \
         rational time stdlib containers/maybe containers/pair \
+        rational stdlib containers/maybe containers/pair \
         containers/result containers/vector concurrency/coroutine \
         concurrency/thread concurrency/kernel concurrency/monitor \
         ${shell find stdhdr -type f -printf "%p "} math gmp time_t.h \
         clock bits/align.h bits/containers.h bits/defs.h bits/debug.h \
         bits/locks.h concurrency/invoke.h
+        ${shell find stdhdr -type f -printf "%p "} math gmp \
+        bits/align.h bits/cfatime.h bits/containers.h bits/defs.h \
+        bits/debug.h bits/locks.h concurrency/invoke.h
 HEADERS = $(nobase_cfa_include_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 …
 EXTRA_FLAGS = -g -Wall -Wno-unused-function -imacros libcfa-prelude.c @CFA_FLAGS@
 AM_CCASFLAGS = @CFA_FLAGS@
 headers = fstream iostream iterator limits rational time stdlib \
+headers = fstream iostream iterator limits rational stdlib \
         containers/maybe containers/pair containers/result \
         containers/vector $(am__append_3)
 …
         math                            \
         gmp                             \
-        time_t.h                        \
-        clock                   \
         bits/align.h            \
+        bits/cfatime.h          \
         bits/containers.h               \
         bits/defs.h             \
 …
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_a-rational.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_a-stdlib.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_a-time.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_a-virtual.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_d_a-assert.Po@am__quote@
 …
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_d_a-rational.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_d_a-stdlib.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_d_a-time.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_d_a-virtual.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@bits/$(DEPDIR)/libcfa_a-debug.Po@am__quote@
 …
 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o libcfa_d_a-rational.obj `if test -f 'rational.c'; then $(CYGPATH_W) 'rational.c'; else $(CYGPATH_W) '$(srcdir)/rational.c'; fi`
-libcfa_d_a-time.o: time.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-time.o -MD -MP -MF $(DEPDIR)/libcfa_d_a-time.Tpo -c -o libcfa_d_a-time.o `test -f 'time.c' || echo '$(srcdir)/'`time.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-time.Tpo $(DEPDIR)/libcfa_d_a-time.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='time.c' object='libcfa_d_a-time.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o libcfa_d_a-time.o `test -f 'time.c' || echo '$(srcdir)/'`time.c
-libcfa_d_a-time.obj: time.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-time.obj -MD -MP -MF $(DEPDIR)/libcfa_d_a-time.Tpo -c -o libcfa_d_a-time.obj `if test -f 'time.c'; then $(CYGPATH_W) 'time.c'; else $(CYGPATH_W) '$(srcdir)/time.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-time.Tpo $(DEPDIR)/libcfa_d_a-time.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='time.c' object='libcfa_d_a-time.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o libcfa_d_a-time.obj `if test -f 'time.c'; then $(CYGPATH_W) 'time.c'; else $(CYGPATH_W) '$(srcdir)/time.c'; fi`
 libcfa_d_a-stdlib.o: stdlib.c
 @am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-stdlib.o -MD -MP -MF $(DEPDIR)/libcfa_d_a-stdlib.Tpo -c -o libcfa_d_a-stdlib.o `test -f 'stdlib.c' || echo '$(srcdir)/'`stdlib.c
 …
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o libcfa_a-rational.obj `if test -f 'rational.c'; then $(CYGPATH_W) 'rational.c'; else $(CYGPATH_W) '$(srcdir)/rational.c'; fi`
-libcfa_a-time.o: time.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-time.o -MD -MP -MF $(DEPDIR)/libcfa_a-time.Tpo -c -o libcfa_a-time.o `test -f 'time.c' || echo '$(srcdir)/'`time.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-time.Tpo $(DEPDIR)/libcfa_a-time.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='time.c' object='libcfa_a-time.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o libcfa_a-time.o `test -f 'time.c' || echo '$(srcdir)/'`time.c
-libcfa_a-time.obj: time.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-time.obj -MD -MP -MF $(DEPDIR)/libcfa_a-time.Tpo -c -o libcfa_a-time.obj `if test -f 'time.c'; then $(CYGPATH_W) 'time.c'; else $(CYGPATH_W) '$(srcdir)/time.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-time.Tpo $(DEPDIR)/libcfa_a-time.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='time.c' object='libcfa_a-time.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o libcfa_a-time.obj `if test -f 'time.c'; then $(CYGPATH_W) 'time.c'; else $(CYGPATH_W) '$(srcdir)/time.c'; fi`
 libcfa_a-stdlib.o: stdlib.c

src/libcfa/bits/locks.h

-              r32cab5b
+              rb2fe1c9
 // Created On       : Tue Oct 31 15:14:38 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Mar 30 18:18:13 2018
 // Update Count     : 9
+// Last Modified On : Fri Dec  8 16:02:22 2017
+// Update Count     : 1
 //
 …
         extern void yield( unsigned int );
+        extern thread_local struct thread_desc *    volatile this_thread;
+        extern thread_local struct processor *      volatile this_processor;
         static inline void ?{}( __spinlock_t & this ) {
 …
                 if( result ) {
                         disable_interrupts();
                         // __cfaabi_dbg_debug_do(
                         //      this.prev_name = caller;
                         //      this.prev_thrd = TL_GET( this_thread );
                         // )
+                        __cfaabi_dbg_debug_do(
+                                this.prev_name = caller;
+                                this.prev_thrd = this_thread;
+                        )
+                }
                 return result;
 …
+                }
                 disable_interrupts();
                 // __cfaabi_dbg_debug_do(
                 //      this.prev_name = caller;
                 //      this.prev_thrd = TL_GET( this_thread );
                 // )
+                __cfaabi_dbg_debug_do(
+                        this.prev_name = caller;
+                        this.prev_thrd = this_thread;
+                )
+        }

src/libcfa/concurrency/alarm.c

-              r32cab5b
+              rb2fe1c9
 // Created On       : Fri Jun 2 11:31:25 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Mon Apr  9 13:36:18 2018
 // Update Count     : 61
+// Last Modified On : Fri Jul 21 22:35:18 2017
+// Update Count     : 1
 //
 …
 #include "preemption.h"
+static inline void ?{}( itimerval & this, __cfa_time_t * alarm ) with( this ) {
+        it_value.tv_sec = alarm->val / (1`cfa_s).val;                   // seconds
+        it_value.tv_usec = max( (alarm->val % (1`cfa_s).val) / (1`cfa_us).val, 1000 ); // microseconds
+        it_interval.tv_sec = 0;
+        it_interval.tv_usec = 0;
+}
+static inline void ?{}( __cfa_time_t & this, timespec * curr ) {
+        uint64_t secs  = curr->tv_sec;
+        uint64_t nsecs = curr->tv_nsec;
+        this.val = from_s(secs).val + nsecs;
+}
 //=============================================================================================
 // Clock logic
 //=============================================================================================
 Time __kernel_get_time() {
+__cfa_time_t __kernel_get_time() {
         timespec curr;
         clock_gettime( CLOCK_MONOTONIC_RAW, &curr );            // CLOCK_REALTIME
         return (Time){ curr };
+        clock_gettime( CLOCK_REALTIME, &curr );
+        return (__cfa_time_t){ &curr };
+}
+void __kernel_set_timer( Duration alarm ) {
+        setitimer( ITIMER_REAL, &(itimerval){ alarm }, NULL );
+void __kernel_set_timer( __cfa_time_t alarm ) {
+        itimerval val = { &alarm };
+        setitimer( ITIMER_REAL, &val, NULL );
+}
 …
 //=============================================================================================
 void ?{}( alarm_node_t & this, thread_desc * thrd, Time alarm, Duration period ) with( this ) {
+void ?{}( alarm_node_t & this, thread_desc * thrd, __cfa_time_t alarm = 0`cfa_s, __cfa_time_t period = 0`cfa_s ) with( this ) {
         this.thrd = thrd;
         this.alarm = alarm;
 …
+}
 void ?{}( alarm_node_t & this, processor   * proc, Time alarm, Duration period ) with( this ) {
+void ?{}( alarm_node_t & this, processor   * proc, __cfa_time_t alarm = 0`cfa_s, __cfa_time_t period = 0`cfa_s ) with( this ) {
         this.proc = proc;
         this.alarm = alarm;

src/libcfa/concurrency/alarm.h

-              r32cab5b
+              rb2fe1c9
 // Created On       : Fri Jun 2 11:31:25 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Mon Mar 26 16:25:41 2018
 // Update Count     : 11
+// Last Modified On : Sat Jul 22 09:59:27 2017
+// Update Count     : 3
 //
 …
 #include <assert.h>
 #include "time"
+#include "bits/cfatime.h"
 struct thread_desc;
 …
 //=============================================================================================
 Time __kernel_get_time();
 void __kernel_set_timer( Duration alarm );
+__cfa_time_t __kernel_get_time();
+void __kernel_set_timer( __cfa_time_t alarm );
 //=============================================================================================
 …
 struct alarm_node_t {
         Time alarm;                             // time when alarm goes off
         Duration period;                        // if > 0 => period of alarm
+        __cfa_time_t alarm;             // time when alarm goes off
+        __cfa_time_t period;            // if > 0 => period of alarm
         alarm_node_t * next;            // intrusive link list field
 …
 typedef alarm_node_t ** __alarm_it_t;
 void ?{}( alarm_node_t & this, thread_desc * thrd, Time alarm, Duration period );
 void ?{}( alarm_node_t & this, processor   * proc, Time alarm, Duration period );
+void ?{}( alarm_node_t & this, thread_desc * thrd, __cfa_time_t alarm = 0`cfa_s, __cfa_time_t period = 0`cfa_s );
+void ?{}( alarm_node_t & this, processor   * proc, __cfa_time_t alarm = 0`cfa_s, __cfa_time_t period = 0`cfa_s );
 void ^?{}( alarm_node_t & this );

src/libcfa/concurrency/coroutine

-              r32cab5b
+              rb2fe1c9
 // Created On       : Mon Nov 28 12:27:26 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Mar 30 18:23:45 2018
 // Update Count     : 8
+// Last Modified On : Wed Aug 30 07:58:29 2017
+// Update Count     : 3
 //
 …
+}
+// Get current coroutine
+extern thread_local coroutine_desc * volatile this_coroutine;
 // Private wrappers for context switch and stack creation
 extern void CoroutineCtxSwitch(coroutine_desc * src, coroutine_desc * dst);
 …
 // Suspend implementation inlined for performance
 static inline void suspend() {
         coroutine_desc * src = TL_GET( this_coroutine );                        // optimization
+        coroutine_desc * src = this_coroutine;          // optimization
         assertf( src->last != 0,
 …
 forall(dtype T | is_coroutine(T))
 static inline void resume(T & cor) {
         coroutine_desc * src = TL_GET( this_coroutine );                        // optimization
+        coroutine_desc * src = this_coroutine;          // optimization
         coroutine_desc * dst = get_coroutine(cor);
 …
 static inline void resume(coroutine_desc * dst) {
         coroutine_desc * src = TL_GET( this_coroutine );                        // optimization
+        coroutine_desc * src = this_coroutine;          // optimization
         // not resuming self ?

src/libcfa/concurrency/coroutine.c

-              r32cab5b
+              rb2fe1c9
 // Created On       : Mon Nov 28 12:27:26 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Mar 30 17:20:57 2018
 // Update Count     : 9
+// Last Modified On : Thu Feb  8 16:10:31 2018
+// Update Count     : 4
 //
 …
 // Wrapper for co
 void CoroutineCtxSwitch(coroutine_desc* src, coroutine_desc* dst) {
         verify( TL_GET( preemption_state ).enabled || TL_GET( this_processor )->do_terminate );
+        verify( preemption_state.enabled || this_processor->do_terminate );
         disable_interrupts();
 …
         // set new coroutine that task is executing
         TL_SET( this_coroutine, dst );
+        this_coroutine = dst;
         // context switch to specified coroutine
 …
         enable_interrupts( __cfaabi_dbg_ctx );
         verify( TL_GET( preemption_state ).enabled || TL_GET( this_processor )->do_terminate );
+        verify( preemption_state.enabled || this_processor->do_terminate );
 } //ctxSwitchDirect
 …
         void __leave_coroutine(void) {
                 coroutine_desc * src = TL_GET( this_coroutine ); // optimization
+                coroutine_desc * src = this_coroutine;          // optimization
                 assertf( src->starter != 0,

src/libcfa/concurrency/invoke.h

-              r32cab5b
+              rb2fe1c9
 // Created On       : Tue Jan 17 12:27:26 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Mar 30 22:33:59 2018
 // Update Count     : 30
+// Last Modified On : Fri Feb  9 14:41:55 2018
+// Update Count     : 6
 //
 …
 #include "bits/defs.h"
 #include "bits/locks.h"
-#define TL_GET( member ) kernelThreadData.member
-#define TL_SET( member, value ) kernelThreadData.member = value;
 #ifdef __cforall
 …
                 static inline struct thread_desc             * & get_next( struct thread_desc             & this );
                 static inline struct __condition_criterion_t * & get_next( struct __condition_criterion_t & this );
-                extern thread_local struct KernelThreadData {
-                        struct coroutine_desc * volatile this_coroutine;
-                        struct thread_desc    * volatile this_thread;
-                        struct processor      * volatile this_processor;
-                        struct {
-                                volatile unsigned short disable_count;
-                                volatile bool enabled;
-                                volatile bool in_progress;
-                        } preemption_state;
-                } kernelThreadData;
+        }
-        static inline struct coroutine_desc * volatile active_coroutine() { return TL_GET( this_coroutine ); }
-        static inline struct thread_desc * volatile active_thread() { return TL_GET( this_thread ); }
-        static inline struct processor * volatile active_processor() { return TL_GET( this_processor ); }
         #endif
         struct coStack_t {
+                size_t size;                                                                    // size of stack
+                void * storage;                                                                 // pointer to stack
+                void * limit;                                                                   // stack grows towards stack limit
+                void * base;                                                                    // base of stack
+                void * context;                                                                 // address of cfa_context_t
+                void * top;                                                                             // address of top of storage
+                bool userStack;                                                                 // whether or not the user allocated the stack
+                // size of stack
+                size_t size;
+                // pointer to stack
+                void *storage;
+                // stack grows towards stack limit
+                void *limit;
+                // base of stack
+                void *base;
+                // address of cfa_context_t
+                void *context;
+                // address of top of storage
+                void *top;
+                // whether or not the user allocated the stack
+                bool userStack;
         };
 …
         struct coroutine_desc {
+                struct coStack_t stack;                                                 // stack information of the coroutine
+                const char * name;                                                              // textual name for coroutine/task, initialized by uC++ generated code
+                int errno_;                                                                             // copy of global UNIX variable errno
+                enum coroutine_state state;                                             // current execution status for coroutine
+                struct coroutine_desc * starter;                                // first coroutine to resume this one
+                struct coroutine_desc * last;                                   // last coroutine to resume this one
+                // stack information of the coroutine
+                struct coStack_t stack;
+                // textual name for coroutine/task, initialized by uC++ generated code
+                const char *name;
+                // copy of global UNIX variable errno
+                int errno_;
+                // current execution status for coroutine
+                enum coroutine_state state;
+                // first coroutine to resume this one
+                struct coroutine_desc * starter;
+                // last coroutine to resume this one
+                struct coroutine_desc * last;
         };

src/libcfa/concurrency/kernel

-              r32cab5b
+              rb2fe1c9
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Apr 10 14:46:49 2018
 // Update Count     : 10
+// Last Modified On : Sat Jul 22 09:58:39 2017
+// Update Count     : 2
 //
 …
 #include "invoke.h"
 #include "time_t.h"
+#include "bits/cfatime.h"
 extern "C" {
 …
         // Preemption rate on this cluster
         Duration preemption_rate;
+        __cfa_time_t preemption_rate;
 };
 extern Duration default_preemption();
+extern __cfa_time_t default_preemption();
 void ?{} (cluster & this);

src/libcfa/concurrency/kernel.c

-              r32cab5b
+              rb2fe1c9
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Mon Apr  9 16:11:46 2018
 // Update Count     : 24
+// Last Modified On : Thu Feb  8 23:52:19 2018
+// Update Count     : 5
 //
 …
 //CFA Includes
-#include "time"
 #include "kernel_private.h"
 #include "preemption.h"
 …
 // Global state
+thread_local coroutine_desc * volatile this_coroutine;
+thread_local thread_desc *    volatile this_thread;
+thread_local processor *      volatile this_processor;
 // volatile thread_local bool preemption_in_progress = 0;
 // volatile thread_local bool preemption_enabled = false;
 // volatile thread_local unsigned short disable_preempt_count = 1;
+thread_local struct KernelThreadData kernelThreadData = {
+        NULL,
+        NULL,
+        NULL,
+        { 1, false, false }
+};
+volatile thread_local __cfa_kernel_preemption_state_t preemption_state = { false, false, 1 };
 //-----------------------------------------------------------------------------
 …
                 terminate(&this);
                 verify(this.do_terminate);
                 verify(TL_GET( this_processor ) != &this);
+                verify(this_processor != &this);
                 P( terminated );
                 verify(TL_GET( this_processor ) != &this);
+                verify(this_processor != &this);
                 pthread_join( kernel_thread, NULL );
+        }
 …
                         if(readyThread)
+                        {
                                 verify( ! TL_GET( preemption_state ).enabled );
+                                verify( !preemption_state.enabled );
                                 runThread(this, readyThread);
                                 verify( ! TL_GET( preemption_state ).enabled );
+                                verify( !preemption_state.enabled );
                                 //Some actions need to be taken from the kernel
 …
         //Update global state
         TL_SET( this_thread, dst );
+        this_thread = dst;
         // Context Switch to the thread
 …
 void returnToKernel() {
         coroutine_desc * proc_cor = get_coroutine(TL_GET( this_processor )->runner);
         coroutine_desc * thrd_cor = TL_GET( this_thread )->curr_cor = TL_GET( this_coroutine );
+        coroutine_desc * proc_cor = get_coroutine(this_processor->runner);
+        coroutine_desc * thrd_cor = this_thread->curr_cor = this_coroutine;
         ThreadCtxSwitch(thrd_cor, proc_cor);
+}
 …
 void finishRunning(processor * this) with( this->finish ) {
         if( action_code == Release ) {
                 verify( ! TL_GET( preemption_state ).enabled );
+                verify( !preemption_state.enabled );
                 unlock( *lock );
+        }
 …
+        }
         else if( action_code == Release_Schedule ) {
                 verify( ! TL_GET( preemption_state ).enabled );
+                verify( !preemption_state.enabled );
                 unlock( *lock );
                 ScheduleThread( thrd );
+        }
         else if( action_code == Release_Multi ) {
                 verify( ! TL_GET( preemption_state ).enabled );
+                verify( !preemption_state.enabled );
                 for(int i = 0; i < lock_count; i++) {
                         unlock( *locks[i] );
 …
 void * CtxInvokeProcessor(void * arg) {
         processor * proc = (processor *) arg;
         TL_SET( this_processor, proc );
         TL_SET( this_coroutine, NULL );
         TL_SET( this_thread, NULL );
         TL_GET( preemption_state ).enabled = false;
         TL_GET( preemption_state ).disable_count = 1;
+        this_processor = proc;
+        this_coroutine = NULL;
+        this_thread = NULL;
+        preemption_state.enabled = false;
+        preemption_state.disable_count = 1;
         // SKULLDUGGERY: We want to create a context for the processor coroutine
         // which is needed for the 2-step context switch. However, there is no reason
 …
         //Set global state
         TL_SET( this_coroutine, get_coroutine(proc->runner) );
         TL_SET( this_thread, NULL );
+        this_coroutine = get_coroutine(proc->runner);
+        this_thread = NULL;
         //We now have a proper context from which to schedule threads
 …
 void kernel_first_resume(processor * this) {
         coroutine_desc * src = TL_GET( this_coroutine );
+        coroutine_desc * src = this_coroutine;
         coroutine_desc * dst = get_coroutine(this->runner);
         verify( ! TL_GET( preemption_state ).enabled );
+        verify( !preemption_state.enabled );
         create_stack(&dst->stack, dst->stack.size);
         CtxStart(&this->runner, CtxInvokeCoroutine);
         verify( ! TL_GET( preemption_state ).enabled );
+        verify( !preemption_state.enabled );
         dst->last = src;
 …
         // set new coroutine that task is executing
         TL_SET( this_coroutine, dst );
+        this_coroutine = dst;
         // SKULLDUGGERY normally interrupts are enable before leaving a coroutine ctxswitch.
 …
         src->state = Active;
         verify( ! TL_GET( preemption_state ).enabled );
+        verify( !preemption_state.enabled );
+}
 …
 // Scheduler routines
 void ScheduleThread( thread_desc * thrd ) {
         // if( ! thrd ) return;
+        // if( !thrd ) return;
         verify( thrd );
         verify( thrd->self_cor.state != Halted );
         verify( ! TL_GET( preemption_state ).enabled );
+        verify( !preemption_state.enabled );
         verifyf( thrd->next == NULL, "Expected null got %p", thrd->next );
         with( *TL_GET( this_processor )->cltr ) {
+        with( *this_processor->cltr ) {
                 lock  ( ready_queue_lock __cfaabi_dbg_ctx2 );
                 append( ready_queue, thrd );
 …
+        }
         verify( ! TL_GET( preemption_state ).enabled );
+        verify( !preemption_state.enabled );
+}
 thread_desc * nextThread(cluster * this) with( *this ) {
         verify( ! TL_GET( preemption_state ).enabled );
+        verify( !preemption_state.enabled );
         lock( ready_queue_lock __cfaabi_dbg_ctx2 );
         thread_desc * head = pop_head( ready_queue );
         unlock( ready_queue_lock );
         verify( ! TL_GET( preemption_state ).enabled );
+        verify( !preemption_state.enabled );
         return head;
+}
 …
 void BlockInternal() {
         disable_interrupts();
         verify( ! TL_GET( preemption_state ).enabled );
+        verify( !preemption_state.enabled );
         returnToKernel();
         verify( ! TL_GET( preemption_state ).enabled );
+        verify( !preemption_state.enabled );
         enable_interrupts( __cfaabi_dbg_ctx );
+}
 …
 void BlockInternal( __spinlock_t * lock ) {
         disable_interrupts();
         TL_GET( this_processor )->finish.action_code = Release;
         TL_GET( this_processor )->finish.lock        = lock;
         verify( ! TL_GET( preemption_state ).enabled );
+        this_processor->finish.action_code = Release;
+        this_processor->finish.lock        = lock;
+        verify( !preemption_state.enabled );
         returnToKernel();
         verify( ! TL_GET( preemption_state ).enabled );
+        verify( !preemption_state.enabled );
         enable_interrupts( __cfaabi_dbg_ctx );
 …
 void BlockInternal( thread_desc * thrd ) {
         disable_interrupts();
         TL_GET( this_processor )->finish.action_code = Schedule;
         TL_GET( this_processor )->finish.thrd        = thrd;
         verify( ! TL_GET( preemption_state ).enabled );
+        this_processor->finish.action_code = Schedule;
+        this_processor->finish.thrd        = thrd;
+        verify( !preemption_state.enabled );
         returnToKernel();
         verify( ! TL_GET( preemption_state ).enabled );
+        verify( !preemption_state.enabled );
         enable_interrupts( __cfaabi_dbg_ctx );
 …
         assert(thrd);
         disable_interrupts();
         TL_GET( this_processor )->finish.action_code = Release_Schedule;
         TL_GET( this_processor )->finish.lock        = lock;
         TL_GET( this_processor )->finish.thrd        = thrd;
         verify( ! TL_GET( preemption_state ).enabled );
+        this_processor->finish.action_code = Release_Schedule;
+        this_processor->finish.lock        = lock;
+        this_processor->finish.thrd        = thrd;
+        verify( !preemption_state.enabled );
         returnToKernel();
         verify( ! TL_GET( preemption_state ).enabled );
+        verify( !preemption_state.enabled );
         enable_interrupts( __cfaabi_dbg_ctx );
 …
 void BlockInternal(__spinlock_t * locks [], unsigned short count) {
         disable_interrupts();
         TL_GET( this_processor )->finish.action_code = Release_Multi;
         TL_GET( this_processor )->finish.locks       = locks;
         TL_GET( this_processor )->finish.lock_count  = count;
         verify( ! TL_GET( preemption_state ).enabled );
+        this_processor->finish.action_code = Release_Multi;
+        this_processor->finish.locks       = locks;
+        this_processor->finish.lock_count  = count;
+        verify( !preemption_state.enabled );
         returnToKernel();
         verify( ! TL_GET( preemption_state ).enabled );
+        verify( !preemption_state.enabled );
         enable_interrupts( __cfaabi_dbg_ctx );
 …
 void BlockInternal(__spinlock_t * locks [], unsigned short lock_count, thread_desc * thrds [], unsigned short thrd_count) {
         disable_interrupts();
         TL_GET( this_processor )->finish.action_code = Release_Multi_Schedule;
         TL_GET( this_processor )->finish.locks       = locks;
         TL_GET( this_processor )->finish.lock_count  = lock_count;
         TL_GET( this_processor )->finish.thrds       = thrds;
         TL_GET( this_processor )->finish.thrd_count  = thrd_count;
         verify( ! TL_GET( preemption_state ).enabled );
+        this_processor->finish.action_code = Release_Multi_Schedule;
+        this_processor->finish.locks       = locks;
+        this_processor->finish.lock_count  = lock_count;
+        this_processor->finish.thrds       = thrds;
+        this_processor->finish.thrd_count  = thrd_count;
+        verify( !preemption_state.enabled );
         returnToKernel();
         verify( ! TL_GET( preemption_state ).enabled );
+        verify( !preemption_state.enabled );
         enable_interrupts( __cfaabi_dbg_ctx );
 …
 void LeaveThread(__spinlock_t * lock, thread_desc * thrd) {
         verify( ! TL_GET( preemption_state ).enabled );
         TL_GET( this_processor )->finish.action_code = thrd ? Release_Schedule : Release;
         TL_GET( this_processor )->finish.lock        = lock;
         TL_GET( this_processor )->finish.thrd        = thrd;
+        verify( !preemption_state.enabled );
+        this_processor->finish.action_code = thrd ? Release_Schedule : Release;
+        this_processor->finish.lock        = lock;
+        this_processor->finish.thrd        = thrd;
         returnToKernel();
 …
 // Kernel boot procedures
 void kernel_startup(void) {
         verify( ! TL_GET( preemption_state ).enabled );
+        verify( !preemption_state.enabled );
         __cfaabi_dbg_print_safe("Kernel : Starting\n");
 …
         //initialize the global state variables
         TL_SET( this_processor, mainProcessor );
         TL_SET( this_thread, mainThread );
         TL_SET( this_coroutine, &mainThread->self_cor );
+        this_processor = mainProcessor;
+        this_thread = mainThread;
+        this_coroutine = &mainThread->self_cor;
         // Enable preemption
 …
         // context. Hence, the main thread does not begin through CtxInvokeThread, like all other threads. The trick here is that
         // mainThread is on the ready queue when this call is made.
         kernel_first_resume( TL_GET( this_processor ) );
+        kernel_first_resume( this_processor );
 …
         __cfaabi_dbg_print_safe("Kernel : Started\n--------------------------------------------------\n\n");
         verify( ! TL_GET( preemption_state ).enabled );
+        verify( !preemption_state.enabled );
         enable_interrupts( __cfaabi_dbg_ctx );
         verify( TL_GET( preemption_state ).enabled );
+        verify( preemption_state.enabled );
+}
 …
         __cfaabi_dbg_print_safe("\n--------------------------------------------------\nKernel : Shutting down\n");
         verify( TL_GET( preemption_state ).enabled );
+        verify( preemption_state.enabled );
         disable_interrupts();
         verify( ! TL_GET( preemption_state ).enabled );
+        verify( !preemption_state.enabled );
         // SKULLDUGGERY: Notify the mainProcessor it needs to terminates.
 …
         // first task to abort ?
         if ( ! kernel_abort_called ) {                  // not first task to abort ?
+        if ( !kernel_abort_called ) {                   // not first task to abort ?
                 kernel_abort_called = true;
                 unlock( kernel_abort_lock );
 …
+        }
         return TL_GET( this_thread );
+        return this_thread;
+}
 …
         __cfaabi_dbg_bits_write( abort_text, len );
         if ( get_coroutine(thrd) != TL_GET( this_coroutine ) ) {
                 len = snprintf( abort_text, abort_text_size, " in coroutine %.256s (%p).\n", TL_GET( this_coroutine )->name, TL_GET( this_coroutine ) );
+        if ( thrd != this_coroutine ) {
+                len = snprintf( abort_text, abort_text_size, " in coroutine %.256s (%p).\n", this_coroutine->name, this_coroutine );
                 __cfaabi_dbg_bits_write( abort_text, len );
+        }
 …
 int kernel_abort_lastframe( void ) __attribute__ ((__nothrow__)) {
         return get_coroutine(TL_GET( this_thread )) == get_coroutine(mainThread) ? 4 : 2;
+        return get_coroutine(this_thread) == get_coroutine(mainThread) ? 4 : 2;
+}
 …
         if ( count < 0 ) {
                 // queue current task
                 append( waiting, (thread_desc *)TL_GET( this_thread ) );
+                append( waiting, (thread_desc *)this_thread );
                 // atomically release spin lock and block

src/libcfa/concurrency/kernel_private.h

-              r32cab5b
+              rb2fe1c9
 // Created On       : Mon Feb 13 12:27:26 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Mar 29 14:06:40 2018
 // Update Count     : 3
+// Last Modified On : Sat Jul 22 09:58:09 2017
+// Update Count     : 2
 //
 …
 extern event_kernel_t * event_kernel;
 //extern thread_local coroutine_desc * volatile this_coroutine;
 //extern thread_local thread_desc *    volatile this_thread;
 //extern thread_local processor *      volatile this_processor;
+extern thread_local coroutine_desc * volatile this_coroutine;
+extern thread_local thread_desc *    volatile this_thread;
+extern thread_local processor *      volatile this_processor;
 // extern volatile thread_local bool preemption_in_progress;

src/libcfa/concurrency/monitor.c

-              r32cab5b
+              rb2fe1c9
 // Created On       : Thd Feb 23 12:27:26 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Mar 30 14:30:26 2018
 // Update Count     : 9
+// Last Modified On : Fri Feb 16 14:49:53 2018
+// Update Count     : 5
 //
 …
                 // Lock the monitor spinlock
                 lock( this->lock __cfaabi_dbg_ctx2 );
                 thread_desc * thrd = TL_GET( this_thread );
+                thread_desc * thrd = this_thread;
                 __cfaabi_dbg_print_safe( "Kernel : %10p Entering mon %p (%p)\n", thrd, this, this->owner);
 …
                 // Lock the monitor spinlock
                 lock( this->lock __cfaabi_dbg_ctx2 );
                 thread_desc * thrd = TL_GET( this_thread );
+                thread_desc * thrd = this_thread;
                 __cfaabi_dbg_print_safe( "Kernel : %10p Entering dtor for mon %p (%p)\n", thrd, this, this->owner);
 …
                         // Create the node specific to this wait operation
                         wait_ctx_primed( TL_GET( this_thread ), 0 )
+                        wait_ctx_primed( this_thread, 0 )
                         // Some one else has the monitor, wait for him to finish and then run
 …
                         __cfaabi_dbg_print_safe( "Kernel :  blocking \n" );
                         wait_ctx( TL_GET( this_thread ), 0 )
+                        wait_ctx( this_thread, 0 )
                         this->dtor_node = &waiter;
 …
                 lock( this->lock __cfaabi_dbg_ctx2 );
                 __cfaabi_dbg_print_safe( "Kernel : %10p Leaving mon %p (%p)\n", TL_GET( this_thread ), this, this->owner);
                 verifyf( TL_GET( this_thread ) == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", TL_GET( this_thread ), this->owner, this->recursion, this );
+                __cfaabi_dbg_print_safe( "Kernel : %10p Leaving mon %p (%p)\n", this_thread, this, this->owner);
+                verifyf( this_thread == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", this_thread, this->owner, this->recursion, this );
                 // Leaving a recursion level, decrement the counter
 …
         void __leave_dtor_monitor_desc( monitor_desc * this ) {
                 __cfaabi_dbg_debug_do(
                         if( TL_GET( this_thread ) != this->owner ) {
                                 abort( "Destroyed monitor %p has inconsistent owner, expected %p got %p.\n", this, TL_GET( this_thread ), this->owner);
+                        if( this_thread != this->owner ) {
+                                abort( "Destroyed monitor %p has inconsistent owner, expected %p got %p.\n", this, this_thread, this->owner);
+                        }
                         if( this->recursion != 1 ) {
 …
         // Save previous thread context
         this.prev = TL_GET( this_thread )->monitors;
+        this.prev = this_thread->monitors;
         // Update thread context (needed for conditions)
         (TL_GET( this_thread )->monitors){m, count, func};
+        (this_thread->monitors){m, count, func};
         // __cfaabi_dbg_print_safe( "MGUARD : enter %d\n", count);
 …
         // Restore thread context
         TL_GET( this_thread )->monitors = this.prev;
+        this_thread->monitors = this.prev;
+}
 …
         // Save previous thread context
         this.prev = TL_GET( this_thread )->monitors;
+        this.prev = this_thread->monitors;
         // Update thread context (needed for conditions)
         (TL_GET( this_thread )->monitors){m, 1, func};
+        (this_thread->monitors){m, 1, func};
         __enter_monitor_dtor( this.m, func );
 …
         // Restore thread context
         TL_GET( this_thread )->monitors = this.prev;
+        this_thread->monitors = this.prev;
+}
 …
         // Create the node specific to this wait operation
         wait_ctx( TL_GET( this_thread ), user_info );
+        wait_ctx( this_thread, user_info );
         // Append the current wait operation to the ones already queued on the condition
 …
         //Some more checking in debug
         __cfaabi_dbg_debug_do(
                 thread_desc * this_thrd = TL_GET( this_thread );
+                thread_desc * this_thrd = this_thread;
                 if ( this.monitor_count != this_thrd->monitors.size ) {
                         abort( "Signal on condition %p made with different number of monitor(s), expected %zi got %zi", &this, this.monitor_count, this_thrd->monitors.size );
 …
         // Create the node specific to this wait operation
         wait_ctx_primed( TL_GET( this_thread ), 0 )
+        wait_ctx_primed( this_thread, 0 )
         //save contexts
 …
                                 // Create the node specific to this wait operation
                                 wait_ctx_primed( TL_GET( this_thread ), 0 );
+                                wait_ctx_primed( this_thread, 0 );
                                 // Save monitor states
 …
         // Create the node specific to this wait operation
         wait_ctx_primed( TL_GET( this_thread ), 0 );
+        wait_ctx_primed( this_thread, 0 );
         monitor_save;
 …
         for( __lock_size_t i = 0; i < count; i++) {
                 verify( monitors[i]->owner == TL_GET( this_thread ) );
+                verify( monitors[i]->owner == this_thread );
+        }
 …
 static inline void brand_condition( condition & this ) {
         thread_desc * thrd = TL_GET( this_thread );
+        thread_desc * thrd = this_thread;
         if( !this.monitors ) {
                 // __cfaabi_dbg_print_safe( "Branding\n" );

src/libcfa/concurrency/preemption.c

-              r32cab5b
+              rb2fe1c9
 // Created On       : Mon Jun 5 14:20:42 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Mon Apr  9 13:52:39 2018
 // Update Count     : 36
+// Last Modified On : Fri Feb  9 16:38:13 2018
+// Update Count     : 14
 //
 …
+}
+#include "bits/cfatime.h"
 #include "bits/signal.h"
 #if !defined(__CFA_DEFAULT_PREEMPTION__)
 #define __CFA_DEFAULT_PREEMPTION__ 10`ms
+#define __CFA_DEFAULT_PREEMPTION__ 10`cfa_ms
 #endif
 Duration default_preemption() __attribute__((weak)) {
+__cfa_time_t default_preemption() __attribute__((weak)) {
         return __CFA_DEFAULT_PREEMPTION__;
+}
 …
 // Get next expired node
 static inline alarm_node_t * get_expired( alarm_list_t * alarms, Time currtime ) {
+static inline alarm_node_t * get_expired( alarm_list_t * alarms, __cfa_time_t currtime ) {
         if( !alarms->head ) return NULL;                          // If no alarms return null
         if( alarms->head->alarm >= currtime ) return NULL;        // If alarms head not expired return null
 …
         alarm_node_t * node = NULL;                     // Used in the while loop but cannot be declared in the while condition
         alarm_list_t * alarms = &event_kernel->alarms;  // Local copy for ease of reading
         Time currtime = __kernel_get_time();                    // Check current time once so we everything "happens at once"
+        __cfa_time_t currtime = __kernel_get_time();    // Check current time once so we everything "happens at once"
         //Loop throught every thing expired
 …
                 // Check if this is a periodic alarm
                 Duration period = node->period;
+                __cfa_time_t period = node->period;
                 if( period > 0 ) {
                         node->alarm = currtime + period;    // Alarm is periodic, add currtime to it (used cached current time)
 …
 // Update the preemption of a processor and notify interested parties
 void update_preemption( processor * this, Duration duration ) {
+void update_preemption( processor * this, __cfa_time_t duration ) {
         alarm_node_t * alarm = this->preemption_alarm;
         // Alarms need to be enabled
         if ( duration > 0 && ! alarm->set ) {
+        if ( duration > 0 && !alarm->set ) {
                 alarm->alarm = __kernel_get_time() + duration;
                 alarm->period = duration;
                 register_self( alarm );
+        }
         // Zero duration but alarm is set
+        // Zero duraction but alarm is set
         else if ( duration == 0 && alarm->set ) {
                 unregister_self( alarm );
 …
         // Disable interrupts by incrementing the counter
         void disable_interrupts() {
                 TL_GET( preemption_state ).enabled = false;
                 __attribute__((unused)) unsigned short new_val = TL_GET( preemption_state ).disable_count + 1;
                 TL_GET( preemption_state ).disable_count = new_val;
+                preemption_state.enabled = false;
+                __attribute__((unused)) unsigned short new_val = preemption_state.disable_count + 1;
+                preemption_state.disable_count = new_val;
                 verify( new_val < 65_000u );              // If this triggers someone is disabling interrupts without enabling them
+        }
 …
         // If counter reaches 0, execute any pending CtxSwitch
         void enable_interrupts( __cfaabi_dbg_ctx_param ) {
                 processor   * proc = TL_GET( this_processor ); // Cache the processor now since interrupts can start happening after the atomic add
                 thread_desc * thrd = TL_GET( this_thread );       // Cache the thread now since interrupts can start happening after the atomic add
                 unsigned short prev = TL_GET( preemption_state ).disable_count;
                 TL_GET( preemption_state ).disable_count -= 1;
+                processor   * proc = this_processor;      // Cache the processor now since interrupts can start happening after the atomic add
+                thread_desc * thrd = this_thread;         // Cache the thread now since interrupts can start happening after the atomic add
+                unsigned short prev = preemption_state.disable_count;
+                preemption_state.disable_count -= 1;
                 verify( prev != 0u );                     // If this triggers someone is enabled already enabled interruptsverify( prev != 0u );
                 // Check if we need to prempt the thread because an interrupt was missed
                 if( prev == 1 ) {
                         TL_GET( preemption_state ).enabled = true;
+                        preemption_state.enabled = true;
                         if( proc->pending_preemption ) {
                                 proc->pending_preemption = false;
 …
         // Don't execute any pending CtxSwitch even if counter reaches 0
         void enable_interrupts_noPoll() {
                 unsigned short prev = TL_GET( preemption_state ).disable_count;
                 TL_GET( preemption_state ).disable_count -= 1;
+                unsigned short prev = preemption_state.disable_count;
+                preemption_state.disable_count -= 1;
                 verifyf( prev != 0u, "Incremented from %u\n", prev );                     // If this triggers someone is enabled already enabled interrupts
                 if( prev == 1 ) {
                         TL_GET( preemption_state ).enabled = true;
+                        preemption_state.enabled = true;
+                }
+        }
 …
 // If false : preemption is unsafe and marked as pending
 static inline bool preemption_ready() {
         bool ready = TL_GET( preemption_state ).enabled && !TL_GET( preemption_state ).in_progress; // Check if preemption is safe
         TL_GET( this_processor )->pending_preemption = !ready;                  // Adjust the pending flag accordingly
+        bool ready = preemption_state.enabled && !preemption_state.in_progress; // Check if preemption is safe
+        this_processor->pending_preemption = !ready;                        // Adjust the pending flag accordingly
         return ready;
+}
 …
         // Start with preemption disabled until ready
         TL_GET( preemption_state ).enabled = false;
         TL_GET( preemption_state ).disable_count = 1;
+        preemption_state.enabled = false;
+        preemption_state.disable_count = 1;
         // Initialize the event kernel
 …
 // Used by thread to control when they want to receive preemption signals
 void ?{}( preemption_scope & this, processor * proc ) {
         (this.alarm){ proc, (Time){ 0 }, 0`s };
+        (this.alarm){ proc, 0`cfa_s, 0`cfa_s };
         this.proc = proc;
         this.proc->preemption_alarm = &this.alarm;
 …
         disable_interrupts();
         update_preemption( this.proc, 0`s );
+        update_preemption( this.proc, 0`cfa_s );
+}
 …
         // before the kernel thread has even started running. When that happens an iterrupt
         // we a null 'this_processor' will be caught, just ignore it.
         if(!TL_GET( this_processor )) return;
+        if(!this_processor) return;
         choose(sfp->si_value.sival_int) {
                 case PREEMPT_NORMAL   : ;// Normal case, nothing to do here
                 case PREEMPT_TERMINATE: verify(TL_GET( this_processor )->do_terminate);
+                case PREEMPT_TERMINATE: verify(this_processor->do_terminate);
                 default:
                         abort( "internal error, signal value is %d", sfp->si_value.sival_int );
 …
         __cfaabi_dbg_print_buffer_decl( " KERNEL: preempting core %p (%p).\n", this_processor, this_thread);
         TL_GET( preemption_state ).in_progress = true;  // Sync flag : prevent recursive calls to the signal handler
+        preemption_state.in_progress = true;                      // Sync flag : prevent recursive calls to the signal handler
         signal_unblock( SIGUSR1 );                          // We are about to CtxSwitch out of the signal handler, let other handlers in
         TL_GET( preemption_state ).in_progress = false; // Clear the in progress flag
+        preemption_state.in_progress = false;                     // Clear the in progress flag
         // Preemption can occur here
         BlockInternal( (thread_desc*)TL_GET( this_thread ) ); // Do the actual CtxSwitch
+        BlockInternal( (thread_desc*)this_thread );         // Do the actual CtxSwitch
+}

src/libcfa/concurrency/preemption.h

-              r32cab5b
+              rb2fe1c9
 // Created On       : Mon Jun 5 14:20:42 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Mar 23 17:18:53 2018
 // Update Count     : 2
+// Last Modified On : Fri Jul 21 22:34:25 2017
+// Update Count     : 1
 //
 …
 void kernel_start_preemption();
 void kernel_stop_preemption();
 void update_preemption( processor * this, Duration duration );
+void update_preemption( processor * this, __cfa_time_t duration );
 void tick_preemption();

src/libcfa/concurrency/thread

-              r32cab5b
+              rb2fe1c9
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Mar 29 14:07:11 2018
 // Update Count     : 4
+// Last Modified On : Sat Jul 22 09:59:40 2017
+// Update Count     : 3
 //
 …
+}
 //extern thread_local thread_desc * volatile this_thread;
+extern thread_local thread_desc * volatile this_thread;
 forall( dtype T | is_thread(T) )

src/libcfa/concurrency/thread.c

-              r32cab5b
+              rb2fe1c9
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Mar 30 17:19:52 2018
 // Update Count     : 8
+// Last Modified On : Fri Jul 21 22:34:46 2017
+// Update Count     : 1
 //
 …
+}
 //extern volatile thread_local processor * this_processor;
+extern volatile thread_local processor * this_processor;
 //-----------------------------------------------------------------------------
 …
         coroutine_desc* thrd_c = get_coroutine(this);
         thread_desc   * thrd_h = get_thread   (this);
         thrd_c->last = TL_GET( this_coroutine );
+        thrd_c->last = this_coroutine;
         // __cfaabi_dbg_print_safe("Thread start : %p (t %p, c %p)\n", this, thrd_c, thrd_h);
 …
         disable_interrupts();
         create_stack(&thrd_c->stack, thrd_c->stack.size);
         TL_SET( this_coroutine, thrd_c );
+        this_coroutine = thrd_c;
         CtxStart(&this, CtxInvokeThread);
         assert( thrd_c->last->stack.context );
 …
 extern "C" {
         void __finish_creation(void) {
                 coroutine_desc* thrd_c = TL_GET( this_coroutine );
+                coroutine_desc* thrd_c = this_coroutine;
                 ThreadCtxSwitch( thrd_c, thrd_c->last );
+        }
 …
 void yield( void ) {
         verify( TL_GET( preemption_state ).enabled );
         BlockInternal( TL_GET( this_thread ) );
         verify( TL_GET( preemption_state ).enabled );
+        verify( preemption_state.enabled );
+        BlockInternal( this_thread );
+        verify( preemption_state.enabled );
+}
 …
         // set new coroutine that the processor is executing
         // and context switch to it
         TL_SET( this_coroutine, dst );
+        this_coroutine = dst;
         assert( src->stack.context );
         CtxSwitch( src->stack.context, dst->stack.context );
         TL_SET( this_coroutine, src );
+        this_coroutine = src;
         // set state of new coroutine to active

src/libcfa/iostream

-              r32cab5b
+              rb2fe1c9
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Apr 12 14:34:37 2018
 // Update Count     : 150
+// Last Modified On : Thu Jan 25 13:08:39 2018
+// Update Count     : 149
 //
 …
 forall( dtype istype | istream( istype ) ) istype & ?|?( istype &, _Istream_cstrC );
-#include <time_t.h>                                                                             // Duration (constructors) / Time (constructors)
-forall( dtype ostype | ostream( ostype ) ) ostype & ?|?( ostype & os, Duration dur );
-forall( dtype ostype | ostream( ostype ) ) ostype & ?|?( ostype & os, Time time );
 // Local Variables: //
 // mode: c //

src/libcfa/stdlib.c

-              r32cab5b
+              rb2fe1c9
         char * eeptr;
         re = strtof( sptr, &eeptr );
         if ( sptr == eeptr ) { if ( eptr != 0 ) *eptr = eeptr; return 0.0f + 0.0f * _Complex_I; }
+        if ( sptr == *eeptr ) { if ( eptr != 0 ) *eptr = eeptr; return 0.0f + 0.0f * _Complex_I; }
         im = strtof( eeptr, &eeptr );
         if ( sptr == eeptr ) { if ( eptr != 0 ) *eptr = eeptr; return 0.0f + 0.0f * _Complex_I; }
+        if ( sptr == *eeptr ) { if ( eptr != 0 ) *eptr = eeptr; return 0.0f + 0.0f * _Complex_I; }
         if ( *eeptr != 'i' ) { if ( eptr != 0 ) *eptr = eeptr; return 0.0f + 0.0f * _Complex_I; }
         return re + im * _Complex_I;
 …
         char * eeptr;
         re = strtod( sptr, &eeptr );
         if ( sptr == eeptr ) { if ( eptr != 0 ) *eptr = eeptr; return 0.0 + 0.0 * _Complex_I; }
+        if ( sptr == *eeptr ) { if ( eptr != 0 ) *eptr = eeptr; return 0.0 + 0.0 * _Complex_I; }
         im = strtod( eeptr, &eeptr );
         if ( sptr == eeptr ) { if ( eptr != 0 ) *eptr = eeptr; return 0.0 + 0.0 * _Complex_I; }
+        if ( sptr == *eeptr ) { if ( eptr != 0 ) *eptr = eeptr; return 0.0 + 0.0 * _Complex_I; }
         if ( *eeptr != 'i' ) { if ( eptr != 0 ) *eptr = eeptr; return 0.0 + 0.0 * _Complex_I; }
         return re + im * _Complex_I;
 …
         char * eeptr;
         re = strtold( sptr, &eeptr );
         if ( sptr == eeptr ) { if ( eptr != 0 ) *eptr = eeptr; return 0.0L + 0.0L * _Complex_I; }
+        if ( sptr == *eeptr ) { if ( eptr != 0 ) *eptr = eeptr; return 0.0L + 0.0L * _Complex_I; }
         im = strtold( eeptr, &eeptr );
         if ( sptr == eeptr ) { if ( eptr != 0 ) *eptr = eeptr; return 0.0L + 0.0L * _Complex_I; }
+        if ( sptr == *eeptr ) { if ( eptr != 0 ) *eptr = eeptr; return 0.0L + 0.0L * _Complex_I; }
         if ( *eeptr != 'i' ) { if ( eptr != 0 ) *eptr = eeptr; return 0.0L + 0.0L * _Complex_I; }
         return re + im * _Complex_I;

src/tests/.expect/attributes.x64.txt

-              r32cab5b
+              rb2fe1c9
     L: __attribute__ ((unused)) ((void)1);
+}
 struct __attribute__ ((unused)) __anonymous0 {
+__attribute__ ((unused)) struct __anonymous0 {
 };
 static inline void ___constructor__F_R13s__anonymous0_autogen___1(struct __anonymous0 *___dst__R13s__anonymous0_1);
 …
     return ___ret__13s__anonymous0_1;
+}
 struct __attribute__ ((unused)) Agn1;
 struct __attribute__ ((unused)) Agn2 {
+__attribute__ ((unused)) struct Agn1;
+__attribute__ ((unused)) struct Agn2 {
 };
 static inline void ___constructor__F_R5sAgn2_autogen___1(struct Agn2 *___dst__R5sAgn2_1);
 …
     __E2__C5eAgn3_1,
 };
 struct __attribute__ ((unused)) __anonymous2;
 struct __attribute__ ((unused)) __anonymous3;
+__attribute__ ((unused)) struct __anonymous2;
+__attribute__ ((unused)) struct __anonymous3;
 struct Fdl {
     __attribute__ ((unused)) signed int __f1__i_1;
 …
     ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int (*)[10]));
     ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int ()));
     struct __attribute__ ((unused)) __anonymous4 {
+    __attribute__ ((unused)) struct __anonymous4 {
         signed int __i__i_2;
     };

src/tests/.expect/attributes.x86.txt

-              r32cab5b
+              rb2fe1c9
     L: __attribute__ ((unused)) ((void)1);
+}
 struct __attribute__ ((unused)) __anonymous0 {
+__attribute__ ((unused)) struct __anonymous0 {
 };
 static inline void ___constructor__F_R13s__anonymous0_autogen___1(struct __anonymous0 *___dst__R13s__anonymous0_1);
 …
     return ___ret__13s__anonymous0_1;
+}
 struct __attribute__ ((unused)) Agn1;
 struct __attribute__ ((unused)) Agn2 {
+__attribute__ ((unused)) struct Agn1;
+__attribute__ ((unused)) struct Agn2 {
 };
 static inline void ___constructor__F_R5sAgn2_autogen___1(struct Agn2 *___dst__R5sAgn2_1);
 …
     __E2__C5eAgn3_1,
 };
 struct __attribute__ ((unused)) __anonymous2;
 struct __attribute__ ((unused)) __anonymous3;
+__attribute__ ((unused)) struct __anonymous2;
+__attribute__ ((unused)) struct __anonymous3;
 struct Fdl {
     __attribute__ ((unused)) signed int __f1__i_1;
 …
     ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int (*)[10]));
     ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int ()));
     struct __attribute__ ((unused)) __anonymous4 {
+    __attribute__ ((unused)) struct __anonymous4 {
         signed int __i__i_2;
     };

src/tests/.expect/literals.x64.txt

-              r32cab5b
+              rb2fe1c9
 struct _Istream_cstrC __cstr__F15s_Istream_cstrC_Pci__1(char *__anonymous_object1340, signed int __size__i_1);
 void *___operator_bitor__A0_1_0_0___fail__PFi_Rd0___eof__PFi_Rd0___open__PF_Rd0PCc___close__PF_Rd0___read__PFRd0_Rd0PcUl___ungetc__PFRd0_Rd0c___fmt__PFi_Rd0PCc__FRd0_Rd015s_Istream_cstrC__1(__attribute__ ((unused)) signed int (*__fail__PFi_R7tistype__1)(void *__anonymous_object1341), __attribute__ ((unused)) signed int (*__eof__PFi_R7tistype__1)(void *__anonymous_object1342), __attribute__ ((unused)) void (*__open__PF_R7tistypePCc__1)(void *__is__R7tistype_1, const char *__name__PCc_1), __attribute__ ((unused)) void (*__close__PF_R7tistype__1)(void *__is__R7tistype_1), __attribute__ ((unused)) void *(*__read__PFR7tistype_R7tistypePcUl__1)(void *__anonymous_object1343, char *__anonymous_object1344, unsigned long int __anonymous_object1345), __attribute__ ((unused)) void *(*__ungetc__PFR7tistype_R7tistypec__1)(void *__anonymous_object1346, char __anonymous_object1347), __attribute__ ((unused)) signed int (*__fmt__PFi_R7tistypePCc__1)(void *__anonymous_object1348, const char *__fmt__PCc_1, ...), void *__anonymous_object1349, struct _Istream_cstrC __anonymous_object1350);
-struct Duration {
-    signed long int __tv__l_1;
-};
-static inline void ___constructor__F_R9sDuration_autogen___1(struct Duration *___dst__R9sDuration_1);
-static inline void ___constructor__F_R9sDuration9sDuration_autogen___1(struct Duration *___dst__R9sDuration_1, struct Duration ___src__9sDuration_1);
-static inline void ___destructor__F_R9sDuration_autogen___1(struct Duration *___dst__R9sDuration_1);
-static inline struct Duration ___operator_assign__F9sDuration_R9sDuration9sDuration_autogen___1(struct Duration *___dst__R9sDuration_1, struct Duration ___src__9sDuration_1);
-static inline void ___constructor__F_R9sDurationl_autogen___1(struct Duration *___dst__R9sDuration_1, signed long int __tv__l_1);
-static inline void ___constructor__F_R9sDuration_autogen___1(struct Duration *___dst__R9sDuration_1){
-    ((void)((*___dst__R9sDuration_1).__tv__l_1) /* ?{} */);
+}
-static inline void ___constructor__F_R9sDuration9sDuration_autogen___1(struct Duration *___dst__R9sDuration_1, struct Duration ___src__9sDuration_1){
-    ((void)((*___dst__R9sDuration_1).__tv__l_1=___src__9sDuration_1.__tv__l_1) /* ?{} */);
+}
-static inline void ___destructor__F_R9sDuration_autogen___1(struct Duration *___dst__R9sDuration_1){
-    ((void)((*___dst__R9sDuration_1).__tv__l_1) /* ^?{} */);
+}
-static inline struct Duration ___operator_assign__F9sDuration_R9sDuration9sDuration_autogen___1(struct Duration *___dst__R9sDuration_1, struct Duration ___src__9sDuration_1){
-    struct Duration ___ret__9sDuration_1;
-    ((void)((*___dst__R9sDuration_1).__tv__l_1=___src__9sDuration_1.__tv__l_1));
-    ((void)___constructor__F_R9sDuration9sDuration_autogen___1((&___ret__9sDuration_1), (*___dst__R9sDuration_1)));
-    return ___ret__9sDuration_1;
+}
-static inline void ___constructor__F_R9sDurationl_autogen___1(struct Duration *___dst__R9sDuration_1, signed long int __tv__l_1){
-    ((void)((*___dst__R9sDuration_1).__tv__l_1=__tv__l_1) /* ?{} */);
+}
-static inline void ___constructor__F_R9sDuration__1(struct Duration *__dur__R9sDuration_1){
-    ((void)((*__dur__R9sDuration_1).__tv__l_1) /* ?{} */);
-    ((void)((*__dur__R9sDuration_1).__tv__l_1=((signed long int )0)));
+}
-static inline void ___constructor__F_R9sDurationZ__1(struct Duration *__dur__R9sDuration_1, long int __anonymous_object1351){
-    ((void)((*__dur__R9sDuration_1).__tv__l_1) /* ?{} */);
-    ((void)((*__dur__R9sDuration_1).__tv__l_1=((signed long int )0)));
+}
-struct Time {
-    unsigned long int __tv__Ul_1;
-};
-static inline void ___constructor__F_R5sTime_autogen___1(struct Time *___dst__R5sTime_1);
-static inline void ___constructor__F_R5sTime5sTime_autogen___1(struct Time *___dst__R5sTime_1, struct Time ___src__5sTime_1);
-static inline void ___destructor__F_R5sTime_autogen___1(struct Time *___dst__R5sTime_1);
-static inline struct Time ___operator_assign__F5sTime_R5sTime5sTime_autogen___1(struct Time *___dst__R5sTime_1, struct Time ___src__5sTime_1);
-static inline void ___constructor__F_R5sTimeUl_autogen___1(struct Time *___dst__R5sTime_1, unsigned long int __tv__Ul_1);
-static inline void ___constructor__F_R5sTime_autogen___1(struct Time *___dst__R5sTime_1){
-    ((void)((*___dst__R5sTime_1).__tv__Ul_1) /* ?{} */);
+}
-static inline void ___constructor__F_R5sTime5sTime_autogen___1(struct Time *___dst__R5sTime_1, struct Time ___src__5sTime_1){
-    ((void)((*___dst__R5sTime_1).__tv__Ul_1=___src__5sTime_1.__tv__Ul_1) /* ?{} */);
+}
-static inline void ___destructor__F_R5sTime_autogen___1(struct Time *___dst__R5sTime_1){
-    ((void)((*___dst__R5sTime_1).__tv__Ul_1) /* ^?{} */);
+}
-static inline struct Time ___operator_assign__F5sTime_R5sTime5sTime_autogen___1(struct Time *___dst__R5sTime_1, struct Time ___src__5sTime_1){
-    struct Time ___ret__5sTime_1;
-    ((void)((*___dst__R5sTime_1).__tv__Ul_1=___src__5sTime_1.__tv__Ul_1));
-    ((void)___constructor__F_R5sTime5sTime_autogen___1((&___ret__5sTime_1), (*___dst__R5sTime_1)));
-    return ___ret__5sTime_1;
+}
-static inline void ___constructor__F_R5sTimeUl_autogen___1(struct Time *___dst__R5sTime_1, unsigned long int __tv__Ul_1){
-    ((void)((*___dst__R5sTime_1).__tv__Ul_1=__tv__Ul_1) /* ?{} */);
+}
-static inline void ___constructor__F_R5sTime__1(struct Time *__time__R5sTime_1){
-    ((void)((*__time__R5sTime_1).__tv__Ul_1) /* ?{} */);
-    ((void)((*__time__R5sTime_1).__tv__Ul_1=((unsigned long int )0)));
+}
-static inline void ___constructor__F_R5sTimeZ__1(struct Time *__time__R5sTime_1, long int __anonymous_object1352){
-    ((void)((*__time__R5sTime_1).__tv__Ul_1) /* ?{} */);
-    ((void)((*__time__R5sTime_1).__tv__Ul_1=((unsigned long int )0)));
+}
-void *___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd09sDuration__1(__attribute__ ((unused)) _Bool (*__sepPrt__PFb_R7tostype__1)(void *__anonymous_object1353), __attribute__ ((unused)) void (*__sepReset__PF_R7tostype__1)(void *__anonymous_object1354), __attribute__ ((unused)) void (*__sepReset__PF_R7tostypeb__1)(void *__anonymous_object1355, _Bool __anonymous_object1356), __attribute__ ((unused)) const char *(*__sepGetCur__PFPCc_R7tostype__1)(void *__anonymous_object1357), __attribute__ ((unused)) void (*__sepSetCur__PF_R7tostypePCc__1)(void *__anonymous_object1358, const char *__anonymous_object1359), __attribute__ ((unused)) _Bool (*__getNL__PFb_R7tostype__1)(void *__anonymous_object1360), __attribute__ ((unused)) void (*__setNL__PF_R7tostypeb__1)(void *__anonymous_object1361, _Bool __anonymous_object1362), __attribute__ ((unused)) void (*__sepOn__PF_R7tostype__1)(void *__anonymous_object1363), __attribute__ ((unused)) void (*__sepOff__PF_R7tostype__1)(void *__anonymous_object1364), __attribute__ ((unused)) _Bool (*__sepDisable__PFb_R7tostype__1)(void *__anonymous_object1365), __attribute__ ((unused)) _Bool (*__sepEnable__PFb_R7tostype__1)(void *__anonymous_object1366), __attribute__ ((unused)) const char *(*__sepGet__PFPCc_R7tostype__1)(void *__anonymous_object1367), __attribute__ ((unused)) void (*__sepSet__PF_R7tostypePCc__1)(void *__anonymous_object1368, const char *__anonymous_object1369), __attribute__ ((unused)) const char *(*__sepGetTuple__PFPCc_R7tostype__1)(void *__anonymous_object1370), __attribute__ ((unused)) void (*__sepSetTuple__PF_R7tostypePCc__1)(void *__anonymous_object1371, const char *__anonymous_object1372), __attribute__ ((unused)) signed int (*__fail__PFi_R7tostype__1)(void *__anonymous_object1373), __attribute__ ((unused)) signed int (*__flush__PFi_R7tostype__1)(void *__anonymous_object1374), __attribute__ ((unused)) void (*__open__PF_R7tostypePCcPCc__1)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1), __attribute__ ((unused)) void (*__close__PF_R7tostype__1)(void *__os__R7tostype_1), __attribute__ ((unused)) void *(*__write__PFR7tostype_R7tostypePCcUl__1)(void *__anonymous_object1375, const char *__anonymous_object1376, unsigned long int __anonymous_object1377), __attribute__ ((unused)) signed int (*__fmt__PFi_R7tostypePCc__1)(void *__anonymous_object1378, const char *__fmt__PCc_1, ...), void *__os__R7tostype_1, struct Duration __dur__9sDuration_1);
-void *___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd05sTime__1(__attribute__ ((unused)) _Bool (*__sepPrt__PFb_R7tostype__1)(void *__anonymous_object1379), __attribute__ ((unused)) void (*__sepReset__PF_R7tostype__1)(void *__anonymous_object1380), __attribute__ ((unused)) void (*__sepReset__PF_R7tostypeb__1)(void *__anonymous_object1381, _Bool __anonymous_object1382), __attribute__ ((unused)) const char *(*__sepGetCur__PFPCc_R7tostype__1)(void *__anonymous_object1383), __attribute__ ((unused)) void (*__sepSetCur__PF_R7tostypePCc__1)(void *__anonymous_object1384, const char *__anonymous_object1385), __attribute__ ((unused)) _Bool (*__getNL__PFb_R7tostype__1)(void *__anonymous_object1386), __attribute__ ((unused)) void (*__setNL__PF_R7tostypeb__1)(void *__anonymous_object1387, _Bool __anonymous_object1388), __attribute__ ((unused)) void (*__sepOn__PF_R7tostype__1)(void *__anonymous_object1389), __attribute__ ((unused)) void (*__sepOff__PF_R7tostype__1)(void *__anonymous_object1390), __attribute__ ((unused)) _Bool (*__sepDisable__PFb_R7tostype__1)(void *__anonymous_object1391), __attribute__ ((unused)) _Bool (*__sepEnable__PFb_R7tostype__1)(void *__anonymous_object1392), __attribute__ ((unused)) const char *(*__sepGet__PFPCc_R7tostype__1)(void *__anonymous_object1393), __attribute__ ((unused)) void (*__sepSet__PF_R7tostypePCc__1)(void *__anonymous_object1394, const char *__anonymous_object1395), __attribute__ ((unused)) const char *(*__sepGetTuple__PFPCc_R7tostype__1)(void *__anonymous_object1396), __attribute__ ((unused)) void (*__sepSetTuple__PF_R7tostypePCc__1)(void *__anonymous_object1397, const char *__anonymous_object1398), __attribute__ ((unused)) signed int (*__fail__PFi_R7tostype__1)(void *__anonymous_object1399), __attribute__ ((unused)) signed int (*__flush__PFi_R7tostype__1)(void *__anonymous_object1400), __attribute__ ((unused)) void (*__open__PF_R7tostypePCcPCc__1)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1), __attribute__ ((unused)) void (*__close__PF_R7tostype__1)(void *__os__R7tostype_1), __attribute__ ((unused)) void *(*__write__PFR7tostype_R7tostypePCcUl__1)(void *__anonymous_object1401, const char *__anonymous_object1402, unsigned long int __anonymous_object1403), __attribute__ ((unused)) signed int (*__fmt__PFi_R7tostypePCc__1)(void *__anonymous_object1404, const char *__fmt__PCc_1, ...), void *__os__R7tostype_1, struct Time __time__5sTime_1);
 enum __anonymous0 {
     __sepSize__C13e__anonymous0_1 = 16,
 …
+}
 _Bool __sepPrt__Fb_R9sofstream__1(struct ofstream *__anonymous_object1405);
 void __sepReset__F_R9sofstream__1(struct ofstream *__anonymous_object1406);
 void __sepReset__F_R9sofstreamb__1(struct ofstream *__anonymous_object1407, _Bool __anonymous_object1408);
 const char *__sepGetCur__FPCc_R9sofstream__1(struct ofstream *__anonymous_object1409);
 void __sepSetCur__F_R9sofstreamPCc__1(struct ofstream *__anonymous_object1410, const char *__anonymous_object1411);
 _Bool __getNL__Fb_R9sofstream__1(struct ofstream *__anonymous_object1412);
 void __setNL__F_R9sofstreamb__1(struct ofstream *__anonymous_object1413, _Bool __anonymous_object1414);
 void __sepOn__F_R9sofstream__1(struct ofstream *__anonymous_object1415);
 void __sepOff__F_R9sofstream__1(struct ofstream *__anonymous_object1416);
 _Bool __sepDisable__Fb_R9sofstream__1(struct ofstream *__anonymous_object1417);
 _Bool __sepEnable__Fb_R9sofstream__1(struct ofstream *__anonymous_object1418);
 const char *__sepGet__FPCc_R9sofstream__1(struct ofstream *__anonymous_object1419);
 void __sepSet__F_R9sofstreamPCc__1(struct ofstream *__anonymous_object1420, const char *__anonymous_object1421);
 const char *__sepGetTuple__FPCc_R9sofstream__1(struct ofstream *__anonymous_object1422);
 void __sepSetTuple__F_R9sofstreamPCc__1(struct ofstream *__anonymous_object1423, const char *__anonymous_object1424);
 signed int __fail__Fi_R9sofstream__1(struct ofstream *__anonymous_object1425);
 signed int __flush__Fi_R9sofstream__1(struct ofstream *__anonymous_object1426);
 void __open__F_R9sofstreamPCcPCc__1(struct ofstream *__anonymous_object1427, const char *__name__PCc_1, const char *__mode__PCc_1);
 void __open__F_R9sofstreamPCc__1(struct ofstream *__anonymous_object1428, const char *__name__PCc_1);
 void __close__F_R9sofstream__1(struct ofstream *__anonymous_object1429);
 struct ofstream *__write__FR9sofstream_R9sofstreamPCcUl__1(struct ofstream *__anonymous_object1430, const char *__data__PCc_1, unsigned long int __size__Ul_1);
 signed int __fmt__Fi_R9sofstreamPCc__1(struct ofstream *__anonymous_object1431, const char *__fmt__PCc_1, ...);
+_Bool __sepPrt__Fb_R9sofstream__1(struct ofstream *__anonymous_object1351);
+void __sepReset__F_R9sofstream__1(struct ofstream *__anonymous_object1352);
+void __sepReset__F_R9sofstreamb__1(struct ofstream *__anonymous_object1353, _Bool __anonymous_object1354);
+const char *__sepGetCur__FPCc_R9sofstream__1(struct ofstream *__anonymous_object1355);
+void __sepSetCur__F_R9sofstreamPCc__1(struct ofstream *__anonymous_object1356, const char *__anonymous_object1357);
+_Bool __getNL__Fb_R9sofstream__1(struct ofstream *__anonymous_object1358);
+void __setNL__F_R9sofstreamb__1(struct ofstream *__anonymous_object1359, _Bool __anonymous_object1360);
+void __sepOn__F_R9sofstream__1(struct ofstream *__anonymous_object1361);
+void __sepOff__F_R9sofstream__1(struct ofstream *__anonymous_object1362);
+_Bool __sepDisable__Fb_R9sofstream__1(struct ofstream *__anonymous_object1363);
+_Bool __sepEnable__Fb_R9sofstream__1(struct ofstream *__anonymous_object1364);
+const char *__sepGet__FPCc_R9sofstream__1(struct ofstream *__anonymous_object1365);
+void __sepSet__F_R9sofstreamPCc__1(struct ofstream *__anonymous_object1366, const char *__anonymous_object1367);
+const char *__sepGetTuple__FPCc_R9sofstream__1(struct ofstream *__anonymous_object1368);
+void __sepSetTuple__F_R9sofstreamPCc__1(struct ofstream *__anonymous_object1369, const char *__anonymous_object1370);
+signed int __fail__Fi_R9sofstream__1(struct ofstream *__anonymous_object1371);
+signed int __flush__Fi_R9sofstream__1(struct ofstream *__anonymous_object1372);
+void __open__F_R9sofstreamPCcPCc__1(struct ofstream *__anonymous_object1373, const char *__name__PCc_1, const char *__mode__PCc_1);
+void __open__F_R9sofstreamPCc__1(struct ofstream *__anonymous_object1374, const char *__name__PCc_1);
+void __close__F_R9sofstream__1(struct ofstream *__anonymous_object1375);
+struct ofstream *__write__FR9sofstream_R9sofstreamPCcUl__1(struct ofstream *__anonymous_object1376, const char *__data__PCc_1, unsigned long int __size__Ul_1);
+signed int __fmt__Fi_R9sofstreamPCc__1(struct ofstream *__anonymous_object1377, const char *__fmt__PCc_1, ...);
 void ___constructor__F_R9sofstream__1(struct ofstream *__os__R9sofstream_1);
 void ___constructor__F_R9sofstreamPCcPCc__1(struct ofstream *__os__R9sofstream_1, const char *__name__PCc_1, const char *__mode__PCc_1);
 …
 struct ifstream *__read__FR9sifstream_R9sifstreamPcUl__1(struct ifstream *__is__R9sifstream_1, char *__data__Pc_1, unsigned long int __size__Ul_1);
 struct ifstream *__ungetc__FR9sifstream_R9sifstreamc__1(struct ifstream *__is__R9sifstream_1, char __c__c_1);
 signed int __fmt__Fi_R9sifstreamPCc__1(struct ifstream *__anonymous_object1432, const char *__fmt__PCc_1, ...);
+signed int __fmt__Fi_R9sifstreamPCc__1(struct ifstream *__anonymous_object1378, const char *__fmt__PCc_1, ...);
 void ___constructor__F_R9sifstream__1(struct ifstream *__is__R9sifstream_1);
 void ___constructor__F_R9sifstreamPCcPCc__1(struct ifstream *__is__R9sifstream_1, const char *__name__PCc_1, const char *__mode__PCc_1);
 …
     struct ofstream *_tmp_cp_ret4;
     __attribute__ ((unused)) struct ofstream *_thunk0(struct ofstream *_p0){
         return __endl__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0__1(((_Bool (*)(void *__anonymous_object1433))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1434))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1435, _Bool __anonymous_object1436))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1437))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1438, const char *__anonymous_object1439))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1440))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1441, _Bool __anonymous_object1442))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1443))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1444))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1445))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1446))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1447))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1448, const char *__anonymous_object1449))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1450))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1451, const char *__anonymous_object1452))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1453))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1454))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1455, const char *__anonymous_object1456, unsigned long int __anonymous_object1457))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1458, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)_p0));
+    }
     ((void)(((void)(_tmp_cp_ret4=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PFRd0_Rd0___1(((_Bool (*)(void *__anonymous_object1459))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1460))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1461, _Bool __anonymous_object1462))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1463))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1464, const char *__anonymous_object1465))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1466))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1467, _Bool __anonymous_object1468))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1469))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1470))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1471))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1472))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1473))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1474, const char *__anonymous_object1475))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1476))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1477, const char *__anonymous_object1478))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1479))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1480))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1481, const char *__anonymous_object1482, unsigned long int __anonymous_object1483))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1484, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret3=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0c__1(((_Bool (*)(void *__anonymous_object1485))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1486))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1487, _Bool __anonymous_object1488))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1489))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1490, const char *__anonymous_object1491))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1492))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1493, _Bool __anonymous_object1494))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1495))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1496))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1497))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1498))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1499))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1500, const char *__anonymous_object1501))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1502))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1503, const char *__anonymous_object1504))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1505))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1506))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1507, const char *__anonymous_object1508, unsigned long int __anonymous_object1509))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1510, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret2=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PCc__1(((_Bool (*)(void *__anonymous_object1511))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1512))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1513, _Bool __anonymous_object1514))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1515))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1516, const char *__anonymous_object1517))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1518))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1519, _Bool __anonymous_object1520))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1521))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1522))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1523))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1524))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1525))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1526, const char *__anonymous_object1527))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1528))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1529, const char *__anonymous_object1530))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1531))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1532))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1533, const char *__anonymous_object1534, unsigned long int __anonymous_object1535))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1536, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)__sout__R9sofstream_1), "char ")))) , _tmp_cp_ret2)), __v__c_1)))) , _tmp_cp_ret3)), ((void *(*)(void *__anonymous_object1537))(&_thunk0)))))) , _tmp_cp_ret4));
+        return __endl__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0__1(((_Bool (*)(void *__anonymous_object1379))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1380))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1381, _Bool __anonymous_object1382))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1383))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1384, const char *__anonymous_object1385))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1386))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1387, _Bool __anonymous_object1388))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1389))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1390))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1391))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1392))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1393))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1394, const char *__anonymous_object1395))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1396))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1397, const char *__anonymous_object1398))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1399))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1400))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1401, const char *__anonymous_object1402, unsigned long int __anonymous_object1403))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1404, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)_p0));
+    }
+    ((void)(((void)(_tmp_cp_ret4=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PFRd0_Rd0___1(((_Bool (*)(void *__anonymous_object1405))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1406))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1407, _Bool __anonymous_object1408))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1409))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1410, const char *__anonymous_object1411))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1412))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1413, _Bool __anonymous_object1414))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1415))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1416))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1417))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1418))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1419))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1420, const char *__anonymous_object1421))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1422))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1423, const char *__anonymous_object1424))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1425))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1426))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1427, const char *__anonymous_object1428, unsigned long int __anonymous_object1429))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1430, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret3=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0c__1(((_Bool (*)(void *__anonymous_object1431))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1432))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1433, _Bool __anonymous_object1434))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1435))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1436, const char *__anonymous_object1437))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1438))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1439, _Bool __anonymous_object1440))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1441))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1442))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1443))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1444))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1445))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1446, const char *__anonymous_object1447))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1448))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1449, const char *__anonymous_object1450))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1451))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1452))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1453, const char *__anonymous_object1454, unsigned long int __anonymous_object1455))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1456, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret2=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PCc__1(((_Bool (*)(void *__anonymous_object1457))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1458))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1459, _Bool __anonymous_object1460))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1461))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1462, const char *__anonymous_object1463))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1464))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1465, _Bool __anonymous_object1466))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1467))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1468))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1469))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1470))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1471))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1472, const char *__anonymous_object1473))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1474))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1475, const char *__anonymous_object1476))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1477))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1478))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1479, const char *__anonymous_object1480, unsigned long int __anonymous_object1481))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1482, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)__sout__R9sofstream_1), "char ")))) , _tmp_cp_ret2)), __v__c_1)))) , _tmp_cp_ret3)), ((void *(*)(void *__anonymous_object1483))(&_thunk0)))))) , _tmp_cp_ret4));
+}
 void __f__F_Sc__1(signed char __v__Sc_1){
 …
     struct ofstream *_tmp_cp_ret7;
     __attribute__ ((unused)) struct ofstream *_thunk1(struct ofstream *_p0){
         return __endl__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0__1(((_Bool (*)(void *__anonymous_object1538))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1539))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1540, _Bool __anonymous_object1541))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1542))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1543, const char *__anonymous_object1544))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1545))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1546, _Bool __anonymous_object1547))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1548))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1549))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1550))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1551))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1552))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1553, const char *__anonymous_object1554))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1555))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1556, const char *__anonymous_object1557))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1558))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1559))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1560, const char *__anonymous_object1561, unsigned long int __anonymous_object1562))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1563, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)_p0));
+    }
     ((void)(((void)(_tmp_cp_ret7=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PFRd0_Rd0___1(((_Bool (*)(void *__anonymous_object1564))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1565))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1566, _Bool __anonymous_object1567))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1568))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1569, const char *__anonymous_object1570))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1571))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1572, _Bool __anonymous_object1573))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1574))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1575))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1576))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1577))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1578))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1579, const char *__anonymous_object1580))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1581))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1582, const char *__anonymous_object1583))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1584))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1585))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1586, const char *__anonymous_object1587, unsigned long int __anonymous_object1588))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1589, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret6=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0Sc__1(((_Bool (*)(void *__anonymous_object1590))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1591))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1592, _Bool __anonymous_object1593))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1594))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1595, const char *__anonymous_object1596))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1597))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1598, _Bool __anonymous_object1599))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1600))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1601))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1602))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1603))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1604))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1605, const char *__anonymous_object1606))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1607))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1608, const char *__anonymous_object1609))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1610))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1611))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1612, const char *__anonymous_object1613, unsigned long int __anonymous_object1614))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1615, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret5=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PCc__1(((_Bool (*)(void *__anonymous_object1616))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1617))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1618, _Bool __anonymous_object1619))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1620))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1621, const char *__anonymous_object1622))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1623))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1624, _Bool __anonymous_object1625))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1626))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1627))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1628))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1629))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1630))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1631, const char *__anonymous_object1632))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1633))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1634, const char *__anonymous_object1635))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1636))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1637))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1638, const char *__anonymous_object1639, unsigned long int __anonymous_object1640))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1641, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)__sout__R9sofstream_1), "signed char ")))) , _tmp_cp_ret5)), __v__Sc_1)))) , _tmp_cp_ret6)), ((void *(*)(void *__anonymous_object1642))(&_thunk1)))))) , _tmp_cp_ret7));
+        return __endl__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0__1(((_Bool (*)(void *__anonymous_object1484))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1485))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1486, _Bool __anonymous_object1487))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1488))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1489, const char *__anonymous_object1490))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1491))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1492, _Bool __anonymous_object1493))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1494))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1495))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1496))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1497))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1498))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1499, const char *__anonymous_object1500))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1501))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1502, const char *__anonymous_object1503))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1504))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1505))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1506, const char *__anonymous_object1507, unsigned long int __anonymous_object1508))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1509, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)_p0));
+    }
+    ((void)(((void)(_tmp_cp_ret7=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PFRd0_Rd0___1(((_Bool (*)(void *__anonymous_object1510))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1511))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1512, _Bool __anonymous_object1513))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1514))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1515, const char *__anonymous_object1516))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1517))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1518, _Bool __anonymous_object1519))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1520))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1521))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1522))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1523))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1524))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1525, const char *__anonymous_object1526))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1527))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1528, const char *__anonymous_object1529))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1530))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1531))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1532, const char *__anonymous_object1533, unsigned long int __anonymous_object1534))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1535, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret6=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0Sc__1(((_Bool (*)(void *__anonymous_object1536))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1537))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1538, _Bool __anonymous_object1539))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1540))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1541, const char *__anonymous_object1542))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1543))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1544, _Bool __anonymous_object1545))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1546))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1547))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1548))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1549))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1550))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1551, const char *__anonymous_object1552))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1553))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1554, const char *__anonymous_object1555))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1556))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1557))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1558, const char *__anonymous_object1559, unsigned long int __anonymous_object1560))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1561, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret5=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PCc__1(((_Bool (*)(void *__anonymous_object1562))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1563))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1564, _Bool __anonymous_object1565))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1566))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1567, const char *__anonymous_object1568))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1569))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1570, _Bool __anonymous_object1571))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1572))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1573))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1574))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1575))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1576))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1577, const char *__anonymous_object1578))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1579))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1580, const char *__anonymous_object1581))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1582))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1583))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1584, const char *__anonymous_object1585, unsigned long int __anonymous_object1586))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1587, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)__sout__R9sofstream_1), "signed char ")))) , _tmp_cp_ret5)), __v__Sc_1)))) , _tmp_cp_ret6)), ((void *(*)(void *__anonymous_object1588))(&_thunk1)))))) , _tmp_cp_ret7));
+}
 void __f__F_Uc__1(unsigned char __v__Uc_1){
 …
     struct ofstream *_tmp_cp_ret10;
     __attribute__ ((unused)) struct ofstream *_thunk2(struct ofstream *_p0){
         return __endl__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0__1(((_Bool (*)(void *__anonymous_object1643))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1644))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1645, _Bool __anonymous_object1646))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1647))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1648, const char *__anonymous_object1649))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1650))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1651, _Bool __anonymous_object1652))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1653))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1654))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1655))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1656))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1657))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1658, const char *__anonymous_object1659))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1660))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1661, const char *__anonymous_object1662))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1663))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1664))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1665, const char *__anonymous_object1666, unsigned long int __anonymous_object1667))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1668, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)_p0));
+    }
     ((void)(((void)(_tmp_cp_ret10=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PFRd0_Rd0___1(((_Bool (*)(void *__anonymous_object1669))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1670))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1671, _Bool __anonymous_object1672))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1673))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1674, const char *__anonymous_object1675))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1676))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1677, _Bool __anonymous_object1678))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1679))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1680))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1681))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1682))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1683))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1684, const char *__anonymous_object1685))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1686))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1687, const char *__anonymous_object1688))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1689))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1690))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1691, const char *__anonymous_object1692, unsigned long int __anonymous_object1693))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1694, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret9=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0Uc__1(((_Bool (*)(void *__anonymous_object1695))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1696))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1697, _Bool __anonymous_object1698))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1699))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1700, const char *__anonymous_object1701))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1702))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1703, _Bool __anonymous_object1704))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1705))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1706))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1707))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1708))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1709))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1710, const char *__anonymous_object1711))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1712))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1713, const char *__anonymous_object1714))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1715))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1716))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1717, const char *__anonymous_object1718, unsigned long int __anonymous_object1719))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1720, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret8=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PCc__1(((_Bool (*)(void *__anonymous_object1721))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1722))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1723, _Bool __anonymous_object1724))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1725))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1726, const char *__anonymous_object1727))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1728))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1729, _Bool __anonymous_object1730))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1731))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1732))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1733))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1734))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1735))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1736, const char *__anonymous_object1737))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1738))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1739, const char *__anonymous_object1740))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1741))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1742))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1743, const char *__anonymous_object1744, unsigned long int __anonymous_object1745))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1746, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)__sout__R9sofstream_1), "unsigned char ")))) , _tmp_cp_ret8)), __v__Uc_1)))) , _tmp_cp_ret9)), ((void *(*)(void *__anonymous_object1747))(&_thunk2)))))) , _tmp_cp_ret10));
+        return __endl__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0__1(((_Bool (*)(void *__anonymous_object1589))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1590))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1591, _Bool __anonymous_object1592))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1593))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1594, const char *__anonymous_object1595))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1596))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1597, _Bool __anonymous_object1598))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1599))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1600))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1601))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1602))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1603))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1604, const char *__anonymous_object1605))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1606))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1607, const char *__anonymous_object1608))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1609))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1610))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1611, const char *__anonymous_object1612, unsigned long int __anonymous_object1613))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1614, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)_p0));
+    }
+    ((void)(((void)(_tmp_cp_ret10=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PFRd0_Rd0___1(((_Bool (*)(void *__anonymous_object1615))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1616))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1617, _Bool __anonymous_object1618))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1619))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1620, const char *__anonymous_object1621))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1622))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1623, _Bool __anonymous_object1624))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1625))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1626))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1627))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1628))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1629))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1630, const char *__anonymous_object1631))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1632))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1633, const char *__anonymous_object1634))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1635))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1636))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1637, const char *__anonymous_object1638, unsigned long int __anonymous_object1639))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1640, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret9=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0Uc__1(((_Bool (*)(void *__anonymous_object1641))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1642))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1643, _Bool __anonymous_object1644))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1645))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1646, const char *__anonymous_object1647))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1648))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1649, _Bool __anonymous_object1650))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1651))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1652))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1653))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1654))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1655))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1656, const char *__anonymous_object1657))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1658))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1659, const char *__anonymous_object1660))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1661))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1662))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1663, const char *__anonymous_object1664, unsigned long int __anonymous_object1665))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1666, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret8=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PCc__1(((_Bool (*)(void *__anonymous_object1667))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1668))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1669, _Bool __anonymous_object1670))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1671))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1672, const char *__anonymous_object1673))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1674))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1675, _Bool __anonymous_object1676))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1677))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1678))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1679))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1680))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1681))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1682, const char *__anonymous_object1683))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1684))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1685, const char *__anonymous_object1686))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1687))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1688))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1689, const char *__anonymous_object1690, unsigned long int __anonymous_object1691))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1692, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)__sout__R9sofstream_1), "unsigned char ")))) , _tmp_cp_ret8)), __v__Uc_1)))) , _tmp_cp_ret9)), ((void *(*)(void *__anonymous_object1693))(&_thunk2)))))) , _tmp_cp_ret10));
+}
 void __f__F_s__1(signed short int __v__s_1){
 …
     struct ofstream *_tmp_cp_ret13;
     __attribute__ ((unused)) struct ofstream *_thunk3(struct ofstream *_p0){
         return __endl__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0__1(((_Bool (*)(void *__anonymous_object1748))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1749))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1750, _Bool __anonymous_object1751))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1752))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1753, const char *__anonymous_object1754))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1755))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1756, _Bool __anonymous_object1757))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1758))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1759))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1760))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1761))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1762))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1763, const char *__anonymous_object1764))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1765))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1766, const char *__anonymous_object1767))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1768))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1769))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1770, const char *__anonymous_object1771, unsigned long int __anonymous_object1772))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1773, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)_p0));
+    }
     ((void)(((void)(_tmp_cp_ret13=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PFRd0_Rd0___1(((_Bool (*)(void *__anonymous_object1774))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1775))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1776, _Bool __anonymous_object1777))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1778))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1779, const char *__anonymous_object1780))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1781))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1782, _Bool __anonymous_object1783))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1784))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1785))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1786))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1787))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1788))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1789, const char *__anonymous_object1790))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1791))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1792, const char *__anonymous_object1793))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1794))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1795))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1796, const char *__anonymous_object1797, unsigned long int __anonymous_object1798))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1799, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret12=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0s__1(((_Bool (*)(void *__anonymous_object1800))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1801))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1802, _Bool __anonymous_object1803))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1804))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1805, const char *__anonymous_object1806))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1807))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1808, _Bool __anonymous_object1809))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1810))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1811))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1812))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1813))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1814))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1815, const char *__anonymous_object1816))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1817))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1818, const char *__anonymous_object1819))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1820))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1821))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1822, const char *__anonymous_object1823, unsigned long int __anonymous_object1824))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1825, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret11=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PCc__1(((_Bool (*)(void *__anonymous_object1826))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1827))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1828, _Bool __anonymous_object1829))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1830))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1831, const char *__anonymous_object1832))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1833))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1834, _Bool __anonymous_object1835))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1836))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1837))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1838))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1839))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1840))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1841, const char *__anonymous_object1842))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1843))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1844, const char *__anonymous_object1845))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1846))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1847))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1848, const char *__anonymous_object1849, unsigned long int __anonymous_object1850))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1851, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)__sout__R9sofstream_1), "signed short int")))) , _tmp_cp_ret11)), __v__s_1)))) , _tmp_cp_ret12)), ((void *(*)(void *__anonymous_object1852))(&_thunk3)))))) , _tmp_cp_ret13));
+        return __endl__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0__1(((_Bool (*)(void *__anonymous_object1694))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1695))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1696, _Bool __anonymous_object1697))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1698))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1699, const char *__anonymous_object1700))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1701))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1702, _Bool __anonymous_object1703))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1704))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1705))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1706))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1707))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1708))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1709, const char *__anonymous_object1710))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1711))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1712, const char *__anonymous_object1713))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1714))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1715))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1716, const char *__anonymous_object1717, unsigned long int __anonymous_object1718))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1719, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)_p0));
+    }
+    ((void)(((void)(_tmp_cp_ret13=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PFRd0_Rd0___1(((_Bool (*)(void *__anonymous_object1720))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1721))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1722, _Bool __anonymous_object1723))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1724))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1725, const char *__anonymous_object1726))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1727))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1728, _Bool __anonymous_object1729))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1730))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1731))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1732))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1733))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1734))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1735, const char *__anonymous_object1736))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1737))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1738, const char *__anonymous_object1739))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1740))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1741))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1742, const char *__anonymous_object1743, unsigned long int __anonymous_object1744))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1745, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret12=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0s__1(((_Bool (*)(void *__anonymous_object1746))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1747))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1748, _Bool __anonymous_object1749))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1750))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1751, const char *__anonymous_object1752))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1753))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1754, _Bool __anonymous_object1755))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1756))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1757))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1758))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1759))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1760))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1761, const char *__anonymous_object1762))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1763))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1764, const char *__anonymous_object1765))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1766))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1767))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1768, const char *__anonymous_object1769, unsigned long int __anonymous_object1770))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1771, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret11=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PCc__1(((_Bool (*)(void *__anonymous_object1772))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1773))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1774, _Bool __anonymous_object1775))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1776))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1777, const char *__anonymous_object1778))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1779))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1780, _Bool __anonymous_object1781))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1782))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1783))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1784))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1785))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1786))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1787, const char *__anonymous_object1788))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1789))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1790, const char *__anonymous_object1791))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1792))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1793))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1794, const char *__anonymous_object1795, unsigned long int __anonymous_object1796))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1797, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)__sout__R9sofstream_1), "signed short int")))) , _tmp_cp_ret11)), __v__s_1)))) , _tmp_cp_ret12)), ((void *(*)(void *__anonymous_object1798))(&_thunk3)))))) , _tmp_cp_ret13));
+}
 void __f__F_Us__1(unsigned short int __v__Us_1){
 …
     struct ofstream *_tmp_cp_ret16;
     __attribute__ ((unused)) struct ofstream *_thunk4(struct ofstream *_p0){
         return __endl__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0__1(((_Bool (*)(void *__anonymous_object1853))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1854))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1855, _Bool __anonymous_object1856))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1857))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1858, const char *__anonymous_object1859))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1860))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1861, _Bool __anonymous_object1862))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1863))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1864))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1865))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1866))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1867))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1868, const char *__anonymous_object1869))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1870))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1871, const char *__anonymous_object1872))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1873))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1874))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1875, const char *__anonymous_object1876, unsigned long int __anonymous_object1877))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1878, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)_p0));
+    }
     ((void)(((void)(_tmp_cp_ret16=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PFRd0_Rd0___1(((_Bool (*)(void *__anonymous_object1879))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1880))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1881, _Bool __anonymous_object1882))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1883))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1884, const char *__anonymous_object1885))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1886))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1887, _Bool __anonymous_object1888))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1889))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1890))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1891))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1892))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1893))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1894, const char *__anonymous_object1895))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1896))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1897, const char *__anonymous_object1898))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1899))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1900))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1901, const char *__anonymous_object1902, unsigned long int __anonymous_object1903))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1904, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret15=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0Us__1(((_Bool (*)(void *__anonymous_object1905))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1906))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1907, _Bool __anonymous_object1908))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1909))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1910, const char *__anonymous_object1911))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1912))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1913, _Bool __anonymous_object1914))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1915))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1916))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1917))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1918))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1919))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1920, const char *__anonymous_object1921))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1922))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1923, const char *__anonymous_object1924))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1925))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1926))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1927, const char *__anonymous_object1928, unsigned long int __anonymous_object1929))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1930, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret14=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PCc__1(((_Bool (*)(void *__anonymous_object1931))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1932))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1933, _Bool __anonymous_object1934))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1935))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1936, const char *__anonymous_object1937))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1938))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1939, _Bool __anonymous_object1940))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1941))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1942))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1943))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1944))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1945))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1946, const char *__anonymous_object1947))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1948))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1949, const char *__anonymous_object1950))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1951))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1952))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1953, const char *__anonymous_object1954, unsigned long int __anonymous_object1955))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1956, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)__sout__R9sofstream_1), "unsigned short int")))) , _tmp_cp_ret14)), __v__Us_1)))) , _tmp_cp_ret15)), ((void *(*)(void *__anonymous_object1957))(&_thunk4)))))) , _tmp_cp_ret16));
+        return __endl__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0__1(((_Bool (*)(void *__anonymous_object1799))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1800))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1801, _Bool __anonymous_object1802))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1803))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1804, const char *__anonymous_object1805))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1806))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1807, _Bool __anonymous_object1808))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1809))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1810))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1811))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1812))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1813))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1814, const char *__anonymous_object1815))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1816))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1817, const char *__anonymous_object1818))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1819))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1820))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1821, const char *__anonymous_object1822, unsigned long int __anonymous_object1823))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1824, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)_p0));
+    }
+    ((void)(((void)(_tmp_cp_ret16=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PFRd0_Rd0___1(((_Bool (*)(void *__anonymous_object1825))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1826))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1827, _Bool __anonymous_object1828))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1829))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1830, const char *__anonymous_object1831))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1832))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1833, _Bool __anonymous_object1834))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1835))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1836))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1837))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1838))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1839))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1840, const char *__anonymous_object1841))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1842))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1843, const char *__anonymous_object1844))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1845))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1846))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1847, const char *__anonymous_object1848, unsigned long int __anonymous_object1849))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1850, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret15=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0Us__1(((_Bool (*)(void *__anonymous_object1851))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1852))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1853, _Bool __anonymous_object1854))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1855))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1856, const char *__anonymous_object1857))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1858))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1859, _Bool __anonymous_object1860))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1861))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1862))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1863))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1864))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1865))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1866, const char *__anonymous_object1867))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1868))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1869, const char *__anonymous_object1870))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1871))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1872))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1873, const char *__anonymous_object1874, unsigned long int __anonymous_object1875))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1876, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret14=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PCc__1(((_Bool (*)(void *__anonymous_object1877))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1878))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1879, _Bool __anonymous_object1880))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1881))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1882, const char *__anonymous_object1883))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1884))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1885, _Bool __anonymous_object1886))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1887))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1888))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1889))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1890))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1891))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1892, const char *__anonymous_object1893))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1894))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1895, const char *__anonymous_object1896))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1897))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1898))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1899, const char *__anonymous_object1900, unsigned long int __anonymous_object1901))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1902, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)__sout__R9sofstream_1), "unsigned short int")))) , _tmp_cp_ret14)), __v__Us_1)))) , _tmp_cp_ret15)), ((void *(*)(void *__anonymous_object1903))(&_thunk4)))))) , _tmp_cp_ret16));
+}
 void __f__F_Ul__1(unsigned long int __v__Ul_1){
 …
     struct ofstream *_tmp_cp_ret19;
     __attribute__ ((unused)) struct ofstream *_thunk5(struct ofstream *_p0){
         return __endl__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0__1(((_Bool (*)(void *__anonymous_object1958))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1959))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1960, _Bool __anonymous_object1961))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1962))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1963, const char *__anonymous_object1964))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1965))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1966, _Bool __anonymous_object1967))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1968))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1969))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1970))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1971))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1972))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1973, const char *__anonymous_object1974))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1975))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1976, const char *__anonymous_object1977))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1978))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1979))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1980, const char *__anonymous_object1981, unsigned long int __anonymous_object1982))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1983, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)_p0));
+    }
     ((void)(((void)(_tmp_cp_ret19=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PFRd0_Rd0___1(((_Bool (*)(void *__anonymous_object1984))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1985))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1986, _Bool __anonymous_object1987))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1988))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1989, const char *__anonymous_object1990))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1991))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1992, _Bool __anonymous_object1993))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1994))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1995))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1996))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1997))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1998))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1999, const char *__anonymous_object2000))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object2001))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object2002, const char *__anonymous_object2003))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object2004))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object2005))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object2006, const char *__anonymous_object2007, unsigned long int __anonymous_object2008))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object2009, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret18=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0Ul__1(((_Bool (*)(void *__anonymous_object2010))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object2011))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object2012, _Bool __anonymous_object2013))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object2014))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object2015, const char *__anonymous_object2016))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object2017))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object2018, _Bool __anonymous_object2019))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object2020))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object2021))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object2022))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object2023))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object2024))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object2025, const char *__anonymous_object2026))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object2027))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object2028, const char *__anonymous_object2029))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object2030))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object2031))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object2032, const char *__anonymous_object2033, unsigned long int __anonymous_object2034))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object2035, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret17=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PCc__1(((_Bool (*)(void *__anonymous_object2036))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object2037))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object2038, _Bool __anonymous_object2039))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object2040))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object2041, const char *__anonymous_object2042))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object2043))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object2044, _Bool __anonymous_object2045))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object2046))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object2047))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object2048))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object2049))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object2050))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object2051, const char *__anonymous_object2052))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object2053))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object2054, const char *__anonymous_object2055))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object2056))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object2057))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object2058, const char *__anonymous_object2059, unsigned long int __anonymous_object2060))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object2061, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)__sout__R9sofstream_1), "size_t")))) , _tmp_cp_ret17)), __v__Ul_1)))) , _tmp_cp_ret18)), ((void *(*)(void *__anonymous_object2062))(&_thunk5)))))) , _tmp_cp_ret19));
+        return __endl__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0__1(((_Bool (*)(void *__anonymous_object1904))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1905))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1906, _Bool __anonymous_object1907))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1908))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1909, const char *__anonymous_object1910))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1911))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1912, _Bool __anonymous_object1913))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1914))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1915))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1916))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1917))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1918))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1919, const char *__anonymous_object1920))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1921))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1922, const char *__anonymous_object1923))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1924))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1925))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1926, const char *__anonymous_object1927, unsigned long int __anonymous_object1928))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1929, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)_p0));
+    }
+    ((void)(((void)(_tmp_cp_ret19=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PFRd0_Rd0___1(((_Bool (*)(void *__anonymous_object1930))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1931))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1932, _Bool __anonymous_object1933))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1934))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1935, const char *__anonymous_object1936))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1937))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1938, _Bool __anonymous_object1939))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1940))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1941))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1942))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1943))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1944))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1945, const char *__anonymous_object1946))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1947))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1948, const char *__anonymous_object1949))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1950))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1951))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1952, const char *__anonymous_object1953, unsigned long int __anonymous_object1954))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1955, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret18=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0Ul__1(((_Bool (*)(void *__anonymous_object1956))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1957))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1958, _Bool __anonymous_object1959))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1960))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1961, const char *__anonymous_object1962))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1963))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1964, _Bool __anonymous_object1965))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1966))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1967))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1968))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1969))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1970))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1971, const char *__anonymous_object1972))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1973))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1974, const char *__anonymous_object1975))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1976))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1977))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1978, const char *__anonymous_object1979, unsigned long int __anonymous_object1980))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1981, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret17=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PCc__1(((_Bool (*)(void *__anonymous_object1982))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1983))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1984, _Bool __anonymous_object1985))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1986))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1987, const char *__anonymous_object1988))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1989))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1990, _Bool __anonymous_object1991))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1992))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1993))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1994))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1995))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1996))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1997, const char *__anonymous_object1998))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1999))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object2000, const char *__anonymous_object2001))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object2002))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object2003))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object2004, const char *__anonymous_object2005, unsigned long int __anonymous_object2006))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object2007, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)__sout__R9sofstream_1), "size_t")))) , _tmp_cp_ret17)), __v__Ul_1)))) , _tmp_cp_ret18)), ((void *(*)(void *__anonymous_object2008))(&_thunk5)))))) , _tmp_cp_ret19));
+}
 signed int __main__Fi___1(){

src/tests/.expect/literals.x86.txt

-              r32cab5b
+              rb2fe1c9
 struct _Istream_cstrC __cstr__F15s_Istream_cstrC_Pci__1(char *__anonymous_object1340, signed int __size__i_1);
 void *___operator_bitor__A0_1_0_0___fail__PFi_Rd0___eof__PFi_Rd0___open__PF_Rd0PCc___close__PF_Rd0___read__PFRd0_Rd0PcUl___ungetc__PFRd0_Rd0c___fmt__PFi_Rd0PCc__FRd0_Rd015s_Istream_cstrC__1(__attribute__ ((unused)) signed int (*__fail__PFi_R7tistype__1)(void *__anonymous_object1341), __attribute__ ((unused)) signed int (*__eof__PFi_R7tistype__1)(void *__anonymous_object1342), __attribute__ ((unused)) void (*__open__PF_R7tistypePCc__1)(void *__is__R7tistype_1, const char *__name__PCc_1), __attribute__ ((unused)) void (*__close__PF_R7tistype__1)(void *__is__R7tistype_1), __attribute__ ((unused)) void *(*__read__PFR7tistype_R7tistypePcUl__1)(void *__anonymous_object1343, char *__anonymous_object1344, unsigned long int __anonymous_object1345), __attribute__ ((unused)) void *(*__ungetc__PFR7tistype_R7tistypec__1)(void *__anonymous_object1346, char __anonymous_object1347), __attribute__ ((unused)) signed int (*__fmt__PFi_R7tistypePCc__1)(void *__anonymous_object1348, const char *__fmt__PCc_1, ...), void *__anonymous_object1349, struct _Istream_cstrC __anonymous_object1350);
-struct Duration {
-    signed long long int __tv__q_1;
-};
-static inline void ___constructor__F_R9sDuration_autogen___1(struct Duration *___dst__R9sDuration_1);
-static inline void ___constructor__F_R9sDuration9sDuration_autogen___1(struct Duration *___dst__R9sDuration_1, struct Duration ___src__9sDuration_1);
-static inline void ___destructor__F_R9sDuration_autogen___1(struct Duration *___dst__R9sDuration_1);
-static inline struct Duration ___operator_assign__F9sDuration_R9sDuration9sDuration_autogen___1(struct Duration *___dst__R9sDuration_1, struct Duration ___src__9sDuration_1);
-static inline void ___constructor__F_R9sDurationq_autogen___1(struct Duration *___dst__R9sDuration_1, signed long long int __tv__q_1);
-static inline void ___constructor__F_R9sDuration_autogen___1(struct Duration *___dst__R9sDuration_1){
-    ((void)((*___dst__R9sDuration_1).__tv__q_1) /* ?{} */);
+}
-static inline void ___constructor__F_R9sDuration9sDuration_autogen___1(struct Duration *___dst__R9sDuration_1, struct Duration ___src__9sDuration_1){
-    ((void)((*___dst__R9sDuration_1).__tv__q_1=___src__9sDuration_1.__tv__q_1) /* ?{} */);
+}
-static inline void ___destructor__F_R9sDuration_autogen___1(struct Duration *___dst__R9sDuration_1){
-    ((void)((*___dst__R9sDuration_1).__tv__q_1) /* ^?{} */);
+}
-static inline struct Duration ___operator_assign__F9sDuration_R9sDuration9sDuration_autogen___1(struct Duration *___dst__R9sDuration_1, struct Duration ___src__9sDuration_1){
-    struct Duration ___ret__9sDuration_1;
-    ((void)((*___dst__R9sDuration_1).__tv__q_1=___src__9sDuration_1.__tv__q_1));
-    ((void)___constructor__F_R9sDuration9sDuration_autogen___1((&___ret__9sDuration_1), (*___dst__R9sDuration_1)));
-    return ___ret__9sDuration_1;
+}
-static inline void ___constructor__F_R9sDurationq_autogen___1(struct Duration *___dst__R9sDuration_1, signed long long int __tv__q_1){
-    ((void)((*___dst__R9sDuration_1).__tv__q_1=__tv__q_1) /* ?{} */);
+}
-static inline void ___constructor__F_R9sDuration__1(struct Duration *__dur__R9sDuration_1){
-    ((void)((*__dur__R9sDuration_1).__tv__q_1) /* ?{} */);
-    ((void)((*__dur__R9sDuration_1).__tv__q_1=((signed long long int )0)));
+}
-static inline void ___constructor__F_R9sDurationZ__1(struct Duration *__dur__R9sDuration_1, long int __anonymous_object1351){
-    ((void)((*__dur__R9sDuration_1).__tv__q_1) /* ?{} */);
-    ((void)((*__dur__R9sDuration_1).__tv__q_1=((signed long long int )0)));
+}
-struct Time {
-    unsigned long long int __tv__Uq_1;
-};
-static inline void ___constructor__F_R5sTime_autogen___1(struct Time *___dst__R5sTime_1);
-static inline void ___constructor__F_R5sTime5sTime_autogen___1(struct Time *___dst__R5sTime_1, struct Time ___src__5sTime_1);
-static inline void ___destructor__F_R5sTime_autogen___1(struct Time *___dst__R5sTime_1);
-static inline struct Time ___operator_assign__F5sTime_R5sTime5sTime_autogen___1(struct Time *___dst__R5sTime_1, struct Time ___src__5sTime_1);
-static inline void ___constructor__F_R5sTimeUq_autogen___1(struct Time *___dst__R5sTime_1, unsigned long long int __tv__Uq_1);
-static inline void ___constructor__F_R5sTime_autogen___1(struct Time *___dst__R5sTime_1){
-    ((void)((*___dst__R5sTime_1).__tv__Uq_1) /* ?{} */);
+}
-static inline void ___constructor__F_R5sTime5sTime_autogen___1(struct Time *___dst__R5sTime_1, struct Time ___src__5sTime_1){
-    ((void)((*___dst__R5sTime_1).__tv__Uq_1=___src__5sTime_1.__tv__Uq_1) /* ?{} */);
+}
-static inline void ___destructor__F_R5sTime_autogen___1(struct Time *___dst__R5sTime_1){
-    ((void)((*___dst__R5sTime_1).__tv__Uq_1) /* ^?{} */);
+}
-static inline struct Time ___operator_assign__F5sTime_R5sTime5sTime_autogen___1(struct Time *___dst__R5sTime_1, struct Time ___src__5sTime_1){
-    struct Time ___ret__5sTime_1;
-    ((void)((*___dst__R5sTime_1).__tv__Uq_1=___src__5sTime_1.__tv__Uq_1));
-    ((void)___constructor__F_R5sTime5sTime_autogen___1((&___ret__5sTime_1), (*___dst__R5sTime_1)));
-    return ___ret__5sTime_1;
+}
-static inline void ___constructor__F_R5sTimeUq_autogen___1(struct Time *___dst__R5sTime_1, unsigned long long int __tv__Uq_1){
-    ((void)((*___dst__R5sTime_1).__tv__Uq_1=__tv__Uq_1) /* ?{} */);
+}
-static inline void ___constructor__F_R5sTime__1(struct Time *__time__R5sTime_1){
-    ((void)((*__time__R5sTime_1).__tv__Uq_1) /* ?{} */);
-    ((void)((*__time__R5sTime_1).__tv__Uq_1=((unsigned long long int )0)));
+}
-static inline void ___constructor__F_R5sTimeZ__1(struct Time *__time__R5sTime_1, long int __anonymous_object1352){
-    ((void)((*__time__R5sTime_1).__tv__Uq_1) /* ?{} */);
-    ((void)((*__time__R5sTime_1).__tv__Uq_1=((unsigned long long int )0)));
+}
-void *___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd09sDuration__1(__attribute__ ((unused)) _Bool (*__sepPrt__PFb_R7tostype__1)(void *__anonymous_object1353), __attribute__ ((unused)) void (*__sepReset__PF_R7tostype__1)(void *__anonymous_object1354), __attribute__ ((unused)) void (*__sepReset__PF_R7tostypeb__1)(void *__anonymous_object1355, _Bool __anonymous_object1356), __attribute__ ((unused)) const char *(*__sepGetCur__PFPCc_R7tostype__1)(void *__anonymous_object1357), __attribute__ ((unused)) void (*__sepSetCur__PF_R7tostypePCc__1)(void *__anonymous_object1358, const char *__anonymous_object1359), __attribute__ ((unused)) _Bool (*__getNL__PFb_R7tostype__1)(void *__anonymous_object1360), __attribute__ ((unused)) void (*__setNL__PF_R7tostypeb__1)(void *__anonymous_object1361, _Bool __anonymous_object1362), __attribute__ ((unused)) void (*__sepOn__PF_R7tostype__1)(void *__anonymous_object1363), __attribute__ ((unused)) void (*__sepOff__PF_R7tostype__1)(void *__anonymous_object1364), __attribute__ ((unused)) _Bool (*__sepDisable__PFb_R7tostype__1)(void *__anonymous_object1365), __attribute__ ((unused)) _Bool (*__sepEnable__PFb_R7tostype__1)(void *__anonymous_object1366), __attribute__ ((unused)) const char *(*__sepGet__PFPCc_R7tostype__1)(void *__anonymous_object1367), __attribute__ ((unused)) void (*__sepSet__PF_R7tostypePCc__1)(void *__anonymous_object1368, const char *__anonymous_object1369), __attribute__ ((unused)) const char *(*__sepGetTuple__PFPCc_R7tostype__1)(void *__anonymous_object1370), __attribute__ ((unused)) void (*__sepSetTuple__PF_R7tostypePCc__1)(void *__anonymous_object1371, const char *__anonymous_object1372), __attribute__ ((unused)) signed int (*__fail__PFi_R7tostype__1)(void *__anonymous_object1373), __attribute__ ((unused)) signed int (*__flush__PFi_R7tostype__1)(void *__anonymous_object1374), __attribute__ ((unused)) void (*__open__PF_R7tostypePCcPCc__1)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1), __attribute__ ((unused)) void (*__close__PF_R7tostype__1)(void *__os__R7tostype_1), __attribute__ ((unused)) void *(*__write__PFR7tostype_R7tostypePCcUl__1)(void *__anonymous_object1375, const char *__anonymous_object1376, unsigned long int __anonymous_object1377), __attribute__ ((unused)) signed int (*__fmt__PFi_R7tostypePCc__1)(void *__anonymous_object1378, const char *__fmt__PCc_1, ...), void *__os__R7tostype_1, struct Duration __dur__9sDuration_1);
-void *___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd05sTime__1(__attribute__ ((unused)) _Bool (*__sepPrt__PFb_R7tostype__1)(void *__anonymous_object1379), __attribute__ ((unused)) void (*__sepReset__PF_R7tostype__1)(void *__anonymous_object1380), __attribute__ ((unused)) void (*__sepReset__PF_R7tostypeb__1)(void *__anonymous_object1381, _Bool __anonymous_object1382), __attribute__ ((unused)) const char *(*__sepGetCur__PFPCc_R7tostype__1)(void *__anonymous_object1383), __attribute__ ((unused)) void (*__sepSetCur__PF_R7tostypePCc__1)(void *__anonymous_object1384, const char *__anonymous_object1385), __attribute__ ((unused)) _Bool (*__getNL__PFb_R7tostype__1)(void *__anonymous_object1386), __attribute__ ((unused)) void (*__setNL__PF_R7tostypeb__1)(void *__anonymous_object1387, _Bool __anonymous_object1388), __attribute__ ((unused)) void (*__sepOn__PF_R7tostype__1)(void *__anonymous_object1389), __attribute__ ((unused)) void (*__sepOff__PF_R7tostype__1)(void *__anonymous_object1390), __attribute__ ((unused)) _Bool (*__sepDisable__PFb_R7tostype__1)(void *__anonymous_object1391), __attribute__ ((unused)) _Bool (*__sepEnable__PFb_R7tostype__1)(void *__anonymous_object1392), __attribute__ ((unused)) const char *(*__sepGet__PFPCc_R7tostype__1)(void *__anonymous_object1393), __attribute__ ((unused)) void (*__sepSet__PF_R7tostypePCc__1)(void *__anonymous_object1394, const char *__anonymous_object1395), __attribute__ ((unused)) const char *(*__sepGetTuple__PFPCc_R7tostype__1)(void *__anonymous_object1396), __attribute__ ((unused)) void (*__sepSetTuple__PF_R7tostypePCc__1)(void *__anonymous_object1397, const char *__anonymous_object1398), __attribute__ ((unused)) signed int (*__fail__PFi_R7tostype__1)(void *__anonymous_object1399), __attribute__ ((unused)) signed int (*__flush__PFi_R7tostype__1)(void *__anonymous_object1400), __attribute__ ((unused)) void (*__open__PF_R7tostypePCcPCc__1)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1), __attribute__ ((unused)) void (*__close__PF_R7tostype__1)(void *__os__R7tostype_1), __attribute__ ((unused)) void *(*__write__PFR7tostype_R7tostypePCcUl__1)(void *__anonymous_object1401, const char *__anonymous_object1402, unsigned long int __anonymous_object1403), __attribute__ ((unused)) signed int (*__fmt__PFi_R7tostypePCc__1)(void *__anonymous_object1404, const char *__fmt__PCc_1, ...), void *__os__R7tostype_1, struct Time __time__5sTime_1);
 enum __anonymous0 {
     __sepSize__C13e__anonymous0_1 = 16,
 …
+}
 _Bool __sepPrt__Fb_R9sofstream__1(struct ofstream *__anonymous_object1405);
 void __sepReset__F_R9sofstream__1(struct ofstream *__anonymous_object1406);
 void __sepReset__F_R9sofstreamb__1(struct ofstream *__anonymous_object1407, _Bool __anonymous_object1408);
 const char *__sepGetCur__FPCc_R9sofstream__1(struct ofstream *__anonymous_object1409);
 void __sepSetCur__F_R9sofstreamPCc__1(struct ofstream *__anonymous_object1410, const char *__anonymous_object1411);
 _Bool __getNL__Fb_R9sofstream__1(struct ofstream *__anonymous_object1412);
 void __setNL__F_R9sofstreamb__1(struct ofstream *__anonymous_object1413, _Bool __anonymous_object1414);
 void __sepOn__F_R9sofstream__1(struct ofstream *__anonymous_object1415);
 void __sepOff__F_R9sofstream__1(struct ofstream *__anonymous_object1416);
 _Bool __sepDisable__Fb_R9sofstream__1(struct ofstream *__anonymous_object1417);
 _Bool __sepEnable__Fb_R9sofstream__1(struct ofstream *__anonymous_object1418);
 const char *__sepGet__FPCc_R9sofstream__1(struct ofstream *__anonymous_object1419);
 void __sepSet__F_R9sofstreamPCc__1(struct ofstream *__anonymous_object1420, const char *__anonymous_object1421);
 const char *__sepGetTuple__FPCc_R9sofstream__1(struct ofstream *__anonymous_object1422);
 void __sepSetTuple__F_R9sofstreamPCc__1(struct ofstream *__anonymous_object1423, const char *__anonymous_object1424);
 signed int __fail__Fi_R9sofstream__1(struct ofstream *__anonymous_object1425);
 signed int __flush__Fi_R9sofstream__1(struct ofstream *__anonymous_object1426);
 void __open__F_R9sofstreamPCcPCc__1(struct ofstream *__anonymous_object1427, const char *__name__PCc_1, const char *__mode__PCc_1);
 void __open__F_R9sofstreamPCc__1(struct ofstream *__anonymous_object1428, const char *__name__PCc_1);
 void __close__F_R9sofstream__1(struct ofstream *__anonymous_object1429);
 struct ofstream *__write__FR9sofstream_R9sofstreamPCcUl__1(struct ofstream *__anonymous_object1430, const char *__data__PCc_1, unsigned long int __size__Ul_1);
 signed int __fmt__Fi_R9sofstreamPCc__1(struct ofstream *__anonymous_object1431, const char *__fmt__PCc_1, ...);
+_Bool __sepPrt__Fb_R9sofstream__1(struct ofstream *__anonymous_object1351);
+void __sepReset__F_R9sofstream__1(struct ofstream *__anonymous_object1352);
+void __sepReset__F_R9sofstreamb__1(struct ofstream *__anonymous_object1353, _Bool __anonymous_object1354);
+const char *__sepGetCur__FPCc_R9sofstream__1(struct ofstream *__anonymous_object1355);
+void __sepSetCur__F_R9sofstreamPCc__1(struct ofstream *__anonymous_object1356, const char *__anonymous_object1357);
+_Bool __getNL__Fb_R9sofstream__1(struct ofstream *__anonymous_object1358);
+void __setNL__F_R9sofstreamb__1(struct ofstream *__anonymous_object1359, _Bool __anonymous_object1360);
+void __sepOn__F_R9sofstream__1(struct ofstream *__anonymous_object1361);
+void __sepOff__F_R9sofstream__1(struct ofstream *__anonymous_object1362);
+_Bool __sepDisable__Fb_R9sofstream__1(struct ofstream *__anonymous_object1363);
+_Bool __sepEnable__Fb_R9sofstream__1(struct ofstream *__anonymous_object1364);
+const char *__sepGet__FPCc_R9sofstream__1(struct ofstream *__anonymous_object1365);
+void __sepSet__F_R9sofstreamPCc__1(struct ofstream *__anonymous_object1366, const char *__anonymous_object1367);
+const char *__sepGetTuple__FPCc_R9sofstream__1(struct ofstream *__anonymous_object1368);
+void __sepSetTuple__F_R9sofstreamPCc__1(struct ofstream *__anonymous_object1369, const char *__anonymous_object1370);
+signed int __fail__Fi_R9sofstream__1(struct ofstream *__anonymous_object1371);
+signed int __flush__Fi_R9sofstream__1(struct ofstream *__anonymous_object1372);
+void __open__F_R9sofstreamPCcPCc__1(struct ofstream *__anonymous_object1373, const char *__name__PCc_1, const char *__mode__PCc_1);
+void __open__F_R9sofstreamPCc__1(struct ofstream *__anonymous_object1374, const char *__name__PCc_1);
+void __close__F_R9sofstream__1(struct ofstream *__anonymous_object1375);
+struct ofstream *__write__FR9sofstream_R9sofstreamPCcUl__1(struct ofstream *__anonymous_object1376, const char *__data__PCc_1, unsigned long int __size__Ul_1);
+signed int __fmt__Fi_R9sofstreamPCc__1(struct ofstream *__anonymous_object1377, const char *__fmt__PCc_1, ...);
 void ___constructor__F_R9sofstream__1(struct ofstream *__os__R9sofstream_1);
 void ___constructor__F_R9sofstreamPCcPCc__1(struct ofstream *__os__R9sofstream_1, const char *__name__PCc_1, const char *__mode__PCc_1);
 …
 struct ifstream *__read__FR9sifstream_R9sifstreamPcUl__1(struct ifstream *__is__R9sifstream_1, char *__data__Pc_1, unsigned long int __size__Ul_1);
 struct ifstream *__ungetc__FR9sifstream_R9sifstreamc__1(struct ifstream *__is__R9sifstream_1, char __c__c_1);
 signed int __fmt__Fi_R9sifstreamPCc__1(struct ifstream *__anonymous_object1432, const char *__fmt__PCc_1, ...);
+signed int __fmt__Fi_R9sifstreamPCc__1(struct ifstream *__anonymous_object1378, const char *__fmt__PCc_1, ...);
 void ___constructor__F_R9sifstream__1(struct ifstream *__is__R9sifstream_1);
 void ___constructor__F_R9sifstreamPCcPCc__1(struct ifstream *__is__R9sifstream_1, const char *__name__PCc_1, const char *__mode__PCc_1);
 …
     struct ofstream *_tmp_cp_ret4;
     __attribute__ ((unused)) struct ofstream *_thunk0(struct ofstream *_p0){
         return __endl__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0__1(((_Bool (*)(void *__anonymous_object1433))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1434))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1435, _Bool __anonymous_object1436))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1437))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1438, const char *__anonymous_object1439))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1440))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1441, _Bool __anonymous_object1442))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1443))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1444))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1445))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1446))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1447))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1448, const char *__anonymous_object1449))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1450))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1451, const char *__anonymous_object1452))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1453))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1454))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1455, const char *__anonymous_object1456, unsigned long int __anonymous_object1457))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1458, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)_p0));
+    }
     ((void)(((void)(_tmp_cp_ret4=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PFRd0_Rd0___1(((_Bool (*)(void *__anonymous_object1459))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1460))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1461, _Bool __anonymous_object1462))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1463))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1464, const char *__anonymous_object1465))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1466))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1467, _Bool __anonymous_object1468))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1469))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1470))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1471))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1472))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1473))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1474, const char *__anonymous_object1475))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1476))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1477, const char *__anonymous_object1478))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1479))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1480))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1481, const char *__anonymous_object1482, unsigned long int __anonymous_object1483))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1484, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret3=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0c__1(((_Bool (*)(void *__anonymous_object1485))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1486))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1487, _Bool __anonymous_object1488))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1489))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1490, const char *__anonymous_object1491))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1492))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1493, _Bool __anonymous_object1494))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1495))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1496))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1497))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1498))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1499))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1500, const char *__anonymous_object1501))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1502))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1503, const char *__anonymous_object1504))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1505))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1506))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1507, const char *__anonymous_object1508, unsigned long int __anonymous_object1509))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1510, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret2=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PCc__1(((_Bool (*)(void *__anonymous_object1511))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1512))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1513, _Bool __anonymous_object1514))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1515))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1516, const char *__anonymous_object1517))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1518))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1519, _Bool __anonymous_object1520))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1521))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1522))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1523))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1524))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1525))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1526, const char *__anonymous_object1527))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1528))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1529, const char *__anonymous_object1530))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1531))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1532))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1533, const char *__anonymous_object1534, unsigned long int __anonymous_object1535))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1536, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)__sout__R9sofstream_1), "char ")))) , _tmp_cp_ret2)), __v__c_1)))) , _tmp_cp_ret3)), ((void *(*)(void *__anonymous_object1537))(&_thunk0)))))) , _tmp_cp_ret4));
+        return __endl__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0__1(((_Bool (*)(void *__anonymous_object1379))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1380))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1381, _Bool __anonymous_object1382))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1383))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1384, const char *__anonymous_object1385))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1386))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1387, _Bool __anonymous_object1388))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1389))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1390))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1391))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1392))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1393))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1394, const char *__anonymous_object1395))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1396))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1397, const char *__anonymous_object1398))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1399))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1400))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1401, const char *__anonymous_object1402, unsigned long int __anonymous_object1403))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1404, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)_p0));
+    }
+    ((void)(((void)(_tmp_cp_ret4=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PFRd0_Rd0___1(((_Bool (*)(void *__anonymous_object1405))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1406))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1407, _Bool __anonymous_object1408))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1409))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1410, const char *__anonymous_object1411))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1412))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1413, _Bool __anonymous_object1414))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1415))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1416))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1417))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1418))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1419))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1420, const char *__anonymous_object1421))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1422))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1423, const char *__anonymous_object1424))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1425))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1426))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1427, const char *__anonymous_object1428, unsigned long int __anonymous_object1429))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1430, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret3=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0c__1(((_Bool (*)(void *__anonymous_object1431))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1432))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1433, _Bool __anonymous_object1434))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1435))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1436, const char *__anonymous_object1437))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1438))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1439, _Bool __anonymous_object1440))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1441))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1442))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1443))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1444))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1445))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1446, const char *__anonymous_object1447))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1448))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1449, const char *__anonymous_object1450))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1451))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1452))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1453, const char *__anonymous_object1454, unsigned long int __anonymous_object1455))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1456, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret2=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PCc__1(((_Bool (*)(void *__anonymous_object1457))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1458))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1459, _Bool __anonymous_object1460))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1461))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1462, const char *__anonymous_object1463))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1464))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1465, _Bool __anonymous_object1466))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1467))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1468))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1469))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1470))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1471))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1472, const char *__anonymous_object1473))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1474))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1475, const char *__anonymous_object1476))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1477))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1478))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1479, const char *__anonymous_object1480, unsigned long int __anonymous_object1481))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1482, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)__sout__R9sofstream_1), "char ")))) , _tmp_cp_ret2)), __v__c_1)))) , _tmp_cp_ret3)), ((void *(*)(void *__anonymous_object1483))(&_thunk0)))))) , _tmp_cp_ret4));
+}
 void __f__F_Sc__1(signed char __v__Sc_1){
 …
     struct ofstream *_tmp_cp_ret7;
     __attribute__ ((unused)) struct ofstream *_thunk1(struct ofstream *_p0){
         return __endl__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0__1(((_Bool (*)(void *__anonymous_object1538))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1539))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1540, _Bool __anonymous_object1541))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1542))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1543, const char *__anonymous_object1544))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1545))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1546, _Bool __anonymous_object1547))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1548))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1549))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1550))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1551))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1552))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1553, const char *__anonymous_object1554))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1555))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1556, const char *__anonymous_object1557))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1558))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1559))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1560, const char *__anonymous_object1561, unsigned long int __anonymous_object1562))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1563, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)_p0));
+    }
     ((void)(((void)(_tmp_cp_ret7=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PFRd0_Rd0___1(((_Bool (*)(void *__anonymous_object1564))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1565))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1566, _Bool __anonymous_object1567))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1568))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1569, const char *__anonymous_object1570))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1571))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1572, _Bool __anonymous_object1573))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1574))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1575))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1576))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1577))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1578))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1579, const char *__anonymous_object1580))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1581))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1582, const char *__anonymous_object1583))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1584))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1585))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1586, const char *__anonymous_object1587, unsigned long int __anonymous_object1588))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1589, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret6=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0Sc__1(((_Bool (*)(void *__anonymous_object1590))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1591))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1592, _Bool __anonymous_object1593))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1594))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1595, const char *__anonymous_object1596))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1597))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1598, _Bool __anonymous_object1599))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1600))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1601))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1602))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1603))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1604))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1605, const char *__anonymous_object1606))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1607))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1608, const char *__anonymous_object1609))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1610))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1611))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1612, const char *__anonymous_object1613, unsigned long int __anonymous_object1614))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1615, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret5=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PCc__1(((_Bool (*)(void *__anonymous_object1616))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1617))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1618, _Bool __anonymous_object1619))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1620))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1621, const char *__anonymous_object1622))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1623))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1624, _Bool __anonymous_object1625))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1626))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1627))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1628))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1629))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1630))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1631, const char *__anonymous_object1632))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1633))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1634, const char *__anonymous_object1635))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1636))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1637))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1638, const char *__anonymous_object1639, unsigned long int __anonymous_object1640))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1641, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)__sout__R9sofstream_1), "signed char ")))) , _tmp_cp_ret5)), __v__Sc_1)))) , _tmp_cp_ret6)), ((void *(*)(void *__anonymous_object1642))(&_thunk1)))))) , _tmp_cp_ret7));
+        return __endl__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0__1(((_Bool (*)(void *__anonymous_object1484))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1485))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1486, _Bool __anonymous_object1487))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1488))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1489, const char *__anonymous_object1490))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1491))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1492, _Bool __anonymous_object1493))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1494))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1495))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1496))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1497))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1498))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1499, const char *__anonymous_object1500))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1501))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1502, const char *__anonymous_object1503))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1504))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1505))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1506, const char *__anonymous_object1507, unsigned long int __anonymous_object1508))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1509, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)_p0));
+    }
+    ((void)(((void)(_tmp_cp_ret7=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PFRd0_Rd0___1(((_Bool (*)(void *__anonymous_object1510))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1511))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1512, _Bool __anonymous_object1513))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1514))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1515, const char *__anonymous_object1516))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1517))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1518, _Bool __anonymous_object1519))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1520))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1521))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1522))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1523))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1524))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1525, const char *__anonymous_object1526))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1527))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1528, const char *__anonymous_object1529))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1530))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1531))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1532, const char *__anonymous_object1533, unsigned long int __anonymous_object1534))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1535, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret6=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0Sc__1(((_Bool (*)(void *__anonymous_object1536))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1537))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1538, _Bool __anonymous_object1539))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1540))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1541, const char *__anonymous_object1542))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1543))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1544, _Bool __anonymous_object1545))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1546))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1547))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1548))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1549))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1550))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1551, const char *__anonymous_object1552))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1553))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1554, const char *__anonymous_object1555))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1556))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1557))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1558, const char *__anonymous_object1559, unsigned long int __anonymous_object1560))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1561, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret5=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PCc__1(((_Bool (*)(void *__anonymous_object1562))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1563))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1564, _Bool __anonymous_object1565))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1566))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1567, const char *__anonymous_object1568))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1569))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1570, _Bool __anonymous_object1571))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1572))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1573))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1574))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1575))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1576))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1577, const char *__anonymous_object1578))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1579))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1580, const char *__anonymous_object1581))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1582))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1583))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1584, const char *__anonymous_object1585, unsigned long int __anonymous_object1586))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1587, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)__sout__R9sofstream_1), "signed char ")))) , _tmp_cp_ret5)), __v__Sc_1)))) , _tmp_cp_ret6)), ((void *(*)(void *__anonymous_object1588))(&_thunk1)))))) , _tmp_cp_ret7));
+}
 void __f__F_Uc__1(unsigned char __v__Uc_1){
 …
     struct ofstream *_tmp_cp_ret10;
     __attribute__ ((unused)) struct ofstream *_thunk2(struct ofstream *_p0){
         return __endl__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0__1(((_Bool (*)(void *__anonymous_object1643))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1644))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1645, _Bool __anonymous_object1646))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1647))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1648, const char *__anonymous_object1649))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1650))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1651, _Bool __anonymous_object1652))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1653))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1654))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1655))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1656))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1657))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1658, const char *__anonymous_object1659))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1660))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1661, const char *__anonymous_object1662))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1663))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1664))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1665, const char *__anonymous_object1666, unsigned long int __anonymous_object1667))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1668, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)_p0));
+    }
     ((void)(((void)(_tmp_cp_ret10=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PFRd0_Rd0___1(((_Bool (*)(void *__anonymous_object1669))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1670))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1671, _Bool __anonymous_object1672))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1673))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1674, const char *__anonymous_object1675))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1676))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1677, _Bool __anonymous_object1678))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1679))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1680))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1681))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1682))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1683))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1684, const char *__anonymous_object1685))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1686))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1687, const char *__anonymous_object1688))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1689))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1690))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1691, const char *__anonymous_object1692, unsigned long int __anonymous_object1693))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1694, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret9=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0Uc__1(((_Bool (*)(void *__anonymous_object1695))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1696))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1697, _Bool __anonymous_object1698))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1699))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1700, const char *__anonymous_object1701))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1702))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1703, _Bool __anonymous_object1704))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1705))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1706))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1707))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1708))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1709))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1710, const char *__anonymous_object1711))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1712))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1713, const char *__anonymous_object1714))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1715))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1716))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1717, const char *__anonymous_object1718, unsigned long int __anonymous_object1719))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1720, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret8=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PCc__1(((_Bool (*)(void *__anonymous_object1721))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1722))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1723, _Bool __anonymous_object1724))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1725))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1726, const char *__anonymous_object1727))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1728))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1729, _Bool __anonymous_object1730))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1731))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1732))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1733))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1734))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1735))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1736, const char *__anonymous_object1737))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1738))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1739, const char *__anonymous_object1740))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1741))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1742))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1743, const char *__anonymous_object1744, unsigned long int __anonymous_object1745))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1746, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)__sout__R9sofstream_1), "unsigned char ")))) , _tmp_cp_ret8)), __v__Uc_1)))) , _tmp_cp_ret9)), ((void *(*)(void *__anonymous_object1747))(&_thunk2)))))) , _tmp_cp_ret10));
+        return __endl__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0__1(((_Bool (*)(void *__anonymous_object1589))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1590))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1591, _Bool __anonymous_object1592))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1593))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1594, const char *__anonymous_object1595))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1596))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1597, _Bool __anonymous_object1598))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1599))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1600))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1601))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1602))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1603))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1604, const char *__anonymous_object1605))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1606))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1607, const char *__anonymous_object1608))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1609))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1610))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1611, const char *__anonymous_object1612, unsigned long int __anonymous_object1613))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1614, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)_p0));
+    }
+    ((void)(((void)(_tmp_cp_ret10=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PFRd0_Rd0___1(((_Bool (*)(void *__anonymous_object1615))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1616))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1617, _Bool __anonymous_object1618))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1619))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1620, const char *__anonymous_object1621))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1622))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1623, _Bool __anonymous_object1624))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1625))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1626))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1627))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1628))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1629))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1630, const char *__anonymous_object1631))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1632))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1633, const char *__anonymous_object1634))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1635))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1636))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1637, const char *__anonymous_object1638, unsigned long int __anonymous_object1639))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1640, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret9=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0Uc__1(((_Bool (*)(void *__anonymous_object1641))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1642))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1643, _Bool __anonymous_object1644))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1645))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1646, const char *__anonymous_object1647))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1648))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1649, _Bool __anonymous_object1650))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1651))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1652))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1653))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1654))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1655))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1656, const char *__anonymous_object1657))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1658))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1659, const char *__anonymous_object1660))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1661))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1662))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1663, const char *__anonymous_object1664, unsigned long int __anonymous_object1665))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1666, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret8=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PCc__1(((_Bool (*)(void *__anonymous_object1667))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1668))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1669, _Bool __anonymous_object1670))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1671))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1672, const char *__anonymous_object1673))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1674))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1675, _Bool __anonymous_object1676))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1677))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1678))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1679))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1680))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1681))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1682, const char *__anonymous_object1683))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1684))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1685, const char *__anonymous_object1686))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1687))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1688))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1689, const char *__anonymous_object1690, unsigned long int __anonymous_object1691))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1692, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)__sout__R9sofstream_1), "unsigned char ")))) , _tmp_cp_ret8)), __v__Uc_1)))) , _tmp_cp_ret9)), ((void *(*)(void *__anonymous_object1693))(&_thunk2)))))) , _tmp_cp_ret10));
+}
 void __f__F_s__1(signed short int __v__s_1){
 …
     struct ofstream *_tmp_cp_ret13;
     __attribute__ ((unused)) struct ofstream *_thunk3(struct ofstream *_p0){
         return __endl__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0__1(((_Bool (*)(void *__anonymous_object1748))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1749))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1750, _Bool __anonymous_object1751))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1752))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1753, const char *__anonymous_object1754))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1755))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1756, _Bool __anonymous_object1757))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1758))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1759))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1760))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1761))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1762))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1763, const char *__anonymous_object1764))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1765))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1766, const char *__anonymous_object1767))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1768))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1769))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1770, const char *__anonymous_object1771, unsigned long int __anonymous_object1772))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1773, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)_p0));
+    }
     ((void)(((void)(_tmp_cp_ret13=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PFRd0_Rd0___1(((_Bool (*)(void *__anonymous_object1774))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1775))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1776, _Bool __anonymous_object1777))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1778))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1779, const char *__anonymous_object1780))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1781))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1782, _Bool __anonymous_object1783))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1784))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1785))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1786))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1787))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1788))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1789, const char *__anonymous_object1790))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1791))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1792, const char *__anonymous_object1793))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1794))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1795))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1796, const char *__anonymous_object1797, unsigned long int __anonymous_object1798))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1799, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret12=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0s__1(((_Bool (*)(void *__anonymous_object1800))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1801))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1802, _Bool __anonymous_object1803))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1804))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1805, const char *__anonymous_object1806))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1807))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1808, _Bool __anonymous_object1809))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1810))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1811))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1812))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1813))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1814))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1815, const char *__anonymous_object1816))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1817))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1818, const char *__anonymous_object1819))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1820))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1821))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1822, const char *__anonymous_object1823, unsigned long int __anonymous_object1824))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1825, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret11=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PCc__1(((_Bool (*)(void *__anonymous_object1826))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1827))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1828, _Bool __anonymous_object1829))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1830))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1831, const char *__anonymous_object1832))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1833))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1834, _Bool __anonymous_object1835))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1836))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1837))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1838))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1839))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1840))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1841, const char *__anonymous_object1842))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1843))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1844, const char *__anonymous_object1845))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1846))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1847))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1848, const char *__anonymous_object1849, unsigned long int __anonymous_object1850))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1851, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)__sout__R9sofstream_1), "signed short int")))) , _tmp_cp_ret11)), __v__s_1)))) , _tmp_cp_ret12)), ((void *(*)(void *__anonymous_object1852))(&_thunk3)))))) , _tmp_cp_ret13));
+        return __endl__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0__1(((_Bool (*)(void *__anonymous_object1694))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1695))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1696, _Bool __anonymous_object1697))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1698))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1699, const char *__anonymous_object1700))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1701))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1702, _Bool __anonymous_object1703))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1704))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1705))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1706))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1707))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1708))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1709, const char *__anonymous_object1710))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1711))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1712, const char *__anonymous_object1713))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1714))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1715))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1716, const char *__anonymous_object1717, unsigned long int __anonymous_object1718))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1719, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)_p0));
+    }
+    ((void)(((void)(_tmp_cp_ret13=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PFRd0_Rd0___1(((_Bool (*)(void *__anonymous_object1720))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1721))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1722, _Bool __anonymous_object1723))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1724))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1725, const char *__anonymous_object1726))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1727))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1728, _Bool __anonymous_object1729))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1730))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1731))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1732))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1733))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1734))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1735, const char *__anonymous_object1736))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1737))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1738, const char *__anonymous_object1739))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1740))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1741))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1742, const char *__anonymous_object1743, unsigned long int __anonymous_object1744))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1745, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret12=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0s__1(((_Bool (*)(void *__anonymous_object1746))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1747))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1748, _Bool __anonymous_object1749))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1750))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1751, const char *__anonymous_object1752))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1753))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1754, _Bool __anonymous_object1755))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1756))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1757))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1758))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1759))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1760))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1761, const char *__anonymous_object1762))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1763))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1764, const char *__anonymous_object1765))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1766))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1767))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1768, const char *__anonymous_object1769, unsigned long int __anonymous_object1770))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1771, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret11=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PCc__1(((_Bool (*)(void *__anonymous_object1772))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1773))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1774, _Bool __anonymous_object1775))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1776))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1777, const char *__anonymous_object1778))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1779))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1780, _Bool __anonymous_object1781))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1782))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1783))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1784))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1785))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1786))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1787, const char *__anonymous_object1788))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1789))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1790, const char *__anonymous_object1791))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1792))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1793))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1794, const char *__anonymous_object1795, unsigned long int __anonymous_object1796))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1797, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)__sout__R9sofstream_1), "signed short int")))) , _tmp_cp_ret11)), __v__s_1)))) , _tmp_cp_ret12)), ((void *(*)(void *__anonymous_object1798))(&_thunk3)))))) , _tmp_cp_ret13));
+}
 void __f__F_Us__1(unsigned short int __v__Us_1){
 …
     struct ofstream *_tmp_cp_ret16;
     __attribute__ ((unused)) struct ofstream *_thunk4(struct ofstream *_p0){
         return __endl__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0__1(((_Bool (*)(void *__anonymous_object1853))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1854))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1855, _Bool __anonymous_object1856))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1857))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1858, const char *__anonymous_object1859))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1860))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1861, _Bool __anonymous_object1862))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1863))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1864))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1865))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1866))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1867))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1868, const char *__anonymous_object1869))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1870))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1871, const char *__anonymous_object1872))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1873))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1874))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1875, const char *__anonymous_object1876, unsigned long int __anonymous_object1877))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1878, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)_p0));
+    }
     ((void)(((void)(_tmp_cp_ret16=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PFRd0_Rd0___1(((_Bool (*)(void *__anonymous_object1879))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1880))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1881, _Bool __anonymous_object1882))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1883))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1884, const char *__anonymous_object1885))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1886))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1887, _Bool __anonymous_object1888))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1889))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1890))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1891))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1892))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1893))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1894, const char *__anonymous_object1895))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1896))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1897, const char *__anonymous_object1898))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1899))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1900))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1901, const char *__anonymous_object1902, unsigned long int __anonymous_object1903))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1904, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret15=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0Us__1(((_Bool (*)(void *__anonymous_object1905))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1906))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1907, _Bool __anonymous_object1908))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1909))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1910, const char *__anonymous_object1911))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1912))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1913, _Bool __anonymous_object1914))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1915))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1916))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1917))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1918))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1919))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1920, const char *__anonymous_object1921))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1922))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1923, const char *__anonymous_object1924))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1925))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1926))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1927, const char *__anonymous_object1928, unsigned long int __anonymous_object1929))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1930, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret14=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PCc__1(((_Bool (*)(void *__anonymous_object1931))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1932))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1933, _Bool __anonymous_object1934))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1935))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1936, const char *__anonymous_object1937))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1938))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1939, _Bool __anonymous_object1940))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1941))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1942))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1943))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1944))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1945))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1946, const char *__anonymous_object1947))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1948))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1949, const char *__anonymous_object1950))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1951))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1952))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1953, const char *__anonymous_object1954, unsigned long int __anonymous_object1955))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1956, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)__sout__R9sofstream_1), "unsigned short int")))) , _tmp_cp_ret14)), __v__Us_1)))) , _tmp_cp_ret15)), ((void *(*)(void *__anonymous_object1957))(&_thunk4)))))) , _tmp_cp_ret16));
+        return __endl__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0__1(((_Bool (*)(void *__anonymous_object1799))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1800))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1801, _Bool __anonymous_object1802))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1803))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1804, const char *__anonymous_object1805))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1806))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1807, _Bool __anonymous_object1808))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1809))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1810))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1811))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1812))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1813))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1814, const char *__anonymous_object1815))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1816))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1817, const char *__anonymous_object1818))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1819))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1820))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1821, const char *__anonymous_object1822, unsigned long int __anonymous_object1823))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1824, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)_p0));
+    }
+    ((void)(((void)(_tmp_cp_ret16=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PFRd0_Rd0___1(((_Bool (*)(void *__anonymous_object1825))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1826))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1827, _Bool __anonymous_object1828))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1829))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1830, const char *__anonymous_object1831))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1832))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1833, _Bool __anonymous_object1834))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1835))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1836))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1837))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1838))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1839))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1840, const char *__anonymous_object1841))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1842))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1843, const char *__anonymous_object1844))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1845))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1846))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1847, const char *__anonymous_object1848, unsigned long int __anonymous_object1849))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1850, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret15=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0Us__1(((_Bool (*)(void *__anonymous_object1851))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1852))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1853, _Bool __anonymous_object1854))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1855))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1856, const char *__anonymous_object1857))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1858))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1859, _Bool __anonymous_object1860))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1861))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1862))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1863))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1864))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1865))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1866, const char *__anonymous_object1867))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1868))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1869, const char *__anonymous_object1870))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1871))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1872))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1873, const char *__anonymous_object1874, unsigned long int __anonymous_object1875))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1876, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret14=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PCc__1(((_Bool (*)(void *__anonymous_object1877))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1878))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1879, _Bool __anonymous_object1880))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1881))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1882, const char *__anonymous_object1883))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1884))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1885, _Bool __anonymous_object1886))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1887))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1888))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1889))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1890))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1891))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1892, const char *__anonymous_object1893))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1894))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1895, const char *__anonymous_object1896))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1897))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1898))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1899, const char *__anonymous_object1900, unsigned long int __anonymous_object1901))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1902, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)__sout__R9sofstream_1), "unsigned short int")))) , _tmp_cp_ret14)), __v__Us_1)))) , _tmp_cp_ret15)), ((void *(*)(void *__anonymous_object1903))(&_thunk4)))))) , _tmp_cp_ret16));
+}
 void __f__F_Ui__1(unsigned int __v__Ui_1){
 …
     struct ofstream *_tmp_cp_ret19;
     __attribute__ ((unused)) struct ofstream *_thunk5(struct ofstream *_p0){
         return __endl__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0__1(((_Bool (*)(void *__anonymous_object1958))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1959))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1960, _Bool __anonymous_object1961))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1962))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1963, const char *__anonymous_object1964))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1965))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1966, _Bool __anonymous_object1967))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1968))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1969))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1970))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1971))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1972))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1973, const char *__anonymous_object1974))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1975))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1976, const char *__anonymous_object1977))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1978))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1979))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1980, const char *__anonymous_object1981, unsigned long int __anonymous_object1982))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1983, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)_p0));
+    }
     ((void)(((void)(_tmp_cp_ret19=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PFRd0_Rd0___1(((_Bool (*)(void *__anonymous_object1984))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1985))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1986, _Bool __anonymous_object1987))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1988))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1989, const char *__anonymous_object1990))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1991))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1992, _Bool __anonymous_object1993))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1994))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1995))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1996))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1997))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1998))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1999, const char *__anonymous_object2000))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object2001))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object2002, const char *__anonymous_object2003))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object2004))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object2005))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object2006, const char *__anonymous_object2007, unsigned long int __anonymous_object2008))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object2009, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret18=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0Ui__1(((_Bool (*)(void *__anonymous_object2010))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object2011))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object2012, _Bool __anonymous_object2013))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object2014))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object2015, const char *__anonymous_object2016))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object2017))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object2018, _Bool __anonymous_object2019))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object2020))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object2021))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object2022))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object2023))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object2024))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object2025, const char *__anonymous_object2026))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object2027))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object2028, const char *__anonymous_object2029))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object2030))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object2031))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object2032, const char *__anonymous_object2033, unsigned long int __anonymous_object2034))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object2035, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret17=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PCc__1(((_Bool (*)(void *__anonymous_object2036))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object2037))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object2038, _Bool __anonymous_object2039))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object2040))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object2041, const char *__anonymous_object2042))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object2043))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object2044, _Bool __anonymous_object2045))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object2046))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object2047))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object2048))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object2049))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object2050))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object2051, const char *__anonymous_object2052))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object2053))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object2054, const char *__anonymous_object2055))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object2056))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object2057))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object2058, const char *__anonymous_object2059, unsigned long int __anonymous_object2060))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object2061, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)__sout__R9sofstream_1), "size_t")))) , _tmp_cp_ret17)), __v__Ui_1)))) , _tmp_cp_ret18)), ((void *(*)(void *__anonymous_object2062))(&_thunk5)))))) , _tmp_cp_ret19));
+        return __endl__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0__1(((_Bool (*)(void *__anonymous_object1904))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1905))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1906, _Bool __anonymous_object1907))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1908))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1909, const char *__anonymous_object1910))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1911))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1912, _Bool __anonymous_object1913))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1914))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1915))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1916))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1917))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1918))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1919, const char *__anonymous_object1920))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1921))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1922, const char *__anonymous_object1923))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1924))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1925))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1926, const char *__anonymous_object1927, unsigned long int __anonymous_object1928))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1929, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)_p0));
+    }
+    ((void)(((void)(_tmp_cp_ret19=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PFRd0_Rd0___1(((_Bool (*)(void *__anonymous_object1930))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1931))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1932, _Bool __anonymous_object1933))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1934))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1935, const char *__anonymous_object1936))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1937))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1938, _Bool __anonymous_object1939))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1940))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1941))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1942))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1943))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1944))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1945, const char *__anonymous_object1946))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1947))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1948, const char *__anonymous_object1949))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1950))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1951))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1952, const char *__anonymous_object1953, unsigned long int __anonymous_object1954))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1955, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret18=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0Ui__1(((_Bool (*)(void *__anonymous_object1956))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1957))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1958, _Bool __anonymous_object1959))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1960))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1961, const char *__anonymous_object1962))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1963))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1964, _Bool __anonymous_object1965))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1966))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1967))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1968))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1969))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1970))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1971, const char *__anonymous_object1972))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1973))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1974, const char *__anonymous_object1975))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object1976))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object1977))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object1978, const char *__anonymous_object1979, unsigned long int __anonymous_object1980))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object1981, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)(((void)(_tmp_cp_ret17=((struct ofstream *)___operator_bitor__A0_1_0_0___sepPrt__PFb_Rd0___sepReset__PF_Rd0___sepReset__PF_Rd0b___sepGetCur__PFPCc_Rd0___sepSetCur__PF_Rd0PCc___getNL__PFb_Rd0___setNL__PF_Rd0b___sepOn__PF_Rd0___sepOff__PF_Rd0___sepDisable__PFb_Rd0___sepEnable__PFb_Rd0___sepGet__PFPCc_Rd0___sepSet__PF_Rd0PCc___sepGetTuple__PFPCc_Rd0___sepSetTuple__PF_Rd0PCc___fail__PFi_Rd0___flush__PFi_Rd0___open__PF_Rd0PCcPCc___close__PF_Rd0___write__PFRd0_Rd0PCcUl___fmt__PFi_Rd0PCc__FRd0_Rd0PCc__1(((_Bool (*)(void *__anonymous_object1982))__sepPrt__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1983))__sepReset__F_R9sofstream__1), ((void (*)(void *__anonymous_object1984, _Bool __anonymous_object1985))__sepReset__F_R9sofstreamb__1), ((const char *(*)(void *__anonymous_object1986))__sepGetCur__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1987, const char *__anonymous_object1988))__sepSetCur__F_R9sofstreamPCc__1), ((_Bool (*)(void *__anonymous_object1989))__getNL__Fb_R9sofstream__1), ((void (*)(void *__anonymous_object1990, _Bool __anonymous_object1991))__setNL__F_R9sofstreamb__1), ((void (*)(void *__anonymous_object1992))__sepOn__F_R9sofstream__1), ((void (*)(void *__anonymous_object1993))__sepOff__F_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1994))__sepDisable__Fb_R9sofstream__1), ((_Bool (*)(void *__anonymous_object1995))__sepEnable__Fb_R9sofstream__1), ((const char *(*)(void *__anonymous_object1996))__sepGet__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object1997, const char *__anonymous_object1998))__sepSet__F_R9sofstreamPCc__1), ((const char *(*)(void *__anonymous_object1999))__sepGetTuple__FPCc_R9sofstream__1), ((void (*)(void *__anonymous_object2000, const char *__anonymous_object2001))__sepSetTuple__F_R9sofstreamPCc__1), ((signed int (*)(void *__anonymous_object2002))__fail__Fi_R9sofstream__1), ((signed int (*)(void *__anonymous_object2003))__flush__Fi_R9sofstream__1), ((void (*)(void *__os__R7tostype_1, const char *__name__PCc_1, const char *__mode__PCc_1))__open__F_R9sofstreamPCcPCc__1), ((void (*)(void *__os__R7tostype_1))__close__F_R9sofstream__1), ((void *(*)(void *__anonymous_object2004, const char *__anonymous_object2005, unsigned long int __anonymous_object2006))__write__FR9sofstream_R9sofstreamPCcUl__1), ((signed int (*)(void *__anonymous_object2007, const char *__fmt__PCc_1, ...))__fmt__Fi_R9sofstreamPCc__1), ((void *)__sout__R9sofstream_1), "size_t")))) , _tmp_cp_ret17)), __v__Ui_1)))) , _tmp_cp_ret18)), ((void *(*)(void *__anonymous_object2008))(&_thunk5)))))) , _tmp_cp_ret19));
+}
 signed int __main__Fi___1(){

src/tests/.expect/references.txt

-              r32cab5b
+              rb2fe1c9
 1 12
 14
-x = 6 ; x2 = 789
-x = 6 ; x2 = 999
-x = 12345 ; x2 = 999
-x = 22222 ; x2 = 999
 Default constructing a Y
 Copy constructing a Y
 …
 Destructing a Y
 Destructing a Y
-3
-9 { 1, 7 }, [1, 2, 3]
 Destructing a Y
 Destructing a Y

src/tests/Makefile.am

-              r32cab5b
+              rb2fe1c9
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
-fallthrough-ERROR: fallthrough.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
 # Constructor/destructor tests
 raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@

src/tests/Makefile.in

-              r32cab5b
+              rb2fe1c9
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
-fallthrough-ERROR: fallthrough.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
 # Constructor/destructor tests
 raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@

src/tests/concurrent/examples/datingService.c

-              r32cab5b
+              rb2fe1c9
 // Created On       : Mon Oct 30 12:56:20 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed Mar 14 22:48:40 2018
 // Update Count     : 23
+// Last Modified On : Tue Jan  2 12:19:01 2018
+// Update Count     : 22
 //
 …
 int main() {
         DatingService TheExchange;
         Girl * girls[NoOfPairs];
         Boy  * boys[NoOfPairs];
+        Girl *girls[NoOfPairs];
+        Boy  *boys[NoOfPairs];
         srandom( /*getpid()*/ 103 );

src/tests/concurrent/preempt.c

-              r32cab5b
+              rb2fe1c9
 #include <kernel>
 #include <thread>
-#include <time>
 #ifndef PREEMPTION_RATE
 #define PREEMPTION_RATE 10`ms
+#define PREEMPTION_RATE 10_000ul
 #endif
 Duration default_preemption() {
+unsigned int default_preemption() {
         return PREEMPTION_RATE;
+}

src/tests/concurrent/signal/barge.c

-              r32cab5b
+              rb2fe1c9
 #ifndef PREEMPTION_RATE
 #define PREEMPTION_RATE 10`ms
+#define PREEMPTION_RATE 10_000ul
 #endif
 Duration default_preemption() {
+unsigned int default_preemption() {
         return 0;
+}

src/tests/concurrent/signal/block.c

-              r32cab5b
+              rb2fe1c9
 #include <stdlib>
 #include <thread>
+#include <time>
+#include <time.h>
 #ifdef LONG_TEST
 …
 #ifndef PREEMPTION_RATE
 #define PREEMPTION_RATE 10`ms
+#define PREEMPTION_RATE 10_000ul
 #endif
 Duration default_preemption() {
+unsigned int default_preemption() {
         return PREEMPTION_RATE;
+}
 …
 //------------------------------------------------------------------------------
 void wait_op( global_data_t & mutex a, global_data_t & mutex b, unsigned i ) {
     wait( cond, (uintptr_t)active_thread() );
+        wait( cond, (uintptr_t)this_thread );
         yield( random( 10 ) );
 …
+        }
         a.last_thread = b.last_thread = active_thread();
+        a.last_thread = b.last_thread = this_thread;
         yield( random( 10 ) );
 …
         yield( random( 10 ) );
         [a.last_thread, b.last_thread, a.last_signaller, b.last_signaller] = active_thread();
+        [a.last_thread, b.last_thread, a.last_signaller, b.last_signaller] = this_thread;
         if( !is_empty( cond ) ) {
 …
 //------------------------------------------------------------------------------
 void barge_op( global_data_t & mutex a ) {
         a.last_thread = active_thread();
+        a.last_thread = this_thread;
+}

src/tests/concurrent/signal/disjoint.c

-              r32cab5b
+              rb2fe1c9
 #include <monitor>
 #include <thread>
+#include <time>
+#include <time.h>
 #ifdef LONG_TEST
 …
 #ifndef PREEMPTION_RATE
 #define PREEMPTION_RATE 10`ms
+#define PREEMPTION_RATE 10_000ul
 #endif
 Duration default_preemption() {
+unsigned int default_preemption() {
         return PREEMPTION_RATE;
+}

src/tests/concurrent/signal/wait.c

-              r32cab5b
+              rb2fe1c9
 #include <stdlib>
 #include <thread>
+#include <time>
+#include <time.h>
 #ifdef LONG_TEST
 …
 #ifndef PREEMPTION_RATE
 #define PREEMPTION_RATE 10`ms
+#define PREEMPTION_RATE 10_000ul
 #endif
 Duration default_preemption() {
+unsigned int default_preemption() {
         return PREEMPTION_RATE;
+}

src/tests/concurrent/waitfor/simple.c

-              r32cab5b
+              rb2fe1c9
 #ifndef PREEMPTION_RATE
 #define PREEMPTION_RATE 10`ms
+#define PREEMPTION_RATE 10_000ul
 #endif
 Duration default_preemption() {
+unsigned int default_preemption() {
         return PREEMPTION_RATE;
+}

src/tests/coroutine/fibonacci.c

-              r32cab5b
+              rb2fe1c9
 // Created On       : Thu Jun  8 07:29:37 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Mar 22 22:45:44 2018
 // Update Count     : 15
+// Last Modified On : Tue Dec  5 22:27:54 2017
+// Update Count     : 14
 //
 …
 void ?{}( Fibonacci & fib ) with( fib ) { fn = 0; }
-// main automatically called on first resume
 void main( Fibonacci & fib ) with( fib ) {
         int fn1, fn2;                                                                           // retained between resumes
+        fn = 0;  fn1 = fn;                                                                      // 1st case
+        fn = 0; fn1 = fn;                                                                       // 1st case
         suspend();                                                                                      // restart last resume
+        fn = 1;  fn2 = fn1;  fn1 = fn;                                          // 2nd case
+        fn = 1; fn2 = fn1;  fn1 = fn;                                           // 2nd case
         suspend();                                                                                      // restart last resume
         for ( ;; ) {
                 fn = fn1 + fn2; fn2 = fn1;  fn1 = fn;                   // general case

src/tests/minmax.c

-              r32cab5b
+              rb2fe1c9
 // minmax.c --
 //
 // Author           : Peter A. Buhr
+// Author           : Richard C. Bilson
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Apr 10 17:29:09 2018
 // Update Count     : 50
+// Last Modified On : Mon Feb 29 23:45:16 2016
+// Update Count     : 49
 //

src/tests/operators.c

r32cab5b	rb2fe1c9
27	27	a(b);
28	28	a + b;
	29	struct accumulator ?+?; // why not, eh?
	30	a + b;
29	31	}
30	32

src/tests/preempt_longrun/create.c

-              r32cab5b
+              rb2fe1c9
 #ifndef PREEMPTION_RATE
 #define PREEMPTION_RATE 10`ms
+#define PREEMPTION_RATE 10_000ul
 #endif
 Duration default_preemption() {
+unsigned int default_preemption() {
         return PREEMPTION_RATE;
+}

src/tests/preempt_longrun/enter.c

-              r32cab5b
+              rb2fe1c9
 #ifndef PREEMPTION_RATE
 #define PREEMPTION_RATE 10`ms
+#define PREEMPTION_RATE 10_000ul
 #endif
 Duration default_preemption() {
+unsigned int default_preemption() {
         return PREEMPTION_RATE;
+}

src/tests/preempt_longrun/enter3.c

-              r32cab5b
+              rb2fe1c9
 #ifndef PREEMPTION_RATE
 #define PREEMPTION_RATE 10`ms
+#define PREEMPTION_RATE 10_000ul
 #endif
 Duration default_preemption() {
+unsigned int default_preemption() {
         return PREEMPTION_RATE;
+}

src/tests/preempt_longrun/processor.c

-              r32cab5b
+              rb2fe1c9
 #ifndef PREEMPTION_RATE
 #define PREEMPTION_RATE 10`ms
+#define PREEMPTION_RATE 10_000ul
 #endif
 Duration default_preemption() {
+unsigned int default_preemption() {
         return PREEMPTION_RATE;
+}

src/tests/preempt_longrun/stack.c

-              r32cab5b
+              rb2fe1c9
 #ifndef PREEMPTION_RATE
 #define PREEMPTION_RATE 10`ms
+#define PREEMPTION_RATE 10_000ul
 #endif
 Duration default_preemption() {
+unsigned int default_preemption() {
         return PREEMPTION_RATE;
+}

src/tests/preempt_longrun/yield.c

-              r32cab5b
+              rb2fe1c9
 #ifndef PREEMPTION_RATE
 #define PREEMPTION_RATE 10`ms
+#define PREEMPTION_RATE 10_000ul
 #endif
 Duration default_preemption() {
+unsigned int default_preemption() {
         return PREEMPTION_RATE;
+}

src/tests/references.c

-              r32cab5b
+              rb2fe1c9
 int main() {
         int x = 123456, x2 = 789, *p1 = &x, **p2 = &p1, ***p3 = &p2,
+        int x = 123456, *p1 = &x, **p2 = &p1, ***p3 = &p2,
                 &r1 = x,    &&r2 = r1,   &&&r3 = r2;
         ***p3 = 3;                          // change x
 …
         *p3 = &p1;                          // change p2
         int y = 0, z = 11, & ar[3] = { x, y, z };    // initialize array of references
-        // &ar[1] = &z;                        // change reference array element
-        // typeof( ar[1] ) p;                  // is int, i.e., the type of referenced object
-        // typeof( &ar[1] ) q;                 // is int &, i.e., the type of reference
-        // sizeof( ar[1] ) == sizeof( int );   // is true, i.e., the size of referenced object
-        // sizeof( &ar[1] ) == sizeof( int *); // is true, i.e., the size of a reference
-        ((int*&)&r3) = &x;                  // change r1, (&*)**r3
-        x = 3;
         // test that basic reference properties are true - r1 should be an alias for x
         printf("%d %d %d\n", x, r1, &x == &r1);
 …
         printf("%d %d\n", r1, x);
-        ((int&)r3) = 6;                       // change x, ***r3
-        printf("x = %d ; x2 = %d\n", x, x2);  // check that x was changed
-        ((int*&)&r3) = &x2;                   // change r1 to refer to x2, (&*)**r3
-        ((int&)r3) = 999;                     // modify x2
-        printf("x = %d ; x2 = %d\n", x, x2);  // check that x2 was changed
-        ((int**&)&&r3) = p2;                  // change r2, (&(&*)*)*r3
-        ((int&)r3) = 12345;                   // modify x
-        printf("x = %d ; x2 = %d\n", x, x2);  // check that x was changed
-        ((int***&)&&&r3) = p3;                // change r3 to p3, (&(&(&*)*)*)r3
-        ((int&)r3) = 22222;                   // modify x
-        printf("x = %d ; x2 = %d\n", x, x2);  // check that x was changed
         // test that reference members are not implicitly constructed/destructed/assigned
         X x1, x2 = x1;
 …
         &z1.r = &z1r;
         &z2.r = &z2r;
         z1 = z2;
-        // test rvalue-to-reference conversion
+        {
-                struct S { double x, y; };
-                void f( int & i, int & j, S & s, int v[] ) {
-                        printf("%d %d { %g, %g }, [%d, %d, %d]\n", i, j, s.[x, y], v[0], v[1], v[2]);
+                }
-                void g(int & i) { printf("%d\n", i); }
-                void h(int &&& i) { printf("%d\n", i); }
-                int &&& r = 3;  // rvalue to reference
-                int i = r;
-                printf("%d %d\n", i, r);  // both 3
-                g( 3 );          // rvalue to reference
-                h( (int &&&)3 ); // rvalue to reference
-                int a = 5, b = 4;
-                f( 3, a + b, (S){ 1.0, 7.0 }, (int [3]){ 1, 2, 3 } ); // two rvalue to reference
+        }
+}

src/tests/switch.c

-              r32cab5b
+              rb2fe1c9
 // Created On       : Tue Jul 12 06:50:22 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Mar  8 07:33:05 2018
 // Update Count     : 36
+// Last Modified On : Sat Aug 26 10:14:21 2017
+// Update Count     : 33
 //
 …
                 S s;
           case 19:
           case 'A'...'Z':
           case 0 ...6:                                                                          // space required, or lexed as decimal point
+          case 'A' ... 'Z':
+          case 0 ... 6:
           case 20, 30, 40:
                 i = 3;
 …
           case 8~10:
                 f( 3 );
                 fallthru;
+                fallthru
           case 'd':
                 j = 5;

tools/prettyprinter/Makefile.am

-              r32cab5b
+              rb2fe1c9
 ## Created On       : Wed Jun 28 12:07:10 2017
 ## Last Modified By : Peter A. Buhr
 ## Last Modified On : Mon Apr 16 09:43:23 2018
 ## Update Count     : 20
+## Last Modified On : Wed Jun 28 23:11:56 2017
+## Update Count     : 15
 ###############################################################################

tools/prettyprinter/lex.ll

-              r32cab5b
+              rb2fe1c9
  * Created On       : Sat Dec 15 11:45:59 2001
  * Last Modified By : Peter A. Buhr
  * Last Modified On : Sun Apr 15 21:28:33 2018
  * Update Count     : 271
+ * Last Modified On : Tue Aug 29 17:33:36 2017
+ * Update Count     : 268
  */
 …
 <INITIAL,C_CODE>"/*" {                                                                  // C style comments */
 #if defined(DEBUG_ALL) | defined(DEBUG_COMMENT)
                 cerr << "\"/*\" : " << yytext << endl;
+    cerr << "\"/*\" : " << yytext << endl;
 #endif
                 if ( YYSTATE == C_CODE ) code_str += yytext;
                 else comment_str += yytext;
                 yy_push_state(C_COMMENT);
+    if ( YYSTATE == C_CODE ) code_str += yytext;
+    else comment_str += yytext;
+    yy_push_state(C_COMMENT);
+}
 <C_COMMENT>(.|"\n")     {                                                                       // C style comments
 #if defined(DEBUG_ALL) | defined(DEBUG_COMMENT)
                 cerr << "<C_COMMENT>(.|\\n) : " << yytext << endl;
+    cerr << "<C_COMMENT>(.|\\n) : " << yytext << endl;
 #endif
                 if ( yy_top_state() == C_CODE ) code_str += yytext;
                 else comment_str += yytext;
+    if ( yy_top_state() == C_CODE ) code_str += yytext;
+    else comment_str += yytext;
+}
 <C_COMMENT>"*/" {                                                                               // C style comments
 …
 <C_CODE>"%}"    { RETURN_TOKEN( RCURL ) }
+^"%define"[^\n]*"\n" { RETURN_TOKEN( DEFINE ) }
+^"%expect"              { RETURN_TOKEN( EXPECT ) }
+^"%left"                { RETURN_TOKEN( LEFT ) }
+^"%locations"   { RETURN_TOKEN( LOCATIONS ) }
+^"%nonassoc"    { RETURN_TOKEN( NONASSOC ) }
+^"%precedence"  { RETURN_TOKEN( PRECEDENCE ) }
+^"%union"       { RETURN_TOKEN( UNION ) }
+^"%start"       { RETURN_TOKEN( START ) }
+^"%token"       { RETURN_TOKEN( TOKEN ) }
+^"%type"            { RETURN_TOKEN( TYPE ) }
+^"%left"            { RETURN_TOKEN( LEFT ) }
+^"%right"           { RETURN_TOKEN( RIGHT ) }
+^"%nonassoc"    { RETURN_TOKEN( NONASSOC ) }
+^"%precedence"  { RETURN_TOKEN( PRECEDENCE ) }
 ^"%pure_parser" { RETURN_TOKEN( PURE_PARSER ) }
-^"%right"               { RETURN_TOKEN( RIGHT ) }
 ^"%semantic_parser"     { RETURN_TOKEN( SEMANTIC_PARSER ) }
+^"%start"               { RETURN_TOKEN( START ) }
+^"%thong"               { RETURN_TOKEN( THONG ) }
+^"%token"               { RETURN_TOKEN( TOKEN ) }
+^"%type"                { RETURN_TOKEN( TYPE ) }
+^"%union"               { RETURN_TOKEN( UNION ) }
+^"%expect"      { RETURN_TOKEN( EXPECT ) }
+^"%thong"               { RETURN_TOKEN( THONG ) }
 "%prec"                 { RETURN_TOKEN( PREC ) }
+"%prec"                 { RETURN_TOKEN( PREC ) }
 {integer}               { RETURN_TOKEN( INTEGER ); }
 [']{c_char}[']  { RETURN_TOKEN( CHARACTER ); }
 {identifier}    { RETURN_TOKEN( IDENTIFIER ); }
+{integer}           { RETURN_TOKEN( INTEGER ); }
+[']{c_char}[']  { RETURN_TOKEN( CHARACTER ); }
+{identifier}    { RETURN_TOKEN( IDENTIFIER ); }
 <C_CODE>["]{s_char}*["] {                                                               // hide braces "{}" in strings
 …
 %%
 void lexC(void) {
         BEGIN(C_CODE);
+    BEGIN(C_CODE);
+}
 string lexYacc(void) {
         BEGIN(INITIAL);
         //cerr << "CODE: " << endl << code_str << endl;
         string temp( code_str );
         code_str = "";
         return temp;
+    BEGIN(INITIAL);
+    //cerr << "CODE: " << endl << code_str << endl;
+    string temp( code_str );
+    code_str = "";
+    return temp;
+}

tools/prettyprinter/parser.yy

-              r32cab5b
+              rb2fe1c9
 // Created On       : Sat Dec 15 13:44:21 2001
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sun Apr 15 21:40:30 2018
 // Update Count     : 1052
+// Last Modified On : Tue Aug 29 16:34:10 2017
+// Update Count     : 1047
 //
 …
 %token<tokenp>  CODE                                                                    // C code
+%token<tokenp>  DEFINE                                                                  // %define
+%token<tokenp>  EXPECT                                                                  // %expect
+%token<tokenp>  START                                                                   // %start
+%token<tokenp>  UNION                                                                   // %union
+%token<tokenp>  TOKEN                                                                   // %token
 %token<tokenp>  LEFT                                                                    // %left
 %token<tokenp>  LOCATIONS                                                               // %locations
+%token<tokenp>  RIGHT                                                                   // %right
 %token<tokenp>  NONASSOC                                                                // %nonassoc
 %token<tokenp>  PRECEDENCE                                                              // %precedence
+%token<tokenp>  TYPE                                                                    // %type
 %token<tokenp>  PURE_PARSER                                                             // %pure_parser
-%token<tokenp>  RIGHT                                                                   // %right
 %token<tokenp>  SEMANTIC_PARSER                                                 // %semantic_parser
 %token<tokenp>  START                                                                   // %start
+%token<tokenp>  EXPECT                                                                  // %expect
 %token<tokenp>  THONG                                                                   // %thong
-%token<tokenp>  TOKEN                                                                   // %token
-%token<tokenp>  TYPE                                                                    // %type
-%token<tokenp>  UNION                                                                   // %union
 %token<tokenp>  PREC                                                                    // %prec
 %token                  END_TERMINALS                                                   // ALL TERMINAL TOKEN NAMES MUST APPEAR BEFORE THIS
+%token          END_TERMINALS                                                           // ALL TERMINAL TOKEN NAMES MUST APPEAR BEFORE THIS
 %type<tokenp>   sections
 %token                  _SECTIONS
+%token          _SECTIONS
 %type<tokenp>   mark
 %type<tokenp>   defsection_opt
 %token                  _DEFSECTION_OPT
+%token          _DEFSECTION_OPT
 %type<tokenp>   declarations
 %type<tokenp>   literalblock
 %token                  _LITERALBLOCK
+%token          _LITERALBLOCK
 %type<tokenp>   declaration
 %token                  _DECLARATION
+%token          _DECLARATION
 %type<tokenp>   union
 %type<tokenp>   rword
 %type<tokenp>   tag_opt
 %token                  _TAG_OPT
+%token          _TAG_OPT
 %type<tokenp>   namenolist
 %token                  _NAMENOLIST
+%token          _NAMENOLIST
 %type<tokenp>   nameno
 %token                  _NAMENO
+%token          _NAMENO
 %type<tokenp>   namelist
 %token                  _NAMELIST
+%token          _NAMELIST
 %type<tokenp>   name
 %type<tokenp>   rulesection
 %token                  _RULESECTION
+%token          _RULESECTION
 %type<tokenp>   rules
 %token                  _RULE
+%token          _RULE
 %type<tokenp>   lhs
 %token                  _LHS
+%token          _LHS
 %type<tokenp>   rhs
 %token                  _RHS
+%token          _RHS
 %type<tokenp>   prod
 %type<tokenp>   prec
 %token                  _PREC
+%token          _PREC
 %type<tokenp>   action
 %token                  _ACTION
+%token          _ACTION
 %type<tokenp>   usersection_opt
 %token                  _USERSECTION_OPT
+%token          _USERSECTION_OPT
 %type<tokenp>   ccode_opt
 %type<tokenp>   blocks
 …
                     $$ = $1;
+                }
-        | DEFINE                                                                                        // bison
-        | LOCATIONS
         | THONG                                                                                         // bison
+        ;

tools/prettyprinter/test.y

-              r32cab5b
+              rb2fe1c9
 /* adsad2 */
+%locations
+%define parse.error verbose
 %%

Context Navigation

Changes in / [32cab5b:b2fe1c9]

Legend:

Download in other formats: