Changeset 3253

Timestamp:

Jun 8, 2014, 1:48:42 AM (8 years ago)

Author:

Peter

Message:

refs #799. get_error: don't use operator<< on Key just to create an
error message; it limits which types can be used heavily. Instead
throw get_error that holds a copy of the key.

Location:

trunk

Files:

• test/utility.cc (modified) (1 diff)
• yat/utility/stl_utility.h (modified) (4 diffs)

trunk/test/utility.cc

@@ -301 +301 @@
     suite.out() << "expected exception thrown with what() = "
                 << e.what() << "\n";
+  }
+  // don't run compiler test code
+  if (false) {
+    typedef boost::default_constructible_archetype<
+      boost::sgi_assignable_archetype<> > key_type;
+
+    typedef boost::default_constructible_archetype<
+      boost::sgi_assignable_archetype<
+        boost::null_archetype<std::string> > > value_type;
+
+    typedef boost::default_constructible_archetype<
+      boost::binary_function_archetype<key_type, key_type, bool> > Compare;
+
+    std::map<key_type, value_type, Compare> m3;
+    key_type my_key;
+    utility::get(m3, my_key);
   }
 }

trunk/yat/utility/stl_utility.h

@@ -9 +9 @@
   Copyright (C) 2006 Jari Häkkinen
   Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2009, 2010, 2011, 2012, 2013 Peter Johansson
+  Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -485 +485 @@
      \return const reference to m[k]
 
+     \throw get_error if key \a k does not exist in map
+
      \since New in yat 0.7
    */
@@ -490 +492 @@
   const Tp& get(const std::map<Key, Tp, Compare, Alloc>& m, const Key& k);
 
+  /**
+     \brief error class used in
+     get(const std::map<Key, Tp, Compare, Alloc>& m, const Key& k)
+
+     \since yat 0.13
+   */
+  template<typename Key>
+  class get_error : public runtime_error
+  {
+  public:
+    /// \brief constructor
+    get_error(const std::string& msg, const Key& key)
+      : runtime_error(msg), key_(key) {}
+    /// \brief destructor
+    virtual ~get_error(void) throw () {}
+    /// access the key object
+    const Key& key(void) const { return key_; }
+  private:
+    Key key_;
+  };
 
   /**
@@ -910 +932 @@
     typename std::map<Key, Tp, Compare,Alloc>::const_iterator iter(m.find(key));
     if (iter==m.end()) {
-      std::stringstream ss;
-      ss << "utility::get(const Map&, const Key&): '"
-         << key << "' not found in map\n";
-      throw runtime_error(ss.str());
+      throw
+        get_error<Key>("utility::get(const Map&, const Key&): key not found",
+                       key);
     }
     return iter->second;