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

made value_t into a more complete type. amounts.py now works.

Browse source
This commit is contained in:
John Wiegley 2004-09-08 01:54:28 -04:00
parent a4c5380a7f
commit 6cfdd704a9
3 changed files with 178 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
balance.h
View file

@ -389,6 +389,11 @@ inline balance_t abs(const balance_t& bal) {
return temp;
}
inline std::ostream& operator<<(std::ostream& out, const balance_t& bal) {
bal.write(out, 12);
}
class balance_pair_t
{
public:
@ -754,6 +759,11 @@ inline balance_pair_t abs(const balance_pair_t& bal_pair) {
return temp;
}
inline std::ostream& operator<<(std::ostream& out,
const balance_pair_t& bal_pair) {
bal_pair.quantity.write(out, 12);
}
} // namespace ledger
#endif // _BALANCE_H

53
value.cc
View file

@ -563,24 +563,71 @@ void export_value()
.def(init<bool>())
.def(self += self)
.def(self += other<balance_pair_t>())
.def(self += other<balance_t>())
.def(self += other<amount_t>())
.def(self += int())
.def(self -= self)
.def(self -= other<balance_pair_t>())
.def(self -= other<balance_t>())
.def(self -= other<amount_t>())
.def(self -= int())
.def(self *= self)
.def(self *= other<balance_pair_t>())
.def(self *= other<balance_t>())
.def(self *= other<amount_t>())
.def(self *= int())
.def(self /= self)
.def(self /= other<balance_pair_t>())
.def(self /= other<balance_t>())
.def(self /= other<amount_t>())
.def(self /= int())
.def(self < self)
.def(self < other<balance_pair_t>())
.def(self < other<balance_t>())
.def(self < other<amount_t>())
.def(self < int())
.def(self <= self)
.def(self <= other<balance_pair_t>())
.def(self <= other<balance_t>())
.def(self <= other<amount_t>())
.def(self <= int())
.def(self > self)
.def(self > other<balance_pair_t>())
.def(self > other<balance_t>())
.def(self > other<amount_t>())
.def(self > int())
.def(self >= self)
.def(self >= other<balance_pair_t>())
.def(self >= other<balance_t>())
.def(self >= other<amount_t>())
.def(self >= int())
.def(self == self)
.def(self == other<balance_pair_t>())
.def(self == other<balance_t>())
.def(self == other<amount_t>())
.def(self == int())
.def(self != self)
.def(self != other<balance_pair_t>())
.def(self != other<balance_t>())
.def(self != other<amount_t>())
.def(self != int())
.def(! self)
#if 0
.def(abs(self))
.def(str(self))
.def(self_ns::str(self))
.def("cast", &value_t::cast)
#endif
.def("negate", &value_t::negate)
.def("cost", &value_t::cost)
;

118
value.h
View file

@ -46,6 +46,10 @@ class value_t
*((unsigned int *) data) = value;
type = INTEGER;
}
value_t(const int value) {
*((unsigned int *) data) = (unsigned int) value;
type = INTEGER;
}
value_t(const double value) {
new((amount_t *) data) amount_t(value);
type = AMOUNT;
@ -92,6 +96,9 @@ class value_t
}
return *this;
}
value_t& operator=(const int value) {
return *this = (unsigned int) value;
}
value_t& operator=(const double value) {
return *this = amount_t(value);
}
@ -143,6 +150,61 @@ class value_t
value_t& operator*=(const value_t& value);
value_t& operator/=(const value_t& value);
template <typename T>
value_t& operator+=(const T& value) {
return *this += value_t(value);
}
template <typename T>
value_t& operator-=(const T& value) {
return *this -= value_t(value);
}
template <typename T>
value_t& operator*=(const T& value) {
return *this *= value_t(value);
}
template <typename T>
value_t& operator/=(const T& value) {
return *this /= value_t(value);
}
value_t operator+(const value_t& value) {
value_t temp(*this);
temp += value;
return temp;
}
value_t operator-(const value_t& value) {
value_t temp(*this);
temp -= value;
return temp;
}
value_t operator*(const value_t& value) {
value_t temp(*this);
temp *= value;
return temp;
}
value_t operator/(const value_t& value) {
value_t temp(*this);
temp /= value;
return temp;
}
template <typename T>
value_t operator+(const T& value) {
return *this + value_t(value);
}
template <typename T>
value_t operator-(const T& value) {
return *this - value_t(value);
}
template <typename T>
value_t operator*(const T& value) {
return *this * value_t(value);
}
template <typename T>
value_t operator/(const T& value) {
return *this / value_t(value);
}
bool operator<(const value_t& value);
bool operator<=(const value_t& value);
bool operator>(const value_t& value);
@ -152,6 +214,31 @@ class value_t
return ! (*this == value);
}
template <typename T>
bool operator<(const T& value) {
return *this < value_t(value);
}
template <typename T>
bool operator<=(const T& value) {
return *this <= value_t(value);
}
template <typename T>
bool operator>(const T& value) {
return *this > value_t(value);
}
template <typename T>
bool operator>=(const T& value) {
return *this >= value_t(value);
}
template <typename T>
bool operator==(const T& value) {
return *this == value_t(value);
}
template <typename T>
bool operator!=(const value_t& value) {
return ! (*this == value);
}
template <typename T>
operator T() const;
@ -185,6 +272,37 @@ value_t::operator T() const
return 0;
}
inline value_t abs(const value_t& value) {
value_t temp(value);
temp.abs();
return temp;
}
inline std::ostream& operator<<(std::ostream& out, const value_t& value) {
switch (value.type) {
case value_t::BOOLEAN:
out << *((bool *) value.data);
break;
case value_t::INTEGER:
out << *((unsigned int *) value.data);
break;
case value_t::AMOUNT:
out << *((amount_t *) value.data);
break;
case value_t::BALANCE:
out << *((balance_t *) value.data);
break;
case value_t::BALANCE_PAIR:
out << *((balance_pair_t *) value.data);
break;
default:
assert(0);
break;
}
return out;
}
class value_error : public std::exception {
std::string reason;
public: