diff options
| author | John Wiegley <johnw@newartisans.com> | 2009-10-31 00:55:56 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2009-10-31 00:55:56 -0400 |
| commit | a2cb549b1dff9024e3f700203e424e496b25fd91 (patch) | |
| tree | 1c03e9eb6f649a1446021dfb2a5d93a697f81feb /src/value.cc | |
| parent | 349fc5d175bc5c4acbc478b4d78c12dc507c4f58 (diff) | |
| parent | a88a4c55b2b11d58d3b9e49bf785be42afe63510 (diff) | |
| download | fork-ledger-a2cb549b1dff9024e3f700203e424e496b25fd91.tar.gz fork-ledger-a2cb549b1dff9024e3f700203e424e496b25fd91.tar.bz2 fork-ledger-a2cb549b1dff9024e3f700203e424e496b25fd91.zip | |
Merge branch 'next'
Diffstat (limited to 'src/value.cc')
| -rw-r--r-- | src/value.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/value.cc b/src/value.cc index a6bbb2fb..a3a05b6c 100644 --- a/src/value.cc +++ b/src/value.cc @@ -113,8 +113,8 @@ value_t::operator bool() const } } return false; - case POINTER: - return ! as_any_pointer().empty(); + case SCOPE: + return as_scope() != NULL; default: break; } @@ -1206,8 +1206,8 @@ bool value_t::is_realzero() const case SEQUENCE: return as_sequence().empty(); - case POINTER: - return as_any_pointer().empty(); + case SCOPE: + return as_scope() == NULL; default: throw_(value_error, _("Cannot determine if %1 is really zero") << label()); @@ -1235,8 +1235,8 @@ bool value_t::is_zero() const case SEQUENCE: return as_sequence().empty(); - case POINTER: - return as_any_pointer().empty(); + case SCOPE: + return as_scope() == NULL; default: throw_(value_error, _("Cannot determine if %1 is zero") << label()); @@ -1474,7 +1474,7 @@ value_t value_t::strip_annotations(const keep_details_t& what_to_keep) const case DATE: case STRING: case MASK: - case POINTER: + case SCOPE: return *this; case SEQUENCE: { @@ -1579,8 +1579,8 @@ void value_t::print(std::ostream& out, break; } - case POINTER: - out << "<POINTER>"; + case SCOPE: + out << "<SCOPE>"; break; default: @@ -1647,8 +1647,8 @@ void value_t::dump(std::ostream& out, const bool relaxed) const out << '/' << as_mask() << '/'; break; - case POINTER: - out << boost::unsafe_any_cast<const void *>(&as_any_pointer()); + case SCOPE: + out << as_scope(); break; case SEQUENCE: { |