Changeset 5fec3f6

Timestamp:

May 8, 2018, 11:55:44 AM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

4990812

Parents:

14a61b5 (diff), 387c9a1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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

Files:

• doc/bibliography/pl.bib (modified) (14 diffs)
• doc/papers/AMA/AMA-stix-1510051231000.zip (moved) (moved from doc/papers/AMA/AMA-stix.zip)
• doc/papers/AMA/AMA-stix/Documents/README.txt (modified) (1 diff)
• doc/papers/AMA/AMA-stix/ama/WileyNJD-AMA.bst (modified) (6 diffs)
• doc/papers/AMA/AMA-stix/ama/WileyNJD-v2.cls (modified) (6 diffs)
• doc/papers/general/.gitignore (modified) (1 diff)
• doc/papers/general/Makefile (modified) (2 diffs)
• doc/papers/general/Paper.tex (modified) (48 diffs)
• doc/papers/general/evaluation/timing.gp (modified) (1 diff)
• doc/papers/general/response (added)
• src/libcfa/interpose.h (deleted)
• src/main.cc (modified) (4 diffs)

doc/bibliography/pl.bib

@@ -40 +40 @@
 % @string{mathann="Math. Ann."}
 
+@misc{CFAStackEvaluation,
+    author      = {Aaron Moss},
+    title       = {\textsf{C}$\mathbf{\forall}$ Stack Evaluation Programs},
+    year        = 2018,
+    howpublished= {\href{https://plg.uwaterloo.ca/~cforall/evaluation.zip}{https://plg.uwaterloo.ca/\-\-$\sim$cforall/\-StackEvaluation.zip}},
+    optnote     = {[Accessed May 2018]},
+}
+
 % A
 
@@ -782 +790 @@
     howpublished= {\href{http://www.boost.org/doc/libs/1_61_0/libs/coroutine/doc/html/index.html}
                   {{http://www.boost.org/\-doc/\-libs/1\_61\_0/\-libs/\-coroutine/\-doc/\-html/\-index.html}}},
-    note        = {Accessed: 2016-09},
+    optnote     = {Accessed: 2016-09},
 }
 
@@ -855 +863 @@
     keywords    = {ANSI C 89},
     contributer = {gjditchfield@plg},
-    title       = {American National Standard for Information Systems -- Programming Language -- {C}},
+    author      = {C90},
+    title       = {Programming Languages -- {C}},
     organization= {American National Standards Institute},
-    address     = {1430 Broadway, New York, New York  10018},
-    month       = dec,
-    year        = 1989,
-    note        = {X3.159-1989}
+    address     = {New York, NY, U.S.A.},
+    year        = 1990,
+    note        = {ANSI/ISO 9899-1990}
 }
 
@@ -888 +896 @@
     title       = {\textsf{C}{$\mathbf{\forall}$} Features},
     howpublished= {\url{https://plg.uwaterloo.ca/~cforall/features}},
-    note        = {Accessed: 2018-01-01},
+    optnote     = {Accessed: 2018-01-01},
 }
 
@@ -1640 +1648 @@
 }
 
+@misc{Taylor10,
+    keywords    = {const, poisoning},
+    contributer = {pabuhr@plg},
+    author      = {Ian Lance Taylor},
+    title       = {const},
+    month       = oct,
+    year        = 2010,
+    howpublished= {\href{https://www.airs.com/blog/archives/428}
+                  {https://www.airs.com/\-blog/\-archives/\-428}},
+    optnote     = {Accessed: 2018-05},
+}
+
 @phdthesis{Ditchfield92,
     keywords    = {C, parametric polymorphism, overloading},
@@ -2755 +2775 @@
 @misc{GCCExtensions,
     contributer = {a3moss@uwaterloo.ca},
-    key         = {{GNU}},
+    key         = {C Extensions},
     author      = {{C Extensions}},
     title       = {Extensions to the {C} Language Family},
     year        = 2014,
     howpublished= {\href{https://gcc.gnu.org/onlinedocs/gcc-4.7.2/gcc/C-Extensions.html}{https://\-gcc.gnu.org/\-onlinedocs/\-gcc-4.7.2/\-gcc/\-C\-Extensions.html}},
-    note        = {Accessed: 2017-04-02},
+    optnote     = {Accessed: 2017-04-02},
 }
 
@@ -3137 +3157 @@
     year        = 2014,
     howpublished= {https://developer.gnome.org/gobject/stable/},
-    note        = {Accessed: 2017-04},
+    optnote     = {Accessed: 2017-04},
 }
 
@@ -3209 +3229 @@
 
 % H
+
+@manual{Haskell10,
+    keywords    = {Haskell},
+    contributer = {pabuhr@plg},
+    author      = {Haskell},
+    title       = {Haskell 2010 Language Report},
+    edition     = {{S}imon {M}arlow},
+    year        = 2010,
+    note        = {\href{https://haskell.org/definition/haskell2010.pdf}{https://haskell.org/\-definition/\-haskell2010.pdf}},
+}
 
 @article{Michael04a,
@@ -3760 +3790 @@
     keywords    = {concurrency, critical section},
     contributer = {pabuhr@plg},
-    author      = {Dominic Duggan and Gordon V. Cormack and John Ophel},
+    author      = {Dominic Duggan and G. V. Cormack and John Ophel},
     title       = {Kinded Type Inference for Parametric Overloading},
     journal     = acta,
@@ -4685 +4715 @@
     year        = 2015,
     howpublished= {\href{https://developer.apple.com/library/content/documentation/General/Conceptual/DevPedia-CocoaCore/ObjectiveC.html}{https://developer.apple.com/\-library/\-content/\-documentation/\-General/\-Conceptual/\-DevPedia-\-CocoaCore/\-ObjectiveC.html}},
-    note        = {Accessed: 2018-03}
+    optnote     = {Accessed: 2018-03}
 }
 
@@ -4695 +4725 @@
     year        = 2015,
     howpublished= {\href{https://developer.apple.com/library/content/documentation/Xcode/Conceptual/RN-Xcode-Archive/Chapters/xc7_release_notes.html}{https://developer.apple.com/\-library/\-content/\-documentation/\-Xcode/\-Conceptual/\-RN-Xcode-Archive/\-Chapters/\-xc7\_release\_notes.html}},
-    note        = {Accessed: 2017-04}
+    optnote     = {Accessed: 2017-04}
 }
 
@@ -5757 +5787 @@
     keywords    = {Cyclone, existential types, polymorphism, type variables},
     contributer = {a3moss@plg},
-    author      = {Dan Grossman},
+    author      = {D. Grossman},
     title       = {Quantified Types in an Imperative Language},
     journal     = toplas,
@@ -6762 +6792 @@
     title       = {{TIOBE} Index},
     howpublished= {\href{http://www.tiobe.com/tiobe_index}{http://\-www.tiobe.com/\-tiobe\_index}},
-    note        = {Accessed: 2018-09},
+    optnote     = {Accessed: 2018-09},
 }
 
@@ -7087 +7117 @@
     year        = 2017,
     howpublished= {\url{https://wiki.gnome.org/Projects/Vala/Manual}},
-    note        = {Accessed: 2017-04}
+    optnote     = {Accessed: 2017-04}
 }
 

doc/papers/AMA/AMA-stix/Documents/README.txt

@@ -13 +13 @@
 %   NJDnatbib.sty --> NJD natbib reference package.
 %   Stix-Fonts (folder) -->   Stix font files 
-
-%   MiKTeX 2.9 (Freeware software) is required to install STIX/LATO fonts
-%   Download MiKTeX installer & instructions from the below URLs
-        https://miktex.org/download
-        Instructions to install the basic MiKTeX installer
-        https://miktex.org/howto/install-miktex
-
-%   Execute(double click) --> Windows-Stix-fontinstaller.exe from Stix-Fonts folder (This EXE file will install fonts to local drive) (please rename Windows-Stix-fontinstaller.e_xe to Windows-Stix-fontinstaller.exe)
+%   Execute(double click) --> Windows-Stix-fontinstaller.exe from Stix-Fonts folder (This EXE file will install fonts to local drive)
 %   Still shows font error, please do the following
 %   Start-->run--> type "mo_edmin.exe" and press enter

doc/papers/AMA/AMA-stix/ama/WileyNJD-AMA.bst

@@ -502 +502 @@
       editor empty$
       { booktitle emphasize * }
-      { " " * format.editors * " " * booktitle emphasize * ", " * }
+    { " " * format.editors * " " * booktitle emphasize * ", " * }
       if$
     }
@@ -691 +691 @@
     { format.journal emphasize "journal" output.check
       format.date add.semicolon "year" output.check
+      blank.sep
       format.volume output
       format.number output
@@ -824 +825 @@
       new.block
       format.pages output
+      new.block
       organization output
+      new.block
       publisher output
       inproformat.date "year" output.check
@@ -863 +866 @@
     { new.block organization new.block address new.block.checkb
       organization output
+      new.block
       address output
     }
@@ -883 +887 @@
   new.block
   school "school" output.check
+  new.block
   address output
   format.date "year" output.check
@@ -927 +932 @@
   "PhD thesis" format.thesis.type output.nonnull
   school "school" output.check
+  new.block
   address output
   format.date "year" output.check

doc/papers/AMA/AMA-stix/ama/WileyNJD-v2.cls

@@ -484 +484 @@
 \if@STIXLargeOneCol%
 \RequirePackage[not1,notextcomp,lcgreekalpha]{stix}%
-%\usepackage[scaled]{helvet}
-%\renewcommand\familydefault{\sfdefault} 
 \usepackage[T1]{fontenc}
 \BXhsize=170mm%
@@ -528 +526 @@
 %\RequirePackage[not1,notextcomp,lcgreekalpha]{stix}%
 
-\captionsetup[figure]{labelformat=simple, labelsep=space, skip=10pt, labelfont=bf}
-\captionsetup[table]{labelformat=simple, labelsep=space, skip=10pt, labelfont=bf}
-\renewcommand{\thefigure}{\arabic{figure}}
-
-\renewcommand{\thetable}{\arabic{table}}
+\captionsetup[figure]{labelformat=simple, labelsep=none, skip=10pt, labelfont=bf}
+\captionsetup[table]{labelformat=simple, labelsep=none, skip=10pt, labelfont=bf}
+\renewcommand{\thefigure}{\arabic{figure}\enspace }
+
+\renewcommand{\thetable}{\arabic{table}\enspace }
 
 \renewcommand\figurename{\textbf{FIGURE}}%%
@@ -1414 +1412 @@
 \gdef\@stix@font@defn{%
   %
-%  \def\infoboxfont{\fontfamily{tim}\fontsize{8}{8}\selectfont}%
+  \def\infoboxfont{\fontfamily{tim}\fontsize{8}{8}\selectfont}%
   %
-%  \def\watermarkfont{\reset@font\fontfamily{\ffdefault}\fontsize{45}{45}\bfseries\selectfont}
+  \def\watermarkfont{\reset@font\fontfamily{\ffdefault}\fontsize{45}{45}\bfseries\selectfont}
   %
   \def\pagenumfont{\rmfamily\fontsize{7}{9}\bfseries\selectfont}%
@@ -1429 +1427 @@
   \def\arttypefont{\rmfamily\fontsize{9}{9}\fontseries{b}\selectfont}%
   \def\SParttypefont{\rmfamily\fontsize{9}{12}\fontseries{b}\selectfont}%
-  \def\titlefont{\rmfamily\fontsize{18}{23}\bfseries\selectfont\leftskip\z@\rightskip\z@ plus1fil}%
+  \def\titlefont{\rmfamily\fontsize{18}{23}\bfseries\selectfont\leftskip\z@\rightskip\z@ plus1fil\let\mathbcal\titmathbcal}%
   \def\subtitlefont{\rmfamily\fontsize{16}{21}\bfseries\selectfont\leftskip\z@\rightskip\z@ plus1fil}%
   \def\Authorfont{\rmfamily\fontsize{12}{18}\selectfont\leftskip\z@\rightskip\z@ plus1fil}%
@@ -1484 +1482 @@
 \gdef\@lato@font@defn{%
   %
-%  \def\infoboxfont{\fontfamily{tim}\fontsize{8}{8}\selectfont}%
+  \def\infoboxfont{\fontfamily{tim}\fontsize{8}{8}\selectfont}%
   %
-%  \def\watermarkfont{\reset@font\fontfamily{\ffdefault}\fontsize{45}{45}\bfseries\selectfont}
+  \def\watermarkfont{\reset@font\fontfamily{\ffdefault}\fontsize{45}{45}\bfseries\selectfont}
   %
   \def\pagenumfont{\rmfamily\fontsize{7}{9}\bfseries\selectfont}%
@@ -3249 +3247 @@
     \fi
   \fi%
-  \renewcommand\thefigure{\@Alph\c@section\arabic{figure}}%
-  \renewcommand\thetable{\@Alph\c@section\arabic{table}}%
+  \renewcommand\thefigure{\@Alph\c@section\arabic{figure}\enspace }%
+  \renewcommand\thetable{\@Alph\c@section\arabic{table}\enspace }%
   \renewcommand\theequation{\@Alph\c@section\arabic{equation}}%
 }{%

doc/papers/general/.gitignore

@@ -8 +8 @@
 Paper.out.ps
 WileyNJD-AMA.bst
+evaluation.zip

doc/papers/general/Makefile

@@ -45 +45 @@
         @rm -frv ${DOCUMENT} ${BASE}.ps WileyNJD-AMA.bst ${BASE}.out.ps ${Build}
 
+evaluation.zip :
+        zip -x evaluation/.gitignore  -x evaluation/timing.xlsx -x evaluation/timing.dat -r evaluation.zip evaluation
+
 # File Dependencies #
 
@@ -66 +69 @@
 ## Define the default recipes.
 
-${Build}:
+${Build} :
         mkdir -p ${Build}
 
-${BASE}.out.ps: ${Build}
+${BASE}.out.ps : ${Build}
         ln -fs ${Build}/Paper.out.ps .
 
-WileyNJD-AMA.bst:
+WileyNJD-AMA.bst :
         ln -fs ../AMA/AMA-stix/ama/WileyNJD-AMA.bst .
 

doc/papers/general/Paper.tex

@@ -59 +59 @@
 %\DeclareTextCommandDefault{\textunderscore}{\leavevmode\makebox[1.2ex][c]{\rule{1ex}{0.1ex}}}
 \renewcommand{\textunderscore}{\leavevmode\makebox[1.2ex][c]{\rule{1ex}{0.075ex}}}
+
+\renewcommand*{\thefootnote}{\alph{footnote}} % hack because fnsymbol does not work
+%\renewcommand*{\thefootnote}{\fnsymbol{footnote}}
 
 \makeatletter
@@ -174 +177 @@
 \lstMakeShortInline@%
 
+\let\OLDthebibliography\thebibliography
+\renewcommand\thebibliography[1]{
+  \OLDthebibliography{#1}
+  \setlength{\parskip}{0pt}
+  \setlength{\itemsep}{4pt plus 0.3ex}
+}
 
 \title{\texorpdfstring{\protect\CFA : Adding Modern Programming Language Features to C}{Cforall : Adding Modern Programming Language Features to C}}
@@ -191 +200 @@
 The C programming language is a foundational technology for modern computing with millions of lines of code implementing everything from commercial operating-systems to hobby projects.
 This installation base and the programmers producing it represent a massive software-engineering investment spanning decades and likely to continue for decades more.
-Nevertheless, C, first standardized over thirty years ago, lacks many features that make programming in more modern languages safer and more productive.
-The goal of the \CFA project is to create an extension of C that provides modern safety and productivity features while still ensuring strong backwards compatibility with C and its programmers.
+Nevertheless, C, first standardized almost forty years ago, lacks many features that make programming in more modern languages safer and more productive.
+
+The goal of the \CFA project (pronounced ``C-for-all'') is to create an extension of C that provides modern safety and productivity features while still ensuring strong backwards compatibility with C and its programmers.
 Prior projects have attempted similar goals but failed to honour C programming-style; for instance, adding object-oriented or functional programming with garbage collection is a non-starter for many C developers.
 Specifically, \CFA is designed to have an orthogonal feature-set based closely on the C programming paradigm, so that \CFA features can be added \emph{incrementally} to existing C code-bases, and C programmers can learn \CFA extensions on an as-needed basis, preserving investment in existing code and programmers.
@@ -226 +236 @@
 Love it or hate it, C is extremely popular, highly used, and one of the few systems languages.
 In many cases, \CC is often used solely as a better C.
-Nevertheless, C, first standardized over thirty years ago, lacks many features that make programming in more modern languages safer and more productive.
+Nevertheless, C, first standardized almost forty years ago~\cite{ANSI89:C}, lacks many features that make programming in more modern languages safer and more productive.
 
 \CFA (pronounced ``C-for-all'', and written \CFA or Cforall) is an evolutionary extension of the C programming language that adds modern language-features to C, while maintaining both source and runtime compatibility with C and a familiar programming model for programmers.
@@ -292 +302 @@
 The \CFA tests are 290+ files and 27,000+ lines of code.
 The tests illustrate syntactic and semantic features in \CFA, plus a growing number of runtime benchmarks.
-The tests check for correctness and are used for daily regression testing of commits (3800+).
+The tests check for correctness and are used for daily regression testing of 3800+ commits.
 
 Finally, it is impossible to describe a programming language without usages before definitions.
@@ -324 +334 @@
 int max( int a, int b ) { return a < b ? b : a; }  $\C{// (3)}$
 double max( double a, double b ) { return a < b ? b : a; }  $\C{// (4)}\CRT$
-max( 7, -max );                                         $\C[2.75in]{// uses (3) and (1), by matching int from constant 7}$
+max( 7, -max );                                         $\C{// uses (3) and (1), by matching int from constant 7}$
 max( max, 3.14 );                                       $\C{// uses (4) and (2), by matching double from constant 3.14}$
-max( max, -max );                                       $\C{// ERROR: ambiguous}$
-int m = max( max, -max );                       $\C{// uses (3) and (1) twice, by matching return type}\CRT$
+max( max, -max );                                       $\C{// ERROR, ambiguous}$
+int m = max( max, -max );                       $\C{// uses (3) and (1) twice, by matching return type}$
 \end{cfa}
 
@@ -336 +346 @@
 As is shown later, there are a number of situations where \CFA takes advantage of available type information to disambiguate, where other programming languages generate ambiguities.
 
-\Celeven added @_Generic@ expressions, which is used in preprocessor macros to provide a form of ad-hoc polymorphism;
+\Celeven added @_Generic@ expressions~\cite[\S~6.5.1.1]{C11}, which is used with preprocessor macros to provide ad-hoc polymorphism;
 however, this polymorphism is both functionally and ergonomically inferior to \CFA name overloading. 
 The macro wrapping the generic expression imposes some limitations;
 \eg, it cannot implement the example above, because the variables @max@ are ambiguous with the functions @max@. 
 Ergonomic limitations of @_Generic@ include the necessity to put a fixed list of supported types in a single place and manually dispatch to appropriate overloads, as well as possible namespace pollution from the dispatch functions, which must all have distinct names.
-For backwards compatibility, \CFA supports @_Generic@ expressions, but it is an unnecessary mechanism. \TODO{actually implement that}
+\CFA supports @_Generic@ expressions for backwards compatibility, but it is an unnecessary mechanism. \TODO{actually implement that}
 
 % http://fanf.livejournal.com/144696.html
@@ -369 +379 @@
 \begin{cfa}
 forall( otype T `| { T ?+?(T, T); }` ) T twice( T x ) { return x `+` x; }  $\C{// ? denotes operands}$
-int val = twice( twice( 3.7 ) );
+int val = twice( twice( 3.7 ) );  $\C{// val == 14}$
 \end{cfa}
 which works for any type @T@ with a matching addition operator.
 The polymorphism is achieved by creating a wrapper function for calling @+@ with @T@ bound to @double@, then passing this function to the first call of @twice@.
 There is now the option of using the same @twice@ and converting the result to @int@ on assignment, or creating another @twice@ with type parameter @T@ bound to @int@ because \CFA uses the return type~\cite{Cormack81,Baker82,Ada} in its type analysis.
-The first approach has a late conversion from @double@ to @int@ on the final assignment, while the second has an eager conversion to @int@.
+The first approach has a late conversion from @double@ to @int@ on the final assignment, while the second has an early conversion to @int@.
 \CFA minimizes the number of conversions and their potential to lose information, so it selects the first approach, which corresponds with C-programmer intuition.
 
@@ -420 +430 @@
 \begin{cfa}
 forall( otype T | { int ?<?( T, T ); } ) void qsort( const T * arr, size_t size ) { /* use C qsort */ }
-{
+int main() {
         int ?<?( double x, double y ) { return x `>` y; } $\C{// locally override behaviour}$
-        qsort( vals, size );                                    $\C{// descending sort}$
+        qsort( vals, 10 );                                                      $\C{// descending sort}$
 }
 \end{cfa}
@@ -534 +544 @@
 \begin{cquote}
 \lstDeleteShortInline@%
-\begin{tabular}{@{}l|@{\hspace{2\parindentlnth}}l@{}}
-\begin{cfa}
-forall( otype R, otype S ) struct pair {
+\begin{tabular}{@{}l|@{\hspace{\parindentlnth}}l@{}}
+\begin{cfa}
+`forall( otype R, otype S )` struct pair {
         R first;        S second;
 };
@@ -578 +588 @@
 \begin{cfa}
 struct _pair_conc0 {
-        const char * first;
-        int second;
+        const char * first;  int second;
 };
 \end{cfa}
@@ -587 +596 @@
 \begin{cfa}
 struct _pair_conc1 {
-        void * first;
-        void * second;
+        void * first, * second;
 };
 \end{cfa}
@@ -645 +653 @@
 \begin{cquote}
 \lstDeleteShortInline@%
-\begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{}}
+\begin{tabular}{@{}l|@{\hspace{\parindentlnth}}l@{}}
 \begin{cfa}
 forall( dtype Unit ) struct scalar { unsigned long value; };
@@ -661 +669 @@
                                                         half_marathon;
 scalar(litres) two_pools = pool + pool;
-`marathon + pool;`      // compilation ERROR
+`marathon + pool;`      // ERROR, mismatched types
 \end{cfa}
 \end{tabular}
@@ -1006 +1014 @@
 \begin{cfa}
 forall( dtype T0, dtype T1 | sized(T0) | sized(T1) ) struct _tuple2 {
-        T0 field_0;                                                             $\C{// generated before the first 2-tuple}$
-        T1 field_1;
+        T0 field_0;  T1 field_1;                                        $\C{// generated before the first 2-tuple}$
 };
 _tuple2(int, int) f() {
         _tuple2(double, double) x;
         forall( dtype T0, dtype T1, dtype T2 | sized(T0) | sized(T1) | sized(T2) ) struct _tuple3 {
-                T0 field_0;                                                     $\C{// generated before the first 3-tuple}$
-                T1 field_1;
-                T2 field_2;
+                T0 field_0;  T1 field_1;  T2 field_2;   $\C{// generated before the first 3-tuple}$
         };
         _tuple3(int, double, int) y;
 }
 \end{cfa}
-{\sloppy
-Tuple expressions are then simply converted directly into compound literals, \eg @[5, 'x', 1.24]@ becomes @(_tuple3(int, char, double)){ 5, 'x', 1.24 }@.
-\par}%
+Tuple expressions are then converted directly into compound literals, \eg @[5, 'x', 1.24]@ becomes @(_tuple3(int, char,@ @double)){ 5, 'x', 1.24 }@.
 
 \begin{comment}
@@ -1105 +1108 @@
 \begin{cquote}
 \lstDeleteShortInline@%
-\begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{}}
+\begin{tabular}{@{}l|@{\hspace{2\parindentlnth}}l@{}}
 \multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{\CFA}}    & \multicolumn{1}{c}{\textbf{C}}        \\
 \begin{cfa}
@@ -1174 +1177 @@
 \centering
 \lstDeleteShortInline@%
-\begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{}}
-\multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{\CFA}}    & \multicolumn{1}{c}{\textbf{C}}        \\
+\begin{tabular}{@{}l|@{\hspace{\parindentlnth}}l@{}}
+\multicolumn{1}{c|@{\hspace{\parindentlnth}}}{\textbf{\CFA}}    & \multicolumn{1}{c}{\textbf{C}}        \\
 \begin{cfa}
 `choose` ( day ) {
   case Mon~Thu:  // program
 
-  case Fri:  // program
+  case Fri:    // program
         wallet += pay;
         `fallthrough;`
-  case Sat:  // party
+  case Sat:   // party
         wallet -= party;
 
   case Sun:  // rest
 
-  default:  // error
+  default:    // print error
 }
 \end{cfa}
@@ -1196 +1199 @@
   case Mon: case Tue: case Wed: case Thu:  // program
         `break;`
-  case Fri:  // program
+  case Fri:    // program
         wallet += pay;
 
-  case Sat:  // party
+  case Sat:   // party
         wallet -= party;
         `break;`
   case Sun:  // rest
         `break;`
-  default:  // error
+  default:    // print error
 }
 \end{cfa}
@@ -1220 +1223 @@
 \centering
 \lstDeleteShortInline@%
-\begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{}}
-\multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{non-terminator}}  & \multicolumn{1}{c}{\textbf{target label}}     \\
+\begin{tabular}{@{}l|@{\hspace{\parindentlnth}}l@{}}
+\multicolumn{1}{c|@{\hspace{\parindentlnth}}}{\textbf{non-terminator}}  & \multicolumn{1}{c}{\textbf{target label}}     \\
 \begin{cfa}
 choose ( ... ) {
@@ -1264 +1267 @@
 \begin{figure}
 \lstDeleteShortInline@%
-\begin{tabular}{@{\hspace{\parindentlnth}}l@{\hspace{\parindentlnth}}l@{\hspace{\parindentlnth}}l@{}}
-\multicolumn{1}{@{\hspace{\parindentlnth}}c@{\hspace{\parindentlnth}}}{\textbf{\CFA}}   & \multicolumn{1}{@{\hspace{\parindentlnth}}c}{\textbf{C}}      \\
+\begin{tabular}{@{\hspace{\parindentlnth}}l|@{\hspace{\parindentlnth}}l@{\hspace{\parindentlnth}}l@{}}
+\multicolumn{1}{@{\hspace{\parindentlnth}}c|@{\hspace{\parindentlnth}}}{\textbf{\CFA}}  & \multicolumn{1}{@{\hspace{\parindentlnth}}c}{\textbf{C}}      \\
 \begin{cfa}
 `LC:` {
@@ -1349 +1352 @@
 \subsection{Exception Handling}
 
-The following framework for \CFA exception handling is in place, excluding some runtime type-information and virtual functions.
+The following framework for \CFA exception-handling is in place, excluding some runtime type-information and virtual functions.
 \CFA provides two forms of exception handling: \newterm{fix-up} and \newterm{recovery} (see Figure~\ref{f:CFAExceptionHandling})~\cite{Buhr92b,Buhr00a}.
 Both mechanisms provide dynamic call to a handler using dynamic name-lookup, where fix-up has dynamic return and recovery has static return from the handler.
@@ -1360 +1363 @@
 \begin{cquote}
 \lstDeleteShortInline@%
-\begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{}}
-\multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{Resumption}}      & \multicolumn{1}{c}{\textbf{Termination}}      \\
+\begin{tabular}{@{}l|@{\hspace{\parindentlnth}}l@{}}
+\multicolumn{1}{c|@{\hspace{\parindentlnth}}}{\textbf{Resumption}}      & \multicolumn{1}{c}{\textbf{Termination}}      \\
 \begin{cfa}
 `exception R { int fix; };`
@@ -1477 +1480 @@
 If an exception is raised and caught, the handler is run before the finally clause.
 Like a destructor (see Section~\ref{s:ConstructorsDestructors}), a finally clause can raise an exception but not if there is an exception being propagated.
-Mimicking the @finally@ clause with mechanisms like RAII is non-trivially when there are multiple types and local accesses.
+Mimicking the @finally@ clause with mechanisms like RAII is non-trivial when there are multiple types and local accesses.
 
 
@@ -1530 +1533 @@
 with ( s, t ) {
         j + k;                                                                  $\C{// unambiguous, s.j + t.k}$
-        m = 5.0;                                                                $\C{// unambiguous, t.m = 5.0}$
-        m = 1;                                                                  $\C{// unambiguous, s.m = 1}$
-        int a = m;                                                              $\C{// unambiguous, a = s.i }$
-        double b = m;                                                   $\C{// unambiguous, b = t.m}$
+        m = 5.0;                                                                $\C{// unambiguous, s.m = 5.0}$
+        m = 1;                                                                  $\C{// unambiguous, t.m = 1}$
+        int a = m;                                                              $\C{// unambiguous, a = t.m }$
+        double b = m;                                                   $\C{// unambiguous, b = s.m}$
         int c = s.i + t.i;                                              $\C{// unambiguous, qualification}$
-        (double)m;                                                              $\C{// unambiguous, cast}$
+        (double)m;                                                              $\C{// unambiguous, cast s.m}$
 }
 \end{cfa}
@@ -1559 +1562 @@
 and implicitly opened \emph{after} a function-body open, to give them higher priority:
 \begin{cfa}
-void ?{}( S & s, int `i` ) with ( s ) `with( $\emph{\color{red}params}$ )` {
+void ?{}( S & s, int `i` ) with ( s ) `{` `with( $\emph{\color{red}params}$ )` {
         s.i = `i`; j = 3; m = 5.5;
-}
+} `}`
 \end{cfa}
 Finally, a cast may be used to disambiguate among overload variables in a @with@ expression:
@@ -1660 +1663 @@
 \begin{cfa}
 `*` int x, y;
-int y;
-\end{cfa}
-&
-\begin{cfa}
-int `*`x, `*`y;
+int z;
+\end{cfa}
+&
+\begin{cfa}
+int `*`x, `*`y, z;
 
 \end{cfa}
@@ -1670 +1673 @@
 \lstMakeShortInline@%
 \end{cquote}
-The downside of the \CFA semantics is the need to separate regular and pointer declarations.
+% The downside of the \CFA semantics is the need to separate regular and pointer declarations.
+The separation of regular and pointer declarations by \CFA declarations enforces greater clarity with only slightly more syntax.
 
 \begin{comment}
@@ -1792 +1796 @@
 * [ * int, int ] ( int ) jp;    $\C{// pointer to function returning pointer to int and int with int parameter}$
 \end{cfa}
-Note, a function name cannot be specified:
-\begin{cfa}
-* [ int x ] f () fp;                    $\C{// function name "f" is disallowed}\CRT$
-\end{cfa}
+Note, the name of the function pointer is specified last, as for other variable declarations.
 
 Finally, new \CFA declarations may appear together with C declarations in the same program block, but cannot be mixed within a specific declaration.
@@ -1852 +1853 @@
 This provides a much more orthogonal design for library implementors, obviating the need for workarounds such as @std::reference_wrapper@.
 Secondly, \CFA references are rebindable, whereas \CC references have a fixed address.
-\newsavebox{\LstBox}
-\begin{lrbox}{\LstBox}
-\lstset{basicstyle=\footnotesize\linespread{0.9}\sf}
-\begin{cfa}
-int & r = *new( int );
-...                                                                                     $\C{// non-null reference}$
-delete &r;                                                                      $\C{// unmanaged (programmer) memory-management}$
-r += 1;                                                                         $\C{// undefined reference}$
-\end{cfa}
-\end{lrbox}
 Rebinding allows \CFA references to be default-initialized (\eg to a null pointer\footnote{
-While effort has been made into non-null reference checking in \CC and Java, the exercise seems moot for any non-managed languages (C/\CC), given that it only handles one of many different error situations:
-\begin{cquote}
-\usebox{\LstBox}
-\end{cquote}
-}%
-) and point to different addresses throughout their lifetime, like pointers.
+While effort has been made into non-null reference checking in \CC and Java, the exercise seems moot for any non-managed languages (C/\CC), given that it only handles one of many different error situations, \eg using a pointer after its storage is deleted.}) and point to different addresses throughout their lifetime, like pointers.
 Rebinding is accomplished by extending the existing syntax and semantics of the address-of operator in C.
 
@@ -1880 +1866 @@
 \begin{itemize}
 \item
-if @R@ is an rvalue of type {@T &@$_1 \cdots$@ &@$_r$} where $r \ge 1$ references (@&@ symbols) than @&R@ has type {@T `*`&@$_{\color{red}2} \cdots$@ &@$_{\color{red}r}$}, \\ \ie @T@ pointer with $r-1$ references (@&@ symbols).
+if @R@ is an rvalue of type {@T &@$_1 \cdots$@ &@$_r$} where $r \ge 1$ references (@&@ symbols) then @&R@ has type {@T `*`&@$_{\color{red}2} \cdots$@ &@$_{\color{red}r}$}, \\ \ie @T@ pointer with $r-1$ references (@&@ symbols).
         
 \item
@@ -1914 +1900 @@
 \end{cfa}
 This allows complex values to be succinctly and efficiently passed to functions, without the syntactic overhead of explicit definition of a temporary variable or the runtime cost of pass-by-value.
-\CC allows a similar binding, but only for @const@ references; the more general semantics of \CFA are an attempt to avoid the \newterm{const hell} problem, in which addition of a @const@ qualifier to one reference requires a cascading chain of added qualifiers.
+\CC allows a similar binding, but only for @const@ references; the more general semantics of \CFA are an attempt to avoid the \newterm{const poisoning} problem~\cite{Taylor10}, in which addition of a @const@ qualifier to one reference requires a cascading chain of added qualifiers.
 
 
@@ -1928 +1914 @@
 \begin{tabular}{@{}l@{\hspace{3em}}l|l@{}}
 \multicolumn{1}{c@{\hspace{3em}}}{\textbf{C Type Nesting}}      & \multicolumn{1}{c|}{\textbf{C Implicit Hoisting}}     & \multicolumn{1}{c}{\textbf{\CFA}}     \\
-\hline
 \begin{cfa}
 struct S {
@@ -2259 +2244 @@
         W w, heavy = { 20 };
         w = 155|_lb|;
-        w = 0b1111|_lb|;       // error, binary unsupported
+        // binary unsupported
         w = 0${\color{red}\LstBasicStyle{'}}$233|_lb|;          // quote separator
         w = 0x9b|_kg|;
@@ -2307 +2292 @@
 \begin{cquote}
 \lstDeleteShortInline@%
-\begin{tabular}{@{}l@{\hspace{2\parindentlnth}}l@{}}
-\multicolumn{1}{c@{\hspace{2\parindentlnth}}}{\textbf{\CFA}}    & \multicolumn{1}{c}{\textbf{C}}        \\
+\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}}
+\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}}     & \multicolumn{1}{c}{\textbf{C}}        \\
 \begin{cfa}
 MIN
-
 MAX
-
 PI
 E
@@ -2319 +2302 @@
 &
 \begin{cfa}
-SCHAR_MIN, CHAR_MIN, SHRT_MIN, INT_MIN, LONG_MIN,
-        LLONG_MIN, FLT_MIN, DBL_MIN, LDBL_MIN
-SCHAR_MAX, UCHAR_MAX, SHRT_MAX, INT_MAX, LONG_MAX,
-        LLONG_MAX, FLT_MAX, DBL_MAX, LDBL_MAX
+CHAR_MIN, SHRT_MIN, INT_MIN, LONG_MIN, LLONG_MIN, FLT_MIN, DBL_MIN, LDBL_MIN
+UCHAR_MAX, SHRT_MAX, INT_MAX, LONG_MAX, LLONG_MAX, FLT_MAX, DBL_MAX, LDBL_MAX
 M_PI, M_PIl
 M_E, M_El
@@ -2441 +2422 @@
 
 \begin{table}
+\caption{Storage-Management Operations}
+\label{t:StorageManagementOperations}
 \centering
 \lstDeleteShortInline@%
@@ -2460 +2443 @@
 \lstDeleteShortInline~%
 \lstMakeShortInline@%
-\caption{Storage-Management Operations}
-\label{t:StorageManagementOperations}
 \end{table}
 
@@ -2589 +2570 @@
 \end{cquote}
 There is a weak similarity between the \CFA logical-or operator and the Shell pipe-operator for moving data, where data flows in the correct direction for input but the opposite direction for output.
-
+\begin{comment}
 The implicit separator character (space/blank) is a separator not a terminator.
 The rules for implicitly adding the separator are:
@@ -2608 +2589 @@
 }%
 \end{itemize}
+\end{comment}
 There are functions to set and get the separator string, and manipulators to toggle separation on and off in the middle of output.
 
@@ -2656 +2638 @@
 
 
-\section{Evaluation}
+\section{Polymorphic Evaluation}
 \label{sec:eval}
 
-Though \CFA provides significant added functionality over C, these features have a low runtime penalty.
-In fact, \CFA's features for generic programming can enable faster runtime execution than idiomatic @void *@-based C code.
-This claim is demonstrated through a set of generic-code-based micro-benchmarks in C, \CFA, and \CC (see stack implementations in Appendix~\ref{sec:BenchmarkStackImplementations}).
+\CFA adds parametric polymorphism to C.
+A runtime evaluation is performed to compare the cost of alternative styles of polymorphism.
+The goal is to compare just the underlying mechanism for implementing different kinds of polymorphism.
+% Though \CFA provides significant added functionality over C, these features have a low runtime penalty.
+% In fact, it is shown that \CFA's generic programming can enable faster runtime execution than idiomatic @void *@-based C code.
+The experiment is a set of generic-stack micro-benchmarks~\cite{CFAStackEvaluation} in C, \CFA, and \CC (see implementations in Appendix~\ref{sec:BenchmarkStackImplementations}).
 Since all these languages share a subset essentially comprising standard C, maximal-performance benchmarks should show little runtime variance, differing only in length and clarity of source code.
 A more illustrative comparison measures the costs of idiomatic usage of each language's features.
@@ -2692 +2677 @@
 \end{figure}
 
-The structure of each benchmark implemented is: C with @void *@-based polymorphism, \CFA with the presented features, \CC with templates, and \CC using only class inheritance for polymorphism, called \CCV.
+The structure of each benchmark implemented is: C with @void *@-based polymorphism, \CFA with parametric polymorphism, \CC with templates, and \CC using only class inheritance for polymorphism, called \CCV.
 The \CCV variant illustrates an alternative object-oriented idiom where all objects inherit from a base @object@ class, mimicking a Java-like interface;
 hence runtime checks are necessary to safely down-cast objects.
 The most notable difference among the implementations is in memory layout of generic types: \CFA and \CC inline the stack and pair elements into corresponding list and pair nodes, while C and \CCV lack such a capability and instead must store generic objects via pointers to separately-allocated objects.
-Note that the C benchmark uses unchecked casts as there is no runtime mechanism to perform such checks, while \CFA and \CC provide type-safety statically.
+Note, the C benchmark uses unchecked casts as C has no runtime mechanism to perform such checks, while \CFA and \CC provide type-safety statically.
 
 Figure~\ref{fig:eval} and Table~\ref{tab:eval} show the results of running the benchmark in Figure~\ref{fig:BenchmarkTest} and its C, \CC, and \CCV equivalents.
@@ -2711 +2696 @@
 
 \begin{table}
-\centering
 \caption{Properties of benchmark code}
 \label{tab:eval}
+\centering
 \newcommand{\CT}[1]{\multicolumn{1}{c}{#1}}
 \begin{tabular}{rrrrr}
@@ -2726 +2711 @@
 The C and \CCV variants are generally the slowest with the largest memory footprint, because of their less-efficient memory layout and the pointer-indirection necessary to implement generic types;
 this inefficiency is exacerbated by the second level of generic types in the pair benchmarks.
-By contrast, the \CFA and \CC variants run in roughly equivalent time for both the integer and pair of @short@ and @char@ because the storage layout is equivalent, with the inlined libraries (\ie no separate compilation) and greater maturity of the \CC compiler contributing to its lead.
+By contrast, the \CFA and \CC variants run in roughly equivalent time for both the integer and pair because of equivalent storage layout, with the inlined libraries (\ie no separate compilation) and greater maturity of the \CC compiler contributing to its lead.
 \CCV is slower than C largely due to the cost of runtime type-checking of down-casts (implemented with @dynamic_cast@);
-The outlier in the graph for \CFA, pop @pair@, results from the complexity of the generated-C polymorphic code.
-The gcc compiler is unable to optimize some dead code and condense nested calls; a compiler designed for \CFA could easily perform these optimizations.
+The outlier for \CFA, pop @pair@, results from the complexity of the generated-C polymorphic code.
+The gcc compiler is unable to optimize some dead code and condense nested calls;
+a compiler designed for \CFA could easily perform these optimizations.
 Finally, the binary size for \CFA is larger because of static linking with the \CFA libraries.
 
@@ -2746 +2732 @@
 The \CFA benchmark is able to eliminate all redundant type annotations through use of the polymorphic @alloc@ function discussed in Section~\ref{sec:libraries}.
 
+We conjecture these results scale across most generic data-types as the underlying polymorphic implement is constant.
+
 
 \section{Related Work}
@@ -2751 +2739 @@
 
 \subsection{Polymorphism}
+
+ML~\cite{ML} was the first language to support parametric polymorphism.
+Like \CFA, it supports universal type parameters, but not the use of assertions and traits to constrain type arguments.
+Haskell~\cite{Haskell10} combines ML-style polymorphism, polymorphic data types, and type inference with the notion of type classes, collections of overloadable methods that correspond in intent to traits in \CFA.
+Unlike \CFA, Haskell requires an explicit association between types and their classes that specifies the implementation of operations.
+These associations determine the functions that are assertion arguments for particular combinations of class and type, in contrast to \CFA where the assertion arguments are selected at function call sites based upon the set of operations in scope at that point.
+Haskell also severely restricts the use of overloading: an overloaded name can only be associated with a single class, and methods with overloaded names can only be defined as part of instance declarations.
 
 \CC provides three disjoint polymorphic extensions to C: overloading, inheritance, and templates.
@@ -2804 +2799 @@
 Go does not have tuples but supports MRVF.
 Java's variadic functions appear similar to C's but are type-safe using homogeneous arrays, which are less useful than \CFA's heterogeneously-typed variadic functions.
-Tuples are a fundamental abstraction in most functional programming languages, such as Standard ML~\cite{sml} and~\cite{Scala}, which decompose tuples using pattern matching.
+Tuples are a fundamental abstraction in most functional programming languages, such as Standard ML~\cite{sml}, Haskell, and Scala~\cite{Scala}, which decompose tuples using pattern matching.
 
 
@@ -2835 +2830 @@
 Finally, we demonstrate that \CFA performance for some idiomatic cases is better than C and close to \CC, showing the design is practically applicable.
 
-There is ongoing work on a wide range of \CFA features, including arrays with size, runtime type-information, virtual functions, user-defined conversions, concurrent primitives, and modules.
-While all examples in the paper compile and run, a public beta-release of \CFA will take another 8--12 months to finalize these extensions.
-There are also interesting future directions for the polymorphism design.
-Notably, \CC template functions trade compile time and code bloat for optimal runtime of individual instantiations of polymorphic functions.
-\CFA polymorphic functions use dynamic virtual-dispatch;
-the runtime overhead of this approach is low, but not as low as inlining, and it may be beneficial to provide a mechanism for performance-sensitive code.
+While all examples in the paper compile and run, a public beta-release of \CFA will take 6--8 months to reduce compilation time, provide better debugging, and add a few more libraries.
+There is also new work on a number of \CFA features, including arrays with size, runtime type-information, virtual functions, user-defined conversions, and modules.
+While \CFA polymorphic functions use dynamic virtual-dispatch with low runtime overhead (see Section~\ref{sec:eval}), it is not as low as \CC template-inlining.
+Hence it may be beneficial to provide a mechanism for performance-sensitive code.
 Two promising approaches are an @inline@ annotation at polymorphic function call sites to create a template-specialization of the function (provided the code is visible) or placing an @inline@ annotation on polymorphic function-definitions to instantiate a specialized version for some set of types (\CC template specialization).
 These approaches are not mutually exclusive and allow performance optimizations to be applied only when necessary, without suffering global code-bloat.
@@ -2849 +2842 @@
 
 The authors would like to recognize the design assistance of Glen Ditchfield, Richard Bilson, Thierry Delisle, Andrew Beach and Brice Dobry on the features described in this paper, and thank Magnus Madsen for feedback on the writing.
-This work is supported by a corporate partnership with Huawei Ltd.\ (\url{http://www.huawei.com}), and Aaron Moss and Peter Buhr are partially funded by the Natural Sciences and Engineering Research Council of Canada.
-
-
+Funding for this project has been provided by Huawei Ltd.\ (\url{http://www.huawei.com}), and Aaron Moss and Peter Buhr are partially funded by the Natural Sciences and Engineering Research Council of Canada.
+
+{%
+\fontsize{9bp}{12bp}\selectfont%
 \bibliography{pl}
-
+}%
 
 \appendix

doc/papers/general/evaluation/timing.gp

@@ -25 +25 @@
 
 set label "23.9" at 7.125,10.5
-
+set style fill pattern 4 border lt -1
 # set datafile separator ","
 plot for [COL=2:5] 'evaluation/timing.dat' using (column(COL)/SCALE):xticlabels(1) title columnheader

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May  6 22:25:59 2018
-// Update Count     : 491
+// Last Modified On : Mon May  7 14:35:57 2018
+// Update Count     : 492
 //
 
@@ -407 +407 @@
         opterr = 0;                                                                                     // (global) prevent getopt from printing error messages
 
-        bool Werror = false;
+        bool Wsuppress = false, Werror = false;
         int c;
         while ( (c = getopt_long( argc, argv, "abBcCdefgGlLmnNpqrstTvwW:yzZD:F:", long_opts, &long_index )) != -1 ) {
@@ -495 +495 @@
                         break;
                   case 'w':
-                        SemanticWarning_SuppressAll();
+                        Wsuppress = true;
                         break;
                   case 'W':
@@ -545 +545 @@
                 SemanticWarning_WarningAsError();
         } // if
+        if ( Wsuppress ) {
+                SemanticWarning_SuppressAll();
+        } // if
         // for ( const auto w : WarningFormats ) {
         //      cout << w.name << ' ' << (int)w.severity << endl;