Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor improvements to TypeWithDict #6935

Merged
merged 1 commit into from Dec 15, 2014
Merged

Minor improvements to TypeWithDict #6935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion FWCore/Utilities/interface/TypeWithDict.h
View file
Open in desktop
Expand Up @@ -41,7 +41,8 @@ class TypeWithDict {
friend class TypeDataMembers;
friend class TypeFunctionMembers;
friend bool operator==(TypeWithDict const&, std::type_info const&);
typedef enum{} dummyEnum;
typedef enum{} dummyType; // Tag for valid type, but no type_info information
typedef dummyType** invalidType; // Tag for invalid type
private:
std::type_info const* ti_;
TType* type_;
Expand Down
40 changes: 29 additions & 11 deletions FWCore/Utilities/src/TypeWithDict.cc
View file
Open in desktop
Expand Up @@ -31,6 +31,7 @@

#include <cxxabi.h>

//#include <iostream>
namespace edm {
static
void throwTypeException(std::string const& function, std::string const& typeName) {
Expand Down Expand Up @@ -134,6 +135,7 @@ namespace edm {
return TypeWithDict(typeid(void), property);
}

// std::cerr << "DEBUG BY NAME: " << name << std::endl;
TType* type = gInterpreter->Type_Factory(name);
if (!gInterpreter->Type_IsValid(type)) {
typeMap.insert(std::make_pair(name, TypeWithDict()));
Expand All @@ -144,7 +146,7 @@ namespace edm {
}

TypeWithDict::TypeWithDict() :
ti_(&typeid(void)),
ti_(&typeid(TypeWithDict::invalidType)),
type_(nullptr),
class_(nullptr),
enum_(nullptr),
Expand Down Expand Up @@ -213,6 +215,12 @@ namespace edm {
return;
}

if(ti == typeid(void)) {
return;
}

// std::cerr << "DEBUG BY TI: " << name() << std::endl;

type_ = gInterpreter->Type_Factory(ti);
if (!gInterpreter->Type_IsValid(type_)) {
throwTypeException("TypeWithDict(TType*, property): ", name());
Expand All @@ -229,7 +237,7 @@ namespace edm {
}

TypeWithDict::TypeWithDict(TEnum* enm, std::string const& name, long property /*= 0L*/) :
ti_(&typeid(TypeWithDict::dummyEnum)),
ti_(&typeid(TypeWithDict::dummyType)),
type_(nullptr),
class_(nullptr),
enum_(enm),
Expand All @@ -242,7 +250,7 @@ namespace edm {
}

TypeWithDict::TypeWithDict(TType* ttype, long property /*= 0L*/) :
ti_(&typeid(void)),
ti_(&typeid(invalidType)),
type_(ttype),
class_(nullptr),
enum_(nullptr),
Expand All @@ -268,18 +276,30 @@ namespace edm {
property_ |= (long) kIsReference;
}
dataType_ = TDataType::GetDataType(TDataType::GetType(*ti_));
// if(dataType_ != nullptr) {
// std::cerr << "DEBUG BY TTYPE FUNDAMENTAL: " << name() << std::endl;
//}
if (!gInterpreter->Type_IsFundamental(ttype) &&
!gInterpreter->Type_IsArray(ttype) &&
!gInterpreter->Type_IsPointer(ttype) &&
!gInterpreter->Type_IsEnum(ttype)) {
// Must be a class, struct, or union.
class_ = TClass::GetClass(*ti_);
// if(class_ != nullptr) {
// std::cerr << "DEBUG BY TTYPE CLASS: " << name() << std::endl;
// return;
// }
}
if (gInterpreter->Type_IsEnum(ttype)) {
enum_ = TEnum::GetEnum(*ti_, TEnum::kAutoload);
// if(enum_ != nullptr) {
// std::cerr << "DEBUG BY TTYPE ENUM: " << name() << std::endl;
// }
}
}

TypeWithDict::operator bool() const {
if (*ti_ == typeid(void)) {
if (*ti_ == typeid(invalidType)) {
return false;
}
if (class_ != nullptr || dataType_ != nullptr || enum_ != nullptr) {
Expand All @@ -291,8 +311,7 @@ namespace edm {

std::type_info const&
TypeWithDict::typeInfo() const {
bool haveGoodInfo = isClass() || isFundamental() || (isEnum() && *ti_ != typeid(dummyEnum));
if(!haveGoodInfo) {
if(*ti_ == typeid(dummyType)) {
// No accurate type_info
assert(qualifiedName().c_str() == nullptr);
}
Expand Down Expand Up @@ -374,7 +393,7 @@ namespace edm {

bool
TypeWithDict::isTypedef() const {
if (class_ != nullptr || dataType_ != nullptr || enum_ != nullptr || *ti_ == typeid(void)) {
if (class_ != nullptr || dataType_ != nullptr || enum_ != nullptr || *ti_ == typeid(void) || *ti_ == typeid(invalidType)) {
return false;
}
assert(type_ != nullptr);
Expand Down Expand Up @@ -579,7 +598,7 @@ namespace edm {

TypeWithDict
TypeWithDict::finalType() const {
if (*ti_ == typeid(void)) {
if (*ti_ == typeid(invalidType)) {
return TypeWithDict();
}
if(enum_ != nullptr) {
Expand All @@ -590,7 +609,7 @@ namespace edm {

TypeWithDict
TypeWithDict::toType() const {
if (*ti_ == typeid(void)) {
if (*ti_ == typeid(invalidType)) {
return TypeWithDict();
}
if(isReference()) {
Expand Down Expand Up @@ -800,8 +819,7 @@ namespace edm {

bool
operator==(TypeWithDict const& a, std::type_info const& b) {
bool haveGoodInfo = a.isClass() || a.isFundamental() || (a.isEnum() && *a.ti_ != typeid(TypeWithDict::dummyEnum));
if(!haveGoodInfo) {
if(*a.ti_ == typeid(TypeWithDict::dummyType)) {
// No accurate type_info
return a.name() == TypeID(b).className();
}
Expand Down