Prioritize matching suffixes when looking for a type

[libs/datafile.git] / source / collection.h

diff --git a/source/collection.h b/source/collection.h
index 612a0af01879deaac213f1883db29df76d3cd57d..89e801ffa87850ebcba5b5452c03a4a15a4dbf0b 100644 (file)
--- a/source/collection.h
+++ b/source/collection.h
@@ -131,7 +131,7 @@ public:
        T &get(const std::string &name)
        {
                typedef typename RemoveConst<T>::Type NCT;
-               return extract<NCT>(get_var(name, get_type<NCT>()));
+               return extract<NCT>(get_var(name, get_type<NCT>(name)));
        }
 
 private:
@@ -251,9 +251,10 @@ protected:
        CollectionItemType<T> &add_type();
 
 private:
-       /// Returns the descriptor for a type, or null if one isn't defined.
+       /** Returns the descriptor for a type, or null if one isn't defined.  An
+       optional name can be given to prioritize matching types. */
        template<typename T>
-       CollectionItemTypeBase *get_type() const;
+       CollectionItemTypeBase *get_type(const std::string & = std::string()) const;
 
        /// Gets a descriptor with the same type as another descriptor.
        CollectionItemTypeBase *get_type(const CollectionItemTypeBase &) const;
@@ -284,6 +285,8 @@ protected:
        /** Sets a fallback collection, which will be consulted if an item is not
        found. */
        void set_fallback(Collection *);
+
+       Collection *get_fallback() const { return fallback; }
 };
 
 template<typename T>
@@ -498,15 +501,20 @@ CollectionItemType<T> &Collection::add_type()
 }
 
 template<typename T>
-CollectionItemTypeBase *Collection::get_type() const
+CollectionItemTypeBase *Collection::get_type(const std::string &name) const
 {
        for(TypeList::const_iterator j=types.begin(); j!=types.end(); ++j)
                if(dynamic_cast<CollectionItemType<T> *>(*j))
                        return *j;
+       CollectionItemTypeBase *type = 0;
        for(TypeList::const_iterator j=types.begin(); j!=types.end(); ++j)
                if((*j)->can_extract<T>())
-                       return *j;
-       return 0;
+               {
+                       if(!name.empty() && (*j)->match_name(name))
+                               return *j;
+                       type = *j;
+               }
+       return type;
 }
 
 } // namespace DataFile