diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | include/tag_compound.h | 2 | ||||
| -rw-r--r-- | include/value_initializer.h | 5 | ||||
| -rw-r--r-- | src/tag_compound.cpp | 6 | ||||
| -rw-r--r-- | src/value_initializer.cpp | 42 |
5 files changed, 51 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f49a64ff7..8474392677 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,8 @@ add_library(nbt++ STATIC src/tag.cpp src/tag_compound.cpp src/tag_string.cpp - src/value.cpp) + src/value.cpp + src/value_initializer.cpp) enable_testing() add_subdirectory(test) diff --git a/include/tag_compound.h b/include/tag_compound.h index 3c68fc1b12..ea0df236c9 100644 --- a/include/tag_compound.h +++ b/include/tag_compound.h @@ -43,7 +43,7 @@ public: ///Constructs an empty compound tag_compound() {} - tag_compound(std::initializer_list<std::pair<std::string, value_initializer&&>> init); + tag_compound(std::initializer_list<std::pair<std::string, value_initializer>> init); /** * @brief Accesses a tag by key with bounds checking diff --git a/include/value_initializer.h b/include/value_initializer.h index 86fdd2d1e1..7ae2cb13f4 100644 --- a/include/value_initializer.h +++ b/include/value_initializer.h @@ -47,10 +47,11 @@ public: value_initializer(std::string&& str); value_initializer(const char* str); - operator value&&(); + value& get() const; private: - value val; + mutable value value_; //FIXME: std::initializer_list objects are constant. + //This solution will probably fail }; } diff --git a/src/tag_compound.cpp b/src/tag_compound.cpp index f26044ce20..a2b91826b6 100644 --- a/src/tag_compound.cpp +++ b/src/tag_compound.cpp @@ -22,10 +22,10 @@ namespace nbt { -tag_compound::tag_compound(std::initializer_list<std::pair<std::string, value_initializer&&>> init) +tag_compound::tag_compound(std::initializer_list<std::pair<std::string, value_initializer>> init) { - for(auto& pair: init) - tags.emplace(pair); + for(const auto& pair: init) + tags.emplace(std::move(pair.first), std::move(pair.second.get())); } value& tag_compound::at(const std::string& key) diff --git a/src/value_initializer.cpp b/src/value_initializer.cpp new file mode 100644 index 0000000000..8d57933e09 --- /dev/null +++ b/src/value_initializer.cpp @@ -0,0 +1,42 @@ +/* + * libnbt++ - A library for the Minecraft Named Binary Tag format. + * Copyright (C) 2013, 2015 ljfa-ag + * + * This file is part of libnbt++. + * + * libnbt++ is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * libnbt++ 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with libnbt++. If not, see <http://www.gnu.org/licenses/>. + */ +#include "value_initializer.h" +#include "libnbt.h" + +namespace nbt +{ + +value_initializer::value_initializer(std::unique_ptr<tag>&& t): value_(std::move(t)) {} +value_initializer::value_initializer(value&& val): value_(std::move(val)) {} +value_initializer::value_initializer(tag&& t): value_(std::move(t)) {} + +value_initializer::value_initializer(int8_t val): value_(tag_byte(val)) {} +value_initializer::value_initializer(int16_t val): value_(tag_short(val)) {} +value_initializer::value_initializer(int32_t val): value_(tag_int(val)) {} +value_initializer::value_initializer(int64_t val): value_(tag_long(val)) {} +value_initializer::value_initializer(float val): value_(tag_float(val)) {} +value_initializer::value_initializer(double val): value_(tag_double(val)) {} +value_initializer::value_initializer(const std::string& str): value_(tag_string(str)) {} +value_initializer::value_initializer(std::string&& str): value_(tag_string(std::move(str))) {} +value_initializer::value_initializer(const char* str): value_(tag_string(str)) {} + +value& value_initializer::get() const { return value_; } + +} |