From: Thomas Geymayer Date: Sun, 27 Oct 2013 17:37:19 +0000 (+0100) Subject: New class simgear::Map extending std::map interface. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=050f3791cce3aa03cb7ce88762b95f92b669fd2b;p=simgear.git New class simgear::Map extending std::map interface. --- diff --git a/simgear/nasal/cppbind/cppbind_test.cxx b/simgear/nasal/cppbind/cppbind_test.cxx index ab62d534..a152a722 100644 --- a/simgear/nasal/cppbind/cppbind_test.cxx +++ b/simgear/nasal/cppbind/cppbind_test.cxx @@ -3,6 +3,7 @@ #include "Ghost.hxx" #include "NasalHash.hxx" #include "NasalString.hxx" +#include #include #include @@ -256,6 +257,13 @@ int main(int argc, char* argv[]) std::map > int_vector_map; VERIFY( naIsHash(to_nasal(c, int_vector_map)) ); + simgear::StringMap dict = + simgear::StringMap("hello", "value") + ("key2", "value2"); + naRef na_dict = to_nasal(c, dict); + VERIFY( naIsHash(na_dict) ); + VERIFY( Hash(na_dict, c).get("key2") == "value2" ); + // Check converting to Ghost if using Nasal hashes with actual ghost inside // the hashes parents vector std::vector parents; diff --git a/simgear/structure/CMakeLists.txt b/simgear/structure/CMakeLists.txt index c69c7de9..c6180b29 100644 --- a/simgear/structure/CMakeLists.txt +++ b/simgear/structure/CMakeLists.txt @@ -22,6 +22,7 @@ set(HEADERS event_mgr.hxx exception.hxx intern.hxx + map.hxx subsystem_mgr.hxx StateMachine.hxx ) diff --git a/simgear/structure/map.hxx b/simgear/structure/map.hxx new file mode 100644 index 00000000..49493128 --- /dev/null +++ b/simgear/structure/map.hxx @@ -0,0 +1,69 @@ +///@file Extended std::map with methods for easier usage. +// +// Copyright (C) 2013 Thomas Geymayer +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Library General Public +// License as published by the Free Software Foundation; either +// version 2 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Library General Public License for more details. +// +// You should have received a copy of the GNU Library General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +#ifndef SG_MAP_HXX_ +#define SG_MAP_HXX_ + +#include +#include + +namespace simgear +{ + + template + class Map: + public std::map + { + public: + Map() {} + + /** + * Initilize a new mape with the given key/value pair. + */ + Map(const Key& key, const Value& value) + { + (*this)[key] = value; + } + + /** + * Change/add new value. + */ + Map& operator()(const Key& key, const Value& value) + { + (*this)[key] = value; + return *this; + } + + /** + * Retrive a value (or get a default value if it does not exist). + */ + Value get(const Key& key, const Value& def = Value()) const + { + typename Map::const_iterator it = this->find(key); + if( it != this->end() ) + return it->second; + + return def; + } + }; + + typedef Map StringMap; + +} // namespace simgear + +#endif /* SG_MAP_HXX_ */