Index: src/BasicTypes-gen.cc =================================================================== --- src/BasicTypes-gen.cc (revision 114bde658eed1edf31cde78bd21584a1ced7df2e) +++ src/BasicTypes-gen.cc (revision b5cff2b64b43663f9c57bc2ae5a4d68f7d2f2a3c) @@ -70,17 +70,24 @@ } graph[NUMBER_OF_BASIC_TYPES] = { { Bool, "Bool", "B", "_Bool", "b", Signed, Char, SignedChar, -1, 0 }, // root + { Char, "Char", "C", "char", "c", Signed, SignedChar, UnsignedChar, ShortSignedInt, 1 }, { SignedChar, "SignedChar", "SC", "signed char", "a", Signed, UnsignedChar, ShortSignedInt, -1, 1 }, { UnsignedChar, "UnsignedChar", "UC", "unsigned char", "h", Unsigned, ShortUnsignedInt, ShortSignedInt, -1, 1 }, + { ShortSignedInt, "ShortSignedInt", "SI", "signed short int", "s", Signed, ShortUnsignedInt, SignedInt, -1, 2 }, { ShortUnsignedInt, "ShortUnsignedInt", "SUI", "unsigned short int", "t", Unsigned, UnsignedInt, SignedInt, -1, 2 }, + { SignedInt, "SignedInt", "I", "signed int", "i", Signed, UnsignedInt, LongSignedInt, -1, 3 }, { UnsignedInt, "UnsignedInt", "UI", "unsigned int", "j", Unsigned, LongUnsignedInt, LongSignedInt, -1, 3 }, + { LongSignedInt, "LongSignedInt", "LI", "signed long int", "l", Signed, LongUnsignedInt, LongLongSignedInt, -1, 4 }, { LongUnsignedInt, "LongUnsignedInt", "LUI", "unsigned long int", "m", Unsigned, LongLongSignedInt, LongLongUnsignedInt, -1, 4 }, + { LongLongSignedInt, "LongLongSignedInt", "LLI", "signed long long int", "x", Signed, LongLongUnsignedInt, SignedInt128, -1, 5 }, { LongLongUnsignedInt, "LongLongUnsignedInt", "LLUI", "unsigned long long int", "y", Unsigned, SignedInt128, UnsignedInt128, -1, 5 }, + { SignedInt128, "SignedInt128", "IB", "__int128", "n", Signed, UnsignedInt128, uFloat16, -1, 6 }, { UnsignedInt128, "UnsignedInt128", "UIB", "unsigned __int128", "o", Unsigned, uFloat16, -1, -1, 6 }, + { uFloat16, "uFloat16", "_FH", "_Float16", "DF16_", Floating, uFloat32, uFloat16Complex, -1, 7 }, { uFloat16Complex, "uFloat16Complex", "_FH", "_Float16 _Complex", "CDF16_", Floating, uFloat32Complex, -1, -1, 7 }, @@ -90,4 +97,5 @@ { FloatComplex, "FloatComplex", "FC", "float _Complex", "Cf", Floating, uFloat32xComplex, -1, -1, 9 }, // { FloatImaginary, "FloatImaginary", "FI", "float _Imaginary", "If", false, DoubleImaginary, FloatComplex, -1, 9 }, + { uFloat32x, "uFloat32x", "_FX", "_Float32x", "DF32x_", Floating, uFloat64, uFloat32xComplex, -1, 10 }, { uFloat32xComplex, "uFloat32xComplex", "_FXC", "_Float32x _Complex", "CDF32x_", Floating, uFloat64Complex, -1, -1, 10 }, @@ -97,4 +105,5 @@ { DoubleComplex, "DoubleComplex", "DC", "double _Complex", "Cd", Floating, uFloat64xComplex, -1, -1, 12 }, // { DoubleImaginary, "DoubleImaginary", "DI", "double _Imaginary", "Id", false, LongDoubleImaginary, DoubleComplex, -1, 12 }, + { uFloat64x, "uFloat64x", "F80X", "_Float64x", "DF64x_", Floating, uuFloat80, uFloat64xComplex, -1, 13 }, { uFloat64xComplex, "uFloat64xComplex", "_FDXC", "_Float64x _Complex", "CDF64x_", Floating, uFloat128Complex, -1, -1, 13 }, @@ -106,4 +115,5 @@ { LongDoubleComplex, "LongDoubleComplex", "LDC", "long double _Complex", "Ce", Floating, uFloat128xComplex, -1, -1, 17 }, // { LongDoubleImaginary, "LongDoubleImaginary", "LDI", "long double _Imaginary", "Ie", false, LongDoubleComplex, -1, -1, 17 }, + { uFloat128x, "uFloat128x", "_FBX", "_Float128x", "DF128x_", Floating, uFloat128xComplex, -1, -1, 18 }, { uFloat128xComplex, "uFloat128xComplex", "_FLDXC", "_Float128x _Complex", "CDF128x_", Floating, -1, -1, -1, 18 } @@ -250,6 +260,10 @@ #define STARTMK "// GENERATED START, DO NOT EDIT" - #define BYMK "// GENERATED BY " __FILE__ #define ENDMK "// GENERATED END" + string BYMK( __FILE__ ); + string::size_type posn = BYMK.find_last_of( "/" ); + if ( posn != string::npos ) BYMK.erase( 0, posn - 1); // remove directories + BYMK = "// GENERATED BY " + BYMK; + fstream file; stringstream buffer, code; Index: src/ControlStruct/ForExprMutator.cc =================================================================== --- src/ControlStruct/ForExprMutator.cc (revision 114bde658eed1edf31cde78bd21584a1ced7df2e) +++ src/ControlStruct/ForExprMutator.cc (revision b5cff2b64b43663f9c57bc2ae5a4d68f7d2f2a3c) @@ -9,7 +9,7 @@ // Author : Rodolfo G. Esteves // Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Andrew Beach -// Last Modified On : Fri Aug 18 10:22:00 2017 -// Update Count : 12 +// Last Modified By : Peter A. Buhr +// Last Modified On : Mon Mar 11 22:26:52 2019 +// Update Count : 14 // @@ -21,5 +21,5 @@ namespace ControlStruct { - Statement *hoist( Statement *originalStmt, std::list &init ) { + Statement * hoist( Statement * originalStmt, std::list & init ) { // If no hoisting is needed, skip: if ( 0 == init.size() ) { @@ -29,6 +29,6 @@ // Create compound statement, move initializers outside, // the resut of the original stays as is. - CompoundStmt *block = new CompoundStmt(); - std::list &stmts = block->get_kids(); + CompoundStmt * block = new CompoundStmt(); + std::list & stmts = block->get_kids(); stmts.splice( stmts.end(), init ); @@ -38,12 +38,12 @@ } - Statement *ForExprMutator::postmutate( IfStmt *ifStmt ) { + Statement * ForExprMutator::postmutate( IfStmt * ifStmt ) { return hoist( ifStmt, ifStmt->initialization ); } - Statement *ForExprMutator::postmutate( ForStmt *forStmt ) { + Statement * ForExprMutator::postmutate( ForStmt * forStmt ) { // hoist any initializer declarations to make them C89 (rather than C99) return hoist( forStmt, forStmt->initialization ); } - Statement *ForExprMutator::postmutate( WhileStmt *whileStmt ) { + Statement * ForExprMutator::postmutate( WhileStmt * whileStmt ) { return hoist( whileStmt, whileStmt->initialization ); } Index: src/ControlStruct/LabelFixer.cc =================================================================== --- src/ControlStruct/LabelFixer.cc (revision 114bde658eed1edf31cde78bd21584a1ced7df2e) +++ src/ControlStruct/LabelFixer.cc (revision b5cff2b64b43663f9c57bc2ae5a4d68f7d2f2a3c) @@ -9,7 +9,7 @@ // Author : Rodolfo G. Esteves // Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Rob Schluntz -// Last Modified On : Tue Jul 28 13:32:43 2015 -// Update Count : 156 +// Last Modified By : Peter A. Buhr +// Last Modified On : Mon Mar 11 22:26:02 2019 +// Update Count : 159 // @@ -32,5 +32,5 @@ } - LabelFixer::LabelFixer( LabelGenerator *gen ) : generator ( gen ) { + LabelFixer::LabelFixer( LabelGenerator * gen ) : generator ( gen ) { if ( generator == 0 ) generator = LabelGenerator::getGenerator(); @@ -49,5 +49,5 @@ // prune to at most one label definition for each statement - void LabelFixer::previsit( Statement *stmt ) { + void LabelFixer::previsit( Statement * stmt ) { std::list< Label > &labels = stmt->get_labels(); @@ -58,5 +58,5 @@ } - void LabelFixer::previsit( BranchStmt *branchStmt ) { + void LabelFixer::previsit( BranchStmt * branchStmt ) { previsit( ( Statement *)branchStmt ); @@ -75,7 +75,7 @@ - // sets the definition of the labelTable entry to be the provided - // statement for every label in the list parameter. Happens for every kind of statement - Label LabelFixer::setLabelsDef( std::list< Label > &llabel, Statement *definition ) { + // sets the definition of the labelTable entry to be the provided statement for every label in the list + // parameter. Happens for every kind of statement + Label LabelFixer::setLabelsDef( std::list< Label > & llabel, Statement * definition ) { assert( definition != 0 ); assert( llabel.size() > 0 ); @@ -100,6 +100,5 @@ } // for - // produce one of the labels attached to this statement to be - // temporarily used as the canonical label + // produce one of the labels attached to this statement to be temporarily used as the canonical label return labelTable[ llabel.front() ]->get_label(); } @@ -117,5 +116,5 @@ // Builds a table that maps a label to its defining statement. - std::map *LabelFixer::resolveJumps() throw ( SemanticErrorException ) { + std::map * LabelFixer::resolveJumps() throw ( SemanticErrorException ) { std::map< Label, Statement * > *ret = new std::map< Label, Statement * >(); for ( std::map< Label, Entry * >::iterator i = labelTable.begin(); i != labelTable.end(); ++i ) { Index: src/ControlStruct/LabelGenerator.cc =================================================================== --- src/ControlStruct/LabelGenerator.cc (revision 114bde658eed1edf31cde78bd21584a1ced7df2e) +++ src/ControlStruct/LabelGenerator.cc (revision b5cff2b64b43663f9c57bc2ae5a4d68f7d2f2a3c) @@ -9,7 +9,7 @@ // Author : Rodolfo G. Esteves // Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Andrew Beach -// Last Modified On : Thr Aug 14 14:14:00 2015 -// Update Count : 14 +// Last Modified By : Peter A. Buhr +// Last Modified On : Mon Mar 11 22:23:20 2019 +// Update Count : 15 // @@ -24,10 +24,9 @@ namespace ControlStruct { - LabelGenerator *LabelGenerator::labelGenerator = 0; + LabelGenerator * LabelGenerator::labelGenerator = 0; - LabelGenerator *LabelGenerator::getGenerator() { + LabelGenerator * LabelGenerator::getGenerator() { if ( LabelGenerator::labelGenerator == 0 ) LabelGenerator::labelGenerator = new LabelGenerator(); - return labelGenerator; } @@ -38,5 +37,5 @@ if ( stmt && ! stmt->get_labels().empty() ) { os << "_" << stmt->get_labels().front() << "__"; - } + } // if std::string ret = os.str(); Label l( ret ); Index: src/Parser/ExpressionNode.cc =================================================================== --- src/Parser/ExpressionNode.cc (revision 114bde658eed1edf31cde78bd21584a1ced7df2e) +++ src/Parser/ExpressionNode.cc (revision b5cff2b64b43663f9c57bc2ae5a4d68f7d2f2a3c) @@ -10,6 +10,6 @@ // Created On : Sat May 16 13:17:07 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Thu Feb 28 21:36:38 2019 -// Update Count : 933 +// Last Modified On : Sun Mar 10 16:10:32 2019 +// Update Count : 976 // @@ -66,25 +66,48 @@ void lnthSuffix( string & str, int & type, int & ltype ) { string::size_type posn = str.find_last_of( "lL" ); - if ( posn != string::npos ) { - type = 3; // default - posn += 1; // advance to size - if ( str[posn] == '3' ) { // 32 - type = ltype = 2; str.erase( posn, 2 ); - } else if ( str[posn] == '6' ) { // 64 - type = ltype = 3; str.erase( posn, 2 ); - } else if ( str[posn] == '8' ) { // 8 - type = ltype = 1; str.erase( posn, 1 ); - } else if ( str[posn] == '1' ) { - if ( str[posn + 1] == '6' ) { // 16 - type = ltype = 0; str.erase( posn, 2 ); - } else { // 128 - type = ltype = 5; str.erase( posn, 3 ); - } // if - } // if - } // if + + if ( posn == string::npos ) return; // no suffix + if ( posn == str.length() - 1 ) { type = 3; return; } // no length => long + + string::size_type next = posn + 1; // advance to length + if ( str[next] == '3' ) { // 32 + type = ltype = 2; + } else if ( str[next] == '6' ) { // 64 + type = ltype = 3; + } else if ( str[next] == '8' ) { // 8 + type = ltype = 1; + } else if ( str[next] == '1' ) { + if ( str[next + 1] == '6' ) { // 16 + type = ltype = 0; + } else { // 128 + type = 5; ltype = 6; + } // if + } // if + // remove "lL" for these cases because it may not imply long + str.erase( posn ); // remove length } // lnthSuffix +void valueToType( unsigned long long int & v, bool dec, int & type, bool & Unsigned ) { + // use value to determine type + if ( v <= INT_MAX ) { // signed int + type = 2; + } else if ( v <= UINT_MAX && ! dec ) { // unsigned int + type = 2; + Unsigned = true; // unsigned + } else if ( v <= LONG_MAX ) { // signed long int + type = 3; + } else if ( v <= ULONG_MAX && ( ! dec || LONG_MAX == LLONG_MAX ) ) { // signed long int + type = 3; + Unsigned = true; // unsigned long int + } else if ( v <= LLONG_MAX ) { // signed long long int + type = 4; + } else { // unsigned long long int + type = 4; + Unsigned = true; // unsigned long long int + } // if +} // valueToType + Expression * build_constantInteger( string & str ) { - static const BasicType::Kind kind[2][6] = { + static const BasicType::Kind kind[2][7] = { // short (h) must be before char (hh) because shorter type has the longer suffix { BasicType::ShortSignedInt, BasicType::SignedChar, BasicType::SignedInt, BasicType::LongSignedInt, BasicType::LongLongSignedInt, BasicType::SignedInt128, }, @@ -92,17 +115,17 @@ }; - static const char * lnthsInt[2][5] = { - { "int16_t", "int8_t", "int32_t", "int64_t", "size_t", }, - { "uint16_t", "uint8_t", "uint32_t", "uint64_t", "size_t", }, + static const char * lnthsInt[2][6] = { + { "int16_t", "int8_t", "int32_t", "int64_t", "size_t", "uintptr_t", }, + { "uint16_t", "uint8_t", "uint32_t", "uint64_t", "size_t", "uintptr_t", }, }; // lnthsInt - - bool dec = true, Unsigned = false; // decimal, unsigned constant - int type = -1; // 0 => short, 1 => char, 2 => int, 3 => long int, 4 => long long int, 5 => int128 - int ltype = -1; // literal length unsigned long long int v; // converted integral value size_t last = str.length() - 1; // last subscript of constant Expression * ret; - string fred( str ); + //string fred( str ); + + int type = -1; // 0 => short, 1 => char, 2 => int, 3 => long int, 4 => long long int, 5 => int128 + int ltype = -1; // 0 => 16 bits, 1 => 8 bits, 2 => 32 bits, 3 => 64 bits, 4 => size_t, 5 => intptr, 6 => pointer + bool dec = true, Unsigned = false; // decimal, unsigned constant // special constants @@ -116,5 +139,5 @@ } // if - // Cannot be just "0"/"1"; sscanf stops at the suffix, if any; value goes over the wall so always generate + // Cannot be just "0"/"1"; sscanf stops at the suffix, if any; value goes over the wall => always generate if ( str[0] == '0' ) { // radix character ? @@ -125,5 +148,5 @@ } else if ( checkB( str[1] ) ) { // binary constant ? v = 0; // compute value - for ( unsigned int i = 2;; ) { + for ( unsigned int i = 2;; ) { // ignore prefix if ( str[i] == '1' ) v |= 1; i += 1; @@ -145,26 +168,17 @@ if ( isdigit( str[last] ) ) { // no suffix ? lnthSuffix( str, type, ltype ); // could have length suffix - if ( type == -1 ) { - // no suffix type, use value to determine type - if ( v <= INT_MAX ) { // signed int - type = 2; - } else if ( v <= UINT_MAX && ! dec ) { // unsigned int - type = 2; - Unsigned = true; // unsigned - } else if ( v <= LONG_MAX ) { // signed long int - type = 3; - } else if ( v <= ULONG_MAX && ( ! dec || LONG_MAX == LLONG_MAX ) ) { // signed long int - type = 3; - Unsigned = true; // unsigned long int - } else if ( v <= LLONG_MAX ) { // signed long long int - type = 4; - } else { // unsigned long long int - type = 4; - Unsigned = true; // unsigned long long int - } // if + if ( type == -1 ) { // no suffix + valueToType( v, dec, type, Unsigned ); } // if } else { // At least one digit in integer constant, so safe to backup while looking for suffix. + posn = str.find_last_of( "pP" ); + if ( posn != string::npos ) { valueToType( v, dec, type, Unsigned ); ltype = 5; str.erase( posn, 1 ); goto FINI; } + + posn = str.find_last_of( "zZ" ); + if ( posn != string::npos ) { Unsigned = true; type = 2; ltype = 4; str.erase( posn, 1 ); goto FINI; } + + // 'u' can appear before or after length suffix if ( str.find_last_of( "uU" ) != string::npos ) Unsigned = true; @@ -181,16 +195,15 @@ if ( posn != string::npos ) { type = 2; str.erase( posn, 1 ); goto FINI; } - posn = str.find_last_of( "zZ" ); - if ( posn != string::npos ) { Unsigned = true; type = 2; ltype = 4; str.erase( posn, 1 ); goto FINI; } - if ( str.rfind( "ll" ) != string::npos || str.rfind( "LL" ) != string::npos ) { type = 4; goto FINI; } lnthSuffix( str, type, ltype ); // must be after check for "ll" - if ( type == -1 ) { type = 3; goto FINI; } + if ( type == -1 ) { // only 'u' suffix ? + valueToType( v, dec, type, Unsigned ); + } // if FINI: ; } // if - //if ( !( 0 <= type && type < 6 ) ) { printf( "%s %lu %d %s\n", fred.c_str(), fred.length(), type, str.c_str() ); } - assert( 0 <= type && type < 6 ); + //if ( !( 0 <= type && type <= 6 ) ) { printf( "%s %lu %d %s\n", fred.c_str(), fred.length(), type, str.c_str() ); } + assert( 0 <= type && type <= 6 ); // Constant type is correct for overload resolving. @@ -200,9 +213,11 @@ ret = new CastExpr( ret, new BasicType( Type::Qualifiers(), kind[Unsigned][type] ), false ); } else if ( ltype != -1 ) { // explicit length ? - if ( ltype == 5 ) { // int128 ? - type = 5; + if ( ltype == 6 ) { // int128, (int128)constant ret = new CastExpr( ret, new BasicType( Type::Qualifiers(), kind[Unsigned][type] ), false ); - } else { + } else { // explicit length, (length_type)constant ret = new CastExpr( ret, new TypeInstType( Type::Qualifiers(), lnthsInt[Unsigned][ltype], false ), false ); + if ( ltype == 5 ) { // pointer, intptr( (uintptr_t)constant ) + ret = build_func( new ExpressionNode( build_varref( new string( "intptr" ) ) ), new ExpressionNode( ret ) ); + } // if } // if } // if Index: src/Parser/lex.ll =================================================================== --- src/Parser/lex.ll (revision 114bde658eed1edf31cde78bd21584a1ced7df2e) +++ src/Parser/lex.ll (revision b5cff2b64b43663f9c57bc2ae5a4d68f7d2f2a3c) @@ -10,6 +10,6 @@ * Created On : Sat Sep 22 08:58:10 2001 * Last Modified By : Peter A. Buhr - * Last Modified On : Wed Feb 27 22:44:03 2019 - * Update Count : 704 + * Last Modified On : Wed Mar 13 14:54:30 2019 + * Update Count : 707 */ @@ -99,6 +99,8 @@ hex_quad {hex}("_"?{hex}){3} size_opt (8|16|32|64|128)? + // CFA: explicit l8/l16/l32/l64/l128, char 'hh', short 'h', int 'n' length ("ll"|"LL"|[lL]{size_opt})|("hh"|"HH"|[hHnN]) -integer_suffix_opt ("_"?(([uU]({length}?[iI]?)|([iI]{length}))|([iI]({length}?[uU]?)|([uU]{length}))|({length}([iI]?[uU]?)|([uU][iI]))|[zZ]))? + // CFA: size_t 'z', pointer 'p', which define a sign and length +integer_suffix_opt ("_"?(([uU]({length}?[iI]?)|([iI]{length}))|([iI]({length}?[uU]?)|([uU]{length}))|({length}([iI]?[uU]?)|([uU][iI]))|[zZ]|[pP]))? octal_digits ({octal})|({octal}({octal}|"_")*{octal}) @@ -224,4 +226,5 @@ char { KEYWORD_RETURN(CHAR); } choose { KEYWORD_RETURN(CHOOSE); } // CFA +coerce { KEYWORD_RETURN(COERCE); } // CFA _Complex { KEYWORD_RETURN(COMPLEX); } // C99 __complex { KEYWORD_RETURN(COMPLEX); } // GCC Index: src/Parser/parser.yy =================================================================== --- src/Parser/parser.yy (revision 114bde658eed1edf31cde78bd21584a1ced7df2e) +++ src/Parser/parser.yy (revision b5cff2b64b43663f9c57bc2ae5a4d68f7d2f2a3c) @@ -10,6 +10,6 @@ // Created On : Sat Sep 1 20:22:55 2001 // Last Modified By : Peter A. Buhr -// Last Modified On : Thu Feb 21 08:45:07 2019 -// Update Count : 4232 +// Last Modified On : Fri Mar 15 14:25:43 2019 +// Update Count : 4248 // @@ -265,5 +265,5 @@ %token RESTRICT // C99 %token ATOMIC // C11 -%token FORALL MUTEX VIRTUAL // CFA +%token FORALL MUTEX VIRTUAL COERCE // CFA %token VOID CHAR SHORT INT LONG FLOAT DOUBLE SIGNED UNSIGNED %token BOOL COMPLEX IMAGINARY // C99 @@ -795,4 +795,5 @@ | '(' type_no_function ')' cast_expression { $$ = new ExpressionNode( build_cast( $2, $4 ) ); } + // keyword cast cannot be grouped because of reduction in aggregate_key | '(' COROUTINE '&' ')' cast_expression // CFA { $$ = new ExpressionNode( build_keyword_cast( KeywordCastExpr::Coroutine, $5 ) ); } @@ -806,6 +807,24 @@ | '(' VIRTUAL type_no_function ')' cast_expression // CFA { $$ = new ExpressionNode( new VirtualCastExpr( maybeMoveBuild< Expression >( $5 ), maybeMoveBuildType( $3 ) ) ); } + | '(' RETURN type_no_function ')' cast_expression // CFA + { SemanticError( yylloc, "Return cast is currently unimplemented." ); $$ = nullptr; } + | '(' COERCE type_no_function ')' cast_expression // CFA + { SemanticError( yylloc, "Coerce cast is currently unimplemented." ); $$ = nullptr; } + | '(' qualifier_cast_list ')' cast_expression // CFA + { SemanticError( yylloc, "Qualifier cast is currently unimplemented." ); $$ = nullptr; } // | '(' type_no_function ')' tuple // { $$ = new ExpressionNode( build_cast( $2, $4 ) ); } + ; + +qualifier_cast_list: + cast_modifier type_qualifier_name + | cast_modifier MUTEX + | qualifier_cast_list cast_modifier type_qualifier_name + | qualifier_cast_list cast_modifier MUTEX + ; + +cast_modifier: + '-' + | '+' ; Index: src/ResolvExpr/CommonType.cc =================================================================== --- src/ResolvExpr/CommonType.cc (revision 114bde658eed1edf31cde78bd21584a1ced7df2e) +++ src/ResolvExpr/CommonType.cc (revision b5cff2b64b43663f9c57bc2ae5a4d68f7d2f2a3c) @@ -177,5 +177,5 @@ // GENERATED START, DO NOT EDIT - // GENERATED BY ../../main/src/BasicTypes-gen.cc + // GENERATED BY BasicTypes-gen.cc #define BT BasicType:: static const BasicType::Kind commonTypes[BasicType::NUMBER_OF_BASIC_TYPES][BasicType::NUMBER_OF_BASIC_TYPES] = { // nearest common ancestor Index: src/ResolvExpr/ConversionCost.cc =================================================================== --- src/ResolvExpr/ConversionCost.cc (revision 114bde658eed1edf31cde78bd21584a1ced7df2e) +++ src/ResolvExpr/ConversionCost.cc (revision b5cff2b64b43663f9c57bc2ae5a4d68f7d2f2a3c) @@ -182,5 +182,5 @@ // GENERATED START, DO NOT EDIT - // GENERATED BY ../../main/src/BasicTypes-gen.cc + // GENERATED BY BasicTypes-gen.cc /* EXTENDED INTEGRAL RANK HIERARCHY (root to leaves) _Bool @@ -207,5 +207,5 @@ // GENERATED START, DO NOT EDIT - // GENERATED BY ../../main/src/BasicTypes-gen.cc + // GENERATED BY BasicTypes-gen.cc static const int costMatrix[BasicType::NUMBER_OF_BASIC_TYPES][BasicType::NUMBER_OF_BASIC_TYPES] = { // path length from root to node /* B C SC UC SI SUI I UI LI LUI LLI LLUI IB UIB _FH _FH _F _FC F FC _FX _FXC FD _FDC D DC F80X_FDXC F80 _FB_FLDC FB LD LDC _FBX_FLDXC */ @@ -254,5 +254,5 @@ // GENERATED START, DO NOT EDIT - // GENERATED BY ../../main/src/BasicTypes-gen.cc + // GENERATED BY BasicTypes-gen.cc static const int signMatrix[BasicType::NUMBER_OF_BASIC_TYPES][BasicType::NUMBER_OF_BASIC_TYPES] = { // number of sign changes in safe conversion /* B C SC UC SI SUI I UI LI LUI LLI LLUI IB UIB _FH _FH _F _FC F FC _FX _FXC FD _FDC D DC F80X_FDXC F80 _FB_FLDC FB LD LDC _FBX_FLDXC */ Index: src/SymTab/ManglerCommon.cc =================================================================== --- src/SymTab/ManglerCommon.cc (revision 114bde658eed1edf31cde78bd21584a1ced7df2e) +++ src/SymTab/ManglerCommon.cc (revision b5cff2b64b43663f9c57bc2ae5a4d68f7d2f2a3c) @@ -24,5 +24,5 @@ // GENERATED START, DO NOT EDIT - // GENERATED BY ../../main/src/BasicTypes-gen.cc + // GENERATED BY BasicTypes-gen.cc // NOTES ON MANGLING: // * Itanium spec says that Float80 encodes to "e" (like LongDouble), but the distinct lengths cause resolution problems. Index: src/SynTree/Statement.h =================================================================== --- src/SynTree/Statement.h (revision 114bde658eed1edf31cde78bd21584a1ced7df2e) +++ src/SynTree/Statement.h (revision b5cff2b64b43663f9c57bc2ae5a4d68f7d2f2a3c) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Thu Mar 8 14:53:02 2018 -// Update Count : 78 +// Last Modified On : Tue Mar 12 09:01:53 2019 +// Update Count : 83 // @@ -19,5 +19,5 @@ #include // for list #include // for allocator -#include // for vector +#include // for vector #include "BaseSyntaxNode.h" // for BaseSyntaxNode @@ -43,8 +43,8 @@ const std::list