diff options
author | Jonathan Robie <jonathan@apache.org> | 2010-11-01 14:18:07 +0000 |
---|---|---|
committer | Jonathan Robie <jonathan@apache.org> | 2010-11-01 14:18:07 +0000 |
commit | f3737cc2b38d3a0494a64d1b5d618229a80651bd (patch) | |
tree | a66be957c5dd1489bb46cc9c0e63002c3728908b | |
parent | ec8173b568c8c57f7f21215f0e64947b69f0c13b (diff) | |
download | qpid-python-f3737cc2b38d3a0494a64d1b5d618229a80651bd.tar.gz |
Changed Variant::fromString() to Variant::parse(). Also changed implementation.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1029673 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | qpid/cpp/include/qpid/types/Variant.h | 6 | ||||
-rw-r--r-- | qpid/cpp/src/qpid/messaging/AddressParser.cpp | 3 | ||||
-rw-r--r-- | qpid/cpp/src/qpid/types/Variant.cpp | 46 |
3 files changed, 19 insertions, 36 deletions
diff --git a/qpid/cpp/include/qpid/types/Variant.h b/qpid/cpp/include/qpid/types/Variant.h index 2b692f9bdf..9ae672b7c2 100644 --- a/qpid/cpp/include/qpid/types/Variant.h +++ b/qpid/cpp/include/qpid/types/Variant.h @@ -113,7 +113,11 @@ class Variant QPID_TYPES_EXTERN Variant& operator=(const Variant&); QPID_TYPES_EXTERN Variant& operator=(const Uuid&); - QPID_TYPES_EXTERN Variant& fromString(const std::string&); + /** + * Parses the argument and assigns itself the appropriate + * value. Recognises integers, doubles and booleans. + */ + QPID_TYPES_EXTERN Variant& parse(const std::string&); QPID_TYPES_EXTERN bool asBool() const; QPID_TYPES_EXTERN uint8_t asUint8() const; diff --git a/qpid/cpp/src/qpid/messaging/AddressParser.cpp b/qpid/cpp/src/qpid/messaging/AddressParser.cpp index d088b94f32..4c8f35fbc5 100644 --- a/qpid/cpp/src/qpid/messaging/AddressParser.cpp +++ b/qpid/cpp/src/qpid/messaging/AddressParser.cpp @@ -201,9 +201,8 @@ bool AddressParser::readSimpleValue(Variant& value) { std::string s; if (readWord(s)) { - value.fromString(s); + value.parse(s); return true; - } else { return false; } diff --git a/qpid/cpp/src/qpid/types/Variant.cpp b/qpid/cpp/src/qpid/types/Variant.cpp index ea4f5ffbbf..5d8878bdac 100644 --- a/qpid/cpp/src/qpid/types/Variant.cpp +++ b/qpid/cpp/src/qpid/types/Variant.cpp @@ -767,39 +767,19 @@ Variant& Variant::operator=(const Variant& v) return *this; } - -template <class T> -bool from_string(T& t, const std::string& s) -{ - char c; // Make sure there are no extra characters - - std::istringstream iss(s); - return !(iss >> t).fail() && (iss>>c).fail(); -} - -Variant& Variant::fromString(const std::string& s) -{ - double d; - int i; - - if (from_string<int>(i, s)) { - return operator=(i); - } - else if (from_string<double>(d, s)) { - return operator=(d); - } - else { - std::string upper(boost::to_upper_copy(s)); - if (upper == "TRUE") { - return operator=(true); - } - else if (upper == "FALSE") { - return operator=(false); - } - else { - return operator=(s); - } - } +Variant& Variant::parse(const std::string& s) +{ + operator=(s); + try { + return operator=(asInt64()); + } catch (const InvalidConversion&) {} + try { + return operator=(asDouble()); + } catch (const InvalidConversion&) {} + try { + return operator=(asBool()); + } catch (const InvalidConversion&) {} + return *this; } |