Index: doc/LaTeXmacros/common.tex =================================================================== --- doc/LaTeXmacros/common.tex (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ doc/LaTeXmacros/common.tex (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -11,6 +11,6 @@ %% Created On : Sat Apr 9 10:06:17 2016 %% Last Modified By : Peter A. Buhr -%% Last Modified On : Sun Feb 4 10:38:26 2018 -%% Update Count : 365 +%% Last Modified On : Tue Feb 13 08:19:07 2018 +%% Update Count : 367 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -177,15 +177,15 @@ \makeatother -\newenvironment{quote2}{% - \list{}{\lstset{resetmargins=true,aboveskip=0pt,belowskip=0pt}\topsep=4pt\parsep=0pt\leftmargin=\parindent\rightmargin\leftmargin}% +\newenvironment{cquote}{% + \list{}{\lstset{resetmargins=true,aboveskip=0pt,belowskip=0pt}\topsep=4pt\parsep=0pt\leftmargin=\parindentlnth\rightmargin\leftmargin}% \item\relax }{% \endlist -}% quote2 +}% cquote \newenvironment{rationale}{% - \begin{quote2}\noindent$\Box$\enspace + \begin{cquote}\noindent$\Box$\enspace }{% - \hfill\enspace$\Box$\end{quote2} + \hfill\enspace$\Box$\end{cquote} }% @@ -201,9 +201,9 @@ \newenvironment{syntax}{ \paragraph{Syntax} -\begin{quote2} +\begin{cquote} \begin{description}[noitemsep,leftmargin=\parindentlnth] }{ \end{description} -\end{quote2} +\end{cquote} } % \def\syntax{\paragraph{Syntax}\trivlist\parindent=.5in\item[\hskip.5in]} Index: doc/papers/general/Paper.tex =================================================================== --- doc/papers/general/Paper.tex (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ doc/papers/general/Paper.tex (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -4,19 +4,21 @@ \usepackage{epic,eepic} \usepackage{xspace,calc,comment} -\usepackage{upquote} % switch curled `'" to straight -\usepackage{listings} % format program code +\usepackage{upquote} % switch curled `'" to straight +\usepackage{listings} % format program code +\usepackage{enumitem} +\usepackage[flushmargin]{footmisc} % support label/reference in footnote \usepackage{rotating} \usepackage[usenames]{color} -\usepackage{pslatex} % reduce size of san serif font +\usepackage{pslatex} % reduce size of san serif font \usepackage[plainpages=false,pdfpagelabels,pdfpagemode=UseNone,pagebackref=true,breaklinks=true,colorlinks=true,linkcolor=blue,citecolor=blue,urlcolor=blue]{hyperref} \setlength{\textheight}{9in} %\oddsidemargin 0.0in -\renewcommand{\topfraction}{0.8} % float must be greater than X of the page before it is forced onto its own page -\renewcommand{\bottomfraction}{0.8} % float must be greater than X of the page before it is forced onto its own page -\renewcommand{\floatpagefraction}{0.8} % float must be greater than X of the page before it is forced onto its own page -\renewcommand{\textfraction}{0.0} % the entire page maybe devoted to floats with no text on the page at all - -\lefthyphenmin=4 % hyphen only after 4 characters +\renewcommand{\topfraction}{0.8} % float must be greater than X of the page before it is forced onto its own page +\renewcommand{\bottomfraction}{0.8} % float must be greater than X of the page before it is forced onto its own page +\renewcommand{\floatpagefraction}{0.8} % float must be greater than X of the page before it is forced onto its own page +\renewcommand{\textfraction}{0.0} % the entire page maybe devoted to floats with no text on the page at all + +\lefthyphenmin=4 % hyphen only after 4 characters \righthyphenmin=4 @@ -24,7 +26,7 @@ \newcommand{\CFAIcon}{\textsf{C}\raisebox{\depth}{\rotatebox{180}{\textsf{A}}}\xspace} % Cforall symbolic name -\newcommand{\CFA}{\protect\CFAIcon} % safe for section/caption -\newcommand{\CFL}{\textrm{Cforall}\xspace} % Cforall symbolic name -\newcommand{\Celeven}{\textrm{C11}\xspace} % C11 symbolic name +\newcommand{\CFA}{\protect\CFAIcon} % safe for section/caption +\newcommand{\CFL}{\textrm{Cforall}\xspace} % Cforall symbolic name +\newcommand{\Celeven}{\textrm{C11}\xspace} % C11 symbolic name \newcommand{\CC}{\textrm{C}\kern-.1em\hbox{+\kern-.25em+}\xspace} % C++ symbolic name \newcommand{\CCeleven}{\textrm{C}\kern-.1em\hbox{+\kern-.25em+}11\xspace} % C++11 symbolic name @@ -56,5 +58,5 @@ \newcommand{\LstCommentStyle}[1]{{\lst@basicstyle{\lst@commentstyle{#1}}}} -\newlength{\gcolumnposn} % temporary hack because lstlisting does not handle tabs correctly +\newlength{\gcolumnposn} % temporary hack because lstlisting does not handle tabs correctly \newlength{\columnposn} \setlength{\gcolumnposn}{2.75in} @@ -72,5 +74,5 @@ % Latin abbreviation -\newcommand{\abbrevFont}{\textit} % set empty for no italics +\newcommand{\abbrevFont}{\textit} % set empty for no italics \newcommand{\EG}{\abbrevFont{e}.\abbrevFont{g}.} \newcommand*{\eg}{% @@ -103,5 +105,5 @@ \newenvironment{cquote}{% - \list{}{\lstset{resetmargins=true,aboveskip=0pt,belowskip=0pt}\topsep=4pt\parsep=0pt\leftmargin=\parindent\rightmargin\leftmargin}% + \list{}{\lstset{resetmargins=true,aboveskip=0pt,belowskip=0pt}\topsep=4pt\parsep=0pt\leftmargin=\parindentlnth\rightmargin\leftmargin}% \item\relax }{% @@ -187,5 +189,5 @@ -\section{Introduction and Background} +\section{Introduction} 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. @@ -193,7 +195,7 @@ The TIOBE~\cite{TIOBE} ranks the top 5 most popular programming languages as: Java 16\%, \Textbf{C 7\%}, \Textbf{\CC 5\%}, \Csharp 4\%, Python 4\% = 36\%, where the next 50 languages are less than 3\% each with a long tail. The top 3 rankings over the past 30 years are: -\lstDeleteShortInline@% \begin{center} \setlength{\tabcolsep}{10pt} +\lstDeleteShortInline@% \begin{tabular}{@{}rccccccc@{}} & 2017 & 2012 & 2007 & 2002 & 1997 & 1992 & 1987 \\ \hline @@ -202,6 +204,6 @@ \CC & 3 & 3 & 3 & 3 & 2 & 2 & 4 \\ \end{tabular} +\lstMakeShortInline@% \end{center} -\lstMakeShortInline@% 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. @@ -224,9 +226,36 @@ The new constructs are empirically compared with both standard C and \CC; the results show the new design is comparable in performance. - -\subsection{Polymorphic Functions} +\section{Polymorphic Functions} + +\CFA introduces both ad-hoc and parametric polymorphism to C, with a design originally formalized by Ditchfield~\cite{Ditchfield92}, and first implemented by Bilson~\cite{Bilson03}. + +\subsection{Name Overloading} + +C already has a limited form of ad-hoc polymorphism in the form of its basic arithmetic operators, which apply to a variety of different types using identical syntax. +\CFA extends the built-in operator overloading by allowing users to define overloads for any function, not just operators, and even any variable; Section~\ref{sec:libraries} includes a number of examples of how this overloading simplifies \CFA programming relative to C. +Code generation for these overloaded functions and variables is implemented by the usual approach of mangling the identifier names to include a representation of their type, while \CFA decides which overload to apply based on the same ``usual arithmetic conversions'' used in C to disambiguate operator overloads. +As an example: + +\begin{cfa} +int max(int a, int b) { return a < b ? b : a; } // (1) +double max(double a, double b) { return a < b ? b : a; } // (2) + +int max = INT_MAX; // (3) +double max = DBL_MAX; // (4) + +max(7, -max); $\C{// uses (1) and (3), by matching int from constant 7}$ +max(max, 3.14); $\C{// uses (2) and (4), by matching double from constant 3.14}$ + +//max(max, -max); $\C{// ERROR: ambiguous}$ +int m = max(max, -max); $\C{// uses (1) once and (3) twice, by matching return type}$ +\end{cfa} + +\Celeven did add @_Generic@ expressions, which can be used in preprocessor macros to provide a form of 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; as an example, it could not implement the example above, because the variables @max@ would collide 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 functions dispatched to, which must all have distinct names. + +\subsection{\texorpdfstring{\LstKeywordStyle{forall} Functions}{forall Functions}} \label{sec:poly-fns} -\CFA{}\hspace{1pt}'s polymorphism was originally formalized by Ditchfield~\cite{Ditchfield92}, and first implemented by Bilson~\cite{Bilson03}. The signature feature of \CFA is parametric-polymorphic functions~\cite{forceone:impl,Cormack90,Duggan96} with functions generalized using a @forall@ clause (giving the language its name): \begin{lstlisting} @@ -257,5 +286,5 @@ Crucial to the design of a new programming language are the libraries to access thousands of external software features. Like \CC, \CFA inherits a massive compatible library-base, where other programming languages must rewrite or provide fragile inter-language communication with C. -A simple example is leveraging the existing type-unsafe (@void *@) C @bsearch@ to binary search a sorted floating-point array: +A simple example is leveraging the existing type-unsafe (@void *@) C @bsearch@ to binary search a sorted float array: \begin{lstlisting} void * bsearch( const void * key, const void * base, size_t nmemb, size_t size, @@ -263,5 +292,5 @@ int comp( const void * t1, const void * t2 ) { return *(double *)t1 < *(double *)t2 ? -1 : *(double *)t2 < *(double *)t1 ? 1 : 0; } -double key = 5.0, vals[10] = { /* 10 sorted floating-point values */ }; +double key = 5.0, vals[10] = { /* 10 sorted float values */ }; double * val = (double *)bsearch( &key, vals, 10, sizeof(vals[0]), comp ); $\C{// search sorted array}$ \end{lstlisting} @@ -304,10 +333,12 @@ Hence, programmers can easily form local environments, adding and modifying appropriate functions, to maximize reuse of other existing functions and types. -Finally, \CFA allows variable overloading: -\begin{lstlisting} -short int MAX = ...; int MAX = ...; double MAX = ...; -short int s = MAX; int i = MAX; double d = MAX; $\C{// select correct MAX}$ -\end{lstlisting} -Here, the single name @MAX@ replaces all the C type-specific names: @SHRT_MAX@, @INT_MAX@, @DBL_MAX@. +%% Redundant with Section~\ref{sec:libraries} %% + +% Finally, \CFA allows variable overloading: +% \begin{lstlisting} +% short int MAX = ...; int MAX = ...; double MAX = ...; +% short int s = MAX; int i = MAX; double d = MAX; $\C{// select correct MAX}$ +% \end{lstlisting} +% Here, the single name @MAX@ replaces all the C type-specific names: @SHRT_MAX@, @INT_MAX@, @DBL_MAX@. \subsection{Traits} @@ -505,5 +536,5 @@ In many languages, functions can return at most one value; however, many operations have multiple outcomes, some exceptional. -Consider C's @div@ and @remquo@ functions, which return the quotient and remainder for a division of integer and floating-point values, respectively. +Consider C's @div@ and @remquo@ functions, which return the quotient and remainder for a division of integer and float values, respectively. \begin{lstlisting} typedef struct { int quo, rem; } div_t; $\C{// from include stdlib.h}$ @@ -936,4 +967,6 @@ \section{Control Structures} + +\CFA identifies missing and problematic control structures in C, and extends and modifies these control structures to increase functionality and safety. @@ -1044,10 +1077,129 @@ The implicit targets of the current @continue@ and @break@, \ie the closest enclosing loop or @switch@, change as certain constructs are added or removed. + \subsection{\texorpdfstring{Enhanced \LstKeywordStyle{switch} Statement}{Enhanced switch Statement}} -\CFA also fixes a number of ergonomic defecits in the @switch@ statements of standard C. -C can specify a number of equivalent cases by using the default ``fall-through'' semantics of @case@ clauses, \eg @case 1: case 2: case 3:@ -- this syntax is cluttered, however, so \CFA includes a more concise list syntax, @case 1, 2, 3:@. -For contiguous ranges, \CFA provides an even more concise range syntax as well, @case 1~3:@; lists of ranges are also allowed in case selectors. - +There are a number of deficiencies with the C @switch@ statements: enumerating @case@ lists, placement of @case@ clauses, scope of the switch body, and fall through between case clauses. + +C has no shorthand for specifying a list of case values, whether the list is non-contiguous or contiguous\footnote{C provides this mechanism via fall through.}. +\CFA provides a shorthand for a non-contiguous list: +\begin{cquote} +\lstDeleteShortInline@% +\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}} +\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ +\begin{cfa} +case 2, 10, 34, 42: +\end{cfa} +& +\begin{cfa} +case 2: case 10: case 34: case 42: +\end{cfa} +\end{tabular} +\lstMakeShortInline@% +\end{cquote} +for a contiguous list:\footnote{gcc provides the same mechanism with awkward syntax, \lstinline@2 ... 42@, where spaces are required around the ellipse.} +\begin{cquote} +\lstDeleteShortInline@% +\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}} +\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ +\begin{cfa} +case 2~42: +\end{cfa} +& +\begin{cfa} +case 2: case 3: ... case 41: case 42: +\end{cfa} +\end{tabular} +\lstMakeShortInline@% +\end{cquote} +and a combination: +\begin{cfa} +case -12~-4, -1~5, 14~21, 34~42: +\end{cfa} + +C allows placement of @case@ clauses \emph{within} statements nested in the @switch@ body (see Duff's device~\cite{Duff83}); +\begin{cfa} +switch ( i ) { + case 0: + for ( int i = 0; i < 10; i += 1 ) { + ... + `case 1:` // no initialization of loop index + ... + } +} +\end{cfa} +\CFA precludes this form of transfer into a control structure because it causes undefined behaviour, especially with respect to missed initialization, and provides very limited functionality. + +C allows placement of declaration within the @switch@ body and unreachable code at the start, resulting in undefined behaviour: +\begin{cfa} +switch ( x ) { + `int y = 1;` $\C{// unreachable initialization}$ + `x = 7;` $\C{// unreachable code without label/branch}$ + case 0: + ... + `int z = 0;` $\C{// unreachable initialization, cannot appear after case}$ + z = 2; + case 1: + `x = z;` $\C{// without fall through, z is undefined}$ +} +\end{cfa} +\CFA allows the declaration of local variables, \eg @y@, at the start of the @switch@ with scope across the entire @switch@ body, \ie all @case@ clauses, but no statements. +\CFA disallows the declaration of local variable, \eg @z@, directly within the @switch@ body, because a declaration cannot occur immediately after a @case@ since a label can only be attached to a statement, and the use of @z@ is undefined in @case 1@ as neither storage allocation nor initialization may have occurred. + +C @switch@ provides multiple entry points into the statement body, but once an entry point is selected, control continues across \emph{all} @case@ clauses until the end of the @switch@ body, called \newterm{fall through}; +@case@ clauses are made disjoint by the @break@ statement. +While the ability to fall through \emph{is} a useful form of control flow, it does not match well with programmer intuition, resulting in many errors from missing @break@ statements. +\CFA provides a new control structure, @choose@, which mimics @switch@, but reverses the meaning of fall through: +\begin{cquote} +\lstDeleteShortInline@% +\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 + wallet += pay; + `fallthrough;` + case Sat: + // party + wallet -= party; + + case Sun: + // rest + + default: + // error +} +\end{cfa} +& +\begin{cfa} +switch ( day ) { + case Mon: case Tue: case Wed: case Thu: + // program + `break;` + case Fri: + // program + wallet += pay; + + case Sat: + // party + wallet -= party; + `break;` + case Sun: + // rest + `break;` + default: + // error +} +\end{cfa} +\end{tabular} +\lstMakeShortInline@% +\end{cquote} +Collectively, these enhancements reduce programmer burden and increase readability and safety. + +\begin{comment} Forgotten @break@ statements at the end of @switch@ cases are a persistent sort of programmer error in C, and the @break@ statements themselves introduce visual clutter and an un-C-like keyword-based block delimiter. \CFA addresses this error by introducing a @choose@ statement, which works identically to a @switch@ except that its default end-of-case behaviour is to break rather than to fall through for all non-empty cases. @@ -1070,4 +1222,6 @@ } \end{cfa} +\end{comment} + \subsection{\texorpdfstring{\LstKeywordStyle{with} Clause / Statement}{with Clause / Statement}} @@ -1206,7 +1360,5 @@ \end{cfa} - -\subsection{Exception Handling ???} - +% \subsection{Exception Handling ???} \section{Declarations} @@ -1255,10 +1407,10 @@ \lstDeleteShortInline@% \lstset{moredelim=**[is][\color{blue}]{+}{+}} -\begin{tabular}{@{}l@{\hspace{3em}}l@{}} -\multicolumn{1}{c@{\hspace{3em}}}{\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} +[5] *+ `int` x1; +* [5]+ `int` x2; -+[* [5] int]+ f`( int p )`; +`[* [5] int]` f+( int p )+; \end{cfa} & @@ -1266,5 +1418,5 @@ `int` +*+ x1 +[5]+; `int` +(*+x2+)[5]+; -+int (*+f`( int p )`+)[5]+; +`int (*`f+( int p )+`)[5]`; \end{cfa} \end{tabular} @@ -1277,6 +1429,6 @@ \begin{cquote} \lstDeleteShortInline@% -\begin{tabular}{@{}l@{\hspace{3em}}l@{}} -\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ +\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}} +\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ \begin{cfa} `*` int x, y; @@ -1292,6 +1444,6 @@ \begin{cquote} \lstDeleteShortInline@% -\begin{tabular}{@{}l@{\hspace{3em}}l@{}} -\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ +\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}} +\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ \begin{cfa} `*` int x; @@ -1310,6 +1462,6 @@ \begin{cquote} \lstDeleteShortInline@% -\begin{tabular}{@{}l@{\hspace{3em}}l@{\hspace{2em}}l@{}} -\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c@{\hspace{2em}}}{\textbf{C}} \\ +\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{\hspace{\parindentlnth}}l@{}} +\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}} & \multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{C}} \\ \begin{cfa} [ 5 ] int z; @@ -1351,6 +1503,6 @@ \begin{cquote} \lstDeleteShortInline@% -\begin{tabular}{@{}l@{\hspace{1em}}l@{\hspace{1em}}l@{}} -\multicolumn{1}{c@{\hspace{1em}}}{\textbf{\CFA}} & \multicolumn{1}{c@{\hspace{1em}}}{\textbf{C}} \\ +\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{\hspace{\parindentlnth}}l@{}} +\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}} & \multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{C}} \\ \begin{cfa} const * const int x; @@ -1374,6 +1526,6 @@ \begin{cquote} \lstDeleteShortInline@% -\begin{tabular}{@{}l@{\hspace{3em}}l@{\hspace{2em}}l@{}} -\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c@{\hspace{2em}}}{\textbf{C}} \\ +\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{\hspace{\parindentlnth}}l@{}} +\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}} & \multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{C}} \\ \begin{cfa} extern [ 5 ] int x; @@ -1397,6 +1549,6 @@ \begin{cquote} \lstDeleteShortInline@% -\begin{tabular}{@{}l@{\hspace{3em}}l@{}} -\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ +\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}} +\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ \begin{cfa} y = (* int)x; @@ -1415,4 +1567,49 @@ Therefore, a programmer has the option of either continuing to use traditional C declarations or take advantage of the new style. Clearly, both styles need to be supported for some time due to existing C-style header-files, particularly for UNIX-like systems. + +The syntax of the new routine prototype declaration follows directly from the new routine definition syntax; +as well, parameter names are optional, \eg: +\begin{cfa} +[ int x ] f (); $\C{// returning int with no parameters}$ +[ * int ] g (int y); $\C{// returning pointer to int with int parameter}$ +[ ] h ( int, char ); $\C{// returning no result with int and char parameters}$ +[ * int, int ] j ( int ); $\C{// returning pointer to int and int, with int parameter}$ +\end{cfa} +This syntax allows a prototype declaration to be created by cutting and pasting source text from the routine definition header (or vice versa). +Like C, it is possible to declare multiple routine-prototypes in a single declaration, where the return type is distributed across \emph{all} routine names in the declaration list, \eg: +\begin{cquote} +\lstDeleteShortInline@% +\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}} +\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ +\begin{cfa} +[double] foo(), foo( int ), foo( double ) {...} +\end{cfa} +& +\begin{cfa} +double foo1(), foo2( int ), foo3( double ); +\end{cfa} +\end{tabular} +\lstMakeShortInline@% +\end{cquote} +\CFA allows the last routine in the list to define its body. + +Declaration qualifiers can only appear at the start of a \CFA routine declaration,\footref{StorageClassSpecifier} \eg: +\begin{cfa} +extern [ int ] f ( int ); +static [ int ] g ( int ); +\end{cfa} + +The syntax for pointers to \CFA routines specifies the pointer name on the right, \eg: +\begin{cfa} +* [ int x ] () fp; $\C{// pointer to routine returning int with no parameters}$ +* [ * int ] (int y) gp; $\C{// pointer to routine returning pointer to int with int parameter}$ +* [ ] (int,char) hp; $\C{// pointer to routine returning no result with int and char parameters}$ +* [ * int,int ] ( int ) jp; $\C{// pointer to routine returning pointer to int and int, with int parameter}$ +\end{cfa} +While parameter names are optional, \emph{a routine name cannot be specified}; +for example, the following is incorrect: +\begin{cfa} +* [ int x ] f () fp; $\C{// routine name "f" is not allowed}$ +\end{cfa} @@ -1593,4 +1790,79 @@ In addition to the expressive power, \lstinline|@=| provides a simple path for migrating legacy C code to \CFA, by providing a mechanism to incrementally convert initializers; the \CFA design team decided to introduce a new syntax for this escape hatch because we believe that our RAII implementation will handle the vast majority of code in a desirable way, and we wished to maintain familiar syntax for this common case. + +\subsection{Type Nesting} + +\CFA allows \newterm{type nesting}, and type qualification of the nested types (see Figure~\ref{f:TypeNestingQualification}), where as C hoists (refactors) nested types into the enclosing scope and has no type qualification. +\begin{figure} +\centering +\lstDeleteShortInline@% +\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 { + enum C { R, G, B }; + struct T { + union U { int i, j; }; + enum C c; + short int i, j; + }; + struct T t; +} s; + +int rtn() { + s.t.c = R; + struct T t = { R, 1, 2 }; + enum C c; + union U u; +} +\end{cfa} +& +\begin{cfa} +enum C { R, G, B }; +union U { int i, j; }; +struct T { + enum C c; + short int i, j; +}; +struct S { + struct T t; +} s; + + + + + + + +\end{cfa} +& +\begin{cfa} +struct S { + enum C { R, G, B }; + struct T { + union U { int i, j; }; + enum C c; + short int i, j; + }; + struct T t; +} s; + +int rtn() { + s.t.c = `S.`R; // type qualification + struct `S.`T t = { `S.`R, 1, 2 }; + enum `S.`C c; + union `S.T.`U u; +} +\end{cfa} +\end{tabular} +\lstMakeShortInline@% +\caption{Type Nesting / Qualification} +\label{f:TypeNestingQualification} +\end{figure} +In the left example in C, types @C@, @U@ and @T@ are implicitly hoisted outside of type @S@ into the containing block scope. +In the right example in \CFA, the types are not hoisted and accessed using the field-selection operator ``@.@'' for type qualification, as does Java, rather than the \CC type-selection operator ``@::@''. + + \subsection{Default Parameters} @@ -1598,5 +1870,5 @@ \section{Literals} -C already includes limited polymorphism for literals -- @0@ can be either an integer or a pointer literal, depending on context, while the syntactic forms of literals of the various integer and floating-point types are very similar, differing from each other only in suffix. +C already includes limited polymorphism for literals -- @0@ can be either an integer or a pointer literal, depending on context, while the syntactic forms of literals of the various integer and float types are very similar, differing from each other only in suffix. In keeping with the general \CFA approach of adding features while respecting ``the C way'' of doing things, we have extended both C's polymorphic zero and typed literal syntax to interoperate with user-defined types, while maintaining a backwards-compatible semantics. @@ -1622,5 +1894,5 @@ struct Weight { double stones; }; -void ?{}( Weight & w ) { w.stones = 0; } $\C{// operations}$ +void ?{}( Weight & w ) { w.stones = 0; } $\C{// operations}$ void ?{}( Weight & w, double w ) { w.stones = w; } Weight ?+?( Weight l, Weight r ) { return (Weight){ l.stones + r.stones }; } @@ -1631,14 +1903,389 @@ int main() { - Weight w, hw = { 14 }; $\C{// 14 stone}$ + Weight w, hw = { 14 }; $\C{// 14 stone}$ w = 11@`st@ + 1@`lb@; w = 70.3@`kg@; w = 155@`lb@; - w = 0x_9b_u@`lb@; $\C{// hexadecimal unsigned weight (155)}$ - w = 0_233@`lb@; $\C{// octal weight (155)}$ + w = 0x_9b_u@`lb@; $\C{// hexadecimal unsigned weight (155)}$ + w = 0_233@`lb@; $\C{// octal weight (155)}$ w = 5@`st@ + 8@`kg@ + 25@`lb@ + hw; } \end{cfa} }% + + +\section{Libraries} +\label{sec:libraries} + +As stated in Section~\ref{sec:poly-fns}, \CFA inherits a large corpus of library code, where other programming languages must rewrite or provide fragile inter-language communication with C. +\CFA has replacement libraries condensing hundreds of existing C names into tens of \CFA overloaded names, all without rewriting the actual computations. +In many cases, the interface is an inline wrapper providing overloading during compilation but zero cost at runtime. +The following sections give a glimpse of the interface reduction to many C libraries. +In many cases, @signed@/@unsigned@ @char@ and @short@ routines are available (but not shown) to ensure expression computations remain in a single type, as conversions can distort results. + + +\subsection{Limits} + +C library @limits.h@ provides lower and upper bound constants for the basic types. +\CFA name overloading is used to condense these typed constants, \eg: +\begin{cquote} +\lstDeleteShortInline@% +\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}} +\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{Definition}} & \multicolumn{1}{c}{\textbf{Usage}} \\ +\begin{cfa} +const short int `MIN` = -32768; +const int `MIN` = -2147483648; +const long int `MIN` = -9223372036854775808L; +\end{cfa} +& +\begin{cfa} +short int si = `MIN`; +int i = `MIN`; +long int li = `MIN`; +\end{cfa} +\end{tabular} +\lstMakeShortInline@% +\end{cquote} +The result is a significant reduction in names to access typed constants, \eg: +\begin{cquote} +\lstDeleteShortInline@% +\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}} +\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ +\begin{cfa} +MIN +MAX +M_PI +M_E +\end{cfa} +& +\begin{cfa} +SCHAR_MIN, CHAR_MIN, SHRT_MIN, INT_MIN, LONG_MIN, LLONG_MIN, +SCHAR_MAX, UCHAR_MAX, SHRT_MAX, INT_MAX, LONG_MAX, LLONG_MAX, +M_PI, M_PIl, M_CPI, M_CPIl, +M_E, M_El, M_CE, M_CEl +\end{cfa} +\end{tabular} +\lstMakeShortInline@% +\end{cquote} + + +\subsection{Math} + +C library @math.h@ provides many mathematical routines. +\CFA routine overloading is used to condense these mathematical routines, \eg: +\begin{cquote} +\lstDeleteShortInline@% +\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}} +\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{Definition}} & \multicolumn{1}{c}{\textbf{Usage}} \\ +\begin{cfa} +float `log`( float x ); +double `log`( double ); +double _Complex `log`( double _Complex x ); +\end{cfa} +& +\begin{cfa} +float f = `log`( 3.5 ); +double d = `log`( 3.5 ); +double _Complex dc = `log`( 3.5+0.5I ); +\end{cfa} +\end{tabular} +\lstMakeShortInline@% +\end{cquote} +The result is a significant reduction in names to access math routines, \eg: +\begin{cquote} +\lstDeleteShortInline@% +\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}} +\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ +\begin{cfa} +log +sqrt +sin +\end{cfa} +& +\begin{cfa} +logf, log, logl, clogf, clog, clogl +sqrtf, sqrt, sqrtl, csqrtf, csqrt, csqrtl +sinf, sin, sinl, csinf, csin, csinl +\end{cfa} +\end{tabular} +\lstMakeShortInline@% +\end{cquote} +While \Celeven has type-generic math~\cite[\S~7.25]{C11} in @tgmath.h@ to provide a similar mechanism, these macros are limited, matching a routine name with a single set of floating type(s). +For example, it is not possible to overload @atan@ for both one and two arguments; +instead the names @atan@ and @atan2@ are required. +The key observation is that only a restricted set of type-generic macros are provided for a limited set of routine names, which do not generalize across the type system, as in \CFA. + + +\subsection{Standard} + +C library @stdlib.h@ provides many general routines. +\CFA routine overloading is used to condense these utility routines, \eg: +\begin{cquote} +\lstDeleteShortInline@% +\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}} +\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{Definition}} & \multicolumn{1}{c}{\textbf{Usage}} \\ +\begin{cfa} +unsigned int `abs`( int ); +double `abs`( double ); +double abs( double _Complex ); +\end{cfa} +& +\begin{cfa} +unsigned int i = `abs`( -1 ); +double d = `abs`( -1.5 ); +double d = `abs`( -1.5+0.5I ); +\end{cfa} +\end{tabular} +\lstMakeShortInline@% +\end{cquote} +The result is a significant reduction in names to access utility routines, \eg: +\begin{cquote} +\lstDeleteShortInline@% +\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}} +\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ +\begin{cfa} +abs +strto +random +\end{cfa} +& +\begin{cfa} +abs, labs, llabs, fabsf, fabs, fabsl, cabsf, cabs, cabsl +strtol, strtoul, strtoll, strtoull, strtof, strtod, strtold +srand48, mrand48, lrand48, drand48 +\end{cfa} +\end{tabular} +\lstMakeShortInline@% +\end{cquote} +In additon, there are polymorphic routines, like @min@ and @max@, which work on any type with operators @??@. + +The following shows one example where \CFA \emph{extends} an existing standard C interface to reduce complexity and provide safety. +C/\Celeven provide a number of complex and overlapping storage-management operation to support the following capabilities: +\begin{description}[itemsep=2pt,parsep=0pt] +\item[fill] +after allocation the storage is filled with a specified character. +\item[resize] +an existing allocation is decreased or increased in size. +In either case, new storage may or may not be allocated and, if there is a new allocation, as much data from the existing allocation is copied. +For an increase in storage size, new storage after the copied data may be filled. +\item[alignment] +an allocation starts on a specified memory boundary, \eg, an address multiple of 64 or 128 for cache-line purposes. +\item[array] +the allocation size is scaled to the specified number of array elements. +An array may be filled, resized, or aligned. +\end{description} +Table~\ref{t:StorageManagementOperations} shows the capabilities provided by C/\Celeven allocation-routines and how all the capabilities can be combined into two \CFA routines. + +\CFA storage-management routines extend the C equivalents by overloading, providing shallow type-safety, and removing the need to specify the base allocation-size. +The following example contrasts \CFA and C storage-allocation operation performing the same operations with the same type safety: +\begin{cquote} +\begin{cfa}[aboveskip=0pt] +size_t dim = 10; $\C{// array dimension}$ +char fill = '\xff'; $\C{// initialization fill value}$ +int * ip; +\end{cfa} +\lstDeleteShortInline@% +\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}} +\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ +\begin{cfa} +ip = alloc(); +ip = alloc( fill ); +ip = alloc( dim ); +ip = alloc( dim, fill ); +ip = alloc( ip, 2 * dim ); +ip = alloc( ip, 4 * dim, fill ); + +ip = align_alloc( 16 ); +ip = align_alloc( 16, fill ); +ip = align_alloc( 16, dim ); +ip = align_alloc( 16, dim, fill ); +\end{cfa} +& +\begin{cfa} +ip = (int *)malloc( sizeof( int ) ); +ip = (int *)malloc( sizeof( int ) ); memset( ip, fill, sizeof( int ) ); +ip = (int *)malloc( dim * sizeof( int ) ); +ip = (int *)malloc( sizeof( int ) ); memset( ip, fill, dim * sizeof( int ) ); +ip = (int *)realloc( ip, 2 * dim * sizeof( int ) ); +ip = (int *)realloc( ip, 4 * dim * sizeof( int ) ); memset( ip, fill, 4 * dim * sizeof( int ) ); + +ip = memalign( 16, sizeof( int ) ); +ip = memalign( 16, sizeof( int ) ); memset( ip, fill, sizeof( int ) ); +ip = memalign( 16, dim * sizeof( int ) ); +ip = memalign( 16, dim * sizeof( int ) ); memset( ip, fill, dim * sizeof( int ) ); +\end{cfa} +\end{tabular} +\lstMakeShortInline@% +\end{cquote} +Variadic @new@ (see Section~\ref{sec:variadic-tuples}) cannot support the same overloading because extra parameters are for initialization. +Hence, there are @new@ and @anew@ routines for single and array variables, and the fill value is the arguments to the constructor, \eg: +\begin{cfa} +struct S { int i, j; }; +void ?{}( S & s, int i, int j ) { s.i = i; s.j = j; } +S * s = new( 2, 3 ); $\C{// allocate storage and run constructor}$ +S * as = anew( dim, 2, 3 ); $\C{// each array element initialized to 2, 3}$ +\end{cfa} +Note, \CC can only initialization array elements via the default constructor. + +Finally, the \CFA memory-allocator has \newterm{sticky properties} for dynamic storage: fill and alignment are remembered with an object's storage in the heap. +When a @realloc@ is performed, the sticky properties are respected, so that new storage is correctly aligned and initialized with the fill character. + +\begin{table} +\centering +\lstDeleteShortInline@% +\lstMakeShortInline~% +\begin{tabular}{@{}r|r|l|l|l|l@{}} +\multicolumn{1}{c}{}& & \multicolumn{1}{c|}{fill} & resize & alignment & array \\ +\hline +C & ~malloc~ & no & no & no & no \\ + & ~calloc~ & yes (0 only) & no & no & yes \\ + & ~realloc~ & no/copy & yes & no & no \\ + & ~memalign~ & no & no & yes & no \\ + & ~posix_memalign~ & no & no & yes & no \\ +\hline +C11 & ~aligned_alloc~ & no & no & yes & no \\ +\hline +\CFA & ~alloc~ & yes/copy & no/yes & no & yes \\ + & ~align_alloc~ & yes & no & yes & yes \\ +\end{tabular} +\lstDeleteShortInline~% +\lstMakeShortInline@% +\caption{Storage-Management Operations} +\label{t:StorageManagementOperations} +\end{table} + + +\subsection{I/O} +\label{s:IOLibrary} + +The goal of \CFA I/O is to simplify the common cases, while fully supporting polymorphism and user defined types in a consistent way. +The approach combines ideas from \CC and Python. +The \CFA header file for the I/O library is @fstream@. + +The common case is printing out a sequence of variables separated by whitespace. +\begin{cquote} +\lstDeleteShortInline@% +\begin{tabular}{@{}l@{\hspace{\parindentlnth}}l@{}} +\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{\CC}} \\ +\begin{cfa} +int x = 1, y = 2, z = 3; +sout | x `|` y `|` z | endl; +\end{cfa} +& +\begin{cfa} + +cout << x `<< " "` << y `<< " "` << z << endl; +\end{cfa} +\\ +\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt] +1` `2` `3 +\end{cfa} +& +\begin{cfa}[showspaces=true,aboveskip=0pt,belowskip=0pt] +1 2 3 +\end{cfa} +\end{tabular} +\lstMakeShortInline@% +\end{cquote} +The \CFA form has half the characters of the \CC form, and is similar to Python I/O with respect to implicit separators. +Similar simplification occurs for tuple I/O, which prints all tuple values separated by ``\lstinline[showspaces=true]@, @''. +\begin{cfa} +[int, [ int, int ] ] t1 = [ 1, [ 2, 3 ] ], t2 = [ 4, [ 5, 6 ] ]; +sout | t1 | t2 | endl; $\C{// print tuples}$ +\end{cfa} +\begin{cfa}[showspaces=true,aboveskip=0pt] +1`, `2`, `3 4`, `5`, `6 +\end{cfa} +Finally, \CFA uses the logical-or operator for I/O as it is the lowest-priority overloadable operator, other than assignment. +Therefore, fewer output expressions require parenthesis. +\begin{cquote} +\lstDeleteShortInline@% +\begin{tabular}{@{}ll@{}} +\textbf{\CFA:} +& +\begin{cfa} +sout | x * 3 | y + 1 | z << 2 | x == y | (x | y) | (x || y) | (x > z ? 1 : 2) | endl; +\end{cfa} +\\ +\textbf{\CC:} +& +\begin{cfa} +cout << x * 3 << y + 1 << `(`z << 2`)` << `(`x == y`)` << (x | y) << (x || y) << (x > z ? 1 : 2) << endl; +\end{cfa} +\\ +\textbf{output:} +& +\begin{cfa}[showspaces=true,aboveskip=0pt] +3 3 12 0 3 1 2 +\end{cfa} +\end{tabular} +\lstMakeShortInline@% +\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. + +The implicit separator character (space/blank) is a separator not a terminator. +The rules for implicitly adding the separator are: +\begin{itemize}[itemsep=2pt,parsep=0pt] +\item +A separator does not appear at the start or end of a line. +\item +A separator does not appear before or after a character literal or variable. +\item +A separator does not appear before or after a null (empty) C string, which is a local mechanism to disable insertion of the separator character. +\item +A separator does not appear before a C string starting with the characters: \lstinline[mathescape=off,basicstyle=\tt]@([{=$@ +\item +A seperator does not appear after a C string ending with the characters: \lstinline[basicstyle=\tt]@,.;!?)]}%@ +\item +{\lstset{language=CFA,deletedelim=**[is][]{`}{`}} +A seperator does not appear before or after a C string begining/ending with the quote or whitespace characters: \lstinline[basicstyle=\tt,showspaces=true]@`'": \t\v\f\r\n@ +}% +\item +There are routines to set and get the separator string, and manipulators to toggle separation on and off in the middle of output. +\end{itemize} + + +\subsection{Multi-precision Integers} +\label{s:MultiPrecisionIntegers} + +\CFA has an interface to the GMP multi-precision signed-integers~\cite{GMP}, similar to the \CC interface provided by GMP. +The \CFA interface wraps GMP routines into operator routines to make programming with multi-precision integers identical to using fixed-sized integers. +The \CFA type name for multi-precision signed-integers is @Int@ and the header file is @gmp@. +The following multi-precision factorial programs contrast using GMP with the \CFA and C interfaces. +\begin{cquote} +\lstDeleteShortInline@% +\begin{tabular}{@{}l@{\hspace{\parindentlnth}}@{\hspace{\parindentlnth}}l@{}} +\multicolumn{1}{c@{\hspace{\parindentlnth}}}{\textbf{\CFA}} & \multicolumn{1}{@{\hspace{\parindentlnth}}c}{\textbf{C}} \\ +\begin{cfa} +#include +int main( void ) { + sout | "Factorial Numbers" | endl; + Int fact = 1; + + sout | 0 | fact | endl; + for ( unsigned int i = 1; i <= 40; i += 1 ) { + fact *= i; + sout | i | fact | endl; + } +} +\end{cfa} +& +\begin{cfa} +#include +int main( void ) { + `gmp_printf`( "Factorial Numbers\n" ); + `mpz_t` fact; + `mpz_init_set_ui`( fact, 1 ); + `gmp_printf`( "%d %Zd\n", 0, fact ); + for ( unsigned int i = 1; i <= 40; i += 1 ) { + `mpz_mul_ui`( fact, fact, i ); + `gmp_printf`( "%d %Zd\n", i, fact ); + } +} +\end{cfa} +\end{tabular} +\lstMakeShortInline@% +\end{cquote} + \section{Evaluation} @@ -1704,4 +2351,5 @@ \begin{table} +\centering \caption{Properties of benchmark code} \label{tab:eval} Index: doc/user/user.tex =================================================================== --- doc/user/user.tex (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ doc/user/user.tex (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -11,6 +11,6 @@ %% Created On : Wed Apr 6 14:53:29 2016 %% Last Modified By : Peter A. Buhr -%% Last Modified On : Wed Jan 31 22:29:25 2018 -%% Update Count : 3147 +%% Last Modified On : Tue Feb 13 08:31:21 2018 +%% Update Count : 3161 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -161,5 +161,5 @@ Like \Index*[C++]{\CC{}}, there may be both an old and new ways to achieve the same effect. For example, the following programs compare the \CFA, C, and \CC I/O mechanisms, where the programs output the same result. -\begin{quote2} +\begin{cquote} \begin{tabular}{@{}l@{\hspace{1.5em}}l@{\hspace{1.5em}}l@{}} \multicolumn{1}{c@{\hspace{1.5em}}}{\textbf{C}} & \multicolumn{1}{c}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{\CC}} \\ @@ -191,5 +191,5 @@ \end{cfa} \end{tabular} -\end{quote2} +\end{cquote} While the \CFA I/O looks similar to the \Index*[C++]{\CC{}} output style, there are important differences, such as automatic spacing between variables as in \Index*{Python} (see~\VRef{s:IOLibrary}). @@ -274,5 +274,5 @@ \begin{comment} -A simple example is leveraging the existing type-unsafe (©void *©) C ©bsearch© to binary search a sorted floating-point array: +A simple example is leveraging the existing type-unsafe (©void *©) C ©bsearch© to binary search a sorted floating array: \begin{lstlisting} void * bsearch( const void * key, const void * base, size_t dim, size_t size, @@ -282,5 +282,5 @@ *(double *)t2 < *(double *)t1 ? 1 : 0; } -double key = 5.0, vals[10] = { /* 10 sorted floating-point values */ }; +double key = 5.0, vals[10] = { /* 10 sorted floating values */ }; double * val = (double *)bsearch( &key, vals, 10, sizeof(vals[0]), comp ); $\C{// search sorted array}$ \end{lstlisting} @@ -444,8 +444,8 @@ 0x®_®ff®_®ff; §\C{// hexadecimal constant}§ 0x®_®ef3d®_®aa5c; §\C{// hexadecimal constant}§ -3.141®_®592®_®654; §\C{// floating point constant}§ -10®_®e®_®+1®_®00; §\C{// floating point constant}§ -0x®_®ff®_®ff®_®p®_®3; §\C{// hexadecimal floating point}§ -0x®_®1.ffff®_®ffff®_®p®_®128®_®l; §\C{// hexadecimal floating point long constant}§ +3.141®_®592®_®654; §\C{// floating constant}§ +10®_®e®_®+1®_®00; §\C{// floating constant}§ +0x®_®ff®_®ff®_®p®_®3; §\C{// hexadecimal floating}§ +0x®_®1.ffff®_®ffff®_®p®_®128®_®l; §\C{// hexadecimal floating long constant}§ L®_®§"\texttt{\textbackslash{x}}§®_®§\texttt{ff}§®_®§\texttt{ee}"§; §\C{// wide character constant}§ \end{cfa} @@ -501,4 +501,25 @@ \label{f:HeaderFileInterposition} \end{figure} + + +\section{Exponentiation Operator} + +C, \CC, and Java (and many other programming languages) have no exponentiation operator\index{exponentiation!operator}\index{operator!exponentiation}, \ie $x^y$, and instead use a routine, like \Indexc{pow}, to perform the exponentiation operation. +\CFA extends the basic operators with the exponentiation operator ©?\?©\index{?\\?@\lstinline$?\?$} and ©?\=?©\index{?\\=?@\lstinline$?\=?$}, as in, ©x \ y© and ©x \= y©, which means $x^y$ and $x \leftarrow x^y$. +The priority of the exponentiation operator is between the cast and multiplicative operators, so that ©w * (int)x \ (int)y * z© is parenthesized as ©((w * (((int)x) \ ((int)y))) * z)©. + +As for \Index{division}, there are exponentiation operators for integral and floating types, including the builtin \Index{complex} types. +Unsigned integral exponentiation\index{exponentiation!unsigned integral} is performed with repeated multiplication\footnote{The multiplication computation is $O(\log y)$.} (or shifting if the base is 2). +Signed integral exponentiation\index{exponentiation!signed integral} is performed with repeated multiplication (or shifting if the base is 2), but yields a floating result because $x^{-y}=1/x^y$. +Hence, it is important to designate exponent integral-constants as unsigned or signed: ©3 \ 3u© return an integral result, while ©3 \ 3© returns a floating result. +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) | endl; +256 64 -64 0.015625 -0.015625 18.3791736799526 0.264715-1.1922i +\end{cfa} +Parenthesis are necessary for the complex constants or the expresion is parsed as ©1.0f+(2.0fi \ 3.0f)+2.0fi©. +The exponentiation operator is available for all the basic types, but for user-defined types, only the integral-computation versions are available. +For returning an integral value, the user type ©T© must define multiplication, ©*©, and one, ©1©; +for returning a floating value, an additional divide of type ©T© into a ©double© returning a ©double© (©double ?/?( double, T )©) is necessary for negative exponents. @@ -628,5 +649,5 @@ \end{cfa} The ability to fall-through to the next clause \emph{is} a useful form of control flow, specifically when a sequence of case actions compound: -\begin{quote2} +\begin{cquote} \begin{tabular}{@{}l@{\hspace{3em}}l@{}} \begin{cfa} @@ -656,5 +677,5 @@ \end{cfa} \end{tabular} -\end{quote2} +\end{cquote} In this example, case 2 is always done if case 3 is done. This control flow is difficult to simulate with if statements or a ©switch© statement without fall-through as code must be duplicated or placed in a separate routine. @@ -730,9 +751,9 @@ ®int y = 1;® §\C{// unreachable initialization}§ ®x = 7;® §\C{// unreachable code without label/branch}§ - case 3: ... + case 0: ... ... ®int z = 0;® §\C{// unreachable initialization, cannot appear after case}§ z = 2; - case 3: + case 1: ®x = z;® §\C{// without fall through, z is uninitialized}§ } @@ -819,5 +840,5 @@ Requiring a ©case© clause for each value does not seem to be in the spirit of brevity normally associated with C. Therefore, the ©case© clause is extended with a list of values, as in: -\begin{quote2} +\begin{cquote} \begin{tabular}{@{}l@{\hspace{3em}}l@{\hspace{2em}}l@{}} \multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c@{\hspace{2em}}}{\textbf{C}} \\ @@ -849,8 +870,8 @@ \end{cfa} \end{tabular} -\end{quote2} +\end{cquote} In addition, two forms of subranges are allowed to specify case values: a new \CFA form and an existing GNU C form.\footnote{ The GNU C form \emph{requires} spaces around the ellipse.} -\begin{quote2} +\begin{cquote} \begin{tabular}{@{}l@{\hspace{3em}}l@{\hspace{2em}}l@{}} \multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c@{\hspace{2em}}}{\textbf{GNU C}} \\ @@ -882,5 +903,5 @@ \end{cfa} \end{tabular} -\end{quote2} +\end{cquote} Lists of subranges are also allowed. \begin{cfa} @@ -902,19 +923,19 @@ } \end{C++} -Since CFA is non-object-oriented, the equivalent object-oriented program looks like: +Since \CFA is non-object-oriented, the equivalent object-oriented program looks like: \begin{cfa} struct S { int i, j; }; -int mem( S &®this® ) { §\C{// explicit "this" parameter}§ +int mem( S & ®this® ) { §\C{// explicit "this" parameter}§ ®this.®i = 1; §\C{// "this" is not elided}§ ®this.®j = 2; } \end{cfa} -but it is cumbersome having to write "©this.©" many times in a member. +but it is cumbersome having to write ``©this.©'' many times in a member. \CFA provides a ©with© clause/statement (see Pascal~\cite[\S~4.F]{Pascal}) to elided the "©this.©" by opening a scope containing field identifiers, changing the qualified fields into variables and giving an opportunity for optimizing qualified references. \begin{cfa} -int mem( S &this ) ®with this® { §\C{// with clause}§ - i = 1; §\C{\color{red}// this->i}§ - j = 2; §\C{\color{red}// this->j}§ +int mem( S & this ) ®with this® { §\C{// with clause}§ + i = 1; §\C{\color{red}// this.i}§ + j = 2; §\C{\color{red}// this.j}§ } \end{cfa} @@ -922,5 +943,5 @@ \begin{cfa} struct T { double m, n; }; -int mem2( S &this1, T &this2 ) ®with this1, this2® { +int mem2( S & this1, T & this2 ) ®with this1, this2® { i = 1; j = 2; m = 1.0; n = 2.0; @@ -933,7 +954,7 @@ struct S1 { ... } s1; struct S2 { ... } s2; - ®with s1® { // with statement + ®with s1® { §\C{// with statement}§ // access fields of s1 without qualification - ®with s2® { // nesting + ®with s2® { §\C{// nesting}§ // access fields of s1 and s2 without qualification } @@ -1045,10 +1066,10 @@ -\section{Declarations} -\label{s:Declarations} +\section{Alternative Declarations} +\label{s:AlternativeDeclarations} C declaration syntax is notoriously confusing and error prone. For example, many C programmers are confused by a declaration as simple as: -\begin{quote2} +\begin{cquote} \begin{tabular}{@{}ll@{}} \begin{cfa} @@ -1058,12 +1079,12 @@ \raisebox{-0.75\totalheight}{\input{Cdecl}} \end{tabular} -\end{quote2} +\end{cquote} Is this an array of 5 pointers to integers or a \Index{pointer} to an array of 5 integers? -The fact this declaration is unclear to many C programmers means there are \Index{productivity} and \Index{safety} issues even for basic programs. +If there is any doubt, it implies \Index{productivity} and \Index{safety} issues even for basic programs. Another example of confusion results from the fact that a routine name and its parameters are embedded within the return type, mimicking the way the return value is used at the routine's call site. For example, a routine returning a \Index{pointer} to an array of integers is defined and used in the following way: \begin{cfa} -int ®(*®f®())[®5®]® {...}; §\C{definition}§ - ... ®(*®f®())[®3®]® += 1; §\C{usage}§ +int ®(*®f®())[®5®]® {...}; §\C{// definition}§ + ... ®(*®f®())[®3®]® += 1; §\C{// usage}§ \end{cfa} Essentially, the return type is wrapped around the routine name in successive layers (like an \Index{onion}). @@ -1074,5 +1095,5 @@ In the following example, \R{red} is the base type and \B{blue} is qualifiers. The \CFA declarations move the qualifiers to the left of the base type, \ie move the blue to the left of the red, while the qualifiers have the same meaning but are ordered left to right to specify a variable's type. -\begin{quote2} +\begin{cquote} \begin{tabular}{@{}l@{\hspace{3em}}l@{}} \multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ @@ -1089,10 +1110,10 @@ \end{cfa} \end{tabular} -\end{quote2} +\end{cquote} The only exception is \Index{bit field} specification, which always appear to the right of the base type. % Specifically, the character ©*© is used to indicate a pointer, square brackets ©[©\,©]© are used to represent an array or function return value, and parentheses ©()© are used to indicate a routine parameter. However, unlike C, \CFA type declaration tokens are distributed across all variables in the declaration list. For instance, variables ©x© and ©y© of type \Index{pointer} to integer are defined in \CFA as follows: -\begin{quote2} +\begin{cquote} \begin{tabular}{@{}l@{\hspace{3em}}l@{}} \multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ @@ -1105,7 +1126,7 @@ \end{cfa} \end{tabular} -\end{quote2} +\end{cquote} The downside of this semantics is the need to separate regular and \Index{pointer} declarations: -\begin{quote2} +\begin{cquote} \begin{tabular}{@{}l@{\hspace{3em}}l@{}} \multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ @@ -1120,8 +1141,8 @@ \end{cfa} \end{tabular} -\end{quote2} +\end{cquote} which is \Index{prescribing} a safety benefit. Other examples are: -\begin{quote2} +\begin{cquote} \begin{tabular}{@{}l@{\hspace{3em}}l@{\hspace{2em}}l@{}} \multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c@{\hspace{2em}}}{\textbf{C}} \\ @@ -1159,8 +1180,8 @@ \end{cfa} \end{tabular} -\end{quote2} +\end{cquote} All type qualifiers, \eg ©const©, ©volatile©, etc., are used in the normal way with the new declarations and also appear left to right, \eg: -\begin{quote2} +\begin{cquote} \begin{tabular}{@{}l@{\hspace{1em}}l@{\hspace{1em}}l@{}} \multicolumn{1}{c@{\hspace{1em}}}{\textbf{\CFA}} & \multicolumn{1}{c@{\hspace{1em}}}{\textbf{C}} \\ @@ -1180,8 +1201,8 @@ \end{cfa} \end{tabular} -\end{quote2} +\end{cquote} All declaration qualifiers, \eg ©extern©, ©static©, etc., are used in the normal way with the new declarations but can only appear at the start of a \CFA routine declaration,\footnote{\label{StorageClassSpecifier} The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature.~\cite[\S~6.11.5(1)]{C11}} \eg: -\begin{quote2} +\begin{cquote} \begin{tabular}{@{}l@{\hspace{3em}}l@{\hspace{2em}}l@{}} \multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c@{\hspace{2em}}}{\textbf{C}} \\ @@ -1201,46 +1222,25 @@ \end{cfa} \end{tabular} -\end{quote2} +\end{cquote} The new declaration syntax can be used in other contexts where types are required, \eg casts and the pseudo-routine ©sizeof©: -\begin{quote2} +\begin{cquote} \begin{tabular}{@{}l@{\hspace{3em}}l@{}} \multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ \begin{cfa} -y = (®* int®)x; -i = sizeof(®[ 5 ] * int®); +y = (* int)x; +i = sizeof([ 5 ] * int); \end{cfa} & \begin{cfa} -y = (®int *®)x; -i = sizeof(®int * [ 5 ]®); +y = (int *)x; +i = sizeof(int * [ 5 ]); \end{cfa} \end{tabular} -\end{quote2} +\end{cquote} Finally, new \CFA declarations may appear together with C declarations in the same program block, but cannot be mixed within a specific declaration. Therefore, a programmer has the option of either continuing to use traditional C declarations or take advantage of the new style. -Clearly, both styles need to be supported for some time due to existing C-style header-files, particularly for UNIX systems. - - -\section{Exponentiation Operator} - -C, \CC, and Java (and many other programming languages) have no exponentiation operator\index{exponentiation!operator}\index{operator!exponentiation}, \ie $x^y$, and instead use a routine, like \Indexc{pow}, to perform the exponentiation operation. -\CFA extends the basic operators with the exponentiation operator ©?\?©\index{?\\?@\lstinline$?\?$} and ©?\=?©\index{?\\=?@\lstinline$?\=?$}, as in, ©x \ y© and ©x \= y©, which means $x^y$ and $x \leftarrow x^y$. -The priority of the exponentiation operator is between the cast and multiplicative operators, so that ©w * (int)x \ (int)y * z© is parenthesized as ©((w * (((int)x) \ ((int)y))) * z)©. - -As for \Index{division}, there are exponentiation operators for integral and floating-point types, including the builtin \Index{complex} types. -Unsigned integral exponentiation\index{exponentiation!unsigned integral} is performed with repeated multiplication\footnote{The multiplication computation is optimized to $O(\log y)$.} (or shifting if the base is 2). -Signed integral exponentiation\index{exponentiation!signed integral} is performed with repeated multiplication (or shifting if the base is 2), but yields a floating-point result because $x^{-y}=1/x^y$. -Hence, it is important to designate exponent integral-constants as unsigned or signed: ©3 \ 3u© return an integral result, while ©3 \ 3© returns a floating-point result. -Floating-point exponentiation\index{exponentiation!floating point} 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) | endl; -256 64 -64 0.015625 -0.015625 18.3791736799526 0.264715-1.1922i -\end{cfa} -Parenthesis are necessary for the complex constants or the expresion is parsed as ©1.0f+(2.0fi \ 3.0f)+2.0fi©. -The exponentiation operator is available for all the basic types, but for user-defined types, only the integral-computation versions are available. -For returning an integral value, the user type ©T© must define multiplication, ©*©, and one, ©1©; -for returning a floating-point value, an additional divide of type ©T© into a ©double© returning a ©double© (©double ?/?( double, T )©) is necessary for negative exponents. +Clearly, both styles need to be supported for some time due to existing C-style header-files, particularly for UNIX-like systems. @@ -1260,5 +1260,5 @@ A program \newterm{object} is a region of data storage in the execution environment, the contents of which can represent values. In most cases, objects are located in memory at an address, and the variable name for an object is an implicit address to the object generated by the compiler and automatically dereferenced, as in: -\begin{quote2} +\begin{cquote} \begin{tabular}{@{}ll@{\hspace{2em}}l@{}} \begin{cfa} @@ -1278,5 +1278,5 @@ \end{cfa} \end{tabular} -\end{quote2} +\end{cquote} where the right example is how the compiler logically interprets the variables in the left example. Since a variable name only points to one address during its lifetime, it is an \Index{immutable} \Index{pointer}; @@ -1284,5 +1284,5 @@ In general, variable addresses are stored in instructions instead of loaded from memory, and hence may not occupy storage. These approaches are contrasted in the following: -\begin{quote2} +\begin{cquote} \begin{tabular}{@{}l|l@{}} \multicolumn{1}{c|}{explicit variable address} & \multicolumn{1}{c}{implicit variable address} \\ @@ -1302,5 +1302,5 @@ \end{cfa} \end{tabular} -\end{quote2} +\end{cquote} Finally, the immutable nature of a variable's address and the fact that there is no storage for the variable pointer means pointer assignment\index{pointer!assignment}\index{assignment!pointer} is impossible. Therefore, the expression ©x = y© has only one meaning, ©*x = *y©, \ie manipulate values, which is why explicitly writing the dereferences is unnecessary even though it occurs implicitly as part of \Index{instruction decoding}. @@ -1309,5 +1309,5 @@ (Similarly, an integer variable can contain multiple integer literals during its lifetime versus an integer constant representing a single literal during its lifetime, and like a variable name, may not occupy storage if the literal is embedded directly into instructions.) Hence, a pointer occupies memory to store its current address, and the pointer's value is loaded by dereferencing, \eg: -\begin{quote2} +\begin{cquote} \begin{tabular}{@{}l@{\hspace{2em}}l@{}} \begin{cfa} @@ -1321,5 +1321,5 @@ \raisebox{-0.5\totalheight}{\input{pointer2.pstex_t}} \end{tabular} -\end{quote2} +\end{cquote} Notice, an address has a \Index{duality}\index{address!duality}: a location in memory or the value at that location. @@ -1426,6 +1426,6 @@ The position of the ©const© qualifier \emph{after} the pointer/reference qualifier causes confuse for C programmers. The ©const© qualifier cannot be moved before the pointer/reference qualifier for C style-declarations; -\CFA-style declarations (see \VRef{s:Declarations}) attempt to address this issue: -\begin{quote2} +\CFA-style declarations (see \VRef{s:AlternativeDeclarations}) attempt to address this issue: +\begin{cquote} \begin{tabular}{@{}l@{\hspace{3em}}l@{}} \multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ @@ -1440,5 +1440,5 @@ \end{cfa} \end{tabular} -\end{quote2} +\end{cquote} where the \CFA declaration is read left-to-right. @@ -1518,5 +1518,5 @@ \begin{cfa} void f( int i ); -void (*fp)( int ); §\C{// routine pointer}§ +void (* fp)( int ); §\C{// routine pointer}§ fp = f; §\C{// reference initialization}§ fp = &f; §\C{// pointer initialization}§ @@ -1897,5 +1897,5 @@ \end{cfa} This syntax allows a prototype declaration to be created by cutting and pasting source text from the routine definition header (or vice versa). -Like C, it is possible to declare multiple routine-prototypes in a single declaration, where the return type is distributed across \emph{all} routine names in the declaration list (see~\VRef{s:Declarations}), \eg: +Like C, it is possible to declare multiple routine-prototypes in a single declaration, where the return type is distributed across \emph{all} routine names in the declaration list (see~\VRef{s:AlternativeDeclarations}), \eg: \begin{cfa} C : const double bar1(), bar2( int ), bar3( double ); @@ -2072,5 +2072,5 @@ Default arguments and overloading (see Section 24) are complementary. While in theory default arguments can be simulated with overloading, as in: -\begin{quote2} +\begin{cquote} \begin{tabular}{@{}l@{\hspace{3em}}l@{}} \multicolumn{1}{c@{\hspace{3em}}}{\textbf{default arguments}} & \multicolumn{1}{c}{\textbf{overloading}} \\ @@ -2087,5 +2087,5 @@ \end{cfa} \end{tabular} -\end{quote2} +\end{cquote} the number of required overloaded routines is linear in the number of default values, which is unacceptable growth. In general, overloading should only be used over default arguments if the body of the routine is significantly different. @@ -2224,5 +2224,5 @@ The following program in undefined in \CFA (and Indexc{gcc}) \begin{cfa} -[* [int]( int )] foo() { §\C{// int (*foo())( int )}§ +[* [int]( int )] foo() { §\C{// int (* foo())( int )}§ int ®i® = 7; int bar( int p ) { @@ -2233,5 +2233,5 @@ } int main() { - * [int]( int ) fp = foo(); §\C{// int (*fp)( int )}§ + * [int]( int ) fp = foo(); §\C{// int (* fp)( int )}§ sout | fp( 3 ) | endl; } @@ -2272,5 +2272,5 @@ In the latter approach, additional return values are passed as pointer parameters. A pointer parameter is assigned inside the routine to emulate a return. -For example, consider C's \Indexc{modf} function, which returns the integral and fractional part of a floating-point value. +For example, consider C's \Indexc{modf} function, which returns the integral and fractional part of a floating value. \begin{cfa} double modf( double x, double * i ); §\C{// from include math.h}§ @@ -2995,5 +2995,5 @@ The common case is printing out a sequence of variables separated by whitespace. -\begin{quote2} +\begin{cquote} \begin{tabular}{@{}l@{\hspace{3em}}l@{}} \multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{\CC}} \\ @@ -3016,5 +3016,5 @@ \end{cfa} \end{tabular} -\end{quote2} +\end{cquote} The \CFA form has half the characters of the \CC form, and is similar to \Index*{Python} I/O with respect to implicit separators. Similar simplification occurs for \Index{tuple} I/O, which prints all tuple values separated by ``\lstinline[showspaces=true]@, @''. @@ -3028,5 +3028,5 @@ Finally, \CFA uses the logical-or operator for I/O as it is the lowest-priority overloadable operator, other than assignment. Therefore, fewer output expressions require parenthesis. -\begin{quote2} +\begin{cquote} \begin{tabular}{@{}ll@{}} \textbf{\CFA:} @@ -3047,5 +3047,5 @@ \end{cfa} \end{tabular} -\end{quote2} +\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. @@ -3420,5 +3420,5 @@ int id; float size; - Parts *optionalParts; + Parts * optionalParts; }; @@ -3634,5 +3634,5 @@ Auto type-inferencing occurs in a declaration where a variable's type is inferred from its initialization ex\-pression type. -\begin{quote2} +\begin{cquote} \begin{tabular}{@{}l@{\hspace{3em}}ll@{}} \multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CC}} & \multicolumn{1}{c}{\textbf{\Indexc{gcc}}} \\ @@ -3658,5 +3658,5 @@ \end{cfa} \end{tabular} -\end{quote2} +\end{cquote} The two important capabilities are: \begin{itemize} @@ -3806,10 +3806,10 @@ generic(type T) -typedef int (*predicate)(T); +typedef int (* predicate)(T); generic(type Captured, type T) -typedef void (*callback)(Captured, T); +typedef void (* callback)(Captured, T); generic(type T) -void find(int length, T *array, +void find(int length, T * array, predicate(T) p, callback(void *, T)f) { int i; @@ -3835,20 +3835,20 @@ struct LinkedListElem { T elem; - LinkedListElem(T) *next; + LinkedListElem(T) * next; }; -LinkedListElem *++?(LinkedListElem **elem) { - return *elem = elem->next; +LinkedListElem *++?(LinkedListElem ** elem) { + return * elem = elem->next; } generic (type T) struct LinkedList { - LinkedListElem(T) *head; + LinkedListElem(T) * head; unsigned int size; } generic (type T | bool ?==?(T, T)) -bool contains(LinkedList(T) *list, T elem) { - for(LinkedListElem *iter = list->head; iter != 0; ++iter) { +bool contains(LinkedList(T) * list, T elem) { + for(LinkedListElem * iter = list->head; iter != 0; ++iter) { if (iter->elem == elem) return true; } @@ -4063,5 +4063,5 @@ // transferring requires mutual exclusion and calls deleteJob -void transferJob(mutex Worker &from, Worker &to) { +void transferJob(mutex Worker & from, Worker & to) { ... deleteJob(j); @@ -5001,5 +5001,5 @@ #include } -size_t fileSize( const char *path ) { +size_t fileSize( const char * path ) { struct stat s; stat(path, &s); @@ -5038,8 +5038,8 @@ #[link(name = "libc")] extern { - fn stat(path: *const u8, - buf: *mut stat_t) -> c_int; -} -fn fileSize(path: *const u8) -> size_t + fn stat(path: * const u8, + buf: * mut stat_t) -> c_int; +} +fn fileSize(path: * const u8) -> size_t { unsafe { @@ -5063,7 +5063,7 @@ generic(type T, type N | { int ? -T *maximize(const F &f, +T * maximize(const F &f, int n, T *a) { typedef decltype(f(a[0])) N; - T *bestX = NULL; + T * bestX = NULL; N bestN; for (int i = 0; i < n; i++) { @@ -5100,5 +5100,5 @@ } -string *longest(int n, string *p) { +string * longest(int n, string *p) { return maximize( [](const string &s) { @@ -5258,5 +5258,5 @@ \begin{cfa} task Nonzero { - int *data; + int * data; int start; int end; @@ -5721,7 +5721,7 @@ \CFA introduces the following new keywords. -\begin{quote2} +\begin{cquote} \input{../refrat/keywords} -\end{quote2} +\end{cquote} @@ -5730,5 +5730,5 @@ \Celeven prescribes the following standard header-files~\cite[\S~7.1.2]{C11} and \CFA adds to this list: -\begin{quote2} +\begin{cquote} \begin{tabular}{@{}llllll|l@{}} \multicolumn{6}{c|}{C11} & \multicolumn{1}{c}{\CFA} \\ @@ -5790,5 +5790,5 @@ \end{tabular} \end{tabular} -\end{quote2} +\end{cquote} For the prescribed head-files, \CFA uses header interposition to wraps these includes in an ©extern "C"©; hence, names in these include files are not mangled\index{mangling!name} (see~\VRef{s:Interoperability}). @@ -6531,5 +6531,5 @@ The following factorial programs contrast using GMP with the \CFA and C interfaces, where the output from these programs appears in \VRef[Figure]{f:MultiPrecisionFactorials}. (Compile with flag \Indexc{-lgmp} to link with the GMP library.) -\begin{quote2} +\begin{cquote} \begin{tabular}{@{}l@{\hspace{\parindentlnth}}|@{\hspace{\parindentlnth}}l@{}} \multicolumn{1}{c|@{\hspace{\parindentlnth}}}{\textbf{\CFA}} & \multicolumn{1}{@{\hspace{\parindentlnth}}c}{\textbf{C}} \\ @@ -6563,5 +6563,5 @@ \end{cfa} \end{tabular} -\end{quote2} +\end{cquote} \begin{figure} Index: src/CodeGen/FixMain.cc =================================================================== --- src/CodeGen/FixMain.cc (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/CodeGen/FixMain.cc (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -39,5 +39,5 @@ { if(main_signature) { - throw SemanticError("Multiple definition of main routine\n", functionDecl); + throw SemanticError(functionDecl, "Multiple definition of main routine\n"); } main_signature.reset( functionDecl->clone() ); Index: src/CodeGen/FixNames.cc =================================================================== --- src/CodeGen/FixNames.cc (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/CodeGen/FixNames.cc (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -118,5 +118,5 @@ int nargs = functionDecl->get_functionType()->get_parameters().size(); if( !(nargs == 0 || nargs == 2 || nargs == 3) ) { - throw SemanticError("Main expected to have 0, 2 or 3 arguments\n", functionDecl); + throw SemanticError(functionDecl, "Main expected to have 0, 2 or 3 arguments\n"); } functionDecl->get_statements()->get_kids().push_back( new ReturnStmt( new ConstantExpr( Constant::from_int( 0 ) ) ) ); Index: src/Common/PassVisitor.impl.h =================================================================== --- src/Common/PassVisitor.impl.h (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/Common/PassVisitor.impl.h (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -77,5 +77,4 @@ maybeAccept_impl( *i, visitor ); } catch( SemanticError &e ) { - e.set_location( (*i)->location ); errors.append( e ); } @@ -104,5 +103,4 @@ maybeMutate_impl( *i, mutator ); } catch( SemanticError &e ) { - e.set_location( (*i)->location ); errors.append( e ); } @@ -134,5 +132,4 @@ } } catch( SemanticError &e ) { - e.set_location( (*i)->location ); errors.append( e ); } @@ -163,5 +160,4 @@ } // if } catch( SemanticError &e ) { - e.set_location( (*i)->location ); errors.append( e ); } // try @@ -200,5 +196,4 @@ } catch ( SemanticError &e ) { - e.set_location( (*i)->location ); errors.append( e ); } Index: src/Common/SemanticError.cc =================================================================== --- src/Common/SemanticError.cc (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/Common/SemanticError.cc (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -23,9 +23,6 @@ #include "SemanticError.h" -SemanticError::SemanticError() { -} - -SemanticError::SemanticError( std::string error ) { - append( error ); +SemanticError::SemanticError( CodeLocation location, std::string error ) { + append( location, error ); } @@ -34,6 +31,6 @@ } -void SemanticError::append( const std::string & msg ) { - errors.emplace_back( error_str() + msg ); +void SemanticError::append( CodeLocation location, const std::string & msg ) { + errors.emplace_back( location, msg ); } @@ -42,13 +39,13 @@ } -void SemanticError::print( std::ostream &os ) { +void SemanticError::print() { using std::to_string; for( auto err : errors ) { - os << err.location << err.description << std::endl; + std::cerr << bold() << err.location << error_str() << reset_font() << err.description << std::endl; } } -void SemanticError::set_location( const CodeLocation& location ) { - errors.begin()->maybeSet( location ); +SemanticWarning::SemanticWarning( CodeLocation location, std::string msg ) { + std::cerr << bold() << location << warning_str() << reset_font() << msg << std::endl; } Index: src/Common/SemanticError.h =================================================================== --- src/Common/SemanticError.h (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/Common/SemanticError.h (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -24,24 +24,23 @@ #include "CodeLocation.h" // for CodeLocation, toString +//----------------------------------------------------------------------------- +// Errors struct error { + CodeLocation location; std::string description; - CodeLocation location; error() = default; - error( const std::string & str ) : description( str ) {} - - void maybeSet( const CodeLocation & location ) { - if( this->location.isUnset() ) { - this->location = location; - } - } + error( CodeLocation loc, const std::string & str ) : location( loc ), description( str ) {} }; class SemanticError : public std::exception { public: - SemanticError(); - SemanticError( std::string error ); - template< typename T > SemanticError( const std::string & error, const T * obj ); + SemanticError() = default; + SemanticError( CodeLocation location, std::string error ); ~SemanticError() throw() {} + + // constructs an exception using the given message and the printed representation of the obj (T must have a print method) + template< typename T > SemanticError(const T * obj, const std::string & error); + template< typename T > SemanticError( CodeLocation location, const T * obj, const std::string & error); static inline const std::string & error_str() { @@ -51,11 +50,7 @@ void append( SemanticError & other ); - void append( const std::string & ); + void append( CodeLocation location, const std::string & ); bool isEmpty() const; - void print( std::ostream & os ); - - void set_location( const CodeLocation & location ); - // constructs an exception using the given message and the printed representation of the obj (T must have a print - // method) + void print(); private: std::list< error > errors; @@ -63,6 +58,68 @@ template< typename T > -SemanticError::SemanticError( const std::string & error, const T * obj ) { - append( toString( error, obj ) ); +SemanticError::SemanticError( const T * obj, const std::string & error ) + : SemanticError( obj->location, toString( error, obj ) ) +{} + +template< typename T > +SemanticError::SemanticError( CodeLocation location, const T * obj, const std::string & error ) + : SemanticError( location, toString( error, obj ) ) +{} + +//----------------------------------------------------------------------------- +// Warnings +class SemanticWarning { + public: + SemanticWarning( CodeLocation location, std::string error ); + ~SemanticWarning() throw() {} + + // constructs an exception using the given message and the printed representation of the obj (T must have a print method) + template< typename T > SemanticWarning(const T * obj, const std::string & error); + template< typename T > SemanticWarning( CodeLocation location, const T * obj, const std::string & error); + + static inline const std::string & warning_str() { + static std::string str = isatty( STDERR_FILENO ) ? "\e[95mwarning:\e[39m " : "warning: "; + return str; + } + + private: +}; + +template< typename T > +SemanticWarning::SemanticWarning( const T * obj, const std::string & error ) + : SemanticWarning( obj->location, toString( error, obj ) ) +{} + +template< typename T > +SemanticWarning::SemanticWarning( CodeLocation location, const T * obj, const std::string & error ) + : SemanticWarning( location, toString( error, obj ) ) +{} + +//----------------------------------------------------------------------------- +// Helpers +static inline const std::string & bold_ttycode() { + static std::string str = isatty( STDERR_FILENO ) ? "\e[1m" : ""; + return str; +} + +static inline const std::string & reset_font_ttycode() { + static std::string str = isatty( STDERR_FILENO ) ? "\e[0m" : ""; + return str; +} + +static inline std::string make_bold( const std::string & str ) { + return bold_ttycode() + str + reset_font_ttycode(); +} + +struct bold {}; +static inline std::ostream & operator<<(std::ostream & os, bold) { + os << bold_ttycode(); + return os; +} + +struct reset_font {}; +static inline std::ostream & operator<<(std::ostream & os, reset_font) { + os << reset_font_ttycode(); + return os; } Index: src/Concurrency/Keywords.cc =================================================================== --- src/Concurrency/Keywords.cc (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/Concurrency/Keywords.cc (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -276,5 +276,4 @@ handle( decl ); } - } @@ -282,5 +281,5 @@ if( ! decl->body ) return; - if( !type_decl ) throw SemanticError( context_error, decl ); + if( !type_decl ) throw SemanticError( decl, context_error ); FunctionDecl * func = forwardDeclare( decl ); @@ -419,9 +418,9 @@ if( mutexArgs.empty() ) return; - if( CodeGen::isConstructor(decl->name) ) throw SemanticError( "constructors cannot have mutex parameters", decl ); + if( CodeGen::isConstructor(decl->name) ) throw SemanticError( decl, "constructors cannot have mutex parameters" ); bool isDtor = CodeGen::isDestructor( decl->name ); - if( isDtor && mutexArgs.size() != 1 ) throw SemanticError( "destructors can only have 1 mutex argument", decl ); + if( isDtor && mutexArgs.size() != 1 ) throw SemanticError( decl, "destructors can only have 1 mutex argument" ); for(auto arg : mutexArgs) { @@ -432,7 +431,7 @@ if( ! body ) return; - if( !monitor_decl ) throw SemanticError( "mutex keyword requires monitors to be in scope, add #include ", decl ); - if( !guard_decl ) throw SemanticError( "mutex keyword requires monitors to be in scope, add #include ", decl ); - if( !dtor_guard_decl ) throw SemanticError( "mutex keyword requires monitors to be in scope, add #include ", decl ); + if( !monitor_decl ) throw SemanticError( decl, "mutex keyword requires monitors to be in scope, add #include " ); + if( !guard_decl ) throw SemanticError( decl, "mutex keyword requires monitors to be in scope, add #include " ); + if( !dtor_guard_decl ) throw SemanticError( decl, "mutex keyword requires monitors to be in scope, add #include " ); if( isDtor ) { @@ -480,13 +479,13 @@ //Makes sure it's not a copy ReferenceType* rty = dynamic_cast< ReferenceType * >( ty ); - if( ! rty ) throw SemanticError( "Mutex argument must be of reference type ", arg ); + if( ! rty ) throw SemanticError( arg, "Mutex argument must be of reference type " ); //Make sure the we are pointing directly to a type Type* base = rty->get_base(); - if( dynamic_cast< ReferenceType * >( base ) ) throw SemanticError( "Mutex argument have exactly one level of indirection ", arg ); - if( dynamic_cast< PointerType * >( base ) ) throw SemanticError( "Mutex argument have exactly one level of indirection ", arg ); + if( dynamic_cast< ReferenceType * >( base ) ) throw SemanticError( arg, "Mutex argument have exactly one level of indirection " ); + if( dynamic_cast< PointerType * >( base ) ) throw SemanticError( arg, "Mutex argument have exactly one level of indirection " ); //Make sure that typed isn't mutex - if( base->get_mutex() ) throw SemanticError( "mutex keyword may only appear once per argument ", arg ); + if( base->get_mutex() ) throw SemanticError( arg, "mutex keyword may only appear once per argument " ); } @@ -626,5 +625,5 @@ if( type && type->get_baseStruct()->is_thread() ) { if( !thread_decl || !thread_ctor_seen ) { - throw SemanticError("thread keyword requires threads to be in scope, add #include "); + throw SemanticError( type->get_baseStruct()->location, "thread keyword requires threads to be in scope, add #include "); } Index: src/Concurrency/Waitfor.cc =================================================================== --- src/Concurrency/Waitfor.cc (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/Concurrency/Waitfor.cc (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -249,5 +249,6 @@ Statement * GenerateWaitForPass::postmutate( WaitForStmt * waitfor ) { - if( !decl_monitor || !decl_acceptable || !decl_mask ) throw SemanticError( "waitfor keyword requires monitors to be in scope, add #include ", waitfor ); + if( !decl_monitor || !decl_acceptable || !decl_mask ) + throw SemanticError( waitfor, "waitfor keyword requires monitors to be in scope, add #include " ); CompoundStmt * stmt = new CompoundStmt(); Index: src/ControlStruct/ExceptTranslate.cc =================================================================== --- src/ControlStruct/ExceptTranslate.cc (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/ControlStruct/ExceptTranslate.cc (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -572,7 +572,7 @@ // Pass. } else if ( CatchStmt::Terminate == catchStmt->get_kind() ) { - throw SemanticError("catch must have exception type"); + throw SemanticError(catchStmt->location, "catch must have exception type"); } else { - throw SemanticError("catchResume must have exception type"); + throw SemanticError(catchStmt->location, "catchResume must have exception type"); } Index: src/ControlStruct/LabelFixer.cc =================================================================== --- src/ControlStruct/LabelFixer.cc (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/ControlStruct/LabelFixer.cc (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -92,5 +92,5 @@ } else if ( labelTable[ l ]->defined() ) { // defined twice, error - throw SemanticError( "Duplicate definition of label: " + l.get_name() ); + throw SemanticError( l.get_statement()->location, "Duplicate definition of label: " + l.get_name() ); } else { // used previously, but undefined until now -> link with this entry @@ -121,5 +121,5 @@ for ( std::map< Label, Entry * >::iterator i = labelTable.begin(); i != labelTable.end(); ++i ) { if ( ! i->second->defined() ) { - throw SemanticError( "Use of undefined label: " + i->first.get_name() ); + throw SemanticError( i->first.get_statement()->location, "Use of undefined label: " + i->first.get_name() ); } (*ret)[ i->first ] = i->second->get_definition(); Index: src/ControlStruct/MLEMutator.cc =================================================================== --- src/ControlStruct/MLEMutator.cc (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/ControlStruct/MLEMutator.cc (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -115,5 +115,5 @@ } else { // break target is outmost control structure - if ( enclosingControlStructures.empty() ) throw SemanticError( "'break' outside a loop, switch, or labelled block" ); + if ( enclosingControlStructures.empty() ) throw SemanticError( branchStmt->location, "'break' outside a loop, switch, or labelled block" ); targetEntry = enclosingControlStructures.rbegin(); } // if @@ -124,5 +124,5 @@ // ensure that selected target is valid if ( targetEntry == enclosingControlStructures.rend() || (isContinue && ! isLoop( targetEntry->get_controlStructure() ) ) ) { - throw SemanticError( toString( (isContinue ? "'continue'" : "'break'"), " target must be an enclosing ", (isContinue ? "loop: " : "control structure: "), originalTarget ) ); + throw SemanticError( branchStmt->location, toString( (isContinue ? "'continue'" : "'break'"), " target must be an enclosing ", (isContinue ? "loop: " : "control structure: "), originalTarget ) ); } // if break; Index: src/GenPoly/Box.cc =================================================================== --- src/GenPoly/Box.cc (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/GenPoly/Box.cc (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -229,5 +229,4 @@ } // if } catch( SemanticError &e ) { - e.set_location( (*i)->location ); errors.append( e ); } // try @@ -576,5 +575,5 @@ } } else { - throw SemanticError( "Cannot pass non-struct type for generic struct: ", argBaseType ); + throw SemanticError( argBaseType, "Cannot pass non-struct type for generic struct: " ); } } @@ -598,5 +597,5 @@ } else { // xxx - should this be an assertion? - throw SemanticError( toString( *env, "\nunbound type variable: ", tyParm->first, " in application " ), appExpr ); + throw SemanticError( appExpr, toString( *env, "\nunbound type variable: ", tyParm->first, " in application " ) ); } // if } // if Index: src/InitTweak/FixInit.cc =================================================================== --- src/InitTweak/FixInit.cc (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/InitTweak/FixInit.cc (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -282,5 +282,4 @@ translationUnit.splice( i, fixer.pass.staticDtorDecls ); } catch( SemanticError &e ) { - e.set_location( (*i)->location ); errors.append( e ); } // try @@ -895,5 +894,5 @@ ) if ( ! diff.empty() ) { - throw SemanticError( std::string("jump to label '") + stmt->get_target().get_name() + "' crosses initialization of " + (*diff.begin())->get_name() + " ", stmt ); + throw SemanticError( stmt, std::string("jump to label '") + stmt->get_target().get_name() + "' crosses initialization of " + (*diff.begin())->get_name() + " " ); } // if // S_G-S_L results in set of objects that must be destructed @@ -1111,6 +1110,5 @@ template< typename Visitor, typename... Params > void error( Visitor & v, CodeLocation loc, const Params &... params ) { - SemanticError err( toString( params... ) ); - err.set_location( loc ); + SemanticError err( loc, toString( params... ) ); v.errors.append( err ); } Index: src/InitTweak/GenInit.cc =================================================================== --- src/InitTweak/GenInit.cc (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/InitTweak/GenInit.cc (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -317,7 +317,7 @@ if ( tryConstruct( objDecl ) && ( managedTypes.isManaged( objDecl ) || ((! inFunction || objDecl->get_storageClasses().is_static ) && ! isConstExpr( objDecl->get_init() ) ) ) ) { // constructed objects cannot be designated - if ( isDesignated( objDecl->get_init() ) ) throw SemanticError( "Cannot include designations in the initializer for a managed Object. If this is really what you want, then initialize with @=.\n", objDecl ); + if ( isDesignated( objDecl->get_init() ) ) throw SemanticError( objDecl, "Cannot include designations in the initializer for a managed Object. If this is really what you want, then initialize with @=.\n" ); // constructed objects should not have initializers nested too deeply - if ( ! checkInitDepth( objDecl ) ) throw SemanticError( "Managed object's initializer is too deep ", objDecl ); + if ( ! checkInitDepth( objDecl ) ) throw SemanticError( objDecl, "Managed object's initializer is too deep " ); objDecl->set_init( genCtorInit( objDecl ) ); Index: src/InitTweak/InitTweak.cc =================================================================== --- src/InitTweak/InitTweak.cc (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/InitTweak/InitTweak.cc (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -225,5 +225,5 @@ // xxx - this shouldn't be an error, but need a way to // terminate without creating output, so should catch this error - throw SemanticError( "unbalanced list initializers" ); + throw SemanticError( init->location, "unbalanced list initializers" ); } Index: src/Parser/DeclarationNode.cc =================================================================== --- src/Parser/DeclarationNode.cc (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/Parser/DeclarationNode.cc (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -581,15 +581,15 @@ dst->basictype = src->basictype; } else if ( src->basictype != DeclarationNode::NoBasicType ) - throw SemanticError( string( "conflicting type specifier " ) + DeclarationNode::basicTypeNames[ src->basictype ] + " in type: ", src ); + throw SemanticError( yylloc, src, string( "conflicting type specifier " ) + DeclarationNode::basicTypeNames[ src->basictype ] + " in type: " ); if ( dst->complextype == DeclarationNode::NoComplexType ) { dst->complextype = src->complextype; } else if ( src->complextype != DeclarationNode::NoComplexType ) - throw SemanticError( string( "conflicting type specifier " ) + DeclarationNode::complexTypeNames[ src->complextype ] + " in type: ", src ); + throw SemanticError( yylloc, src, string( "conflicting type specifier " ) + DeclarationNode::complexTypeNames[ src->complextype ] + " in type: " ); if ( dst->signedness == DeclarationNode::NoSignedness ) { dst->signedness = src->signedness; } else if ( src->signedness != DeclarationNode::NoSignedness ) - throw SemanticError( string( "conflicting type specifier " ) + DeclarationNode::signednessNames[ src->signedness ] + " in type: ", src ); + throw SemanticError( yylloc, src, string( "conflicting type specifier " ) + DeclarationNode::signednessNames[ src->signedness ] + " in type: " ); if ( dst->length == DeclarationNode::NoLength ) { @@ -598,5 +598,5 @@ dst->length = DeclarationNode::LongLong; } else if ( src->length != DeclarationNode::NoLength ) - throw SemanticError( string( "conflicting type specifier " ) + DeclarationNode::lengthNames[ src->length ] + " in type: ", src ); + throw SemanticError( yylloc, src, string( "conflicting type specifier " ) + DeclarationNode::lengthNames[ src->length ] + " in type: " ); } // if break; @@ -966,5 +966,4 @@ } // if } catch( SemanticError &e ) { - e.set_location( cur->location ); errors.append( e ); } // try @@ -1001,5 +1000,4 @@ } // if } catch( SemanticError &e ) { - e.set_location( cur->location ); errors.append( e ); } // try @@ -1020,5 +1018,4 @@ * out++ = cur->buildType(); } catch( SemanticError &e ) { - e.set_location( cur->location ); errors.append( e ); } // try @@ -1032,5 +1029,5 @@ Declaration * DeclarationNode::build() const { - if ( ! error.empty() ) throw SemanticError( error + " in declaration of ", this ); + if ( ! error.empty() ) throw SemanticError( this, error + " in declaration of " ); if ( asmStmt ) { @@ -1055,5 +1052,5 @@ // inline _Noreturn int i; // disallowed if ( type->kind != TypeData::Function && funcSpecs.any() ) { - throw SemanticError( "invalid function specifier for ", this ); + throw SemanticError( this, "invalid function specifier for " ); } // if return buildDecl( type, name ? *name : string( "" ), storageClasses, maybeBuild< Expression >( bitfieldWidth ), funcSpecs, linkage, asmName, maybeBuild< Initializer >(initializer), attributes )->set_extension( extension ); @@ -1065,5 +1062,5 @@ // inlne _Noreturn enum E { ... }; // disallowed if ( funcSpecs.any() ) { - throw SemanticError( "invalid function specifier for ", this ); + throw SemanticError( this, "invalid function specifier for " ); } // if assertf( name, "ObjectDecl must a have name\n" ); Index: src/Parser/ExpressionNode.cc =================================================================== --- src/Parser/ExpressionNode.cc (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/Parser/ExpressionNode.cc (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -356,5 +356,5 @@ Expression * build_field_name_FLOATING_FRACTIONconstant( const string & str ) { - if ( str.find_first_not_of( "0123456789", 1 ) != string::npos ) throw SemanticError( "invalid tuple index " + str ); + if ( str.find_first_not_of( "0123456789", 1 ) != string::npos ) throw SemanticError( yylloc, "invalid tuple index " + str ); Expression * ret = build_constantInteger( *new string( str.substr(1) ) ); delete &str; @@ -363,5 +363,5 @@ Expression * build_field_name_FLOATING_DECIMALconstant( const string & str ) { - if ( str[str.size()-1] != '.' ) throw SemanticError( "invalid tuple index " + str ); + if ( str[str.size()-1] != '.' ) throw SemanticError( yylloc, "invalid tuple index " + str ); Expression * ret = build_constantInteger( *new string( str.substr( 0, str.size()-1 ) ) ); delete &str; Index: src/Parser/LinkageSpec.cc =================================================================== --- src/Parser/LinkageSpec.cc (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/Parser/LinkageSpec.cc (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -24,5 +24,5 @@ namespace LinkageSpec { -Spec linkageCheck( const string * spec ) { +Spec linkageCheck( CodeLocation location, const string * spec ) { assert( spec ); unique_ptr guard( spec ); // allocated by lexer @@ -34,9 +34,9 @@ return BuiltinC; } else { - throw SemanticError( "Invalid linkage specifier " + *spec ); + throw SemanticError( location, "Invalid linkage specifier " + *spec ); } // if } -Spec linkageUpdate( Spec old_spec, const string * cmd ) { +Spec linkageUpdate( CodeLocation location, Spec old_spec, const string * cmd ) { assert( cmd ); unique_ptr guard( cmd ); // allocated by lexer @@ -48,5 +48,5 @@ return old_spec; } else { - throw SemanticError( "Invalid linkage specifier " + *cmd ); + throw SemanticError( location, "Invalid linkage specifier " + *cmd ); } // if } Index: src/Parser/LinkageSpec.h =================================================================== --- src/Parser/LinkageSpec.h (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/Parser/LinkageSpec.h (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -17,4 +17,6 @@ #include + +#include "Common/CodeLocation.h" namespace LinkageSpec { @@ -45,7 +47,7 @@ - Spec linkageCheck( const std::string * ); + Spec linkageCheck( CodeLocation location, const std::string * ); // Returns the Spec with the given name (limited to C, Cforall & BuiltinC) - Spec linkageUpdate( Spec old_spec, const std::string * cmd ); + Spec linkageUpdate( CodeLocation location, Spec old_spec, const std::string * cmd ); /* If cmd = "C" returns a Spec that is old_spec with is_mangled = false * If cmd = "Cforall" returns old_spec Spec with is_mangled = true Index: src/Parser/ParseNode.h =================================================================== --- src/Parser/ParseNode.h (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/Parser/ParseNode.h (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -434,5 +434,4 @@ } // if } catch( SemanticError &e ) { - e.set_location( cur->location ); errors.append( e ); } // try Index: src/Parser/TypeData.cc =================================================================== --- src/Parser/TypeData.cc (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/Parser/TypeData.cc (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -31,5 +31,5 @@ using namespace std; -TypeData::TypeData( Kind k ) : kind( k ), base( nullptr ), forall( nullptr ) /*, PTR1( (void*)(0xdeadbeefdeadbeef)), PTR2( (void*)(0xdeadbeefdeadbeef) ) */ { +TypeData::TypeData( Kind k ) : location( yylloc ), kind( k ), base( nullptr ), forall( nullptr ) /*, PTR1( (void*)(0xdeadbeefdeadbeef)), PTR2( (void*)(0xdeadbeefdeadbeef) ) */ { switch ( kind ) { case Unknown: @@ -521,5 +521,5 @@ static string genTSError( string msg, DeclarationNode::BasicType basictype ) { - throw SemanticError( string( "invalid type specifier \"" ) + msg + "\" for type \"" + DeclarationNode::basicTypeNames[basictype] + "\"." ); + throw SemanticError( yylloc, string( "invalid type specifier \"" ) + msg + "\" for type \"" + DeclarationNode::basicTypeNames[basictype] + "\"." ); } // genTSError @@ -800,5 +800,5 @@ assert( td->base ); if ( td->symbolic.isTypedef ) { - ret = new TypedefDecl( name, scs, typebuild( td->base ), linkage ); + ret = new TypedefDecl( name, td->location, scs, typebuild( td->base ), linkage ); } else { ret = new TypeDecl( name, scs, typebuild( td->base ), TypeDecl::Dtype, true ); @@ -923,8 +923,8 @@ // type set => parameter name already transformed by a declaration names so there is a duplicate // declaration name attempting a second transformation - if ( param->type ) throw SemanticError( string( "duplicate declaration name " ) + *param->name ); + if ( param->type ) throw SemanticError( param->location, string( "duplicate declaration name " ) + *param->name ); // declaration type reset => declaration already transformed by a parameter name so there is a duplicate // parameter name attempting a second transformation - if ( ! decl->type ) throw SemanticError( string( "duplicate parameter name " ) + *param->name ); + if ( ! decl->type ) throw SemanticError( param->location, string( "duplicate parameter name " ) + *param->name ); param->type = decl->type; // set copy declaration type to parameter type decl->type = nullptr; // reset declaration type @@ -933,5 +933,5 @@ } // for // declaration type still set => type not moved to a matching parameter so there is a missing parameter name - if ( decl->type ) throw SemanticError( string( "missing name in parameter list " ) + *decl->name ); + if ( decl->type ) throw SemanticError( decl->location, string( "missing name in parameter list " ) + *decl->name ); } // for Index: src/Parser/TypeData.h =================================================================== --- src/Parser/TypeData.h (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/Parser/TypeData.h (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -76,4 +76,6 @@ }; + CodeLocation location; + Kind kind; TypeData * base; Index: src/Parser/parser.yy =================================================================== --- src/Parser/parser.yy (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/Parser/parser.yy (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -10,6 +10,6 @@ // Created On : Sat Sep 1 20:22:55 2001 // Last Modified By : Peter A. Buhr -// Last Modified On : Thu Dec 21 11:32:56 2017 -// Update Count : 2996 +// Last Modified On : Thu Feb 15 17:12:31 2018 +// Update Count : 3006 // @@ -482,7 +482,19 @@ { $$ = new ExpressionNode( new StmtExpr( dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >($2) ) ) ); } | type_name '.' no_attr_identifier // CFA, nested type - { throw SemanticError("Qualified names are currently unimplemented."); $$ = nullptr; } // FIX ME + { throw SemanticError( yylloc, "Qualified names are currently unimplemented." ); $$ = nullptr; } // FIX ME | type_name '.' '[' push field_list pop ']' // CFA, nested type / tuple field selector - { throw SemanticError("Qualified names are currently unimplemented."); $$ = nullptr; } // FIX ME + { throw SemanticError( yylloc, "Qualified names are currently unimplemented." ); $$ = nullptr; } // FIX ME + | GENERIC '(' assignment_expression ',' generic_assoc_list ')' // C11 + { throw SemanticError( yylloc, "_Generic is currently unimplemented." ); $$ = nullptr; } // FIX ME + ; + +generic_assoc_list: // C11 + | generic_association + | generic_assoc_list ',' generic_association + ; + +generic_association: // C11 + type_no_function ':' assignment_expression + | DEFAULT ':' assignment_expression ; @@ -767,4 +779,6 @@ | unary_expression assignment_operator assignment_expression { $$ = new ExpressionNode( build_binary_val( $2, $1, $3 ) ); } + | unary_expression '=' '{' initializer_list comma_opt '}' // FIX ME + { $$ = nullptr; } ; @@ -1050,4 +1064,6 @@ | RETURN comma_expression_opt ';' { $$ = new StatementNode( build_return( $2 ) ); } + | RETURN '{' initializer_list comma_opt '}' // FIX ME + { $$ = nullptr; } | THROW assignment_expression_opt ';' // handles rethrow { $$ = new StatementNode( build_throw( $2 ) ); } @@ -1068,5 +1084,5 @@ mutex_statement: MUTEX '(' argument_expression_list ')' statement - { throw SemanticError("Mutex statement is currently unimplemented."); $$ = nullptr; } // FIX ME + { throw SemanticError( yylloc, "Mutex statement is currently unimplemented." ); $$ = nullptr; } // FIX ME ; @@ -1289,5 +1305,5 @@ static_assert: STATICASSERT '(' constant_expression ',' string_literal ')' ';' // C11 - { throw SemanticError("Static assert is currently unimplemented."); $$ = nullptr; } // FIX ME + { throw SemanticError( yylloc, "Static assert is currently unimplemented." ); $$ = nullptr; } // FIX ME // C declaration syntax is notoriously confusing and error prone. Cforall provides its own type, variable and function @@ -2377,5 +2393,5 @@ { linkageStack.push( linkage ); // handle nested extern "C"/"Cforall" - linkage = LinkageSpec::linkageUpdate( linkage, $2 ); + linkage = LinkageSpec::linkageUpdate( yylloc, linkage, $2 ); } '{' external_definition_list_opt '}' Index: src/ResolvExpr/AlternativeFinder.cc =================================================================== --- src/ResolvExpr/AlternativeFinder.cc (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/ResolvExpr/AlternativeFinder.cc (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -239,5 +239,5 @@ std::cerr << "No reasonable alternatives for expression " << expr << std::endl; ) - throw SemanticError( "No reasonable alternatives for expression ", expr ); + throw SemanticError( expr, "No reasonable alternatives for expression " ); } if ( prune ) { @@ -257,5 +257,5 @@ stream << "Alternatives are:\n"; printAlts( winners, stream, 1 ); - throw SemanticError( stream.str() ); + throw SemanticError( expr->location, stream.str() ); } alternatives = move(pruned); @@ -494,5 +494,5 @@ return; } else if ( level >= recursionLimit ) { - throw SemanticError( "Too many recursive assertions" ); + throw SemanticError( newAlt.expr->location, "Too many recursive assertions" ); } else { AssertionSet newerNeed; @@ -1408,5 +1408,5 @@ findMinCost( finder.alternatives.begin(), finder.alternatives.end(), back_inserter( winners ) ); if ( winners.size() != 1 ) { - throw SemanticError( "Ambiguous expression in sizeof operand: ", sizeofExpr->get_expr() ); + throw SemanticError( sizeofExpr->get_expr(), "Ambiguous expression in sizeof operand: " ); } // if // return the lowest cost alternative for the argument @@ -1429,5 +1429,5 @@ findMinCost( finder.alternatives.begin(), finder.alternatives.end(), back_inserter( winners ) ); if ( winners.size() != 1 ) { - throw SemanticError( "Ambiguous expression in alignof operand: ", alignofExpr->get_expr() ); + throw SemanticError( alignofExpr->get_expr(), "Ambiguous expression in alignof operand: " ); } // if // return the lowest cost alternative for the argument Index: src/ResolvExpr/CurrentObject.cc =================================================================== --- src/ResolvExpr/CurrentObject.cc (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/ResolvExpr/CurrentObject.cc (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -141,5 +141,5 @@ base = at->get_base(); memberIter = createMemberIterator( base ); - if ( at->isVarLen ) throw SemanticError( "VLA initialization does not support @=", at ); + if ( at->isVarLen ) throw SemanticError( at, "VLA initialization does not support @=" ); setSize( at->get_dimension() ); } @@ -156,5 +156,5 @@ PRINT( std::cerr << "array type with size: " << size << std::endl; ) } catch ( SemanticError & ) { - throw SemanticError( "Constant expression of non-integral type in array dimension: ", expr ); + throw SemanticError( expr, "Constant expression of non-integral type in array dimension: " ); } } else if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( expr ) ) { @@ -179,5 +179,5 @@ index = constExpr->intValue(); } catch( SemanticError & ) { - throw SemanticError( "Constant expression of non-integral type in array designator: ", expr ); + throw SemanticError( expr, "Constant expression of non-integral type in array designator: " ); } } else if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( expr ) ) { @@ -532,7 +532,7 @@ } // for if ( desigAlts.size() > 1 ) { - throw SemanticError( toString("Too many alternatives (", desigAlts.size(), ") for designation: "), designation ); + throw SemanticError( designation, toString("Too many alternatives (", desigAlts.size(), ") for designation: ") ); } else if ( desigAlts.size() == 0 ) { - throw SemanticError( "No reasonable alternatives for designation: ", designation ); + throw SemanticError( designation, "No reasonable alternatives for designation: " ); } DesignatorChain & d = desigAlts.back(); Index: src/ResolvExpr/Resolver.cc =================================================================== --- src/ResolvExpr/Resolver.cc (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/ResolvExpr/Resolver.cc (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -174,5 +174,5 @@ findMinCost( candidates.begin(), candidates.end(), back_inserter( winners ) ); if ( winners.size() == 0 ) { - throw SemanticError( toString( "No reasonable alternatives for ", kindStr, (kindStr != "" ? " " : ""), "expression: "), untyped ); + throw SemanticError( untyped, toString( "No reasonable alternatives for ", kindStr, (kindStr != "" ? " " : ""), "expression: ") ); } else if ( winners.size() != 1 ) { std::ostringstream stream; @@ -181,5 +181,5 @@ stream << "Alternatives are:\n"; printAlts( winners, stream, 1 ); - throw SemanticError( stream.str() ); + throw SemanticError( untyped->location, stream.str() ); } @@ -187,5 +187,5 @@ Alternative & choice = winners.front(); if ( findDeletedExpr( choice.expr ) ) { - throw SemanticError( "Unique best alternative includes deleted identifier in ", choice.expr ); + throw SemanticError( choice.expr, "Unique best alternative includes deleted identifier in " ); } alt = std::move( choice ); @@ -484,5 +484,5 @@ ss << strict_dynamic_cast( clause.target.function )->name; ss << "' in call to waitfor"; - throw SemanticError( ss.str() ); + throw SemanticError( stmt->location, ss.str() ); } @@ -506,10 +506,10 @@ PointerType * pointer = dynamic_cast< PointerType* >( func.expr->get_result()->stripReferences() ); if( !pointer ) { - throw SemanticError( "candidate not viable: not a pointer type\n", func.expr->get_result() ); + throw SemanticError( func.expr->get_result(), "candidate not viable: not a pointer type\n" ); } FunctionType * function = dynamic_cast< FunctionType* >( pointer->get_base() ); if( !function ) { - throw SemanticError( "candidate not viable: not a function type\n", pointer->get_base() ); + throw SemanticError( pointer->get_base(), "candidate not viable: not a function type\n" ); } @@ -520,5 +520,5 @@ if( !advance_to_mutex( param, param_end ) ) { - throw SemanticError("candidate function not viable: no mutex parameters\n", function); + throw SemanticError(function, "candidate function not viable: no mutex parameters\n"); } } @@ -559,5 +559,5 @@ // We ran out of parameters but still have arguments // this function doesn't match - throw SemanticError("candidate function not viable: too many mutex arguments\n", function); + throw SemanticError( function, "candidate function not viable: too many mutex arguments\n" ); } @@ -571,5 +571,5 @@ (*param)->get_type()->print( ss ); ss << "'\n"; - throw SemanticError(ss.str(), function); + throw SemanticError( function, ss.str() ); } @@ -583,5 +583,5 @@ // We ran out of arguments but still have parameters left // this function doesn't match - throw SemanticError("candidate function not viable: too few mutex arguments\n", function); + throw SemanticError( function, "candidate function not viable: too few mutex arguments\n" ); } @@ -610,8 +610,8 @@ // Make sure we got the right number of arguments - if( func_candidates.empty() ) { SemanticError top( "No alternatives for function in call to waitfor" ); top.append( errors ); throw top; } - if( args_candidates.empty() ) { SemanticError top( "No alternatives for arguments in call to waitfor" ); top.append( errors ); throw top; } - if( func_candidates.size() > 1 ) { SemanticError top( "Ambiguous function in call to waitfor" ); top.append( errors ); throw top; } - if( args_candidates.size() > 1 ) { SemanticError top( "Ambiguous arguments in call to waitfor" ); top.append( errors ); throw top; } + if( func_candidates.empty() ) { SemanticError top( stmt->location, "No alternatives for function in call to waitfor" ); top.append( errors ); throw top; } + if( args_candidates.empty() ) { SemanticError top( stmt->location, "No alternatives for arguments in call to waitfor" ); top.append( errors ); throw top; } + if( func_candidates.size() > 1 ) { SemanticError top( stmt->location, "Ambiguous function in call to waitfor" ); top.append( errors ); throw top; } + if( args_candidates.size() > 1 ) { SemanticError top( stmt->location, "Ambiguous arguments in call to waitfor" ); top.append( errors ); throw top; } // TODO: need to use findDeletedExpr to ensure no deleted identifiers are used. Index: src/SymTab/Indexer.cc =================================================================== --- src/SymTab/Indexer.cc (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/SymTab/Indexer.cc (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -443,10 +443,10 @@ // isomorphic to C type-compatibility, which it may not be. if ( hasIncompatibleCDecl( name, mangleName, scope ) ) { - throw SemanticError( "conflicting overload of C function ", decl ); + throw SemanticError( decl, "conflicting overload of C function " ); } } else { // Check that a Cforall declaration doesn't override any C declaration if ( hasCompatibleCDecl( name, mangleName, scope ) ) { - throw SemanticError( "Cforall declaration hides C function ", decl ); + throw SemanticError( decl, "Cforall declaration hides C function " ); } } @@ -463,10 +463,10 @@ void Indexer::addId( DeclarationWithType * decl, Expression * baseExpr ) { // default handling of conflicts is to raise an error - addId( decl, [decl](IdData &, const std::string & msg) { throw SemanticError( msg, decl ); return true; }, baseExpr ); + addId( decl, [decl](IdData &, const std::string & msg) { throw SemanticError( decl, msg ); return true; }, baseExpr ); } void Indexer::addDeletedId( DeclarationWithType * decl, BaseSyntaxNode * deleteStmt ) { // default handling of conflicts is to raise an error - addId( decl, [decl](IdData &, const std::string & msg) { throw SemanticError( msg, decl ); return true; }, nullptr, deleteStmt ); + addId( decl, [decl](IdData &, const std::string & msg) { throw SemanticError( decl, msg ); return true; }, nullptr, deleteStmt ); } @@ -477,5 +477,5 @@ return true; } else { - throw SemanticError( "redeclaration of ", added ); + throw SemanticError( added, "redeclaration of " ); } } @@ -504,5 +504,5 @@ return false; } else if ( ! added->get_members().empty() ) { - throw SemanticError( "redeclaration of ", added ); + throw SemanticError( added, "redeclaration of " ); } // if return true; Index: src/SymTab/Validate.cc =================================================================== --- src/SymTab/Validate.cc (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/SymTab/Validate.cc (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -361,5 +361,5 @@ // the only case in which "void" is valid is where it is the only one in the list if ( containsVoid && ( nvals > 1 || isVarArgs ) ) { - throw SemanticError( "invalid type void in function type ", func ); + throw SemanticError( func, "invalid type void in function type " ); } @@ -402,5 +402,5 @@ for ( Expression * param : inst->parameters ) { if ( ! dynamic_cast< TypeExpr * >( param ) ) { - throw SemanticError( "Expression parameters for generic types are currently unsupported: ", inst ); + throw SemanticError( inst, "Expression parameters for generic types are currently unsupported: " ); } } @@ -502,8 +502,8 @@ TraitDecl *traitDecl = local_indexer->lookupTrait( traitInst->name ); if ( ! traitDecl ) { - throw SemanticError( "use of undeclared trait " + traitInst->name ); + throw SemanticError( traitInst->location, "use of undeclared trait " + traitInst->name ); } // if if ( traitDecl->get_parameters().size() != traitInst->get_parameters().size() ) { - throw SemanticError( "incorrect number of trait parameters: ", traitInst ); + throw SemanticError( traitInst, "incorrect number of trait parameters: " ); } // if traitInst->baseTrait = traitDecl; @@ -513,5 +513,5 @@ TypeExpr * expr = dynamic_cast< TypeExpr * >( std::get<1>(p) ); if ( ! expr ) { - throw SemanticError( "Expression parameters for trait instances are currently unsupported: ", std::get<1>(p) ); + throw SemanticError( std::get<1>(p), "Expression parameters for trait instances are currently unsupported: " ); } if ( TypeInstType * inst = dynamic_cast< TypeInstType * >( expr->get_type() ) ) { @@ -619,5 +619,5 @@ bool isVoid = fixFunction( assertion ); if ( isVoid ) { - throw SemanticError( "invalid type void in assertion of function ", node ); + throw SemanticError( node, "invalid type void in assertion of function " ); } // if } // for @@ -663,5 +663,5 @@ // were cast to void. if ( ! returnStmt->get_expr() && returnVals.size() != 0 ) { - throw SemanticError( "Non-void function returns no values: " , returnStmt ); + throw SemanticError( returnStmt, "Non-void function returns no values: " ); } } @@ -704,5 +704,5 @@ ReferenceToType *rtt = dynamic_cast(ret); if ( ! rtt ) { - throw SemanticError("Cannot apply type parameters to base type of " + typeInst->name); + throw SemanticError( typeInst->location, "Cannot apply type parameters to base type of " + typeInst->name ); } rtt->get_parameters().clear(); @@ -742,5 +742,5 @@ Type * t2 = typedefNames[ tyDecl->get_name() ].first->get_base(); if ( ! ResolvExpr::typesCompatible( t1, t2, Indexer() ) ) { - throw SemanticError( "Cannot redefine typedef: " + tyDecl->name ); + throw SemanticError( tyDecl->location, "Cannot redefine typedef: " + tyDecl->name ); } // Cannot redefine VLA typedefs. Note: this is slightly incorrect, because our notion of VLAs @@ -749,5 +749,5 @@ // to fix this corner case likely outweighs the utility of allowing it. if ( isVariableLength( t1 ) || isVariableLength( t2 ) ) { - throw SemanticError( "Cannot redefine typedef: " + tyDecl->name ); + throw SemanticError( tyDecl->location, "Cannot redefine typedef: " + tyDecl->name ); } } else { @@ -847,5 +847,5 @@ type = new EnumInstType( Type::Qualifiers(), newDeclEnumDecl->get_name() ); } // if - TypedefDeclPtr tyDecl( new TypedefDecl( aggDecl->get_name(), Type::StorageClasses(), type, aggDecl->get_linkage() ) ); + TypedefDeclPtr tyDecl( new TypedefDecl( aggDecl->get_name(), aggDecl->location, Type::StorageClasses(), type, aggDecl->get_linkage() ) ); typedefNames[ aggDecl->get_name() ] = std::make_pair( std::move( tyDecl ), scopeLevel ); } // if @@ -898,12 +898,12 @@ if ( CodeGen::isCtorDtorAssign( funcDecl->get_name() ) ) { // TODO: also check /=, etc. if ( params.size() == 0 ) { - throw SemanticError( "Constructors, destructors, and assignment functions require at least one parameter ", funcDecl ); + throw SemanticError( funcDecl, "Constructors, destructors, and assignment functions require at least one parameter " ); } ReferenceType * refType = dynamic_cast< ReferenceType * >( params.front()->get_type() ); if ( ! refType ) { - throw SemanticError( "First parameter of a constructor, destructor, or assignment function must be a reference ", funcDecl ); + throw SemanticError( funcDecl, "First parameter of a constructor, destructor, or assignment function must be a reference " ); } if ( CodeGen::isCtorDtor( funcDecl->get_name() ) && returnVals.size() != 0 ) { - throw SemanticError( "Constructors and destructors cannot have explicit return values ", funcDecl ); + throw SemanticError( funcDecl, "Constructors and destructors cannot have explicit return values " ); } } @@ -940,6 +940,6 @@ sub.apply( inst ); - if ( args.size() < params->size() ) throw SemanticError( "Too few type arguments in generic type ", inst ); - if ( args.size() > params->size() ) throw SemanticError( "Too many type arguments in generic type ", inst ); + if ( args.size() < params->size() ) throw SemanticError( inst, "Too few type arguments in generic type " ); + if ( args.size() > params->size() ) throw SemanticError( inst, "Too many type arguments in generic type " ); } } Index: src/SynTree/Declaration.h =================================================================== --- src/SynTree/Declaration.h (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/SynTree/Declaration.h (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -245,5 +245,7 @@ typedef NamedTypeDecl Parent; public: - TypedefDecl( const std::string &name, Type::StorageClasses scs, Type *type, LinkageSpec::Spec spec = LinkageSpec::Cforall ) : Parent( name, scs, type ) { set_linkage( spec ); } + TypedefDecl( const std::string &name, CodeLocation location, Type::StorageClasses scs, Type *type, LinkageSpec::Spec spec = LinkageSpec::Cforall ) + : Parent( name, scs, type ) { set_linkage( spec ); this->location = location; } + TypedefDecl( const TypedefDecl &other ) : Parent( other ) {} Index: src/SynTree/Expression.cc =================================================================== --- src/SynTree/Expression.cc (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/SynTree/Expression.cc (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -93,5 +93,5 @@ return 0; } - throw SemanticError( "Constant expression of non-integral type ", this ); + throw SemanticError( this, "Constant expression of non-integral type " ); } Index: src/SynTree/Mutator.h =================================================================== --- src/SynTree/Mutator.h (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/SynTree/Mutator.h (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -149,5 +149,4 @@ } // if } catch( SemanticError &e ) { - e.set_location( (*i)->location ); errors.append( e ); } // try Index: src/SynTree/Statement.cc =================================================================== --- src/SynTree/Statement.cc (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/SynTree/Statement.cc (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -100,5 +100,5 @@ //actually this is a syntactic error signaled by the parser if ( type == BranchStmt::Goto && target.empty() ) { - throw SemanticError("goto without target"); + throw SemanticError( target.get_statement()->location, "goto without target"); } } @@ -107,5 +107,5 @@ Statement(), computedTarget( computedTarget ), type( type ) { if ( type != BranchStmt::Goto || computedTarget == nullptr ) { - throw SemanticError("Computed target not valid in branch statement"); + throw SemanticError( computedTarget->location, "Computed target not valid in branch statement"); } } @@ -203,5 +203,5 @@ CaseStmt::CaseStmt( Expression *condition, const std::list &statements, bool deflt ) throw ( SemanticError ) : Statement(), condition( condition ), stmts( statements ), _isDefault( deflt ) { - if ( isDefault() && condition != 0 ) throw SemanticError("default case with condition: ", condition); + if ( isDefault() && condition != 0 ) throw SemanticError( condition, "default case with condition: " ); } Index: src/SynTree/TypeSubstitution.h =================================================================== --- src/SynTree/TypeSubstitution.h (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/SynTree/TypeSubstitution.h (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -98,5 +98,5 @@ } // if } else { - throw SemanticError( toString( "Attempt to provide non-type parameter: ", toString( *actualIt ).c_str(), " for type parameter " ), formal ); + throw SemanticError( formal, toString( "Attempt to provide non-type parameter: ", toString( *actualIt ).c_str(), " for type parameter " ) ); } // if } else { Index: src/SynTree/Visitor.h =================================================================== --- src/SynTree/Visitor.h (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/SynTree/Visitor.h (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -143,5 +143,4 @@ } } catch( SemanticError &e ) { - e.set_location( (*i)->location ); errors.append( e ); } Index: src/libcfa/bits/cfatime.h =================================================================== --- src/libcfa/bits/cfatime.h (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) +++ src/libcfa/bits/cfatime.h (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -0,0 +1,93 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// align.h -- +// +// Author : Thierry Delisle +// Created On : Mon Feb 12 18:06:59 2018 +// Last Modified By : +// Last Modified On : +// Update Count : 0 +// +// This library is free software; you can redistribute it and/or modify it +// under the terms of the GNU Lesser General Public License as published by the +// Free Software Foundation; either version 2.1 of the License, or (at your +// option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License +// for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this library. +// + +#pragma once + +extern "C" { +#include +} + +#include "bits/defs.h" + +struct timespec; +struct itimerval; + +//============================================================================================= +// time type +//============================================================================================= + +struct __cfa_time_t { + uint64_t val; +}; + +// ctors +static inline void ?{}( __cfa_time_t & this ) { this.val = 0; } +static inline void ?{}( __cfa_time_t & this, zero_t zero ) { this.val = 0; } + +static inline __cfa_time_t ?=?( __cfa_time_t & this, zero_t rhs ) { + this.val = 0; + return this; +} + +// logical ops +static inline bool ?==?( __cfa_time_t lhs, __cfa_time_t rhs ) { return lhs.val == rhs.val; } +static inline bool ?!=?( __cfa_time_t lhs, __cfa_time_t rhs ) { return lhs.val != rhs.val; } +static inline bool ?>? ( __cfa_time_t lhs, __cfa_time_t rhs ) { return lhs.val > rhs.val; } +static inline bool ?=?( __cfa_time_t lhs, __cfa_time_t rhs ) { return lhs.val >= rhs.val; } +static inline bool ?<=?( __cfa_time_t lhs, __cfa_time_t rhs ) { return lhs.val <= rhs.val; } + +static inline bool ?==?( __cfa_time_t lhs, zero_t rhs ) { return lhs.val == rhs; } +static inline bool ?!=?( __cfa_time_t lhs, zero_t rhs ) { return lhs.val != rhs; } +static inline bool ?>? ( __cfa_time_t lhs, zero_t rhs ) { return lhs.val > rhs; } +static inline bool ?=?( __cfa_time_t lhs, zero_t rhs ) { return lhs.val >= rhs; } +static inline bool ?<=?( __cfa_time_t lhs, zero_t rhs ) { return lhs.val <= rhs; } + +// addition/substract +static inline __cfa_time_t ?+?( __cfa_time_t lhs, __cfa_time_t rhs ) { + __cfa_time_t ret; + ret.val = lhs.val + rhs.val; + return ret; +} + +static inline __cfa_time_t ?-?( __cfa_time_t lhs, __cfa_time_t rhs ) { + __cfa_time_t ret; + ret.val = lhs.val - rhs.val; + return ret; +} + +static inline __cfa_time_t ?`cfa_s ( uint64_t val ) { __cfa_time_t ret; ret.val = val * 1_000_000_000ul; return ret; } +static inline __cfa_time_t ?`cfa_ms( uint64_t val ) { __cfa_time_t ret; ret.val = val * 1_000_000ul; return ret; } +static inline __cfa_time_t ?`cfa_us( uint64_t val ) { __cfa_time_t ret; ret.val = val * 1_000ul; return ret; } +static inline __cfa_time_t ?`cfa_ns( uint64_t val ) { __cfa_time_t ret; ret.val = val * 1ul; return ret; } + +static inline __cfa_time_t from_s ( uint64_t val ) { __cfa_time_t ret; ret.val = val * 1_000_000_000ul; return ret; } +static inline __cfa_time_t from_ms ( uint64_t val ) { __cfa_time_t ret; ret.val = val * 1_000_000ul; return ret; } +static inline __cfa_time_t from_us ( uint64_t val ) { __cfa_time_t ret; ret.val = val * 1_000ul; return ret; } +static inline __cfa_time_t from_ns ( uint64_t val ) { __cfa_time_t ret; ret.val = val * 1ul; return ret; } Index: src/libcfa/concurrency/alarm.c =================================================================== --- src/libcfa/concurrency/alarm.c (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/libcfa/concurrency/alarm.c (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -18,5 +18,4 @@ #include #include -#include #include #include @@ -27,41 +26,17 @@ #include "preemption.h" -//============================================================================================= -// time type -//============================================================================================= -#define one_second 1_000_000_000ul -#define one_milisecond 1_000_000ul -#define one_microsecond 1_000ul -#define one_nanosecond 1ul - -__cfa_time_t zero_time = { 0 }; - -void ?{}( __cfa_time_t & this ) { this.val = 0; } -void ?{}( __cfa_time_t & this, zero_t zero ) { this.val = 0; } - -void ?{}( itimerval & this, __cfa_time_t * alarm ) with( this ) { - it_value.tv_sec = alarm->val / one_second; // seconds - it_value.tv_usec = max( (alarm->val % one_second) / one_microsecond, 1000 ); // microseconds +static inline void ?{}( itimerval & this, __cfa_time_t * alarm ) with( this ) { + it_value.tv_sec = alarm->val / (1`cfa_s).val; // seconds + it_value.tv_usec = max( (alarm->val % (1`cfa_s).val) / (1`cfa_us).val, 1000 ); // microseconds it_interval.tv_sec = 0; it_interval.tv_usec = 0; } - -void ?{}( __cfa_time_t & this, timespec * curr ) { +static inline void ?{}( __cfa_time_t & this, timespec * curr ) { uint64_t secs = curr->tv_sec; uint64_t nsecs = curr->tv_nsec; - this.val = (secs * one_second) + nsecs; + this.val = from_s(secs).val + nsecs; } - -__cfa_time_t ?=?( __cfa_time_t & this, zero_t rhs ) { - this.val = 0; - return this; -} - -__cfa_time_t from_s ( uint64_t val ) { __cfa_time_t ret; ret.val = val * 1_000_000_000ul; return ret; } -__cfa_time_t from_ms( uint64_t val ) { __cfa_time_t ret; ret.val = val * 1_000_000ul; return ret; } -__cfa_time_t from_us( uint64_t val ) { __cfa_time_t ret; ret.val = val * 1_000ul; return ret; } -__cfa_time_t from_ns( uint64_t val ) { __cfa_time_t ret; ret.val = val * 1ul; return ret; } //============================================================================================= @@ -84,5 +59,5 @@ //============================================================================================= -void ?{}( alarm_node_t & this, thread_desc * thrd, __cfa_time_t alarm = zero_time, __cfa_time_t period = zero_time ) with( this ) { +void ?{}( alarm_node_t & this, thread_desc * thrd, __cfa_time_t alarm = 0`cfa_s, __cfa_time_t period = 0`cfa_s ) with( this ) { this.thrd = thrd; this.alarm = alarm; @@ -93,5 +68,5 @@ } -void ?{}( alarm_node_t & this, processor * proc, __cfa_time_t alarm = zero_time, __cfa_time_t period = zero_time ) with( this ) { +void ?{}( alarm_node_t & this, processor * proc, __cfa_time_t alarm = 0`cfa_s, __cfa_time_t period = 0`cfa_s ) with( this ) { this.proc = proc; this.alarm = alarm; Index: src/libcfa/concurrency/alarm.h =================================================================== --- src/libcfa/concurrency/alarm.h (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/libcfa/concurrency/alarm.h (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -21,60 +21,8 @@ #include +#include "bits/cfatime.h" + struct thread_desc; struct processor; - -struct timespec; -struct itimerval; - -//============================================================================================= -// time type -//============================================================================================= - -struct __cfa_time_t { - uint64_t val; -}; - -// ctors -void ?{}( __cfa_time_t & this ); -void ?{}( __cfa_time_t & this, zero_t zero ); -void ?{}( __cfa_time_t & this, timespec * curr ); -void ?{}( itimerval & this, __cfa_time_t * alarm ); - -__cfa_time_t ?=?( __cfa_time_t & this, zero_t rhs ); - -// logical ops -static inline bool ?==?( __cfa_time_t lhs, __cfa_time_t rhs ) { return lhs.val == rhs.val; } -static inline bool ?!=?( __cfa_time_t lhs, __cfa_time_t rhs ) { return lhs.val != rhs.val; } -static inline bool ?>? ( __cfa_time_t lhs, __cfa_time_t rhs ) { return lhs.val > rhs.val; } -static inline bool ?=?( __cfa_time_t lhs, __cfa_time_t rhs ) { return lhs.val >= rhs.val; } -static inline bool ?<=?( __cfa_time_t lhs, __cfa_time_t rhs ) { return lhs.val <= rhs.val; } - -static inline bool ?==?( __cfa_time_t lhs, zero_t rhs ) { return lhs.val == rhs; } -static inline bool ?!=?( __cfa_time_t lhs, zero_t rhs ) { return lhs.val != rhs; } -static inline bool ?>? ( __cfa_time_t lhs, zero_t rhs ) { return lhs.val > rhs; } -static inline bool ?=?( __cfa_time_t lhs, zero_t rhs ) { return lhs.val >= rhs; } -static inline bool ?<=?( __cfa_time_t lhs, zero_t rhs ) { return lhs.val <= rhs; } - -// addition/substract -static inline __cfa_time_t ?+?( __cfa_time_t lhs, __cfa_time_t rhs ) { - __cfa_time_t ret; - ret.val = lhs.val + rhs.val; - return ret; -} - -static inline __cfa_time_t ?-?( __cfa_time_t lhs, __cfa_time_t rhs ) { - __cfa_time_t ret; - ret.val = lhs.val - rhs.val; - return ret; -} - -__cfa_time_t from_s ( uint64_t ); -__cfa_time_t from_ms( uint64_t ); -__cfa_time_t from_us( uint64_t ); -__cfa_time_t from_ns( uint64_t ); - -extern __cfa_time_t zero_time; //============================================================================================= @@ -105,6 +53,6 @@ typedef alarm_node_t ** __alarm_it_t; -void ?{}( alarm_node_t & this, thread_desc * thrd, __cfa_time_t alarm = zero_time, __cfa_time_t period = zero_time ); -void ?{}( alarm_node_t & this, processor * proc, __cfa_time_t alarm = zero_time, __cfa_time_t period = zero_time ); +void ?{}( alarm_node_t & this, thread_desc * thrd, __cfa_time_t alarm = 0`cfa_s, __cfa_time_t period = 0`cfa_s ); +void ?{}( alarm_node_t & this, processor * proc, __cfa_time_t alarm = 0`cfa_s, __cfa_time_t period = 0`cfa_s ); void ^?{}( alarm_node_t & this ); Index: src/libcfa/concurrency/coroutine.c =================================================================== --- src/libcfa/concurrency/coroutine.c (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/libcfa/concurrency/coroutine.c (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -99,4 +99,5 @@ // Wrapper for co void CoroutineCtxSwitch(coroutine_desc* src, coroutine_desc* dst) { + verify( preemption.enabled || this_processor->do_terminate ); disable_interrupts(); @@ -116,4 +117,5 @@ enable_interrupts( __cfaabi_dbg_ctx ); + verify( preemption.enabled || this_processor->do_terminate ); } //ctxSwitchDirect Index: src/libcfa/concurrency/invoke.c =================================================================== --- src/libcfa/concurrency/invoke.c (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/libcfa/concurrency/invoke.c (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -28,4 +28,5 @@ extern void __suspend_internal(void); extern void __leave_coroutine(void); +extern void __finish_creation(void); extern void __leave_thread_monitor( struct thread_desc * this ); extern void disable_interrupts(); @@ -44,4 +45,6 @@ cor->state = Active; + + enable_interrupts( __cfaabi_dbg_ctx ); main( this ); @@ -62,5 +65,5 @@ // First suspend, once the thread arrives here, // the function pointer to main can be invalidated without risk - __suspend_internal(); + __finish_creation(); // Fetch the thread handle from the user defined thread structure Index: src/libcfa/concurrency/kernel.c =================================================================== --- src/libcfa/concurrency/kernel.c (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/libcfa/concurrency/kernel.c (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -56,7 +56,9 @@ thread_local processor * volatile this_processor; -volatile thread_local bool preemption_in_progress = 0; -volatile thread_local bool preemption_enabled = false; -volatile thread_local unsigned short disable_preempt_count = 1; +// volatile thread_local bool preemption_in_progress = 0; +// volatile thread_local bool preemption_enabled = false; +// volatile thread_local unsigned short disable_preempt_count = 1; + +volatile thread_local __cfa_kernel_preemption_data_t preemption = { false, false, 1 }; //----------------------------------------------------------------------------- @@ -207,9 +209,9 @@ if(readyThread) { - verify( !preemption_enabled ); + verify( !preemption.enabled ); runThread(this, readyThread); - verify( !preemption_enabled ); + verify( !preemption.enabled ); //Some actions need to be taken from the kernel @@ -260,5 +262,5 @@ void finishRunning(processor * this) with( this->finish ) { if( action_code == Release ) { - verify( !preemption_enabled ); + verify( !preemption.enabled ); unlock( *lock ); } @@ -267,10 +269,10 @@ } else if( action_code == Release_Schedule ) { - verify( !preemption_enabled ); + verify( !preemption.enabled ); unlock( *lock ); ScheduleThread( thrd ); } else if( action_code == Release_Multi ) { - verify( !preemption_enabled ); + verify( !preemption.enabled ); for(int i = 0; i < lock_count; i++) { unlock( *locks[i] ); @@ -304,6 +306,6 @@ this_coroutine = NULL; this_thread = NULL; - preemption_enabled = false; - disable_preempt_count = 1; + preemption.enabled = false; + preemption.disable_count = 1; // SKULLDUGGERY: We want to create a context for the processor coroutine // which is needed for the 2-step context switch. However, there is no reason @@ -345,4 +347,42 @@ } +void kernel_first_resume(processor * this) { + coroutine_desc * src = this_coroutine; + coroutine_desc * dst = get_coroutine(*this->runner); + + verify( !preemption.enabled ); + + create_stack(&dst->stack, dst->stack.size); + CtxStart(this->runner, CtxInvokeCoroutine); + + verify( !preemption.enabled ); + + dst->last = src; + dst->starter = dst->starter ? dst->starter : src; + + // set state of current coroutine to inactive + src->state = src->state == Halted ? Halted : Inactive; + + // set new coroutine that task is executing + this_coroutine = dst; + + // SKULLDUGGERY normally interrupts are enable before leaving a coroutine ctxswitch. + // Therefore, when first creating a coroutine, interrupts are enable before calling the main. + // This is consistent with thread creation. However, when creating the main processor coroutine, + // we wan't interrupts to be disabled. Therefore, we double-disable interrupts here so they will + // stay disabled. + disable_interrupts(); + + // context switch to specified coroutine + assert( src->stack.context ); + CtxSwitch( src->stack.context, dst->stack.context ); + // when CtxSwitch returns we are back in the src coroutine + + // set state of new coroutine to active + src->state = Active; + + verify( !preemption.enabled ); +} + //----------------------------------------------------------------------------- // Scheduler routines @@ -352,5 +392,5 @@ verify( thrd->self_cor.state != Halted ); - verify( !preemption_enabled ); + verify( !preemption.enabled ); verifyf( thrd->next == NULL, "Expected null got %p", thrd->next ); @@ -362,13 +402,13 @@ } - verify( !preemption_enabled ); + verify( !preemption.enabled ); } thread_desc * nextThread(cluster * this) with( *this ) { - verify( !preemption_enabled ); + verify( !preemption.enabled ); lock( ready_queue_lock __cfaabi_dbg_ctx2 ); thread_desc * head = pop_head( ready_queue ); unlock( ready_queue_lock ); - verify( !preemption_enabled ); + verify( !preemption.enabled ); return head; } @@ -376,7 +416,7 @@ void BlockInternal() { disable_interrupts(); - verify( !preemption_enabled ); + verify( !preemption.enabled ); returnToKernel(); - verify( !preemption_enabled ); + verify( !preemption.enabled ); enable_interrupts( __cfaabi_dbg_ctx ); } @@ -387,7 +427,7 @@ this_processor->finish.lock = lock; - verify( !preemption_enabled ); + verify( !preemption.enabled ); returnToKernel(); - verify( !preemption_enabled ); + verify( !preemption.enabled ); enable_interrupts( __cfaabi_dbg_ctx ); @@ -399,7 +439,7 @@ this_processor->finish.thrd = thrd; - verify( !preemption_enabled ); + verify( !preemption.enabled ); returnToKernel(); - verify( !preemption_enabled ); + verify( !preemption.enabled ); enable_interrupts( __cfaabi_dbg_ctx ); @@ -413,7 +453,7 @@ this_processor->finish.thrd = thrd; - verify( !preemption_enabled ); + verify( !preemption.enabled ); returnToKernel(); - verify( !preemption_enabled ); + verify( !preemption.enabled ); enable_interrupts( __cfaabi_dbg_ctx ); @@ -426,7 +466,7 @@ this_processor->finish.lock_count = count; - verify( !preemption_enabled ); + verify( !preemption.enabled ); returnToKernel(); - verify( !preemption_enabled ); + verify( !preemption.enabled ); enable_interrupts( __cfaabi_dbg_ctx ); @@ -441,7 +481,7 @@ this_processor->finish.thrd_count = thrd_count; - verify( !preemption_enabled ); + verify( !preemption.enabled ); returnToKernel(); - verify( !preemption_enabled ); + verify( !preemption.enabled ); enable_interrupts( __cfaabi_dbg_ctx ); @@ -449,5 +489,5 @@ void LeaveThread(__spinlock_t * lock, thread_desc * thrd) { - verify( !preemption_enabled ); + verify( !preemption.enabled ); this_processor->finish.action_code = thrd ? Release_Schedule : Release; this_processor->finish.lock = lock; @@ -463,4 +503,5 @@ // Kernel boot procedures void kernel_startup(void) { + verify( !preemption.enabled ); __cfaabi_dbg_print_safe("Kernel : Starting\n"); @@ -500,5 +541,5 @@ // context. Hence, the main thread does not begin through CtxInvokeThread, like all other threads. The trick here is that // mainThread is on the ready queue when this call is made. - resume( *mainProcessor->runner ); + kernel_first_resume( this_processor ); @@ -507,5 +548,7 @@ __cfaabi_dbg_print_safe("Kernel : Started\n--------------------------------------------------\n\n"); + verify( !preemption.enabled ); enable_interrupts( __cfaabi_dbg_ctx ); + verify( preemption.enabled ); } @@ -513,5 +556,7 @@ __cfaabi_dbg_print_safe("\n--------------------------------------------------\nKernel : Shutting down\n"); + verify( preemption.enabled ); disable_interrupts(); + verify( !preemption.enabled ); // SKULLDUGGERY: Notify the mainProcessor it needs to terminates. Index: src/libcfa/concurrency/kernel_private.h =================================================================== --- src/libcfa/concurrency/kernel_private.h (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/libcfa/concurrency/kernel_private.h (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -74,7 +74,15 @@ extern thread_local processor * volatile this_processor; -extern volatile thread_local bool preemption_in_progress; -extern volatile thread_local bool preemption_enabled; -extern volatile thread_local unsigned short disable_preempt_count; +// extern volatile thread_local bool preemption_in_progress; +// extern volatile thread_local bool preemption_enabled; +// extern volatile thread_local unsigned short disable_preempt_count; + +struct __cfa_kernel_preemption_data_t { + bool enabled; + bool in_progress; + unsigned short disable_count; +}; + +extern volatile thread_local __cfa_kernel_preemption_data_t preemption; //----------------------------------------------------------------------------- Index: src/libcfa/concurrency/monitor.c =================================================================== --- src/libcfa/concurrency/monitor.c (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/libcfa/concurrency/monitor.c (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -10,6 +10,6 @@ // Created On : Thd Feb 23 12:27:26 2017 // Last Modified By : Peter A. Buhr -// Last Modified On : Thu Feb 8 16:12:20 2018 -// Update Count : 4 +// Last Modified On : Fri Feb 16 14:49:53 2018 +// Update Count : 5 // @@ -427,5 +427,5 @@ thread_desc * this_thrd = this_thread; if ( this.monitor_count != this_thrd->monitors.size ) { - abort( "Signal on condition %p made with different number of monitor(s), expected %li got %li", &this, this.monitor_count, this_thrd->monitors.size ); + abort( "Signal on condition %p made with different number of monitor(s), expected %zi got %zi", &this, this.monitor_count, this_thrd->monitors.size ); } Index: src/libcfa/concurrency/preemption.c =================================================================== --- src/libcfa/concurrency/preemption.c (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/libcfa/concurrency/preemption.c (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -149,7 +149,7 @@ // Disable interrupts by incrementing the counter void disable_interrupts() { - preemption_enabled = false; - __attribute__((unused)) unsigned short new_val = disable_preempt_count + 1; - disable_preempt_count = new_val; + preemption.enabled = false; + __attribute__((unused)) unsigned short new_val = preemption.disable_count + 1; + preemption.disable_count = new_val; verify( new_val < 65_000u ); // If this triggers someone is disabling interrupts without enabling them } @@ -161,11 +161,11 @@ thread_desc * thrd = this_thread; // Cache the thread now since interrupts can start happening after the atomic add - unsigned short prev = disable_preempt_count; - disable_preempt_count -= 1; + unsigned short prev = preemption.disable_count; + preemption.disable_count -= 1; verify( prev != 0u ); // If this triggers someone is enabled already enabled interruptsverify( prev != 0u ); // Check if we need to prempt the thread because an interrupt was missed if( prev == 1 ) { - preemption_enabled = true; + preemption.enabled = true; if( proc->pending_preemption ) { proc->pending_preemption = false; @@ -181,9 +181,9 @@ // Don't execute any pending CtxSwitch even if counter reaches 0 void enable_interrupts_noPoll() { - unsigned short prev = disable_preempt_count; - disable_preempt_count -= 1; + unsigned short prev = preemption.disable_count; + preemption.disable_count -= 1; verifyf( prev != 0u, "Incremented from %u\n", prev ); // If this triggers someone is enabled already enabled interrupts if( prev == 1 ) { - preemption_enabled = true; + preemption.enabled = true; } } @@ -235,5 +235,5 @@ // If false : preemption is unsafe and marked as pending static inline bool preemption_ready() { - bool ready = preemption_enabled && !preemption_in_progress; // Check if preemption is safe + bool ready = preemption.enabled && !preemption.in_progress; // Check if preemption is safe this_processor->pending_preemption = !ready; // Adjust the pending flag accordingly return ready; @@ -250,6 +250,6 @@ // Start with preemption disabled until ready - preemption_enabled = false; - disable_preempt_count = 1; + preemption.enabled = false; + preemption.disable_count = 1; // Initialize the event kernel @@ -290,5 +290,5 @@ // Used by thread to control when they want to receive preemption signals void ?{}( preemption_scope & this, processor * proc ) { - (this.alarm){ proc, zero_time, zero_time }; + (this.alarm){ proc, 0`cfa_s, 0`cfa_s }; this.proc = proc; this.proc->preemption_alarm = &this.alarm; @@ -300,5 +300,5 @@ disable_interrupts(); - update_preemption( this.proc, zero_time ); + update_preemption( this.proc, 0`cfa_s ); } @@ -330,7 +330,7 @@ __cfaabi_dbg_print_buffer_decl( " KERNEL: preempting core %p (%p).\n", this_processor, this_thread); - preemption_in_progress = true; // Sync flag : prevent recursive calls to the signal handler + preemption.in_progress = true; // Sync flag : prevent recursive calls to the signal handler signal_unblock( SIGUSR1 ); // We are about to CtxSwitch out of the signal handler, let other handlers in - preemption_in_progress = false; // Clear the in progress flag + preemption.in_progress = false; // Clear the in progress flag // Preemption can occur here Index: src/libcfa/concurrency/thread.c =================================================================== --- src/libcfa/concurrency/thread.c (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/libcfa/concurrency/thread.c (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -90,6 +90,15 @@ } +extern "C" { + void __finish_creation(void) { + coroutine_desc* thrd_c = this_coroutine; + ThreadCtxSwitch( thrd_c, thrd_c->last ); + } +} + void yield( void ) { + verify( preemption.enabled ); BlockInternal( this_thread ); + verify( preemption.enabled ); } Index: src/main.cc =================================================================== --- src/main.cc (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/main.cc (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -282,4 +282,6 @@ } // if + CodeTools::fillLocations( translationUnit ); + OPTPRINT( "resolve" ) ResolvExpr::resolve( translationUnit ); @@ -361,5 +363,5 @@ cerr << endl << "---End of AST, begin error message:---\n" << endl; } // if - e.print( cerr ); + e.print(); if ( output != &cout ) { delete output; Index: src/tests/.expect/alloc.txt =================================================================== --- src/tests/.expect/alloc.txt (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/tests/.expect/alloc.txt (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -2,5 +2,5 @@ CFA malloc 0xdeadbeef CFA alloc 0xdeadbeef -CFA alloc, fill 01010101 +CFA alloc, fill ffffffff C array calloc, fill 0 @@ -10,6 +10,6 @@ CFA array alloc, no fill 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef -CFA array alloc, fill 0x1 -0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 +CFA array alloc, fill 0xff +0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff C realloc @@ -25,9 +25,9 @@ 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef CFA resize array alloc, fill -0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 +0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff CFA resize array alloc, fill -0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 +0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff CFA resize array alloc, fill -0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 0x1010101 +0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff 0xffffffff C memalign 42 42.5 @@ -37,18 +37,18 @@ CFA aligned_alloc 42 42.5 CFA align_alloc 42 42.5 -CFA align_alloc fill 0x1010101 0x1.1010101010101p-1007 +CFA align_alloc fill 0xffffffff -nan CFA array align_alloc 42 42.5, 42 42.5, 42 42.5, 42 42.5, 42 42.5, 42 42.5, 42 42.5, 42 42.5, 42 42.5, 42 42.5, CFA array align_alloc, fill -0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, +0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, -CFA memset 0x1010101 0x1.1010101010101p-1007 -CFA memcpy 0x1010101 0x1.1010101010101p-1007 +CFA memset 0xffffffff -nan +CFA memcpy 0xffffffff -nan CFA array memset -0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, +0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, CFA memcpy -0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, 0x1010101 0x1.1010101010101p-1007, +0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, 0xffffffff -nan, CFA new initialize Index: src/tests/alloc.c =================================================================== --- src/tests/alloc.c (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/tests/alloc.c (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -10,6 +10,6 @@ // Created On : Wed Feb 3 07:56:22 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Mon Jan 22 21:26:40 2018 -// Update Count : 326 +// Last Modified On : Fri Feb 16 15:42:31 2018 +// Update Count : 330 // @@ -27,6 +27,6 @@ int main( void ) { size_t dim = 10; + char fill = '\xff'; int * p; - char fill = '\1'; // allocation, non-array types @@ -79,5 +79,5 @@ p = alloc( 2 * dim, fill ); // CFA array alloc, fill - printf( "CFA array alloc, fill %#x\n", fill ); + printf( "CFA array alloc, fill %#hhx\n", fill ); for ( int i = 0; i < 2 * dim; i += 1 ) { printf( "%#x ", p[i] ); } printf( "\n" ); Index: src/tests/raii/.expect/dtor-early-exit-ERR2.txt =================================================================== --- src/tests/raii/.expect/dtor-early-exit-ERR2.txt (revision c71b2568066cb39013d366dd0195e430de881e0e) +++ src/tests/raii/.expect/dtor-early-exit-ERR2.txt (revision 7c782aff4b836a71e18dd75c37d3b3e43582a5bc) @@ -1,3 +1,3 @@ -raii/dtor-early-exit.c:220:1 error: jump to label 'L2' crosses initialization of y Branch (Goto) +raii/dtor-early-exit.c:217:1 error: jump to label 'L2' crosses initialization of y Branch (Goto) with target: L2 with original target: L2