Index: doc/user/Makefile =================================================================== --- doc/user/Makefile (revision 09d1ad0b1f50213ed8f7a8749ff1ba2242b2c4a7) +++ doc/user/Makefile (revision 6b6597c4520b64fdb6397f1de6a7497d55cccc40) @@ -12,4 +12,5 @@ FIGURES = ${addsuffix .tex, \ +Cdecl \ } Index: doc/user/user.tex =================================================================== --- doc/user/user.tex (revision 09d1ad0b1f50213ed8f7a8749ff1ba2242b2c4a7) +++ doc/user/user.tex (revision 6b6597c4520b64fdb6397f1de6a7497d55cccc40) @@ -11,6 +11,6 @@ %% Created On : Wed Apr 6 14:53:29 2016 %% Last Modified By : Peter A. Buhr -%% Last Modified On : Sun Apr 10 22:50:15 2016 -%% Update Count : 72 +%% Last Modified On : Thu Apr 14 21:30:07 2016 +%% Update Count : 130 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -26,4 +26,5 @@ \usepackage{upquote} \usepackage{fullpage,times} +\usepackage{epic,eepic} \usepackage{xspace} \usepackage{varioref} @@ -48,4 +49,5 @@ % Names used in the document. +\newcommand{\Version}{1.0.0} \newcommand{\CS}{C\raisebox{-0.9ex}{\large$^\sharp$}\xspace} @@ -105,5 +107,5 @@ The syntax of the \CFA language builds from C, and should look immediately familiar to C programmers. % Any language feature that is not described here can be assumed to be using the standard C11 syntax. -\CFA adds many modern programming-language features, which directly leads to increased safety and productivity, while maintaining interoperability with existing C programs and maintaining C-like performance. +\CFA adds many modern programming-language features, which directly leads to increased safety and productivity, while maintaining interoperability with existing C programs and achieving C performance. Like C, \CFA is a statically typed, procedural language with a low-overhead runtime, meaning there is no global garbage-collection. The primary new features include parametric-polymorphism routines and types, exceptions, concurrency, and modules. @@ -224,5 +226,5 @@ -\section{Compiling \CFA} +\section{Compiling \CFA Program} The command \lstinline@cfa@ is used to compile \CFA program(s). @@ -231,8 +233,10 @@ cfa [ gcc-options ] C/@{\CFA}@-files [ assembler/loader-files ] \end{lstlisting} +\index{cfa@\lstinline$cfa$}\index{compilation!cfa@\lstinline$cfa$} By default, \CFA programs having the following \lstinline@gcc@ flags turned on: \begin{description} \item \hspace*{-4pt}\lstinline@-std=gnu99@ +\index{-std=gnu99@{\lstinline$-std=gnu99$}}\index{compilation option!-std=gnu99@{\lstinline$-std=gnu99$}} The 1999 C standard plus GNU extensions. \end{description} @@ -241,6 +245,43 @@ \item \hspace*{-4pt}\lstinline@-CFA@ +\index{-CFA@{\lstinline$-CFA$}}\index{compilation option!-CFA@{\lstinline$-CFA$}} Only the C preprocessor and the \CFA translator steps are performed and the transformed program is written to standard output, which makes it possible to examine the code generated by the \CFA translator. \end{description} + +The following preprocessor variables are available: +\begin{description} +\item +\hspace*{-4pt}\lstinline$__CFA__$ +\index{__CFA__@{\lstinline$__CFA__$}}\index{preprocessor variables!__CFA__@{\lstinline$__CFA__$}} +is always available during preprocessing and its value is the current major \Index{version number} of \CFA.\footnote{ +The C preprocessor allows only integer values in a preprocessor variable so a value like ``\Version'' is not allowed. +Hence, the need to have three variables for the major, minor and patch version number.} + +\item +\hspace*{-4pt}\lstinline$__CFA_MINOR__$ +\index{__CFA_MINOR__@{\lstinline$__CFA_MINOR__$}}\index{preprocessor variables!__CFA_MINOR__@{\lstinline$__CFA_MINOR__$}} +is always available during preprocessing and its value is the current minor \Index{version number} of \CFA. + +\item +\hspace*{-4pt}\lstinline$__CFA_PATCH__$ +\index{__CFA_PATCH__@%(__CFA_PATCH__%)}\index{preprocessor variables!__CFA_PATCH__@%(__CFA_PATCH__%)} +is always available during preprocessing and its value is the current patch \Index{version number} of \CFA. + +\item +\hspace*{-4pt}\lstinline$__CFORALL__$ +\index{__CFORALL__@%(__CFORALL__%)}\index{preprocessor variables!__CFORALL__@%(__CFORALL__%)} +is always available during preprocessing and it has no value. +\end{description} + +These preprocessor variables allow conditional compilation of programs that must work differently in these situations. +For example, to toggle between C and \CFA extensions, using the following: +\begin{lstlisting} +#ifndef __CFORALL__ +#include // C header file +#else +#include // @\CFA{}@ header file +#endif +\end{lstlisting} +which conditionally includes the correct header file, if the program is compiled using \lstinline@gcc@ or \lstinline@cfa@. @@ -284,13 +325,19 @@ C declaration syntax is notoriously confusing and error prone. For example, many C programmers are confused by a declaration as simple as: -\begin{lstlisting} -int *x[ 10 ] -\end{lstlisting} -Is this a pointer to an array of 10 integers or an array of 10 pointers to integers? +\begin{quote2} +\begin{tabular}{@{}ll@{}} +\begin{lstlisting}[aboveskip=0pt,belowskip=0pt] +int *x[ 5 ] +\end{lstlisting} +& +\raisebox{-0.75\totalheight}{\input{Cdecl}} +\end{tabular} +\end{quote2} +Is this an array of 5 pointers to integers or a pointer to an array of 5 integers? 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 pointer to an array of integers is defined and used in the following way: \begin{lstlisting} -int (*f())[ 10 ] {...}; -... (*f())[ 3 ] += 1; // definition mimics usage +int (*f())[ 5 ] {...}; // definition mimics usage +... (*f())[ 3 ] += 1; \end{lstlisting} Essentially, the return type is wrapped around the routine name in successive layers (like an onion). @@ -322,29 +369,29 @@ \multicolumn{1}{c@{\hspace{30pt}}}{\textbf{\CFA}} & \multicolumn{1}{c@{\hspace{20pt}}}{\textbf{C}} \\ \begin{lstlisting} -[ 10 ] int z; -[ 10 ] * char w; -* [ 10 ] double v; +[ 5 ] int z; +[ 5 ] * char w; +* [ 5 ] double v; struct s { int f0:3; * int f1; - [ 10 ] * int f2; + [ 5 ] * int f2; }; \end{lstlisting} & \begin{lstlisting} -int z[ 10 ]; -char *w[ 10 ]; -double (*v)[ 10 ]; +int z[ 5 ]; +char *w[ 5 ]; +double (*v)[ 5 ]; struct s { int f0:3; int *f1; - int *f2[ 10 ] + int *f2[ 5 ] }; \end{lstlisting} & \begin{lstlisting} -// array of 10 integers -// array of 10 pointers to char -// pointer to array of 10 doubles +// array of 5 integers +// array of 5 pointers to char +// pointer to array of 5 doubles // common bit field syntax @@ -362,15 +409,15 @@ \begin{lstlisting} const * const int x; -const * [ 10 ] const int y; +const * [ 5 ] const int y; \end{lstlisting} & \begin{lstlisting} int const * const x; -const int (* const y)[ 10 ] +const int (* const y)[ 5 ] \end{lstlisting} & \begin{lstlisting} // const pointer to const integer -// const pointer to array of 10 const integers +// const pointer to array of 5 const integers \end{lstlisting} \end{tabular} @@ -382,15 +429,15 @@ \multicolumn{1}{c@{\hspace{30pt}}}{\textbf{\CFA}} & \multicolumn{1}{c@{\hspace{20pt}}}{\textbf{C}} \\ \begin{lstlisting} -extern [ 10 ] int x; +extern [ 5 ] int x; static * const int y; \end{lstlisting} & \begin{lstlisting} -int extern x[ 10 ]; +int extern x[ 5 ]; const int static *y; \end{lstlisting} & \begin{lstlisting} -// externally visible array of 10 integers +// externally visible array of 5 integers // internally visible pointer to constant int \end{lstlisting} @@ -421,10 +468,10 @@ \begin{lstlisting} y = (* int)x; -i = sizeof([ 10 ] * int); +i = sizeof([ 5 ] * int); \end{lstlisting} & \begin{lstlisting} y = (int *)x; -i = sizeof(int *[ 10 ]); +i = sizeof(int *[ 5 ]); \end{lstlisting} \end{tabular} @@ -466,7 +513,7 @@ \CFA style declarations cannot be used to declare parameters for K\&R style routine definitions because of the following ambiguity: \begin{lstlisting} -int (*f(x))[ 10 ] int x; {} -\end{lstlisting} -The string ``\lstinline@int (*f(x))[ 10 ]@'' declares a K\&R style routine of type returning a pointer to an array of 10 integers, while the string ``\lstinline@[ 10 ] int x@'' declares a \CFA style parameter x of type array of 10 integers. +int (*f(x))[ 5 ] int x; {} +\end{lstlisting} +The string ``\lstinline@int (*f(x))[ 5 ]@'' declares a K\&R style routine of type returning a pointer to an array of 5 integers, while the string ``\lstinline@[ 5 ] int x@'' declares a \CFA style parameter x of type array of 5 integers. Since the strings overlap starting with the open bracket, \lstinline@[@, there is an ambiguous interpretation for the string. As well, \CFA-style declarations cannot be used to declare parameters for C-style routine-definitions because of the following ambiguity: @@ -487,6 +534,6 @@ \begin{lstlisting} #define ptoa( n, d ) int (*n)[ d ] -int f( ptoa(p,10) ) ... // expands to int f( int (*p)[ 10 ] ) -[ int ] f( ptoa(p,10) ) ... // expands to [ int ] f( int (*p)[ 10 ] ) +int f( ptoa(p,5) ) ... // expands to int f( int (*p)[ 5 ] ) +[ int ] f( ptoa(p,5) ) ... // expands to [ int ] f( int (*p)[ 5 ] ) \end{lstlisting} Again, programmers are highly encouraged to use one declaration form or the other, rather than mixing the forms. @@ -807,5 +854,5 @@ which can be used to sort in ascending and descending order by locally redefining the less-than operator into greater-than. \begin{lstlisting} -const unsigned int size = 10; +const unsigned int size = 5; int ia[size]; ... // assign values to array ia @@ -874,5 +921,5 @@ [ double, double, double ] [ * int, int * ] // mix of CFA and ANSI -[ * [ 10 ] int, * * char, * [ [ int, int ] ] (int, int) ] +[ * [ 5 ] int, * * char, * [ [ int, int ] ] (int, int) ] \end{lstlisting} Like tuples, tuple types may be nested, such as \lstinline@[ [ int, int ], int ]@, which is a 2-element tuple type whose first element is itself a tuple type. @@ -2216,8 +2263,8 @@ try { - throw 13; + throw 13; } catch(int e) { - printf(.caught an exception: %d\n., e); + printf(.caught an exception: %d\n., e); } \end{lstlisting} Index: src/examples/io.c =================================================================== --- src/examples/io.c (revision 09d1ad0b1f50213ed8f7a8749ff1ba2242b2c4a7) +++ src/examples/io.c (revision 6b6597c4520b64fdb6397f1de6a7497d55cccc40) @@ -11,6 +11,6 @@ // Created On : Wed Mar 2 16:56:02 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Apr 6 14:58:27 2016 -// Update Count : 15 +// Last Modified On : Wed Apr 13 23:03:14 2016 +// Update Count : 22 // @@ -36,5 +36,5 @@ ifstream in; // create / open file - open( &in, "input.data", "r" ); + open( &in, "io.data", "r" ); &in | &c // character @@ -59,4 +59,42 @@ | fc | dc | ldc | endl // complex without separator | s1 | s2 | endl; + sout | endl; + sepSet( sout, " " ); + + sout + // opening delimiters + | "v(" | 27 + | "v[" | 27 + | "v{" | 27 + | "$" | 27 + | "£" | 27 + | "¥" | 27 + | "¿" | 27 + | "«" | 27 + | endl + // closing delimiters + | 25 | "," + | 25 | "." + | 25 | ":" + | 25 | ";" + | 25 | "!" + | 25 | "?" + | 25 | ")" + | 25 | "]" + | 25 | "}" + | 25 | "%" + | 25 | "¢" + | 25 | "»" + | endl + // opening-closing delimiters + | 25 | "'" | 27 + | 25 | "`" | 27 + | 25 | "\"" | 27 + | 25 | "\f" | 27 + | 25 | "\n" | 27 + | 25 | "\r" | 27 + | 25 | "\t" | 27 + | 25 | "\v" | 27 + | endl; } Index: src/libcfa/fstream =================================================================== --- src/libcfa/fstream (revision 09d1ad0b1f50213ed8f7a8749ff1ba2242b2c4a7) +++ src/libcfa/fstream (revision 6b6597c4520b64fdb6397f1de6a7497d55cccc40) @@ -10,6 +10,6 @@ // Created On : Wed May 27 17:56:53 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Tue Apr 5 22:37:12 2016 -// Update Count : 82 +// Last Modified On : Tue Apr 19 20:44:10 2016 +// Update Count : 84 // @@ -22,6 +22,6 @@ struct ofstream { void *file; - _Bool sepDefault; - _Bool sepOnOff; + int sepDefault; + int sepOnOff; char separator[separateSize]; }; // ofstream Index: src/libcfa/stdlib =================================================================== --- src/libcfa/stdlib (revision 09d1ad0b1f50213ed8f7a8749ff1ba2242b2c4a7) +++ src/libcfa/stdlib (revision 6b6597c4520b64fdb6397f1de6a7497d55cccc40) @@ -10,6 +10,6 @@ // Created On : Thu Jan 28 17:12:35 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Apr 13 14:45:53 2016 -// Update Count : 85 +// Last Modified On : Tue Apr 19 21:21:53 2016 +// Update Count : 93 // @@ -28,4 +28,5 @@ #endif // ! EXIT_FAILURE void exit( int rc ); +void abort( void ); } // extern "C" @@ -50,9 +51,11 @@ forall( otype T ) T * aligned_alloc( size_t alignment ); -forall( otype T ) T * memalign( size_t alignment ); // deprecated +forall( otype T ) T * memalign( size_t alignment ); forall( otype T ) int posix_memalign( T ** ptr, size_t alignment ); -forall( otype T ) T * memset( T * ptr, unsigned char fill ); // use default value '\0' for fill -forall( otype T ) T * memset( T * ptr ); // remove when default value available +extern "C" { +void * memset( void * ptr, int fill, size_t size ); +void free( void * ptr ); +} // extern "C" //--------------------------------------- Index: src/libcfa/stdlib.c =================================================================== --- src/libcfa/stdlib.c (revision 09d1ad0b1f50213ed8f7a8749ff1ba2242b2c4a7) +++ src/libcfa/stdlib.c (revision 6b6597c4520b64fdb6397f1de6a7497d55cccc40) @@ -10,6 +10,6 @@ // Created On : Thu Jan 28 17:10:29 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Apr 13 14:49:58 2016 -// Update Count : 155 +// Last Modified On : Tue Apr 19 21:21:51 2016 +// Update Count : 159 // @@ -34,5 +34,5 @@ //printf( "malloc3\n" ); T * ptr = (T *)malloc( sizeof(T) ); - return memset( ptr ); + return memset( ptr, (int)fill, sizeof(T) ); } // malloc @@ -78,13 +78,4 @@ } // posix_memalign -forall( otype T ) T * memset( T * ptr, unsigned char fill ) { // use default value '\0' for fill - //printf( "memset1\n" ); - return (T *)memset( ptr, (int)fill, malloc_usable_size( ptr ) ); -} // memset -forall( otype T ) T * memset( T * ptr ) { // remove when default value available - //printf( "memset2\n" ); - return (T *)memset( ptr, 0, malloc_usable_size( ptr ) ); -} // memset - //---------------------------------------