Index: doc/bibliography/pl.bib =================================================================== --- doc/bibliography/pl.bib (revision 8a5530c3a15f736eaece69b227492df67f2bbd89) +++ doc/bibliography/pl.bib (revision f2e482cbe316b0e182c5db2642a29b655cb00f49) @@ -1919,4 +1919,14 @@ year = 1965, note = {Reprinted in \cite{Genuys68} pp. 43--112.} +} + +@manual{C++20Coroutine19, + keywords = {coroutine}, + contributer = {pabuhr@plg}, + title = {Coroutines (C++20)}, + organization= {cppreference.com}, + month = apr, + year = 2019, + note = {\href{https://en.cppreference.com/w/cpp/language/coroutines}{https://\-en.cppreference.com/\-w/\-cpp/\-language/\-coroutines}}, } Index: libcfa/src/fstream.cfa =================================================================== --- libcfa/src/fstream.cfa (revision 8a5530c3a15f736eaece69b227492df67f2bbd89) +++ libcfa/src/fstream.cfa (revision f2e482cbe316b0e182c5db2642a29b655cb00f49) @@ -10,6 +10,6 @@ // Created On : Wed May 27 17:56:53 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Sat Apr 20 12:03:43 2019 -// Update Count : 311 +// Last Modified On : Thu May 16 08:33:28 2019 +// Update Count : 328 // @@ -27,14 +27,14 @@ #define IO_MSG "I/O error: " -void ?{}( ofstream & os, void * file, bool sepDefault, bool sepOnOff, bool nlOnOff, bool prt, const char * separator, const char * tupleSeparator ) { +void ?{}( ofstream & os, void * file ) { os.file = file; - os.sepDefault = sepDefault; - os.sepOnOff = sepOnOff; - os.nlOnOff = nlOnOff; - os.prt = prt; + os.sepDefault = true; + os.sepOnOff = false; + os.nlOnOff = true; + os.prt = false; os.sawNL = false; - sepSet( os, separator ); + sepSet( os, " " ); sepSetCur( os, sepGet( os ) ); - sepSetTuple( os, tupleSeparator ); + sepSetTuple( os, ", " ); } @@ -104,5 +104,5 @@ void open( ofstream & os, const char * name, const char * mode ) { - FILE *file = fopen( name, mode ); + FILE * file = fopen( name, mode ); #ifdef __CFA_DEBUG__ if ( file == 0 ) { @@ -110,5 +110,5 @@ } // if #endif // __CFA_DEBUG__ - (os){ file, true, false, true, false, " ", ", " }; + (os){ file }; } // open @@ -152,9 +152,18 @@ } // fmt -static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_), true, false, true, false, " ", ", " }; +static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_) }; ofstream & sout = soutFile; -static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_), true, false, true, false, " ", ", " }; +static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_) }; ofstream & serr = serrFile; +// static ofstream sexitFile = { (FILE *)(&_IO_2_1_stdout_) }; +// ofstream & sexit = sexitFile; +// static ofstream sabortFile = { (FILE *)(&_IO_2_1_stderr_) }; +// ofstream & sabort = sabortFile; + +void nl( ofstream & os ) { + if ( getANL( os ) ) (ofstream &)(nl( os )); // implementation only + else setPrt( os, false ); // turn off +} //--------------------------------------- Index: libcfa/src/fstream.hfa =================================================================== --- libcfa/src/fstream.hfa (revision 8a5530c3a15f736eaece69b227492df67f2bbd89) +++ libcfa/src/fstream.hfa (revision f2e482cbe316b0e182c5db2642a29b655cb00f49) @@ -10,6 +10,6 @@ // Created On : Wed May 27 17:56:53 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Sat Apr 20 12:03:58 2019 -// Update Count : 151 +// Last Modified On : Thu May 16 08:34:10 2019 +// Update Count : 157 // @@ -70,4 +70,7 @@ extern ofstream & sout, & serr; +// extern ofstream & sout, & serr, & sexit, & sabort; +// void nl( ofstream & os ); + struct ifstream { Index: libcfa/src/iostream.cfa =================================================================== --- libcfa/src/iostream.cfa (revision 8a5530c3a15f736eaece69b227492df67f2bbd89) +++ libcfa/src/iostream.cfa (revision f2e482cbe316b0e182c5db2642a29b655cb00f49) @@ -10,6 +10,6 @@ // Created On : Wed May 27 17:56:53 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Sat Apr 20 14:02:43 2019 -// Update Count : 617 +// Last Modified On : Mon May 13 12:46:45 2019 +// Update Count : 650 // @@ -23,4 +23,5 @@ extern size_t strlen (const char *__s) __attribute__ ((__nothrow__ , __leaf__)) __attribute__ ((__pure__)) __attribute__ ((__nonnull__ (1))); #include // DBL_DIG, LDBL_DIG +#include // modff, modf, modlf #include // creal, cimag } @@ -156,4 +157,6 @@ if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) ); fmt( os, "%g", f ); + float tempi; + if ( isfinite( f ) && modff( f, &tempi ) == 0.0F ) fmt( os, "." ); // always print decimal point return os; } // ?|? @@ -165,4 +168,7 @@ if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) ); fmt( os, "%.*lg", DBL_DIG, d ); + // fmt( os, "%lg", d ); + double tempi; + if ( isfinite( d ) && modf( d, &tempi ) == 0.0D ) fmt( os, "." ); // always print decimal point return os; } // ?|? @@ -174,4 +180,7 @@ if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) ); fmt( os, "%.*Lg", LDBL_DIG, ld ); + // fmt( os, "%Lg", ld ); + long double tempi; + if ( isfinite( ld ) && modfl( ld, &tempi ) == 0.0L ) fmt( os, "." ); // always print decimal point return os; } // ?|? @@ -182,5 +191,11 @@ ostype & ?|?( ostype & os, float _Complex fc ) { if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) ); - fmt( os, "%g%+gi", crealf( fc ), cimagf( fc ) ); + float temp = crealf( fc ), tempi; + fmt( os, "%g", temp ); + if ( isfinite( temp ) && modff( temp, &tempi ) == 0.0F ) fmt( os, "." ); // always print decimal point + temp = cimagf( fc ); + fmt( os, "%+g", temp ); + if ( isfinite( temp ) && modff( temp, &tempi ) == 0.0F ) fmt( os, "." ); // always print decimal point + fmt( os, "i" ); return os; } // ?|? @@ -191,5 +206,12 @@ ostype & ?|?( ostype & os, double _Complex dc ) { if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) ); - fmt( os, "%.*lg%+.*lgi", DBL_DIG, creal( dc ), DBL_DIG, cimag( dc ) ); + double temp = creal( dc ), tempi; + fmt( os, "%.*lg", DBL_DIG, temp ); + if ( isfinite( temp ) && modf( temp, &tempi ) == 0.0D ) fmt( os, "." ); // always print decimal point + temp = cimag( dc ); + fmt( os, "%+.*lg", DBL_DIG, temp ); + if ( isfinite( temp ) && modf( temp, &tempi ) == 0.0D ) fmt( os, "." ); // always print decimal point + fmt( os, "i" ); + // fmt( os, "%lg%+lgi", creal( dc ), cimag( dc ) ); return os; } // ?|? @@ -200,5 +222,12 @@ ostype & ?|?( ostype & os, long double _Complex ldc ) { if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) ); - fmt( os, "%.*Lg%+.*Lgi", LDBL_DIG, creall( ldc ), LDBL_DIG, cimagl( ldc ) ); + long double temp = creall( ldc ), tempi; + fmt( os, "%.*Lg", LDBL_DIG, temp ); + if ( isfinite( temp ) && modfl( temp, &tempi ) == 0.0L ) fmt( os, "." ); // always print decimal point + temp = cimagl( ldc ); + fmt( os, "%+.*Lg", LDBL_DIG, cimagl( ldc ) ); + if ( isfinite( temp ) && modfl( temp, &tempi ) == 0.0L ) fmt( os, "." ); // always print decimal point + fmt( os, "i" ); + // fmt( os, "%Lg%+Lgi", creall( ldc ), cimagl( ldc ) ); return os; } // ?|? @@ -494,5 +523,4 @@ } // ?|? - // manipulators istype & ?|?( istype & is, istype & (* manip)( istype & ) ) { @@ -501,5 +529,5 @@ istype & nl( istype & is ) { - fmt( is, "%*[ \t\f\n\r\v]" ); // ignore whitespace + fmt( is, "%*[^\n]" ); // ignore characters to newline return is; } // nl Index: libcfa/src/iostream.hfa =================================================================== --- libcfa/src/iostream.hfa (revision 8a5530c3a15f736eaece69b227492df67f2bbd89) +++ libcfa/src/iostream.hfa (revision f2e482cbe316b0e182c5db2642a29b655cb00f49) @@ -10,6 +10,6 @@ // Created On : Wed May 27 17:56:53 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Fri May 3 22:55:04 2019 -// Update Count : 230 +// Last Modified On : Sat May 11 10:31:27 2019 +// Update Count : 232 // @@ -190,8 +190,8 @@ // manipulators + istype & ?|?( istype &, istype & (*)( istype & ) ); + istype & nl( istype & is ); istype & nlOn( istype & ); istype & nlOff( istype & ); - istype & ?|?( istype &, istype & (*)( istype & ) ); - istype & nl( istype & is ); } // distribution @@ -215,5 +215,4 @@ // Local Variables: // -// mode: c // // tab-width: 4 // // End: // Index: src/Parser/lex.ll =================================================================== --- src/Parser/lex.ll (revision 8a5530c3a15f736eaece69b227492df67f2bbd89) +++ src/Parser/lex.ll (revision f2e482cbe316b0e182c5db2642a29b655cb00f49) @@ -10,6 +10,6 @@ * Created On : Sat Sep 22 08:58:10 2001 * Last Modified By : Peter A. Buhr - * Last Modified On : Wed Mar 13 14:54:30 2019 - * Update Count : 707 + * Last Modified On : Wed May 15 21:25:27 2019 + * Update Count : 708 */ @@ -265,4 +265,5 @@ fortran { KEYWORD_RETURN(FORTRAN); } ftype { KEYWORD_RETURN(FTYPE); } // CFA +generator { KEYWORD_RETURN(GENERATOR); } // CFA _Generic { KEYWORD_RETURN(GENERIC); } // C11 goto { KEYWORD_RETURN(GOTO); } Index: src/Parser/parser.yy =================================================================== --- src/Parser/parser.yy (revision 8a5530c3a15f736eaece69b227492df67f2bbd89) +++ src/Parser/parser.yy (revision f2e482cbe316b0e182c5db2642a29b655cb00f49) @@ -10,6 +10,6 @@ // Created On : Sat Sep 1 20:22:55 2001 // Last Modified By : Peter A. Buhr -// Last Modified On : Mon Apr 15 15:02:56 2019 -// Update Count : 4290 +// Last Modified On : Wed May 15 21:25:27 2019 +// Update Count : 4296 // @@ -173,5 +173,5 @@ DeclarationNode * fieldDecl( DeclarationNode * typeSpec, DeclarationNode * fieldList ) { if ( ! fieldList ) { // field declarator ? - if ( ! ( typeSpec->type && typeSpec->type->kind == TypeData::Aggregate ) ) { + if ( ! ( typeSpec->type && (typeSpec->type->kind == TypeData::Aggregate || typeSpec->type->kind == TypeData::Enum) ) ) { stringstream ss; typeSpec->type->print( ss ); @@ -275,5 +275,5 @@ %token ENUM STRUCT UNION %token EXCEPTION // CFA -%token COROUTINE MONITOR THREAD // CFA +%token GENERATOR COROUTINE MONITOR THREAD // CFA %token OTYPE FTYPE DTYPE TTYPE TRAIT // CFA %token SIZEOF OFFSETOF @@ -677,5 +677,5 @@ // empty { $$ = nullptr; } - | '?' // CFA, default parameter + | '@' // CFA, default parameter { SemanticError( yylloc, "Default parameter for argument is currently unimplemented." ); $$ = nullptr; } // { $$ = new ExpressionNode( build_constantInteger( *new string( "2" ) ) ); } @@ -796,4 +796,6 @@ { $$ = new ExpressionNode( build_cast( $2, $4 ) ); } // keyword cast cannot be grouped because of reduction in aggregate_key + | '(' GENERATOR '&' ')' cast_expression // CFA + { $$ = new ExpressionNode( build_keyword_cast( KeywordCastExpr::Coroutine, $5 ) ); } | '(' COROUTINE '&' ')' cast_expression // CFA { $$ = new ExpressionNode( build_keyword_cast( KeywordCastExpr::Coroutine, $5 ) ); } @@ -2061,4 +2063,6 @@ | EXCEPTION { yyy = true; $$ = DeclarationNode::Exception; } + | GENERATOR + { yyy = true; $$ = DeclarationNode::Coroutine; } | COROUTINE { yyy = true; $$ = DeclarationNode::Coroutine; } Index: tests/.expect/abs.txt =================================================================== --- tests/.expect/abs.txt (revision 8a5530c3a15f736eaece69b227492df67f2bbd89) +++ tests/.expect/abs.txt (revision f2e482cbe316b0e182c5db2642a29b655cb00f49) @@ -3,8 +3,8 @@ signed long int -65 abs 65 signed long long int -65 abs 65 -float -65 abs 65 -double -65 abs 65 -long double -65 abs 65 -float _Complex -65-2i abs 65.0308 -double _Complex -65-2i abs 65.0307619515564 -long double _Complex -65-2i abs 65.0307619515564342 +float -65. abs 65. +double -65. abs 65. +long double -65. abs 65. +float _Complex -65.-2.i abs 65.0308 +double _Complex -65.-2.i abs 65.0307619515564 +long double _Complex -65.-2.i abs 65.0307619515564342 Index: tests/.expect/ato.txt =================================================================== --- tests/.expect/ato.txt (revision 8a5530c3a15f736eaece69b227492df67f2bbd89) +++ tests/.expect/ato.txt (revision f2e482cbe316b0e182c5db2642a29b655cb00f49) @@ -22,5 +22,5 @@ -123.456789012345679 -123.45678901234567890123456789 -123.456-123.456i -123.456-123.456i -0+0i 2 3 +0.+0.i 2 3 -123.456789012346+123.456789012346i -123.4567890123456+123.4567890123456i 123.456789012345679-123.456789012345679i 123.45678901234567890123456789-123.45678901234567890123456789i Index: tests/.expect/complex.txt =================================================================== --- tests/.expect/complex.txt (revision 8a5530c3a15f736eaece69b227492df67f2bbd89) +++ tests/.expect/complex.txt (revision f2e482cbe316b0e182c5db2642a29b655cb00f49) @@ -1,4 +1,4 @@ x:3+2i y:4+5i z:7+7i -x:3+2i y:4+5i z:7+7i +x:3.+2.i y:4.+5.i z:7.+7.i x:2.1+1.3i y:3.2+4.5i z:5.3+5.8i x:2.1+1.3i y:3.2+4.5i z:5.3+5.8i Index: tests/.expect/identity.txt =================================================================== --- tests/.expect/identity.txt (revision 8a5530c3a15f736eaece69b227492df67f2bbd89) +++ tests/.expect/identity.txt (revision f2e482cbe316b0e182c5db2642a29b655cb00f49) @@ -9,5 +9,5 @@ double 4.1 long double 4.1 -float _Complex -4.1-2i -double _Complex -4.1-2i -long double _Complex -4.1-2i +float _Complex -4.1-2.i +double _Complex -4.1-2.i +long double _Complex -4.1-2.i Index: tests/.expect/math1.txt =================================================================== --- tests/.expect/math1.txt (revision 8a5530c3a15f736eaece69b227492df67f2bbd89) +++ tests/.expect/math1.txt (revision f2e482cbe316b0e182c5db2642a29b655cb00f49) @@ -1,13 +1,13 @@ -fmod:1 1 1 1 1 1 -remainder:-1 -1 -1 +fmod:1. 1. 1. 1. 1. 1. +remainder:-1. -1. -1. remquo:7 0.0999999 7 0.1 7 0.0999999999999999999 -div:7, 0.2 7, 0.2 7, 0.2 -fma:-2 -2 -2 -fdim:2 2 2 +div:7., 0.2 7., 0.2 7., 0.2 +fma:-2. -2. -2. +fdim:2. 2. 2. nan:nan nan nan exp:2.71828 2.71828182845905 2.71828182845904524 1.46869+2.28736i 1.46869393991589+2.28735528717884i 1.46869393991588516+2.28735528717884239i -exp2:2 2 2 +exp2:2. 2. 2. expm1:1.71828 1.71828182845905 1.71828182845904524 -pow:1 1 1 0.273957+0.583701i 0.273957253830121+0.583700758758615i -0.638110484918098871+0.705394566961838155i +pow:1. 1. 1. 0.273957+0.583701i 0.273957253830121+0.583700758758615i -0.638110484918098871+0.705394566961838155i 16 \ 2 = 256 912673 256 64 -64 0 0 Index: tests/.expect/math2.txt =================================================================== --- tests/.expect/math2.txt (revision 8a5530c3a15f736eaece69b227492df67f2bbd89) +++ tests/.expect/math2.txt (revision f2e482cbe316b0e182c5db2642a29b655cb00f49) @@ -1,10 +1,10 @@ -log:0 0 0 0.346574+0.785398i 0.346573590279973+0.785398163397448i 0.346573590279972655+0.78539816339744831i -log2:3 3 3 -log10:2 2 2 +log:0. 0. 0. 0.346574+0.785398i 0.346573590279973+0.785398163397448i 0.346573590279972655+0.78539816339744831i +log2:3. 3. 3. +log10:2. 2. 2. log1p:0.693147 0.693147180559945 0.693147180559945309 ilogb:0 0 0 -logb:3 3 3 -sqrt:1 1 1 1.09868+0.45509i 1.09868411346781+0.455089860562227i 1.09868411346780997+0.455089860562227341i -cbrt:3 3 3 +logb:3. 3. 3. +sqrt:1. 1. 1. 1.09868+0.45509i 1.09868411346781+0.455089860562227i 1.09868411346780997+0.455089860562227341i +cbrt:3. 3. 3. hypot:1.41421 1.4142135623731 1.41421356237309505 sin:0.841471 0.841470984807897 0.841470984807896507 1.29846+0.634964i 1.29845758141598+0.634963914784736i 1.29845758141597729+0.634963914784736108i @@ -12,5 +12,5 @@ tan:1.55741 1.5574077246549 1.55740772465490223 0.271753+1.08392i 0.271752585319512+1.08392332733869i 0.271752585319511717+1.08392332733869454i asin:1.5708 1.5707963267949 1.57079632679489662 0.666239+1.06128i 0.666239432492515+1.06127506190504i 0.666239432492515255+1.06127506190503565i -acos:0 0 0 0.904557-1.06128i 0.904556894302381-1.06127506190504i 0.904556894302381364-1.06127506190503565i +acos:0. 0. 0. 0.904557-1.06128i 0.904556894302381-1.06127506190504i 0.904556894302381364-1.06127506190503565i atan:0.785398 0.785398163397448 0.78539816339744831 1.01722+0.402359i 1.01722196789785+0.402359478108525i 1.01722196789785137+0.402359478108525094i atan2:0.785398 0.785398163397448 0.78539816339744831 atan:0.785398 0.785398163397448 0.78539816339744831 Index: tests/.expect/math3.txt =================================================================== --- tests/.expect/math3.txt (revision 8a5530c3a15f736eaece69b227492df67f2bbd89) +++ tests/.expect/math3.txt (revision f2e482cbe316b0e182c5db2642a29b655cb00f49) @@ -2,5 +2,5 @@ cosh:1.54308 1.54308063481524 1.54308063481524378 0.83373+0.988898i 0.833730025131149+0.988897705762865i 0.833730025131149049+0.988897705762865096i tanh:0.761594 0.761594155955765 0.761594155955764888 1.08392+0.271753i 1.08392332733869+0.271752585319512i 1.08392332733869454+0.271752585319511717i -acosh:0 0 0 1.06128+0.904557i 1.06127506190504+0.904556894302381i 1.06127506190503565+0.904556894302381364i +acosh:0. 0. 0. 1.06128+0.904557i 1.06127506190504+0.904556894302381i 1.06127506190503565+0.904556894302381364i asinh:0.881374 0.881373587019543 0.881373587019543025 1.06128+0.666239i 1.06127506190504+0.666239432492515i 1.06127506190503565+0.666239432492515255i atanh:inf inf inf 0.402359+1.01722i 0.402359478108525+1.01722196789785i 0.402359478108525094+1.01722196789785137i @@ -9,3 +9,3 @@ lgamma:1.79176 1.79175946922805 1.791759469228055 lgamma:1.79176 1 1.79175946922805 1 1.791759469228055 1 -tgamma:6 6 6 +tgamma:6 6. 6. Index: tests/.expect/math4.txt =================================================================== --- tests/.expect/math4.txt (revision 8a5530c3a15f736eaece69b227492df67f2bbd89) +++ tests/.expect/math4.txt (revision f2e482cbe316b0e182c5db2642a29b655cb00f49) @@ -1,23 +1,23 @@ -floor:1 1 1 -ceil:2 2 2 -trunc:3 3 3 -rint:2 2 2 +floor:1. 1. 1. +ceil:2. 2. 2. +trunc:3. 3. 3. +rint:2. 2. 2. rint:2 2 2 rint:2 2 2 lrint:2 2 2 llrint:2 2 2 -nearbyint:4 4 4 -round:2 2 2 +nearbyint:4. 4. 4. +round:2. 2. 2. round:2 2 2 round:2 2 2 lround:2 2 2 llround:2 2 2 -copysign:-1 -1 -1 +copysign:-1. -1. -1. frexp:0.5 3 0.5 3 0.5 3 -ldexp:8 8 8 -modf:2 0.3 2 0.3 2 0.3 -modf:2, 0.3 2, 0.3 2, 0.3 +ldexp:8. 8. 8. +modf:2. 0.3 2. 0.3 2. 0.3 +modf:2., 0.3 2., 0.3 2., 0.3 nextafter:2 2 2 nexttoward:2 2 2 -scalbn:16 16 16 -scalbln:16 16 16 +scalbn:16. 16. 16. +scalbln:16. 16. 16. Index: tests/.expect/minmax.txt =================================================================== --- tests/.expect/minmax.txt (revision 8a5530c3a15f736eaece69b227492df67f2bbd89) +++ tests/.expect/minmax.txt (revision f2e482cbe316b0e182c5db2642a29b655cb00f49) @@ -6,7 +6,7 @@ signed long long int 4 3 min 3 unsigned long long int 4 3 min 3 -float 4 3.1 min 3.1 -double 4 3.1 min 3.1 -long double 4 3.1 min 3.1 +float 4. 3.1 min 3.1 +double 4. 3.1 min 3.1 +long double 4. 3.1 min 3.1 char z a max z @@ -17,5 +17,5 @@ signed long long int 4 3 max 4 unsigned long long int 4 3 max 4 -float 4 3.1 max 4 -double 4 3.1 max 4 -long double 4 3.1 max 4 +float 4. 3.1 max 4. +double 4. 3.1 max 4. +long double 4. 3.1 max 4. Index: tests/.expect/references.txt =================================================================== --- tests/.expect/references.txt (revision 8a5530c3a15f736eaece69b227492df67f2bbd89) +++ tests/.expect/references.txt (revision f2e482cbe316b0e182c5db2642a29b655cb00f49) @@ -35,5 +35,5 @@ 3 3 -3 9 { 1, 7 }, [1, 2, 3] +3 9 { 1., 7. }, [1, 2, 3] Destructing a Y Destructing a Y