Index: doc/LaTeXmacros/lstlang.sty =================================================================== --- doc/LaTeXmacros/lstlang.sty (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ doc/LaTeXmacros/lstlang.sty (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -8,6 +8,6 @@ %% Created On : Sat May 13 16:34:42 2017 %% Last Modified By : Peter A. Buhr -%% Last Modified On : Wed Jul 24 07:40:11 2024 -%% Update Count : 45 +%% Last Modified On : Fri Jan 17 14:29:52 2025 +%% Update Count : 46 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -117,5 +117,5 @@ __auto_type, basetypeof, _Bool, bool, catch, catchResume, choose, coerce, cofor, corun, countof, _Complex, __complex, __complex__, __const, __const__, continue, coroutine, _Decimal32, _Decimal64, _Decimal128, disable, dtype, enable, exception, __extension__, - fallthrough, fallthru, finally, fixup, __float80, float80, __float128, float128, _Float16, _Float32, _Float32x, _Float64, + fallthrough, finally, fixup, __float80, float80, __float128, float128, _Float16, _Float32, _Float32x, _Float64, _Float64x, _Float128, _Float128x, forall, fortran, ftype, generator, _Generic, _Imaginary, __imag, __imag__, inline, __inline, __inline__, int128, __int128, __int128_t, __label__, monitor, mutex, _Noreturn, __builtin_offsetof, one_t, or, Index: doc/papers/OOPSLA17/generic_types.tex =================================================================== --- doc/papers/OOPSLA17/generic_types.tex (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ doc/papers/OOPSLA17/generic_types.tex (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -66,5 +66,5 @@ 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__, - fallthrough,fallthru,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,_Noreturn,one_t,otype,restrict,_Static_assert, + fallthrough,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,_Noreturn,one_t,otype,restrict,_Static_assert, _Thread_local,throw,throwResume,trait,try,ttype,typeof,__typeof,__typeof__,zero_t}, }% Index: doc/papers/concurrency/Paper.tex =================================================================== --- doc/papers/concurrency/Paper.tex (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ doc/papers/concurrency/Paper.tex (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -162,5 +162,5 @@ _Alignas, _Alignof, __alignof, __alignof__, asm, __asm, __asm__, __attribute, __attribute__, auto, _Bool, catch, catchResume, choose, _Complex, __complex, __complex__, __const, __const__, - coroutine, disable, dtype, enable, exception, __extension__, fallthrough, fallthru, finally, + coroutine, disable, dtype, enable, exception, __extension__, fallthrough, finally, __float80, float80, __float128, float128, forall, ftype, generator, _Generic, _Imaginary, __imag, __imag__, inline, __inline, __inline__, __int128, int128, __label__, monitor, mutex, _Noreturn, one_t, or, Index: doc/papers/general/Paper.tex =================================================================== --- doc/papers/general/Paper.tex (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ doc/papers/general/Paper.tex (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -143,5 +143,5 @@ _Alignas, _Alignof, __alignof, __alignof__, asm, __asm, __asm__, __attribute, __attribute__, auto, _Bool, catch, catchResume, choose, _Complex, __complex, __complex__, __const, __const__, - coroutine, disable, dtype, enable, exception, __extension__, fallthrough, fallthru, finally, + coroutine, disable, dtype, enable, exception, __extension__, fallthrough, finally, __float80, float80, __float128, float128, forall, ftype, _Generic, _Imaginary, __imag, __imag__, inline, __inline, __inline__, __int128, int128, __label__, monitor, mutex, _Noreturn, one_t, or, Index: doc/papers/llheap/Paper.tex =================================================================== --- doc/papers/llheap/Paper.tex (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ doc/papers/llheap/Paper.tex (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -108,5 +108,5 @@ _Alignas, _Alignof, __alignof, __alignof__, and, asm, __asm, __asm__, _Atomic, __attribute, __attribute__, __auto_type, basetypeof, _Bool, catch, catchResume, choose, coerce, _Complex, __complex, __complex__, __const, __const__, - coroutine, _Decimal32, _Decimal64, _Decimal128, disable, enable, exception, __extension__, fallthrough, fallthru, finally, fixup, + coroutine, _Decimal32, _Decimal64, _Decimal128, disable, enable, exception, __extension__, fallthrough, finally, fixup, __float80, float80, __float128, float128, _Float16, _Float32, _Float32x, _Float64, _Float64x, _Float128, _Float128x, forall, fortran, generator, _Generic, _Imaginary, __imag, __imag__, inline, __inline, __inline__, int128, __int128, __int128_t, Index: doc/refrat/keywords.tex =================================================================== --- doc/refrat/keywords.tex (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ doc/refrat/keywords.tex (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -11,6 +11,6 @@ %% Created On : Sun Aug 6 08:17:27 2017 %% Last Modified By : Peter A. Buhr -%% Last Modified On : Fri Apr 6 15:16:11 2018 -%% Update Count : 7 +%% Last Modified On : Fri Jan 17 14:45:13 2025 +%% Update Count : 8 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{tabular}{@{}llllll@{}} @@ -28,5 +28,4 @@ ©exception© \\ ©fallthrough© \\ -©fallthru© \\ \end{tabular} & Index: doc/refrat/refrat.tex =================================================================== --- doc/refrat/refrat.tex (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ doc/refrat/refrat.tex (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -11,6 +11,6 @@ %% Created On : Wed Apr 6 14:52:25 2016 %% Last Modified By : Peter A. Buhr -%% Last Modified On : Mon Oct 5 09:02:53 2020 -%% Update Count : 110 +%% Last Modified On : Fri Jan 17 14:45:04 2025 +%% Update Count : 111 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3348,5 +3348,5 @@ The ©choose© statement is the same as the ©switch© statement except control transfers to the end of the ©choose© statement at a ©case© or ©default© labeled statement. -The ©fallthru© statement is used to fall through to the next ©case© or ©default© labeled statement. +The ©fallthrough© statement is used to fall through to the next ©case© or ©default© labeled statement. The following have identical meaning: \begin{flushleft} @@ -3366,6 +3366,6 @@ case 1: ... ; // exit case 2: ... ; // exit - case 3: ... ; fallthru; - case 4: ... ; fallthru; + case 3: ... ; fallthrough; + case 4: ... ; fallthrough; default: ... ; // exit } Index: doc/theses/aaron_moss_PhD/phd/cfa-macros.tex =================================================================== --- doc/theses/aaron_moss_PhD/phd/cfa-macros.tex (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ doc/theses/aaron_moss_PhD/phd/cfa-macros.tex (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -27,5 +27,5 @@ _Alignas, _Alignof, __alignof, __alignof__, asm, __asm, __asm__, __attribute, __attribute__, auto, bool, _Bool, catch, catchResume, choose, _Complex, __complex, __complex__, __const, __const__, - coroutine, disable, dtype, enable, exception, __extension__, fallthrough, fallthru, finally, + coroutine, disable, dtype, enable, exception, __extension__, fallthrough, finally, __float80, float80, __float128, float128, forall, ftype, _Generic, _Imaginary, __imag, __imag__, inline, __inline, __inline__, __int128, int128, __label__, monitor, mutex, _Noreturn, one_t, or, Index: doc/theses/andrew_beach_MMath/cfalab.sty =================================================================== --- doc/theses/andrew_beach_MMath/cfalab.sty (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ doc/theses/andrew_beach_MMath/cfalab.sty (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -76,5 +76,5 @@ choose, _Complex, __complex, __complex__, __const, __const__, coroutine, disable, dtype, enable, exception, __extension__, - fallthrough, fallthru, finally, __float80, float80, __float128, + fallthrough, finally, __float80, float80, __float128, float128, forall, ftype, generator, _Generic, _Imaginary, __imag, __imag__, inline, __inline, __inline__, __int128, int128, __label__, Index: doc/theses/andrew_beach_MMath/features.tex =================================================================== --- doc/theses/andrew_beach_MMath/features.tex (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ doc/theses/andrew_beach_MMath/features.tex (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -822,5 +822,5 @@ control flow. Because of this requirement, local control flow out of the finally block -is forbidden. The compiler precludes any @break@, @continue@, @fallthru@ or +is forbidden. The compiler precludes any @break@, @continue@, @fallthrough@ or @return@ that causes control to leave the finally block. Other ways to leave the finally block, such as a @longjmp@ or termination are much harder to check, Index: doc/uC++toCFA/uC++toCFA.tex =================================================================== --- doc/uC++toCFA/uC++toCFA.tex (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ doc/uC++toCFA/uC++toCFA.tex (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -11,6 +11,6 @@ %% Created On : Wed Apr 6 14:53:29 2016 %% Last Modified By : Peter A. Buhr -%% Last Modified On : Thu Jan 16 11:49:47 2025 -%% Update Count : 6281 +%% Last Modified On : Fri Jan 17 07:39:09 2025 +%% Update Count : 6284 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -588,37 +588,4 @@ -\section{Thread} - -\begin{cquote} -\begin{tabular}{@{}l|ll@{}} -\begin{uC++} - -@_Task@ T { - // private task fields - void main() { - ... @_Resume E( ... ) _At partner@; - ... @uThisTask();@ ... - } - public: -}; -\end{uC++} -& -\begin{cfa} -#include <$thread$.hfa> -@thread@ T { - // private task fields - -}; -void main( @T & t@ ) { - ... @resumeAt( partner, ExceptionInst( E, ... )@ ); - ... @active_thread();@ ... -} -\end{cfa} -\\ -\multicolumn{2}{@{}l@{}}{\lstinline{T t; // start thread in main routine}} -\end{tabular} -\end{cquote} - - \section{\lstinline{COBEGIN}/\lstinline{COFOR}} @@ -634,5 +601,4 @@ BEGIN osacquire( cout ) << "C" << endl; END BEGIN osacquire( cout ) << "D" << endl; END - BEGIN osacquire( cout ) << "E" << endl; END @COEND@ @COFOR@( i, 1, 10, @@ -651,5 +617,4 @@ corun { mutex( sout ) sout | "C"; } corun { mutex( sout ) sout | "D"; } - corun { mutex( sout ) sout | "E"; } } @cofor@( i; 10 ) { @@ -735,4 +700,37 @@ } \end{cfa} +\end{tabular} +\end{cquote} + + +\section{Thread} + +\begin{cquote} +\begin{tabular}{@{}l|ll@{}} +\begin{uC++} + +@_Task@ T { + // private task fields + void main() { + ... @_Resume E( ... ) _At partner@; + ... @uThisTask();@ ... + } + public: +}; +\end{uC++} +& +\begin{cfa} +#include <$thread$.hfa> +@thread@ T { + // private task fields + +}; +void main( @T & t@ ) { + ... @resumeAt( partner, ExceptionInst( E, ... )@ ); + ... @active_thread();@ ... +} +\end{cfa} +\\ +\multicolumn{2}{@{}l@{}}{\lstinline{T t; // start thread in main routine}} \end{tabular} \end{cquote} Index: doc/user/user.tex =================================================================== --- doc/user/user.tex (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ doc/user/user.tex (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -11,6 +11,6 @@ %% Created On : Wed Apr 6 14:53:29 2016 %% Last Modified By : Peter A. Buhr -%% Last Modified On : Sat Dec 7 16:53:37 2024 -%% Update Count : 6970 +%% Last Modified On : Fri Jan 17 14:20:39 2025 +%% Update Count : 6971 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -893,5 +893,5 @@ still works. 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 \Indexc{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 \Indexc{fallthrough}/\-\Indexc{fallthru}, \eg: +Therefore, to preserve backwards compatibility, it is necessary to introduce a new kind of ©switch© statement, called \Indexc{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 \Indexc{fallthrough}, \eg: \begin{cfa} ®choose® ( i ) { @@ -901,5 +901,5 @@ case 5: ... - ®fallthru®; §\C{// explicit fall through}§ + ®fallthrough®; §\C{// explicit fall through}§ case 7: ... @@ -911,5 +911,5 @@ Like the ©switch© statement, the ©choose© statement retains the fall-through semantics for a list of ©case© clauses. An implicit ©break© is applied only at the end of the \emph{statements} following a ©case© clause. -An explicit ©fallthru© is retained because it is a C-idiom most C programmers expect, and its absence might discourage programmers from using the ©choose© statement. +An explicit ©fallthrough© is retained because it is a C-idiom most C programmers expect, and its absence might discourage programmers from using the ©choose© statement. As well, allowing an explicit ©break© from the ©choose© is a carry over from the ©switch© statement, and expected by C programmers. \item @@ -950,5 +950,5 @@ case 3: if ( ... ) { - ... ®fallthru;® // goto case 4 + ... ®fallthrough;® // goto case 4 } else { ... @@ -985,5 +985,5 @@ for ( ... ) { // multi-level transfer - ... ®fallthru common;® + ... ®fallthrough common;® } ... @@ -8053,5 +8053,5 @@ \begin{cquote} \Indexc{basetypeof}, \Indexc{choose}, \Indexc{coroutine}, \Indexc{disable}, -\Indexc{enable}, \Indexc{exception}, \Indexc{fallthrough}, \Indexc{fallthru}, +\Indexc{enable}, \Indexc{exception}, \Indexc{fallthrough}, \Indexc{fallthrough}, \Indexc{finally}, \Indexc{fixup}, \Indexc{forall},\Indexc{generator}, \Indexc{int128}, \Indexc{monitor}, \Indexc{mutex}, \Indexc{one_t}, @@ -8079,5 +8079,5 @@ \Indexc{exception} \\ \Indexc{fallthrough} \\ -\Indexc{fallthru} \\ +\Indexc{fallthrough} \\ \end{tabular} & Index: src/AST/Stmt.hpp =================================================================== --- src/AST/Stmt.hpp (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ src/AST/Stmt.hpp (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -9,7 +9,7 @@ // Author : Aaron B. Moss // Created On : Wed May 8 13:00:00 2019 -// Last Modified By : Andrew Beach -// Last Modified On : Wed Apr 5 10:34:00 2023 -// Update Count : 37 +// Last Modified By : Peter A. Buhr +// Last Modified On : Fri Jan 17 14:18:56 2025 +// Update Count : 38 // @@ -280,5 +280,5 @@ }; -// Branch control flow statement: goto ... or break or continue or fallthru +// Branch control flow statement: goto ... or break or continue or fallthrough class BranchStmt final : public Stmt { public: Index: src/CodeGen/CodeGenerator.cpp =================================================================== --- src/CodeGen/CodeGenerator.cpp (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ src/CodeGen/CodeGenerator.cpp (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -9,7 +9,7 @@ // Author : Andrew Beach // Created On : Tue Oct 17 15:54:00 2023 -// Last Modified By : Andrew Beach -// Last Modified On : Wed Oct 25 18:28:00 2023 -// Update Count : 0 +// Last Modified By : Peter A. Buhr +// Last Modified On : Fri Jan 17 14:19:22 2025 +// Update Count : 1 // @@ -1092,11 +1092,11 @@ case ast::BranchStmt::FallThrough: case ast::BranchStmt::FallThroughDefault: - assertf( !options.genC, "fallthru should not reach code generation." ); - output << "fallthru"; + assertf( !options.genC, "fallthrough should not reach code generation." ); + output << "fallthrough"; break; default: assertf( false, "Bad BranchStmt value." ); } - // Print branch target for labelled break/continue/fallthru in debug mode. + // Print branch target for labelled break/continue/fallthrough in debug mode. if ( !options.genC && stmt->kind != ast::BranchStmt::Goto ) { if ( !stmt->target.empty() ) { Index: src/Parser/lex.ll =================================================================== --- src/Parser/lex.ll (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ src/Parser/lex.ll (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -10,6 +10,6 @@ * Created On : Sat Sep 22 08:58:10 2001 * Last Modified By : Peter A. Buhr - * Last Modified On : Sun Dec 15 17:23:46 2024 - * Update Count : 877 + * Last Modified On : Fri Jan 17 14:36:16 2025 + * Update Count : 878 */ @@ -273,5 +273,4 @@ extern { KEYWORD_RETURN(EXTERN); } fallthrough { KEYWORD_RETURN(FALLTHROUGH); } // CFA -fallthru { KEYWORD_RETURN(FALLTHRU); } // CFA finally { QKEYWORD_RETURN(FINALLY); } // CFA fixup { QKEYWORD_RETURN(FIXUP); } // CFA Index: src/Parser/parser.yy =================================================================== --- src/Parser/parser.yy (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ src/Parser/parser.yy (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -10,6 +10,6 @@ // Created On : Sat Sep 1 20:22:55 2001 // Last Modified By : Peter A. Buhr -// Last Modified On : Sun Dec 15 21:30:38 2024 -// Update Count : 6933 +// Last Modified On : Fri Jan 17 14:35:08 2025 +// Update Count : 6935 // @@ -377,5 +377,5 @@ %token ATTRIBUTE EXTENSION // GCC %token IF ELSE SWITCH CASE DEFAULT DO WHILE FOR BREAK CONTINUE GOTO RETURN -%token CHOOSE FALLTHRU FALLTHROUGH WITH WHEN WAITFOR WAITUNTIL // CFA +%token CHOOSE FALLTHROUGH WITH WHEN WAITFOR WAITUNTIL // CFA %token CORUN COFOR %token DISABLE ENABLE TRY THROW THROWRESUME AT // CFA @@ -1680,10 +1680,10 @@ // whereas normal operator precedence yields goto (*i)+3; { $$ = new StatementNode( build_computedgoto( $3 ) ); } - // A semantic check is required to ensure fallthru appears only in the body of a choose statement. - | fall_through_name ';' // CFA + // A semantic check is required to ensure fallthrough appears only in the body of a choose statement. + | FALLTHROUGH ';' // CFA { $$ = new StatementNode( build_branch( yylloc, ast::BranchStmt::FallThrough ) ); } - | fall_through_name identifier_or_type_name ';' // CFA + | FALLTHROUGH identifier_or_type_name ';' // CFA { $$ = new StatementNode( build_branch( yylloc, $2, ast::BranchStmt::FallThrough ) ); } - | fall_through_name DEFAULT ';' // CFA + | FALLTHROUGH DEFAULT ';' // CFA { $$ = new StatementNode( build_branch( yylloc, ast::BranchStmt::FallThroughDefault ) ); } | CONTINUE ';' @@ -1723,9 +1723,4 @@ | THROWRESUME assignment_expression_opt AT assignment_expression ';' // handles reresume { $$ = new StatementNode( build_resume_at( $2, $4 ) ); } - ; - -fall_through_name: // CFA - FALLTHRU - | FALLTHROUGH ; Index: tests/concurrency/actors/dynamic.cfa =================================================================== --- tests/concurrency/actors/dynamic.cfa (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ tests/concurrency/actors/dynamic.cfa (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -37,5 +37,5 @@ if ( strcmp( argv[1], "d" ) != 0 ) { // default ? Times = ato( argv[1] ); - if ( Times < 1 ) fallthru default; + if ( Times < 1 ) fallthrough default; } // if case 1: // use defaults Index: tests/concurrency/actors/executor.cfa =================================================================== --- tests/concurrency/actors/executor.cfa (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ tests/concurrency/actors/executor.cfa (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -41,30 +41,30 @@ if ( strcmp( argv[6], "d" ) != 0 ) { // default ? BufSize = ato( argv[6] ); - if ( BufSize < 0 ) fallthru default; + if ( BufSize < 0 ) fallthrough default; } // if case 6: if ( strcmp( argv[5], "d" ) != 0 ) { // default ? Batch = ato( argv[5] ); - if ( Batch < 1 ) fallthru default; + if ( Batch < 1 ) fallthrough default; } // if case 5: if ( strcmp( argv[4], "d" ) != 0 ) { // default ? Processors = ato( argv[4] ); - if ( Processors < 1 ) fallthru default; + if ( Processors < 1 ) fallthrough default; } // if case 4: if ( strcmp( argv[3], "d" ) != 0 ) { // default ? Rounds = ato( argv[3] ); - if ( Rounds < 1 ) fallthru default; + if ( Rounds < 1 ) fallthrough default; } // if case 3: if ( strcmp( argv[2], "d" ) != 0 ) { // default ? Set = ato( argv[2] ); - if ( Set < 1 ) fallthru default; + if ( Set < 1 ) fallthrough default; } // if case 2: if ( strcmp( argv[1], "d" ) != 0 ) { // default ? Actors = ato( argv[1] ); - if ( Actors < 1 || Actors <= Set || Actors % Set != 0 ) fallthru default; + if ( Actors < 1 || Actors <= Set || Actors % Set != 0 ) fallthrough default; } // if case 1: // use defaults Index: tests/concurrency/actors/matrixMultiply.cfa =================================================================== --- tests/concurrency/actors/matrixMultiply.cfa (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ tests/concurrency/actors/matrixMultiply.cfa (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -39,20 +39,20 @@ if ( strcmp( argv[4], "d" ) != 0 ) { // default ? Processors = ato( argv[4] ); - if ( Processors < 1 ) fallthru default; + if ( Processors < 1 ) fallthrough default; } // if case 4: if ( strcmp( argv[3], "d" ) != 0 ) { // default ? xr = ato( argv[3] ); - if ( xr < 1 ) fallthru default; + if ( xr < 1 ) fallthrough default; } // if case 3: if ( strcmp( argv[2], "d" ) != 0 ) { // default ? xc = ato( argv[2] ); - if ( xc < 1 ) fallthru default; + if ( xc < 1 ) fallthrough default; } // if case 2: if ( strcmp( argv[1], "d" ) != 0 ) { // default ? yc = ato( argv[1] ); - if ( yc < 1 ) fallthru default; + if ( yc < 1 ) fallthrough default; } // if case 1: // use defaults Index: tests/concurrency/actors/static.cfa =================================================================== --- tests/concurrency/actors/static.cfa (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ tests/concurrency/actors/static.cfa (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -34,5 +34,5 @@ if ( strcmp( argv[1], "d" ) != 0 ) { // default ? Times = ato( argv[1] ); - if ( Times < 1 ) fallthru default; + if ( Times < 1 ) fallthrough default; } // if case 1: // use defaults Index: tests/concurrency/channels/barrier.cfa =================================================================== --- tests/concurrency/channels/barrier.cfa (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ tests/concurrency/channels/barrier.cfa (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -66,10 +66,10 @@ if ( strcmp( argv[2], "d" ) != 0 ) { // default ? BarrierSize = ato( argv[2] ); - if ( Processors < 1 ) fallthru default; + if ( Processors < 1 ) fallthrough default; } // if case 2: if ( strcmp( argv[1], "d" ) != 0 ) { // default ? Processors = ato( argv[1] ); - if ( Processors < 1 ) fallthru default; + if ( Processors < 1 ) fallthrough default; } // if case 1: // use defaults Index: tests/concurrency/channels/churn.cfa =================================================================== --- tests/concurrency/channels/churn.cfa (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ tests/concurrency/channels/churn.cfa (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -91,15 +91,15 @@ if ( strcmp( argv[3], "d" ) != 0 ) { // default ? ChannelSize = ato( argv[3] ); - if ( ChannelSize < 1 ) fallthru default; + if ( ChannelSize < 1 ) fallthrough default; } // if case 3: if ( strcmp( argv[2], "d" ) != 0 ) { // default ? Channels = ato( argv[2] ); - if ( Channels < 1 ) fallthru default; + if ( Channels < 1 ) fallthrough default; } // if case 2: if ( strcmp( argv[1], "d" ) != 0 ) { // default ? Processors = ato( argv[1] ); - if ( Processors < 1 ) fallthru default; + if ( Processors < 1 ) fallthrough default; } // if case 1: // use defaults Index: tests/concurrency/channels/contend.cfa =================================================================== --- tests/concurrency/channels/contend.cfa (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ tests/concurrency/channels/contend.cfa (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -128,10 +128,10 @@ if ( strcmp( argv[2], "d" ) != 0 ) { // default ? ChannelSize = ato( argv[2] ); - if ( ChannelSize < 1 ) fallthru default; + if ( ChannelSize < 1 ) fallthrough default; } // if case 2: if ( strcmp( argv[1], "d" ) != 0 ) { // default ? Processors = ato( argv[1] ); - if ( Processors < 1 ) fallthru default; + if ( Processors < 1 ) fallthrough default; } // if case 1: // use defaults Index: tests/concurrency/channels/daisy_chain.cfa =================================================================== --- tests/concurrency/channels/daisy_chain.cfa (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ tests/concurrency/channels/daisy_chain.cfa (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -38,10 +38,10 @@ if ( strcmp( argv[2], "d" ) != 0 ) { // default ? Tasks = ato( argv[2] ); - if ( Tasks < 1 ) fallthru default; + if ( Tasks < 1 ) fallthrough default; } // if case 2: if ( strcmp( argv[1], "d" ) != 0 ) { // default ? Processors = ato( argv[1] ); - if ( Processors < 1 ) fallthru default; + if ( Processors < 1 ) fallthrough default; } // if case 1: // use defaults Index: tests/concurrency/channels/hot_potato.cfa =================================================================== --- tests/concurrency/channels/hot_potato.cfa (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ tests/concurrency/channels/hot_potato.cfa (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -43,10 +43,10 @@ if ( strcmp( argv[2], "d" ) != 0 ) { // default ? Tasks = ato( argv[2] ); - if ( Tasks < 1 ) fallthru default; + if ( Tasks < 1 ) fallthrough default; } // if case 2: if ( strcmp( argv[1], "d" ) != 0 ) { // default ? Processors = ato( argv[1] ); - if ( Processors < 1 ) fallthru default; + if ( Processors < 1 ) fallthrough default; } // if case 1: // use defaults Index: tests/concurrency/channels/pub_sub.cfa =================================================================== --- tests/concurrency/channels/pub_sub.cfa (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ tests/concurrency/channels/pub_sub.cfa (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -88,10 +88,10 @@ if ( strcmp( argv[2], "d" ) != 0 ) { // default ? Tasks = ato( argv[2] ); - if ( Tasks < 1 ) fallthru default; + if ( Tasks < 1 ) fallthrough default; } // if case 2: if ( strcmp( argv[1], "d" ) != 0 ) { // default ? Processors = ato( argv[1] ); - if ( Processors < 1 ) fallthru default; + if ( Processors < 1 ) fallthrough default; } // if case 1: // use defaults Index: tests/ctrl-flow/fallthrough.cfa =================================================================== --- tests/ctrl-flow/fallthrough.cfa (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ tests/ctrl-flow/fallthrough.cfa (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -10,6 +10,6 @@ // Created On : Wed Mar 14 10:06:25 2018 // Last Modified By : Peter A. Buhr -// Last Modified On : Mon Dec 24 11:24:35 2018 -// Update Count : 22 +// Last Modified On : Fri Jan 17 14:09:49 2025 +// Update Count : 23 // @@ -20,15 +20,15 @@ case 1: sout | "case 1"; - fallthru; + fallthrough; case 2: sout | "case 2"; - fallthru; - sout | "did not fallthru"; - if ( 7 ) fallthru common2; - fallthru common1; + fallthrough; + sout | "did not fallthrough"; + if ( 7 ) fallthrough common2; + fallthrough common1; case 3: sout | "case 3"; - fallthru default; - fallthru common1; + fallthrough default; + fallthrough common1; common1: sout | "common1"; @@ -36,12 +36,12 @@ case 4: sout | "case 4"; - fallthru common2; + fallthrough common2; case 5: sout | "case 5"; - fallthru common2; - fallthru default; + fallthrough common2; + fallthrough default; case 6: sout | "case 6"; - fallthru common2; + fallthrough common2; common2: sout | "common2"; @@ -49,5 +49,5 @@ default: sout | "default"; - fallthru; + fallthrough; } // choose @@ -62,5 +62,5 @@ for ( int i = 0; i < 4; i += 1 ) { sout | i; - if ( i == 2 ) fallthru common; + if ( i == 2 ) fallthrough common; } // for } // switch @@ -73,23 +73,23 @@ } else { sout | "check"; - fallthru common; + fallthrough common; } // if } // if common: sout | "common"; - fallthru; + fallthrough; break; default: sout | "default"; - fallthru; + fallthrough; } // switch #if ERR1 // ERROR: fallthrough must be enclosed in switch or choose - fallthru; + fallthrough; // ERROR: fallthrough must be enclosed in switch or choose - fallthru common4; + fallthrough common4; // ERROR: fallthrough must be enclosed in switch or choose - fallthru default; + fallthrough default; choose ( 3 ) { case 2: @@ -98,7 +98,7 @@ case 1: // ERROR: default is later, but in a different switch - fallthru default; + fallthrough default; // ERROR: common3 is later, but not at the same level as a case clause - fallthru common3; + fallthrough common3; } common3: ; @@ -108,7 +108,7 @@ common4: // ERROR: attempt to jump up with fallthrough - if ( 7 ) fallthru common4; + if ( 7 ) fallthrough common4; // ERROR: attempt to jump up with fallthrough - fallthru default; + fallthrough default; } // choose #endif Index: tests/ctrl-flow/labelledExit.cfa =================================================================== --- tests/ctrl-flow/labelledExit.cfa (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ tests/ctrl-flow/labelledExit.cfa (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -10,6 +10,6 @@ // Created On : Wed Aug 10 07:29:39 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Sat Jun 5 10:07:34 2021 -// Update Count : 13 +// Last Modified On : Fri Jan 17 14:18:15 2025 +// Update Count : 14 // @@ -131,5 +131,5 @@ break Choose; } - fallthru; + fallthrough; case 2: i += 1; Index: tests/exceptions/try-ctrl-flow.cfa =================================================================== --- tests/exceptions/try-ctrl-flow.cfa (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ tests/exceptions/try-ctrl-flow.cfa (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -81,9 +81,9 @@ } -void choose_fallthru_in_finally() { +void choose_fallthrough_in_finally() { choose (1) { case 1: try {} finally { - fallthru; + fallthrough; } default: @@ -105,9 +105,9 @@ } -void labelled_choose_fallthru_in_finally() { +void labelled_choose_fallthrough_in_finally() { mainBlock: choose (1) { case 1: try {} finally { - fallthru mainBlock; + fallthrough mainBlock; } case 2: @@ -118,9 +118,9 @@ } -void choose_fallthru_default_in_finally() { +void choose_fallthrough_default_in_finally() { choose (1) { case 1: try {} finally { - fallthru default; + fallthrough default; } default: Index: tests/quotedKeyword.cfa =================================================================== --- tests/quotedKeyword.cfa (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ tests/quotedKeyword.cfa (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -10,6 +10,6 @@ // Created On : Wed May 27 17:56:53 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Thu Feb 23 20:31:05 2023 -// Update Count : 26 +// Last Modified On : Fri Jan 17 14:10:32 2025 +// Update Count : 27 // @@ -29,5 +29,5 @@ ``__attribute__, ``auto, ``_Bool, ``break, ``case, ``catch, ``catchResume, ``char, ``choose, ``_Complex, ``__complex, ``__complex__, ``const, ``__const, ``__const__, ``continue, ``default, ``disable, ``do, ``double, ``dtype, ``else, - ``enable, ``enum, ``__extension__, ``extern, ``fallthru, ``finally, ``float, ``__float128, ``for, ``forall, ``fortran, + ``enable, ``enum, ``__extension__, ``extern, ``fallthrough, ``finally, ``float, ``__float128, ``for, ``forall, ``fortran, ``ftype, ``_Generic, ``goto, ``if, ``_Imaginary, ``__imag, ``__imag__, ``inline, ``__inline, ``__inline__, ``int, ``__int128, ``__label__, ``long, ``lvalue, ``_Noreturn, ``__builtin_offsetof, ``otype, ``register, ``restrict, Index: tests/switch.cfa =================================================================== --- tests/switch.cfa (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ tests/switch.cfa (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -10,6 +10,6 @@ // Created On : Tue Jul 12 06:50:22 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Sat Jun 5 10:08:20 2021 -// Update Count : 44 +// Last Modified On : Fri Jan 17 14:10:12 2025 +// Update Count : 45 // @@ -96,5 +96,5 @@ case 8~10: f( 3 ); - fallthru; + fallthrough; case 'd': j = 5; Index: tools/cforall.el =================================================================== --- tools/cforall.el (revision 3b340d68d89c49cede2f22a3aeb4c56382482c8d) +++ tools/cforall.el (revision d96f7c4f1e2b7dfb521e83969e9704b7e12505da) @@ -118,5 +118,5 @@ ;; Statements "break" "catch" "choose" "context" - "continue" "do" "else" "fallthru" "for" "if" "return" + "continue" "do" "else" "fallthrough" "for" "if" "return" "sizeof" "switch" "throw" "try" ;c-cfa-typeof-re "while"