Index: Jenkins/FullBuild =================================================================== --- Jenkins/FullBuild (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ Jenkins/FullBuild (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -25,5 +25,8 @@ gcc_08_x64_new: { trigger_build( 'gcc-8', 'x64', false ) }, gcc_07_x64_new: { trigger_build( 'gcc-7', 'x64', false ) }, - // gcc_06_x64_new: { trigger_build( 'gcc-6', 'x64', false ) }, + gcc_11_arm64_new: { trigger_build( 'gcc-11', 'arm64', false ) }, + gcc_10_arm64_new: { trigger_build( 'gcc-10', 'arm64', false ) }, + gcc_09_arm64_new: { trigger_build( 'gcc-9', 'arm64', false ) }, + // gcc_06_arm64_new: { trigger_build( 'gcc-6', 'arm64', false ) }, clang_x64_new: { trigger_build( 'clang', 'x64', true ) }, ) Index: Jenkins/TestRegen =================================================================== --- Jenkins/TestRegen (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ Jenkins/TestRegen (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -24,4 +24,8 @@ stage('Building x64') { regen_tests('x86_64') + } + + stage('Building arm64') { + regen_tests('arm64') } Index: Jenkinsfile =================================================================== --- Jenkinsfile (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ Jenkinsfile (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -327,4 +327,7 @@ case 'x86': this.Architecture = new Arch_Desc('x86', '--host=i386', 'x86') + break + case 'arm64': + this.Architecture = new Arch_Desc('arm64', '--host=aarch64', 'arm64') break default : @@ -377,5 +380,5 @@ description: 'The target architecture', \ name: 'Architecture', \ - choices: 'x64\nx86', \ + choices: 'x64\nx86\narm64', \ defaultValue: 'x64', \ ], \ Index: doc/LaTeXmacros/common.sty =================================================================== --- doc/LaTeXmacros/common.sty (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ doc/LaTeXmacros/common.sty (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -11,6 +11,6 @@ %% Created On : Sat Apr 9 10:06:17 2016 %% Last Modified By : Peter A. Buhr -%% Last Modified On : Sun Jul 16 08:28:52 2023 -%% Update Count : 586 +%% Last Modified On : Fri Sep 29 16:48:59 2023 +%% Update Count : 587 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -272,4 +272,5 @@ \setlength{\gcolumnposn}{2.75in} \setlength{\columnposn}{\gcolumnposn} +\newcommand{\setgcolumn}[1]{\global\gcolumnposn=#1\global\columnposn=\gcolumnposn} \newcommand{\C}[2][\@empty]{\ifx#1\@empty\else\global\setlength{\columnposn}{#1}\global\columnposn=\columnposn\fi\hfill\makebox[\textwidth-\columnposn][l]{\lst@basicstyle{\LstCommentStyle{#2}}}} \newcommand{\CRT}{\global\columnposn=\gcolumnposn} @@ -302,5 +303,5 @@ literate= {-}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.75ex}{0.1ex}}}}1 - {^}{\raisebox{0.6ex}{$\scriptscriptstyle\land\,$}}1 + {^}{\raisebox{0.6ex}{$\scriptstyle\land\,$}}1 {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 {`}{\ttfamily\upshape\hspace*{-0.3ex}`}1 Index: doc/LaTeXmacros/common.tex =================================================================== --- doc/LaTeXmacros/common.tex (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ doc/LaTeXmacros/common.tex (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -11,6 +11,6 @@ %% Created On : Sat Apr 9 10:06:17 2016 %% Last Modified By : Peter A. Buhr -%% Last Modified On : Fri Jul 21 09:02:00 2023 -%% Update Count : 576 +%% Last Modified On : Fri Sep 29 16:49:02 2023 +%% Update Count : 590 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -275,4 +275,5 @@ \setlength{\gcolumnposn}{2.75in} \setlength{\columnposn}{\gcolumnposn} +\newcommand{\setgcolumn}[1]{\global\gcolumnposn=#1\global\columnposn=\gcolumnposn} \newcommand{\C}[2][\@empty]{\ifx#1\@empty\else\global\setlength{\columnposn}{#1}\global\columnposn=\columnposn\fi\hfill\makebox[\textwidth-\columnposn][l]{\lst@basicstyle{\LstCommentStyle{#2}}}} \newcommand{\CRT}{\global\columnposn=\gcolumnposn} @@ -301,10 +302,10 @@ showlines=true, % show blank lines at end of code aboveskip=4pt, % spacing above/below code block -belowskip=0pt, +belowskip=2pt, numberstyle=\footnotesize\sf, % numbering style % replace/adjust listing characters that look bad in sanserif literate= {-}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.75ex}{0.1ex}}}}1 - {^}{\raisebox{0.6ex}{$\scriptscriptstyle\land\,$}}1 + {^}{\raisebox{0.6ex}{$\scriptstyle\land\,$}}1 {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 {`}{\ttfamily\upshape\hspace*{-0.3ex}`}1 Index: doc/LaTeXmacros/lstlang.sty =================================================================== --- doc/LaTeXmacros/lstlang.sty (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ doc/LaTeXmacros/lstlang.sty (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -8,6 +8,6 @@ %% Created On : Sat May 13 16:34:42 2017 %% Last Modified By : Peter A. Buhr -%% Last Modified On : Tue May 2 08:52:35 2023 -%% Update Count : 30 +%% Last Modified On : Thu Sep 21 08:40:05 2023 +%% Update Count : 31 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -134,5 +134,5 @@ morekeywords={ _Accept, _AcceptReturn, _AcceptWait, _Actor, _At, _Catch, _CatchResume, _CorActor, _Cormonitor, _Coroutine, - _Disable, _Else, _Enable, _Event, _Finally, _Monitor, _Mutex, _Nomutex, _PeriodicTask, _RealTimeTask, + _Disable, _Else, _Enable, _Event, _Exception, _Finally, _Monitor, _Mutex, _Nomutex, _PeriodicTask, _RealTimeTask, _Resume, _ResumeTop, _Select, _SporadicTask, _Task, _Timeout, _When, _With, _Throw}, } Index: doc/bibliography/pl.bib =================================================================== --- doc/bibliography/pl.bib (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ doc/bibliography/pl.bib (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -4113,6 +4113,7 @@ title = {High-Performance Extended Actors}, journal = spe, - year = 2022, - note = {submitted July 2022}, + year = 2023, + month = sep, + note = {\url{https://onlinelibrary.wiley.com/doi/pdf/10.1002/spe.3262}} } Index: doc/user/user.tex =================================================================== --- doc/user/user.tex (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ doc/user/user.tex (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -11,6 +11,6 @@ %% Created On : Wed Apr 6 14:53:29 2016 %% Last Modified By : Peter A. Buhr -%% Last Modified On : Thu Aug 10 21:24:07 2023 -%% Update Count : 5570 +%% Last Modified On : Sat Sep 30 22:46:19 2023 +%% Update Count : 5658 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -65,6 +65,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\setlength{\gcolumnposn}{3in} \CFAStyle % use default CFA format-style +\setgcolumn{2.25in} %\lstset{language=CFA} % CFA default lnaguage \lstnewenvironment{C++}[1][] % use C++ style @@ -224,9 +224,9 @@ \setlength{\tabcolsep}{10pt} \begin{tabular}{@{}rcccccccc@{}} - & 2021 & 2016 & 2011 & 2006 & 2001 & 1996 & 1991 & 1986 \\ \hline -\RB{C} & \RB{1}& \RB{2}& \RB{2}& \RB{1}& \RB{1}& \RB{1}& \RB{1}& \RB{1}\\ -Java & 2 & 1 & 1 & 2 & 3 & 28 & - & - \\ -Python & 3 & 5 & 6 & 7 & 23 & 13 & - & - \\ -\CC & 4 & 3 & 3 & 3 & 2 & 2 & 2 & 8 \\ + & 2023 & 2018 & 2013 & 2008 & 2003 & 1998 & 1993 & 1988 \\ \hline +Python & 1 & 4 & 8 & 7 & 12 & 25 & 18 & - \\ +\RB{C} & \RB{2}& \RB{2}& \RB{1}& \RB{2}& \RB{2}& \RB{1}& \RB{1}& \RB{1}\\ +C++ & 3 & 3 & 4 & 4 & 3 & 2 & 2 & 4 \\ +Java & 4 & 1 & 2 & 1 & 1 & 18 & - & - \\ \end{tabular} \end{center} @@ -465,4 +465,6 @@ \Indexc{-h}\index{translator option!-h@{©-h©}}, \Indexc{--help}\index{translator option!--help@{©--help©}} \, print translator help message \item +\Indexc{-i}\index{translator option!-i@{©-i©}}, \Indexc{--invariant}\index{translator option!--invariant@{©--invariant©}} \, invariant checking during AST passes +\item \Indexc{-l}\index{translator option!-l@{©-l©}}, \Indexc{--libcfa}\index{translator option!--libcfa@{©--libcfa©}} \, generate ©libcfa.c© \item @@ -482,11 +484,11 @@ \begin{description}[topsep=0pt,itemsep=0pt,parsep=0pt] \item -\Indexc{ascodegen}\index{translator option!-P@{©-P©}!©ascodegen©}\index{translator option!--print@{©-print©}!©ascodegen©} \, as codegen rather than AST -\item -\Indexc{asterr}\index{translator option!-P@{©-P©}!©asterr©}\index{translator option!--print@{©-print©}!©asterr©} \, AST on error -\item -\Indexc{declstats}\index{translator option!-P@{©-P©}!©declstats©}\index{translator option!--print@{©-print©}!©declstats©} \, code property statistics -\item -\Indexc{parse}\index{translator option!-P@{©-P©}!©parse©}\index{translator option!--print@{©-print©}!©parse©} \, yacc (parsing) debug information +\Indexc{ascodegen}\index{translator option!-P@{©-P©}!©ascodegen©}\index{translator option!--print@{©-print©}!©ascodegen©} \, print AST as codegen rather than AST +\item +\Indexc{asterr}\index{translator option!-P@{©-P©}!©asterr©}\index{translator option!--print@{©-print©}!©asterr©} \, print AST on error +\item +\Indexc{declstats}\index{translator option!-P@{©-P©}!©declstats©}\index{translator option!--print@{©-print©}!©declstats©} \, print code property statistics +\item +\Indexc{parse}\index{translator option!-P@{©-P©}!©parse©}\index{translator option!--print@{©-print©}!©parse©} \, print yacc (parsing) debug information \item \Indexc{pretty}\index{translator option!-P@{©-P©}!©pretty©}\index{translator option!--print@{©-print©}!©pretty©} \, prettyprint for ©ascodegen© flag @@ -494,29 +496,29 @@ \Indexc{rproto}\index{translator option!-P@{©-P©}!©rproto©}\index{translator option!--print@{©-print©}!©rproto©} \, resolver-proto instance \item -\Indexc{rsteps}\index{translator option!-P@{©-P©}!©rsteps©}\index{translator option!--print@{©-print©}!©rsteps©} \, resolver steps -\item -\Indexc{tree}\index{translator option!-P@{©-P©}!©tree©}\index{translator option!--print@{©-print©}!©tree©} \, parse tree -\item -\Indexc{ast}\index{translator option!-P@{©-P©}!©ast©}\index{translator option!--print@{©-print©}!©ast©} \, AST after parsing -\item -\Indexc{symevt}\index{translator option!-P@{©-P©}!©symevt©}\index{translator option!--print@{©-print©}!©symevt©} \, symbol table events -\item -\Indexc{altexpr}\index{translator option!-P@{©-P©}!©altexpr©}\index{translator option!--print@{©-print©}!©altexpr©} \, alternatives for expressions -\item -\Indexc{astdecl}\index{translator option!-P@{©-P©}!©astdecl©}\index{translator option!--print@{©-print©}!©astdecl©} \, AST after declaration validation pass -\item -\Indexc{resolver}\index{translator option!-P@{©-P©}!©resolver©}\index{translator option!--print@{©-print©}!©resolver©} \, before resolver step -\item -\Indexc{astexpr}\index{translator option!-P@{©-P©}!©astexpr©}\index{translator option!--print@{©-print©}!©altexpr©} \, AST after expression analysis -\item -\Indexc{ctordtor}\index{translator option!-P@{©-P©}!©ctordtor©}\index{translator option!--print@{©-print©}!©ctordtor©} \, after ctor/dtor are replaced -\item -\Indexc{tuple}\index{translator option!-P@{©-P©}!©tuple©}\index{translator option!--print@{©-print©}!©tuple©} \, after tuple expansion -\item -\Indexc{astgen}\index{translator option!-P@{©-P©}!©astgen©}\index{translator option!--print@{©-print©}!©astgen©} \, AST after instantiate generics -\item -\Indexc{box}\index{translator option!-P@{©-P©}!©box©}\index{translator option!--print@{©-print©}!©box©} \, before box step -\item -\Indexc{codegen}\index{translator option!-P@{©-P©}!©codegen©}\index{translator option!--print@{©-print©}!©codegen©} \, before code generation +\Indexc{rsteps}\index{translator option!-P@{©-P©}!©rsteps©}\index{translator option!--print@{©-print©}!©rsteps©} \, print resolver steps +\item +\Indexc{ast}\index{translator option!-P@{©-P©}!©ast©}\index{translator option!--print@{©-print©}!©ast©} \, print AST after parsing +\item +\Indexc{excpdecl}\index{translator option!-P@{©-P©}!©excpdecl©}\index{translator option!--print@{©-print©}!©excpdecl©} \, print AST after translating exception decls +\item +\Indexc{symevt}\index{translator option!-P@{©-P©}!©symevt©}\index{translator option!--print@{©-print©}!©symevt©} \, print AST after symbol table events +\item +\Indexc{expralt}\index{translator option!-P@{©-P©}!©expralt©}\index{translator option!--print@{©-print©}!©expralt©} \, print AST after expressions alternatives +\item +\Indexc{valdecl}\index{translator option!-P@{©-P©}!©valdecl©}\index{translator option!--print@{©-print©}!©valdecl©} \, print AST after declaration validation pass +\item +\Indexc{bresolver}\index{translator option!-P@{©-P©}!©bresolver©}\index{translator option!--print@{©-print©}!©bresolver©} \, print AST before resolver step +\item +\Indexc{expranly}\index{translator option!-P@{©-P©}!©expranly©}\index{translator option!--print@{©-print©}!©expranly©} \, print AST after expression analysis +\item +\Indexc{ctordtor}\index{translator option!-P@{©-P©}!©ctordtor©}\index{translator option!--print@{©-print©}!©ctordtor©} \, print AST after ctor/dtor are replaced +\item +\Indexc{tuple}\index{translator option!-P@{©-P©}!©tuple©}\index{translator option!--print@{©-print©}!©tuple©} \, print AST after tuple expansion +\item +\Indexc{instgen}\index{translator option!-P@{©-P©}!©instgen©}\index{translator option!--print@{©-print©}!©instgen©} \, print AST after instantiate generics +\item +\Indexc{bbox}\index{translator option!-P@{©-P©}!©bbox©}\index{translator option!--print@{©-print©}!©bbox©} \, print AST before box pass +\item +\Indexc{bcodegen}\index{translator option!-P@{©-P©}!©bcodegen©}\index{translator option!--print@{©-print©}!©bcodegen©} \, print AST before code generation \end{description} \item @@ -535,5 +537,5 @@ Keyword clashes are accommodated by syntactic transformations using the \CFA backquote escape-mechanism: \begin{cfa} -int ®``®coroutine = 3; $\C{// make keyword an identifier}$ +int ®``®coroutine = 3; $\C{// make keyword an identifier}$ double ®``®forall = 3.5; \end{cfa} @@ -545,9 +547,9 @@ \begin{cfa} // include file uses the CFA keyword "with". -#if ! defined( with ) $\C{// nesting ?}$ -#define with ®``®with $\C{// make keyword an identifier}$ +#if ! defined( with ) $\C{// nesting ?}$ +#define with ®``®with $\C{// make keyword an identifier}$ #define __CFA_BFD_H__ #endif -$\R{\#include\_next} $ $\C{// must have internal check for multiple expansion}$ +$\R{\#include\_next} $ $\C{// must have internal check for multiple expansion}$ #if defined( with ) && defined( __CFA_BFD_H__ ) $\C{// reset only if set}$ #undef with @@ -564,13 +566,13 @@ Numeric constants are extended to allow \Index{underscore}s\index{constant!underscore} as a separator, \eg: \begin{cfa} -2®_®147®_®483®_®648; $\C{// decimal constant}$ -56®_®ul; $\C{// decimal unsigned long constant}$ -0®_®377; $\C{// octal constant}$ -0x®_®ff®_®ff; $\C{// hexadecimal constant}$ -0x®_®ef3d®_®aa5c; $\C{// hexadecimal 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}$ +2®_®147®_®483®_®648; $\C{// decimal constant}$ +56®_®ul; $\C{// decimal unsigned long constant}$ +0®_®377; $\C{// octal constant}$ +0x®_®ff®_®ff; $\C{// hexadecimal constant}$ +0x®_®ef3d®_®aa5c; $\C{// hexadecimal 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} @@ -602,10 +604,9 @@ There are exponentiation operators for integral and floating types, including the builtin \Index{complex} types. -Integral exponentiation\index{exponentiation!unsigned integral} is performed with repeated multiplication\footnote{The multiplication computation is $O(\log y)$.} (or shifting if the exponent is 2). +Integral exponentiation\index{exponentiation!unsigned integral} is performed with repeated multiplication ($O(\log y)$ multiplies or shifting if the exponent is 2). Overflow for a large exponent or negative exponent returns zero. Floating exponentiation\index{exponentiation!floating} is performed using \Index{logarithm}s\index{exponentiation!logarithm}, so the exponent cannot be negative. \begin{cfa} -sout | 1 ®\® 0 | 1 ®\® 1 | 2 ®\® 8 | -4 ®\® 3 | 5 ®\® 3 | 5 ®\® 32 | 5L ®\® 32 | 5L ®\® 64 | -4 ®\® -3 | -4.0 ®\® -3 | 4.0 ®\® 2.1 - | (1.0f+2.0fi) ®\® (3.0f+2.0fi); +sout | 1 ®\® 0 | 1 ®\® 1 | 2 ®\® 8 | -4 ®\® 3 | 5 ®\® 3 | 5 ®\® 32 | 5L ®\® 32 | 5L ®\® 64 | -4 ®\® -3 | -4.0 ®\® -3 | 4.0 ®\® 2.1 | (1.0f+2.0fi) ®\® (3.0f+2.0fi); 1 1 256 -64 125 ®0® 3273344365508751233 ®0® ®0® -0.015625 18.3791736799526 0.264715-1.1922i \end{cfa} @@ -620,5 +621,5 @@ T ?®\®?( T ep, unsigned long int y ); \end{cfa} -The user type ©T© must define multiplication, one (©1©), and ©*©. +A user type ©T© must define multiplication, one (©1©), and ©*©. @@ -634,10 +635,10 @@ Declarations in the \Indexc{do}-©while© condition are not useful because they appear after the loop body.} \begin{cfa} -if ( ®int x = f()® ) ... $\C{// x != 0}$ -if ( ®int x = f(), y = g()® ) ... $\C{// x != 0 \&\& y != 0}$ +if ( ®int x = f()® ) ... $\C{// x != 0}$ +if ( ®int x = f(), y = g()® ) ... $\C{// x != 0 \&\& y != 0}$ if ( ®int x = f(), y = g(); x < y® ) ... $\C{// relational expression}$ if ( ®struct S { int i; } x = { f() }; x.i < 4® ) $\C{// relational expression}$ -while ( ®int x = f()® ) ... $\C{// x != 0}$ +while ( ®int x = f()® ) ... $\C{// x != 0}$ while ( ®int x = f(), y = g()® ) ... $\C{// x != 0 \&\& y != 0}$ while ( ®int x = f(), y = g(); x < y® ) ... $\C{// relational expression}$ @@ -653,11 +654,20 @@ \label{s:caseClause} -C restricts the \Indexc{case} clause of a \Indexc{switch} statement to a single value. -For multiple ©case© clauses associated with the same statement, it is necessary to have multiple ©case© clauses rather than multiple values. +C restricts a \Indexc{case} clause in \Indexc{switch} statement to a single value. +For multiple ©case© clauses prefixing a statement within the ©switch© statement, it is necessary to have multiple ©case© clauses rather than multiple values. Requiring a ©case© clause for each value is not in the spirit of brevity normally associated with C. Therefore, the ©case© clause is extended with a list of values. \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}} \\ +\multicolumn{1}{c@{\hspace{3em}}}{\textbf{C}} & \multicolumn{1}{c@{\hspace{2em}}}{\textbf{\CFA}} \\ +\begin{cfa} +switch ( i ) { + case 1: case 3 : case 5: + ... + case 2: case 4 : case 6: + ... +} +\end{cfa} +& \begin{cfa} switch ( i ) { @@ -670,13 +680,4 @@ & \begin{cfa} -switch ( i ) { - case 1: case 3 : case 5: - ... - case 2: case 4 : case 6: - ... -} -\end{cfa} -& -\begin{cfa} // odd values @@ -688,15 +689,48 @@ \end{tabular} \end{cquote} -In addition, subranges are allowed to specify case values.\footnote{ -gcc has the same mechanism but awkward syntax, \lstinline{2 ...42}, because a space is required after a number, otherwise the period is a decimal point.} +In addition, subranges are allowed to specify case values. +\begin{cquote} +\begin{tabular}{@{}l@{\hspace{3em}}l@{\hspace{2em}}l@{\hspace{2em}}l@{}} +\multicolumn{1}{c@{\hspace{3em}}}{\textbf{C}} & \multicolumn{1}{c@{\hspace{2em}}}{\textbf{\CFA}} & \multicolumn{1}{c@{\hspace{2em}}}{\textbf{©gcc©}} \\ \begin{cfa} switch ( i ) { - case ®1~5:® $\C{// 1, 2, 3, 4, 5}$ + case 1: case 2: case 3: case 4: ... - case ®10~15:® $\C{// 10, 11, 12, 13, 14, 15}$ + case 10: case 11: case 12: case 13: ... } \end{cfa} -Lists of subranges are also allowed. +& +\begin{cfa} +switch ( i ) { + case ®1~4:® + ... + case ®10~13:® + ... +} +\end{cfa} +& +\begin{cfa} +switch ( i ) { + case 1$\R{\textvisiblespace}$®...®4: + ... + case 10$\R{\textvisiblespace}$®...®13: + ... +} +\end{cfa} +& +\begin{cfa} + +// 1, 2, 3, 4 + +// 10, 11, 12, 13 + + +\end{cfa} +\end{tabular} +\end{cquote} +While ©gcc© has the same range mechanism, it has an awkward syntax, ©2©\R{\textvisiblespace}©...42©, because a space is required after a number, otherwise the period is a decimal point. + +\CFA also allows lists of subranges. \begin{cfa} case ®1~5, 12~21, 35~42®: @@ -769,5 +803,5 @@ This situation is better handled by a list of case values \see{\VRef{s:caseClause}}. While fall-through itself is not a problem, the problem occurs when fall-through is the default, as this semantics is unintuitive to many programmers and is different from most programming languages with a ©switch© statement. -Hence, default fall-through semantics results in a large number of programming errors as programmers often \emph{forget} the ©break© statement at the end of a ©case© clause, resulting in inadvertent fall-through. +Hence, default fall-through semantics results in a many programming errors as programmers often \emph{forget} the ©break© statement at the end of a ©case© clause, resulting in inadvertent fall-through. \item @@ -846,5 +880,5 @@ 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 put into perspective the \CFA changes to the ©switch©. +These observations put into perspective the \CFA changes to the ©switch© statement. \begin{enumerate} \item @@ -888,13 +922,13 @@ \begin{cfa} switch ( x ) { - ®int i = 0;® $\C{// allowed only at start}$ + ®int i = 0;® $\C{// allowed only at start}$ case 0: ... - ®int j = 0;® $\C{// disallowed}$ + ®int j = 0;® $\C{// disallowed}$ case 1: { - ®int k = 0;® $\C{// allowed at different nesting levels}$ + ®int k = 0;® $\C{// allowed at different nesting levels}$ ... - ®case 2:® $\C{// disallow case in nested statements}$ + ®case 2:® $\C{// disallow case in nested statements}$ } ... @@ -907,5 +941,5 @@ The \Indexc{fallthrough} clause may be non-terminating within a \Indexc{case} clause or have a target label to common code from multiple case clauses. -\begin{center} +\begin{cquote} \begin{tabular}{@{}lll@{}} \begin{cfa} @@ -957,5 +991,5 @@ \end{cfa} \end{tabular} -\end{center} +\end{cquote} The target label must be below the \Indexc{fallthrough} and may not be nested in a control structure, and the target label must be at the same or higher level as the containing \Indexc{case} clause and located at @@ -964,6 +998,6 @@ \begin{figure} -\begin{tabular}{@{}l@{\hspace{40pt}}|l@{}} -\multicolumn{1}{@{}c@{\hspace{40pt}}|}{loop control} & \multicolumn{1}{c@{}}{output} \\ +\begin{tabular}{@{}l@{\hspace{50pt}}|l@{}} +\multicolumn{1}{@{}c@{\hspace{50pt}}|}{loop control} & \multicolumn{1}{c@{}}{output} \\ \hline \begin{cfa} @@ -1083,7 +1117,7 @@ The \Indexc{for}, \Indexc{while}, and \Indexc{do} loop-control allow an empty conditional, which implies a comparison value of ©1© (true). \begin{cfa} -while ( ®/*empty*/® ) $\C{// while ( true )}$ -for ( ®/*empty*/® ) $\C{// for ( ; true; )}$ -do ... while ( ®/*empty*/® ) $\C{// do ... while ( true )}$ +while ( ®/* empty */® ) $\C{// while ( true )}$ +for ( ®/* empty */® ) $\C{// for ( ; true; )}$ +do ... while ( ®/* empty */® ) $\C{// do ... while ( true )}$ \end{cfa} @@ -1115,7 +1149,7 @@ If no type is specified for the loop index, it is the type of the high value H (when the low value is implicit) or the low value L. \begin{cfa} -for ( ®5® ) $\C{// typeof(5) anonymous-index; 5 is high value}$ -for ( i; ®1.5® ~ 5.5 ) $\C{// typeof(1.5) i; 1.5 is low value}$ -for ( ®int i®; 0 ~ 10 ~ 2 ) $\C{// int i; type is explicit}$ +for ( ®5® ) $\C{// typeof(5) anonymous-index; 5 is high value}$ +for ( i; ®1.5® ~ 5.5 ) $\C{// typeof(1.5) i; 1.5 is low value}$ +for ( ®int i®; 0 ~ 10 ~ 2 ) $\C{// int i; type is explicit}$ \end{cfa} @@ -1125,37 +1159,37 @@ H is implicit up-to exclusive range [0,H\R{)}. \begin{cfa} -for ( ®5® ) $\C{// for ( typeof(5) i; i < 5; i += 1 )}$ +for ( ®5® ) $\C{// for ( typeof(5) i; i < 5; i += 1 )}$ \end{cfa} \item ©~=© H is implicit up-to inclusive range [0,H\R{]}. \begin{cfa} -for ( ®~=® 5 ) $\C{// for ( typeof(5) i; i <= 5; i += 1 )}$ +for ( ®~=® 5 ) $\C{// for ( typeof(5) i; i <= 5; i += 1 )}$ \end{cfa} \item L ©~©\index{~@©~©} H is explicit up-to exclusive range [L,H\R{)}. \begin{cfa} -for ( 1 ®~® 5 ) $\C{// for ( typeof(1) i = 1; i < 5; i += 1 )}$ +for ( 1 ®~® 5 ) $\C{// for ( typeof(1) i = 1; i < 5; i += 1 )}$ \end{cfa} \item L ©~=©\index{~=@©~=©} H is explicit up-to inclusive range [L,H\R{]}. \begin{cfa} -for ( 1 ®~=® 5 ) $\C{// for ( typeof(1) i = 1; i <= 5; i += 1 )}$ +for ( 1 ®~=® 5 ) $\C{// for ( typeof(1) i = 1; i <= 5; i += 1 )}$ \end{cfa} \item L ©-~©\index{-~@©-~©} H is explicit down-to exclusive range [H,L\R{)}, where L and H are implicitly interchanged to make the range down-to. \begin{cfa} -for ( 1 ®-~® 5 ) $\C{// for ( typeof(1) i = 5; i > 0; i -= 1 )}$ +for ( 1 ®-~® 5 ) $\C{// for ( typeof(1) i = 5; i > 0; i -= 1 )}$ \end{cfa} \item L ©-~=©\index{-~=@©-~=©} H is explicit down-to inclusive range [H,L\R{]}, where L and H are implicitly interchanged to make the range down-to. \begin{cfa} -for ( 1 ®-~=® 5 ) $\C{// for ( typeof(1) i = 5; i >= 0; i -= 1 )}$ +for ( 1 ®-~=® 5 ) $\C{// for ( typeof(1) i = 5; i >= 0; i -= 1 )}$ \end{cfa} \item ©@© means put nothing in this field. \begin{cfa} -for ( i; 1 ~ ®@® ~ 2 ) $\C{// for ( typeof(1) i = 1; \R{/* empty */}; i += 2 )}$ -for ( i; 1 ~ 10 ~ ®@® ) $\C{// for ( typeof(1) i = 1; i < 10; \R{/* empty */} )}$ -for ( i; 1 ~ ®@® ~ ®@® ) $\C{// for ( typeof(1) i = 1; /*empty*/; \R{/* empty */} )}$ +for ( i; 1 ~ ®@® ~ 2 ) $\C{// for ( typeof(1) i = 1; \R{/* empty */}; i += 2 )}$ +for ( i; 1 ~ 10 ~ ®@® ) $\C{// for ( typeof(1) i = 1; i < 10; \R{/* empty */} )}$ +for ( i; 1 ~ ®@® ~ ®@® ) $\C{// for ( typeof(1) i = 1; /*empty*/; \R{/* empty */} )}$ \end{cfa} L cannot be elided for the up-to range, \lstinline{@ ~ 5}, and H for the down-to range, \lstinline{1 -~ @}, because then the loop index is uninitialized. @@ -1164,12 +1198,12 @@ ©:© means low another index. \begin{cfa} -for ( i; 5 ®:® j; 2 ~ 12 ~ 3 ) $\C{// for ( typeof(i) i = 1, j = 2; i < 5 \&\& j < 12; i += 1, j += 3 )}$ +for ( i; 5 ®:® j; 2 ~ 12 ~ 3 ) $\C{// for ( typeof(i) i = 1, j = 2; i < 5 \&\& j < 12; i += 1, j += 3 )}$ \end{cfa} \end{itemize} \R{Warning}: specifying the down-to range maybe unexpected because the loop control \emph{implicitly} switches the L and H values (and toggles the increment/decrement for I): \begin{cfa} -for ( i; 1 ~ 10 ) ${\C[1.5in]{// up range}$ -for ( i; 1 -~ 10 ) ${\C{// down range}$ -for ( i; ®10 -~ 1® ) ${\C{// \R{WRONG down range!}}\CRT}$ +for ( i; 1 ~ 10 ) ${\C{// up range}$ +for ( i; 1 -~ 10 ) ${\C{// down range}$ +for ( i; ®10 -~ 1® ) ${\C{// \R{WRONG down range!}}}$ \end{cfa} The reason for this semantics is that the range direction can be toggled by adding/removing the minus, ©'-'©, versus interchanging the L and H expressions, which has a greater chance of introducing errors. @@ -1188,7 +1222,6 @@ \begin{figure} -\centering \begin{lrbox}{\myboxA} -\begin{cfa}[tabsize=3] +\begin{cfa}[tabsize=4] ®Compound:® { ®Try:® try { @@ -1220,5 +1253,5 @@ \begin{lrbox}{\myboxB} -\begin{cfa}[tabsize=3] +\begin{cfa}[tabsize=4] { @@ -1249,9 +1282,9 @@ \end{lrbox} -\subfloat[\CFA]{\label{f:CFibonacci}\usebox\myboxA} +\subfloat[C]{\label{f:CFAFibonacciGen}\usebox\myboxB} \hspace{3pt} \vrule \hspace{3pt} -\subfloat[C]{\label{f:CFAFibonacciGen}\usebox\myboxB} +\subfloat[\CFA]{\label{f:CFibonacci}\usebox\myboxA} \caption{Multi-level Exit} \label{f:MultiLevelExit} @@ -1287,5 +1320,5 @@ int a[10]; \end{cfa} -\begin{tabular}{@{}lll@{}} +\begin{tabular}{@{}l@{\hspace{3em}}l@{\hspace{3em}}l@{}} \begin{cfa} @@ -1328,7 +1361,11 @@ Grouping heterogeneous data into an \newterm{aggregate} (structure/union) is a common programming practice, and aggregates may be nested: \begin{cfa} -struct Person { $\C{// aggregate}$ - struct Name { char first[20], last[20]; } name $\C{// nesting}$ - struct Address { ... } address $\C{// nesting}$ +struct Person { $\C{// aggregate}$ + struct Name { $\C{// nesting}$ + char first[20], last[20]; + } name; + struct Address { $\C{// nesting}$ + ... + } address; int sex; }; @@ -1337,5 +1374,5 @@ \begin{cfa} Person p -®p.®name; ®p.®address; ®p.®sex; $\C{// access containing fields}$ +®p.®name; ®p.®address; ®p.®sex; $\C{// access containing fields}$ \end{cfa} which extends to multiple levels of qualification for nested aggregates and multiple aggregates. @@ -1352,7 +1389,7 @@ \begin{cfa} struct S { - struct $\R{\LstCommentStyle{/* unnamed */}}$ { int g, h; } __attribute__(( aligned(64) )); + struct $\R{\LstCommentStyle{/* unnamed */}}$ { int g, h; } __attribute__(( aligned(64) )); int tag; - union $\R{\LstCommentStyle{/* unnamed */}}$ { + union $\R{\LstCommentStyle{/* unnamed */}}$ { struct { char c1, c2; } __attribute__(( aligned(128) )); struct { int i1, i2; }; @@ -1368,6 +1405,6 @@ struct S { char ®c®; int ®i®; double ®d®; - void f( /* S * this */ ) { $\C{// implicit ``this'' parameter}$ - ®c®; ®i®; ®d®; $\C{// this->c; this->i; this->d;}$ + void f( /* S * this */ ) { $\C{// implicit ``this'' parameter}$ + ®c®; ®i®; ®d®; $\C{// this->c; this->i; this->d;}$ } } @@ -1377,12 +1414,12 @@ \begin{cfa} struct T { - char ®m®; int ®i®; double ®n®; $\C{// derived class variables}$ + char ®m®; int ®i®; double ®n®; $\C{// derived class variables}$ }; struct S : public T { - char ®c®; int ®i®; double ®d®; $\C{// class variables}$ + char ®c®; int ®i®; double ®d®; $\C{// class variables}$ void g( double ®d®, T & t ) { - d; ®t®.m; ®t®.i; ®t®.n; $\C{// function parameter}$ - c; i; ®this->®d; ®S::®d; $\C{// class S variables}$ - m; ®T::®i; n; $\C{// class T variables}$ + d; ®t®.m; ®t®.i; ®t®.n; $\C{// function parameter}$ + c; i; ®this->®d; ®S::®d; $\C{// class S variables}$ + m; ®T::®i; n; $\C{// class T variables}$ } }; @@ -1394,13 +1431,13 @@ Hence, the qualified fields become variables with the side-effect that it is simpler to write, easier to read, and optimize field references in a block. \begin{cfa} -void f( S & this ) ®with ( this )® { $\C{// with statement}$ - ®c®; ®i®; ®d®; $\C{// this.c, this.i, this.d}$ +void f( S & this ) ®with ( this )® { $\C{// with statement}$ + ®c®; ®i®; ®d®; $\C{// this.c, this.i, this.d}$ } \end{cfa} with the generality of opening multiple aggregate-parameters: \begin{cfa} -void g( S & s, T & t ) ®with ( s, t )® { $\C{// multiple aggregate parameters}$ - c; ®s.®i; d; $\C{// s.c, s.i, s.d}$ - m; ®t.®i; n; $\C{// t.m, t.i, t.n}$ +void g( S & s, T & t ) ®with ( s, t )® {$\C{// multiple aggregate parameters}$ + c; ®s.®i; d; $\C{// s.c, s.i, s.d}$ + m; ®t.®i; n; $\C{// t.m, t.i, t.n}$ } \end{cfa} @@ -1425,11 +1462,11 @@ struct R { int ®i®; int j; double ®m®; } r, w; with ( r, q ) { - j + k; $\C{// unambiguous, r.j + q.k}$ - m = 5.0; $\C{// unambiguous, q.m = 5.0}$ - m = 1; $\C{// unambiguous, r.m = 1}$ - int a = m; $\C{// unambiguous, a = r.i }$ - double b = m; $\C{// unambiguous, b = q.m}$ - int c = r.i + q.i; $\C{// disambiguate with qualification}$ - (double)m; $\C{// disambiguate with cast}$ + j + k; $\C{// unambiguous, r.j + q.k}$ + m = 5.0; $\C{// unambiguous, q.m = 5.0}$ + m = 1; $\C{// unambiguous, r.m = 1}$ + int a = m; $\C{// unambiguous, a = r.i }$ + double b = m; $\C{// unambiguous, b = q.m}$ + int c = r.i + q.i; $\C{// disambiguate with qualification}$ + (double)m; $\C{// disambiguate with cast}$ } \end{cfa} @@ -1439,7 +1476,7 @@ \begin{cfa} with ( r ) { - i; $\C{// unambiguous, r.i}$ + i; $\C{// unambiguous, r.i}$ with ( q ) { - i; $\C{// unambiguous, q.i}$ + i; $\C{// unambiguous, q.i}$ } } @@ -1448,6 +1485,6 @@ A cast can also be used to disambiguate among overload variables in a ©with© \emph{expression}: \begin{cfa} -with ( w ) { ... } $\C{// ambiguous, same name and no context}$ -with ( (Q)w ) { ... } $\C{// unambiguous, cast}$ +with ( w ) { ... } $\C{// ambiguous, same name and no context}$ +with ( (Q)w ) { ... } $\C{// unambiguous, cast}$ \end{cfa} Because there is no left-side in the ©with© expression to implicitly disambiguate between the ©w© variables, it is necessary to explicitly disambiguate by casting ©w© to type ©Q© or ©R©. @@ -1456,5 +1493,5 @@ \begin{cfa} void f( S & s, char c ) with ( s ) { - ®s.c = c;® i = 3; d = 5.5; $\C{// initialize fields}$ + ®s.c = c;® i = 3; d = 5.5; $\C{// initialize fields}$ } \end{cfa} @@ -1462,5 +1499,5 @@ To solve this problem, parameters \emph{not} explicitly opened are treated like an initialized aggregate: \begin{cfa} -struct Params { $\C{// s explicitly opened so S \& s elided}$ +struct Params { $\C{// s explicitly opened so S \& s elided}$ char c; } params; @@ -1481,4 +1518,23 @@ Transfer of control can be local, within a routine, or non-local, among routines. Non-local transfer can cause stack unwinding, \ie non-local routine termination, depending on the kind of raise. + +Currently, \CFA uses macros ©ExceptionDecl© and ©ExceptionInst© to declare and instantiate an exception. +\begin{cfa} +#include +®ExceptionDecl®( E, // must be global scope + ... // exception fields +); +try { + ... + if ( ... ) ®throwResume® ®ExceptionInst®( E, /* intialization */ ); + if ( ... ) ®throw® ®ExceptionInst®( E, /* intialization */ ); + ... +} ®catchResume®( E * ) { // must be pointer + ... +} catch( E * ) { + ... +} +\end{cfa} + \begin{cfa} exception_t E {}; $\C{// exception type}$ @@ -1489,5 +1545,5 @@ try { f(...); -} catch( E e ; $boolean-predicate$ ) { $\C{// termination handler}$ +} catch( E e ; $boolean-predicate$ ) { $\C{// termination handler}$ // recover and continue } catchResume( E e ; $boolean-predicate$ ) { $\C{// resumption handler}$ @@ -1501,4 +1557,21 @@ The ©catch© and ©catchResume© handlers may appear in any oder. However, the ©finally© clause must appear at the end of the ©try© statement. + + +\section{Non-local Exception} + +\begin{cfa} +void main() { + try { + _Enable { + ... resume(); ... + } + } ®catchResume®( E & ) { // should be reference + ... + } catch( E & ) { + ... + } +} +\end{cfa} @@ -1566,15 +1639,15 @@ \begin{cquote} \begin{tabular}{@{}l@{\hspace{3em}}l@{}} -\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ +\multicolumn{1}{c@{\hspace{3em}}}{\textbf{C}} & \multicolumn{1}{c}{\textbf{\CFA}} \\ +\begin{cfa}[moredelim={**[is][\color{blue}]{\#}{\#}}] +®int® #*# x1 #[5]#; +®int® #(*#x2#)[5]#; +#int (*#f®( int p )®#)[5]#; +\end{cfa} +& \begin{cfa}[moredelim={**[is][\color{blue}]{\#}{\#}}] #[5] *# ®int® x1; #* [5]# ®int® x2; #[* [5] int]# f®( int p )®; -\end{cfa} -& -\begin{cfa}[moredelim={**[is][\color{blue}]{\#}{\#}}] -®int® #*# x1 #[5]#; -®int® #(*#x2#)[5]#; -#int (*#f®( int p )®#)[5]#; \end{cfa} \end{tabular} @@ -1586,11 +1659,11 @@ \begin{cquote} \begin{tabular}{@{}l@{\hspace{3em}}l@{}} -\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ +\multicolumn{1}{c@{\hspace{3em}}}{\textbf{C}} & \multicolumn{1}{c}{\textbf{\CFA}} \\ +\begin{cfa} +int ®*®x, ®*®y; +\end{cfa} +& \begin{cfa} ®*® int x, y; -\end{cfa} -& -\begin{cfa} -int ®*®x, ®*®y; \end{cfa} \end{tabular} @@ -1599,13 +1672,13 @@ \begin{cquote} \begin{tabular}{@{}l@{\hspace{3em}}l@{}} -\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ +\multicolumn{1}{c@{\hspace{3em}}}{\textbf{C}} & \multicolumn{1}{c}{\textbf{\CFA}} \\ +\begin{cfa} +int ®*®x, y; + +\end{cfa} +& \begin{cfa} ®*® int x; int y; -\end{cfa} -& -\begin{cfa} -int ®*®x, y; - \end{cfa} \end{tabular} @@ -1615,5 +1688,16 @@ \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}} \\ +\multicolumn{1}{c@{\hspace{3em}}}{\textbf{C}} & \multicolumn{1}{c@{\hspace{2em}}}{\textbf{\CFA}} \\ +\begin{cfa} +int z[ 5 ]; +char * w[ 5 ]; +double (* v)[ 5 ]; +struct s { + int f0:3; + int * f1; + int * f2[ 5 ] +}; +\end{cfa} +& \begin{cfa} [ 5 ] int z; @@ -1628,15 +1712,4 @@ & \begin{cfa} -int z[ 5 ]; -char * w[ 5 ]; -double (* v)[ 5 ]; -struct s { - int f0:3; - int * f1; - int * f2[ 5 ] -}; -\end{cfa} -& -\begin{cfa} // array of 5 integers // array of 5 pointers to char @@ -1654,13 +1727,13 @@ \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}} \\ +\multicolumn{1}{c@{\hspace{1em}}}{\textbf{C}} & \multicolumn{1}{c@{\hspace{1em}}}{\textbf{\CFA}} \\ +\begin{cfa} +int const * const x; +const int (* const y)[ 5 ] +\end{cfa} +& \begin{cfa} const * const int x; const * [ 5 ] const int y; -\end{cfa} -& -\begin{cfa} -int const * const x; -const int (* const y)[ 5 ] \end{cfa} & @@ -1675,13 +1748,13 @@ \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}} \\ +\multicolumn{1}{c@{\hspace{3em}}}{\textbf{C}} & \multicolumn{1}{c@{\hspace{2em}}}{\textbf{\CFA}} \\ +\begin{cfa} +int extern x[ 5 ]; +const int static * y; +\end{cfa} +& \begin{cfa} extern [ 5 ] int x; static * const int y; -\end{cfa} -& -\begin{cfa} -int extern x[ 5 ]; -const int static * y; \end{cfa} & @@ -1696,13 +1769,13 @@ \begin{cquote} \begin{tabular}{@{}l@{\hspace{3em}}l@{}} -\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ +\multicolumn{1}{c@{\hspace{3em}}}{\textbf{C}} & \multicolumn{1}{c}{\textbf{\CFA}} \\ +\begin{cfa} +y = (int *)x; +i = sizeof(int * [ 5 ]); +\end{cfa} +& \begin{cfa} y = (* int)x; i = sizeof([ 5 ] * int); -\end{cfa} -& -\begin{cfa} -y = (int *)x; -i = sizeof(int * [ 5 ]); \end{cfa} \end{tabular} @@ -1899,13 +1972,13 @@ \begin{cquote} \begin{tabular}{@{}l@{\hspace{3em}}l@{}} -\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}} & \multicolumn{1}{c}{\textbf{C}} \\ +\multicolumn{1}{c@{\hspace{3em}}}{\textbf{Cy}} & \multicolumn{1}{c}{\textbf{\CFA}} \\ +\begin{cfa} +const int * ®const® * ®const® ccp; + +\end{cfa} +& \begin{cfa} ®const® * ®const® * const int ccp; ®const® & ®const® & const int ccr; -\end{cfa} -& -\begin{cfa} -const int * ®const® * ®const® ccp; - \end{cfa} \end{tabular} @@ -2068,5 +2141,5 @@ \begin{cfa} int x, &r = ®x®, f( int & p ); $\C{// lvalue variable (int) convert to reference (int \&)}$ -f( ®x® ); $\C{// lvalue variable (int) convert to reference (int \&)}$ +f( ®x® ); $\C{// lvalue variable (int) convert to reference (int \&)}\CRT$ \end{cfa} Conversion can restrict a type, where ©cv1© $\le$ ©cv2©, \eg passing an ©int© to a ©const volatile int &©, which has low cost. @@ -4430,5 +4503,5 @@ \end{cfa} To match a minus, put it as the first character, ©"-0-9"©. -Note, other complex forms of regular-expression matching is not supported. +Other complex forms of regular-expression matching are not supported. The following \Index{manipulator}s control scanning of input values (reading), and only affect the format of the argument. @@ -8628,20 +8701,6 @@ \begin{cquote} \begin{tabular}{@{}l@{\hspace{\parindentlnth}}|@{\hspace{\parindentlnth}}l@{}} -\multicolumn{1}{@{}c|@{\hspace{\parindentlnth}}}{\textbf{\CFA}} & \multicolumn{1}{@{\hspace{\parindentlnth}}c@{}}{\textbf{C}} \\ +\multicolumn{1}{@{}c|@{\hspace{\parindentlnth}}}{\textbf{C}} & \multicolumn{1}{@{\hspace{\parindentlnth}}c@{}}{\textbf{\CFA}} \\ \hline -\begin{cfa} -#include $\indexc{gmp}$ -int main( void ) { - sout | "Factorial Numbers"; - Int fact = 1; - - sout | 0 | fact; - for ( i; 40 ) { - fact *= i; - sout | i | fact; - } -} -\end{cfa} -& \begin{cfa} #include $\indexc{gmp.h}$ @@ -8654,4 +8713,18 @@ ®mpz_mul_ui®( fact, fact, i ); ®gmp_printf®( "%d %Zd\n", i, fact ); + } +} +\end{cfa} +& +\begin{cfa} +#include $\indexc{gmp}$ +int main( void ) { + sout | "Factorial Numbers"; + Int fact = 1; + + sout | 0 | fact; + for ( i; 40 ) { + fact *= i; + sout | i | fact; } } Index: driver/cc1.cc =================================================================== --- driver/cc1.cc (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ driver/cc1.cc (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -10,16 +10,14 @@ // Created On : Fri Aug 26 14:23:51 2005 // Last Modified By : Peter A. Buhr -// Last Modified On : Fri Jun 9 11:36:44 2023 -// Update Count : 423 +// Last Modified On : Mon Sep 25 11:07:22 2023 +// Update Count : 427 // #include -using std::cerr; -using std::endl; #include -using std::string; #include // find #include // stderr, stdout, perror, fprintf #include // getenv, exit, mkstemp +using namespace std; #include // execvp, fork, unlink #include // wait @@ -52,5 +50,5 @@ if ( dot == string::npos ) return; const string * end = suffixes + NumSuffixes; - if ( std::find( suffixes, end, arg.substr( dot + 1 ) ) != end ) { + if ( find( suffixes, end, arg.substr( dot + 1 ) ) != end ) { args[nargs++] = "-x"; args[nargs++] = "c"; @@ -153,11 +151,13 @@ #ifdef __DEBUG_H__ - cerr << "Stage1" << endl; + cerr << "#########" << endl << "Stage1 " << string( 100, '#' ) << endl << "#########" << endl; #endif // __DEBUG_H__ checkEnv1(); // arguments passed via environment variables #ifdef __DEBUG_H__ + cerr << string( 100, '*' ) << endl; for ( int i = 1; i < argc; i += 1 ) { cerr << "argv[" << i << "]:\"" << argv[i] << "\"" << endl; } // for + cerr << string( 100, '*' ) << endl; #endif // __DEBUG_H__ @@ -260,5 +260,5 @@ } else { args[nargs++] = "-x"; - args[nargs++] = ( *new string( lang.c_str() ) ).c_str(); + args[nargs++] = ( *new string( lang ) ).c_str(); } // if args[nargs++] = cpp_in; @@ -275,4 +275,5 @@ } // for cerr << endl; + cerr << string( 100, '*' ) << endl; #endif // __DEBUG_H__ @@ -298,5 +299,5 @@ } else { args[nargs++] = "-x"; - args[nargs++] = ( *new string( lang.c_str() ) ).c_str(); + args[nargs++] = ( *new string( lang ) ).c_str(); } // if args[nargs++] = cpp_in; // input to cpp @@ -346,11 +347,13 @@ #ifdef __DEBUG_H__ - cerr << "Stage2" << endl; + cerr << "#########" << endl << "Stage2 " << string( 100, '#' ) << endl << "#########" << endl; #endif // __DEBUG_H__ checkEnv2( cargs, ncargs ); // arguments passed via environment variables #ifdef __DEBUG_H__ + cerr << string( 100, '*' ) << endl; for ( int i = 1; i < argc; i += 1 ) { cerr << "argv[" << i << "]:\"" << argv[i] << "\"" << endl; } // for + cerr << string( 100, '*' ) << endl; #endif // __DEBUG_H__ @@ -473,5 +476,5 @@ if ( CFA_flag ) { // run cfa-cpp ? if ( o_file.size() != 0 ) { // location for output - cargs[ncargs++] = ( *new string( o_file.c_str() ) ).c_str(); + cargs[ncargs++] = ( *new string( o_file ) ).c_str(); } // if } else { @@ -571,7 +574,5 @@ int main( const int argc, const char * const argv[], __attribute__((unused)) const char * const env[] ) { #ifdef __DEBUG_H__ - for ( int i = 0; env[i] != nullptr; i += 1 ) { - cerr << env[i] << endl; - } // for + cerr << "#########" << endl << "main cc1 " << string( 100, '#' ) << endl << "#########" << endl; #endif // __DEBUG_H__ Index: driver/cfa.cc =================================================================== --- driver/cfa.cc (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ driver/cfa.cc (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -10,6 +10,6 @@ // Created On : Tue Aug 20 13:44:49 2002 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Aug 30 21:48:48 2023 -// Update Count : 480 +// Last Modified On : Thu Sep 28 21:53:54 2023 +// Update Count : 484 // @@ -20,4 +20,5 @@ #include // STL version #include // find +using namespace std; #include // execvp @@ -27,9 +28,4 @@ #include "Common/SemanticError.h" #include "config.h" // configure info - -using std::cerr; -using std::endl; -using std::string; -using std::to_string; //#define __DEBUG_H__ Index: libcfa/src/collections/string_res.cfa =================================================================== --- libcfa/src/collections/string_res.cfa (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ libcfa/src/collections/string_res.cfa (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -218,5 +218,7 @@ // Read in chunks. Often, one chunk is enough. Keep the string that accumulates chunks last in the heap, // so available room is rest of heap. When a chunk fills the heap, force growth then take the next chunk. - for (;;) { + for (bool cont = true; cont; ) { + cont = false; + // Append dummy content to temp, forcing expansion when applicable (occurs always on subsequent loops) // length 2 ensures room for at least one real char, plus scanf/pipe-cstr's null terminator @@ -228,10 +230,14 @@ temp.Handle.ulink->EndVbyte -= 2; - // rest of heap, less 1 byte for null terminator, is available to read into - int lenReadable = (char*)temp.Handle.ulink->ExtVbyte - temp.Handle.ulink->EndVbyte - 1; - assert (lenReadable >= 1); + // rest of heap is available to read into + int lenReadable = (char*)temp.Handle.ulink->ExtVbyte - temp.Handle.ulink->EndVbyte; + assert (lenReadable >= 2); // get bytes - in | wdi( lenReadable + 1, lenReadable, temp.Handle.ulink->EndVbyte ); + try { + in | wdi( lenReadable, temp.Handle.ulink->EndVbyte ); + } catch (cstring_length*) { + cont = true; + } int lenWasRead = strlen(temp.Handle.ulink->EndVbyte); @@ -239,6 +245,4 @@ temp.Handle.lnth += lenWasRead; temp.Handle.ulink->EndVbyte += lenWasRead; - - if (lenWasRead < lenReadable) break; } Index: libcfa/src/concurrency/channel.hfa =================================================================== --- libcfa/src/concurrency/channel.hfa (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ libcfa/src/concurrency/channel.hfa (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -130,4 +130,5 @@ static inline void __cons_handoff( channel(T) & chan, T & elem ) with(chan) { memcpy( cons`first.extra, (void *)&elem, sizeof(T) ); // do waiting consumer work + __atomic_thread_fence( __ATOMIC_SEQ_CST ); wake_one( cons ); } @@ -136,4 +137,5 @@ static inline void __prods_handoff( channel(T) & chan, T & retval ) with(chan) { memcpy( (void *)&retval, prods`first.extra, sizeof(T) ); + __atomic_thread_fence( __ATOMIC_SEQ_CST ); wake_one( prods ); } Index: libcfa/src/concurrency/cofor.cfa =================================================================== --- libcfa/src/concurrency/cofor.cfa (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ libcfa/src/concurrency/cofor.cfa (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -4,10 +4,10 @@ // cofor ( uC++ COFOR ) -thread co_runner { +thread cofor_runner { ssize_t low, high; __cofor_body_t loop_body; }; -static void ?{}( co_runner & this, ssize_t low, ssize_t high, __cofor_body_t loop_body ) { +static void ?{}( cofor_runner & this, ssize_t low, ssize_t high, __cofor_body_t loop_body ) { this.low = low; this.high = high; @@ -15,10 +15,10 @@ } -void main( co_runner & this ) with( this ) { +void main( cofor_runner & this ) with( this ) { for ( ssize_t i = low; i < high; i++ ) loop_body(i); } -void cofor( ssize_t low, ssize_t high, __cofor_body_t loop_body ) libcfa_public { +void __Cofor__( ssize_t low, ssize_t high, __cofor_body_t loop_body ) libcfa_public { ssize_t range = high - low; if ( range <= 0 ) return; @@ -29,5 +29,5 @@ ssize_t i = 0; ssize_t stride_iter = low; - co_runner * runners[ threads ]; + cofor_runner * runners[ threads ]; for ( i; threads ) { runners[i] = alloc(); @@ -45,25 +45,3 @@ } -////////////////////////////////////////////////////////////////////////////////////////// -// parallel (COBEGIN/COEND) -thread para_runner { - parallel_stmt_t body; - void * arg; -}; - -static void ?{}( para_runner & this, parallel_stmt_t body, void * arg ) { - this.body = body; - this.arg = arg; -} - -void main( para_runner & this ) with( this ) { body( arg ); } - -void parallel( parallel_stmt_t * stmts, void ** args, size_t num ) libcfa_public { - para_runner * runners[ num ]; - for ( i; num ) - (*(runners[i] = malloc())){ stmts[i], args[i] }; - for ( i; num ) - delete( runners[i] ); -} - Index: libcfa/src/concurrency/cofor.hfa =================================================================== --- libcfa/src/concurrency/cofor.hfa (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ libcfa/src/concurrency/cofor.hfa (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -5,5 +5,5 @@ typedef void (*__cofor_body_t)( ssize_t ); -void cofor( ssize_t low, ssize_t high, __cofor_body_t loop_body ); +void __Cofor__( ssize_t low, ssize_t high, __cofor_body_t loop_body ); #define COFOR( lidname, low, high, loopbody ) \ @@ -12,10 +12,33 @@ loopbody \ } \ - cofor( low, high, __CFA_loopLambda__ ); \ + __Cofor__( low, high, __CFA_loopLambda__ ); \ } ////////////////////////////////////////////////////////////////////////////////////////// -// parallel (COBEGIN/COEND) -typedef void (*parallel_stmt_t)( void * ); +// corun -void parallel( parallel_stmt_t * stmts, void ** args, size_t num ); +// +typedef void (*__CFA_corun_lambda_t)( void ); + +// used to run a corun statement in parallel +thread co_runner { + __CFA_corun_lambda_t body; +}; + +// wraps a co_runner to provide RAII deallocation +struct runner_block { + co_runner * runner; +}; +static inline void ?{}( co_runner & this, __CFA_corun_lambda_t body ) { this.body = body; } + +void main( co_runner & this ) with( this ) { body(); } + +static inline void ?{}( runner_block & this ) {} +static inline void ?{}( runner_block & this, __CFA_corun_lambda_t body ) { + (*(this.runner = malloc())){ body }; +} + +static inline void ^?{}( runner_block & this ) { + delete( this.runner ); +} + Index: libcfa/src/concurrency/coroutine.cfa =================================================================== --- libcfa/src/concurrency/coroutine.cfa (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ libcfa/src/concurrency/coroutine.cfa (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -343,4 +343,7 @@ bool poll() libcfa_public { return poll( active_coroutine() ); } +void enable_ehm() libcfa_public { active_coroutine()->ehm_state.ehm_enabled = true; } +void disable_ehm() libcfa_public { active_coroutine()->ehm_state.ehm_enabled = false; } +bool checked_poll() libcfa_public { return active_coroutine()->ehm_state.ehm_enabled ? poll( active_coroutine() ) : false; } coroutine$ * resumer() libcfa_public { return active_coroutine()->last; } coroutine$ * first_resumer() libcfa_public { return active_coroutine()->starter; } Index: libcfa/src/concurrency/coroutine.hfa =================================================================== --- libcfa/src/concurrency/coroutine.hfa (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ libcfa/src/concurrency/coroutine.hfa (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -224,14 +224,17 @@ // non local ehm and coroutine utility routines +void enable_ehm(); +void disable_ehm(); bool poll( coroutine$ * cor ); bool poll(); +bool checked_poll(); coroutine$ * resumer(); coroutine$ * first_resumer(); forall(T & | is_coroutine(T)) { - void enable_ehm( T & cor ); - void disable_ehm( T & cor ); + void enable_ehm( T & cor ); // enable checking non-local exceptions for cor via checked_poll + void disable_ehm( T & cor ); // disable checking non-local exceptions for cor via checked_poll bool poll( T & cor ); - bool checked_poll( T & cor ); + bool checked_poll( T & cor ); // check for non-local exceptions while respecting enable/disable coroutine$ * resumer( T & cor ); coroutine$ * first_resumer( T & cor ); Index: libcfa/src/concurrency/kernel/fwd.hfa =================================================================== --- libcfa/src/concurrency/kernel/fwd.hfa (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ libcfa/src/concurrency/kernel/fwd.hfa (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -118,5 +118,5 @@ // Yield: yield N times static inline void yield( size_t times ) { - for( times ) { + for ( times ) { yield(); } @@ -136,8 +136,8 @@ bool wait(single_sem & this) { - for() { + for () { struct thread$ * expected = this.ptr; - if(expected == 1p) { - if(__atomic_compare_exchange_n(&this.ptr, &expected, 0p, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) { + if (expected == 1p) { + if (__atomic_compare_exchange_n(&this.ptr, &expected, 0p, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) { return false; } @@ -145,5 +145,5 @@ else { /* paranoid */ verify( expected == 0p ); - if(__atomic_compare_exchange_n(&this.ptr, &expected, active_thread(), false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) { + if (__atomic_compare_exchange_n(&this.ptr, &expected, active_thread(), false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) { park(); return true; @@ -155,14 +155,14 @@ bool post(single_sem & this) { - for() { + for () { struct thread$ * expected = this.ptr; - if(expected == 1p) return false; - if(expected == 0p) { - if(__atomic_compare_exchange_n(&this.ptr, &expected, 1p, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) { + if (expected == 1p) return false; + if (expected == 0p) { + if (__atomic_compare_exchange_n(&this.ptr, &expected, 1p, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) { return false; } } else { - if(__atomic_compare_exchange_n(&this.ptr, &expected, 0p, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) { + if (__atomic_compare_exchange_n(&this.ptr, &expected, 0p, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) { unpark( expected ); return true; @@ -195,8 +195,8 @@ // return true if the thread was parked bool wait(oneshot & this) { - for() { + for () { struct thread$ * expected = this.ptr; - if(expected == oneshot_FULFILLED) return false; - if(__atomic_compare_exchange_n(&this.ptr, &expected, active_thread(), false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) { + if (expected == oneshot_FULFILLED) return false; + if (__atomic_compare_exchange_n(&this.ptr, &expected, active_thread(), false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) { park(); /* paranoid */ verify( this.ptr == oneshot_FULFILLED ); @@ -210,6 +210,6 @@ thread$ * post(oneshot & this, bool do_unpark = true) { struct thread$ * got = __atomic_exchange_n( &this.ptr, oneshot_FULFILLED, __ATOMIC_SEQ_CST); - if( got == oneshot_ARMED || got == oneshot_FULFILLED ) return 0p; - if(do_unpark) unpark( got ); + if ( got == oneshot_ARMED || got == oneshot_FULFILLED ) return 0p; + if (do_unpark) unpark( got ); return got; } @@ -255,11 +255,11 @@ /* paranoid */ verify( wait_ctx.ptr == oneshot_ARMED || wait_ctx.ptr == oneshot_FULFILLED ); // The future needs to set the wait context - for() { + for () { struct oneshot * expected = this.ptr; // Is the future already fulfilled? - if(expected == future_FULFILLED) return false; // Yes, just return false (didn't block) + if (expected == future_FULFILLED) return false; // Yes, just return false (didn't block) // The future is not fulfilled, try to setup the wait context - if(__atomic_compare_exchange_n(&this.ptr, &expected, &wait_ctx, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) { + if (__atomic_compare_exchange_n(&this.ptr, &expected, &wait_ctx, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) { return true; } @@ -276,5 +276,5 @@ // attempt to remove the context so it doesn't get consumed. - if(__atomic_compare_exchange_n( &this.ptr, &expected, future_ARMED, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) { + if (__atomic_compare_exchange_n( &this.ptr, &expected, future_ARMED, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) { // we still have the original context, then no one else saw it return false; @@ -282,14 +282,14 @@ // expected == ARMED: future was never actually setup, just return - if( expected == future_ARMED ) return false; + if ( expected == future_ARMED ) return false; // expected == FULFILLED: the future is ready and the context was fully consumed // the server won't use the pointer again // It is safe to delete (which could happen after the return) - if( expected == future_FULFILLED ) return true; + if ( expected == future_FULFILLED ) return true; // expected == PROGRESS: the future is ready but the context hasn't fully been consumed // spin until it is safe to move on - if( expected == future_PROGRESS ) { + if ( expected == future_PROGRESS ) { while( this.ptr != future_FULFILLED ) Pause(); /* paranoid */ verify( this.ptr == future_FULFILLED ); @@ -310,9 +310,9 @@ // If the future isn't already fulfilled, let the server delete it - if( got == future_ARMED ) return false; + if ( got == future_ARMED ) return false; // got == PROGRESS: the future is ready but the context hasn't fully been consumed // spin until it is safe to move on - if( got == future_PROGRESS ) { + if ( got == future_PROGRESS ) { while( this.ptr != future_FULFILLED ) Pause(); got = future_FULFILLED; @@ -327,15 +327,19 @@ // from the server side, mark the future as fulfilled // delete it if needed + thread$ * fulfil( future_t & this, bool do_unpark = true ) { - for() { + for () { struct oneshot * expected = this.ptr; - // was this abandoned? + #if defined(__GNUC__) && __GNUC__ >= 7 - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wfree-nonheap-object" + // SKULLDUGGERY: gcc bug does not handle push/pop for -Wfree-nonheap-object + //#pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wfree-nonheap-object" #endif - if( expected == future_ABANDONED ) { free( &this ); return 0p; } + + if ( expected == future_ABANDONED ) { free( &this ); return 0p; } + #if defined(__GNUC__) && __GNUC__ >= 7 - #pragma GCC diagnostic pop + //#pragma GCC diagnostic pop #endif @@ -346,6 +350,6 @@ // If there is no context then we can skip the in progress phase struct oneshot * want = expected == future_ARMED ? future_FULFILLED : future_PROGRESS; - if(__atomic_compare_exchange_n(&this.ptr, &expected, want, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) { - if( expected == future_ARMED ) { return 0p; } + if (__atomic_compare_exchange_n(&this.ptr, &expected, want, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) { + if ( expected == future_ARMED ) { return 0p; } thread$ * ret = post( *expected, do_unpark ); __atomic_store_n( &this.ptr, future_FULFILLED, __ATOMIC_SEQ_CST); @@ -359,5 +363,5 @@ bool wait( future_t & this ) { oneshot temp; - if( !setup(this, temp) ) return false; + if ( !setup(this, temp) ) return false; // Wait context is setup, just wait on it @@ -387,5 +391,5 @@ // if any are already satisfied return for ( i; num_futures ) { - if( !setup(futures[i], temp) ) return futures[i]; + if ( !setup(futures[i], temp) ) return futures[i]; } @@ -413,17 +417,17 @@ #define __STATS__(in_kernel, ...) { \ - if( !(in_kernel) ) disable_interrupts(); \ - with( *__tls_stats() ) { \ + if ( !(in_kernel) ) disable_interrupts(); \ + with ( *__tls_stats() ) { \ __VA_ARGS__ \ } \ - if( !(in_kernel) ) enable_interrupts(); \ + if ( !(in_kernel) ) enable_interrupts(); \ } #if defined(CFA_HAVE_LINUX_IO_URING_H) #define __IO_STATS__(in_kernel, ...) { \ - if( !(in_kernel) ) disable_interrupts(); \ - with( *__tls_stats() ) { \ + if ( !(in_kernel) ) disable_interrupts(); \ + with ( *__tls_stats() ) { \ __VA_ARGS__ \ } \ - if( !(in_kernel) ) enable_interrupts(); \ + if ( !(in_kernel) ) enable_interrupts(); \ } #else @@ -436,3 +440,3 @@ } } -#endif +#endif // #endif Index: libcfa/src/heap.cfa =================================================================== --- libcfa/src/heap.cfa (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ libcfa/src/heap.cfa (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -10,6 +10,6 @@ // Created On : Tue Dec 19 21:58:35 2017 // Last Modified By : Peter A. Buhr -// Last Modified On : Mon Sep 11 11:21:10 2023 -// Update Count : 1615 +// Last Modified On : Sat Sep 30 17:31:15 2023 +// Update Count : 1617 // @@ -53,5 +53,5 @@ #define TLSMODEL __attribute__(( tls_model("initial-exec") )) -//#define __STATISTICS__ +#define __STATISTICS__ enum { @@ -681,5 +681,5 @@ static HeapStatistics & collectStats( HeapStatistics & stats ) with( heapMaster ) { - lock( mgrLock ); + lock( heapMaster.mgrLock ); stats += heapMaster.stats; @@ -688,10 +688,10 @@ } // for - unlock( mgrLock ); + unlock( heapMaster.mgrLock ); return stats; } // collectStats static inline void clearStats() { - lock( mgrLock ); + lock( heapMaster.mgrLock ); // Zero the heap master and all active thread heaps. @@ -701,5 +701,5 @@ } // for - unlock( mgrLock ); + unlock( heapMaster.mgrLock ); } // clearStats #endif // __STATISTICS__ Index: libcfa/src/iostream.cfa =================================================================== --- libcfa/src/iostream.cfa (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ libcfa/src/iostream.cfa (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -11,6 +11,6 @@ // Created On : Wed May 27 17:56:53 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Sat Sep 2 14:42:01 2023 -// Update Count : 1561 +// Last Modified On : Sun Oct 8 12:10:21 2023 +// Update Count : 1564 // @@ -22,4 +22,5 @@ #include // DBL_DIG, LDBL_DIG #include // creal, cimag +#include // isspace //#include @@ -29,4 +30,5 @@ extern char *strcpy (char *__restrict __dest, const char *__restrict __src) __attribute__ ((__nothrow__ , __leaf__)) __attribute__ ((__nonnull__ (1, 2))); extern void *memcpy (void *__restrict __dest, const void *__restrict __src, size_t __n) __attribute__ ((__nothrow__ , __leaf__)) __attribute__ ((__nonnull__ (1, 2))); +extern char *strchr(const char *str, int ch); } // extern "C" @@ -649,5 +651,5 @@ exp10 = floor( exp10, 3 ); \ value *= pow( 10.0, -exp10 ); \ - if ( pc <= 3 ) pc = 3; \ + if ( pc < 0 ) pc = 3; \ } /* eng */ \ \ @@ -960,5 +962,16 @@ istype & ?|?( istype & is, _Istream_Cskip f ) { // printf( "skip %s %d\n", f.scanset, f.wd ); - if ( f.scanset ) fmt( is, f.scanset, "" ); // no input arguments + if ( f.scanset ) { + int nscanset = strlen(f.scanset); + char fmtstr[ sizeof("%*[]") + nscanset ]; + int pos = 0; + fmtstr[pos] = '%'; pos += 1; + fmtstr[pos] = '*'; pos += 1; + fmtstr[pos] = '['; pos += 1; + strcpy( &fmtstr[pos], f.scanset ); pos += nscanset; + fmtstr[pos] = ']'; pos += 1; + fmtstr[pos] = '\0'; + fmt( is, fmtstr, (void*)0 ); // last arg is dummy: suppress gcc warning + } else for ( f.wd ) fmt( is, "%*c" ); return is; @@ -980,5 +993,12 @@ // wd is buffer bytes available (for input chars + null terminator) // rwd is count of input chars - int rwd = f.flags.rwd ? f.wd : (f.wd - 1); + int rwd; + if (f.flags.rwd) { + verify (f.wd >= 0); + rwd = f.wd; + } else { + verify (f.wd >= 1); + rwd = f.wd - 1; + } // if start += sprintf( &fmtstr[start], "%d", rwd ); } @@ -1000,10 +1020,29 @@ int check = f.wd - 2; - if ( ! f.flags.rwd ) f.s[check] = '\0'; // insert sentinel + if (! f.flags.ignore ) { + f.s[0] = '\0'; + if ( ! f.flags.rwd ) f.s[check] = '\0'; // insert sentinel + } len = fmt( is, fmtstr, f.s ); //fprintf( stderr, "KK %s %zd %d %c %s\n", fmtstr, len, check, f.s[check], f.s ); - if ( ! f.flags.rwd && f.s[check] != '\0' ) // sentinel overwritten ? - throw (cstring_length){ &cstring_length_vt }; + if ( ! f.flags.ignore && ! f.flags.rwd && f.s[check] != '\0' ) { // sentinel overwritten ? + // buffer filled, but would we have kept going? + if ( ! eof( is ) ) { + char peek; + fmt( is, "%c", &peek ); + ungetc( is, peek ); + bool hasMore; + if (f.flags.delimiter) { // getline + hasMore = (peek != f.delimiter[0]); + } else if (f.scanset) { // incl/excl + bool peekMatch = strchr(f.scanset, peek) != 0p; + hasMore = f.flags.inex ? (!peekMatch) : (peekMatch); + } else { // %s + hasMore = !isspace(peek); + } + if (hasMore) throw (cstring_length){ &cstring_length_vt }; + } // if + } // if if ( f.flags.delimiter ) { // getline ? Index: libcfa/src/iostream.hfa =================================================================== --- libcfa/src/iostream.hfa (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ libcfa/src/iostream.hfa (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -10,6 +10,6 @@ // Created On : Wed May 27 17:56:53 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Sat Sep 2 14:42:13 2023 -// Update Count : 567 +// Last Modified On : Sun Oct 8 12:02:55 2023 +// Update Count : 568 // @@ -243,5 +243,5 @@ _Ostream_Manip(T) hex( T val ) { return (_Ostream_Manip(T))@{ val, 1, 0, 'a', { .all : 0 } }; } \ _Ostream_Manip(T) sci( T val ) { return (_Ostream_Manip(T))@{ val, 1, 0, 'e', { .all : 0 } }; } \ - _Ostream_Manip(T) eng( T val ) { return (_Ostream_Manip(T))@{ val, 1, 0, 'g', { .flags.eng : true } }; } \ + _Ostream_Manip(T) eng( T val ) { return (_Ostream_Manip(T))@{ val, 1, -1, 'g', { .flags.eng : true } }; } \ _Ostream_Manip(T) wd( unsigned int w, T val ) { return (_Ostream_Manip(T))@{ val, w, 0, 'g', { .all : 0 } }; } \ _Ostream_Manip(T) wd( unsigned int w, unsigned int pc, T val ) { return (_Ostream_Manip(T))@{ val, w, pc, 'f', { .flags.pc : true } }; } \ Index: libcfa/src/rational.cfa =================================================================== --- libcfa/src/rational.cfa (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ libcfa/src/rational.cfa (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -10,6 +10,6 @@ // Created On : Wed Apr 6 17:54:28 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Tue Jul 18 11:07:10 2023 -// Update Count : 197 +// Last Modified On : Fri Oct 6 07:52:13 2023 +// Update Count : 198 // @@ -76,6 +76,6 @@ } // denominator - [ T, T ] ?=?( & [ T, T ] dest, rational(T) src ) { - return dest = src.[ numerator, denominator ]; + [ T, T ] ?=?( & [ T, T ] dst, rational(T) src ) { + return dst = src.[ numerator, denominator ]; } // ?=? Index: libcfa/src/rational.hfa =================================================================== --- libcfa/src/rational.hfa (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ libcfa/src/rational.hfa (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -12,6 +12,6 @@ // Created On : Wed Apr 6 17:56:25 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Tue Jul 18 11:08:24 2023 -// Update Count : 121 +// Last Modified On : Fri Oct 6 07:52:20 2023 +// Update Count : 122 // @@ -40,5 +40,5 @@ T numerator( rational(T) r ); T denominator( rational(T) r ); - [ T, T ] ?=?( & [ T, T ] dest, rational(T) src ); + [ T, T ] ?=?( & [ T, T ] dst, rational(T) src ); // numerator/denominator setter Index: libcfa/src/stdlib.hfa =================================================================== --- libcfa/src/stdlib.hfa (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ libcfa/src/stdlib.hfa (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -10,6 +10,6 @@ // Created On : Thu Jan 28 17:12:35 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Sat Sep 2 18:29:35 2023 -// Update Count : 780 +// Last Modified On : Sun Oct 8 09:18:28 2023 +// Update Count : 789 // @@ -431,5 +431,5 @@ uint32_t seed; // current seed PRNG_STATE_32_T state; // random state -}; // PRNG +}; // PRNG32 static inline { @@ -442,5 +442,8 @@ uint32_t prng( PRNG32 & prng, uint32_t l, uint32_t u ) __attribute__(( warn_unused_result )) { return prng( prng, u - l + 1 ) + l; } // [l,u] uint32_t calls( PRNG32 & prng ) __attribute__(( warn_unused_result )) with( prng ) { return callcnt; } -} // distribution + void copy( PRNG32 & dst, PRNG32 & src ) { dst = src; } // checkpoint PRNG state, use autogen assignment +} // distribution +void ?{}( PRNG32 &, PRNG32 & ) = void; // no copy, remove autogen copy constructor +PRNG32 & ?=?( PRNG32 &, const PRNG32 ) = void; // no assignment, remove autogen assignment struct PRNG64 { @@ -448,5 +451,5 @@ uint64_t seed; // current seed PRNG_STATE_64_T state; // random state -}; // PRNG +}; // PRNG64 static inline { @@ -459,5 +462,8 @@ uint64_t prng( PRNG64 & prng, uint64_t l, uint64_t u ) __attribute__(( warn_unused_result )) { return prng( prng, u - l + 1 ) + l; } // [l,u] uint64_t calls( PRNG64 & prng ) __attribute__(( warn_unused_result )) with( prng ) { return callcnt; } -} // distribution + void copy( PRNG64 & dst, PRNG64 & src ) { dst = src; } // checkpoint PRNG state, use autogen assignment +} // distribution +void ?{}( PRNG64 &, PRNG64 & ) = void; // no copy, remove autogen copy constructor +PRNG64 & ?=?( PRNG64 &, const PRNG64 ) = void; // no assignment, remove autogen assignment // Set default random-generator size. Index: src/AST/Convert.cpp =================================================================== --- src/AST/Convert.cpp (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ src/AST/Convert.cpp (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -269,5 +269,5 @@ node->location, Type::StorageClasses( node->storage.val ), - get().accept1( node->base ), + get().accept1( node->base ), LinkageSpec::Spec( node->linkage.val ) ); @@ -567,5 +567,5 @@ } - const ast::WhenClause * visit( const ast::WhenClause * node ) override final { + const ast::WhenClause * visit( const ast::WhenClause * node ) override final { // There is no old-AST WhenClause, so this should never be called. assert( !node ); @@ -604,6 +604,6 @@ } - const ast::Stmt * visit( const ast::WaitUntilStmt * node ) override final { - // There is no old-AST WaitUntilStmt, so this should never be called. + const ast::Stmt * visit( const ast::WaitUntilStmt * node ) override final { + // There is no old-AST WaitUntilStmt, so this should never be called. assert( !node ); return nullptr; @@ -648,4 +648,10 @@ ); return stmtPostamble( stmt, node ); + } + + const ast::Stmt * visit( const ast::CorunStmt * node ) override final { + // There is no old-AST CorunStmt, so this should never be called. + assert( !node ); + return nullptr; } @@ -853,5 +859,5 @@ // New workd: one public type: node->result, plus node->underlyer only to support roundtrip conversion // preserving underlyer because the correct type for string literals is complicated to construct, - // and distinguishing a string from other literals using the type is hard to do accurately + // and distinguishing a string from other literals using the type is hard to do accurately // Both worlds: the outer, expression-level type can change during resolution // for a string, that's char[k] before-resolve and char * after @@ -859,5 +865,5 @@ // for a string, that's char[k] always // Both worlds: the "rep" field of a constant is the C source file fragment that compiles to the desired value - // for a string, that includes outer quotes, backslashes, et al cases from the Literals test + // for a string, that includes outer quotes, backslashes, et al cases from the Literals test ConstantExpr *rslt = new ConstantExpr(Constant( get().accept1(node->underlyer), @@ -1518,5 +1524,5 @@ return strict_dynamic_cast< ast::Decl * >( node ); } - + ConverterOldToNew() = default; ConverterOldToNew(const ConverterOldToNew &) = delete; @@ -1581,5 +1587,5 @@ ast::Label make_label(const Label* old) { CodeLocation const & location = - ( old->labelled ) ? old->labelled->location : CodeLocation(); + ( old->labelled ) ? old->labelled->location : CodeLocation(); return ast::Label( location, @@ -2240,5 +2246,4 @@ // TypeSubstitution shouldn't exist yet in old. ast::TypeSubstitution * convertTypeSubstitution(const TypeSubstitution * old) { - if (!old) return nullptr; if (old->empty()) return nullptr; @@ -2285,5 +2290,5 @@ ast::Expr * visitBaseExpr_SkipResultType( const Expression * old, ast::Expr * nw) { - nw->env = convertTypeSubstitution(old->env); + nw->env = convertTypeSubstitution(old->env); nw->extension = old->extension; @@ -2856,5 +2861,5 @@ virtual void visit( const EnumInstType * old ) override final { - ast::EnumInstType * ty; + ast::EnumInstType * ty; if ( old->baseEnum ) { ty = new ast::EnumInstType{ Index: src/AST/Fwd.hpp =================================================================== --- src/AST/Fwd.hpp (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ src/AST/Fwd.hpp (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -67,4 +67,5 @@ class ImplicitCtorDtorStmt; class MutexStmt; +class CorunStmt; class Expr; Index: src/AST/Node.cpp =================================================================== --- src/AST/Node.cpp (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ src/AST/Node.cpp (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -192,4 +192,6 @@ template class ast::ptr_base< ast::MutexStmt, ast::Node::ref_type::weak >; template class ast::ptr_base< ast::MutexStmt, ast::Node::ref_type::strong >; +template class ast::ptr_base< ast::CorunStmt, ast::Node::ref_type::weak >; +template class ast::ptr_base< ast::CorunStmt, ast::Node::ref_type::strong >; template class ast::ptr_base< ast::Expr, ast::Node::ref_type::weak >; template class ast::ptr_base< ast::Expr, ast::Node::ref_type::strong >; Index: src/AST/Pass.hpp =================================================================== --- src/AST/Pass.hpp (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ src/AST/Pass.hpp (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -162,8 +162,8 @@ const ast::FinallyClause * visit( const ast::FinallyClause * ) override final; const ast::Stmt * visit( const ast::SuspendStmt * ) override final; - const ast::WhenClause * visit( const ast::WhenClause * ) override final; + const ast::WhenClause * visit( const ast::WhenClause * ) override final; const ast::Stmt * visit( const ast::WaitForStmt * ) override final; const ast::WaitForClause * visit( const ast::WaitForClause * ) override final; - const ast::Stmt * visit( const ast::WaitUntilStmt * ) override final; + const ast::Stmt * visit( const ast::WaitUntilStmt * ) override final; const ast::Decl * visit( const ast::WithStmt * ) override final; const ast::NullStmt * visit( const ast::NullStmt * ) override final; @@ -171,4 +171,5 @@ const ast::Stmt * visit( const ast::ImplicitCtorDtorStmt * ) override final; const ast::Stmt * visit( const ast::MutexStmt * ) override final; + const ast::Stmt * visit( const ast::CorunStmt * ) override final; const ast::Expr * visit( const ast::ApplicationExpr * ) override final; const ast::Expr * visit( const ast::UntypedExpr * ) override final; Index: src/AST/Pass.impl.hpp =================================================================== --- src/AST/Pass.impl.hpp (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ src/AST/Pass.impl.hpp (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -1121,4 +1121,17 @@ //-------------------------------------------------------------------------- +// CorunStmt +template< typename core_t > +const ast::Stmt * ast::Pass< core_t >::visit( const ast::CorunStmt * node ) { + VISIT_START( node ); + + if ( __visit_children() ) { + maybe_accept( node, &CorunStmt::stmt ); + } + + VISIT_END( Stmt, node ); +} + +//-------------------------------------------------------------------------- // ApplicationExpr template< typename core_t > Index: src/AST/Print.cpp =================================================================== --- src/AST/Print.cpp (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ src/AST/Print.cpp (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -209,5 +209,5 @@ } - void print( const ast::WaitStmt * node ) { + void print( const ast::WaitStmt * node ) { if ( node->timeout_time ) { os << indent-1 << "timeout of:" << endl; @@ -860,5 +860,5 @@ } - virtual const ast::Stmt * visit( const ast::WaitUntilStmt * node ) override final { + virtual const ast::Stmt * visit( const ast::WaitUntilStmt * node ) override final { os << "Waituntil Statement" << endl; indent += 2; @@ -866,5 +866,6 @@ clause->accept( *this ); } - print(node); // calls print( const ast::WaitStmt * node ) + // calls print( const ast::WaitStmt * node ) + print(node); return node; } @@ -913,4 +914,15 @@ printAll( node->mutexObjs ); --indent; + os << indent << "... with Statement: "; + ++indent; + safe_print( node->stmt ); + --indent; + os << endl; + + return node; + } + + virtual const ast::Stmt * visit( const ast::CorunStmt * node ) override final { + os << "Corun Statement" << endl; os << indent << "... with Statement: "; ++indent; Index: src/AST/Stmt.hpp =================================================================== --- src/AST/Stmt.hpp (revision 85034edc709b6220ea9dabc9a07efab793e34dab) +++ src/AST/Stmt.hpp (revision 8cbe732066c1d0d00e6d6622a2e8b5a6b1f72c45) @@ -532,4 +532,18 @@ }; +// Corun Statement +class CorunStmt final : public Stmt { + public: + ptr stmt; + + CorunStmt( const CodeLocation & loc, const Stmt * stmt, const std::vector