Index: INSTALL =================================================================== --- INSTALL (revision ac43954180f13a25ad6ec84de6b73da43f6f9223) +++ INSTALL (revision a14187f829cf56e146d93f0879351491f761a9bb) @@ -3,6 +3,6 @@ Cforall is built using GNU Make and the GNU Autoconf system. It also requires -g++ version 4, bison and flex. On systems where GNU Make is the default make -it may suffice to build the system by entering the commands +g++ version >= 4.6, bison and flex. On systems where GNU Make is the default +make, the system is built by entering the commands: ./configure @@ -17,9 +17,9 @@ --prefix=/some/directory controls the path prefix common to all installed - cfa-cc components. Some components will be installed in /some/directory/bin, + cfa-cc components. Some components are installed in /some/directory/bin, others in /some/directory/lib. If unspecified, this defaults to /usr/local. - If you wish to use (a subdirectory of) your home directory, ${HOME}/some/dir - works, but it is important not to put quotes around the directory path; - Cforall may appear to build, but the installed version may not work properly. + To use (a subdirectory of) your home directory, ${HOME}/some/dir works, but + it is important not to put quotes around the directory path; Cforall may + appear to build, but the installed version may not work properly. --with-backend-compiler=PROGRAM specifies the installed path of gcc. It Index: Jenkins/FullBuild =================================================================== --- Jenkins/FullBuild (revision ac43954180f13a25ad6ec84de6b73da43f6f9223) +++ Jenkins/FullBuild (revision a14187f829cf56e146d93f0879351491f761a9bb) @@ -43,5 +43,6 @@ } - sh "GIT_SSH_COMMAND=\"ssh -v\" git push DoLang ${gitRefNewValue}:master" + //sh "GIT_SSH_COMMAND=\"ssh -v\" git push DoLang ${gitRefNewValue}:master" + echo('BUILD NOT PUSH SINCE DO-LANG SERVER WAS DOWN') } @@ -67,4 +68,6 @@ node ('master') { + def err = null + try { //Prevent the build from exceeding 30 minutes @@ -78,12 +81,12 @@ results = [null, null] - // parallel ( - // x64: { - // trigger_build('64-bit') - // }, - // x32: { - // trigger_build('32-bit') - // } - // ) + parallel ( + x64: { + trigger_build('64-bit') + }, + x32: { + trigger_build('32-bit') + } + ) //Push latest changes to do-lang repo Index: doc/LaTeXmacros/common.tex =================================================================== --- doc/LaTeXmacros/common.tex (revision ac43954180f13a25ad6ec84de6b73da43f6f9223) +++ doc/LaTeXmacros/common.tex (revision a14187f829cf56e146d93f0879351491f761a9bb) @@ -11,18 +11,16 @@ %% Created On : Sat Apr 9 10:06:17 2016 %% Last Modified By : Peter A. Buhr -%% Last Modified On : Tue Jul 12 20:37:57 2016 -%% Update Count : 206 +%% Last Modified On : Tue Aug 2 17:02:02 2016 +%% Update Count : 228 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \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{\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 +\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 @@ -38,9 +36,9 @@ % Names used in the document. -\newcommand{\CFA}{C$\mathbf\forall$\xspace} % set language symbolic name -\newcommand{\CFL}{Cforall\xspace} % set language text name +\newcommand{\CFA}{C$\mathbf\forall$\xspace} % set language symbolic name +\newcommand{\CFL}{Cforall\xspace} % set language text name \newcommand{\CC}{\rm C\kern-.1em\hbox{+\kern-.25em+}\xspace} % CC symbolic name \newcommand{\CCeleven}{\rm C\kern-.1em\hbox{+\kern-.25em+}11\xspace} % C++11 symbolic name -\def\c11{ISO/IEC C} % C11 name (cannot have numbers in latex command name) +\newcommand{\Celeven}{C11\xspace} % C11 symbolic name %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -52,5 +50,5 @@ \setlength{\parindentlnth}{\parindent} -\newlength{\gcolumnposn} +\newlength{\gcolumnposn} % temporary hack because lstlisting does handle tabs correctly \newlength{\columnposn} \setlength{\gcolumnposn}{2.5in} @@ -63,6 +61,6 @@ %\patchcmd{\lsthk@TextStyle}{\let\lst@DefEsc\@empty}{}{}{\errmessage{failed to patch}} -\usepackage{pslatex} % reduce size of san serif font -\usepackage{relsize} % must be after change to small or selects old size +\usepackage{pslatex} % reduce size of san serif font +\usepackage{relsize} % must be after change to small or selects old size % reduce size of chapter/section titles @@ -120,12 +118,13 @@ % inline text and lowercase index: \Index{inline and lowercase index text} +\newcommand{\Index}{\@ifstar\@sIndex\@Index} % inline text and as-in index: \Index[as-is index text]{inline text} +\newcommand{\@Index}[2][\@empty]{\lowercase{\def\temp{#2}}#2\ifx#1\@empty\index{\temp}\else\index{#1@{\protect#2}}\fi} % inline text but index with different as-is text: \Index[index text]{inline text} -\newcommand{\Index}{\@ifstar\@sIndex\@Index} -\newcommand{\@Index}[2][\@empty]{\lowercase{\def\temp{#2}}#2\ifx#1\@empty\index{\temp}\else\index{#1@{\protect#2}}\fi} \newcommand{\@sIndex}[2][\@empty]{#2\ifx#1\@empty\index{#2}\else\index{#1@{\protect#2}}\fi} -% cannot use © +% inline text and code index (cannot use ©) \newcommand{\Indexc}[1]{\lstinline$#1$\index{#1@\lstinline$#1$}} +% code index (cannot use ©) \newcommand{\indexc}[1]{\index{#1@\lstinline$#1$}} @@ -137,4 +136,21 @@ \newcommand{\@newterm}[2][\@empty]{\lowercase{\def\temp{#2}}{\newtermFontInline{#2}}\ifx#1\@empty\index{\temp}\else\index{#1@{\protect#2}}\fi} \newcommand{\@snewterm}[2][\@empty]{{\newtermFontInline{#2}}\ifx#1\@empty\index{#2}\else\index{#1@{\protect#2}}\fi} + +% Latin abbreviation +\newcommand{\abbrevFont}{\textit} % set empty for no italics +\newcommand*{\eg}{% + \@ifnextchar{,}{\abbrevFont{e}.\abbrevFont{g}.}% + {\@ifnextchar{:}{\abbrevFont{e}.\abbrevFont{g}.}% + {\abbrevFont{e}.\abbrevFont{g}.,\xspace}}% +}% +\newcommand*{\ie}{% + \@ifnextchar{,}{\abbrevFont{i}.\abbrevFont{e}.}% + {\@ifnextchar{:}{\abbrevFont{i}.\abbrevFont{e}.}% + {\abbrevFont{i}.\abbrevFont{e}.,\xspace}}% +}% +\newcommand*{\etc}{% + \@ifnextchar{.}{\abbrevFont{etc}}% + {\abbrevFont{etc}.\xspace}% +}% \makeatother @@ -145,4 +161,5 @@ \endlist }% quote2 + \newenvironment{rationale}{% \begin{quote2}\noindent$\Box$\enspace @@ -188,5 +205,5 @@ \newcommand{\VPageref}[2][page]{\ifx#1\@empty\else{#1}\nobreakspace\fi\pageref{#2}} -% Go programming language +% Go programming language: https://github.com/julienc91/listings-golang/blob/master/listings-golang.sty \lstdefinelanguage{Golang}{ morekeywords=[1]{package,import,func,type,struct,return,defer,panic, recover,select,var,const,iota,},% @@ -204,9 +221,9 @@ } -% CFA programming language, based on ANSI C +% CFA programming language, based on ANSI C (with some gcc additions) \lstdefinelanguage{CFA}[ANSI]{C}{ morekeywords={_Alignas,_Alignof,__alignof,__alignof__,asm,__asm,__asm__,_At,_Atomic,__attribute,__attribute__,auto, _Bool,catch,catchResume,choose,_Complex,__complex,__complex__,__const,__const__,disable,dtype,enable,__extension__, - fallthru,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,_Noreturn,otype,restrict,_Static_assert, + fallthrough,fallthru,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,_Noreturn,otype,restrict,_Static_assert, _Thread_local,throw,throwResume,trait,try,typeof,__typeof,__typeof__,}, }% @@ -215,18 +232,18 @@ language=CFA, columns=fullflexible, -basicstyle=\linespread{0.9}\sf, -stringstyle=\tt, -tabsize=4, -xleftmargin=\parindentlnth, -extendedchars=true, -escapechar=§, -mathescape=true, -keepspaces=true, -showstringspaces=false, -showlines=true, -aboveskip=4pt, +basicstyle=\linespread{0.9}\sf, % reduce line spacing and use sanserif font +stringstyle=\tt, % use typewriter font +tabsize=4, % 4 space tabbing +xleftmargin=\parindentlnth, % indent code to paragraph indentation +extendedchars=true, % allow ASCII characters in the range 128-255 +escapechar=§, % escape to latex in CFA code +mathescape=true, % allow $...$ LaTeX math escapes in code +%keepspaces=true, % +showstringspaces=false, % do not show spaces with cup +showlines=true, % show blank lines at end of code +aboveskip=4pt, % spacing above/below code block belowskip=3pt, -moredelim=**[is][\color{red}]{®}{®}, % red highlighting -moredelim=**[is][\color{blue}]{ß}{ß}, % blue highlighting +moredelim=**[is][\color{red}]{®}{®}, % red highlighting +moredelim=**[is][\color{blue}]{ß}{ß}, % blue highlighting moredelim=**[is][\color{OliveGreen}]{¢}{¢}, % green highlighting moredelim=[is][\lstset{keywords={}}]{¶}{¶}, % temporarily turn off keywords @@ -242,18 +259,7 @@ \renewcommand\thebibliography[1]{ \Oldthebibliography{#1} - \setlength{\parskip}{0pt} % reduce vertical spacing between references + \setlength{\parskip}{0pt} % reduce vertical spacing between references \setlength{\itemsep}{5pt plus 0.3ex} }% - -\newcommand*{\eg}{\textit{e.g}.\@\xspace} -\newcommand*{\ie}{\textit{i.e}.\@\xspace} - -\makeatletter -\newcommand*{\etc}{% - \@ifnextchar{.}% - {\textit{etc}}% - {\textit{etc}.\@\xspace}% -} -\makeatother % Local Variables: % Index: doc/user/user.tex =================================================================== --- doc/user/user.tex (revision ac43954180f13a25ad6ec84de6b73da43f6f9223) +++ doc/user/user.tex (revision a14187f829cf56e146d93f0879351491f761a9bb) @@ -11,6 +11,6 @@ %% Created On : Wed Apr 6 14:53:29 2016 %% Last Modified By : Peter A. Buhr -%% Last Modified On : Wed Jul 13 08:14:39 2016 -%% Update Count : 1247 +%% Last Modified On : Tue Aug 2 17:39:02 2016 +%% Update Count : 1286 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -211,5 +211,5 @@ however, it largely extended the language, and did not address many existing problems.\footnote{% Two important existing problems addressed were changing the type of character literals from ©int© to ©char© and enumerator from ©int© to the type of its enumerators.} -\Index*{Fortran}~\cite{Fortran08}, \Index*{Ada}~\cite{Ada12}, and \Index*{Cobol}~\cite{Cobol14} are examples of programming languages that took an evolutionary approach, where modern language features (e.g., objects, concurrency) are added and problems fixed within the framework of the existing language. +\Index*{Fortran}~\cite{Fortran08}, \Index*{Ada}~\cite{Ada12}, and \Index*{Cobol}~\cite{Cobol14} are examples of programming languages that took an evolutionary approach, where modern language features (\eg objects, concurrency) are added and problems fixed within the framework of the existing language. \Index*{Java}~\cite{Java8}, \Index*{Go}~\cite{Go}, \Index*{Rust}~\cite{Rust} and \Index*{D}~\cite{D} are examples of the revolutionary approach for modernizing C/\CC, resulting in a new language rather than an extension of the descendent. These languages have different syntax and semantics from C, and do not interoperate directly with C, largely because of garbage collection. @@ -226,4 +226,5 @@ \section{Interoperability} +\label{s:Interoperability} \CFA is designed to integrate well with existing C programs and libraries. @@ -265,5 +266,5 @@ \section[Compiling CFA Program]{Compiling \CFA Program} -The command ©cfa© is used to compile \CFA program(s), and is based on the GNU \Indexc{gcc} command, e.g.: +The command ©cfa© is used to compile \CFA program(s), and is based on the GNU \Indexc{gcc} command, \eg: \begin{lstlisting} cfa§\indexc{cfa}\index{compilation!cfa@©cfa©}§ [ gcc-options ] C/§\CFA§-files [ assembler/loader-files ] @@ -314,4 +315,9 @@ The \CFA compilation message is printed at the beginning of a compilation. \textbf{This option is the default.} + +\item +\Indexc{-no-include-std}\index{compilation option!-no-include-std@©-no-include-std©} +Do not supply ©extern "C"© wrappers for \Celeven standard include files (see~\VRef{s:StandardHeaders}). +\textbf{This option is \emph{not} the default.} \end{description} @@ -350,5 +356,5 @@ \section{Underscores in Constants} -Numeric constants are extended to allow \Index{underscore}s within constants\index{constant!underscore}, e.g.: +Numeric constants are extended to allow \Index{underscore}s within constants\index{constant!underscore}, \eg: \begin{lstlisting} 2®_®147®_®483®_®648; §\C{// decimal constant}§ @@ -366,8 +372,8 @@ \begin{enumerate} \item -A sequence of underscores is disallowed, e.g., ©12__34© is invalid. +A sequence of underscores is disallowed, \eg ©12__34© is invalid. \item Underscores may only appear within a sequence of digits (regardless of the digit radix). -In other words, an underscore cannot start or end a sequence of digits, e.g., ©_1©, ©1_© and ©_1_© are invalid (actually, the 1st and 3rd examples are identifier names). +In other words, an underscore cannot start or end a sequence of digits, \eg ©_1©, ©1_© and ©_1_© are invalid (actually, the 1st and 3rd examples are identifier names). \item A numeric prefix may end with an underscore; @@ -498,5 +504,5 @@ \end{quote2} -All type qualifiers, e.g., ©const©, ©volatile©, etc., are used in the normal way with the new declarations and also appear left to right, e.g.: +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{tabular}{@{}l@{\hspace{1em}}l@{\hspace{1em}}l@{}} @@ -518,6 +524,6 @@ \end{tabular} \end{quote2} -All declaration qualifiers, e.g., ©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}} e.g.: +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{tabular}{@{}l@{\hspace{3em}}l@{\hspace{2em}}l@{}} @@ -542,5 +548,5 @@ Unsupported are K\&R C declarations where the base type defaults to ©int©, if no type is specified,\footnote{ At least one type specifier shall be given in the declaration specifiers in each declaration, and in the specifier-qualifier list in each structure declaration and type name~\cite[\S~6.7.2(2)]{C11}} -e.g.: +\eg: \begin{lstlisting} x; §\C{// int x}§ @@ -612,5 +618,5 @@ A \Index{pointer}/\Index{reference} is a generalization of a variable name, i.e., a mutable address that can point to more than one memory location during its lifetime. (Similarly, an integer variable can contain multiple integer literals during its lifetime versus an integer constant representing a single literal during its lifetime and may not occupy storage as 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, e.g.: +Hence, a pointer occupies memory to store its current address, and the pointer's value is loaded by dereferencing, \eg: \begin{quote2} \begin{tabular}{@{}ll@{}} @@ -669,5 +675,5 @@ Except for auto-dereferencing by the compiler, this reference example is the same as the previous pointer example. Hence, a reference behaves like the variable name for the current variable it is pointing-to. -The simplest way to understand a reference is to imagine the compiler inserting a dereference operator before the reference variable for each reference qualifier in a declaration, e.g.: +The simplest way to understand a reference is to imagine the compiler inserting a dereference operator before the reference variable for each reference qualifier in a declaration, \eg: \begin{lstlisting} r2 = ((r1 + r2) * (r3 - r1)) / (r3 - 15); @@ -677,5 +683,5 @@ ®*®r2 = ((®*®r1 + ®*®r2) ®*® (®**®r3 - ®*®r1)) / (®**®r3 - 15); \end{lstlisting} -When a reference operation appears beside a dereference operation, e.g., ©&*©, they cancel out.\footnote{ +When a reference operation appears beside a dereference operation, \eg ©&*©, they cancel out.\footnote{ The unary ©&© operator yields the address of its operand. If the operand has type ``type'', the result has type ``pointer to type''. @@ -721,9 +727,27 @@ ®&®crc = &cx; §\C{// error, cannot change crc}§ \end{lstlisting} -Hence, for type ©& const©, there is no pointer assignment, so ©&rc = &x© is disallowed, and \emph{the address value cannot be ©0© unless an arbitrary pointer is assigned to the reference}, e.g.: +Hence, for type ©& const©, there is no pointer assignment, so ©&rc = &x© is disallowed, and \emph{the address value cannot be ©0© unless an arbitrary pointer is assigned to the reference}, \eg: \begin{lstlisting} int & const r = *0; §\C{// where 0 is the int * zero}§ \end{lstlisting} Otherwise, the compiler is managing the addresses for type ©& const© not the programmer, and by a programming discipline of only using references with references, address errors can be prevented. +Finally, 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 attempt to address this issue: +\begin{quote2} +\begin{tabular}{@{}l@{\hspace{3em}}l@{}} +\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ +\begin{lstlisting} +®const® * ®const® * const int ccp; +®const® & ®const® & const int ccr; +\end{lstlisting} +& +\begin{lstlisting} +const int * ®const® * ®const® ccp; + +\end{lstlisting} +\end{tabular} +\end{quote2} +where the \CFA declaration is read left-to-right (see \VRef{s:Declarations}). \Index{Initialization} is different than \Index{assignment} because initialization occurs on the empty (uninitialized) storage on an object, while assignment occurs on possibly initialized storage of an object. @@ -785,5 +809,5 @@ \section{Type Operators} -The new declaration syntax can be used in other contexts where types are required, e.g., casts and the pseudo-routine ©sizeof©: +The new declaration syntax can be used in other contexts where types are required, \eg casts and the pseudo-routine ©sizeof©: \begin{quote2} \begin{tabular}{@{}l@{\hspace{3em}}l@{}} @@ -805,5 +829,5 @@ \CFA also supports a new syntax for routine definition, as well as ISO C and K\&R routine syntax. -The point of the new syntax is to allow returning multiple values from a routine~\cite{Galletly96,CLU}, e.g.: +The point of the new syntax is to allow returning multiple values from a routine~\cite{Galletly96,CLU}, \eg: \begin{lstlisting} ®[ int o1, int o2, char o3 ]® f( int i1, char i2, char i3 ) { @@ -817,5 +841,5 @@ \Index*{Michael Tiemann}, with help from \Index*{Doug Lea}, provided named return values in g++, circa 1989.} The value of each local return variable is automatically returned at routine termination. -Declaration qualifiers can only appear at the start of a routine definition, e.g.: +Declaration qualifiers can only appear at the start of a routine definition, \eg: \begin{lstlisting} ®extern® [ int x ] g( int y ) {§\,§} @@ -849,5 +873,5 @@ The inability to use \CFA declarations in these two contexts is probably a blessing because it precludes programmers from arbitrarily switching between declarations forms within a declaration contexts. -C-style declarations can be used to declare parameters for \CFA style routine definitions, e.g.: +C-style declarations can be used to declare parameters for \CFA style routine definitions, \eg: \begin{lstlisting} [ int ] f( * int, int * ); §\C{// returns an integer, accepts 2 pointers to integers}§ @@ -898,5 +922,5 @@ The syntax of the new routine prototype declaration follows directly from the new routine definition syntax; -as well, parameter names are optional, e.g.: +as well, parameter names are optional, \eg: \begin{lstlisting} [ int x ] f (); §\C{// returning int with no parameters}§ @@ -906,5 +930,5 @@ \end{lstlisting} This syntax allows a prototype declaration to be created by cutting and pasting source text from the routine definition header (or vice versa). -It is possible to declare multiple routine-prototypes in a single declaration, but the entire type specification is distributed across \emph{all} routine names in the declaration list (see~\VRef{s:Declarations}), e.g.: +It is possible to declare multiple routine-prototypes in a single declaration, but the entire type specification is distributed across \emph{all} routine names in the declaration list (see~\VRef{s:Declarations}), \eg: \begin{quote2} \begin{tabular}{@{}l@{\hspace{3em}}l@{}} @@ -919,5 +943,5 @@ \end{tabular} \end{quote2} -Declaration qualifiers can only appear at the start of a \CFA routine declaration,\footref{StorageClassSpecifier} e.g.: +Declaration qualifiers can only appear at the start of a \CFA routine declaration,\footref{StorageClassSpecifier} \eg: \begin{lstlisting} extern [ int ] f (int); @@ -928,5 +952,5 @@ \section{Routine Pointers} -The syntax for pointers to \CFA routines specifies the pointer name on the right, e.g.: +The syntax for pointers to \CFA routines specifies the pointer name on the right, \eg: \begin{lstlisting} * [ int x ] () fp; §\C{// pointer to routine returning int with no parameters}§ @@ -1046,5 +1070,5 @@ p( /* positional */, /* named */, . . . ); \end{lstlisting} -While it is possible to implement both approaches, the first possibly is more complex than the second, e.g.: +While it is possible to implement both approaches, the first possibly is more complex than the second, \eg: \begin{lstlisting} p( int x, int y, int z, . . . ); @@ -1056,5 +1080,5 @@ In the second call, the named arguments separate the positional and ellipse arguments, making it trivial to read the call. -The problem is exacerbated with default arguments, e.g.: +The problem is exacerbated with default arguments, \eg: \begin{lstlisting} void p( int x, int y = 2, int z = 3. . . ); @@ -1264,5 +1288,5 @@ As mentioned, tuples can appear in contexts requiring a list of value, such as an argument list of a routine call. -In unambiguous situations, the tuple brackets may be omitted, e.g., a tuple that appears as an argument may have its +In unambiguous situations, the tuple brackets may be omitted, \eg a tuple that appears as an argument may have its square brackets omitted for convenience; therefore, the following routine invocations are equivalent: \begin{lstlisting} @@ -1303,5 +1327,5 @@ Type qualifiers, i.e., const and volatile, may modify a tuple type. -The meaning is the same as for a type qualifier modifying an aggregate type [Int99, x 6.5.2.3(7),x 6.7.3(11)], i.e., the qualifier is distributed across all of the types in the tuple, e.g.: +The meaning is the same as for a type qualifier modifying an aggregate type [Int99, x 6.5.2.3(7),x 6.7.3(11)], i.e., the qualifier is distributed across all of the types in the tuple, \eg: \begin{lstlisting} const volatile [ int, float, const int ] x; @@ -1311,5 +1335,5 @@ [ const volatile int, const volatile float, const volatile int ] x; \end{lstlisting} -Declaration qualifiers can only appear at the start of a \CFA tuple declaration4, e.g.: +Declaration qualifiers can only appear at the start of a \CFA tuple declaration4, \eg: \begin{lstlisting} extern [ int, int ] w1; @@ -1319,5 +1343,5 @@ Unfortunately, C's syntax for subscripts precluded treating them as tuples. The C subscript list has the form ©[i][j]...© and not ©[i, j, ...]©. -Therefore, there is no syntactic way for a routine returning multiple values to specify the different subscript values, e.g., ©f[g()]© always means a single subscript value because there is only one set of brackets. +Therefore, there is no syntactic way for a routine returning multiple values to specify the different subscript values, \eg ©f[g()]© always means a single subscript value because there is only one set of brackets. Fixing this requires a major change to C because the syntactic form ©M[i, j, k]© already has a particular meaning: ©i, j, k© is a comma expression. \end{rationale} @@ -1380,5 +1404,5 @@ Clearly, the types of the entities being assigned must be type compatible with the value of the expression. -Mass assignment has parallel semantics, e.g., the statement: +Mass assignment has parallel semantics, \eg the statement: \begin{lstlisting} [ x, y, z ] = 1.5; @@ -1469,21 +1493,21 @@ \section{Unnamed Structure Fields} -C requires each field of a structure to have a name, except for a bit field associated with a basic type, e.g.: +C requires each field of a structure to have a name, except for a bit field associated with a basic type, \eg: \begin{lstlisting} struct { - int f1; // named field - int f2 : 4; // named field with bit field size - int : 3; // unnamed field for basic type with bit field size - int ; // disallowed, unnamed field - int *; // disallowed, unnamed field - int (*)(int); // disallowed, unnamed field + int f1; §\C{// named field}§ + int f2 : 4; §\C{// named field with bit field size}§ + int : 3; §\C{// unnamed field for basic type with bit field size}§ + int ; §\C{// disallowed, unnamed field}§ + int *; §\C{// disallowed, unnamed field}§ + int (*)(int); §\C{// disallowed, unnamed field}§ }; \end{lstlisting} This requirement is relaxed by making the field name optional for all field declarations; therefore, all the field declarations in the example are allowed. As for unnamed bit fields, an unnamed field is used for padding a structure to a particular size. -A list of unnamed fields is also supported, e.g.: +A list of unnamed fields is also supported, \eg: \begin{lstlisting} struct { - int , , ; // 3 unnamed fields + int , , ; §\C{// 3 unnamed fields}§ } \end{lstlisting} @@ -1498,5 +1522,5 @@ §\emph{expr}§ -> [ §\emph{fieldlist}§ ] \end{lstlisting} -\emph{expr} is any expression yielding a value of type record, e.g., ©struct©, ©union©. +\emph{expr} is any expression yielding a value of type record, \eg ©struct©, ©union©. Each element of \emph{ fieldlist} is an element of the record specified by \emph{expr}. A record-field tuple may be used anywhere a tuple can be used. An example of the use of a record-field tuple is @@ -1760,9 +1784,8 @@ } \end{lstlisting} -While the declaration of the local variable ©y© is useful and its scope is across all ©case© clauses, the initialization for such a variable is defined to never be executed because control always transfers over it. -Furthermore, any statements before the first ©case© clause can only be executed if labelled and transferred to using a ©goto©, either from outside or inside of the ©switch©. -As mentioned, transfer into control structures should be forbidden; -transfers from within the ©switch© body using a ©goto© are equally unpalatable. -As well, the declaration of ©z© is cannot occur after the ©case© because a label can only be attached to a statement, and without a fall through to case 3, ©z© is uninitialized. +While the declaration of the local variable ©y© is useful with a scope across all ©case© clauses, the initialization for such a variable is defined to never be executed because control always transfers over it. +Furthermore, any statements before the first ©case© clause can only be executed if labelled and transferred to using a ©goto©, either from outside or inside of the ©switch©, both of which are problematic. +As well, the declaration of ©z© cannot occur after the ©case© because a label can only be attached to a statement, and without a fall through to case 3, ©z© is uninitialized. +The key observation is that the ©switch© statement branches into control structure, i.e., there are multiple entry points into its statement body. \end{enumerate} @@ -1778,15 +1801,19 @@ and there is only a medium amount of fall-through from one ©case© clause to the next, and most of these result from a list of case values executing common code, rather than a sequence of case actions that compound. \end{itemize} -These observations help to put the suggested changes to the ©switch© into perspective. +These observations help to put the \CFA changes to the ©switch© into perspective. \begin{enumerate} \item Eliminating default fall-through has the greatest potential for affecting existing code. -However, even if fall-through is removed, most ©switch© statements would continue to work because of the explicit transfers already present at the end of each ©case© clause, the common placement of the ©default© clause at the end of the case list, and the most common use of fall-through, i.e., a list of ©case© clauses executing common code, e.g.: -\begin{lstlisting} +However, even if fall-through is removed, most ©switch© statements would continue to work because of the explicit transfers already present at the end of each ©case© clause, the common placement of the ©default© clause at the end of the case list, and the most common use of fall-through, i.e., a list of ©case© clauses executing common code, \eg: + \begin{lstlisting} case 1: case 2: case 3: ... \end{lstlisting} still work. Nevertheless, reversing the default action would have a non-trivial effect on case actions that compound, such as the above example of processing shell arguments. -Therefore, to preserve backwards compatibility, it is necessary to introduce a new kind of ©switch© statement, called ©choose©, with no implicit fall-through semantics and an explicit fall-through if the last statement of a case-clause ends with the new keyword ©fallthru©, e.g.: +<<<<<<< HEAD +Therefore, to preserve backwards compatibility, it is necessary to introduce a new kind of ©switch© statement, called ©choose©, with no implicit fall-through semantics and an explicit fall-through if the last statement of a case-clause ends with the new keyword ©fallthru©, \eg: +======= +Therefore, to preserve backwards compatibility, it is necessary to introduce a new kind of ©switch© statement, called ©choose©, with no implicit fall-through semantics and an explicit fall-through if the last statement of a case-clause ends with the new keyword ©fallthrough©/©fallthru©, e.g.: +>>>>>>> 080615890f586cb9954c252b55cab47f52c25758 \begin{lstlisting} ®choose® ( i ) { @@ -1815,16 +1842,16 @@ Therefore, no change is made for this issue. \item -Dealing with unreachable code in a ©switch©/©choose© body is solved by restricting declarations and associated initialization to the start of statement body, which is executed \emph{before} the transfer to the appropriate ©case© clause.\footnote{ -Essentially, these declarations are hoisted before the statement and both declarations and statement are surrounded by a compound statement.} and precluding statements before the first ©case© clause. -Further declaration in the statement body are disallowed. +Dealing with unreachable code in a ©switch©/©choose© body is solved by restricting declarations and associated initialization to the start of statement body, which is executed \emph{before} the transfer to the appropriate ©case© clause\footnote{ +Essentially, these declarations are hoisted before the ©switch©/©choose© statement and both declarations and statement are surrounded by a compound statement.} and precluding statements before the first ©case© clause. +Further declarations at the same nesting level as the statement body are disallowed to ensure every transfer into the body is sound. \begin{lstlisting} switch ( x ) { - ®int i = 0;® §\C{// allowed}§ + ®int i = 0;® §\C{// allowed only at start}§ case 0: ... - ®int i = 0;® §\C{// disallowed}§ + ®int j = 0;® §\C{// disallowed}§ case 1: { - ®int i = 0;® §\C{// allowed in any compound statement}§ + ®int k = 0;® §\C{// allowed at different nesting levels}§ ... } @@ -2707,6 +2734,6 @@ Like the \Index*[C++]{\CC} lexical problem with closing template-syntax, e.g, ©Foo>®©, this issue can be solved with a more powerful lexer/parser. -There are several ambiguous cases with operator identifiers, e.g., ©int *?*?()©, where the string ©*?*?© can be lexed as ©*©/©?*?© or ©*?©/©*?©. -Since it is common practise to put a unary operator juxtaposed to an identifier, e.g., ©*i©, users will be annoyed if they cannot do this with respect to operator identifiers. +There are several ambiguous cases with operator identifiers, \eg ©int *?*?()©, where the string ©*?*?© can be lexed as ©*©/©?*?© or ©*?©/©*?©. +Since it is common practise to put a unary operator juxtaposed to an identifier, \eg ©*i©, users will be annoyed if they cannot do this with respect to operator identifiers. Even with this special hack, there are 5 general cases that cannot be handled. The first case is for the function-call identifier ©?()©: @@ -2773,5 +2800,5 @@ This means that a function requiring mutual exclusion could block if the lock is already held by another thread. Blocking on a monitor lock does not block the kernel thread, it simply blocks the user thread, which yields its kernel thread while waiting to obtain the lock. -If multiple mutex parameters are specified, they will be locked in parameter order (i.e. first parameter is locked first) and unlocked in the +If multiple mutex parameters are specified, they will be locked in parameter order (\ie first parameter is locked first) and unlocked in the reverse order. \begin{lstlisting} @@ -4342,4 +4369,52 @@ +\section{New Keywords} +\label{s:NewKeywords} + +\begin{quote2} +\begin{tabular}{ll} +©catch© & ©lvalue© \\ +©catchResume© & \\ +©choose© & ©otype© \\ + & \\ +©disable© & ©throw© \\ +©dtype© & ©throwResume© \\ + & ©trait© \\ +©enable© & ©try© \\ + & \\ +©fallthrough© \\ +©fallthru© \\ +©finally© \\ +©forall© \\ +©ftype© \\ +\end{tabular} +\end{quote2} + + +\section{Standard Headers} +\label{s:StandardHeaders} + +C prescribes the following standard header-files: +\begin{quote2} +\begin{minipage}{\linewidth} +\begin{tabular}{lll} +assert.h & math.h & stdlib.h \\ +complex.h & setjmp.h & stdnoreturn.h \\ +ctype.h & signal.h & string.h \\ +errno.h & stdalign.h & tgmath.h \\ +fenv.h & stdarg.h & threads.h \\ +float.h & stdatomic.h & time.h \\ +inttypes.h & stdbool.h & uchar.h \\ +iso646.h & stddef.h & wchar.h \\ +limits.h & stdint.h & wctype.h \\ +locale.h & stdio.h & unistd.h\footnote{\CFA extension} +\end{tabular} +\end{minipage} +\end{quote2} +For the prescribed head-files, \CFA implicit wraps their includes in an ©extern "C"©; +hence, names in these include files are not mangled\index{mangling!name} (see~\VRef{s:Interoperability}). +All other C header files must be explicitly wrapped in ©extern "C"© to prevent name mangling. + + \section{Incompatible} @@ -4349,5 +4424,5 @@ \item \begin{description} -\item[Change:] add new keywords \\ +\item[Change:] add new keywords (see~\VRef{s:NewKeywords}) \\ New keywords are added to \CFA. \item[Rationale:] keywords added to implement new semantics of \CFA. @@ -4447,5 +4522,5 @@ \begin{description} \item[Change:] have ©struct© introduce a scope for nested types -In C, the name of the nested types belongs to the same scope as the name of the outermost enclosing +In C, the name of the nested types belongs to the same scope as the name of the outermost enclosing Example: \begin{lstlisting} @@ -4471,5 +4546,5 @@ \CFA is C \emph{incompatible} on this issue, and provides semantics similar to \Index*[C++]{\CC}. Nested types are not hoisted and can be referenced using the field selection operator ``©.©'', unlike the \CC scope-resolution operator ``©::©''. -Given that nested types in C are equivalent to not using them, i.e., they are essentially useless, it is unlikely there are any realistic usages that break because of this incompatibility. +Given that nested types in C are equivalent to not using them, \ie they are essentially useless, it is unlikely there are any realistic usages that break because of this incompatibility. \end{description} @@ -4570,5 +4645,6 @@ %$ \begin{lstlisting}[mathescape=off] -sout | "x (" | 1 | "x [" | 2 | "x {" | 3 | "x $" | 4 | "x £" | 5 | "x ¥" | 6 | "x ¡" | 7 | "x ¿" | 8 | "x «" | 9 | endl; +sout | "x (" | 1 | "x [" | 2 | "x {" | 3 | "x $" | 4 | "x £" | 5 | "x ¥" | 6 | "x ¡" | 7 + | "x ¿" | 8 | "x «" | 9 | endl; \end{lstlisting} %$ @@ -4580,6 +4656,6 @@ A seperator does not appear after a C string ending with the (extended) \Index{ASCII}\index{ASCII!extended} characters: ©,.:;!?)]}%¢»© \begin{lstlisting}[belowskip=0pt] -sout | 1 | ", x" | 2 | ". x" | 3 | ": x" | 4 | "; x" | 5 | "! x" | 6 | "? x" | 7 | ") x" | 8 | "] x" | 9 | "} x" - | 10 | "% x" | 11 | "¢ x" | 12 | "» x" | endl; +sout | 1 | ", x" | 2 | ". x" | 3 | ": x" | 4 | "; x" | 5 | "! x" | 6 | "? x" | 7 + | ") x" | 8 | "] x" | 9 | "} x" | 10 | "% x" | 11 | "¢ x" | 12 | "» x" | endl; \end{lstlisting} \begin{lstlisting}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt] @@ -4597,5 +4673,5 @@ The following \CC-style \Index{manipulator}s allow further control over implicit seperation. \begin{lstlisting}[mathescape=off,belowskip=0pt] -sout | sepOn | 1 | 2 | 3 | sepOn | endl; // separator at start of line +sout | sepOn | 1 | 2 | 3 | sepOn | endl; §\C{// separator at start of line}§ \end{lstlisting} \begin{lstlisting}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt] @@ -4603,5 +4679,5 @@ \end{lstlisting} \begin{lstlisting}[mathescape=off,aboveskip=0pt,belowskip=0pt] -sout | 1 | sepOff | 2 | 3 | endl; // turn off implicit separator temporarily +sout | 1 | sepOff | 2 | 3 | endl; §\C{// turn off implicit separator temporarily}§ \end{lstlisting} \begin{lstlisting}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt] @@ -4609,5 +4685,5 @@ \end{lstlisting} \begin{lstlisting}[mathescape=off,aboveskip=0pt,belowskip=0pt] -sout | sepDisable | 1 | 2 | 3 | endl; // turn off implicit separation, affects all subsequent prints +sout | sepDisable | 1 | 2 | 3 | endl; §\C{// turn off implicit separation, affects all subsequent prints}§ \end{lstlisting} \begin{lstlisting}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt] @@ -4615,5 +4691,5 @@ \end{lstlisting} \begin{lstlisting}[mathescape=off,aboveskip=0pt,belowskip=0pt] -sout | 1 | sepOn | 2 | 3 | endl; // turn on implicit separator temporarily +sout | 1 | sepOn | 2 | 3 | endl; §\C{// turn on implicit separator temporarily}§ \end{lstlisting} \begin{lstlisting}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt] @@ -4621,5 +4697,5 @@ \end{lstlisting} \begin{lstlisting}[mathescape=off,aboveskip=0pt,belowskip=0pt] -sout | sepEnable | 1 | 2 | 3 | endl; // turn on implicit separation, affects all subsequent prints +sout | sepEnable | 1 | 2 | 3 | endl; §\C{// turn on implicit separation, affects all subsequent prints}§ \end{lstlisting} \begin{lstlisting}[mathescape=off,showspaces=true,aboveskip=0pt,belowskip=0pt] @@ -4627,5 +4703,5 @@ \end{lstlisting} \begin{lstlisting}[mathescape=off,aboveskip=0pt,aboveskip=0pt,belowskip=0pt] -sepSet( sout, ", $" ); // change separator from " " to ", $" +sepSet( sout, ", $" ); §\C{// change separator from " " to ", \$"}§ sout | 1 | 2 | 3 | endl; \end{lstlisting} @@ -5162,5 +5238,5 @@ \label{s:RationalNumbers} -Rational numbers are numbers written as a ratio, i.e., as a fraction, where the numerator (top number) and the denominator (bottom number) are whole numbers. +Rational numbers are numbers written as a ratio, \ie as a fraction, where the numerator (top number) and the denominator (bottom number) are whole numbers. When creating and computing with rational numbers, results are constantly reduced to keep the numerator and denominator as small as possible. Index: src/CodeGen/CodeGenerator.cc =================================================================== --- src/CodeGen/CodeGenerator.cc (revision ac43954180f13a25ad6ec84de6b73da43f6f9223) +++ src/CodeGen/CodeGenerator.cc (revision a14187f829cf56e146d93f0879351491f761a9bb) @@ -9,7 +9,7 @@ // Author : Richard C. Bilson // Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Fri Jul 15 15:53:15 2016 -// Update Count : 306 +// Last Modified By : +// Last Modified On : Sun Jul 31 08:42:18 2016 +// Update Count : 345 // @@ -45,5 +45,5 @@ bool wantSpacing( Statement * stmt) { return dynamic_cast< IfStmt * >( stmt ) || dynamic_cast< CompoundStmt * >( stmt ) || - dynamic_cast< WhileStmt * >( stmt ) || dynamic_cast< ForStmt * > ( stmt ) || dynamic_cast< SwitchStmt *>( stmt ); + dynamic_cast< WhileStmt * >( stmt ) || dynamic_cast< ForStmt * >( stmt ) || dynamic_cast< SwitchStmt *>( stmt ); } @@ -83,5 +83,5 @@ } - CodeGenerator::CodeGenerator( std::ostream &os ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ) { } + CodeGenerator::CodeGenerator( std::ostream &os ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ) {} CodeGenerator::CodeGenerator( std::ostream &os, std::string init, int indentation, bool infunp ) @@ -155,4 +155,5 @@ objectDecl->get_init()->accept( *this ); } // if + if ( objectDecl->get_bitfieldWidth() ) { output << ":"; @@ -172,9 +173,9 @@ cur_indent += CodeGenerator::tabsize; - for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end(); i++) { + for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end(); i++ ) { output << indent; (*i)->accept( *this ); output << ";" << endl; - } + } // for cur_indent -= CodeGenerator::tabsize; @@ -257,6 +258,6 @@ (*iter)->accept( *this ); output << "]"; - } - } + } // if + } // for output << " = "; } @@ -317,5 +318,5 @@ // do nothing ; - } + } // switch switch ( opInfo.type ) { @@ -385,5 +386,5 @@ // there are no intrinsic definitions of 0/1 or label addresses as functions assert( false ); - } + } // switch } else { varExpr->accept( *this ); @@ -417,5 +418,4 @@ case OT_CALL: assert( false ); - case OT_CTOR: @@ -437,5 +437,5 @@ // no constructors with 0 or more than 2 parameters assert( false ); - } + } // if break; @@ -470,10 +470,17 @@ // there are no intrinsic definitions of 0 or 1 as functions assert( false ); - } + } // switch } else { - nameExpr->accept( *this ); - output << "("; - genCommaList( untypedExpr->get_args().begin(), untypedExpr->get_args().end() ); - output << ")"; + if ( nameExpr->get_name() == "Range" ) { // case V1 ... V2 or case V1~V2 + assert( untypedExpr->get_args().size() == 2 ); + (*untypedExpr->get_args().begin())->accept( *this ); + output << " ... "; + (*--untypedExpr->get_args().end())->accept( *this ); + } else { // builtin routines + nameExpr->accept( *this ); + output << "("; + genCommaList( untypedExpr->get_args().begin(), untypedExpr->get_args().end() ); + output << ")"; + } // if } // if } else { @@ -521,5 +528,5 @@ // otherwise, the cast is to an lvalue type, so the cast should be dropped, since the result of a cast is // never an lvalue in C - } + } // if castExpr->get_arg()->accept( *this ); output << ")"; @@ -654,5 +661,5 @@ if ( wantSpacing( *i ) ) { output << endl; - } + } // if } cur_indent -= CodeGenerator::tabsize; @@ -737,5 +744,5 @@ (*i)->accept( *this ); output << endl; - } + } // for cur_indent -= CodeGenerator::tabsize; } @@ -759,5 +766,5 @@ output << "continue"; break; - } + } // switch output << ";"; } @@ -798,5 +805,5 @@ if ( forStmt->get_condition() != 0 ) { forStmt->get_condition()->accept( *this ); - } + } // if output << ";"; @@ -805,5 +812,5 @@ Expression * expr = new CastExpr( forStmt->get_increment() ); expr->accept( *this ); - } + } // if output << ") "; Index: src/CodeGen/CodeGenerator.h =================================================================== --- src/CodeGen/CodeGenerator.h (revision ac43954180f13a25ad6ec84de6b73da43f6f9223) +++ src/CodeGen/CodeGenerator.h (revision a14187f829cf56e146d93f0879351491f761a9bb) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Mon Jul 4 17:12:40 2016 -// Update Count : 34 +// Last Modified On : Sat Jul 30 11:10:42 2016 +// Update Count : 37 // @@ -118,5 +118,5 @@ void handleAggregate( AggregateDecl *aggDecl ); void handleTypedef( NamedTypeDecl *namedType ); - }; + }; // CodeGenerator template< class Iterator > Index: src/ControlStruct/CaseRangeMutator.cc =================================================================== --- src/ControlStruct/CaseRangeMutator.cc (revision ac43954180f13a25ad6ec84de6b73da43f6f9223) +++ src/ControlStruct/CaseRangeMutator.cc (revision a14187f829cf56e146d93f0879351491f761a9bb) @@ -9,7 +9,7 @@ // Author : Rodolfo G. Esteves // Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Tue Jul 12 17:35:13 2016 -// Update Count : 9 +// Last Modified By : +// Last Modified On : Sun Jul 31 12:16:28 2016 +// Update Count : 32 // @@ -34,27 +34,28 @@ std::list< Statement * >::iterator i = cases.begin(); while ( i != cases.end() ) { - (*i )->acceptMutator( *this ); + (*i)->acceptMutator( *this ); if ( ! newCaseLabels.empty() ) { + std::cout << "FRED" << std::endl; std::list< Statement * > newCases; // transform( newCaseLabels.begin(), newCaseLabels.end(), bnd1st( ptr_fun( ctor< CaseStmt, Label, Expression * > ) ) ); - for ( std::list< Expression * >::iterator j = newCaseLabels.begin(); - j != newCaseLabels.end(); j++ ) { - std::list