maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[flang] checkpoint - building again now with all compilers 

Original-commit: flang-compiler/f18@8cd746910d
Reviewed-on: https://github.com/flang-compiler/f18/pull/183
Tree-same-pre-rewrite: false
This commit is contained in:
peter klausler 2018-08-28 16:35:45 -07:00
parent b1d441749c
commit 3c850d05ca
2 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
flang/lib/evaluate/expression.h
View File

@ -39,7 +39,7 @@ using common::RelationalOperator;
// Expressions are represented by specializations of Expr.
// Each of these specializations wraps a single data member "u" that
// is a std::variant<> discriminated union over the representational
// types of the constants, variables, operations, and other entities that
// types for the constants, variables, operations, and other entities that
// can be valid expressions in that context:
// - Expr<Type<CATEGORY, KIND>> is an expression whose result is of a
// specific intrinsic type category and kind, e.g. Type<TypeCategory::Real, 4>
@ -502,6 +502,8 @@ public:
u;
};
extern template class Expr<Type<TypeCategory::Character, 1>>; // TODO more
// The Relational class template is a helper for constructing logical
// expressions with polymorphism over the cross product of the possible
// categories and kinds of comparable operands.
@ -540,6 +542,25 @@ template<> struct Relational<SomeType> {
common::MapTemplate<Relational, std::variant, RelationalTypes> u;
};
extern template struct Relational<Type<TypeCategory::Integer, 1>>;
extern template struct Relational<Type<TypeCategory::Integer, 2>>;
extern template struct Relational<Type<TypeCategory::Integer, 4>>;
extern template struct Relational<Type<TypeCategory::Integer, 8>>;
extern template struct Relational<Type<TypeCategory::Integer, 16>>;
extern template struct Relational<Type<TypeCategory::Real, 2>>;
extern template struct Relational<Type<TypeCategory::Real, 4>>;
extern template struct Relational<Type<TypeCategory::Real, 8>>;
extern template struct Relational<Type<TypeCategory::Real, 10>>;
extern template struct Relational<Type<TypeCategory::Real, 16>>;
extern template struct Relational<Type<TypeCategory::Complex, 2>>;
extern template struct Relational<Type<TypeCategory::Complex, 4>>;
extern template struct Relational<Type<TypeCategory::Complex, 8>>;
extern template struct Relational<Type<TypeCategory::Complex, 10>>;
extern template struct Relational<Type<TypeCategory::Complex, 16>>;
extern template struct Relational<Type<TypeCategory::Character, 1>>; // TODO
// more
extern template struct Relational<SomeType>;
template<int KIND>
class Expr<Type<TypeCategory::Logical, KIND>>
: public ExpressionBase<Type<TypeCategory::Logical, KIND>> {
@ -565,6 +586,11 @@ public:
common::CombineVariants<Operations, Others> u;
};
extern template class Expr<Type<TypeCategory::Logical, 1>>;
extern template class Expr<Type<TypeCategory::Logical, 2>>;
extern template class Expr<Type<TypeCategory::Logical, 4>>;
extern template class Expr<Type<TypeCategory::Logical, 8>>;
// A polymorphic expression of known intrinsic type category, but dynamic
// kind, represented as a discriminated union over Expr<Type<CAT, K>>
// for each supported kind K in the category.
@ -619,34 +645,10 @@ public:
}
using Others = std::variant<BOZLiteralConstant>;
common::CombineVariants<Others,
common::MapTemplate<Expr, std::variant, SomeCategory>>
u;
using Categories = common::MapTemplate<Expr, std::variant, SomeCategory>;
common::CombineVariants<Others, Categories> u;
};
extern template class Expr<Type<TypeCategory::Character, 1>>; // TODO more
extern template struct Relational<Type<TypeCategory::Integer, 1>>;
extern template struct Relational<Type<TypeCategory::Integer, 2>>;
extern template struct Relational<Type<TypeCategory::Integer, 4>>;
extern template struct Relational<Type<TypeCategory::Integer, 8>>;
extern template struct Relational<Type<TypeCategory::Integer, 16>>;
extern template struct Relational<Type<TypeCategory::Real, 2>>;
extern template struct Relational<Type<TypeCategory::Real, 4>>;
extern template struct Relational<Type<TypeCategory::Real, 8>>;
extern template struct Relational<Type<TypeCategory::Real, 10>>;
extern template struct Relational<Type<TypeCategory::Real, 16>>;
extern template struct Relational<Type<TypeCategory::Complex, 2>>;
extern template struct Relational<Type<TypeCategory::Complex, 4>>;
extern template struct Relational<Type<TypeCategory::Complex, 8>>;
extern template struct Relational<Type<TypeCategory::Complex, 10>>;
extern template struct Relational<Type<TypeCategory::Complex, 16>>;
extern template struct Relational<Type<TypeCategory::Character, 1>>; // TODO
// more
extern template struct Relational<SomeType>;
extern template class Expr<Type<TypeCategory::Logical, 1>>;
extern template class Expr<Type<TypeCategory::Logical, 2>>;
extern template class Expr<Type<TypeCategory::Logical, 4>>;
extern template class Expr<Type<TypeCategory::Logical, 8>>;
extern template class Expr<SomeInteger>;
extern template class Expr<SomeReal>;
extern template class Expr<SomeComplex>;

13
flang/lib/evaluate/type.h
View File

@ -179,8 +179,8 @@ template<typename CONST> struct TypeOfHelper {
template<typename CONST> using TypeOf = typename TypeOfHelper<CONST>::type;
// A variant union that can hold a scalar constant of some type in a set,
// which is passed in as a tuple of Type<> specializations.
// A variant union that can hold a scalar constant of any type chosen from
// a set of types, which is passed in as a tuple of Type<> specializations.
template<typename TYPES> struct SomeScalar {
using Types = TYPES;
CLASS_BOILERPLATE(SomeScalar)
@ -196,9 +196,8 @@ template<typename TYPES> struct SomeScalar {
if constexpr (TypeOf<decltype(x)>::category ==
TypeCategory::Integer) {
return {x.ToInt64()};
} else {
return std::nullopt;
}
return std::nullopt;
},
u);
}
@ -209,9 +208,8 @@ template<typename TYPES> struct SomeScalar {
if constexpr (std::is_same_v<std::string,
std::decay_t<decltype(x)>>) {
return {x};
} else {
return std::nullopt;
}
return std::nullopt;
},
u);
}
@ -222,9 +220,8 @@ template<typename TYPES> struct SomeScalar {
if constexpr (TypeOf<decltype(x)>::category ==
TypeCategory::Logical) {
return {x.IsTrue()};
} else {
return std::nullopt;
}
return std::nullopt;
},
u);
}