jepler/openscad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

green refactor: Use shared_ptr strings

Browse source
This commit is contained in:
Marius Kintel 2015-12-26 21:12:48 -05:00
parent d065aff2d3
commit 577a5908fd
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/nodecache.h
View file

@ -3,6 +3,7 @@
#include <vector>
#include <string>
#include "node.h"
#include "memory.h"
/*!
Caches string values per node based on the node.index().
@ -16,14 +17,15 @@ public:
virtual ~NodeCache() { }
bool contains(const AbstractNode &node) const {
return !(*this)[node].empty();
if (this->cache.size() > node.index()) return this->cache[node.index()].get();
return false;
}
/*! Returns a reference to the cached string copy. NB! don't rely on
* this reference to be valid for long - if the cache is resized
* internally, existing values are lost. */
const std::string & operator[](const AbstractNode &node) const {
if (this->cache.size() > node.index()) return this->cache[node.index()];
if (this->cache.size() > node.index()) return *this->cache[node.index()];
else return this->nullvalue;
}
@ -32,11 +34,12 @@ public:
* internally, existing values are lost. */
const std::string &insert(const class AbstractNode &node, const std::string & value) {
if (this->cache.size() <= node.index()) this->cache.resize(node.index() + 1);
return this->cache[node.index()] = value;
this->cache[node.index()].reset(new std::string(value));
return *this->cache[node.index()];
}
void remove(const class AbstractNode &node) {
if (this->cache.size() > node.index()) this->cache[node.index()] = std::string();
if (this->cache.size() > node.index()) this->cache[node.index()].reset();
}
void clear() {
@ -44,6 +47,6 @@ public:
}
private:
std::vector<std::string> cache;
std::vector<shared_ptr<std::string> > cache;
std::string nullvalue;
};

2
src/nodedumper.cc
View file

@ -16,7 +16,7 @@
bool NodeDumper::isCached(const AbstractNode &node) const
{
return !this->cache[node].empty();
return this->cache.contains(node);
}
/*!