jasder
/
antlr
1
0
Fork 1
Code Issues Pull Requests Releases 1 Wiki Activity

Do not throw std::bad_cast from antlrcpp::Any::is 

The antlrcpp::Any::is function should not throw a std::bad_cast
exception if the contained type can't be cast to the requested type,
but should instead just return a boolean result. Add a boolean
parameter to the private getDerived helper function to allow callers
to specify whether or not they want the cast results checked. In the
is() function, pass false for this parameter; in the as() functions,
pass true.
This commit is contained in:
Steve Vinoski 2018-11-15 11:01:51 -05:00
parent 11d601348e
commit 562eab817c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
runtime/Cpp/runtime/src/support/Any.h
View File

@ -46,21 +46,21 @@ struct ANTLR4CPP_PUBLIC Any
template<class U>
bool is() const {
auto derived = getDerived<U>();
auto derived = getDerived<U>(false);
return derived != nullptr;
}
template<class U>
StorageType<U>& as() {
auto derived = getDerived<U>();
auto derived = getDerived<U>(true);
return derived->value;
}
template<class U>
const StorageType<U>& as() const {
auto derived = getDerived<U>();
auto derived = getDerived<U>(true);
return derived->value;
}
@ -143,12 +143,12 @@ private:
}
template<class U>
Derived<StorageType<U>>* getDerived() const {
Derived<StorageType<U>>* getDerived(bool checkCast) const {
typedef StorageType<U> T;
auto derived = dynamic_cast<Derived<T>*>(_ptr);
if (!derived)
if (checkCast && !derived)
throw std::bad_cast();
return derived;