Diff [515a037b9b2f61287a165cdb63ddf64362990b9d:cdc02f28045dea7a293c384abb175ac0c5185dcc] for / – Cforall

benchmark/Makefile.am

-              r515a037
+              rcdc02f2
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
 ## Last Modified On : Tue Nov  6 09:01:23 2018
 ## Update Count     : 26
+## Last Modified On : Mon Jan 25 22:31:42 2016
+## Update Count     : 25
 ###############################################################################
 …
 compile-attributes$(EXEEXT):
         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
+        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.c
 compile-empty$(EXEEXT):

benchmark/Makefile.in

r515a037	rcdc02f2
879	879
880	880	compile-attributes$(EXEEXT):
881		$(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
	881	$(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.c
882	882
883	883	compile-empty$(EXEEXT):

benchmark/Monitor.c

r515a037	rcdc02f2
29	29	EndTime = Time();
30	30
31		sout \| ( EndTime - StartTime ) / N;
	31	sout \| ( EndTime - StartTime ) / N \| endl;
32	32	}

doc/bibliography/pl.bib

-              r515a037
+              rcdc02f2
 %  toplas: ACM Trans. on Prog. Lang. & Sys.
 %  tcs: Theoretical Computer Science
+string{ieeepds="IEEE Transactions on Parallel and Distributed Systems"}
+@string{ieeepds="IEEE Trans. Parallel Distrib. Syst."}
+string{ieeese="IEEE Transactions on Software Engineering"}
+@string{ieeese="IEEE Trans. Softw. Eng."}
+string{spe="Software---\-Practice and Experience"}
+@string{spe="Softw. Pract. Exper."}
+string{ccpe="Concurrency and Computation: Practice and Experience"}
+@string{ccpe="Concurrency Comput.: Pract. Exper."}
+string{sigplan="SIGPLAN Notices"}
+@string{sigplan="SIGPLAN Not."}
+string{joop="Journal of Object-Oriented Programming"}
+@string{joop="J. of Object-Oriented Program."}
+@string{ieeepds="IEEE Transactions on Parallel and Distributed Systems"}
+% @string{ieeepds="IEEE Trans. Parallel Distrib. Syst."}
+@string{ieeese="IEEE Transactions on Software Engineering"}
+% @string{ieeese="IEEE Trans. Softw. Eng."}
+@string{spe="Software---\-Practice and Experience"}
+% @string{spe="Softw. Pract. Exp."}
+@string{ccpe="Concurrency and Computation: Practice and Experience"}
+% @string{ccpe="Concurrency Comput: Pract Experience"}
+@string{sigplan="SIGPLAN Notices"}
+% @string{sigplan="SIGPLAN Not."}
+@string{joop="Journal of Object-Oriented Programming"}
+% @string{joop="J. of Object-Oriented Program."}
 @string{popl="Conference Record of the ACM Symposium on Principles of Programming Languages"}
 @string{osr="Operating Systems Review"}
 @string{pldi="Programming Language Design and Implementation"}
 @string{toplas="Transactions on Programming Languages and Systems"}
 string{mathann="Mathematische Annalen"}
 @string{mathann="Math. Ann."}
+@string{mathann="Mathematische Annalen"}
+% @string{mathann="Math. Ann."}
 % A
 …
+}
-@inproceedings {Qin18,
-    author      = {Henry Qin and Qian Li and Jacqueline Speiser and Peter Kraft and John Ousterhout},
-    title       = {Arachne: Core-Aware Thread Management},
-    booktitle   = {13th {USENIX} Symp. on Oper. Sys. Design and Impl. ({OSDI} 18)},
-    year        = {2018},
-    address     = {Carlsbad, CA},
-    pages       = {145-160},
-    publisher   = {{USENIX} Association},
-    note        = {\href{https://www.usenix.org/conference/osdi18/presentation/qin}{https://\-www.usenix.org/\-conference/\-osdi18/\-presentation/\-qin}},
+}
 @article{Kessels82,
     keywords    = {concurrency, critical section},
 …
     author      = {Joung, Yuh-Jzer},
     title       = {Asynchronous group mutual exclusion},
+    journal     = {Dist. Comput.},
+    optjournal  = {Distributed Computing},
+    journal     = {Distributed Computing},
     year        = {2000},
     month       = {Nov},
 …
         time computable inheritance hierarchy.
     },
     comment     = {
+    comment = {
         Classes are predicates; if object {\tt o} is in class {\tt C}, then
         {\tt C} is true of {\tt o}.  Classes are combined with {\tt :AND},
 …
 @article{Moss18,
     keywords    = {type systems, polymorphism, tuples, Cforall},
+    keywords    = {type systems, tuples, Cforall},
     contributer = {pabuhr@plg},
     author      = {Aaron Moss and Robert Schluntz and Peter A. Buhr},
     title       = {\textsf{C}$\mathbf{\forall}$ : Adding Modern Programming Language Features to C},
+    year        = 2018,
+    month       = aug,
     journal     = spe,
-    volume      = 48,
-    number      = 12,
-    month       = dec,
-    year        = 2018,
-    pages       = {2111-2146},
     note        = {\href{http://dx.doi.org/10.1002/spe.2624}{http://\-dx.doi.org/\-10.1002/\-spe.2624}},
+}
 …
     journal     = {Dr. Dobb's Journal of Software Tools},
     year        = 1989,
+    month       = feb,
+    volume      = 14,
+    number      = 2,
+    pages       = {45-51},
+    month       = feb, volume = 14, number = 2, pages = {45-51},
     comment     = {
        A light-weight multitasking kernel for MS-DOS.  A task\_control
 …
+}
 @manual{uC++,
+@techreport{uC++,
     keywords    = {C++, concurrency, light-weight process, shared memory},
     contributer = {pabuhr@plg},
-    key         = {uC++},
     author      = {Peter A. Buhr},
     title       = {$\mu${C}{\kern-.1em\hbox{\large\texttt{+\kern-.25em+}}} Annotated Reference Manual, Version 7.0.0},
+    organization= {University of Waterloo},
+    month       = sep,
+    year        = 2018,
+    institution = {School of Computer Science, University of Waterloo},
+    address     = {Waterloo, Ontario, Canada, N2L 3G1},
+    month       = dec,
+    year        = 2017,
     note        = {\href{https://plg.uwaterloo.ca/~usystem/pub/uSystem/uC++.pdf}{https://\-plg.uwaterloo.ca/\-$\sim$usystem/\-pub/\-uSystem/uC++.pdf}},
+}
 …
     author      = {Sun, Xianda},
     title       = {Concurrent High-performance Persistent Hash Table In {J}ava},
     school      = {School of Computer Sc., University of Waterloo},
+    school      = {School of Computer Science, University of Waterloo},
     year        = 2015,
     optaddress  = {Waterloo, Ontario, Canada, N2L 3G1},
 …
     note        = {Svensk Standard SS 63 61 14},
     year        = 1987,
+    abstract    = {Standard for the programming language SIMULA. Written in English.}
+}
+@article{Galil91,
+    keywords    = {union-find},
+    contributer = {a3moss@uwaterloo.ca},
+    title       = {Data structures and algorithms for disjoint set union problems},
+    author      = {Galil, Zvi and Italiano, Giuseppe F},
+    journal     = {ACM Computing Surveys (CSUR)},
+    volume      = 23,
+    number      = 3,
+    pages       = {319--344},
+    year        = 1991,
+    publisher   = {ACM},
+    abstract    = {
+        Standard for the programming language SIMULA.  Written in English.
+    }
+}
 …
     year        = {1998},
     pages       = {393-407},
+}
-@book{Aho74,
-    keywords    = {algorithms, textbook, union-find},
-    contributer = {a3moss@uwaterloo.ca},
-    title       = {The Design and Analysis of Computer Algorithms},
-    author      = {Aho, Alfred V and Hopcroft, John E and Ullman, Jeffrey D},
-    year        = {1974},
-    publisher   = {Addison-Wesley},
-    address     = {Reading, MA, USA}
+}
 …
+}
-@inproceedings{Patwary10,
-    keywords    = {union-find},
-    contributer = {a3moss@uwaterloo.ca},
-    author      = {Patwary, Md. Mostofa Ali and Blair, Jean and Manne, Fredrik},
-    editor      = {Festa, Paola},
-    title       = {Experiments on Union-Find Algorithms for the Disjoint-Set Data Structure},
-    booktitle   = {Experimental Algorithms},
-    year        = 2010,
-    publisher   = {Springer Berlin Heidelberg},
-    address     = {Berlin, Heidelberg},
-    pages       = {411--423},
-    isbn        = {978-3-642-13193-6}
+}
 % F
 …
     keywords    = {Go programming language},
     contributer = {pabuhr@plg},
+    title       = {{Go} Programming Language},
     author      = {Robert Griesemer and Rob Pike and Ken Thompson},
-    title       = {{Go} Programming Language},
     organization= {Google},
     year        = 2009,
 …
     month       = sep,
     publisher   = {John Wiley \& Sons},
     note        = {\href{https://doi.org/10.1002/cpe.4475}{https://\-doi.org/\-10.1002/\-cpe.4475}},
+    note        = {\href{https://doi-org.proxy.lib.uwaterloo.ca/10.1002/cpe.4475}{https://\-doi-org.proxy.lib.uwaterloo.ca/\-10.1002/\-cpe.4475}},
+}
 …
     publisher   = {ACM Press},
     address     = {New York, NY, USA},
+}
-@article{Galler64,
-    keywords    = {union-find, original},
-    contributer = {a3moss@uwaterloo.ca},
-    title       = {An improved equivalence algorithm},
-    author      = {Galler, Bernard A and Fisher, Michael J},
-    journal     = {Communications of the ACM},
-    volume      = {7},
-    number      = {5},
-    pages       = {301--303},
-    year        = {1964},
-    publisher   = {ACM}
+}
 …
     author      = {Peter A. Buhr and Martin Karsten and Jun Shih},
     title       = {{\small\textsf{KDB}}: A Multi-threaded Debugger for Multi-threaded Applications},
     booktitle   = {Proc. of SPDT'96: SIGMETRICS Symp. on Parallel and Distributed Tools},
+    booktitle   = {Proceedings of SPDT'96: SIGMETRICS Symposium on Parallel and Distributed Tools},
     publisher   = {ACM Press},
     address     = {Philadelphia, Pennsylvania, U.S.A.},
 …
+}
-@inproceedings{Conchon07,
-    keywords    = {persistent array, union-find},
-    contributer = {a3moss@uwaterloo.ca},
-    title       = {A persistent union-find data structure},
-    author      = {Conchon, Sylvain and Filli{\^a}tre, Jean-Christophe},
-    booktitle   = {Proceedings of the 2007 workshop on Workshop on ML},
-    pages       = {37--46},
-    year        = {2007},
-    organization= {ACM}
+}
 @article{poly,
     keywords    = {Poly, Standard ML, Russell, persistence},
 …
     author      = {Peter A. Buhr and Robert Denda},
     title       = {{$\mu$Profiler} : Profiling User-Level Threads in a Shared-Memory Programming Environment},
     booktitle   = {Proc. of 2nd Inter. Symp. on Computing in Object-Oriented Parallel Environments},
+    booktitle   = {Proceedings of the Second International Symposium on Computing in Object-Oriented Parallel Environments (ISCOPE'98)},
     series      = {Lecture Notes in Computer Science},
     publisher   = {Springer-Verlag},
 …
     issn        = {0164-0925},
     pages       = {429-475},
     url         = {http://doi.acm.org/10.1145/1133651.1133653},
+    url         = {http://doi.acm.org.proxy.lib.uwaterloo.ca/10.1145/1133651.1133653},
     doi         = {10.1145/1133651.1133653},
     acmid       = {1133653},
 …
     contributer = {pabuhr@plg},
     key         = {Rust},
     title       = {{R}ust Programming Language},
     optaddress  = {Rust Project Developers},
+    title       = {The {R}ust Programming Language},
+    address     = {The Rust Project Developers},
     year        = 2015,
     note        = {\href{https://doc.rust-lang.org/reference.html}{https://\-doc.rust-lang\-.org/\-reference.html}},
 …
     publisher   = {Springer},
     note        = {Lecture Notes in Computer Science v. 173},
+}
-@article{Baker78,
-    keywords    = {Algol display, FUNARG's, Lisp 1.5, deep binding, environment trees, multiprogramming, shallow binding},
-    contributer = {a3moss@uwaterloo.ca},
-    author      = {Baker,Jr., Henry G.},
-    title       = {Shallow Binding in Lisp 1.5},
-    journal     = {Commun. ACM},
-    issue_date  = {July 1978},
-    volume      = 21,
-    number      = 7,
-    month       = jul,
-    year        = 1978,
-    issn        = {0001-0782},
-    pages       = {565--569},
-    numpages    = {5},
-    url         = {http://doi.acm.org/10.1145/359545.359566},
-    doi         = {10.1145/359545.359566},
-    acmid       = {359566},
-    publisher   = {ACM},
-    address     = {New York, NY, USA}
+}
-@article{Baker91,
-    keywords    = {shallow binding, functional arrays},
-    contributer = {a3moss@uwaterloo.ca},
-    author      = {Baker, Henry G.},
-    title       = {Shallow Binding Makes Functional Arrays Fast},
-    journal     = {SIGPLAN Not.},
-    issue_date  = {Aug. 1991},
-    volume      = 26,
-    number      = 8,
-    month       = aug,
-    year        = 1991,
-    issn        = {0362-1340},
-    pages       = {145--147},
-    numpages    = {3},
-    url         = {http://doi.acm.org/10.1145/122598.122614},
-    doi         = {10.1145/122598.122614},
-    acmid       = {122614},
-    publisher   = {ACM},
-    address     = {New York, NY, USA},
+}
 …
+}
-@article{Tarjan84,
-    keywords    = {union-find},
-    contributer = {a3moss@uwaterloo.ca},
-    author      = {Tarjan, Robert E. and van Leeuwen, Jan},
-    title       = {Worst-case Analysis of Set Union Algorithms},
-    journal     = {J. ACM},
-    issue_date  = {April 1984},
-    volume      = 31,
-    number      = 2,
-    month       = mar,
-    year        = 1984,
-    issn        = {0004-5411},
-    pages       = {245--281},
-    numpages    = {37},
-    url         = {http://doi.acm.org/10.1145/62.2160},
-    doi         = {10.1145/62.2160},
-    acmid       = {2160},
-    publisher   = {ACM},
-    address     = {New York, NY, USA},
+}
 % X

doc/papers/concurrency/Paper.tex

-              r515a037
+              rcdc02f2
         Fib f1, f2;
         for ( int i = 1; i <= 10; i += 1 ) {
                 sout | next( f1 ) | next( f2 );
+                sout | next( f1 ) | next( f2 ) | endl;
+        }
+}
 …
                         sout | "  ";               // separator
+                }
                 sout | nl;
+                sout | endl;
+        }
+}
 void ?{}( Format & fmt ) { `resume( fmt );` }
 void ^?{}( Format & fmt ) with( fmt ) {
         if ( g != 0 || b != 0 ) sout | nl;
+        if ( g != 0 || b != 0 ) sout | endl;
+}
 void format( Format & fmt ) {
 …
         for ( int i = 0; i < N; i += 1 ) {
                 int p1 = random( 100 ), p2 = random( 100 );
                 sout | p1 | " " | p2;
+                sout | p1 | " " | p2 | endl;
                 int status = delivery( c, p1, p2 );
                 sout | " $" | money | nl | status;
+                sout | " $" | money | endl | status | endl;
                 receipt += 1;
+        }
         stop( c );
         sout | "prod stops";
+        sout | "prod stops" | endl;
+}
 int payment( Prod & prod, int money ) {
 …
         int money = 1, receipt;
         for ( ; ! done; ) {
                 sout | p1 | " " | p2 | nl | " $" | money;
+                sout | p1 | " " | p2 | endl | " $" | money | endl;
                 status += 1;
                 receipt = payment( p, money );
                 sout | " #" | receipt;
+                sout | " #" | receipt | endl;
                 money += 1;
+        }
         sout | "cons stops";
+        sout | "cons stops" | endl;
+}
 int delivery( Cons & cons, int p1, int p2 ) {
 …
 void main(foo & this) {
         sout | "Hello World!";
+        sout | "Hello World!" | endl;
+}
 \end{cfa}
 …
 void hello(/*unused*/ int) {
         sout | "Hello World!";
+        sout | "Hello World!" | endl;
+}
 …
 thread World {};
 void main( World & this ) {
         sout | "World!";
+        sout | "World!" | endl;
+}
 int main() {
         World w`[10]`;                                                  $\C{// implicit forks after creation}$
         sout | "Hello ";                                        $\C{// "Hello " and 10 "World!" printed concurrently}$
+        sout | "Hello " | endl;                                 $\C{// "Hello " and 10 "World!" printed concurrently}$
 }                                                                                       $\C{// implicit joins before destruction}$
 \end{cfa}
 …
                 total += subtotals[r];                          $\C{// total subtotal}$
+    }
     sout | total;
+    sout | total | endl;
+}
 \end{cfa}
 …
         BENCH(
                 for ( size_t i = 0; i < N; i += 1 ) { @resume( c );@ } )
         sout | result`ns;
+        sout | result`ns | endl;
+}
 \end{cfa}
 …
         BENCH(
                 for ( size_t i = 0; i < N; i += 1 ) { @yield();@ } )
         sout | result`ns;
+        sout | result`ns | endl;
+}
 \end{cfa}
 …
 int main() {
         BENCH( for( size_t i = 0; i < N; i += 1 ) { @do_call( m1/*, m2, m3, m4*/ );@ } )
         sout | result`ns;
+        sout | result`ns | endl;
+}
 \end{cfa}
 …
         BENCH( for ( size_t i = 0; i < N; i += 1 ) { @wait( c );@ } );
         go = 0; // stop other thread
         sout | result`ns;
+        sout | result`ns | endl;
+}
 int main() {
 …
         BENCH( for ( size_t i = 0; i < N; i += 1 ) { @waitfor( do_call, m );@ } )
         go = 0; // stop other thread
         sout | result`ns;
+        sout | result`ns | endl;
+}
 int main() {
 …
 int main() {
         BENCH( for ( size_t i = 0; i < N; i += 1 ) { @MyThread m;@ } )
         sout | result`ns;
+        sout | result`ns | endl;
+}
 \end{cfa}

doc/proposals/flags.md

-              r515a037
+              rcdc02f2
         ```
         FunFlags f = some_val();
         if ( f ) { sout | "f has some flag(s) set"; }
         if ( f & FOO ) { sout | "f has FOO set"; }
+        if ( f ) { sout | "f has some flag(s) set" | endl; }
+        if ( f & FOO ) { sout | "f has FOO set" | endl; }
         f |= FOO; // set FOO
         f -= FOO; // unset FOO
 …
         ```
         FunFlags f = some_val();
         if ( f.FOO ) { sout | "f has FOO set"; }
+        if ( f.FOO ) { sout | "f has FOO set" | endl; }
         f.FOO = true;    // set FOO
         f.FOO = false;   // unset FOO

doc/theses/aaron_moss_PhD/phd/thesis.tex

-              r515a037
+              rcdc02f2
 % \usepackage[pdftex]{graphicx} % For including graphics N.B. pdftex graphics driver
 \usepackage{graphicx}
-\usepackage{amsthm} % for theorem environment
-\newtheorem{theorem}{Theorem}
 \usepackage{footmisc} % for double refs to the same footnote

doc/theses/aaron_moss_PhD/phd/type-environment.tex

-              r515a037
+              rcdc02f2
 As discussed in Chapter~\ref{resolution-chap}, being able to efficiently determine which type variables are bound to which concrete types or whether two type environments are compatible is a core requirement of the resolution algorithm.
 Furthermore, expression resolution involves a search through many related possible solutions, so being able to re-use shared subsets of type environment data and to switch between environments quickly is desirable for performance.
 In this chapter I discuss and empirically compare a number of type environment data structure variants, including some novel variations on the union-find\cite{Galler64} data structure introduced in this thesis.
+In this chapter I discuss and empirically compare a number of type environment data structure variants, including some novel variations on the union-find\cit{} data structure introduced in this thesis.
 \section{Definitions} \label{env-defn-sec}
+\section{Definitions}
 For purposes of this chapter, a \emph{type environment} $T$ is a set of \emph{type classes} $\myset{T_1, T_2, \cdots, T_{|T|}}$.
 …
         $add(T_i, v_{i,j})$ &                                                           & Add variable to class                 \\
         $bind(T_i, b_i)$ &                                                                      & Set or update class bound             \\
+        $remove(T, T_i)$ &                                                                      & Remove class from environment \\
         $unify(T, T_i, T_j)$ & $\rightarrow \top | \bot$        & Combine two type classes              \\
-        $split(T, T_i)$ & $\rightarrow T'$                                      & Revert the last $unify$ operation on $T_i$            \\
         $combine(T, T')$ & $\rightarrow \top | \bot$            & Merge two environments                \\
         $save(T)$ & $\rightarrow H$                                                     & Get handle for current state  \\
 …
 The $add(T_i, v_{i,j})$ operation adds a new type variable $v_{i,j}$ to class $T_i$; again, $v_{i,j}$ cannot exist elsewhere in $T$.
 $bind(T_i, b_i)$ mutates the bound for a type class, setting or updating the current bound.
+The final basic mutation operation is $remove(T, T_i)$, which removes a class $T_i$ and all its type variables from an environment $T$.
 The $unify$ operation is the fundamental non-trivial operation a type environment data structure must support.
 $unify(T, T_i, T_j)$ merges a type class $T_j$ into another $T_i$, producing a failure result and leaving $T$ in an invalid state if this merge fails.
 It is always possible to unify the type variables of both classes by simply taking the union of both sets; given the disjointness property, no checks for set containment are required, and the variable sets can simply be concatenated if supported by the underlying data structure.
 $unify$ depends on an internal $unifyBound$ operation which may fail.
 In \CFACC{}, $unifyBound(b_i, b_j) \rightarrow b'_i|\bot$ checks that the type classes contain the same sort of variable, takes the tighter of the two conversion permissions, and checks if the bound types can be unified.
 If the bound types cannot be unified (\eg{} !struct A! with !int*!), then $unifyBound$ fails, while other combinations of bound types may result in recursive calls.
 For instance, unifying !R*! with !S*! for type variables !R! and !S! will result in a call to $unify(T, find($!R!$), find($!S!$))$, while unifying !R*! with !int*! will result in a call to $unifyBound$ on !int! and the bound type of the class containing !R!.
+$unify$ depends on an internal $unify_bound$ operation which may fail.
+In \CFACC{}, $unify_bound(b_i, b_j) \rightarrow b'_i|\bot$ checks that the type classes contain the same sort of variable, takes the tighter of the two conversion permissions, and checks if the bound types can be unified.
+If the bound types cannot be unified (\eg{} !struct A! with !int*!), then $unify_bound$ fails, while other combinations of bound types may result in recursive calls.
+For instance, unifying !R*! with !S*! for type variables !R! and !S! will result in a call to $unify(T, find($!R!$), find($!S!$))$, while unifying !R*! with !int*! will result in a call to $unify_bound$ on !int! and the bound type of the class containing !R!.
 As such, a call to $unify(T, T_i, T_j)$ may touch every type class in $T$, not just $T_i$ and $T_j$, collapsing the entirety of $T$ into a single type class in extreme cases.
-For more information on \CFA{} unification, see \cite{Bilson03}.
-The inverse of $unify$ is $split(T, T_i)$, which produces a new environment $T'$ which is the same as $T$ except that $T_i$ has been replaced by two classes corresponding to the arguments to the previous call to $unify$ on $T_i$.
-If there has been no call to $unify$ on $T_i$ (\ie{} $T_i$ is a single-element class) $T_i$ is absent in $T'$.
 Given the nature of the expression resolution problem as backtracking search, caching and concurrency are both useful tools to decrease runtime.
 …
 The invalid state of $T$ on failure is not important, given that a combination failure will result in the resolution algorithm backtracking to a different environment.
 $combine$ proceeds by calls to $insert$, $add$, and $unify$ as needed, and can be roughly thought of as calling $unify$ on every pair of classes in $T$ that have variables $v'_{i,j}$ and $v'_{i,k}$ in the same class $T'_i$ in $T'$.
 Like $unify$, $combine$ can always find a mutually-consistent partition of type variables into classes (in the extreme case, all type variables from $T$ and $T'$ in a single type class), but may fail due to inconsistent bounds on merged type classes.
+Like for $unify$, $combine$ can always find a mutually-consistent division of type variables into classes (in the extreme case, all type variables from $T$ and $T'$ in a single type class), but may fail due to inconsistent bounds on merged type classes.
 Finally, the backtracking access patterns of the compiler can be exploited to reduce memory usage or runtime through use of an appropriately designed data structure.
 The set of mutations to a type environment across the execution of the resolution algorithm produce an implicit tree of related environments, and the backtracking search typically focuses only on one leaf of the tree at once, or at most a small number of closely-related nodes as arguments to $combine$.
 As such, the ability to save and restore particular type environment states is useful, and supported by the $save(T) \rightarrow H$ and $backtrack(T, H)$ operations, which produce a handle for the current environment state and mutate an environment back to a previous state, respectively.
+These operations can be naively implemented by a deep copy of $T$ into $H$ and vice versa, but have more efficient implementations in persistency-aware data structures.
+\section{Approaches}
+\subsection{Na\"{\i}ve}
+The type environment data structure used in Bilson's\cite{Bilson03} original implementation of \CFACC{} is a straightforward translation of the definitions in Section~\ref{env-defn-sec} to \CC{} code; a !TypeEnvironment! contains a list of !EqvClass! type equivalence classes, each of which contains the type bound information and a tree-based sorted set of type variables.
+This approach has the benefit of being easy to understand and not imposing life-cycle or inheritance constraints on its use, but, as can be seen in Table~\ref{env-bounds-table}, does not support many of the desired operations with any particular efficiency.
+Some variations on this structure may improve performance somewhat; for instance, replacing the !EqvClass! variable storage with a hash-based set would reduce search and update times from $O(\log n)$ to amortized $O(1)$, while adding an index for the type variables in the entire environment would remove the need to check each type class individually to maintain the disjointness property.
+These improvements do not change the fundamental issues with this data structure, however.
+\subsection{Incremental Inheritance}
+One more invasive modification to this data structure which I investigated is to support swifter combinations of closely-related environments in the backtracking tree by storing a reference to a \emph{parent} environment within each environment, and having that environment only store type classes which have been modified with respect to the parent.
+This approach provides constant-time copying of environments, as a new environment simply consists of an empty list of type classes and a reference to its (logically identical) parent; since many type environments are no different than their parent, this speeds backtracking in this common case.
+Since all mutations made to a child environment are by definition compatible with the parent environment, two descendants of a common ancestor environment can be combined by iteratively combining the changes made in one environment then that environment's parent until the common ancestor is reached, again re-using storage and reducing computation in many cases.
+For this environment I also employed a lazily-generated index of type variables to their containing class, which could be in either the current environment or an ancestor.
+Any mutation of a type class in an ancestor environment would cause that class to be copied into the current environment before mutation, as well as added to the index, ensuring that all local changes to the type environment are listed in its index.
+However, not adding type variables to the index until lookup or mutation preserves the constant-time environment copy operation in the common case in which the copy is not mutated from its parent during its life-cycle.
+This approach imposes some performance penalty on $combine$ if related environments are not properly linked together, as the entire environment needs to be combined rather than just the diff, but is correct as long as the ``null parent'' base case is properly handled.
+The life-cycle issues are somewhat more complex, as many environments may descend from a common parent, and all of these need their parent to stay alive for purposes of lookup.
+These issues can be solved by ``flattening'' parent nodes into their children before the parents leave scope, but given the tree structure of the inheritance graph it is more straightforward to store the parent nodes in reference-counted or otherwise automatically garbage-collected heap storage.
+\subsection{Union-Find} \label{env-union-find-approach}
+Given the nature of the classes of type variables as disjoint sets, another natural approach to implementing a type environment is the union-find disjoint set data structure\cite{Galler64}.
+Union-find efficiently implements two operations over a partition of a collection of elements into disjoint sets; $find(x)$ locates the \emph{representative} of $x$, the element which canonically names its set, while $union(r, s)$ merges two sets represented by $r$ and $s$, respectively.
+The union-find data structure is based on providing each element with a reference to its parent element, such that the root of a tree of elements is the representative of the set of elements contained in the tree.
+$find$ is then implemented by a search up to the parent, generally combined with a \emph{path compression} step that links nodes more directly to their ancestors to speed up subsequent searches.
+$union$ involves making the representative of one set a child of the representative of the other, generally employing a rank- or size-based heuristic to ensure that the tree remains somewhat balanced.
+If both path compression and a balancing heuristic are employed, both $union$ and $find$ run in amortized $O(\alpha(n))$ worst-case time; this bound by the inverse Ackermann function is a small constant for all practical values of $n$.
+The union-find $find$ and $union$ operations have obvious applicability to the $find$ and $unify$ type environment operations in Table~\ref{env-op-table}, but the union-find data structure must be augmented to fully implement the type environment operations.
+In particular, the type class bound cannot be easily included in the union-find data structure, as the requirement to make it the class representative breaks the balancing properties of $union$, and requires too-close integration of the type environment $unifyBound$ internal operation.
+This issue can be solved by including a side map from class representatives to the type class bound.
+If placeholder values are inserted in this map for type classes without bounds than this also has the useful property that the key set of the map provides an easily obtainable list of all the class representatives, a list which cannot be derived from the union-find data structure without a linear search for class representatives through all elements.
+\subsection{Union-Find with Classes} \label{env-union-find-classes-approach}
+Another type environment operation not supported directly by the union-find data structure is $report$, which lists the type variables in a given class, and similarly $split$, which reverts a $unify$ operation.
+Since the union-find data structure stores only links from children to parents and not vice-versa, there is no way to reconstruct a class from one of its elements without a linear search over the entire data structure, with $find$ called on each element to check its membership in the class.
+The situation is even worse for the $split$ operation, which would require extra information to maintain the order that each child was added to its parent node.
+Unfortunately, the literature\cite{Tarjan84,Galil91,Patwary10} on union-find does not present a way to keep references to children without breaking the asymptotic time bounds of the algorithm; I have discovered a method to do so which, despite its simplicity, seems to be novel.
+\TODO{port figure from slideshow}
+The core idea of this ``union-find with classes'' data structure and algorithm is to keep the members of each class stored in a circularly-linked list.
+Aho, Hopcroft, and Ullman also include a circularly-linked list in their 1974 textbook~\cite{Aho74}.
+However, the algorithm presented by Aho~\etal{} has an entirely flat class hierarchy, where all elements are direct children of the representative, giving constant-time $find$ at the cost of linear-time $union$ operations.
+In my version, the list data structure does not affect the layout of the union-find tree, maintaining the same asymptotic bounds as union-find.
+In more detail, each element is given a !next! pointer to another element in the same class; this !next! pointer initially points to the element itself.
+When two classes are unified, the !next! pointers of the representatives of those classes are swapped, splicing the two circularly-linked lists together.
+Importantly, though this approach requires an extra pointer per element, it does maintain the linear space bound of union-find, and because it only requires updating the two root nodes in $union$ it does not asymptotically increase runtime either.
+The basic approach is compatible with all path-compression techniques, and allows the members of any class to be retrieved in time linear in the size of the class simply by following the !next! pointers from any element.
+If the path-compression optimization is abandoned, union-find with classes also encodes a reversible history of all the $union$ operations applied to a given class.
+Theorem~\ref{env-reverse-thm} demonstrates that the !next! pointer of the representative of a class always points to a leaf from the last-added subtree.
+This property is sufficient to reverse the most-recent $union$ operation by finding the ancestor of that leaf that is an immediate child of the representative, breaking its parent link, and swapping the !next! pointers back\footnote{Union-by-size may be a more appropriate approach than union-by-rank in this instance, as adding two known sizes is a reversible operation, but the rank increment operation cannot be reliably reversed.}.
+Once the $union$ operation has been reversed, Theorem~\ref{env-reverse-thm} still holds for the reduced class, and the process can be repeated recursively until the entire set is split into its component elements.
+\begin{theorem} \label{env-reverse-thm}
+The !next! pointer of a class representative in the union-find with classes algorithm without path compression points to a leaf from the most-recently-added subtree.
+\end{theorem}
+\begin{proof}
+        By induction on the height of the tree. \\
+        \emph{Base case:} A height 1 tree by definition includes only a single item. In such a case, the representative's !next! pointer points to itself by construction, and the representative is the most-recently-added (and only) leaf in the tree. \\
+        \emph{Inductive case:} By construction, a tree $T$ of height greater than 1 has children of the root (representative) node that were representative nodes of classes merged by $union$. By definition, the most-recently-added subtree $T'$ has a smaller height than $T$, thus by the inductive hypothesis before the most-recent $union$ operation the !next! pointer of the root of $T'$ pointed to one of the leaf nodes of $T'$; by construction the !next! pointer of the root of $T$ points to this leaf after the $union$ operation.
+\end{proof}
+On its own, union-find, like the na\"{\i}ve approach, has no special constraints on life-cycle or inheritance, but it can be used as a building block in more sophisticated type environment data structures.
+\subsection{Persistent Union-Find}
+Given the backtracking nature of the resolution algorithm discussed in Section~\ref{env-defn-sec}, the abilities to quickly switch between related versions of a type environment and to de-duplicate shared data between environments are both assets to performance.
+Conchon and Filli\^{a}tre~\cite{Conchon07} present a persistent union-find data structure based on the persistent array of Baker~\cite{Baker78,Baker91}.
+\TODO{port figure from slideshow}
+In Baker's persistent array, an array reference contains either a pointer to the array or a pointer to an \emph{edit node}; these edit nodes contain an array index, the value in that index, and another array reference pointing either to the array or a different edit node.
+In this manner, a tree of edits is formed, rooted at the actual array.
+Read from the actual array at the root can be performed in constant time, as with a non-persistent array.
+The persistent array can be mutated in constant time by directly modifying the underlying array, then replacing its array reference with an edit node containing the mutated index, the previous value at that index, and a reference to the mutated array. If the current array reference is not the root, mutation consists simply of constructing a new edit node encoding the change and referring to the current array reference.
+The mutation algorithm at the root is in some sense a special case of the key operation on persistent arrays, $reroot$.
+A rerooting operation takes any array reference and makes it the root node of the array.
+This is accomplished by tracing the path from some edit node to the root node of the array (always the underlying array), recursively applying the edits to the underlying array and replacing each edit node's successor with the inverse edit.
+In this way, any previous state of the persistent array can be restored in time proportional to the number of edits to the current state of the array.
+While $reroot$ does maintain the same value mapping in every version of the persistent array, the internal mutations it performs means that it is not thread-safe, and must be used behind a lock in a concurrent context.
+Also, the root node with the actual array may in principle be anywhere in the tree, and does not provide information to report its leaf nodes, so some form of automatic garbage collection is generally required for the data structure.
+Since the graph of edit nodes is tree-structured, reference counting approaches suffice for garbage collection; Conchon and Filli\^{a}tre~\cite{Conchon07} also observe that if the only $reroot$ operations are for backtracking then the tail of inverse edit nodes may be elided, suggesting the possibility of stack-based memory management.
+While Conchon and Filli\^{a}tre~\cite{Conchon07} implement their persistent union-find data structure over a universe of integer elements in the fixed range $[1,N]$, the type environment problem needs more flexibility.
+In particular, an arbitrary number of type variables must be added to the environment.
+As such, a persistent hash table is a more suitable structure than a persistent array, providing the same expected asymptotic time bounds while allowing a dynamic number of elements.
+Besides replacing the underlying array with a hash table, the other major change in this approach is to replace the two types of array references, !Array! and !Edit!, with four node types, !Table!,  !Edit!, !Add!, and !Remove!, where !Add! adds a new key-value pair, !Remove! removes a key, and !Edit! mutates an existing key-value pair.
+In this variant of \CFACC{}, this persistent hash table is used as the side map discussed in Section~\ref{env-union-find-approach} for class bounds.
+The actual union-find data structure is slightly modified from this approach, with a !Base! node containing the root union-find data structure, !Add! nodes adding new elements, !AddTo! nodes defining the union of two type classes, and !Remove! and !RemoveFrom! nodes as inverses of the previous two elements, for purposes of maintaining the edit list.
+Making !AddTo! and !RemoveFrom! single nodes shortens the edit path for improved performance, while also providing semantic information missing from the raw array updates in Conchon and Filli\^{a}tre's data structure.
+The single-node approach, does, however, break under most path-compression algorithms; !RemoveFrom! can be applied to the underlying data structure using the ``leaf of last union'' approach discussed in in Section~\ref{env-union-find-classes-approach}; this was judged an acceptable trade-off for the added semantic information and shortened paths.
+Maintaining explicit information on $union$ operations in the persistent union-find edit tree in the form of !AddTo! and !RemoveFrom! nodes exposes a new option for combining type environments.
+If the type environments are part of the same edit tree, one environment $T'$ can be combined with another $T$ by only testing the edits on the path from $T'$ to $T$ in both the persistent union-find data structure describing the classes and the persistent hash table containing the class bounds.
+This is generally more efficient than testing the compatibility of all type classes in $T'$, as only those that are actually different than those in $T$ must be considered.
+The procedure for $combine(T, T')$ based on edit paths is as follows:
+The shared edit trees for classes and bindings are rerooted at $T$, and the path from $T'$ to $T$ is followed to create a list of actual edits.
+By tracking the state of each element, redundant changes such as an !Edit! followed by an !Edit! can be reduced to their form in $T'$ by dropping the later (more like $T$) !Edit! for the same key; !Add! and !Remove! cancel similarly.
+This procedure is repeated for both the class edit tree and the binding edit tree.
+When the list of net changes to the environment has been produced, the additive changes are applied to $T$.
+For example, if a type class exists in $T'$ but not $T$, the corresponding !Add! edit will be applied to $T$, but in the reverse situation the !Remove! edit will not be applied to $T$, as the intention is to produce a new environment representing the union of the two sets of type classes; similarly, !AddTo! edits are applied to unify type-classes in $T$ that are united in $T'$, but !RemoveFrom! edits that split type classes are not.
+The new environment, $T''$ can always be constructed with a consistent partitioning of type variables; in the extreme case, all variables from both $T$ and $T'$ will be united in a single type class in $T''$.
+Where $combine$ can fail is in unifying the bound types; if any class in $T'$ has a class bound which does not unify with the merged class in $T''$ than $combine$ fails.
+\section{Analysis}
+In this section I present asymptotic analyses of the various approaches to a type environment data structure discussed in the previous section.
+\begin{table}
+\caption[Type environment operation bounds]{Worst-case analysis of type environment operations. $n$ is the number of type classes, $m$ the maximum size of a type class, and $p$ the edit distance between two environments or a single environment and the empty environment; $u(n)$ captures the recursive cost of class unification.}
+\label{env-bounds-table}
+\centering
+\begin{tabular}{rllll}
+        \hline
+                                & \textbf{Na\"{\i}ve}   & \textbf{Incremental}  & \textbf{Union-Find}           & \textbf{U-F with Classes}             \\
+        \hline
+        $find$          & $O(n)$                                & $O(p)$                                & $O(\alpha(m))$                        & $O(\log m)$                                   \\
+        $report$        & $O(m)$                                & $O(m)$                                & $O(n \log m)$                         & $O(m)$                                                \\
+        $bound$         & $O(1)$                                & $O(1)$                                & $O(1)$                                        & $O(1)$                                                \\
+        $insert$        & $O(1)$                                & $O(1)$                                & $O(1)$                                        & $O(1)$                                                \\
+        $add$           & $O(1)$                                & $O(1)$                                & $O(1)$                                        & $O(1)$                                                \\
+        $bind$          & $O(1)$                                & $O(1)$                                & $O(1)$                                        & $O(1)$                                                \\
+        $unify$         & $O(m + u(n))$                 & $O(m + u(n))$                 & $O(\log m + u(n))$            & $O(\log m + u(n))$                    \\
+        $split$         & ---                                   & ---                                   & ---                                           & $O(\log m)$                                   \\
+        $combine$       & $O(nm \cdot u(n))$    & $O(pm \cdot u(n))$    & $O(n \log m \cdot u(n))$      & $O(p \log m \cdot u(n))$              \\
+        $save$          & $O(nm)$                               & $O(1)$                                & $O(nm)$                                       & $O(1)$                                                \\
+        $backtrack$     & $O(nm)$                               & $O(pm)$                               & $O(nm)$                                       & $O(p)$                                                \\
+        \hline
+\end{tabular}
+\end{table}
+These operations can be naively implemented by a deep copy of $T$ into $H$ and vice versa, but have more efficient implementations in persistency-aware data structures.
 % Future work: design multi-threaded version of C&F persistent map --- core idea is some sort of thread-boundary edit node

doc/user/user.tex

-              r515a037
+              rcdc02f2
 %% Created On       : Wed Apr  6 14:53:29 2016
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Tue Dec 11 23:19:26 2018
 %% Update Count     : 3400
+%% Last Modified On : Fri Aug 31 07:54:50 2018
+%% Update Count     : 3396
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 …
 int main( void ) {
         int x = 0, y = 1, z = 2;
         ®sout | x | y | z;®§\indexc{sout}§
+        ®sout | x | y | z | endl;®§\indexc{sout}§
+}
 \end{cfa}
 …
 Floating exponentiation\index{exponentiation!floating} is performed using \Index{logarithm}s\index{exponentiation!logarithm}, so the base cannot be negative.
 \begin{cfa}
 sout | 2 ®\® 8u | 4 ®\® 3u | -4 ®\® 3u | 4 ®\® -3 | -4 ®\® -3 | 4.0 ®\® 2.1 | (1.0f+2.0fi) ®\® (3.0f+2.0fi);
+sout | 2 ®\® 8u | 4 ®\® 3u | -4 ®\® 3u | 4 ®\® -3 | -4 ®\® -3 | 4.0 ®\® 2.1 | (1.0f+2.0fi) ®\® (3.0f+2.0fi) | endl;
 64 -64 0.015625 -0.015625 18.3791736799526 0.264715-1.1922i
 \end{cfa}
 …
+\subsection{Loop Control}
+%\subsection{\texorpdfstring{\protect\lstinline@for@ Statement}{for Statement}}
+\subsection{\texorpdfstring{\LstKeywordStyle{for} Statement}{for Statement}}
 The ©for©/©while©/©do-while© loop-control allows empty or simplified ranges.
 …
 the down-to range ©-~=©\index{-~=@©-~=©} means inclusive range [N,M].
 ©0© is the implicit start value;
+©1© is the implicit increment value.
+The up-to range uses ©+=© for increment;
+the down-to range uses ©-=© for decrement.
+©1© is the implicit increment value for an up-to range and ©-1© for an implicit down-to range.
 The loop index is polymorphic in the type of the start value or comparison value when start is implicitly ©0©.
 \begin{cquote}
 \begin{tabular}{@{}ll|l@{}}
 \multicolumn{2}{c|}{loop control} & \multicolumn{1}{c}{output} \\
+\multicolumn{2}{c|}{for control} & \multicolumn{1}{c}{output} \\
 \hline
 \begin{cfa}
 …
 for ( ®10® ) { sout | "A"; }
 for ( ®1 ~= 10 ~ 2® ) { sout | "B"; }
 for ( ®10 -~= 1 ~ 2® ) { sout | "C"; }
+for ( ®10 -~= 1 ~ -2® ) { sout | "C"; }
 for ( ®0.5 ~ 5.5® ) { sout | "D"; }
 for ( ®5.5 -~ 0.5® ) { sout | "E"; }
 for ( ®i; 10® ) { sout | i; }
 for ( ®i; 1 ~= 10 ~ 2® ) { sout | i; }
 for ( ®i; 10 -~= 1 ~ 2® ) { sout | i; }
+for ( ®i; 10 -~= 1 ~ -2® ) { sout | i; }
 for ( ®i; 0.5 ~ 5.5® ) { sout | i; }
 for ( ®i; 5.5 -~ 0.5® ) { sout | i; }
 for ( ®ui; 2u ~= 10u ~ 2u® ) { sout | ui; }
+for ( ®ui; 10u -~= 2u ~ 2u® ) { sout | ui; }
+enum { N = 10 };
+for ( ®N® ) { sout | "N"; }
+for ( ®i; N® ) { sout | i; }
+for ( ®i; N -~ 0® ) { sout | i; }
+const int start = 3, comp = 10, inc = 2;
+for ( ®ui; 10u -~= 2u ~ -2u® ) { sout | ui; }
+int start = 3, comp = 10, inc = 2;
 for ( ®i; start ~ comp ~ inc + 1® ) { sout | i; }
 \end{cfa}
+&
 \begin{cfa}
+sout | nl;
+sout | nl;
+sout | nl;
+sout | "zero" | nl;
+sout | nl;
+sout | nl;
+sout | nl;
+sout | nl;
+sout | nl;
+sout | nl;
+sout | nl;
+sout | nl;
+sout | nl;
+sout | nl;
+sout | nl;
+sout | nl;
+sout | nl | nl;
+sout | nl;
+sout | nl;
+sout | nl | nl;
+sout | nl;
+sout | endl;
+sout | endl;
+sout | endl;
+sout | endl;
+sout | endl;
+sout | endl;
+sout | endl;
+sout | endl;
+sout | endl;
+sout | endl;
+sout | endl;
+sout | endl;
+sout | endl;
+sout | endl;
+sout | endl;
+sout | endl;
+sout | endl;
+sout | endl;
 \end{cfa}
+&
 …
 empty
 empty
+zero
+A
 A A A A A A A A A A
 …
 4 6 8 10
 8 6 4 2
-N N N N N N N N N N
-1 2 3 4 5 6 7 8 9
-9 8 7 6 5 4 3 2 1
 6 9
 …
         int bar( int p ) {
                 ®i® += 1;                               §\C{// dependent on local variable}§
                 sout | ®i®;
+                sout | ®i® | endl;
+        }
         return bar;                                     §\C{// undefined because of local dependence}§
 …
 int main() {
         * [int]( int ) fp = foo();      §\C{// int (* fp)( int )}§
         sout | fp( 3 );
+        sout | fp( 3 ) | endl;
+}
 \end{cfa}
 …
 \begin{cfa}
 int x = 1, y = 2, z = 3;
 sout | x ®|® y ®|® z;
+sout | x ®|® y ®|® z | endl;
 \end{cfa}
+&
 …
 \begin{cfa}
 [int, [ int, int ] ] t1 = [ 1, [ 2, 3 ] ], t2 = [ 4, [ 5, 6 ] ];
 sout | t1 | t2;                                         §\C{// print tuples}§
+sout | t1 | t2 | endl;                                  §\C{// print tuples}§
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt]
 …
+&
 \begin{cfa}
 sout | x * 3 | y + 1 | z << 2 | x == y | (x | y) | (x || y) | (x > z ? 1 : 2);
+sout | x * 3 | y + 1 | z << 2 | x == y | (x | y) | (x || y) | (x > z ? 1 : 2) | endl;
 \end{cfa}
 \\
 …
 A separator does not appear at the start or end of a line.
 \begin{cfa}[belowskip=0pt]
 sout | 1 | 2 | 3;
+sout | 1 | 2 | 3 | endl;
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
 …
 A separator does not appear before or after a character literal or variable.
 \begin{cfa}
 sout | '1' | '2' | '3';
+sout | '1' | '2' | '3' | endl;
 \end{cfa}
 …
 A separator does not appear before or after a null (empty) C string.
 \begin{cfa}
 sout | 1 | "" | 2 | "" | 3;
+sout | 1 | "" | 2 | "" | 3 | endl;
 \end{cfa}
 …
 \begin{cfa}[mathescape=off]
 sout | "x (" | 1 | "x [" | 2 | "x {" | 3 | "x =" | 4 | "x $" | 5 | "x £" | 6 | "x ¥"
                 | 7 | "x ¡" | 8 | "x ¿" | 9 | "x «" | 10;
+                | 7 | "x ¡" | 8 | "x ¿" | 9 | "x «" | 10 | endl;
 \end{cfa}
 %$
 …
 \begin{cfa}[belowskip=0pt]
 sout | 1 | ", x" | 2 | ". x" | 3 | "; x" | 4 | "! x" | 5 | "? x" | 6 | "% x"
                 | 7 | "¢ x" | 8 | "» x" | 9 | ") x" | 10 | "] x" | 11 | "} x";
+                | 7 | "¢ x" | 8 | "» x" | 9 | ") x" | 10 | "] x" | 11 | "} x" | endl;
 \end{cfa}
 \begin{cfa}[basicstyle=\tt,showspaces=true,aboveskip=0pt,belowskip=0pt]
 …
 A seperator does not appear before or after a C string begining/ending with the \Index*{ASCII} quote or whitespace characters: \lstinline[basicstyle=\tt,showspaces=true]@`'": \t\v\f\r\n@
 \begin{cfa}[belowskip=0pt]
 sout | "x`" | 1 | "`x'" | 2 | "'x\"" | 3 | "\"x:" | 4 | ":x " | 5 | " x\t" | 6 | "\tx";
+sout | "x`" | 1 | "`x'" | 2 | "'x\"" | 3 | "\"x:" | 4 | ":x " | 5 | " x\t" | 6 | "\tx" | endl;
 \end{cfa}
 \begin{cfa}[basicstyle=\tt,showspaces=true,showtabs=true,aboveskip=0pt,belowskip=0pt]
 …
 If a space is desired before or after one of the special string start/end characters, simply insert a space.
 \begin{cfa}[belowskip=0pt]
 sout | "x (§\color{red}\texttt{\textvisiblespace}§" | 1 | "§\color{red}\texttt{\textvisiblespace}§) x" | 2 | "§\color{red}\texttt{\textvisiblespace}§, x" | 3 | "§\color{red}\texttt{\textvisiblespace}§:x:§\color{red}\texttt{\textvisiblespace}§" | 4;
+sout | "x (§\color{red}\texttt{\textvisiblespace}§" | 1 | "§\color{red}\texttt{\textvisiblespace}§) x" | 2 | "§\color{red}\texttt{\textvisiblespace}§, x" | 3 | "§\color{red}\texttt{\textvisiblespace}§:x:§\color{red}\texttt{\textvisiblespace}§" | 4 | endl;
 \end{cfa}
 \begin{cfa}[basicstyle=\tt,showspaces=true,showtabs=true,aboveskip=0pt,belowskip=0pt]
 …
 \begin{cfa}[mathescape=off,belowskip=0pt]
 sepSet( sout, ", $" );                                          §\C{// set separator from " " to ", \$"}§
 sout | 1 | 2 | 3 | " \"" | ®sep® | "\"";
+sout | 1 | 2 | 3 | " \"" | ®sep® | "\"" | endl;
 \end{cfa}
 %$
 …
 \begin{cfa}[belowskip=0pt]
 sepSet( sout, " " );                                            §\C{// reset separator to " "}§
 sout | 1 | 2 | 3 | " \"" | ®sepGet( sout )® | "\"";
+sout | 1 | 2 | 3 | " \"" | ®sepGet( sout )® | "\"" | endl;
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt]
 …
 strcpy( store, sepGet( sout ) );                          §\C{// copy current separator}§
 sepSet( sout, "_" );                                            §\C{// change separator to underscore}§
 sout | 1 | 2 | 3;
+sout | 1 | 2 | 3 | endl;
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
 …
 \begin{cfa}[belowskip=0pt]
 sepSet( sout, store );                                          §\C{// change separator back to original}§
 sout | 1 | 2 | 3;
+sout | 1 | 2 | 3 | endl;
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt]
 …
 \begin{cfa}[belowskip=0pt]
 sepSetTuple( sout, " " );                                       §\C{// set tuple separator from ", " to " "}§
 sout | t1 | t2 | " \"" | ®sepTuple® | "\"";
+sout | t1 | t2 | " \"" | ®sepTuple® | "\"" | endl;
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt]
 …
 \begin{cfa}[belowskip=0pt]
 sepSetTuple( sout, ", " );                                      §\C{// reset tuple separator to ", "}§
 sout | t1 | t2 | " \"" | ®sepGetTuple( sout )® | "\"";
+sout | t1 | t2 | " \"" | ®sepGetTuple( sout )® | "\"" | endl;
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt]
 …
 Manipulators \Indexc{sepDisable}\index{manipulator!sepDisable@©sepDisable©} and \Indexc{sepEnable}\index{manipulator!sepEnable@©sepEnable©} \emph{globally} toggle printing the separator, \ie the seperator is adjusted with respect to all subsequent printed items.
 \begin{cfa}[belowskip=0pt]
 sout | sepDisable | 1 | 2 | 3;                  §\C{// globally turn off implicit separator}§
+sout | sepDisable | 1 | 2 | 3 | endl;           §\C{// globally turn off implicit separator}§
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
 …
 \end{cfa}
 \begin{cfa}[belowskip=0pt]
 sout | sepEnable | 1 | 2 | 3;           §\C{// globally turn on implicit separator}§
+sout | sepEnable | 1 | 2 | 3 | endl;            §\C{// globally turn on implicit separator}§
 \end{cfa}
 \begin{cfa}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt]
 …
 Manipulators \Indexc{sepOn}\index{manipulator!sepOn@©sepOn©} and \Indexc{sepOff}\index{manipulator!sepOff@©sepOff©} \emph{locally} toggle printing the separator, \ie the seperator is adjusted only with respect to the next printed item.
 \begin{cfa}[belowskip=0pt]
 sout | 1 | sepOff | 2 | 3;                      §\C{// locally turn off implicit separator}§
+sout | 1 | sepOff | 2 | 3 | endl;                       §\C{// locally turn off implicit separator}§
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
 …
 \end{cfa}
 \begin{cfa}[belowskip=0pt]
 sout | sepDisable | 1 | sepOn | 2 | 3; §\C{// locally turn on implicit separator}§
+sout | sepDisable | 1 | sepOn | 2 | 3 | endl; §\C{// locally turn on implicit separator}§
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
 …
 The tuple separator also responses to being turned on and off.
 \begin{cfa}[belowskip=0pt]
 sout | t1 | sepOff | t2;                                §\C{// locally turn on/off implicit separator}§
+sout | t1 | sepOff | t2 | endl;                         §\C{// locally turn on/off implicit separator}§
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
 …
 use ©sep© to accomplish this functionality.
 \begin{cfa}[belowskip=0pt]
 sout | sepOn | 1 | 2 | 3 | sepOn;       §\C{// sepOn does nothing at start/end of line}§
+sout | sepOn | 1 | 2 | 3 | sepOn | endl ;       §\C{// sepOn does nothing at start/end of line}§
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
 …
 \end{cfa}
 \begin{cfa}[belowskip=0pt]
 sout | sep | 1 | 2 | 3 | sep ;          §\C{// use sep to print separator at start/end of line}§
+sout | sep | 1 | 2 | 3 | sep | endl ;           §\C{// use sep to print separator at start/end of line}§
 \end{cfa}
 \begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt]
 …
 int main( void ) {
         int x = 1, y = 2, z = 3;
         sout | x | y | z;
+        sout | x | y | z | endl;
         [int, [ int, int ] ] t1 = [ 1, [ 2, 3 ] ], t2 = [ 4, [ 5, 6 ] ];
         sout | t1 | t2;                                         // print tuples
         sout | x * 3 | y + 1 | z << 2 | x == y | (x | y) | (x || y) | (x > z ? 1 : 2);
         sout | 1 | 2 | 3;
         sout | '1' | '2' | '3';
         sout | 1 | "" | 2 | "" | 3;
+        sout | t1 | t2 | endl;                                          // print tuples
+        sout | x * 3 | y + 1 | z << 2 | x == y | (x | y) | (x || y) | (x > z ? 1 : 2) | endl;
+        sout | 1 | 2 | 3 | endl;
+        sout | '1' | '2' | '3' | endl;
+        sout | 1 | "" | 2 | "" | 3 | endl;
         sout | "x (" | 1 | "x [" | 2 | "x {" | 3 | "x =" | 4 | "x $" | 5 | "x £" | 6 | "x ¥"
                 | 7 | "x ¡" | 8 | "x ¿" | 9 | "x «" | 10;
+                | 7 | "x ¡" | 8 | "x ¿" | 9 | "x «" | 10 | endl;
         sout | 1 | ", x" | 2 | ". x" | 3 | "; x" | 4 | "! x" | 5 | "? x" | 6 | "% x"
                 | 7 | "¢ x" | 8 | "» x" | 9 | ") x" | 10 | "] x" | 11 | "} x";
         sout | "x`" | 1 | "`x'" | 2 | "'x\"" | 3 | "\"x:" | 4 | ":x " | 5 | " x\t" | 6 | "\tx";
         sout | "x ( " | 1 | " ) x" | 2 | " , x" | 3 | " :x: " | 4;
+                | 7 | "¢ x" | 8 | "» x" | 9 | ") x" | 10 | "] x" | 11 | "} x" | endl;
+        sout | "x`" | 1 | "`x'" | 2 | "'x\"" | 3 | "\"x:" | 4 | ":x " | 5 | " x\t" | 6 | "\tx" | endl;
+        sout | "x ( " | 1 | " ) x" | 2 | " , x" | 3 | " :x: " | 4 | endl;
         sepSet( sout, ", $" );                                          // set separator from " " to ", $"
         sout | 1 | 2 | 3 | " \"" | sep | "\"";
+        sout | 1 | 2 | 3 | " \"" | sep | "\"" | endl;
         sepSet( sout, " " );                                            // reset separator to " "
         sout | 1 | 2 | 3 | " \"" | sepGet( sout ) | "\"";
+        sout | 1 | 2 | 3 | " \"" | sepGet( sout ) | "\"" | endl;
         char store[sepSize];
         strcpy( store, sepGet( sout ) );
         sepSet( sout, "_" );
         sout | 1 | 2 | 3;
+        sout | 1 | 2 | 3 | endl;
         sepSet( sout, store );
         sout | 1 | 2 | 3;
+        sout | 1 | 2 | 3 | endl;
         sepSetTuple( sout, " " );                                       // set tuple separator from ", " to " "
         sout | t1 | t2 | " \"" | sepTuple | "\"";
+        sout | t1 | t2 | " \"" | sepTuple | "\"" | endl;
         sepSetTuple( sout, ", " );                                      // reset tuple separator to ", "
         sout | t1 | t2 | " \"" | sepGetTuple( sout ) | "\"";
         sout | sepDisable | 1 | 2 | 3;          // globally turn off implicit separator
         sout | sepEnable | 1 | 2 | 3;           // globally turn on implicit separator
         sout | 1 | sepOff | 2 | 3;                      // locally turn on implicit separator
         sout | sepDisable | 1 | sepOn | 2 | 3; // globally turn off implicit separator
+        sout | t1 | t2 | " \"" | sepGetTuple( sout ) | "\"" | endl;
+        sout | sepDisable | 1 | 2 | 3 | endl;           // globally turn off implicit separator
+        sout | sepEnable | 1 | 2 | 3 | endl;            // globally turn on implicit separator
+        sout | 1 | sepOff | 2 | 3 | endl;                       // locally turn on implicit separator
+        sout | sepDisable | 1 | sepOn | 2 | 3 | endl; // globally turn off implicit separator
         sout | sepEnable;
         sout | t1 | sepOff | t2;                                // locally turn on/off implicit separator
         sout | sepOn | 1 | 2 | 3 | sepOn ;      // sepOn does nothing at start/end of line
         sout | sep | 1 | 2 | 3 | sep ;          // use sep to print separator at start/end of line
+        sout | t1 | sepOff | t2 | endl;                         // locally turn on/off implicit separator
+        sout | sepOn | 1 | 2 | 3 | sepOn | endl ;       // sepOn does nothing at start/end of line
+        sout | sep | 1 | 2 | 3 | sep | endl ;           // use sep to print separator at start/end of line
+}
 …
         Fibonacci f1, f2;
         for ( int i = 1; i <= 10; i += 1 ) {
                 sout | next( &f1 ) | ' ' | next( &f2 );
+                sout | next( &f1 ) | ' ' | next( &f2 ) | endl;
         } // for
+}
 …
                 MyThread f[4];
+        }
         sout | global.value;
+        sout | global.value | endl;
+}
 \end{cfa}
 …
 void main( First * this ) {
         for ( int i = 0; i < 10; i += 1 ) {
                 sout | "First : Suspend No." | i + 1;
+                sout | "First : Suspend No." | i + 1 | endl;
                 yield();
+        }
 …
         wait( this->lock );
         for ( int i = 0; i < 10; i += 1 ) {
                 sout | "Second : Suspend No." | i + 1;
+                sout | "Second : Suspend No." | i + 1 | endl;
                 yield();
+        }
 …
 int main( void ) {
         signal_once lock;
         sout | "User main begin";
+        sout | "User main begin" | endl;
+        {
                 processor p;
 …
+                }
+        }
         sout | "User main end";
+        sout | "User main end" | endl;
+}
 \end{cfa}
 …
 void ?{}( Line * l ) {
         l->lnth = 0.0;
         sout | "default";
+        sout | "default" | endl;
+}
 …
 void ?{}( Line * l, float lnth ) {
         l->lnth = lnth;
         sout | "lnth" | l->lnth;
+        sout | "lnth" | l->lnth | endl;
+}
 …
 // destructor
 void ^?() {
         sout | "destroyed";
+        sout | "destroyed" | endl;
         l.lnth = 0.0;
+}
 …
 In particular, output of ©char© variable now print a character rather than the decimal ASCII value of the character.
 \begin{cfa}
 sout | 'x' | " " | (int)'x';
+sout | 'x' | " " | (int)'x' | endl;
 x 120
 \end{cfa}
 …
 #include <gmp>§\indexc{gmp}§
 int main( void ) {
         sout | "Factorial Numbers";
+        sout | "Factorial Numbers" | endl;
         Int fact = 1;
         sout | 0 | fact;
+        sout | 0 | fact | endl;
         for ( unsigned int i = 1; i <= 40; i += 1 ) {
                 fact *= i;
                 sout | i | fact;
+                sout | i | fact | endl;
+        }
+}

examples/ArrayN.c

-              r515a037
+              rcdc02f2
 forall(otype index_t)
+index_t offset_to_index(unsigned offset, index_t size) {
+index_t offset_to_index(unsigned offset, index_t size)
+{
     return [offset / size.0, offset % size.1];
+}
+int main(int argc, char* argv[]) {
+int main(int argc, char* argv[])
+{
     unsigned x = 0, y = 0, i = 0;
     unsigned sx = 4, sy = 4;
 …
     [x, y] = offset_to_index(6, [sx, sy]);
     sout | x | ' ' | y;
+    sout | x | ' ' | y | endl;
     return 0;

examples/gc_no_raii/src/internal/collector.c

-              r515a037
+              rcdc02f2
 void* gc_allocate(size_t target_size)
+{
         // sout | "Allocating " | target_size | " bytes";
+        // sout | "Allocating " | target_size | " bytes" | endl;
         size_t size = gc_compute_size(target_size + sizeof(gc_object_header));
         // sout | "Object header size: " | sizeof(gc_object_header) | " bytes";
         // sout | "Actual allocation size: " | size | " bytes";
+        // sout | "Object header size: " | sizeof(gc_object_header) | " bytes" | endl;
+        // sout | "Actual allocation size: " | size | " bytes" | endl;
         check(size < POOL_SIZE_BYTES);

examples/gc_no_raii/src/internal/state.h

r515a037	rcdc02f2
38	38	static inline bool gc_needs_collect(gc_state* state)
39	39	{
40		// sout \| "Used Space: " \| state->used_space \| " bytes";
	40	// sout \| "Used Space: " \| state->used_space \| " bytes" \| endl;
41	41	return state->used_space * 2 > state->total_space;
42	42	}

examples/gc_no_raii/src/tools/print.h

r515a037	rcdc02f2
5	5	// #include <fstream.hfa>
6	6	//
7		// #define DEBUG_OUT(x) sout \| x;
	7	// #define DEBUG_OUT(x) sout \| x \| endl;
8	8	//
9	9	// #else

examples/multicore.c

r515a037	rcdc02f2
15	15
16	16	int main(int argc, char* argv[]) {
17		// sout \| "User main begin";
	17	// sout \| "User main begin" \| endl;
18	18	{
19	19	processor p;
…	…
22	22	}
23	23	}
24		// sout \| "User main end";
	24	// sout \| "User main end" \| endl;
25	25	}

examples/prolog.c

-              r515a037
+              rcdc02f2
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Dec 11 23:27:19 2018
 // Update Count     : 6
+// Last Modified On : Tue Mar  8 22:09:39 2016
+// Update Count     : 5
 //
 #include <fstream.hfa>
 void printResult( int x ) { sout | "int"; }
 void printResult( double x ) { sout | "double"; }
 void printResult( char * x ) { sout | "char*"; }
+void printResult( int x ) { sout | "int" | endl; }
+void printResult( double x ) { sout | "double" | endl; }
+void printResult( char * x ) { sout | "char*" | endl; }
 void is_arithmetic( int x ) {}

examples/quad.c

-              r515a037
+              rcdc02f2
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Dec 11 23:26:58 2018
 // Update Count     : 9
+// Last Modified On : Tue Mar  8 22:07:02 2016
+// Update Count     : 8
 //
 …
 int main() {
         int N = 2;
         sout | "result of quad of" | N | "is" | quad( N );
+        sout | "result of quad of" | N | "is" | quad( N ) | endl;
+}

examples/square.c

-              r515a037
+              rcdc02f2
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Dec 11 23:28:24 2018
 // Update Count     : 28
+// Last Modified On : Tue Mar  8 22:05:48 2016
+// Update Count     : 27
 //
 …
 int main() {
 #if 0
         sout | "result of squaring 9 is ";
+        sout | "result of squaring 9 is " | endl;
         // char does not have multiplication.
 …
         } // ?*?
         char c = 9;
         sout | "char\t\t\t" | square( c );
+        sout | "char\t\t\t" | square( c ) | endl;
         sout | square( s );
+        sout | square( s ) | endl;
 #endif
         short s = 9;
 …
 #if 0
         signed int i = 9;
         sout | "signed int\t\t" | square( i );
+        sout | "signed int\t\t" | square( i ) | endl;
         unsigned int ui = 9;
         sout | "unsigned int\t\t" | square( ui );
+        sout | "unsigned int\t\t" | square( ui ) | endl;
         long int li = 9;
         sout | "signed long int\t\t" | square( li );
+        sout | "signed long int\t\t" | square( li ) | endl;
         unsigned long int uli = 9;
         sout | "unsigned long int\t" | square( uli );
+        sout | "unsigned long int\t" | square( uli ) | endl;
         signed long long int lli = 9;
         sout | "signed long long int\t" | square( lli );
+        sout | "signed long long int\t" | square( lli ) | endl;
         unsigned long long int ulli = 9;
         sout | "unsigned long long int\t" | square( ulli );
+        sout | "unsigned long long int\t" | square( ulli ) | endl;
         float f = 9.0;
         sout | "float\t\t\t" | square( f );
+        sout | "float\t\t\t" | square( f ) | endl;
         double d = 9.0;
         sout | "double\t\t\t" | square( d );
+        sout | "double\t\t\t" | square( d ) | endl;
         long double ld = 9.0;
         sout | "long double\t\t" | square( ld );
+        sout | "long double\t\t" | square( ld ) | endl;
 #endif
 } // main

examples/twice.c

-              r515a037
+              rcdc02f2
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Dec 11 23:28:08 2018
 // Update Count     : 47
+// Last Modified On : Thu Oct 19 21:52:57 2017
+// Update Count     : 46
 //
 …
 int main( void ) {
         sout | twice( ' ' ) | ' ' | twice( (signed char)0 ) | twice( (int)1 ) | twice( 3.2 );
+        sout | twice( ' ' ) | ' ' | twice( (signed char)0 ) | twice( (int)1 ) | twice( 3.2 ) | endl;
+}

examples/wrapper/src/main.c

-              r515a037
+              rcdc02f2
 #include "pointer.h"
+wrapper_t make_copy(wrapper_t copy) {
+wrapper_t make_copy(wrapper_t copy)
+{
         return copy;
+}
+int main(int argc, char const *argv[]) {
+int main(int argc, char const *argv[])
+{
         wrapper_t p = wrap(6);
+        sout | nl | "test started";
+        sout | endl | "test started" | endl;
         wrapper_t p2 = p;
         clear(&p);
         p = p2;
         wrapper_t p3 = make_copy(p2);
+        sout | nl | "test ended";
+        sout | endl | "test ended" | endl;
         return 0;
+}

examples/wrapper/src/pointer.h

r515a037	rcdc02f2
34	34	void ?{}(content_t* this)
35	35	{
36		sout \| "Constructing content";
	36	sout \| "Constructing content" \| endl;
37	37	this->count = 0;
38	38	}
…	…
40	40	void ^?{}(content_t* this)
41	41	{
42		sout \| "Destroying content";
	42	sout \| "Destroying content" \| endl;
43	43	}
44	44
…	…
53	53	void ?{}(wrapper_t* this)
54	54	{
55		sout \| "Constructing empty ref pointer" \| nl;
	55	sout \| "Constructing empty ref pointer" \| endl \| endl;
56	56	this->ptr = NULL;
57	57	}
…	…
59	59	void ?{}(wrapper_t* this, wrapper_t rhs)
60	60	{
61		sout \| "Constructing ref pointer from copy";
	61	sout \| "Constructing ref pointer from copy" \| endl;
62	62	this->ptr = rhs.ptr;
63	63	this->ptr->count++;
64		sout \| "Reference is " \| this->ptr->count \| nl;
	64	sout \| "Reference is " \| this->ptr->count \| endl \| endl;
65	65	}
66	66
…	…
69	69	if(this->ptr)
70	70	{
71		sout \| "Destroying ref pointer";
	71	sout \| "Destroying ref pointer" \| endl;
72	72	this->ptr->count--;
73		sout \| "Reference is " \| this->ptr->count \| nl;
	73	sout \| "Reference is " \| this->ptr->count \| endl \| endl;
74	74	if(!this->ptr->count) delete(this->ptr);
75	75	}
76	76	else
77	77	{
78		sout \| "Destroying empty ref pointer" \| nl;
	78	sout \| "Destroying empty ref pointer" \| endl \| endl;
79	79	}
80	80	}
…	…
82	82	wrapper_t ?=?(wrapper_t* this, wrapper_t rhs)
83	83	{
84		sout \| "Setting ref pointer";
	84	sout \| "Setting ref pointer" \| endl;
85	85	if(this->ptr)
86	86	{
87	87	this->ptr->count--;
88		sout \| "Reference is " \| this->ptr->count \| nl;
	88	sout \| "Reference is " \| this->ptr->count \| endl \| endl;
89	89	if(!this->ptr->count) delete(this->ptr);
90	90	}
91	91	this->ptr = rhs.ptr;
92	92	this->ptr->count++;
93		sout \| "Reference is " \| this->ptr->count \| nl;
	93	sout \| "Reference is " \| this->ptr->count \| endl \| endl;
94	94	}
95	95
…	…
98	98	this->ptr = c;
99	99	this->ptr->count++;
100		sout \| "Setting ref pointer";
101		sout \| "Reference is " \| this->ptr->count \| nl;
	100	sout \| "Setting ref pointer" \| endl;
	101	sout \| "Reference is " \| this->ptr->count \| endl \| endl;
102	102	}
103	103
104	104	void clear(wrapper_t* this)
105	105	{
106		sout \| "Clearing ref pointer";
	106	sout \| "Clearing ref pointer" \| endl;
107	107	this->ptr->count--;
108		sout \| "Reference is " \| this->ptr->count \| nl;
	108	sout \| "Reference is " \| this->ptr->count \| endl \| endl;
109	109	if(!this->ptr->count) delete(this->ptr);
110	110	this->ptr = NULL;

examples/zero_one.c

r515a037	rcdc02f2
3	3	void foo(zero_t o)
4	4	{
5		sout \| "It's a Zero!";
	5	sout \| "It's a Zero!" \| endl;
6	6	}
7	7
8	8	void foo(one_t o)
9	9	{
10		sout \| "It's a One!";
	10	sout \| "It's a One!" \| endl;
11	11	}
12	12
13	13	void foo(int o)
14	14	{
15		sout \| "It's a Number!";
	15	sout \| "It's a Number!" \| endl;
16	16	}
17	17

libcfa/src/fstream.cfa

-              r515a037
+              rcdc02f2
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed Dec 12 08:34:28 2018
 // Update Count     : 298
+// Last Modified On : Fri Aug 10 18:19:40 2018
+// Update Count     : 284
 //
 …
 #include <stdarg.h>                                                                             // varargs
 #include <string.h>                                                                             // strlen
+#include <stdbool.h>                                                                    // true/false
 #include <float.h>                                                                              // DBL_DIG, LDBL_DIG
 #include <complex.h>                                                                    // creal, cimag
 …
 #define IO_MSG "I/O error: "
 void ?{}( ofstream & os, void * file, bool sepDefault, bool sepOnOff, bool nlOnOff, bool nonlManip, const char * separator, const char * tupleSeparator ) {
+void ?{}( ofstream & os, void * file, bool sepDefault, bool sepOnOff, const char * separator, const char * tupleSeparator ) {
         os.file = file;
         os.sepDefault = sepDefault;
         os.sepOnOff = sepOnOff;
-        os.nlOnOff = nlOnOff;
-        os.nonlManip = nonlManip;
         sepSet( os, separator );
         sepSetCur( os, sepGet( os ) );
 …
 bool getNL( ofstream & os ) { return os.sawNL; }
 void setNL( ofstream & os, bool state ) { os.sawNL = state; }
-bool getANL( ofstream & os ) { return os.nlOnOff; }
-bool getNonl( ofstream & os ) { return os.nonlManip; }
-void setNonl( ofstream & os, bool state ) { os.nonlManip = state; }
 // public
 …
 } // sepEnable
-void nlOn( ofstream & os ) { os.nlOnOff = true; }
-void nlOff( ofstream & os ) { os.nlOnOff = false; }
 const char * sepGet( ofstream & os ) { return os.separator; }
 void sepSet( ofstream & os, const char * s ) {
 …
         } // if
         #endif // __CFA_DEBUG__
         (os){ file, true, false, true, false, " ", ", " };
+        (os){ file, true, false, " ", ", " };
 } // open
 …
 } // fmt
 static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_), true, false, true, false, " ", ", " };
+static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_), true, false, " ", ", " };
 ofstream & sout = soutFile;
 static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_), true, false, true, false, " ", ", " };
+static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_), true, false, " ", ", " };
 ofstream & serr = serrFile;

libcfa/src/fstream.hfa

-              r515a037
+              rcdc02f2
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed Dec 12 07:52:41 2018
 // Update Count     : 143
+// Last Modified On : Sat Aug 11 13:54:27 2018
+// Update Count     : 132
 //
 …
         bool sepDefault;
         bool sepOnOff;
-        bool nlOnOff;
-        bool nonlManip;
         bool sawNL;
         const char * sepCur;
 …
 bool getNL( ofstream & );
 void setNL( ofstream &, bool );
-bool getANL( ofstream & );
-bool getNonl( ofstream & );
-void setNonl( ofstream &, bool );
 // public
 …
 bool sepDisable( ofstream & );
 bool sepEnable( ofstream & );
-void nlOn( ofstream & );
-void nlOff( ofstream & );
 const char * sepGet( ofstream & );

libcfa/src/gmp.hfa

-              r515a037
+              rcdc02f2
 // Created On       : Tue Apr 19 08:43:43 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Dec  4 23:25:51 2018
 // Update Count     : 22
+// Last Modified On : Thu Dec  7 09:10:41 2017
+// Update Count     : 21
 //
 …
 } // ?|?
+static inline forall( dtype ostype | ostream( ostype ) ) {
+        ostype & ?|?( ostype & os, Int mp ) {
+                if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+                gmp_printf( "%Zd", mp.mpz );
+                sepOn( os );
+                return os;
+        } // ?|?
+        void ?|?( ostype & os, Int mp ) {
+                (ostype)(os | mp); if ( getANL( os ) ) nl( os );
+        } // ?|?
+} // distribution
+static inline forall( dtype ostype | ostream( ostype ) )
+ostype & ?|?( ostype & os, Int mp ) {
+        if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+        gmp_printf( "%Zd", mp.mpz );
+        sepOn( os );
+        return os;
+} // ?|?
 // Local Variables: //

libcfa/src/iostream.cfa

-              r515a037
+              rcdc02f2
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Dec 11 22:02:03 2018
 // Update Count     : 546
+// Last Modified On : Wed Sep 26 18:22:57 2018
+// Update Count     : 474
 //
 …
 #include <stdio.h>
 #include <stdbool.h>                                                                    // true/false
 //#include <string.h>                                                                   // strlen, strcmp
+//#include <string.h>                                                                           // strlen, strcmp
 extern int strcmp (const char *__s1, const char *__s2) __attribute__ ((__nothrow__ , __leaf__)) __attribute__ ((__pure__)) __attribute__ ((__nonnull__ (1, 2)));
 extern size_t strlen (const char *__s) __attribute__ ((__nothrow__ , __leaf__)) __attribute__ ((__pure__)) __attribute__ ((__nonnull__ (1)));
 …
                 return os;
         } // ?|?
+        void ?|?( ostype & os, bool b ) {
+                (ostype)(os | b); if ( getANL( os ) ) nl( os );
+        } // ?|?
+        ostype & ?|?( ostype & os, char c ) {
+                fmt( os, "%c", c );
+                if ( c == '\n' ) setNL( os, true );
+                return sepOff( os );
+        } // ?|?
+        void ?|?( ostype & os, char c ) {
+                (ostype)(os | c); if ( getANL( os ) ) nl( os );
+        } // ?|?
+        ostype & ?|?( ostype & os, signed char sc ) {
+                if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+                fmt( os, "%hhd", sc );
+                return os;
+        } // ?|?
+        void ?|?( ostype & os, signed char sc ) {
+                (ostype)(os | sc); if ( getANL( os ) ) nl( os );
+        } // ?|?
+        ostype & ?|?( ostype & os, unsigned char usc ) {
+                if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+                fmt( os, "%hhu", usc );
+                return os;
+        } // ?|?
+        void ?|?( ostype & os, unsigned char usc ) {
+                (ostype)(os | usc); if ( getANL( os ) ) nl( os );
+        ostype & ?|?( ostype & os, char ch ) {
+                fmt( os, "%c", ch );
+                if ( ch == '\n' ) setNL( os, true );
+                sepOff( os );
+                return os;
+        } // ?|?
+        ostype & ?|?( ostype & os, signed char c ) {
+                if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+                fmt( os, "%hhd", c );
+                return os;
+        } // ?|?
+        ostype & ?|?( ostype & os, unsigned char c ) {
+                if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+                fmt( os, "%hhu", c );
+                return os;
         } // ?|?
 …
                 return os;
         } // ?|?
-        void & ?|?( ostype & os, short int si ) {
-                (ostype)(os | si); if ( getANL( os ) ) nl( os );
-        } // ?|?
         ostype & ?|?( ostype & os, unsigned short int usi ) {
 …
                 return os;
         } // ?|?
-        void & ?|?( ostype & os, unsigned short int usi ) {
-                (ostype)(os | usi); if ( getANL( os ) ) nl( os );
-        } // ?|?
         ostype & ?|?( ostype & os, int i ) {
 …
                 return os;
         } // ?|?
-        void & ?|?( ostype & os, int i ) {
-                (ostype)(os | i); if ( getANL( os ) ) nl( os );
-        } // ?|?
         ostype & ?|?( ostype & os, unsigned int ui ) {
 …
                 return os;
         } // ?|?
-        void & ?|?( ostype & os, unsigned int ui ) {
-                (ostype)(os | ui); if ( getANL( os ) ) nl( os );
-        } // ?|?
         ostype & ?|?( ostype & os, long int li ) {
 …
                 return os;
         } // ?|?
-        void & ?|?( ostype & os, long int li ) {
-                (ostype)(os | li); if ( getANL( os ) ) nl( os );
-        } // ?|?
         ostype & ?|?( ostype & os, unsigned long int uli ) {
 …
                 return os;
         } // ?|?
-        void & ?|?( ostype & os, unsigned long int uli ) {
-                (ostype)(os | uli); if ( getANL( os ) ) nl( os );
-        } // ?|?
         ostype & ?|?( ostype & os, long long int lli ) {
 …
                 return os;
         } // ?|?
-        void & ?|?( ostype & os, long long int lli ) {
-                (ostype)(os | lli); if ( getANL( os ) ) nl( os );
-        } // ?|?
         ostype & ?|?( ostype & os, unsigned long long int ulli ) {
 …
                 return os;
         } // ?|?
-        void & ?|?( ostype & os, unsigned long long int ulli ) {
-                (ostype)(os | ulli); if ( getANL( os ) ) nl( os );
-        } // ?|?
         ostype & ?|?( ostype & os, float f ) {
 …
                 return os;
         } // ?|?
-        void & ?|?( ostype & os, float f ) {
-                (ostype)(os | f); if ( getANL( os ) ) nl( os );
-        } // ?|?
         ostype & ?|?( ostype & os, double d ) {
 …
                 return os;
         } // ?|?
-        void & ?|?( ostype & os, double d ) {
-                (ostype)(os | d); if ( getANL( os ) ) nl( os );
-        } // ?|?
         ostype & ?|?( ostype & os, long double ld ) {
 …
                 return os;
         } // ?|?
-        void & ?|?( ostype & os, long double ld ) {
-                (ostype)(os | ld); if ( getANL( os ) ) nl( os );
-        } // ?|?
         ostype & ?|?( ostype & os, float _Complex fc ) {
 …
                 return os;
         } // ?|?
-        void & ?|?( ostype & os, float _Complex fc ) {
-                (ostype)(os | fc); if ( getANL( os ) ) nl( os );
-        } // ?|?
         ostype & ?|?( ostype & os, double _Complex dc ) {
 …
                 return os;
         } // ?|?
-        void & ?|?( ostype & os, double _Complex dc ) {
-                (ostype)(os | dc); if ( getANL( os ) ) nl( os );
-        } // ?|?
         ostype & ?|?( ostype & os, long double _Complex ldc ) {
 …
                 fmt( os, "%.*Lg%+.*Lgi", LDBL_DIG, creall( ldc ), LDBL_DIG, cimagl( ldc ) );
                 return os;
-        } // ?|?
-        void & ?|?( ostype & os, long double _Complex ldc ) {
-                (ostype)(os | ldc); if ( getANL( os ) ) nl( os );
         } // ?|?
 …
                         // opening delimiters, no space after
                         ['('] : Open, ['['] : Open, ['{'] : Open,
                         ['='] : Open, ['$'] : Open, [(unsigned char)'�'] : Open, [(unsigned char)'�'] : Open,
                         [(unsigned char)'�'] : Open, [(unsigned char)'�'] : Open, [(unsigned char)'�'] : Open,
+                        ['='] : Open, ['$'] : Open, [(unsigned char)'£'] : Open, [(unsigned char)'¥'] : Open,
+                        [(unsigned char)'¡'] : Open, [(unsigned char)'¿'] : Open, [(unsigned char)'«'] : Open,
                         // closing delimiters, no space before
                         [','] : Close, ['.'] : Close, [';'] : Close, ['!'] : Close, ['?'] : Close,
                         ['%'] : Close, [(unsigned char)'�'] : Close, [(unsigned char)'�'] : Close,
+                        ['%'] : Close, [(unsigned char)'¢'] : Close, [(unsigned char)'»'] : Close,
                         [')'] : Close, [']'] : Close, ['}'] : Close,
                         // opening-closing delimiters, no space before or after
 …
                 return write( os, str, len );
         } // ?|?
-        void ?|?( ostype & os, const char * str ) {
-                (ostype)(os | str); if ( getANL( os ) ) nl( os );
-        } // ?|?
 //      ostype & ?|?( ostype & os, const char16_t * str ) {
 …
                 return os;
         } // ?|?
+        void ?|?( ostype & os, const void * p ) {
+                (ostype)(os | p); if ( getANL( os ) ) nl( os );
+        } // ?|?
         // manipulators
         ostype & ?|?( ostype & os, ostype & (* manip)( ostype & ) ) {
+                (ostype)(manip( os ));
+                setNonl( os, false );                                                   // ignore nonl in middle
+                return os;
+        } // ?|?
+        void ?|?( ostype & os, ostype & (* manip)( ostype & ) ) {
+                (ostype)(manip( os ));
+                if ( getANL( os ) && ! getNonl( os ) ) nl( os ); // ignore nl if nonl at end
+                setNonl( os, false );
+                return manip( os );
         } // ?|?
         ostype & sep( ostype & os ) {
+                return (ostype)(os | sepGet( os ));
+                os | sepGet( os );
+                return os;
         } // sep
         ostype & sepTuple( ostype & os ) {
+                return os | sepGetTuple( os );
+                os | sepGetTuple( os );
+                return os;
         } // sepTuple
         ostype & nl( ostype & os ) {
                 (ostype)(os | '\n');
+        ostype & endl( ostype & os ) {
+                os | '\n';
                 setNL( os, true );
                 flush( os );
+                return sepOff( os );                                                    // prepare for next line
+        } // nl
+        ostype & nonl( ostype & os ) {
+                setNonl( os, true );                                                    // indicate nonl manipulator
+                return os;
+        } // nonl
+                sepOff( os );                                                                   // prepare for next line
+                return os;
+        } // endl
         ostype & sepOn( ostype & os ) {
                 sepOn( os );                                                                    // call void returning
+                sepOn( os );
                 return os;
         } // sepOn
         ostype & sepOff( ostype & os ) {
                 sepOff( os );                                                                   // call void returning
+                sepOff( os );
                 return os;
         } // sepOff
         ostype & sepEnable( ostype & os ) {
                 sepEnable( os );                                                                // call void returning
+                sepEnable( os );
                 return os;
         } // sepEnable
         ostype & sepDisable( ostype & os ) {
                 sepDisable( os );                                                               // call void returning
+                sepDisable( os );
                 return os;
         } // sepDisable
-        ostype & nlOn( ostype & os ) {
-                nlOn( os );                                                                             // call void returning
-                return os;
-        } // nlOn
-        ostype & nlOff( ostype & os ) {
-                nlOff( os );                                                                    // call void returning
-                return os;
-        } // nlOff
 } // distribution
 // tuples
+forall( dtype ostype, otype T, ttype Params | writeable( T, ostype ) | { ostype & ?|?( ostype &, Params ); } ) {
+        ostype & ?|?( ostype & os, T arg, Params rest ) {
+                (ostype)(os | arg);                                                             // print first argument
+                sepSetCur( os, sepGetTuple( os ) );                             // switch to tuple separator
+                (ostype)(os | rest);                                                    // print remaining arguments
+                sepSetCur( os, sepGet( os ) );                                  // switch to regular separator
+                return os;
+        } // ?|?
+        void ?|?( ostype & os, T arg, Params rest ) {
+//              (ostype)(?|?( os, arg, rest )); if ( getANL( os ) ) nl( os );
+                (ostype)(os | arg);                                                             // print first argument
+                sepSetCur( os, sepGetTuple( os ) );                             // switch to tuple separator
+                (ostype)(os | rest);                                                    // print remaining arguments
+                sepSetCur( os, sepGet( os ) );                                  // switch to regular separator
+                if ( getANL( os ) ) nl( os );
+        } // ?|?
+} // distribution
+forall( dtype ostype, otype T, ttype Params | writeable( T, ostype ) | { ostype & ?|?( ostype &, Params ); } )
+ostype & ?|?( ostype & os, T arg, Params rest ) {
+        os | arg;                                                                                       // print first argument
+        sepSetCur( os, sepGetTuple( os ) );                                     // switch to tuple separator
+        os | rest;                                                                                      // print remaining arguments
+        sepSetCur( os, sepGet( os ) );                                          // switch to regular separator
+        return os;
+} // ?|?
 //---------------------------------------
 // writes the range [begin, end) to the given stream
 forall( dtype ostype, otype elt_type | writeable( elt_type, ostype ), otype iterator_type | iterator( iterator_type, elt_type ) ) {
         void write( iterator_type begin, iterator_type end, ostype & os ) {
                 void print( elt_type i ) { os | i; }
                 for_each( begin, end, print );
         } // ?|?
+        void write_reverse( iterator_type begin, iterator_type end, ostype & os ) {
+                void print( elt_type i ) { os | i; }
                 for_each_reverse( begin, end, print );
         } // ?|?
 } // distribution
+forall( dtype ostype, otype elt_type | writeable( elt_type, ostype ), otype iterator_type | iterator( iterator_type, elt_type ) )
+void write( iterator_type begin, iterator_type end, ostype & os ) {
+        void print( elt_type i ) { os | i; }
+        for_each( begin, end, print );
+} // ?|?
+forall( dtype ostype, otype elt_type | writeable( elt_type, ostype ), otype iterator_type | iterator( iterator_type, elt_type ) )
+void write_reverse( iterator_type begin, iterator_type end, ostype & os ) {
+        void print( elt_type i ) { os | i; }
+        for_each_reverse( begin, end, print );
+} // ?|?
 //---------------------------------------
 …
         } // ?|?
         istype & nl( istype & is ) {
+        istype & endl( istype & is ) {
                 fmt( is, "%*[ \t\f\n\r\v]" );                                   // ignore whitespace
                 return is;
         } // nl
+        } // endl
 } // distribution

libcfa/src/iostream.hfa

-              r515a037
+              rcdc02f2
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Dec 11 22:01:31 2018
 // Update Count     : 213
+// Last Modified On : Sat Aug 11 08:22:49 2018
+// Update Count     : 156
 //
 …
         const char * sepGetCur( ostype & );                                     // get current separator string
         void sepSetCur( ostype &, const char * );                       // set current separator string
         bool getNL( ostype & );                                                         // check newline
+        bool getNL( ostype & );                                                 // check newline
         void setNL( ostype &, bool );                                           // saw newline
-        bool getANL( ostype & );                                                        // check auto newline
-        bool getNonl( ostype & );                                                       // check nonnl manipulator
-        void setNonl( ostype &, bool );                                         // set nonnl manipulator
         // public
         void sepOn( ostype & );                                                         // turn separator state on
         void sepOff( ostype & );                                                        // turn separator state off
         bool sepDisable( ostype & );                                            // set default state to off, and return previous state
+        bool sepEnable( ostype & );                                                     // set default state to on, and return previous state
+        void nlOn( ostype & );                                                          // turn auto-newline state on
+        void nlOff( ostype & );                                                         // turn auto-newline state off
+        bool sepEnable( ostype & );                                             // set default state to on, and return previous state
         const char * sepGet( ostype & );                                        // get separator string
 …
 forall( dtype ostype | ostream( ostype ) ) {
         ostype & ?|?( ostype &, bool );
-        void & ?|?( ostype &, bool );
         ostype & ?|?( ostype &, char );
-        void & ?|?( ostype &, char );
         ostype & ?|?( ostype &, signed char );
-        void & ?|?( ostype &, signed char );
         ostype & ?|?( ostype &, unsigned char );
-        void & ?|?( ostype &, unsigned char );
         ostype & ?|?( ostype &, short int );
-        void & ?|?( ostype &, short int );
         ostype & ?|?( ostype &, unsigned short int );
-        void & ?|?( ostype &, unsigned short int );
         ostype & ?|?( ostype &, int );
-        void & ?|?( ostype &, int );
         ostype & ?|?( ostype &, unsigned int );
-        void & ?|?( ostype &, unsigned int );
         ostype & ?|?( ostype &, long int );
-        void & ?|?( ostype &, long int );
         ostype & ?|?( ostype &, long long int );
-        void & ?|?( ostype &, long long int );
         ostype & ?|?( ostype &, unsigned long int );
-        void & ?|?( ostype &, unsigned long int );
         ostype & ?|?( ostype &, unsigned long long int );
-        void & ?|?( ostype &, unsigned long long int );
         ostype & ?|?( ostype &, float ); // FIX ME: should not be required
-        void & ?|?( ostype &, float ); // FIX ME: should not be required
         ostype & ?|?( ostype &, double );
-        void & ?|?( ostype &, double );
         ostype & ?|?( ostype &, long double );
-        void & ?|?( ostype &, long double );
         ostype & ?|?( ostype &, float _Complex );
-        void & ?|?( ostype &, float _Complex );
         ostype & ?|?( ostype &, double _Complex );
-        void & ?|?( ostype &, double _Complex );
         ostype & ?|?( ostype &, long double _Complex );
-        void & ?|?( ostype &, long double _Complex );
         ostype & ?|?( ostype &, const char * );
-        void & ?|?( ostype &, const char * );
         // ostype & ?|?( ostype &, const char16_t * );
 #if ! ( __ARM_ARCH_ISA_ARM == 1 && __ARM_32BIT_STATE == 1 ) // char32_t == wchar_t => ambiguous
 …
         // ostype & ?|?( ostype &, const wchar_t * );
         ostype & ?|?( ostype &, const void * );
-        void & ?|?( ostype &, const void * );
         // manipulators
         ostype & ?|?( ostype &, ostype & (*)( ostype & ) );
+        void ?|?( ostype &, ostype & (*)( ostype & ) );
+        ostype & nl( ostype & );
+        ostype & nonl( ostype & );
+        ostype & endl( ostype & );
         ostype & sep( ostype & );
         ostype & sepTuple( ostype & );
 …
         ostype & sepDisable( ostype & );
         ostype & sepEnable( ostype & );
-        ostype & nlOn( ostype & );
-        ostype & nlOff( ostype & );
 } // distribution
 // tuples
+forall( dtype ostype, otype T, ttype Params | writeable( T, ostype ) | { ostype & ?|?( ostype &, Params ); } ) {
+        ostype & ?|?( ostype & os, T arg, Params rest );
+        void ?|?( ostype & os, T arg, Params rest );
+} // distribution
+forall( dtype ostype, otype T, ttype Params | writeable( T, ostype ) | { ostype & ?|?( ostype &, Params ); } )
+ostype & ?|?( ostype & os, T arg, Params rest );
 // writes the range [begin, end) to the given stream
+forall( dtype ostype, otype elt_type | writeable( elt_type, ostype ), otype iterator_type | iterator( iterator_type, elt_type ) ) {
+        void write( iterator_type begin, iterator_type end, ostype & os );
+        void write_reverse( iterator_type begin, iterator_type end, ostype & os );
+} // distribution
+forall( dtype ostype, otype elt_type | writeable( elt_type, ostype ), otype iterator_type | iterator( iterator_type, elt_type ) )
+void write( iterator_type begin, iterator_type end, ostype & os );
+forall( dtype ostype, otype elt_type | writeable( elt_type, ostype ), otype iterator_type | iterator( iterator_type, elt_type ) )
+void write_reverse( iterator_type begin, iterator_type end, ostype & os );
 //---------------------------------------
 …
         // manipulators
         istype & ?|?( istype &, istype & (*)( istype & ) );
         istype & nl( istype & is );
+        istype & endl( istype & is );
 } // distribution
 …
 #include <time_t.hfa>                                                                   // Duration (constructors) / Time (constructors)
+#include <time_t.hfa>                                                                           // Duration (constructors) / Time (constructors)
+forall( dtype ostype | ostream( ostype ) ) {
+        ostype & ?|?( ostype & os, Duration dur );
+        void ?|?( ostype & os, Duration dur );
+        ostype & ?|?( ostype & os, Time time );
+        void ?|?( ostype & os, Time time );
+} // distribution
+forall( dtype ostype | ostream( ostype ) ) ostype & ?|?( ostype & os, Duration dur );
+forall( dtype ostype | ostream( ostype ) ) ostype & ?|?( ostype & os, Time time );
 // Local Variables: //

libcfa/src/iterator.cfa

r515a037	rcdc02f2
10	10	// Created On : Wed May 27 17:56:53 2015
11	11	// Last Modified By : Peter A. Buhr
12		// Last Modified On : ~~Fri Nov 2 07:17:37~~ 2018
	12	// Last Modified On : Wed Sep 26 18:23:10 2018
13	13	// Update Count : 29
14	14	//

libcfa/src/rational.cfa

-              r515a037
+              rcdc02f2
 // Created On       : Wed Apr  6 17:54:28 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Dec 11 22:02:29 2018
 // Update Count     : 168
+// Last Modified On : Sat Jun  2 09:24:33 2018
+// Update Count     : 162
 //
 …
         static RationalImpl simplify( RationalImpl & n, RationalImpl & d ) {
                 if ( d == (RationalImpl){0} ) {
                         serr | "Invalid rational number construction: denominator cannot be equal to 0.";
+                        serr | "Invalid rational number construction: denominator cannot be equal to 0." | endl;
                         exit( EXIT_FAILURE );
                 } // exit
 …
         } // ?|?
+        forall( dtype ostype | ostream( ostype ) | { ostype & ?|?( ostype &, RationalImpl ); } ) {
+                ostype & ?|?( ostype & os, Rational(RationalImpl) r ) {
+                        return os | r.numerator | '/' | r.denominator;
+                } // ?|?
+                void ?|?( ostype & os, Rational(RationalImpl) r ) {
+                        (ostype)(os | r); if ( getANL( os ) ) nl( os );
+                } // ?|?
+        } // distribution
+        forall( dtype ostype | ostream( ostype ) | { ostype & ?|?( ostype &, RationalImpl ); } )
+        ostype & ?|?( ostype & os, Rational(RationalImpl ) r ) {
+                return os | r.numerator | '/' | r.denominator;
+        } // ?|?
 } // distribution

libcfa/src/rational.hfa

-              r515a037
+              rcdc02f2
 // Created On       : Wed Apr  6 17:56:25 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Dec  4 23:07:46 2018
 // Update Count     : 106
+// Last Modified On : Sat Jun  2 09:10:01 2018
+// Update Count     : 105
 //
 …
         istype & ?|?( istype &, Rational(RationalImpl) & );
+        forall( dtype ostype | ostream( ostype ) | { ostype & ?|?( ostype &, RationalImpl ); } ) {
+                ostype & ?|?( ostype &, Rational(RationalImpl) );
+                void ?|?( ostype &, Rational(RationalImpl) );
+        } // distribution
+        forall( dtype ostype | ostream( ostype ) | { ostype & ?|?( ostype &, RationalImpl ); } )
+        ostype & ?|?( ostype &, Rational(RationalImpl ) );
 } // distribution

libcfa/src/time.cfa

-              r515a037
+              rcdc02f2
 // Created On       : Tue Mar 27 13:33:14 2018
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Dec 11 21:32:15 2018
 // Update Count     : 53
+// Last Modified On : Sun May  6 22:26:00 2018
+// Update Count     : 37
 //
 …
+forall( dtype ostype | ostream( ostype ) ) {
+        ostype & ?|?( ostype & os, Duration dur ) with( dur ) {
+                (ostype)(os | tv / TIMEGRAN);                                   // print seconds
+                long int ns = (tv < 0 ? -tv : tv) % TIMEGRAN;   // compute nanoseconds
+                if ( ns != 0 ) {                                                                // some ?
+                        char buf[16];
+                        (ostype)(os | nanomsd( ns, buf ));                      // print nanoseconds
+                } // if
+                return os;
+        } // ?|?
+        void ?|?( ostype & os, Duration dur ) with( dur ) {
+                (ostype)(os | dur); if ( getANL( os ) ) nl( os );
+        } // ?|?
+} // distribution
+forall( dtype ostype | ostream( ostype ) )
+ostype & ?|?( ostype & os, Duration dur ) with( dur ) {
+        os | tv / TIMEGRAN;                                                                     // print seconds
+        long int ns = (tv < 0 ? -tv : tv) % TIMEGRAN;           // compute nanoseconds
+        if ( ns != 0 ) {                                                                        // some ?
+                char buf[16];
+                os | nanomsd( ns, buf );                                                // print nanoseconds
+        } // if
+        return os;
+} // ?|?
 …
 } // strftime
+forall( dtype ostype | ostream( ostype ) ) {
+        ostype & ?|?( ostype & os, Time time ) with( time ) {
+                char buf[32];                                                                   // at least 26
+                time_t s = tv / TIMEGRAN;
+                ctime_r( &s, (char *)&buf );                                    // 26 characters: "Wed Jun 30 21:49:08 1993\n"
+                buf[24] = '\0';                                                                 // remove trailing '\n'
+                long int ns = (tv < 0 ? -tv : tv) % TIMEGRAN;   // compute nanoseconds
+                if ( ns == 0 ) {                                                                // none ?
+                        (ostype)(os | buf);                                                     // print date/time/year
+                } else {
+                        buf[19] = '\0';                                                         // truncate to "Wed Jun 30 21:49:08"
+                        char buf2[16];
+                        nanomsd( ns, buf2 );                                            // compute nanoseconds
+                        (ostype)(os | buf | buf2 | ' ' | &buf[20]);     // print date/time, nanoseconds and year
+                } // if
+                return os;
+        } // ?|?
+        void ?|?( ostype & os, Time time ) with( time ) {
+                (ostype)(os | time); if ( getANL( os ) ) nl( os );
+        } // ?|?
+} // distribution
+forall( dtype ostype | ostream( ostype ) )
+ostype & ?|?( ostype & os, Time time ) with( time ) {
+        char buf[32];                                                                           // at least 26
+        time_t s = tv / TIMEGRAN;
+    ctime_r( &s, (char *)&buf );                                                // 26 characters: "Wed Jun 30 21:49:08 1993\n"
+        buf[24] = '\0';                                                                         // remove trailing '\n'
+        long int ns = (tv < 0 ? -tv : tv) % TIMEGRAN;           // compute nanoseconds
+        if ( ns == 0 ) {                                                                        // none ?
+                os | buf;                                                                               // print date/time/year
+        } else {
+                buf[19] = '\0';                                                                 // truncate to "Wed Jun 30 21:49:08"
+                os | buf;                                                                               // print date/time
+                char buf2[16];
+                nanomsd( ns, buf2 );                                                    // compute nanoseconds
+                os | buf2 | ' ' | &buf[20];                                             // print nanoseconds and year
+        } // if
+        return os;
+} // ?|?
 // Local Variables: //

src/Parser/DeclarationNode.cc

-              r515a037
+              rcdc02f2
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Nov  1 20:54:26 2018
 // Update Count     : 1108
+// Last Modified On : Fri Jul 20 14:56:54 2018
+// Update Count     : 1107
 //
 …
+}
 DeclarationNode * DeclarationNode::newTypeof( ExpressionNode * expr, bool basetypeof ) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = new TypeData( basetypeof ? TypeData::Basetypeof : TypeData::Typeof );
+DeclarationNode * DeclarationNode::newTypeof( ExpressionNode * expr ) {
+        DeclarationNode * newnode = new DeclarationNode;
+        newnode->type = new TypeData( TypeData::Typeof );
         newnode->type->typeexpr = expr;
         return newnode;

src/Parser/ParseNode.h

-              r515a037
+              rcdc02f2
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Nov  1 20:54:53 2018
 // Update Count     : 854
+// Last Modified On : Sat Aug  4 09:39:40 2018
+// Update Count     : 853
 //
 …
         static DeclarationNode * newBitfield( ExpressionNode * size );
         static DeclarationNode * newTuple( DeclarationNode * members );
         static DeclarationNode * newTypeof( ExpressionNode * expr, bool basetypeof = false );
+        static DeclarationNode * newTypeof( ExpressionNode * expr );
         static DeclarationNode * newAttr( const std::string *, ExpressionNode * expr ); // @ attributes
         static DeclarationNode * newAttr( const std::string *, DeclarationNode * type ); // @ attributes

src/Parser/TypeData.cc

-              r515a037
+              rcdc02f2
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Nov  2 07:54:26 2018
 // Update Count     : 624
+// Last Modified On : Fri Jul 20 14:39:31 2018
+// Update Count     : 622
 //
 …
                 break;
           case Typeof:
-          case Basetypeof:
                 // typeexpr = new Typeof_t;
                 typeexpr = nullptr;
 …
                 break;
           case Typeof:
-          case Basetypeof:
                 // delete typeexpr->expr;
                 delete typeexpr;
 …
                 break;
           case Typeof:
-          case Basetypeof:
                 newtype->typeexpr = maybeClone( typeexpr );
                 break;
 …
                 } // if
                 break;
-          case Basetypeof:
-                os << "base-";
-                #if defined(__GNUC__) && __GNUC__ >= 7
-                        __attribute__((fallthrough));
-                #endif
           case Typeof:
                 os << "type-of expression ";
 …
           case Tuple:
           case Typeof:
-          case Basetypeof:
           case Builtin:
                 assertf(false, "Tried to get leaf name from kind without a name: %d", kind);
 …
         switch ( td->kind ) {
           case TypeData::Unknown:
                         // fill in implicit int
                         return new BasicType( buildQualifiers( td ), BasicType::SignedInt );
+                // fill in implicit int
+                return new BasicType( buildQualifiers( td ), BasicType::SignedInt );
           case TypeData::Basic:
                         return buildBasicType( td );
+                return buildBasicType( td );
           case TypeData::Pointer:
                         return buildPointer( td );
+                return buildPointer( td );
           case TypeData::Array:
                         return buildArray( td );
+                return buildArray( td );
           case TypeData::Reference:
                         return buildReference( td );
+                return buildReference( td );
           case TypeData::Function:
                         return buildFunction( td );
+                return buildFunction( td );
           case TypeData::AggregateInst:
                         return buildAggInst( td );
+                return buildAggInst( td );
           case TypeData::EnumConstant:
                         // the name gets filled in later -- by SymTab::Validate
                         return new EnumInstType( buildQualifiers( td ), "" );
+                // the name gets filled in later -- by SymTab::Validate
+                return new EnumInstType( buildQualifiers( td ), "" );
           case TypeData::SymbolicInst:
                         return buildSymbolicInst( td );
+                return buildSymbolicInst( td );
           case TypeData::Tuple:
                         return buildTuple( td );
+                return buildTuple( td );
           case TypeData::Typeof:
+          case TypeData::Basetypeof:
+                        return buildTypeof( td );
+                return buildTypeof( td );
           case TypeData::Builtin:
                         if (td->builtintype == DeclarationNode::Zero) {
                                 return new ZeroType( noQualifiers );
+                        }
                         else if (td->builtintype == DeclarationNode::One) {
                                 return new OneType( noQualifiers );
+                        }
                         else {
                                 return new VarArgsType( buildQualifiers( td ) );
+                        }
+                if(td->builtintype == DeclarationNode::Zero) {
+                        return new ZeroType( noQualifiers );
+                }
+                else if(td->builtintype == DeclarationNode::One) {
+                        return new OneType( noQualifiers );
+                }
+                else {
+                        return new VarArgsType( buildQualifiers( td ) );
+                }
           case TypeData::GlobalScope:
                         return new GlobalScopeType();
+                return new GlobalScopeType();
                 case TypeData::Qualified:
                         return new QualifiedType( buildQualifiers( td ), typebuild( td->qualified.parent ), typebuild( td->qualified.child ) );
+                return new QualifiedType( buildQualifiers( td ), typebuild( td->qualified.parent ), typebuild( td->qualified.child ) );
           case TypeData::Symbolic:
           case TypeData::Enum:
           case TypeData::Aggregate:
                         assert( false );
+                assert( false );
         } // switch
 …
 TypeofType * buildTypeof( const TypeData * td ) {
         assert( td->kind == TypeData::Typeof || td->kind == TypeData::Basetypeof );
+        assert( td->kind == TypeData::Typeof );
         assert( td->typeexpr );
         // assert( td->typeexpr->expr );
+        return new TypeofType{
+                buildQualifiers( td ), td->typeexpr->build(), td->kind == TypeData::Basetypeof };
+        return new TypeofType( buildQualifiers( td ), td->typeexpr->build() );
 } // buildTypeof

src/Parser/TypeData.h

-              r515a037
+              rcdc02f2
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Nov  1 20:56:46 2018
 // Update Count     : 196
+// Last Modified On : Fri Jul 20 13:56:40 2018
+// Update Count     : 195
 //
 …
 struct TypeData {
         enum Kind { Basic, Pointer, Reference, Array, Function, Aggregate, AggregateInst, Enum, EnumConstant, Symbolic,
                                 SymbolicInst, Tuple, Typeof, Basetypeof, Builtin, GlobalScope, Qualified, Unknown };
+                                SymbolicInst, Tuple, Typeof, Builtin, GlobalScope, Qualified, Unknown };
         struct Aggregate_t {

src/Parser/lex.ll

r515a037	rcdc02f2
10	10	* Created On : Sat Sep 22 08:58:10 2001
11	11	* Last Modified By : Peter A. Buhr
12		* Last Modified On : ~~Thu Nov 1 20:57:3~~5 2018
	12	* Last Modified On : Sat Oct 20 09:42:45 2018
13	13	* Update Count : 687
14	14	*/

src/Parser/parser.yy

-              r515a037
+              rcdc02f2
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Nov  8 18:08:23 2018
 // Update Count     : 4052
+// Last Modified On : Sun Oct 21 08:27:29 2018
+// Update Count     : 4045
 //
 …
 ForCtrl * forCtrl( ExpressionNode * type, string * index, ExpressionNode * start, enum OperKinds compop, ExpressionNode * comp, ExpressionNode * inc ) {
         ConstantExpr * constant = dynamic_cast<ConstantExpr *>(type->get_expr());
+        ConstantExpr *constant = dynamic_cast<ConstantExpr *>(type->get_expr());
         if ( constant && (constant->get_constant()->get_value() == "0" || constant->get_constant()->get_value() == "1") ) {
         type = new ExpressionNode( new CastExpr( maybeMoveBuild< Expression >(type), new BasicType( Type::Qualifiers(), BasicType::SignedInt ) ) );
         } // if
         return new ForCtrl(
                 distAttr( DeclarationNode::newTypeof( type, true ), DeclarationNode::newName( index )->addInitializer( new InitializerNode( start ) ) ),
+                distAttr( DeclarationNode::newTypeof( type ), DeclarationNode::newName( index )->addInitializer( new InitializerNode( start ) ) ),
                 new ExpressionNode( build_binary_val( compop, new ExpressionNode( build_varref( new string( *index ) ) ), comp ) ),
                 new ExpressionNode( build_binary_val( compop == OperKinds::LThan || compop == OperKinds::LEThan ? // choose += or -= for upto/downto
                                                                                           OperKinds::PlusAssn : OperKinds::MinusAssn, new ExpressionNode( build_varref( new string( *index ) ) ), inc ) ) );
-<<<<<<< HEAD
-=======
-} // forCtrl
-ForCtrl * forCtrl( ExpressionNode * type, ExpressionNode * index, ExpressionNode * start, enum OperKinds compop, ExpressionNode * comp, ExpressionNode * inc ) {
-        if ( NameExpr * identifier = dynamic_cast<NameExpr *>(index->get_expr()) ) {
-                return forCtrl( type, new string( identifier->name ), start, compop, comp, inc );
-        } else {
-                SemanticError( yylloc, "Expression disallowed. Only loop-index name allowed" ); return nullptr;
-        } // if
->>>>>>> master
 } // forCtrl
 …
         | FOR '(' push for_control_expression ')' statement pop
                 { $$ = new StatementNode( build_for( $4, $6 ) ); }
-        | FOR '(' ')' statement                                                         // CFA => for ( ;; )
-                { $$ = new StatementNode( build_for( new ForCtrl( (ExpressionNode * )nullptr, (ExpressionNode * )nullptr, (ExpressionNode * )nullptr ), $4 ) ); }
+        ;
 for_control_expression:
-<<<<<<< HEAD
         comma_expression_opt                                                            // CFA
+                {
 …
                         } // if
+                }
-=======
-        comma_expression                                                                        // CFA
-                { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), new ExpressionNode( build_constantInteger( *new string( "0" ) ) ),
-                                                OperKinds::LThan, $1->clone(), new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
->>>>>>> master
         | constant_expression inclexcl constant_expression      // CFA
                 { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $2, $3, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
         | constant_expression inclexcl constant_expression '~' constant_expression // CFA
                 { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $2, $3, $5 ); }
-<<<<<<< HEAD
         | comma_expression_opt ';' comma_expression                     // CFA
+                {
 …
+                }
         | comma_expression_opt ';' comma_expression_opt ';' comma_expression_opt
-=======
-        | comma_expression ';' comma_expression                         // CFA
-                { $$ = forCtrl( $3, $1, new ExpressionNode( build_constantInteger( *new string( "0" ) ) ),
-                                                OperKinds::LThan, $3->clone(), new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
-        | comma_expression ';' constant_expression inclexcl constant_expression // CFA
-                { $$ = forCtrl( $3, $1, $3->clone(), $4, $5, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
-        | comma_expression ';' constant_expression inclexcl constant_expression '~' constant_expression // CFA
-                { $$ = forCtrl( $3, $1, $3->clone(), $4, $5, $7 ); }
-        | comma_expression ';' comma_expression_opt ';' comma_expression_opt
->>>>>>> master
                 { $$ = new ForCtrl( $1, $3, $5 ); }
-        | ';' comma_expression_opt ';' comma_expression_opt
-                { $$ = new ForCtrl( (ExpressionNode * )nullptr, $2, $4 ); }
         | declaration comma_expression_opt ';' comma_expression_opt // C99, declaration has ';'
                 { $$ = new ForCtrl( $1, $2, $4 ); }
 …
 indirect_type:
         TYPEOF '(' type ')'                                                                     // GCC: typeof( x ) y;
+        TYPEOF '(' type ')'                                                                     // GCC: typeof(x) y;
                 { $$ = $3; }
         | TYPEOF '(' comma_expression ')'                                       // GCC: typeof( a+b ) y;
+        | TYPEOF '(' comma_expression ')'                                       // GCC: typeof(a+b) y;
                 { $$ = DeclarationNode::newTypeof( $3 ); }
-<<<<<<< HEAD
         | BASETYPEOF '(' type ')'                                                       // CFA: basetypeof(x) y;
                 { $$ = $3; }
 …
                 { $$ = DeclarationNode::newTypeof( $3 ); }
         | ATTR_TYPEGENname '(' type ')'                                         // CFA: e.g., @type(x) y;
-=======
-        | BASETYPEOF '(' type ')'                                                       // CFA: basetypeof( x ) y;
-                { $$ = DeclarationNode::newTypeof( new ExpressionNode( new TypeExpr( maybeMoveBuildType( $3 ) ) ), true ); }
-        | BASETYPEOF '(' comma_expression ')'                           // CFA: basetypeof( a+b ) y;
-                { $$ = DeclarationNode::newTypeof( $3, true ); }
-        | ATTR_TYPEGENname '(' type ')'                                         // CFA: e.g., @type( x ) y;
->>>>>>> master
                 { $$ = DeclarationNode::newAttr( $1, $3 ); }
         | ATTR_TYPEGENname '(' comma_expression ')'                     // CFA: e.g., @type( a+b ) y;
+        | ATTR_TYPEGENname '(' comma_expression ')'                     // CFA: e.g., @type(a+b) y;
                 { $$ = DeclarationNode::newAttr( $1, $3 ); }
         | ZERO_T                                                                                        // CFA

src/ResolvExpr/AlternativeFinder.cc

-              r515a037
+              rcdc02f2
 // Created On       : Sat May 16 23:52:08 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Nov  1 21:00:56 2018
 // Update Count     : 34
+// Last Modified On : Sat Feb 17 11:19:39 2018
+// Update Count     : 33
 //
 …
                 /// Gets name from untyped member expression (member must be NameExpr)
                 const std::string& get_member_name( UntypedMemberExpr *memberExpr ) {
-                        if ( dynamic_cast< ConstantExpr * >( memberExpr->get_member() ) ) {
-                                SemanticError( memberExpr, "Indexed access to struct fields unsupported: " );
-                        } // if
                         NameExpr * nameExpr = dynamic_cast< NameExpr * >( memberExpr->get_member() );
                         assert( nameExpr );

src/ResolvExpr/ResolveTypeof.cc

-              r515a037
+              rcdc02f2
                 std::cerr << std::endl;
 #endif
+                // pass on null expression
+                if ( ! typeofType->expr ) return typeofType;
+                bool isBasetypeof = typeofType->is_basetypeof;
+                auto oldQuals = typeofType->get_qualifiers().val;
+                Type* newType;
+                if ( TypeExpr* tyExpr = dynamic_cast<TypeExpr*>(typeofType->expr) ) {
+                        // typeof wrapping type
+                        newType = tyExpr->type;
+                        tyExpr->type = nullptr;
+                        delete tyExpr;
+                } else {
+                        // typeof wrapping expression
+                if ( typeofType->expr ) {
                         Expression * newExpr = resolveInVoidContext( typeofType->expr, indexer );
                         assert( newExpr->result && ! newExpr->result->isVoid() );
                         newType = newExpr->result;
+                        Type * newType = newExpr->result;
                         newExpr->result = nullptr;
                         delete typeofType;
                         delete newExpr;
+                }
+                // clear qualifiers for base, combine with typeoftype quals in any case
+                if ( isBasetypeof ) {
+                        // replace basetypeof(<enum>) by int
+                        if ( dynamic_cast<EnumInstType*>(newType) ) {
+                                Type* newerType =
+                                        new BasicType{ newType->get_qualifiers(), BasicType::SignedInt,
+                                        newType->attributes };
+                                delete newType;
+                                newType = newerType;
+                        }
+                        newType->get_qualifiers().val
+                                = ( newType->get_qualifiers().val & ~Type::Qualifiers::Mask ) | oldQuals;
+                } else {
+                        newType->get_qualifiers().val |= oldQuals;
+                }
+                return newType;
+                        return newType;
+                } // if
+                return typeofType;
+        }
 } // namespace ResolvExpr

src/SynTree/Type.h

-              r515a037
+              rcdc02f2
 class TypeofType : public Type {
   public:
+        Expression *expr;    ///< expression to take the type of
+        bool is_basetypeof;  ///< true iff is basetypeof type
+        TypeofType( const Type::Qualifiers & tq, Expression *expr, const std::list< Attribute * > & attributes = std::list< Attribute * >() );
+        TypeofType( const Type::Qualifiers & tq, Expression *expr, bool is_basetypeof,
+                const std::list< Attribute * > & attributes = std::list< Attribute * >() );
+        Expression *expr;
+        TypeofType( const Type::Qualifiers & tq, Expression *expr, const std::list< Attribute * > & attributes = std::list< Attribute * >()  );
         TypeofType( const TypeofType& );
         virtual ~TypeofType();

src/SynTree/TypeofType.cc

-              r515a037
+              rcdc02f2
 class Attribute;
+TypeofType::TypeofType( const Type::Qualifiers &tq, Expression *expr,
+        const std::list< Attribute * > & attributes )
+: Type( tq, attributes ), expr( expr ), is_basetypeof(false) {}
+TypeofType::TypeofType( const Type::Qualifiers &tq, Expression *expr, const std::list< Attribute * > & attributes ) : Type( tq, attributes ), expr( expr ) {
+}
+TypeofType::TypeofType( const Type::Qualifiers &tq, Expression *expr, bool is_basetypeof,
+        const std::list< Attribute * > & attributes )
+: Type( tq, attributes ), expr( expr ), is_basetypeof( is_basetypeof ) {}
+TypeofType::TypeofType( const TypeofType &other )
+: Type( other ), expr( maybeClone( other.expr ) ), is_basetypeof( other.is_basetypeof ) {}
+TypeofType::TypeofType( const TypeofType &other ) : Type( other ), expr( maybeClone( other.expr ) ) {
+}
 TypeofType::~TypeofType() {
 …
 void TypeofType::print( std::ostream &os, Indenter indent ) const {
         Type::print( os, indent );
-        if ( is_basetypeof ) { os << "base-"; }
         os << "type-of expression ";
         if ( expr ) {

tests/.expect/alloc-ERROR.txt

-              r515a037
+              rcdc02f2
 alloc.cfa:265:1 error: No reasonable alternatives for expression Applying untyped:
+alloc.c:265:1 error: No reasonable alternatives for expression Applying untyped:
   Name: ?=?
 ...to:
 …
 alloc.cfa:266:1 error: No reasonable alternatives for expression Applying untyped:
+alloc.c:266:1 error: No reasonable alternatives for expression Applying untyped:
   Name: ?=?
 ...to:
 …
 alloc.cfa:267:1 error: No reasonable alternatives for expression Applying untyped:
+alloc.c:267:1 error: No reasonable alternatives for expression Applying untyped:
   Name: ?=?
 ...to:
 …
 alloc.cfa:268:1 error: No reasonable alternatives for expression Applying untyped:
+alloc.c:268:1 error: No reasonable alternatives for expression Applying untyped:
   Name: ?=?
 ...to:

tests/.expect/castError.txt

-              r515a037
+              rcdc02f2
 castError.cfa:7:1 error: Cannot choose between 3 alternatives for expression
+castError.c:7:1 error: Cannot choose between 3 alternatives for expression
 Cast of:
   Name: f
 ... to:
   char Alternatives are:
+  charAlternatives are:
 Cost ( 1, 0, 0, 0 ): Cast of:
      Variable Expression: f: function

tests/.expect/completeTypeError.txt

-              r515a037
+              rcdc02f2
 completeTypeError.cfa:33:1 error: No reasonable alternatives for expression Applying untyped:
+completeTypeError.c:33:1 error: No reasonable alternatives for expression Applying untyped:
   Name: *?
 ...to:
   Name: v
 completeTypeError.cfa:34:1 error: No reasonable alternatives for expression Applying untyped:
+completeTypeError.c:34:1 error: No reasonable alternatives for expression Applying untyped:
   Name: *?
 ...to:
   Name: y
 completeTypeError.cfa:35:1 error: No reasonable alternatives for expression Applying untyped:
+completeTypeError.c:35:1 error: No reasonable alternatives for expression Applying untyped:
   Name: foo
 ...to:
   Name: v
 completeTypeError.cfa:36:1 error: No reasonable alternatives for expression Applying untyped:
+completeTypeError.c:36:1 error: No reasonable alternatives for expression Applying untyped:
   Name: baz
 ...to:
   Name: v
 completeTypeError.cfa:37:1 error: No reasonable alternatives for expression Applying untyped:
+completeTypeError.c:37:1 error: No reasonable alternatives for expression Applying untyped:
   Name: quux
 ...to:
   Name: v
 completeTypeError.cfa:58:1 error: No reasonable alternatives for expression Applying untyped:
+completeTypeError.c:58:1 error: No reasonable alternatives for expression Applying untyped:
   Name: baz
 ...to:
   Name: y
 completeTypeError.cfa:59:1 error: No reasonable alternatives for expression Applying untyped:
+completeTypeError.c:59:1 error: No reasonable alternatives for expression Applying untyped:
   Name: quux
 ...to:
   Name: y
 completeTypeError.cfa:60:1 error: No reasonable alternatives for expression Applying untyped:
+completeTypeError.c:60:1 error: No reasonable alternatives for expression Applying untyped:
   Name: *?
 ...to:
   Name: y
 completeTypeError.cfa:72:1 error: No reasonable alternatives for expression Applying untyped:
+completeTypeError.c:72:1 error: No reasonable alternatives for expression Applying untyped:
   Name: baz
 ...to:

tests/.expect/declarationErrors.txt

-              r515a037
+              rcdc02f2
 declarationErrors.cfa:16:1 error: duplicate static in declaration of x1: static const volatile short int
+declarationErrors.c:16:1 error: duplicate static in declaration of x1: static const volatile short int
 declarationErrors.cfa:17:1 error: conflicting extern & static in declaration of x2: extern const volatile short int
+declarationErrors.c:17:1 error: conflicting extern & static in declaration of x2: extern const volatile short int
 declarationErrors.cfa:18:1 error: conflicting extern & auto, conflicting extern & static, conflicting extern & static, duplicate extern in declaration of x3: extern const volatile short int
+declarationErrors.c:18:1 error: conflicting extern & auto, conflicting extern & static, conflicting extern & static, duplicate extern in declaration of x3: extern const volatile short int
 declarationErrors.cfa:19:1 error: duplicate static in declaration of x4: static const volatile instance of const volatile struct __anonymous0
+declarationErrors.c:19:1 error: duplicate static in declaration of x4: static const volatile instance of const volatile struct __anonymous0
   with members
     i: int
 …
 declarationErrors.cfa:20:1 error: duplicate const, duplicate static, duplicate volatile in declaration of x5: static const volatile instance of const volatile struct __anonymous1
+declarationErrors.c:20:1 error: duplicate const, duplicate static, duplicate volatile in declaration of x5: static const volatile instance of const volatile struct __anonymous1
   with members
     i: int
 …
 declarationErrors.cfa:22:1 error: duplicate static in declaration of x6: static const volatile Int
+declarationErrors.c:22:1 error: duplicate static in declaration of x6: static const volatile Int
 declarationErrors.cfa:24:1 error: duplicate const in declaration of f01: static inline function
+declarationErrors.c:24:1 error: duplicate const in declaration of f01: static inline function
   with no parameters
   returning const volatile int
 declarationErrors.cfa:25:1 error: duplicate volatile in declaration of f02: static inline function
+declarationErrors.c:25:1 error: duplicate volatile in declaration of f02: static inline function
   with no parameters
   returning const volatile int
 declarationErrors.cfa:26:1 error: duplicate const in declaration of f03: static inline function
+declarationErrors.c:26:1 error: duplicate const in declaration of f03: static inline function
   with no parameters
   returning const volatile int
 declarationErrors.cfa:27:1 error: duplicate volatile in declaration of f04: static inline function
+declarationErrors.c:27:1 error: duplicate volatile in declaration of f04: static inline function
   with no parameters
   returning const volatile int
 declarationErrors.cfa:28:1 error: duplicate const in declaration of f05: static inline function
+declarationErrors.c:28:1 error: duplicate const in declaration of f05: static inline function
   with no parameters
   returning const volatile int
 declarationErrors.cfa:29:1 error: duplicate volatile in declaration of f06: static inline function
+declarationErrors.c:29:1 error: duplicate volatile in declaration of f06: static inline function
   with no parameters
   returning const volatile int
 declarationErrors.cfa:30:1 error: duplicate const in declaration of f07: static inline function
+declarationErrors.c:30:1 error: duplicate const in declaration of f07: static inline function
   with no parameters
   returning const volatile int
 declarationErrors.cfa:31:1 error: duplicate const, duplicate volatile in declaration of f08: static inline function
+declarationErrors.c:31:1 error: duplicate const, duplicate volatile in declaration of f08: static inline function
   with no parameters
   returning const volatile int
 declarationErrors.cfa:33:1 error: duplicate const, duplicate volatile in declaration of f09: static inline function
+declarationErrors.c:33:1 error: duplicate const, duplicate volatile in declaration of f09: static inline function
   with no parameters
   returning const volatile int
 declarationErrors.cfa:34:1 error: duplicate const, duplicate _Atomic, duplicate _Atomic, duplicate const, duplicate restrict, duplicate volatile in declaration of f09: static inline function
+declarationErrors.c:34:1 error: duplicate const, duplicate _Atomic, duplicate _Atomic, duplicate const, duplicate restrict, duplicate volatile in declaration of f09: static inline function
   with no parameters
   returning const restrict volatile _Atomic int

tests/.expect/loopctrl.txt

-              r515a037
+              rcdc02f2
-N N N N N N N N N N
-1 2 3 4 5 6 7 8 9
-9 8 7 6 5 4 3 2 1
 6 9
 (0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)

tests/.expect/nested-types-ERR1.txt

r515a037	rcdc02f2
1		nested-types.cfa:70:1 error: Use of undefined type T
	1	nested-types.c:70:1 error: Use of undefined type T

tests/.expect/nested-types-ERR2.txt

-              r515a037
+              rcdc02f2
 nested-types.cfa:73:1 error: Use of undefined global type Z
 nested-types.cfa:74:1 error: Qualified type requires an aggregate on the left, but has: signed int
 nested-types.cfa:75:1 error: Undefined type in qualified type: Qualified Type:
+nested-types.c:73:1 error: Use of undefined global type Z
+nested-types.c:74:1 error: Qualified type requires an aggregate on the left, but has: signed int
+nested-types.c:75:1 error: Undefined type in qualified type: Qualified Type:
   instance of struct S with body 1
   instance of type Z (not function type)

tests/.expect/scopeErrors.txt

r515a037	rcdc02f2
1		scopeErrors.cfa:2:1 error: duplicate object definition for thisIsAnError: signed int
2		scopeErrors.cfa:20:1 error: duplicate function definition for butThisIsAnError: function
	1	scopeErrors.c:2:1 error: duplicate object definition for thisIsAnError: signed int
	2	scopeErrors.c:20:1 error: duplicate function definition for butThisIsAnError: function
3	3	... with parameters
4	4	double

tests/.expect/typedefRedef-ERR1.txt

r515a037	rcdc02f2
1		typedefRedef.cfa:4:1 error: Cannot redefine typedef: Foo
2		typedefRedef.cfa:60:1 error: Cannot redefine typedef: ARR
	1	typedefRedef.c:4:1 error: Cannot redefine typedef: Foo
	2	typedefRedef.c:60:1 error: Cannot redefine typedef: ARR

tests/Makefile.am

-              r515a037
+              rcdc02f2
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
 ## Last Modified On : Tue Nov 20 11:18:51 2018
 ## Update Count     : 68
+## Last Modified On : Wed Jun  6 16:42:20 2018
+## Update Count     : 49
 ###############################################################################
 AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
-include $(top_srcdir)/src/cfa.make
 debug=yes
 …
 AM_CFLAGS += ${DEBUG_FLAGS} ${INSTALL_FLAGS} ${ARCH_FLAGS}
 CC = @CFACC@
 …
 .PHONY: list .validate
+.INTERMEDIATE: .validate .validate.cfa
+EXTRA_PROGRAMS = avl_test # build but do not install
+.INTERMEDIATE: .validate .validate.c
+EXTRA_PROGRAMS = fstream_test avl_test # build but do not install
+fstream_test_SOURCES = fstream_test.c
 avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c
 …
         @+${TEST_PY} --list ${concurrent}
 .validate: .validate.cfa
         $(CFACOMPILE) .validate.cfa -fsyntax-only -Wall -Wextra -Werror
+.validate: .validate.c
+        $(COMPILE) .validate.c -fsyntax-only -Wall -Wextra -Werror
+.validate.cfa:
+        @echo "int main() { return 0; }" > ${@}
+dummy_hack.c:
+.validate.c:
         @echo "int main() { return 0; }" > ${@}
 …
 #----------------------------------------------------------------------------------------------------------------
+# implicit rule so not all test require a rule
+% : %.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+# implicit rule so not all test require a rule
+% : %.c $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+declarationSpecifier: declarationSpecifier.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 % : %.cfa $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+gccExtensions : gccExtensions.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 declarationSpecifier: declarationSpecifier.cfa $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+extension : extension.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 gccExtensions : gccExtensions.cfa $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+attributes : attributes.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 extension : extension.cfa $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+functions: functions.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 attributes : attributes.cfa $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+KRfunctions : KRfunctions.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 functions: functions.cfa $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+sched-ext-parse : sched-ext-parse.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+KRfunctions : KRfunctions.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+sched-ext-parse : sched-ext-parse.c $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+gmp : gmp.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -lgmp $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+gmp : gmp.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -lgmp $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 #builtins
 builtins/sync: builtins/sync.c $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
+builtins/sync: builtins/sync.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
 #------------------------------------------------------------------------------
+#To make errors path independent we need to cd into the correct directories
+completeTypeError : completeTypeError.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+#To make errors path independent we need to cd into the correct directories
+completeTypeError : completeTypeError.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+typedefRedef-ERR1: typedefRedef.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 typedefRedef-ERR1: typedefRedef.cfa $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+alloc-ERROR: alloc.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 alloc-ERROR: alloc.cfa $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+fallthrough-ERROR: fallthrough.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 fallthrough-ERROR: fallthrough.cfa $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+nested-types-ERR1: nested-types.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+nested-types-ERR1: nested-types.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+nested-types-ERR2: nested-types.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+nested-types-ERR2: nested-types.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 # Constructor/destructor tests
 raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 raii/memberCtors-ERR1: raii/memberCtors.c $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+raii/memberCtors-ERR1: raii/memberCtors.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 raii/ctor-autogen-ERR1: raii/ctor-autogen.c $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+raii/ctor-autogen-ERR1: raii/ctor-autogen.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 # Warnings
 warnings/self-assignment: warnings/self-assignment.c $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
+warnings/self-assignment: warnings/self-assignment.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only

tests/Makefile.in

-              r515a037
+              rcdc02f2
 build_triplet = @build@
 host_triplet = @host@
 EXTRA_PROGRAMS = avl_test$(EXEEXT)
+EXTRA_PROGRAMS = fstream_test$(EXEEXT) avl_test$(EXEEXT)
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 …
 avl_test_OBJECTS = $(am_avl_test_OBJECTS)
 avl_test_LDADD = $(LDADD)
+am_fstream_test_OBJECTS = fstream_test.$(OBJEXT)
+fstream_test_OBJECTS = $(am_fstream_test_OBJECTS)
+fstream_test_LDADD = $(LDADD)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 …
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 =
 SOURCES = $(avl_test_SOURCES)
 DIST_SOURCES = $(avl_test_SOURCES)
+SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES)
+DIST_SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
 …
 CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.py.in \
+        $(srcdir)/test.py $(top_srcdir)/automake/depcomp \
+        $(top_srcdir)/src/cfa.make
+        $(srcdir)/test.py $(top_srcdir)/automake/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 …
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
-CFACOMPILE = $(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCFACOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CFACC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) \
-        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CFA = $(am__v_CFA_@AM_V@)
-am__v_CFA_ = $(am__v_CFA_@AM_DEFAULT_V@)
-am__v_CFA_0 = @echo "  CFA     " $@;
-am__v_CFA_1 =
-AM_V_JAVAC = $(am__v_JAVAC_@AM_V@)
-am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@)
-am__v_JAVAC_0 = @echo "  JAVAC   " $@;
-am__v_JAVAC_1 =
-AM_V_GOC = $(am__v_GOC_@AM_V@)
-am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@)
-am__v_GOC_0 = @echo "  GOC     " $@;
-am__v_GOC_1 =
-UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
-AM_V_UPP = $(am__v_UPP_@AM_V@)
-am__v_UPP_ = $(am__v_UPP_@AM_DEFAULT_V@)
-am__v_UPP_0 = @echo "  UPP     " $@;
-am__v_UPP_1 =
 debug = yes
 installed = no
 …
         ${INSTALL_FLAGS} ${ARCH_FLAGS}
 PRETTY_PATH = cd ${srcdir} &&
+fstream_test_SOURCES = fstream_test.c
 avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c
 all: all-am
 .SUFFIXES:
 .SUFFIXES: .c .cfa .lo .o .obj .validate
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/src/cfa.make $(am__configure_deps)
+.SUFFIXES: .c .o .obj .validate
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
         @for dep in $?; do \
           case '$(am__configure_deps)' in \
 …
             cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
         esac;
-$(top_srcdir)/src/cfa.make $(am__empty):
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 …
         $(AM_V_CCLD)$(LINK) $(avl_test_OBJECTS) $(avl_test_LDADD) $(LIBS)
+fstream_test$(EXEEXT): $(fstream_test_OBJECTS) $(fstream_test_DEPENDENCIES) $(EXTRA_fstream_test_DEPENDENCIES)
+        @rm -f fstream_test$(EXEEXT)
+        $(AM_V_CCLD)$(LINK) $(fstream_test_OBJECTS) $(fstream_test_LDADD) $(LIBS)
 mostlyclean-compile:
         -rm -f *.$(OBJEXT)
 …
         -rm -f *.tab.c
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstream_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl-private.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl0.Po@am__quote@
 …
 distclean: distclean-am
         -rm -rf avltree/$(DEPDIR)
+        -rm -rf ./$(DEPDIR) avltree/$(DEPDIR)
         -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 …
 maintainer-clean: maintainer-clean-am
         -rm -rf avltree/$(DEPDIR)
+        -rm -rf ./$(DEPDIR) avltree/$(DEPDIR)
         -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 …
-.cfa.o:
-        $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-        $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-        $(am__mv) $$depbase.Tpo $$depbase.Po
-.cfa.lo:
-        $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-        $(LTCFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-        $(am__mv) $$depbase.Tpo $$depbase.Plo
 .PHONY: list .validate
 .INTERMEDIATE: .validate .validate.cfa
+.INTERMEDIATE: .validate .validate.c
 #----------------------------------------------------------------------------------------------------------------
 …
         @+${TEST_PY} --list ${concurrent}
+.validate: .validate.cfa
+        $(CFACOMPILE) .validate.cfa -fsyntax-only -Wall -Wextra -Werror
+.validate.cfa:
+        @echo "int main() { return 0; }" > ${@}
+dummy_hack.c:
+.validate: .validate.c
+        $(COMPILE) .validate.c -fsyntax-only -Wall -Wextra -Werror
+.validate.c:
         @echo "int main() { return 0; }" > ${@}
 …
 #----------------------------------------------------------------------------------------------------------------
 # implicit rule so not all test require a rule
+% : %.c $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+% : %.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+declarationSpecifier: declarationSpecifier.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+gccExtensions : gccExtensions.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+extension : extension.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+attributes : attributes.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+functions: functions.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+KRfunctions : KRfunctions.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+sched-ext-parse : sched-ext-parse.c $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+gmp : gmp.cfa $(CFACC)
+        $(PRETTY_PATH) $(CFACOMPILE) -lgmp $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+% : %.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+declarationSpecifier: declarationSpecifier.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+gccExtensions : gccExtensions.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+extension : extension.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+attributes : attributes.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+functions: functions.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+KRfunctions : KRfunctions.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+sched-ext-parse : sched-ext-parse.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+gmp : gmp.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -lgmp $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 #builtins
 builtins/sync: builtins/sync.c $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
+builtins/sync: builtins/sync.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
 #------------------------------------------------------------------------------
 #To make errors path independent we need to cd into the correct directories
 completeTypeError : completeTypeError.cfa $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 typedefRedef-ERR1: typedefRedef.cfa $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 alloc-ERROR: alloc.cfa $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 fallthrough-ERROR: fallthrough.cfa $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 nested-types-ERR1: nested-types.cfa $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 nested-types-ERR2: nested-types.cfa $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+completeTypeError : completeTypeError.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+typedefRedef-ERR1: typedefRedef.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+alloc-ERROR: alloc.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+fallthrough-ERROR: fallthrough.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+nested-types-ERR1: nested-types.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+nested-types-ERR2: nested-types.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 # Constructor/destructor tests
 raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 raii/memberCtors-ERR1: raii/memberCtors.c $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 raii/ctor-autogen-ERR1: raii/ctor-autogen.c $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -DERR2 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+raii/memberCtors-ERR1: raii/memberCtors.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
+raii/ctor-autogen-ERR1: raii/ctor-autogen.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) -DERR1 $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
 # Warnings
 warnings/self-assignment: warnings/self-assignment.c $(CFACC)
         $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
+warnings/self-assignment: warnings/self-assignment.c $(CC)
+        $(PRETTY_PATH) $(COMPILE) $(shell realpath --relative-to=${srcdir} ${<}) 2> $(abspath ${@}) -fsyntax-only
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

tests/concurrent/coroutineYield.c

-              r515a037
+              rcdc02f2
 #define __kick_rate 150000ul
 #include "long_tests.hfa"
+#include "long_tests.h"
 #ifndef PREEMPTION_RATE
 …
         while(true) {
                 #if !defined(TEST_FOREVER)
                         sout | "Coroutine 1";
+                        sout | "Coroutine 1" | endl;
                 #endif
                 yield();
                 #if !defined(TEST_FOREVER)
                         sout | "Coroutine 2";
+                        sout | "Coroutine 2" | endl;
                 #endif
                 suspend();
 …
         for(int i = 0; TEST(i < N); i++) {
                 #if !defined(TEST_FOREVER)
                         sout | "Thread 1";
+                        sout | "Thread 1" | endl;
                 #endif
                 resume(c);
                 #if !defined(TEST_FOREVER)
                         sout | "Thread 2";
+                        sout | "Thread 2" | endl;
                 #endif
                 yield();

tests/concurrent/examples/boundedBufferEXT.c

-              r515a037
+              rcdc02f2
 // Created On       : Wed Apr 18 22:52:12 2018
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Dec 11 21:55:02 2018
 // Update Count     : 9
+// Last Modified On : Thu Aug 16 08:17:03 2018
+// Update Count     : 8
 //
 …
                 sum += sums[i];
         } // for
         sout | "total:" | sum;
+        sout | "total:" | sum | endl;
+}

tests/concurrent/examples/boundedBufferINT.c

-              r515a037
+              rcdc02f2
 // Created On       : Mon Oct 30 12:45:13 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Dec 11 21:55:45 2018
 // Update Count     : 84
+// Last Modified On : Thu Aug 16 08:17:58 2018
+// Update Count     : 83
 //
 …
                 sum += sums[i];
         } // for
         sout | "total:" | sum;
+        sout | "total:" | sum | endl;
+}

tests/concurrent/examples/datingService.c

-              r515a037
+              rcdc02f2
 // Created On       : Mon Oct 30 12:56:20 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Dec 11 21:55:34 2018
 // Update Count     : 28
+// Last Modified On : Sun May 27 09:05:18 2018
+// Update Count     : 26
 //
 …
         yield( random( 100 ) );                                                         // don't all start at the same time
         unsigned int partner = girl( TheExchange, id, ccode );
         sout | "Girl:" | id | "is dating Boy at" | partner | "with ccode" | ccode;
+        sout | "Girl:" | id | "is dating Boy at" | partner | "with ccode" | ccode | endl;
         girlck[id] = partner;
 } // Girl main
 …
 thread Boy {
         DatingService & TheExchange;
+        DatingService &TheExchange;
         unsigned int id, ccode;
 }; // Boy
 …
         yield( random( 100 ) );                                                         // don't all start at the same time
         unsigned int partner = boy( TheExchange, id, ccode );
         sout | " Boy:" | id | "is dating Girl" | partner | "with ccode" | ccode;
+        sout | " Boy:" | id | "is dating Girl" | partner | "with ccode" | ccode | endl;
         boyck[id] = partner;
 } // Boy main

tests/concurrent/examples/matrixSum.c

-              r515a037
+              rcdc02f2
 // file "LICENCE" distributed with Cforall.
 //
 // matrixSum.cfa --
+// matrixSum.c --
 //
 // Author           : Peter A. Buhr
 // Created On       : Mon Oct  9 08:29:28 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Dec 11 21:54:55 2018
 // Update Count     : 15
+// Last Modified On : Thu Aug  9 09:17:30 2018
+// Update Count     : 13
 //
 …
                 total += subtotals[r];                                                  // total subtotals
         } // for
         sout | total;
+        sout | total | endl;
+}
 // Local Variables: //
 // tab-width: 4 //
 // compile-command: "cfa matrixSum.cfa" //
+// compile-command: "cfa matrixSum.c" //
 // End: //

tests/concurrent/examples/quickSort.c

-              r515a037
+              rcdc02f2
 // Created On       : Wed Dec  6 12:15:52 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Dec  4 18:00:27 2018
 // Update Count     : 167
+// Last Modified On : Thu Aug 16 08:17:41 2018
+// Update Count     : 163
 //
 …
 void usage( char * argv[] ) {
         sout | "Usage:" | argv[0] | "( -s unsorted-file [ sorted-file ] | -t size (>= 0) [ depth (>= 0) ] )";
+        sout | "Usage:" | argv[0] | "( -s unsorted-file [ sorted-file ] | -t size (>= 0) [ depth (>= 0) ] )" | endl;
         exit( EXIT_FAILURE );                                                           // TERMINATE!
 } // usage
 …
                                 &sortedfile = new( (const char *)argv[2] ); // open the output file
                                 if ( fail( sortedfile ) ) {
                                         serr | "Error! Could not open sorted output file \"" | argv[2] | "\"";
+                                        serr | "Error! Could not open sorted output file \"" | argv[2] | "\"" | endl;
                                         usage( argv );
                                 } // if
 …
                                 &unsortedfile = new( (const char *)argv[1] ); // open the input file
                                 if ( fail( unsortedfile ) ) {
                                         serr | "Error! Could not open unsorted input file \"" | argv[1] | "\"";
+                                        serr | "Error! Could not open unsorted input file \"" | argv[1] | "\"" | endl;
                                         usage( argv );
                                 } // if
 …
                 } // if
         } // if
-        sortedfile | nlOff;                                                                     // turn off auto newline
         enum { ValuesPerLine = 22 };                                            // number of values printed per line
 …
                         for ( int counter = 0; counter < size; counter += 1 ) { // read unsorted numbers
                                 unsortedfile | values[counter];
                                 if ( counter != 0 && counter % ValuesPerLine == 0 ) sortedfile | nl | "  ";
+                                if ( counter != 0 && counter % ValuesPerLine == 0 ) sortedfile | endl | "  ";
                                 sortedfile | values[counter];
                                 if ( counter < size - 1 && (counter + 1) % ValuesPerLine != 0 ) sortedfile | ' ';
                         } // for
                         sortedfile | nl;
+                        sortedfile | endl;
                         if ( size > 0 ) {                                                       // values to sort ?
                                 Quicksort QS = { values, size - 1, 0 }; // sort values
                         } // wait until sort tasks terminate
                         for ( int counter = 0; counter < size; counter += 1 ) { // print sorted list
                                 if ( counter != 0 && counter % ValuesPerLine == 0 ) sortedfile | nl | "  ";
+                                if ( counter != 0 && counter % ValuesPerLine == 0 ) sortedfile | endl | "  ";
                                 sortedfile | values[counter];
                                 if ( counter < size - 1 && (counter + 1) % ValuesPerLine != 0 ) sortedfile | ' ';
                         } // for
                         sortedfile | nl;
+                        sortedfile | endl | endl;
                         delete( values );

tests/concurrent/monitor.c

r515a037	rcdc02f2
40	40	MyThread f[4];
41	41	}
42		sout \| global.value;
	42	sout \| global.value \| endl;
43	43	}

tests/concurrent/multi-monitor.c

r515a037	rcdc02f2
52	52	}
53	53	}
54		sout \| global12 \| global23 \| global13;
	54	sout \| global12 \| global23 \| global13 \| endl;
55	55	}

tests/concurrent/preempt.c

r515a037	rcdc02f2
3	3	#include <time.hfa>
4	4
5		#include "long_tests.hfa"
	5	#include "long_tests.h"
6	6
7	7	#ifndef PREEMPTION_RATE

tests/concurrent/signal/block.c

-              r515a037
+              rcdc02f2
 #include <time.hfa>
 #include "long_tests.hfa"
+#include "long_tests.h"
 #ifndef PREEMPTION_RATE
 …
         if(a.last_thread != a.last_signaller || b.last_thread != b.last_signaller ) {
                 sout | "ERROR Barging detected, expected" | a.last_signaller | b.last_signaller | "got" | a.last_thread | b.last_thread;
+                sout | "ERROR Barging detected, expected" | a.last_signaller | b.last_signaller | "got" | a.last_thread | b.last_thread | endl;
                 abort();
+        }
 …
                 if( ! signal_block( cond ) ) {
                         sout | "ERROR expected to be able to signal";
+                        sout | "ERROR expected to be able to signal" | endl;
                         abort();
+                }
 …
                 if(a.last_thread != next || b.last_thread != next) {
                         sout | "ERROR Barging detected, expected" | next | "got" | a.last_thread | b.last_thread;
+                        sout | "ERROR Barging detected, expected" | next | "got" | a.last_thread | b.last_thread | endl;
                         abort();
+                }
 …
                 Signaller s[4];
                 Barger b[13];
                 sout | "Starting waiters";
+                sout | "Starting waiters" | endl;
+                {
                         Waiter w[3];
+                }
                 sout | "Waiters done";
+                sout | "Waiters done" | endl;
                 done = true;
+        }

tests/concurrent/signal/disjoint.c

-              r515a037
+              rcdc02f2
 #include <time.hfa>
 #include "long_tests.hfa"
+#include "long_tests.h"
 #ifndef PREEMPTION_RATE
 …
         wait( cond );
         if( d.state != SIGNAL ) {
                 sout | "ERROR barging!";
+                sout | "ERROR barging!" | endl;
+        }
         #if !defined(TEST_FOREVER)
                 d.counter++;
                 if( (d.counter % 1000) == 0 ) sout | d.counter;
+                if( (d.counter % 1000) == 0 ) sout | d.counter | endl;
         #endif
 …
         bool running = TEST(data.counter < N) && data.counter > 0;
         if( data.state != SIGNAL && running ) {
                 sout | "ERROR Eager signal" | data.state;
+                sout | "ERROR Eager signal" | data.state | endl;
+        }
+}
 …
                         Waiter w[4];
+                }
                 sout | "All waiter done";
+                sout | "All waiter done" | endl;
                 all_done = true;
+        }

tests/concurrent/signal/wait.c

-              r515a037
+              rcdc02f2
 #define __kick_rate 12000ul
 #include "long_tests.hfa"
+#include "long_tests.h"
 #ifndef PREEMPTION_RATE
 …
                                 break;
                         default:
                                 sout | "Something went wrong";
+                                sout | "Something went wrong" | endl;
                                 abort();
+                }
 …
         waiter_left = 4;
         processor p[2];
         sout | "Starting";
+        sout | "Starting" | endl;
+        {
                 Signaler  e;
 …
+                }
+        }
         sout | "Done";
+        sout | "Done" | endl;
+}

tests/concurrent/thread.c

r515a037	rcdc02f2
12	12	void main(First& this) {
13	13	for(int i = 0; i < 10; i++) {
14		sout \| "First : Suspend No." \| i + 1;
	14	sout \| "First : Suspend No." \| i + 1 \| endl;
15	15	yield();
16	16	}
…	…
21	21	P(*this.lock);
22	22	for(int i = 0; i < 10; i++) {
23		sout \| "Second : Suspend No." \| i + 1;
	23	sout \| "Second : Suspend No." \| i + 1 \| endl;
24	24	yield();
25	25	}
…	…
29	29	int main(int argc, char* argv[]) {
30	30	semaphore lock = { 0 };
31		sout \| "User main begin";
	31	sout \| "User main begin" \| endl;
32	32	{
33	33	processor p;
…	…
37	37	}
38	38	}
39		sout \| "User main end";
	39	sout \| "User main end" \| endl;
40	40	}

tests/concurrent/waitfor/barge.c

r515a037	rcdc02f2
48	48	yield(random( 10 ));
49	49	if( this.state != WAITFOR && !this.done && this.started ) {
50		serr \| "Barging before caller detected";
	50	serr \| "Barging before caller detected" \| endl;
51	51	}
52	52
…	…
66	66	this.state = WAITFOR;
67	67	waitfor(do_call, this) {
68		sout \| i;
	68	sout \| i \| endl;
69	69	}
70	70
71	71	if( this.state != CALL ) {
72		serr \| "Barging after caller detected";
	72	serr \| "Barging after caller detected" \| endl;
73	73	}
74	74	}
…	…
83	83
84	84	int main() {
85		sout \| "Starting";
	85	sout \| "Starting" \| endl;
86	86	{
87	87	barger_t bargers[17];
…	…
89	89	waiter_t waiters;
90	90	}
91		sout \| "Stopping";
	91	sout \| "Stopping" \| endl;
92	92	}

tests/concurrent/waitfor/dtor.c

-              r515a037
+              rcdc02f2
         switch(state) {
                 case CTOR  : break;
                 case MAIN  : if( this.state != CTOR  ) { serr | "ERROR Expected state to be CTOR" ; abort(); } this.state = state; break;
                 case AFTER : if( this.state != MAIN  ) { serr | "ERROR Expected state to be MAIN" ; abort(); } this.state = state; break;
                 case END   : if( this.state != AFTER ) { serr | "ERROR Expected state to be AFTER"; abort(); } this.state = state; break;
                 case DTOR  : if( this.state != END   ) { serr | "ERROR Expected state to be END"  ; abort(); } this.state = state; break;
+                case MAIN  : if( this.state != CTOR  ) { serr | "ERROR Expected state to be CTOR"  | endl; abort(); } this.state = state; break;
+                case AFTER : if( this.state != MAIN  ) { serr | "ERROR Expected state to be MAIN"  | endl; abort(); } this.state = state; break;
+                case END   : if( this.state != AFTER ) { serr | "ERROR Expected state to be AFTER" | endl; abort(); } this.state = state; break;
+                case DTOR  : if( this.state != END   ) { serr | "ERROR Expected state to be END"   | endl; abort(); } this.state = state; break;
+        }
+}
 …
 int main() {
         sout | "Starting";
+        sout | "Starting" | endl;
         processor p;
         for( int i = 0; i < N; i++ ){
 …
                 yield( random( 100 ) );
+        }
         sout | "Stopping";
+        sout | "Stopping" | endl;
+}

tests/concurrent/waitfor/else.c

-              r515a037
+              rcdc02f2
 void test( M & mutex m ) {
         int i = 0;
         sout | "Starting";
+        sout | "Starting" | endl;
         when( false ) waitfor( notcalled, m );
         sout | "Step" | i++;
+        sout | "Step" | i++ | endl;
         waitfor( notcalled, m ); or else {
                 sout | "else called";
+                sout | "else called" | endl;
+        }
         sout | "Step" | i++;
+        sout | "Step" | i++ | endl;
         when( true ) waitfor( notcalled, m ); or when( true ) else {
                 sout | "else called";
+                sout | "else called" | endl;
+        }
         sout | "Step" | i++;
+        sout | "Step" | i++ | endl;
         when( false ) waitfor( notcalled, m ); or when( true ) else {
                 sout | "else called";
+                sout | "else called" | endl;
+        }
         sout | "Step" | i++;
+        sout | "Step" | i++ | endl;
         when( false ) waitfor( notcalled, m ); or when( false ) else {
                 sout | "else called";
+                sout | "else called" | endl;
+        }
         sout | "Done";
+        sout | "Done" | endl;
+}

tests/concurrent/waitfor/recurse.c

-              r515a037
+              rcdc02f2
         rand_yield();
         sout | "1st" | nl;
+        sout | "1st" | endl;
         return this.counter < N ? (state_t)this.actions[idx] : (state_t)STOP;
 …
                         case THIRD  : while( !global.ready ) { yield(); } this.state = call3( global, this.idx ); break;
                         case LAST   : while( !global.ready ) { yield(); } this.state = call4( global, this.idx ); break;
                         case STOP   : serr | "This should not happen" | nl;
+                        case STOP   : serr | "This should not happen" | endl;
+                }
+        }
 …
 int main() {
         srandom( time(NULL) );
+        sout | nlOff;                                   // turn off auto newline
+        sout | "Starting" | nl;
+        sout | "Starting" | endl;
+        {
                 waiter_t waiters[4] = {
 …
                 the_threads = waiters;
+        }
         sout | "Stopping" | nl;
+        sout | "Stopping" | endl;
+}

tests/concurrent/waitfor/simple.c

-              r515a037
+              rcdc02f2
 void do_wait( global_t * mutex a ) {
         sout | "Waiting to accept";
+        sout | "Waiting to accept" | endl;
         yield( random( 10 ) );
         sout | "Accepting";
+        sout | "Accepting" | endl;
         __acceptable_t acceptable;
 …
         __waitfor_internal( 1, &acceptable );
         sout | "Accepted";
+        sout | "Accepted" | endl;
         yield( random( 10 ) );
+}
 …
         for( int i = 0; i < N; i++ ) {
                 do_wait( &globalA );
                 sout | i;
+                sout | i | endl;
+        }
 …
         srandom( time( NULL ) );
         printf("%p\n", &globalA);
         sout | "Starting";
+        sout | "Starting" | endl;
+        {
                 Acceptor r;
 …
+        }
         sout | "Done";
+        sout | "Done" | endl;
+}

tests/concurrent/waitfor/statment.c

-              r515a037
+              rcdc02f2
                 case 7: return call7( m );
                 default :
                         serr | "Incorrect index" | index;
+                        serr | "Incorrect index" | index | endl;
                         abort();
+        }
 …
         while( !done ) {
                    waitfor( get_index, this );
                 or waitfor( call1, this ) { sout | "Statement"; if( this.last_val != 1 ) { serr | "Incorrect index: expected" | 1 | "got" | this.last_val; } }
                 or waitfor( call2, this ) { sout | "Statement"; if( this.last_val != 2 ) { serr | "Incorrect index: expected" | 2 | "got" | this.last_val; } }
                 or waitfor( call3, this ) { sout | "Statement"; if( this.last_val != 3 ) { serr | "Incorrect index: expected" | 3 | "got" | this.last_val; } }
                 or waitfor( call4, this ) { sout | "Statement"; if( this.last_val != 4 ) { serr | "Incorrect index: expected" | 4 | "got" | this.last_val; } }
                 or waitfor( call5, this ) { sout | "Statement"; if( this.last_val != 5 ) { serr | "Incorrect index: expected" | 5 | "got" | this.last_val; } }
                 or waitfor( call6, this ) { sout | "Statement"; if( this.last_val != 6 ) { serr | "Incorrect index: expected" | 6 | "got" | this.last_val; } }
                 or waitfor( call7, this ) { sout | "Statement"; if( this.last_val != 7 ) { serr | "Incorrect index: expected" | 7 | "got" | this.last_val; } }
+                or waitfor( call1, this ) { sout | "Statement" | endl; if( this.last_val != 1 ) { serr | "Incorrect index: expected" | 1 | "got" | this.last_val | endl; } }
+                or waitfor( call2, this ) { sout | "Statement" | endl; if( this.last_val != 2 ) { serr | "Incorrect index: expected" | 2 | "got" | this.last_val | endl; } }
+                or waitfor( call3, this ) { sout | "Statement" | endl; if( this.last_val != 3 ) { serr | "Incorrect index: expected" | 3 | "got" | this.last_val | endl; } }
+                or waitfor( call4, this ) { sout | "Statement" | endl; if( this.last_val != 4 ) { serr | "Incorrect index: expected" | 4 | "got" | this.last_val | endl; } }
+                or waitfor( call5, this ) { sout | "Statement" | endl; if( this.last_val != 5 ) { serr | "Incorrect index: expected" | 5 | "got" | this.last_val | endl; } }
+                or waitfor( call6, this ) { sout | "Statement" | endl; if( this.last_val != 6 ) { serr | "Incorrect index: expected" | 6 | "got" | this.last_val | endl; } }
+                or waitfor( call7, this ) { sout | "Statement" | endl; if( this.last_val != 7 ) { serr | "Incorrect index: expected" | 7 | "got" | this.last_val | endl; } }
                 done = true;
 …
 int main() {
         processor p[2];
         sout | "Starting";
+        sout | "Starting" | endl;
+        {
                 caller c[7];
                 waiter w;
+        }
         sout | "Stopping";
+        sout | "Stopping" | endl;
+}

tests/concurrent/waitfor/when.c

-              r515a037
+              rcdc02f2
 void arbiter( global_t & mutex this ) {
         for( int i = 0; i < N; i++ ) {
                    when( this.last_call == 6 ) waitfor( call1, this ) { if( this.last_call != 1) { serr | "Expected last_call to be 1 got" | this.last_call; } }
                 or when( this.last_call == 1 ) waitfor( call2, this ) { if( this.last_call != 2) { serr | "Expected last_call to be 2 got" | this.last_call; } }
                 or when( this.last_call == 2 ) waitfor( call3, this ) { if( this.last_call != 3) { serr | "Expected last_call to be 3 got" | this.last_call; } }
                 or when( this.last_call == 3 ) waitfor( call4, this ) { if( this.last_call != 4) { serr | "Expected last_call to be 4 got" | this.last_call; } }
                 or when( this.last_call == 4 ) waitfor( call5, this ) { if( this.last_call != 5) { serr | "Expected last_call to be 5 got" | this.last_call; } }
                 or when( this.last_call == 5 ) waitfor( call6, this ) { if( this.last_call != 6) { serr | "Expected last_call to be 6 got" | this.last_call; } }
+                   when( this.last_call == 6 ) waitfor( call1, this ) { if( this.last_call != 1) { serr | "Expected last_call to be 1 got" | this.last_call | endl; } }
+                or when( this.last_call == 1 ) waitfor( call2, this ) { if( this.last_call != 2) { serr | "Expected last_call to be 2 got" | this.last_call | endl; } }
+                or when( this.last_call == 2 ) waitfor( call3, this ) { if( this.last_call != 3) { serr | "Expected last_call to be 3 got" | this.last_call | endl; } }
+                or when( this.last_call == 3 ) waitfor( call4, this ) { if( this.last_call != 4) { serr | "Expected last_call to be 4 got" | this.last_call | endl; } }
+                or when( this.last_call == 4 ) waitfor( call5, this ) { if( this.last_call != 5) { serr | "Expected last_call to be 5 got" | this.last_call | endl; } }
+                or when( this.last_call == 5 ) waitfor( call6, this ) { if( this.last_call != 6) { serr | "Expected last_call to be 6 got" | this.last_call | endl; } }
                 sout | this.last_call;
+                sout | this.last_call | endl;
+        }
 …
 int main() {
         srandom( time(NULL) );
         sout | "Starting";
+        sout | "Starting" | endl;
+        {
                 arbiter_t arbiter;
 …
+        }
         sout | "Stopping";
+        sout | "Stopping" | endl;
+}

tests/coroutine/.expect/fmtLines.txt

-              r515a037
+              rcdc02f2
 difi  ed B  y :   Pete  r A.
  Buh  r//   Last   Mod  ifie
 d On   : T  ue D  ec 1  1 23
 :31:  12 2  018/  / Up  date
  Cou  nt       :   32/  /#in
+d On   : M  on S  ep 1  8 11
+:35:  57 2  017/  / Up  date
+ Cou  nt       :   31/  /#in
 clud  e <f  stre  am.h  fa>#
 incl  ude   <cor  outi  ne.h
 …
 t )   {      if   ( fm  t.g
 != 0   ||   fmt.  b !=   0 )
+ sou  t |   nl;}  void   mai
+n( F  orma  t &   fmt   ) {
+for   ( ;;   ) {
+                //   for   as   many   cha
+ract  ers               for   ( f  mt.g
+ = 0  ; fm  t.g   < 5;   fmt
+.g +  = 1   ) {         //   grou
+ps o  f 5   bloc  ks                    for
+ ( f  mt.b   = 0  ; fm  t.b
+< 4;   fmt  .b +  = 1   ) {
+// b  lock  s of   4 c  hara
+cter  s                         for   ( ;  ; )
+{                                                         // f  or n  ewli
+ne c  hara  cter  s                                     su
+spen  d();                                      if   ( fm
+t.ch   !=   '\n'   ) b  reak
+;               /  / ig  nore   new  line
+                                  } //   for                              sout
+ | f  mt.c  h;                                                  //
+prin  t ch  arac  ter                   }
+// f  or                        sou  t |   "  "
+;                                                               //   prin  t bl
+ock   sepa  rato  r             }   //
+for             sou  t |   nl;
+                                  // p  rint   gro  up s
+epar  ator      } /  / fo  r} /
+/ ma  invo  id p  rt(   Form
+at &   fmt  , ch  ar c  h )
+{      fmt  .ch   = ch  ;
+ res  ume(   fmt   );}   //
+prti  nt m  ain(  ) {     Form
+at f  mt;         char   ch;    for
+ ( ;  ; )   {           s  in |   ch;
+                                                                                //   rea  d on
+e ch  arac  ter     if   ( e
+of(   sin   ) )   brea  k;
+                                        //   eof   ?            p  rt(
+fmt,   ch   );  }   //   for}
+ //   main  // L  ocal   Var
+iabl  es:   ////   tab  -wid
+th:   4 //  // c  ompi  le-c
+omma  nd:   "cfa   fmt  Line
+s.c"   ///  / En  d: /  /
+ sou  t |   endl  ;}vo  id m
+ain(   For  mat   & fm  t )
+{       fo  r (   ;; )   {
+                                  // f  or a  s ma  ny c
+hara  cter  s           f  or (   fmt
+.g =   0;   fmt.  g <   5; f
+mt.g   +=   1 )   {             /  / gr
+oups   of   5 bl  ocks                          f
+or (   fmt  .b =   0;   fmt.
+b <   4; f  mt.b   +=   1 )
+{       //   blo  cks   of 4   cha
+ract  ers                               f  or (   ;;
+) {                                                     //   for   new
+line   cha  ract  ers
+susp  end(  );                                  i  f (
+fmt.  ch !  = '\  n' )   bre
+ak;             //   igno  re n  ewli
+ne                              }   // f  or                            so
+ut |   fmt  .ch;                                                        /
+/ pr  int   char  acte  r
+} //   for                      s  out   | "
+ ";                                                             /  / pr  int
+bloc  k se  para  tor           } /
+/ fo  r         s  out   | en  dl;
+                                                                  // p  rint   gro
+up s  epar  ator        } /  / fo
+r} /  / ma  invo  id p  rt(
+Form  at &   fmt  , ch  ar c
+h )   {      fmt  .ch   = ch
+;      res  ume(   fmt   );}
+ //   prti  nt m  ain(  ) {
+Form  at f  mt;   char   ch;
+        for   ( ;  ; )   {              s  in |
+ ch;                                                                            //   rea
+d on  e ch  arac  ter       if
+ ( e  of(   sin   ) )   brea
+k;                                                      //   eof   ?            p
+rt(   fmt,   ch   );    }   //
+for}   //   main  // L  ocal
+ Var  iabl  es:   ////   tab
+-wid  th:   4 //  // c  ompi
+le-c  omma  nd:   "cfa   fmt
+Line  s.c"   ///  / En  d: /
+/

tests/coroutine/.in/fmtLines.txt

-              r515a037
+              rcdc02f2
 // Created On       : Sun Sep 17 21:56:15 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Dec 11 23:31:12 2018
 // Update Count     : 32
+// Last Modified On : Mon Sep 18 11:35:57 2017
+// Update Count     : 31
 //
 …
 void ^?{}( Format & fmt ) {
     if ( fmt.g != 0 || fmt.b != 0 ) sout | nl;
+    if ( fmt.g != 0 || fmt.b != 0 ) sout | endl;
+}
 …
                         sout | "  ";                                                            // print block separator
                 } // for
                 sout | nl;                                                                      // print group separator
+                sout | endl;                                                                    // print group separator
         } // for
 } // main

tests/coroutine/fibonacci.c

-              r515a037
+              rcdc02f2
 // Created On       : Thu Jun  8 07:29:37 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Dec 11 21:57:33 2018
 // Update Count     : 25
+// Last Modified On : Sat Aug 18 11:21:58 2018
+// Update Count     : 24
 //
 …
         Fibonacci f1, f2;
         for ( 10 ) {                                                                            // print N Fibonacci values
                 sout | next( f1 ) | next( f2 );
+                sout | next( f1 ) | next( f2 ) | endl;
         } // for
+}

tests/coroutine/fibonacci_1.c

-              r515a037
+              rcdc02f2
 // Created On       : Thu Apr 26 23:20:08 2018
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Dec 11 21:57:54 2018
 // Update Count     : 14
+// Last Modified On : Sat Aug 18 11:21:02 2018
+// Update Count     : 13
 //
 …
         Fibonacci f1, f2;
         for ( 10 ) {                                                                            // print N Fibonacci values
                 sout | next( f1 ) | next( f2 );
+                sout | next( f1 ) | next( f2 ) | endl;
         } // for
+}

tests/coroutine/fmtLines.c

-              r515a037
+              rcdc02f2
 // Created On       : Sun Sep 17 21:56:15 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Dec 11 21:58:49 2018
 // Update Count     : 47
+// Last Modified On : Thu Aug 16 08:20:54 2018
+// Update Count     : 45
 //
 …
                         sout | "  ";                                                            // print block separator
                 } // for
                 sout | nl;                                                                              // print group separator
+                sout | endl;                                                                    // print group separator
         } // for
 } // main
 …
 void ^?{}( Format & fmt ) with( fmt ) {
         if ( g != 0 || b != 0 ) sout | nl;
+        if ( g != 0 || b != 0 ) sout | endl;
+}
 …
 int main() {
         Format fmt;
-        sout | nlOff;                                                                           // turn off auto newline
   eof: for () {                                                                                 // read until end of file

tests/coroutine/pingpong.c

-              r515a037
+              rcdc02f2
 // Created On       : Wed Sep 20 11:55:23 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Dec 11 21:58:06 2018
 // Update Count     : 29
+// Last Modified On : Sat Aug 18 11:31:11 2018
+// Update Count     : 28
 //
 …
 void main( PingPong & pingpong ) {                                              // ping's starter ::main, pong's starter ping
         for ( pingpong.N ) {                                                            // N ping-pongs
                 sout | pingpong.name;
+                sout | pingpong.name | endl;
                 cycle( *pingpong.part );
         } // for

tests/coroutine/prodcons.c

-              r515a037
+              rcdc02f2
 // Created On       : Mon Sep 18 12:23:39 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Dec 11 21:58:25 2018
 // Update Count     : 52
+// Last Modified On : Sat Aug 18 12:55:10 2018
+// Update Count     : 51
 //
 …
                 int p1 = random( 100 );
                 int p2 = random( 100 );
                 sout | p1 | " " | p2;
+                sout | p1 | " " | p2 | endl;
                 int status = delivery( *c, p1, p2 );
                 sout | " $" | money;
                 sout | status;
+                sout | " $" | money | endl;
+                sout | status | endl;
                 receipt += 1;
+        }
         stop( *c );
         sout | "prod stops";
+        sout | "prod stops" | endl;
+}
 int payment( Prod & prod, int money ) {
 …
         int money = 1, receipt;
         for ( ; ! done; ) {
                 sout | p1 | " " | p2;
                 sout | " $" | money;
+                sout | p1 | " " | p2 | endl;
+                sout | " $" | money | endl;
                 status += 1;
                 receipt = payment( *p, money );
                 sout | " #" | receipt;
+                sout | " #" | receipt | endl;
                 money += 1;
+        }
         sout | "cons stops";
+        sout | "cons stops" | endl;
+}
 int delivery( Cons & cons, int p1, int p2 ) {
 …
         srandom( /* getpid() */ 103 );                                          // fixed seed for testing
         start( prod, 5, cons );
         sout | "main stops";
+        sout | "main stops" | endl;
+}

tests/coroutine/runningTotal.c

-              r515a037
+              rcdc02f2
 // Created On       : Wed Dec  6 08:05:27 2017
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Dec 11 21:59:00 2018
 // Update Count     : 4
+// Last Modified On : Thu Aug 16 08:22:29 2018
+// Update Count     : 3
 //
 …
         RunTotal rntl;
         for ( i; 10 ) {
                 sout | i | add( rntl, i );
+                sout | i | add( rntl, i ) | endl;
         } // for
+}

tests/preempt_longrun/create.c

r515a037	rcdc02f2
3	3	#include <time.hfa>
4	4
5		#include "long_tests.hfa"
	5	#include "long_tests.h"
6	6
7	7	#ifndef PREEMPTION_RATE

tests/preempt_longrun/enter3.c

r515a037	rcdc02f2
5	5
6	6	#define __kick_rate 75000ul
7		#include "long_tests.hfa"
	7	#include "long_tests.h"
8	8
9	9	#ifndef PREEMPTION_RATE

tests/preempt_longrun/processor.c

r515a037	rcdc02f2
5	5	#include <unistd.h>
6	6
7		#include "long_tests.hfa"
	7	#include "long_tests.h"
8	8
9	9	#ifndef PREEMPTION_RATE

tests/preempt_longrun/yield.c

r515a037	rcdc02f2
4	4
5	5	#define __kick_rate 550000ul
6		#include "long_tests.hfa"
	6	#include "long_tests.h"
7	7
8	8	#ifndef PREEMPTION_RATE

tests/raii/dtor-early-exit.c

-              r515a037
+              rcdc02f2
 // Created On       : Wed Aug 17 08:26:25 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Dec 11 22:05:24 2018
 // Update Count     : 9
+// Last Modified On : Sat Aug 11 07:58:39 2018
+// Update Count     : 8
 //
 …
 // don't want these called
 void ?{}(A & a) { assert( false ); }
 void ?{}(A & a, const char * name) { a.name = name; sout | "construct " | name; a.x = (int*)malloc(); }
+void ?{}(A & a, const char * name) { a.name = name; sout | "construct " | name | endl; a.x = (int*)malloc(); }
 void ?{}(A & a, const char * name, int * ptr) { assert( false ); }
 A ?=?(A & a, A b) {  sout | "assign " | a.name | " " | b.name; return a; }
 void ?{}(A & a, A b) { sout | "copy construct " | b.name; a.x = (int*)malloc(); }
 void ^?{}(A & a) { sout | "destruct " | a.name; free(a.x); }
+void ?{}(A & a, A b) { sout | "copy construct " | b.name | endl; a.x = (int*)malloc(); }
+void ^?{}(A & a) { sout | "destruct " | a.name | endl; free(a.x); }
 // test returns
 void f(int i) {
         sout | "f i=" | i;
+        sout | "f i=" | i | endl;
         A x = { "x" };  // construct x
+        {
 …
 void g() {
         for (int i = 0; i < 10; i++) {
                 sout | "g for i=" | i;
+                sout | "g for i=" | i | endl;
                 A x = { "x" };
                 // construct x
                 // destruct x
+        }
         sout | nl;
+        sout | endl;
+        {
                 int i = 0;
                 while (i < 10) {
                         sout | "g while i=" | i;
+                        sout | "g while i=" | i | endl;
                         A x = { "x" };
                         // construct x
 …
+                }
+        }
         sout;
+        sout | endl;
         for (int i = 0; i < 10; i++) {
                 switch(10) {
 …
                         case 10: {
                                 A y = { "y" };
                                 sout | "g switch i=" | i;
+                                sout | "g switch i=" | i | endl;
                                 // construct y
                                 break; // destruct y
+                        }
                         default: {
                                 sout | "g switch i=" | i;
+                                sout | "g switch i=" | i | endl;
                                 A x = { "x" };
                                 // construct x
 …
+                }
+        }
         sout | nl;
+        sout | endl;
         for (int k = 0; k < 2; k++) {
                 sout | "g for k=" | k;
+                sout | "g for k=" | k | endl;
                 L1: for (int i = 0; i < 10; i++) {
                         sout | "g for i=" | i;
+                        sout | "g for i=" | i | endl;
                         A x = { "x" };
                         if (i == 2) {
                                 sout | "continue L1";
+                                sout | "continue L1" | endl;
                                 continue;  // destruct x
                         } else if (i == 3) {
                                 sout | "break L1";
+                                sout | "break L1" | endl;
                                 break;  // destruct x
+                        }
                         L2: for (int j = 0; j < 10; j++) {
                                 sout | "g for j=" | j;
+                                sout | "g for j=" | j | endl;
                                 A y = { "y" };
                                 if (j == 0) {
                                         sout | "continue L2";
+                                        sout | "continue L2" | endl;
                                         continue; // destruct y - missing because object that needs to be destructed is not a part of this block, it's a part of the for's block
                                 } else if (j == 1) {
                                         sout | "break L2";
+                                        sout | "break L2" | endl;
                                         break;  // destruct y
                                 } else if (i == 1) {
                                         sout | "continue L1";
+                                        sout | "continue L1" | endl;
                                         continue L1; // destruct x,y - note: continue takes you to destructors for block, so only generate destructor for y
                                 } else if (k == 1) {
                                         sout | "break L1";
+                                        sout | "break L1" | endl;
                                         break L1;  // destruct x,y
+                                }
 …
+        }
         sout | nl;
+        sout | endl;
         L3: if( 3 ) {
                 A w = { "w" };
                 if( 4 ) {
                         A v = { "v" };
                         sout | "break L3";
+                        sout | "break L3" | endl;
                         break L3;
+                }
 …
         // * if S_L-S_G is non-empty, error
         // * emit destructors for all variables in S_G-S_L
         sout | "h";
+        sout | "h" | endl;
+        {
                 L0: ;
 …
                         A y = { "y" };
                         // S_L1 = { y }
                 L1: sout | "L1";
+                L1: sout | "L1" | endl;
                         A x = { "x" };
                         // S_L2 = { y, x }
                 L2: sout | "L2";
+                L2: sout | "L2" | endl;
                         if (i == 0) {
                                 ++i;
                                 sout | "goto L1";
+                                sout | "goto L1" | endl;
                                 // S_G = { y, x }
                                 goto L1;  // jump back, destruct b/c before x definition
 …
                         } else if (i == 1) {
                                 ++i;
                                 sout | "goto L2";
+                                sout | "goto L2" | endl;
                                 // S_G = { y, x }
                                 goto L2;  // jump back, do not destruct
 …
                         } else if (i == 2) {
                                 ++i;
                                 sout | "goto L3";
+                                sout | "goto L3" | endl;
                                 // S_G = { y, x }
                                 goto L3;  // jump ahead, do not destruct
 …
                                 ++i;
                                 A z = { "z" };
                                 sout | "goto L3-2";
+                                sout | "goto L3-2" | endl;
                                 // S_G = { z, y, x }
                                 goto L3;
 …
                         } else {
                                 ++i;
                                 sout | "goto L4";
+                                sout | "goto L4" | endl;
                                 // S_G = { y, x }
                                 goto L4;  // jump ahead, destruct b/c left block x was defined in
 …
+                        }
                         // S_L3 = { y, x }
                 L3: sout | "L3";
                         sout | "goto L2-2";
+                L3: sout | "L3" | endl;
+                        sout | "goto L2-2" | endl;
                         // S_G = { y, x }
                         goto L2; // jump back, do not destruct
 …
+        }
         // S_L4 = {}
         L4: sout | "L4";
+        L4: sout | "L4" | endl;
         if (i == 4) {
                 sout | "goto L0";
+                sout | "goto L0" | endl;
                 // S_G = {}
                 goto L0;
 …
                 f(i);
+        }
         sout | nl;
+        sout | endl;
         g();
         sout | nl;
+        sout | endl;
         h();

tests/raii/globals.c

-              r515a037
+              rcdc02f2
 int main() {
         sout | "static\t\tinline\t\tautogen\t\tvalue";
+        sout | "static\t\tinline\t\tautogen\t\tvalue" | endl;
         sout | "no \t\tno \t\tno \t\t" | g.val.value;
         sout | "no \t\tno \t\tyes\t\t" | ga.val.value;
         sout | "no \t\tyes\t\tno \t\t" | gi.val.value;
         sout | "no \t\tyes\t\tyes\t\t" | gia.val.value;
         sout | "yes\t\tno \t\tno \t\t" | gs.val.value;
         sout | "yes\t\tno \t\tyes\t\t" | gsa.val.value;
         sout | "yes\t\tyes\t\tno \t\t" | gsi.val.value;
         sout | "yes\t\tyes\t\tyes\t\t" | gsia.val.value;
+        sout | "no \t\tno \t\tno \t\t" | g.val.value    | endl;
+        sout | "no \t\tno \t\tyes\t\t" | ga.val.value   | endl;
+        sout | "no \t\tyes\t\tno \t\t" | gi.val.value   | endl;
+        sout | "no \t\tyes\t\tyes\t\t" | gia.val.value  | endl;
+        sout | "yes\t\tno \t\tno \t\t" | gs.val.value   | endl;
+        sout | "yes\t\tno \t\tyes\t\t" | gsa.val.value  | endl;
+        sout | "yes\t\tyes\t\tno \t\t" | gsi.val.value  | endl;
+        sout | "yes\t\tyes\t\tyes\t\t" | gsia.val.value | endl;
+}

tests/tuple/tupleAssign.c

-              r515a037
+              rcdc02f2
 // Created On       : Tue Nov 15 17:24:32 2016
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Dec  4 22:03:48 2018
 // Update Count     : 35
+// Last Modified On : Mon Mar  6 21:23:58 2017
+// Update Count     : 34
 //
 …
                 // swap x, y and store the new [x, y] in [u, v] and in z;
                 printf( "u=%d v=%d x=%d y=%d z=[%d, %d]\n", u, v, x, y, z );
                 sout | "u=" | u | "v=" | v | "x=" | x | "y=" | y | "z=[" | z | "]";
+                sout | "u=" | u | "v=" | v | "x=" | x | "y=" | y | "z=[" | z | "]" | endl;
                 z = [u, v] = [x, y] = [y, x];
                 printf( "u=%d v=%d x=%d y=%d z=[%d, %d]\n", u, v, x, y, z );
                 sout | "u=" | u | "v=" | v | "x=" | x | "y=" | y | "z=[" | z | "]";
+                sout | "u=" | u | "v=" | v | "x=" | x | "y=" | y | "z=[" | z | "]" | endl;
                 // shuffle elements -- v = z.0, z.0 = z.1, z.1 = u, u = v
                 [v, z, u] = [z, u, v];
                 printf( "u=%d v=%d z=[%d, %d]\n", u, v, z );
                 sout | "u=" | u | "v=" | v | "z=[" | z | "]";
+                sout | "u=" | u | "v=" | v | "z=[" | z | "]" | endl;
                 // multiple assignment with tuple expression on right
 …
                 [u, v] = [123, 456];
                 printf( "u=%d v=%d z=[%d, %d]\n", u, v, z );
                 sout | "u=" | u | "v=" | v | "z=[" | z | "]";
+                sout | "u=" | u | "v=" | v | "z=[" | z | "]" | endl;
+        }
+        {
 …
                 [t, x, d, i, c, x] = (double)94.12;
                 printf( "d=%lg i=%d c=%c t=[%d, %lg, %d]\n", d, i, (int)c, t );
                 sout | "d=" | d | "i=" | i | "c=" | c | ' ' | "t=[" | t | "]";
+                sout | "d=" | d | "i=" | i | "c=" | c | ' ' | "t=[" | t | "]" | endl;
                 [x, c, i, d, x, t] = (double)-94.12;
                 printf( "d=%lg i=%d c=%c t=[%d, %lg, %d]\n", d, i, c, t );
                 sout | "d=" | d | "i=" | i | "c=" | c | ' ' | "t=[" | t | "]";
+                sout | "d=" | d | "i=" | i | "c=" | c | ' ' | "t=[" | t | "]" | endl;
+        }
+}

Context Navigation

Changes in / [515a037:cdc02f2]

Legend:

Download in other formats: