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

[flang] buildable checkpoint before merging with master 

Original-commit: flang-compiler/f18@78c5b8c411
Reviewed-on: https://github.com/flang-compiler/f18/pull/212
Tree-same-pre-rewrite: false
This commit is contained in:
peter klausler 2018-10-01 11:27:45 -07:00
parent 42b33da129
commit b22d494357
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
flang/lib/evaluate/intrinsics.cc
View File

@ -36,6 +36,7 @@ static constexpr CategorySet Int{TypeCategory::Integer},
AnyType{IntrinsicType | CategorySet{TypeCategory::Derived}};
enum class KindCode {
none,
defaultIntegerKind,
defaultRealKind,
doublePrecision,
@ -56,7 +57,7 @@ enum class KindCode {
struct TypePattern {
CategorySet categorySet;
KindCode kindCode;
KindCode kindCode{KindCode::none};
};
// Abbreviations for arguments and results in the prototype specifications
@ -108,10 +109,10 @@ enum SpecialNote {
};
struct IntrinsicDummyArgument {
const char *keyword;
const char *keyword{nullptr};
TypePattern typePattern;
RankPattern rank{elemental};
enum SpecialNote note; // default value when greater than zero
enum SpecialNote note { none };
};
static constexpr IntrinsicDummyArgument DefaultingKind{
@ -120,14 +121,14 @@ static constexpr IntrinsicDummyArgument DefaultingKind{
struct IntrinsicInterface {
static constexpr int maxArguments{7};
const char *name;
const char *name{nullptr};
IntrinsicDummyArgument dummy[maxArguments];
TypePattern result;
RankPattern rank{elemental};
};
// This table's entries must be ordered alphabetically.
static constexpr IntrinsicInterface genericIntrinsicFunction[]{
static const IntrinsicInterface genericIntrinsicFunction[]{
{"abs", {{"a", IntOrRealA}}, IntOrRealA},
{"abs", {{"a", ZA}}, RA},
{"achar", {{"i", IA}, DefaultingKind}, ChK},
@ -355,7 +356,7 @@ struct SpecificIntrinsicInterface : public IntrinsicInterface {
const char *generic{nullptr};
};
static constexpr SpecificIntrinsicInterface specificIntrinsicFunction[]{
static const SpecificIntrinsicInterface specificIntrinsicFunction[]{
{{"abs", {{"a", Rd}}, Rd}},
{{"acos", {{"x", Rd}}, Rd}},
{{"aimag", {{"z", Zd}}, Rd}},