Index: src/Parser/ExpressionNode.cc =================================================================== --- src/Parser/ExpressionNode.cc (revision ba01b142553f364d8b98d056e7a939ef20820f41) +++ src/Parser/ExpressionNode.cc (revision 70a3e166669a6cd8a03ea52924b20ca4b4604d80) @@ -10,6 +10,6 @@ // Created On : Sat May 16 13:17:07 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Thu Feb 7 22:35:29 2019 -// Update Count : 900 +// Last Modified On : Wed Feb 13 18:07:38 2019 +// Update Count : 902 // @@ -233,6 +233,6 @@ Expression * build_constantFloat( string & str ) { static const BasicType::Kind kind[2][12] = { - { BasicType::Float, BasicType::Double, BasicType::LongDouble, BasicType::__float80, BasicType::__float128, BasicType::_Float16, BasicType::_Float32, BasicType::_Float32x, BasicType::_Float64, BasicType::_Float64x, BasicType::_Float128, BasicType::_Float128x }, - { BasicType::FloatComplex, BasicType::DoubleComplex, BasicType::LongDoubleComplex, (BasicType::Kind)-1, (BasicType::Kind)-1, BasicType::_Float16Complex, BasicType::_Float32Complex, BasicType::_Float32xComplex, BasicType::_Float64Complex, BasicType::_Float64xComplex, BasicType::_Float128Complex, BasicType::_Float128xComplex }, + { BasicType::Float, BasicType::Double, BasicType::LongDouble, BasicType::uuFloat80, BasicType::uuFloat128, BasicType::uFloat16, BasicType::uFloat32, BasicType::uFloat32x, BasicType::uFloat64, BasicType::uFloat64x, BasicType::uFloat128, BasicType::uFloat128x }, + { BasicType::FloatComplex, BasicType::DoubleComplex, BasicType::LongDoubleComplex, (BasicType::Kind)-1, (BasicType::Kind)-1, BasicType::uFloat16Complex, BasicType::uFloat32Complex, BasicType::uFloat32xComplex, BasicType::uFloat64Complex, BasicType::uFloat64xComplex, BasicType::uFloat128Complex, BasicType::uFloat128xComplex }, }; Index: src/Parser/ParseNode.h =================================================================== --- src/Parser/ParseNode.h (revision ba01b142553f364d8b98d056e7a939ef20820f41) +++ src/Parser/ParseNode.h (revision 70a3e166669a6cd8a03ea52924b20ca4b4604d80) @@ -10,6 +10,6 @@ // Created On : Sat May 16 13:28:16 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Fri Feb 1 16:48:10 2019 -// Update Count : 866 +// Last Modified On : Wed Feb 13 17:36:49 2019 +// Update Count : 867 // @@ -208,6 +208,6 @@ // These enumerations must harmonize with their names in DeclarationNode.cc. enum BasicType { Void, Bool, Char, Int, Int128, - Float, Double, LongDouble, Float80, Float128, - _Float16, _Float32, _Float32x, _Float64, _Float64x, _Float128, _Float128x, NoBasicType }; + Float, Double, LongDouble, uuFloat80, uuFloat128, + uFloat16, uFloat32, uFloat32x, uFloat64, uFloat64x, uFloat128, uFloat128x, NoBasicType }; static const char * basicTypeNames[]; enum ComplexType { Complex, NoComplexType, Imaginary }; // Imaginary unsupported => parse, but make invisible and print error message Index: src/Parser/TypeData.cc =================================================================== --- src/Parser/TypeData.cc (revision ba01b142553f364d8b98d056e7a939ef20820f41) +++ src/Parser/TypeData.cc (revision 70a3e166669a6cd8a03ea52924b20ca4b4604d80) @@ -10,6 +10,6 @@ // Created On : Sat May 16 15:12:51 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Fri Feb 8 09:36:26 2019 -// Update Count : 645 +// Last Modified On : Wed Feb 13 18:16:23 2019 +// Update Count : 649 // @@ -629,5 +629,5 @@ } // if - ret = BasicType::_Bool; + ret = BasicType::Bool; break; @@ -668,16 +668,16 @@ case DeclarationNode::Double: case DeclarationNode::LongDouble: // not set until below - case DeclarationNode::Float80: - case DeclarationNode::Float128: - case DeclarationNode::_Float16: - case DeclarationNode::_Float32: - case DeclarationNode::_Float32x: - case DeclarationNode::_Float64: - case DeclarationNode::_Float64x: - case DeclarationNode::_Float128: - case DeclarationNode::_Float128x: + case DeclarationNode::uuFloat80: + case DeclarationNode::uuFloat128: + case DeclarationNode::uFloat16: + case DeclarationNode::uFloat32: + case DeclarationNode::uFloat32x: + case DeclarationNode::uFloat64: + case DeclarationNode::uFloat64x: + case DeclarationNode::uFloat128: + case DeclarationNode::uFloat128x: static BasicType::Kind floattype[2][12] = { - { BasicType::FloatComplex, BasicType::DoubleComplex, BasicType::LongDoubleComplex, (BasicType::Kind)-1, (BasicType::Kind)-1, BasicType::_Float16Complex, BasicType::_Float32Complex, BasicType::_Float32xComplex, BasicType::_Float64Complex, BasicType::_Float64xComplex, BasicType::_Float128Complex, BasicType::_Float128xComplex, }, - { BasicType::Float, BasicType::Double, BasicType::LongDouble, BasicType::__float80, BasicType::__float128, BasicType::_Float16, BasicType::_Float32, BasicType::_Float32x, BasicType::_Float64, BasicType::_Float64x, BasicType::_Float128, BasicType::_Float128x, }, + { BasicType::FloatComplex, BasicType::DoubleComplex, BasicType::LongDoubleComplex, (BasicType::Kind)-1, (BasicType::Kind)-1, BasicType::uFloat16Complex, BasicType::uFloat32Complex, BasicType::uFloat32xComplex, BasicType::uFloat64Complex, BasicType::uFloat64xComplex, BasicType::uFloat128Complex, BasicType::uFloat128xComplex, }, + { BasicType::Float, BasicType::Double, BasicType::LongDouble, BasicType::uuFloat80, BasicType::uuFloat128, BasicType::uFloat16, BasicType::uFloat32, BasicType::uFloat32x, BasicType::uFloat64, BasicType::uFloat64x, BasicType::uFloat128, BasicType::uFloat128x, }, }; @@ -695,5 +695,5 @@ genTSError( DeclarationNode::complexTypeNames[ td->complextype ], td->basictype ); } // if - if ( (td->basictype == DeclarationNode::Float80 || td->basictype == DeclarationNode::Float128) && td->complextype == DeclarationNode::Complex ) { // gcc unsupported + if ( (td->basictype == DeclarationNode::uuFloat80 || td->basictype == DeclarationNode::uuFloat128) && td->complextype == DeclarationNode::Complex ) { // gcc unsupported genTSError( DeclarationNode::complexTypeNames[ td->complextype ], td->basictype ); } // if Index: src/Parser/lex.ll =================================================================== --- src/Parser/lex.ll (revision ba01b142553f364d8b98d056e7a939ef20820f41) +++ src/Parser/lex.ll (revision 70a3e166669a6cd8a03ea52924b20ca4b4604d80) @@ -10,6 +10,6 @@ * Created On : Sat Sep 22 08:58:10 2001 * Last Modified By : Peter A. Buhr - * Last Modified On : Mon Feb 4 22:49:19 2019 - * Update Count : 701 + * Last Modified On : Wed Feb 13 17:33:53 2019 + * Update Count : 702 */ @@ -247,15 +247,15 @@ finally { KEYWORD_RETURN(FINALLY); } // CFA float { KEYWORD_RETURN(FLOAT); } -__float80 { KEYWORD_RETURN(FLOAT80); } // GCC -float80 { KEYWORD_RETURN(FLOAT80); } // GCC -__float128 { KEYWORD_RETURN(FLOAT128); } // GCC -float128 { KEYWORD_RETURN(FLOAT128); } // GCC -_Float16 { FLOATXX(_FLOAT16); } // GCC -_Float32 { FLOATXX(_FLOAT32); } // GCC -_Float32x { FLOATXX(_FLOAT32X); } // GCC -_Float64 { FLOATXX(_FLOAT64); } // GCC -_Float64x { FLOATXX(_FLOAT64X); } // GCC -_Float128 { FLOATXX(_FLOAT128); } // GCC -_Float128x { FLOATXX(_FLOAT128); } // GCC +__float80 { KEYWORD_RETURN(uuFLOAT80); } // GCC +float80 { KEYWORD_RETURN(uuFLOAT80); } // GCC +__float128 { KEYWORD_RETURN(uuFLOAT128); } // GCC +float128 { KEYWORD_RETURN(uuFLOAT128); } // GCC +_Float16 { FLOATXX(uFLOAT16); } // GCC +_Float32 { FLOATXX(uFLOAT32); } // GCC +_Float32x { FLOATXX(uFLOAT32X); } // GCC +_Float64 { FLOATXX(uFLOAT64); } // GCC +_Float64x { FLOATXX(uFLOAT64X); } // GCC +_Float128 { FLOATXX(uFLOAT128); } // GCC +_Float128x { FLOATXX(uFLOAT128); } // GCC for { KEYWORD_RETURN(FOR); } forall { KEYWORD_RETURN(FORALL); } // CFA Index: src/Parser/parser.yy =================================================================== --- src/Parser/parser.yy (revision ba01b142553f364d8b98d056e7a939ef20820f41) +++ src/Parser/parser.yy (revision 70a3e166669a6cd8a03ea52924b20ca4b4604d80) @@ -10,6 +10,6 @@ // Created On : Sat Sep 1 20:22:55 2001 // Last Modified By : Peter A. Buhr -// Last Modified On : Fri Feb 1 16:26:47 2019 -// Update Count : 4061 +// Last Modified On : Wed Feb 13 17:56:23 2019 +// Update Count : 4064 // @@ -263,6 +263,6 @@ %token VOID CHAR SHORT INT LONG FLOAT DOUBLE SIGNED UNSIGNED %token BOOL COMPLEX IMAGINARY // C99 -%token INT128 FLOAT80 FLOAT128 // GCC -%token _FLOAT16 _FLOAT32 _FLOAT32X _FLOAT64 _FLOAT64X _FLOAT128 // GCC +%token INT128 uuFLOAT80 uuFLOAT128 // GCC +%token uFLOAT16 uFLOAT32 uFLOAT32X uFLOAT64 uFLOAT64X uFLOAT128 // GCC %token ZERO_T ONE_T // CFA %token VALIST // GCC @@ -1774,20 +1774,20 @@ | DOUBLE { $$ = DeclarationNode::newBasicType( DeclarationNode::Double ); } - | FLOAT80 - { $$ = DeclarationNode::newBasicType( DeclarationNode::Float80 ); } - | FLOAT128 - { $$ = DeclarationNode::newBasicType( DeclarationNode::Float128 ); } - | _FLOAT16 - { $$ = DeclarationNode::newBasicType( DeclarationNode::_Float16 ); } - | _FLOAT32 - { $$ = DeclarationNode::newBasicType( DeclarationNode::_Float32 ); } - | _FLOAT32X - { $$ = DeclarationNode::newBasicType( DeclarationNode::_Float32x ); } - | _FLOAT64 - { $$ = DeclarationNode::newBasicType( DeclarationNode::_Float64 ); } - | _FLOAT64X - { $$ = DeclarationNode::newBasicType( DeclarationNode::_Float64x ); } - | _FLOAT128 - { $$ = DeclarationNode::newBasicType( DeclarationNode::_Float128 ); } + | uuFLOAT80 + { $$ = DeclarationNode::newBasicType( DeclarationNode::uuFloat80 ); } + | uuFLOAT128 + { $$ = DeclarationNode::newBasicType( DeclarationNode::uuFloat128 ); } + | uFLOAT16 + { $$ = DeclarationNode::newBasicType( DeclarationNode::uFloat16 ); } + | uFLOAT32 + { $$ = DeclarationNode::newBasicType( DeclarationNode::uFloat32 ); } + | uFLOAT32X + { $$ = DeclarationNode::newBasicType( DeclarationNode::uFloat32x ); } + | uFLOAT64 + { $$ = DeclarationNode::newBasicType( DeclarationNode::uFloat64 ); } + | uFLOAT64X + { $$ = DeclarationNode::newBasicType( DeclarationNode::uFloat64x ); } + | uFLOAT128 + { $$ = DeclarationNode::newBasicType( DeclarationNode::uFloat128 ); } | COMPLEX // C99 { $$ = DeclarationNode::newComplexType( DeclarationNode::Complex ); }