Index: src/AST/BasicKind.hpp =================================================================== --- src/AST/BasicKind.hpp (revision 44acc7230995f5609bc1cac28ef52b28ba5617ec) +++ src/AST/BasicKind.hpp (revision 689d0575efebba7e0ece164aab8e2967a9548a43) @@ -50,9 +50,9 @@ Float64xComplex, Float80, + LongDouble, + LongDoubleComplex, + uuFloat128, Float128, Float128Complex, - uuFloat128, - LongDouble, - LongDoubleComplex, Float128x, Float128xComplex, Index: src/AST/Type.cpp =================================================================== --- src/AST/Type.cpp (revision 44acc7230995f5609bc1cac28ef52b28ba5617ec) +++ src/AST/Type.cpp (revision 689d0575efebba7e0ece164aab8e2967a9548a43) @@ -81,9 +81,9 @@ "_Float64x _Complex", "__float80", + "long double", + "long double _Complex", + "__float128", "_Float128", "_Float128 _Complex", - "__float128", - "long double", - "long double _Complex", "_Float128x", "_Float128x _Complex", Index: src/ResolvExpr/CommonType.cpp =================================================================== --- src/ResolvExpr/CommonType.cpp (revision 44acc7230995f5609bc1cac28ef52b28ba5617ec) +++ src/ResolvExpr/CommonType.cpp (revision 689d0575efebba7e0ece164aab8e2967a9548a43) @@ -46,6 +46,6 @@ __ID __UID _FH _FHC _F _FC F FC _FX _FXC _FD _FDC - D DC _FDX _FDXC _F80 _FLD - _FLDC __FLD LD LDC _FLDX _FLDXC + D DC _FDX _FDXC _F80 LD + LDC __FLD _FLD _FLDC _FLDX _FLDXC */ { @@ -54,6 +54,6 @@ BT SignedInt128, BT UnsignedInt128, BT Float16, BT Float16Complex, BT Float32, BT Float32Complex, BT Float, BT FloatComplex, BT Float32x, BT Float32xComplex, BT Float64, BT Float64Complex, - BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT Float128, - BT Float128Complex, BT uuFloat128, BT LongDouble, BT LongDoubleComplex, BT Float128x, BT Float128xComplex, + BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT LongDouble, + BT LongDoubleComplex, BT uuFloat128, BT Float128, BT Float128Complex, BT Float128x, BT Float128xComplex, }, { @@ -62,6 +62,6 @@ BT SignedInt128, BT UnsignedInt128, BT Float16, BT Float16Complex, BT Float32, BT Float32Complex, BT Float, BT FloatComplex, BT Float32x, BT Float32xComplex, BT Float64, BT Float64Complex, - BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT Float128, - BT Float128Complex, BT uuFloat128, BT LongDouble, BT LongDoubleComplex, BT Float128x, BT Float128xComplex, + BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT LongDouble, + BT LongDoubleComplex, BT uuFloat128, BT Float128, BT Float128Complex, BT Float128x, BT Float128xComplex, }, { @@ -70,6 +70,6 @@ BT SignedInt128, BT UnsignedInt128, BT Float16, BT Float16Complex, BT Float32, BT Float32Complex, BT Float, BT FloatComplex, BT Float32x, BT Float32xComplex, BT Float64, BT Float64Complex, - BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT Float128, - BT Float128Complex, BT uuFloat128, BT LongDouble, BT LongDoubleComplex, BT Float128x, BT Float128xComplex, + BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT LongDouble, + BT LongDoubleComplex, BT uuFloat128, BT Float128, BT Float128Complex, BT Float128x, BT Float128xComplex, }, { @@ -78,6 +78,6 @@ BT SignedInt128, BT UnsignedInt128, BT Float16, BT Float16Complex, BT Float32, BT Float32Complex, BT Float, BT FloatComplex, BT Float32x, BT Float32xComplex, BT Float64, BT Float64Complex, - BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT Float128, - BT Float128Complex, BT uuFloat128, BT LongDouble, BT LongDoubleComplex, BT Float128x, BT Float128xComplex, + BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT LongDouble, + BT LongDoubleComplex, BT uuFloat128, BT Float128, BT Float128Complex, BT Float128x, BT Float128xComplex, }, { @@ -86,6 +86,6 @@ BT SignedInt128, BT UnsignedInt128, BT Float16, BT Float16Complex, BT Float32, BT Float32Complex, BT Float, BT FloatComplex, BT Float32x, BT Float32xComplex, BT Float64, BT Float64Complex, - BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT Float128, - BT Float128Complex, BT uuFloat128, BT LongDouble, BT LongDoubleComplex, BT Float128x, BT Float128xComplex, + BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT LongDouble, + BT LongDoubleComplex, BT uuFloat128, BT Float128, BT Float128Complex, BT Float128x, BT Float128xComplex, }, { @@ -94,6 +94,6 @@ BT SignedInt128, BT UnsignedInt128, BT Float16, BT Float16Complex, BT Float32, BT Float32Complex, BT Float, BT FloatComplex, BT Float32x, BT Float32xComplex, BT Float64, BT Float64Complex, - BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT Float128, - BT Float128Complex, BT uuFloat128, BT LongDouble, BT LongDoubleComplex, BT Float128x, BT Float128xComplex, + BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT LongDouble, + BT LongDoubleComplex, BT uuFloat128, BT Float128, BT Float128Complex, BT Float128x, BT Float128xComplex, }, { @@ -102,6 +102,6 @@ BT SignedInt128, BT UnsignedInt128, BT Float16, BT Float16Complex, BT Float32, BT Float32Complex, BT Float, BT FloatComplex, BT Float32x, BT Float32xComplex, BT Float64, BT Float64Complex, - BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT Float128, - BT Float128Complex, BT uuFloat128, BT LongDouble, BT LongDoubleComplex, BT Float128x, BT Float128xComplex, + BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT LongDouble, + BT LongDoubleComplex, BT uuFloat128, BT Float128, BT Float128Complex, BT Float128x, BT Float128xComplex, }, { @@ -110,6 +110,6 @@ BT SignedInt128, BT UnsignedInt128, BT Float16, BT Float16Complex, BT Float32, BT Float32Complex, BT Float, BT FloatComplex, BT Float32x, BT Float32xComplex, BT Float64, BT Float64Complex, - BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT Float128, - BT Float128Complex, BT uuFloat128, BT LongDouble, BT LongDoubleComplex, BT Float128x, BT Float128xComplex, + BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT LongDouble, + BT LongDoubleComplex, BT uuFloat128, BT Float128, BT Float128Complex, BT Float128x, BT Float128xComplex, }, { @@ -118,6 +118,6 @@ BT SignedInt128, BT UnsignedInt128, BT Float16, BT Float16Complex, BT Float32, BT Float32Complex, BT Float, BT FloatComplex, BT Float32x, BT Float32xComplex, BT Float64, BT Float64Complex, - BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT Float128, - BT Float128Complex, BT uuFloat128, BT LongDouble, BT LongDoubleComplex, BT Float128x, BT Float128xComplex, + BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT LongDouble, + BT LongDoubleComplex, BT uuFloat128, BT Float128, BT Float128Complex, BT Float128x, BT Float128xComplex, }, { @@ -126,6 +126,6 @@ BT SignedInt128, BT UnsignedInt128, BT Float16, BT Float16Complex, BT Float32, BT Float32Complex, BT Float, BT FloatComplex, BT Float32x, BT Float32xComplex, BT Float64, BT Float64Complex, - BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT Float128, - BT Float128Complex, BT uuFloat128, BT LongDouble, BT LongDoubleComplex, BT Float128x, BT Float128xComplex, + BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT LongDouble, + BT LongDoubleComplex, BT uuFloat128, BT Float128, BT Float128Complex, BT Float128x, BT Float128xComplex, }, { @@ -134,6 +134,6 @@ BT SignedInt128, BT UnsignedInt128, BT Float16, BT Float16Complex, BT Float32, BT Float32Complex, BT Float, BT FloatComplex, BT Float32x, BT Float32xComplex, BT Float64, BT Float64Complex, - BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT Float128, - BT Float128Complex, BT uuFloat128, BT LongDouble, BT LongDoubleComplex, BT Float128x, BT Float128xComplex, + BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT LongDouble, + BT LongDoubleComplex, BT uuFloat128, BT Float128, BT Float128Complex, BT Float128x, BT Float128xComplex, }, { @@ -142,6 +142,6 @@ BT SignedInt128, BT UnsignedInt128, BT Float16, BT Float16Complex, BT Float32, BT Float32Complex, BT Float, BT FloatComplex, BT Float32x, BT Float32xComplex, BT Float64, BT Float64Complex, - BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT Float128, - BT Float128Complex, BT uuFloat128, BT LongDouble, BT LongDoubleComplex, BT Float128x, BT Float128xComplex, + BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT LongDouble, + BT LongDoubleComplex, BT uuFloat128, BT Float128, BT Float128Complex, BT Float128x, BT Float128xComplex, }, { @@ -150,6 +150,6 @@ BT SignedInt128, BT UnsignedInt128, BT Float16, BT Float16Complex, BT Float32, BT Float32Complex, BT Float, BT FloatComplex, BT Float32x, BT Float32xComplex, BT Float64, BT Float64Complex, - BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT Float128, - BT Float128Complex, BT uuFloat128, BT LongDouble, BT LongDoubleComplex, BT Float128x, BT Float128xComplex, + BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT LongDouble, + BT LongDoubleComplex, BT uuFloat128, BT Float128, BT Float128Complex, BT Float128x, BT Float128xComplex, }, { @@ -158,6 +158,6 @@ BT UnsignedInt128, BT UnsignedInt128, BT Float16, BT Float16Complex, BT Float32, BT Float32Complex, BT Float, BT FloatComplex, BT Float32x, BT Float32xComplex, BT Float64, BT Float64Complex, - BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT Float128, - BT Float128Complex, BT uuFloat128, BT LongDouble, BT LongDoubleComplex, BT Float128x, BT Float128xComplex, + BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT LongDouble, + BT LongDoubleComplex, BT uuFloat128, BT Float128, BT Float128Complex, BT Float128x, BT Float128xComplex, }, { @@ -166,6 +166,6 @@ BT Float16, BT Float16, BT Float16, BT Float16Complex, BT Float32, BT Float32Complex, BT Float, BT FloatComplex, BT Float32x, BT Float32xComplex, BT Float64, BT Float64Complex, - BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT Float128, - BT Float128Complex, BT uuFloat128, BT LongDouble, BT LongDoubleComplex, BT Float128x, BT Float128xComplex, + BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT LongDouble, + BT LongDoubleComplex, BT uuFloat128, BT Float128, BT Float128Complex, BT Float128x, BT Float128xComplex, }, { @@ -174,6 +174,6 @@ BT Float16Complex, BT Float16Complex, BT Float16Complex, BT Float16Complex, BT Float32Complex, BT Float32Complex, BT FloatComplex, BT FloatComplex, BT Float32xComplex, BT Float32xComplex, BT Float64Complex, BT Float64Complex, - BT DoubleComplex, BT DoubleComplex, BT Float64xComplex, BT Float64xComplex, BT Float64xComplex, BT Float128Complex, - BT Float128Complex, BT Float128Complex, BT LongDoubleComplex, BT LongDoubleComplex, BT Float128xComplex, BT Float128xComplex, + BT DoubleComplex, BT DoubleComplex, BT Float64xComplex, BT Float64xComplex, BT LongDoubleComplex, BT LongDoubleComplex, + BT LongDoubleComplex, BT Float128Complex, BT Float128Complex, BT Float128Complex, BT Float128xComplex, BT Float128xComplex, }, { @@ -182,6 +182,6 @@ BT Float32, BT Float32, BT Float32, BT Float32Complex, BT Float32, BT Float32Complex, BT Float, BT FloatComplex, BT Float32x, BT Float32xComplex, BT Float64, BT Float64Complex, - BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT Float128, - BT Float128Complex, BT uuFloat128, BT LongDouble, BT LongDoubleComplex, BT Float128x, BT Float128xComplex, + BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT LongDouble, + BT LongDoubleComplex, BT uuFloat128, BT Float128, BT Float128Complex, BT Float128x, BT Float128xComplex, }, { @@ -190,6 +190,6 @@ BT Float32Complex, BT Float32Complex, BT Float32Complex, BT Float32Complex, BT Float32Complex, BT Float32Complex, BT FloatComplex, BT FloatComplex, BT Float32xComplex, BT Float32xComplex, BT Float64Complex, BT Float64Complex, - BT DoubleComplex, BT DoubleComplex, BT Float64xComplex, BT Float64xComplex, BT Float64xComplex, BT Float128Complex, - BT Float128Complex, BT Float128Complex, BT LongDoubleComplex, BT LongDoubleComplex, BT Float128xComplex, BT Float128xComplex, + BT DoubleComplex, BT DoubleComplex, BT Float64xComplex, BT Float64xComplex, BT LongDoubleComplex, BT LongDoubleComplex, + BT LongDoubleComplex, BT Float128Complex, BT Float128Complex, BT Float128Complex, BT Float128xComplex, BT Float128xComplex, }, { @@ -198,6 +198,6 @@ BT Float, BT Float, BT Float, BT FloatComplex, BT Float, BT FloatComplex, BT Float, BT FloatComplex, BT Float32x, BT Float32xComplex, BT Float64, BT Float64Complex, - BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT Float128, - BT Float128Complex, BT uuFloat128, BT LongDouble, BT LongDoubleComplex, BT Float128x, BT Float128xComplex, + BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT LongDouble, + BT LongDoubleComplex, BT uuFloat128, BT Float128, BT Float128Complex, BT Float128x, BT Float128xComplex, }, { @@ -206,6 +206,6 @@ BT FloatComplex, BT FloatComplex, BT FloatComplex, BT FloatComplex, BT FloatComplex, BT FloatComplex, BT FloatComplex, BT FloatComplex, BT Float32xComplex, BT Float32xComplex, BT Float64Complex, BT Float64Complex, - BT DoubleComplex, BT DoubleComplex, BT Float64xComplex, BT Float64xComplex, BT Float64xComplex, BT Float128Complex, - BT Float128Complex, BT Float128Complex, BT LongDoubleComplex, BT LongDoubleComplex, BT Float128xComplex, BT Float128xComplex, + BT DoubleComplex, BT DoubleComplex, BT Float64xComplex, BT Float64xComplex, BT LongDoubleComplex, BT LongDoubleComplex, + BT LongDoubleComplex, BT Float128Complex, BT Float128Complex, BT Float128Complex, BT Float128xComplex, BT Float128xComplex, }, { @@ -214,6 +214,6 @@ BT Float32x, BT Float32x, BT Float32x, BT Float32xComplex, BT Float32x, BT Float32xComplex, BT Float32x, BT Float32xComplex, BT Float32x, BT Float32xComplex, BT Float64, BT Float64Complex, - BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT Float128, - BT Float128Complex, BT uuFloat128, BT LongDouble, BT LongDoubleComplex, BT Float128x, BT Float128xComplex, + BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT LongDouble, + BT LongDoubleComplex, BT uuFloat128, BT Float128, BT Float128Complex, BT Float128x, BT Float128xComplex, }, { @@ -222,6 +222,6 @@ BT Float32xComplex, BT Float32xComplex, BT Float32xComplex, BT Float32xComplex, BT Float32xComplex, BT Float32xComplex, BT Float32xComplex, BT Float32xComplex, BT Float32xComplex, BT Float32xComplex, BT Float64Complex, BT Float64Complex, - BT DoubleComplex, BT DoubleComplex, BT Float64xComplex, BT Float64xComplex, BT Float64xComplex, BT Float128Complex, - BT Float128Complex, BT Float128Complex, BT LongDoubleComplex, BT LongDoubleComplex, BT Float128xComplex, BT Float128xComplex, + BT DoubleComplex, BT DoubleComplex, BT Float64xComplex, BT Float64xComplex, BT LongDoubleComplex, BT LongDoubleComplex, + BT LongDoubleComplex, BT Float128Complex, BT Float128Complex, BT Float128Complex, BT Float128xComplex, BT Float128xComplex, }, { @@ -230,6 +230,6 @@ BT Float64, BT Float64, BT Float64, BT Float64Complex, BT Float64, BT Float64Complex, BT Float64, BT Float64Complex, BT Float64, BT Float64Complex, BT Float64, BT Float64Complex, - BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT Float128, - BT Float128Complex, BT uuFloat128, BT LongDouble, BT LongDoubleComplex, BT Float128x, BT Float128xComplex, + BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT LongDouble, + BT LongDoubleComplex, BT uuFloat128, BT Float128, BT Float128Complex, BT Float128x, BT Float128xComplex, }, { @@ -238,6 +238,6 @@ BT Float64Complex, BT Float64Complex, BT Float64Complex, BT Float64Complex, BT Float64Complex, BT Float64Complex, BT Float64Complex, BT Float64Complex, BT Float64Complex, BT Float64Complex, BT Float64Complex, BT Float64Complex, - BT DoubleComplex, BT DoubleComplex, BT Float64xComplex, BT Float64xComplex, BT Float64xComplex, BT Float128Complex, - BT Float128Complex, BT Float128Complex, BT LongDoubleComplex, BT LongDoubleComplex, BT Float128xComplex, BT Float128xComplex, + BT DoubleComplex, BT DoubleComplex, BT Float64xComplex, BT Float64xComplex, BT LongDoubleComplex, BT LongDoubleComplex, + BT LongDoubleComplex, BT Float128Complex, BT Float128Complex, BT Float128Complex, BT Float128xComplex, BT Float128xComplex, }, { @@ -246,6 +246,6 @@ BT Double, BT Double, BT Double, BT DoubleComplex, BT Double, BT DoubleComplex, BT Double, BT DoubleComplex, BT Double, BT DoubleComplex, BT Double, BT DoubleComplex, - BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT Float128, - BT Float128Complex, BT uuFloat128, BT LongDouble, BT LongDoubleComplex, BT Float128x, BT Float128xComplex, + BT Double, BT DoubleComplex, BT Float64x, BT Float64xComplex, BT Float80, BT LongDouble, + BT LongDoubleComplex, BT uuFloat128, BT Float128, BT Float128Complex, BT Float128x, BT Float128xComplex, }, { @@ -254,6 +254,6 @@ BT DoubleComplex, BT DoubleComplex, BT DoubleComplex, BT DoubleComplex, BT DoubleComplex, BT DoubleComplex, BT DoubleComplex, BT DoubleComplex, BT DoubleComplex, BT DoubleComplex, BT DoubleComplex, BT DoubleComplex, - BT DoubleComplex, BT DoubleComplex, BT Float64xComplex, BT Float64xComplex, BT Float64xComplex, BT Float128Complex, - BT Float128Complex, BT Float128Complex, BT LongDoubleComplex, BT LongDoubleComplex, BT Float128xComplex, BT Float128xComplex, + BT DoubleComplex, BT DoubleComplex, BT Float64xComplex, BT Float64xComplex, BT LongDoubleComplex, BT LongDoubleComplex, + BT LongDoubleComplex, BT Float128Complex, BT Float128Complex, BT Float128Complex, BT Float128xComplex, BT Float128xComplex, }, { @@ -262,6 +262,6 @@ BT Float64x, BT Float64x, BT Float64x, BT Float64xComplex, BT Float64x, BT Float64xComplex, BT Float64x, BT Float64xComplex, BT Float64x, BT Float64xComplex, BT Float64x, BT Float64xComplex, - BT Float64x, BT Float64xComplex, BT Float64x, BT Float64xComplex, BT Float80, BT Float128, - BT Float128Complex, BT uuFloat128, BT LongDouble, BT LongDoubleComplex, BT Float128x, BT Float128xComplex, + BT Float64x, BT Float64xComplex, BT Float64x, BT Float64xComplex, BT Float80, BT LongDouble, + BT LongDoubleComplex, BT uuFloat128, BT Float128, BT Float128Complex, BT Float128x, BT Float128xComplex, }, { @@ -270,14 +270,38 @@ BT Float64xComplex, BT Float64xComplex, BT Float64xComplex, BT Float64xComplex, BT Float64xComplex, BT Float64xComplex, BT Float64xComplex, BT Float64xComplex, BT Float64xComplex, BT Float64xComplex, BT Float64xComplex, BT Float64xComplex, - BT Float64xComplex, BT Float64xComplex, BT Float64xComplex, BT Float64xComplex, BT Float64xComplex, BT Float128Complex, - BT Float128Complex, BT Float128Complex, BT LongDoubleComplex, BT LongDoubleComplex, BT Float128xComplex, BT Float128xComplex, + BT Float64xComplex, BT Float64xComplex, BT Float64xComplex, BT Float64xComplex, BT LongDoubleComplex, BT LongDoubleComplex, + BT LongDoubleComplex, BT Float128Complex, BT Float128Complex, BT Float128Complex, BT Float128xComplex, BT Float128xComplex, }, { /* _F80 */ BT Float80, BT Float80, BT Float80, BT Float80, BT Float80, BT Float80, BT Float80, BT Float80, BT Float80, BT Float80, BT Float80, BT Float80, - BT Float80, BT Float80, BT Float80, BT Float64xComplex, BT Float80, BT Float64xComplex, - BT Float80, BT Float64xComplex, BT Float80, BT Float64xComplex, BT Float80, BT Float64xComplex, - BT Float80, BT Float64xComplex, BT Float80, BT Float64xComplex, BT Float80, BT Float128, - BT Float128Complex, BT uuFloat128, BT LongDouble, BT LongDoubleComplex, BT Float128x, BT Float128xComplex, + BT Float80, BT Float80, BT Float80, BT LongDoubleComplex, BT Float80, BT LongDoubleComplex, + BT Float80, BT LongDoubleComplex, BT Float80, BT LongDoubleComplex, BT Float80, BT LongDoubleComplex, + BT Float80, BT LongDoubleComplex, BT Float80, BT LongDoubleComplex, BT Float80, BT LongDouble, + BT LongDoubleComplex, BT uuFloat128, BT Float128, BT Float128Complex, BT Float128x, BT Float128xComplex, + }, + { + /* LD */ BT LongDouble, BT LongDouble, BT LongDouble, BT LongDouble, BT LongDouble, BT LongDouble, + BT LongDouble, BT LongDouble, BT LongDouble, BT LongDouble, BT LongDouble, BT LongDouble, + BT LongDouble, BT LongDouble, BT LongDouble, BT LongDoubleComplex, BT LongDouble, BT LongDoubleComplex, + BT LongDouble, BT LongDoubleComplex, BT LongDouble, BT LongDoubleComplex, BT LongDouble, BT LongDoubleComplex, + BT LongDouble, BT LongDoubleComplex, BT LongDouble, BT LongDoubleComplex, BT LongDouble, BT LongDouble, + BT LongDoubleComplex, BT uuFloat128, BT Float128, BT Float128Complex, BT Float128x, BT Float128xComplex, + }, + { + /* LDC */ BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, + BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, + BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, + BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, + BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, + BT LongDoubleComplex, BT Float128Complex, BT Float128Complex, BT Float128Complex, BT Float128xComplex, BT Float128xComplex, + }, + { + /* __FLD */ BT uuFloat128, BT uuFloat128, BT uuFloat128, BT uuFloat128, BT uuFloat128, BT uuFloat128, + BT uuFloat128, BT uuFloat128, BT uuFloat128, BT uuFloat128, BT uuFloat128, BT uuFloat128, + BT uuFloat128, BT uuFloat128, BT uuFloat128, BT Float128Complex, BT uuFloat128, BT Float128Complex, + BT uuFloat128, BT Float128Complex, BT uuFloat128, BT Float128Complex, BT uuFloat128, BT Float128Complex, + BT uuFloat128, BT Float128Complex, BT uuFloat128, BT Float128Complex, BT uuFloat128, BT uuFloat128, + BT Float128Complex, BT uuFloat128, BT Float128, BT Float128Complex, BT Float128x, BT Float128xComplex, }, { @@ -287,5 +311,5 @@ BT Float128, BT Float128Complex, BT Float128, BT Float128Complex, BT Float128, BT Float128Complex, BT Float128, BT Float128Complex, BT Float128, BT Float128Complex, BT Float128, BT Float128, - BT Float128Complex, BT uuFloat128, BT LongDouble, BT LongDoubleComplex, BT Float128x, BT Float128xComplex, + BT Float128Complex, BT Float128, BT Float128, BT Float128Complex, BT Float128x, BT Float128xComplex, }, { @@ -295,29 +319,5 @@ BT Float128Complex, BT Float128Complex, BT Float128Complex, BT Float128Complex, BT Float128Complex, BT Float128Complex, BT Float128Complex, BT Float128Complex, BT Float128Complex, BT Float128Complex, BT Float128Complex, BT Float128Complex, - BT Float128Complex, BT Float128Complex, BT LongDoubleComplex, BT LongDoubleComplex, BT Float128xComplex, BT Float128xComplex, - }, - { - /* __FLD */ BT uuFloat128, BT uuFloat128, BT uuFloat128, BT uuFloat128, BT uuFloat128, BT uuFloat128, - BT uuFloat128, BT uuFloat128, BT uuFloat128, BT uuFloat128, BT uuFloat128, BT uuFloat128, - BT uuFloat128, BT uuFloat128, BT uuFloat128, BT Float128Complex, BT uuFloat128, BT Float128Complex, - BT uuFloat128, BT Float128Complex, BT uuFloat128, BT Float128Complex, BT uuFloat128, BT Float128Complex, - BT uuFloat128, BT Float128Complex, BT uuFloat128, BT Float128Complex, BT uuFloat128, BT uuFloat128, - BT Float128Complex, BT uuFloat128, BT LongDouble, BT LongDoubleComplex, BT Float128x, BT Float128xComplex, - }, - { - /* LD */ BT LongDouble, BT LongDouble, BT LongDouble, BT LongDouble, BT LongDouble, BT LongDouble, - BT LongDouble, BT LongDouble, BT LongDouble, BT LongDouble, BT LongDouble, BT LongDouble, - BT LongDouble, BT LongDouble, BT LongDouble, BT LongDoubleComplex, BT LongDouble, BT LongDoubleComplex, - BT LongDouble, BT LongDoubleComplex, BT LongDouble, BT LongDoubleComplex, BT LongDouble, BT LongDoubleComplex, - BT LongDouble, BT LongDoubleComplex, BT LongDouble, BT LongDoubleComplex, BT LongDouble, BT LongDouble, - BT LongDoubleComplex, BT LongDouble, BT LongDouble, BT LongDoubleComplex, BT Float128x, BT Float128xComplex, - }, - { - /* LDC */ BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, - BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, - BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, - BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, - BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, - BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT LongDoubleComplex, BT Float128xComplex, BT Float128xComplex, + BT Float128Complex, BT Float128Complex, BT Float128Complex, BT Float128Complex, BT Float128xComplex, BT Float128xComplex, }, { Index: src/ResolvExpr/ConversionCost.cpp =================================================================== --- src/ResolvExpr/ConversionCost.cpp (revision 44acc7230995f5609bc1cac28ef52b28ba5617ec) +++ src/ResolvExpr/ConversionCost.cpp (revision 689d0575efebba7e0ece164aab8e2967a9548a43) @@ -52,7 +52,7 @@ _Float64x _Float64x _Complex __float80 + long double long double _Complex + __float128 _Float128 _Float128 _Complex - __float128 - long double long double _Complex _Float128x _Float128x _Complex */ @@ -62,43 +62,43 @@ // GENERATED BY BasicTypes-gen.cpp static const int costMatrix[ast::BasicKind::NUMBER_OF_BASIC_TYPES][ast::BasicKind::NUMBER_OF_BASIC_TYPES] = { // path length from root to node - /* B C SC UC SI USI I UI LI ULI LLI ULLI __ID__UID _FH _FHC _F _FC F FC _FX _FXC _FD _FDC D DC _FDX_FDXC _F80 _FLD_FLDC__FLD LD LDC_FLDX_FLDXC */ - /* B */ { 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 16, 16, 17, 18, 18, 19, }, - /* C */ { -1, 0, 1, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 15, 15, 16, 17, 17, 18, }, - /* SC */ { -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 15, 15, 16, 17, 17, 18, }, - /* UC */ { -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 15, 15, 16, 17, 17, 18, }, - /* SI */ { -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 14, 14, 15, 16, 16, 17, }, - /* USI */ { -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 14, 14, 15, 16, 16, 17, }, - /* I */ { -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 13, 13, 14, 15, 15, 16, }, - /* UI */ { -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 13, 13, 14, 15, 15, 16, }, - /* LI */ { -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 12, 12, 13, 14, 14, 15, }, - /* ULI */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 12, 12, 13, 14, 14, 15, }, - /* LLI */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 11, 11, 12, 13, 13, 14, }, - /* ULLI */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 11, 11, 12, 13, 13, 14, }, - /* __ID */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 10, 10, 11, 12, 12, 13, }, - /* __UID */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 10, 10, 11, 12, 12, 13, }, - /* _FH */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 9, 9, 10, 11, 11, 12, }, + /* B C SC UC SI USI I UI LI ULI LLI ULLI __ID__UID _FH _FHC _F _FC F FC _FX _FXC _FD _FDC D DC _FDX_FDXC _F80 LD LDC__FLD _FLD_FLDC_FLDX_FLDXC */ + /* B */ { 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 17, 17, 18, 18, }, + /* C */ { -1, 0, 1, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 16, 16, 17, 17, }, + /* SC */ { -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 16, 16, 17, 17, }, + /* UC */ { -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 16, 16, 17, 17, }, + /* SI */ { -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 15, 15, 16, 16, }, + /* USI */ { -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 15, 15, 16, 16, }, + /* I */ { -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 14, 14, 15, 15, }, + /* UI */ { -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 14, 14, 15, 15, }, + /* LI */ { -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 13, 13, 14, 14, }, + /* ULI */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 13, 13, 14, 14, }, + /* LLI */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 12, 12, 13, 13, }, + /* ULLI */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 12, 12, 13, 13, }, + /* __ID */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 11, 11, 12, 12, }, + /* __UID */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 11, 11, 12, 12, }, + /* _FH */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 10, 10, 11, 11, }, /* _FHC */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, 1, -1, 2, -1, 3, -1, 4, -1, 5, -1, 6, -1, -1, 8, -1, -1, 10, -1, 11, }, - /* _F */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 8, 8, 9, 10, 10, 11, }, + /* _F */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 9, 9, 10, 10, }, /* _FC */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, 1, -1, 2, -1, 3, -1, 4, -1, 5, -1, -1, 7, -1, -1, 9, -1, 10, }, - /* F */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 7, 7, 8, 9, 9, 10, }, + /* F */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 8, 8, 9, 9, }, /* FC */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, 1, -1, 2, -1, 3, -1, 4, -1, -1, 6, -1, -1, 8, -1, 9, }, - /* _FX */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 6, 6, 7, 8, 8, 9, }, + /* _FX */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 7, 7, 8, 8, }, /* _FXC */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, 1, -1, 2, -1, 3, -1, -1, 5, -1, -1, 7, -1, 8, }, - /* _FD */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 5, 5, 6, 7, 7, 8, }, + /* _FD */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 6, 6, 7, 7, }, /* _FDC */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, 1, -1, 2, -1, -1, 4, -1, -1, 6, -1, 7, }, - /* D */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, }, + /* D */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, 4, 5, 5, 6, 6, }, /* DC */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, 1, -1, -1, 3, -1, -1, 5, -1, 6, }, - /* _FDX */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 3, 3, 4, 5, 5, 6, }, + /* _FDX */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 4, 4, 5, 5, }, /* _FDXC */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, 2, -1, -1, 4, -1, 5, }, - /* _F80 */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 0, 1, 2, 2, 3, 4, 4, 5, }, - /* _FLD */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 3, 3, 4, }, - /* _FLDC */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, 2, -1, 3, }, - /* __FLD */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 0, 1, 2, 2, 3, }, - /* LD */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, }, - /* LDC */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, 1, }, + /* _F80 */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 3, 3, 4, 4, }, + /* LD */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, 3, 3, }, + /* LDC */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, 2, -1, 3, }, + /* __FLD */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, 2, }, + /* _FLD */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, 2, }, + /* _FLDC */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, 1, }, /* _FLDX */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, }, /* _FLDXC */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, }, }; // costMatrix - static const int maxIntCost = 16; + static const int maxIntCost = 15; // GENERATED END static_assert( @@ -110,5 +110,5 @@ // GENERATED BY BasicTypes-gen.cpp static const int signMatrix[ast::BasicKind::NUMBER_OF_BASIC_TYPES][ast::BasicKind::NUMBER_OF_BASIC_TYPES] = { // number of sign changes in safe conversion - /* B C SC UC SI USI I UI LI ULI LLI ULLI __ID__UID _FH _FHC _F _FC F FC _FX _FXC _FD _FDC D DC _FDX_FDXC _F80 _FLD_FLDC__FLD LD LDC_FLDX_FLDXC */ + /* B C SC UC SI USI I UI LI ULI LLI ULLI __ID__UID _FH _FHC _F _FC F FC _FX _FXC _FD _FDC D DC _FDX_FDXC _F80 LD LDC__FLD _FLD_FLDC_FLDX_FLDXC */ /* B */ { 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, /* C */ { -1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, @@ -139,10 +139,10 @@ /* _FDX */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, /* _FDXC */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, 0, -1, -1, 0, -1, 0, }, - /* _F80 */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, - /* _FLD */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, }, - /* _FLDC */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, 0, -1, 0, }, - /* __FLD */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, }, - /* LD */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, }, - /* LDC */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, 0, }, + /* _F80 */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, }, + /* LD */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, }, + /* LDC */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, 0, -1, 0, }, + /* __FLD */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, }, + /* _FLD */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, }, + /* _FLDC */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, 0, }, /* _FLDX */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, }, /* _FLDXC */ { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, }, Index: src/SymTab/ManglerCommon.cpp =================================================================== --- src/SymTab/ManglerCommon.cpp (revision 44acc7230995f5609bc1cac28ef52b28ba5617ec) +++ src/SymTab/ManglerCommon.cpp (revision 689d0575efebba7e0ece164aab8e2967a9548a43) @@ -71,9 +71,9 @@ "CDF64x_", // _Float64x _Complex "Dq", // __float80 + "e", // long double + "Ce", // long double _Complex + "g", // __float128 "DF128_", // _Float128 "CDF128_", // _Float128 _Complex - "g", // __float128 - "e", // long double - "Ce", // long double _Complex "DF128x_", // _Float128x "CDF128x_", // _Float128x _Complex