sol2/sol/table_iterator.hpp
ThePhD 220ff5a475 Fixes the key value being left on the stack when using iterators (the other case that's not "and we're not actually using this for iteration", asides from the empty table case).
Closes #111 - fixed
Closes #110 - need to test exactly how much extra speed was gained
Closes #108 - seems to be fixed, albeit std::mutex is a butt on VC++
2016-06-07 20:32:10 -04:00

121 lines
3.4 KiB
C++

// The MIT License (MIT)
// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors
// Permission is hereby granted, free of charge, to any person obtaining a copy of
// this software and associated documentation files (the "Software"), to deal in
// the Software without restriction, including without limitation the rights to
// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
// the Software, and to permit persons to whom the Software is furnished to do so,
// subject to the following conditions:
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef SOL_TABLE_ITERATOR_HPP
#define SOL_TABLE_ITERATOR_HPP
#include "object.hpp"
#include <iterator>
namespace sol {
template <typename reference_type>
class basic_table_iterator : public std::iterator<std::input_iterator_tag, std::pair<object, object>> {
private:
typedef std::iterator<std::input_iterator_tag, std::pair<object, object>> base_t;
public:
typedef object key_type;
typedef object mapped_type;
typedef base_t::value_type value_type;
typedef base_t::iterator_category iterator_category;
typedef base_t::difference_type difference_type;
typedef base_t::pointer pointer;
typedef base_t::reference reference;
typedef const value_type& const_reference;
private:
std::pair<object, object> kvp;
reference_type ref;
int tableidx = 0;
int keyidx = 0;
std::ptrdiff_t idx = 0;
public:
basic_table_iterator () : idx(-1), keyidx(-1) {
}
basic_table_iterator(reference_type x) : ref(std::move(x)) {
ref.push();
tableidx = lua_gettop(ref.lua_state());
stack::push(ref.lua_state(), nil);
this->operator++();
if (idx == -1) {
return;
}
--idx;
}
basic_table_iterator& operator++() {
if (idx == -1)
return *this;
if (lua_next(ref.lua_state(), tableidx) == 0) {
idx = -1;
keyidx = -1;
return *this;
}
++idx;
kvp.first = object(ref.lua_state(), -2);
kvp.second = object(ref.lua_state(), -1);
lua_pop(ref.lua_state(), 1);
// leave key on the stack
keyidx = lua_gettop(ref.lua_state());
return *this;
}
basic_table_iterator operator++(int) {
auto saved = *this;
this->operator++();
return saved;
}
reference operator*() {
return kvp;
}
const_reference operator*() const {
return kvp;
}
bool operator== (const basic_table_iterator& right) const {
return idx == right.idx;
}
bool operator!= (const basic_table_iterator& right) const {
return idx != right.idx;
}
~basic_table_iterator() {
if (keyidx != -1) {
stack::remove(ref.lua_state(), keyidx, 1);
}
if (ref.valid()) {
stack::remove(ref.lua_state(), tableidx, 1);
}
}
};
} // sol
#endif // SOL_TABLE_ITERATOR_HPP