sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved value_t::set_type into value.cc, since it had grown.

Browse source
This commit is contained in:
John Wiegley 2009-02-12 02:36:14 -04:00
parent 9344598eb0
commit 433bb11fa9
2 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/value.cc
View file

@ -104,6 +104,26 @@ value_t::operator bool() const
return false; return false;
} }
void value_t::set_type(type_t new_type)
{
assert(new_type >= VOID && new_type <= POINTER);
if (new_type == VOID) {
#if BOOST_VERSION >= 103700
storage.reset();
#else
storage = intrusive_ptr<storage_t>();
#endif
assert(is_null());
} else {
if (! storage || storage->refc > 1)
storage = new storage_t;
else
storage->data = false; // destruct all other types
storage->type = new_type;
assert(is_type(new_type));
}
}
bool value_t::to_boolean() const bool value_t::to_boolean() const
{ {
if (is_boolean()) { if (is_boolean()) {

19
src/value.h
View file

@ -459,24 +459,7 @@ public:
} }
private: private:
void set_type(type_t new_type) { void set_type(type_t new_type);
assert(new_type >= VOID && new_type <= POINTER);
if (new_type == VOID) {
#if BOOST_VERSION >= 103700
storage.reset();
#else
storage = intrusive_ptr<storage_t>();
#endif
assert(is_null());
} else {
if (! storage || storage->refc > 1)
storage = new storage_t;
else
storage->data = false; // destruct all other types
storage->type = new_type;
assert(is_type(new_type));
}
}
public: public:
/** /**