amounts.cc
setup.py
test.py
@@ -1,8 +1,14 @@
-lib_LTLIBRARIES = libledger.la
-libledger_la_CXXFLAGS =
-libledger_la_SOURCES = \
+lib_LTLIBRARIES = libamounts.la libledger.la
+libamounts_la_CXXFLAGS =
+libamounts_la_SOURCES = \
amount.cc \
balance.cc \
+ value.cc
+if HAVE_BOOST_PYTHON
+libamounts_la_CXXFLAGS += -DUSE_BOOST_PYTHON=1
+endif
+libledger_la_CXXFLAGS =
+libledger_la_SOURCES = \
binary.cc \
config.cc \
datetime.cc \
@@ -19,7 +25,6 @@ libledger_la_SOURCES = \
startup.cc \
textual.cc \
valexpr.cc \
- value.cc \
walk.cc
if HAVE_EXPAT
libledger_la_CXXFLAGS += -DHAVE_EXPAT=1
@@ -37,12 +42,16 @@ if DEBUG
libledger_la_CXXFLAGS += -DDEBUG_LEVEL=4
libledger_la_SOURCES += debug.cc
endif
-libledger_la_LDFLAGS = -version-info 3:0
+libledger_la_LDFLAGS = -version-info 2:6
pkginclude_HEADERS = \
acconf.h \
+ \
amount.h \
balance.h \
+ value.h \
+ util.h \
+ \
binary.h \
config.h \
datetime.h \
@@ -62,9 +71,7 @@ pkginclude_HEADERS = \
reconcile.h \
textual.h \
timing.h \
- util.h \
valexpr.h \
- value.h \
walk.h \
xml.h
@@ -73,18 +80,15 @@ pkginclude_HEADERS = \
bin_PROGRAMS = ledger
ledger_CXXFLAGS =
ledger_SOURCES = main.cc
-ledger_LDADD = $(LIBOBJS) libledger.la
+ledger_LDADD = $(LIBOBJS) libamounts.la libledger.la
if HAVE_EXPAT
ledger_CXXFLAGS += -DHAVE_EXPAT=1
-ledger_LDADD += -lexpat
endif
if HAVE_XMLPARSE
ledger_CXXFLAGS += -DHAVE_XMLPARSE=1
-ledger_LDADD += -lxmlparse -lxmltok
endif
if HAVE_LIBOFX
ledger_CXXFLAGS += -DHAVE_LIBOFX=1
-ledger_LDADD += -lofx
endif
if DEBUG
ledger_CXXFLAGS += -DDEBUG_LEVEL=4
@@ -100,6 +104,22 @@ dist_lisp_LISP = ledger.el timeclock.el
######################################################################
+if HAVE_BOOST_PYTHON
+
+noinst_PROGRAMS = amounts.so
+
+amounts.so: amounts.cc libamounts.la
+ CFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS) -L. -L.libs" \
+ python setup.py build --build-lib=.
+
+install-exec-hook:
+ CFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS) -L. -L.libs" \
+ python setup.py install --prefix=$(prefix)
+
+endif
+
+######################################################################
+
all-clean: maintainer-clean
rm -fr *~ .*~ .\#* *.html *.info *.pdf *.a *.so *.o *.lo *.la \
*.elc *.aux *.cp *.fn *.ky *.log *.pg *.toc *.tp *.vr \
Makefile.am
@@ -18,12 +18,13 @@ autoconf
INCDIRS="-I/sw/include -I/usr/local/include/boost-1_33 -I/usr/include/httpd/xml"
#INCDIRS="$INCDIRS -I/sw/include/libofx"
+INCDIRS="$INCDIRS -I/sw/include/python2.4"
INCDIRS="$INCDIRS -Wno-long-double"
-LIBDIRS="-L/sw/lib -L/usr/local/lib"
+LIBDIRS="-L/sw/lib -L/usr/local/lib -L/sw/lib/python2.4/config"
if [ "$1" = "--debug" ]; then
./configure CPPFLAGS="$INCDIRS" LDFLAGS="$LIBDIRS" CXXFLAGS="-g" \
- --enable-debug
+ --enable-debug --enable-python
elif [ "$1" = "--opt" ]; then
./configure CPPFLAGS="$INCDIRS" LDFLAGS="$LIBDIRS" \
CXXFLAGS="-fomit-frame-pointer -O3 -mcpu=7450 -fPIC"
acprep
@@ -1291,3 +1291,180 @@ amount_t commodity_t::value(const std::time_t moment)
}
} // namespace ledger
+
+#ifdef USE_BOOST_PYTHON
+
+#include <boost/python.hpp>
+#include <Python.h>
+
+using namespace boost::python;
+using namespace ledger;
+
+int py_amount_quantity(amount_t& amount)
+{
+ std::string quant = amount.quantity_string();
+ return std::atol(quant.c_str());
+}
+
+void py_parse_1(amount_t& amount, const std::string& str,
+ unsigned short flags) {
+ amount.parse(str, flags);
+}
+void py_parse_2(amount_t& amount, const std::string& str) {
+ amount.parse(str);
+}
+
+struct commodity_updater_wrap : public commodity_t::updater_t
+{
+ PyObject * self;
+ commodity_updater_wrap(PyObject * self_) : self(self_) {}
+
+ virtual void operator()(commodity_t& commodity,
+ const std::time_t moment,
+ const std::time_t date,
+ const std::time_t last,
+ amount_t& price) {
+ call_method<void>(self, "__call__", commodity, moment, date, last, price);
+ }
+};
+
+commodity_t * py_find_commodity_1(const std::string& symbol)
+{
+ return commodity_t::find_commodity(symbol);
+}
+
+commodity_t * py_find_commodity_2(const std::string& symbol, bool auto_create)
+{
+ return commodity_t::find_commodity(symbol, auto_create);
+}
+
+#define EXC_TRANSLATOR(type) \
+ void exc_translate_ ## type(const type& err) { \
+ PyErr_SetString(PyExc_RuntimeError, err.what()); \
+ }
+
+EXC_TRANSLATOR(amount_error)
+
+void export_amount()
+{
+ scope().attr("AMOUNT_PARSE_NO_MIGRATE") = AMOUNT_PARSE_NO_MIGRATE;
+ scope().attr("AMOUNT_PARSE_NO_REDUCE") = AMOUNT_PARSE_NO_REDUCE;
+
+ class_< amount_t > ("Amount")
+ .def(init<amount_t>())
+ .def(init<std::string>())
+ .def(init<char *>())
+ .def(init<bool>())
+ .def(init<long>())
+ .def(init<unsigned long>())
+ .def(init<double>())
+
+ .def(self += self)
+ .def(self += long())
+ .def(self + self)
+ .def(self + long())
+ .def(self -= self)
+ .def(self -= long())
+ .def(self - self)
+ .def(self - long())
+ .def(self *= self)
+ .def(self *= long())
+ .def(self * self)
+ .def(self * long())
+ .def(self /= self)
+ .def(self /= long())
+ .def(self / self)
+ .def(self / long())
+ .def(- self)
+
+ .def(self < self)
+ .def(self < long())
+ .def(self <= self)
+ .def(self <= long())
+ .def(self > self)
+ .def(self > long())
+ .def(self >= self)
+ .def(self >= long())
+ .def(self == self)
+ .def(self == long())
+ .def(self != self)
+ .def(self != long())
+ .def(! self)
+
+ .def(self_ns::int_(self))
+ .def(self_ns::float_(self))
+ .def(self_ns::str(self))
+ .def(abs(self))
+
+ .add_property("commodity",
+ make_function(&amount_t::commodity,
+ return_value_policy<reference_existing_object>()),
+ &amount_t::set_commodity)
+ .add_property("quantity", py_amount_quantity)
+
+ .def("negate", &amount_t::negate)
+ .def("parse", py_parse_1)
+ .def("parse", py_parse_2)
+ .def("reduce", &amount_t::reduce)
+
+ .def("valid", &amount_t::valid)
+ ;
+
+ class_< commodity_t::updater_t, commodity_updater_wrap, boost::noncopyable >
+ ("Updater")
+ ;
+
+ scope().attr("COMMODITY_STYLE_DEFAULTS") = COMMODITY_STYLE_DEFAULTS;
+ scope().attr("COMMODITY_STYLE_SUFFIXED") = COMMODITY_STYLE_SUFFIXED;
+ scope().attr("COMMODITY_STYLE_SEPARATED") = COMMODITY_STYLE_SEPARATED;
+ scope().attr("COMMODITY_STYLE_EUROPEAN") = COMMODITY_STYLE_EUROPEAN;
+ scope().attr("COMMODITY_STYLE_THOUSANDS") = COMMODITY_STYLE_THOUSANDS;
+ scope().attr("COMMODITY_STYLE_NOMARKET") = COMMODITY_STYLE_NOMARKET;
+ scope().attr("COMMODITY_STYLE_VARIABLE") = COMMODITY_STYLE_VARIABLE;
+
+ class_< commodity_t > ("Commodity")
+ .def(init<std::string, optional<unsigned int, unsigned int> >())
+
+ .add_property("symbol", &commodity_t::symbol,
+ &commodity_t::set_symbol)
+
+ // jww (2006-02-28): Use getters and setters!
+ .def_readwrite("name", &commodity_t::name_)
+ .def_readwrite("note", &commodity_t::note_)
+ .def_readwrite("precision", &commodity_t::precision_)
+ .def_readwrite("flags", &commodity_t::flags_)
+ .def_readwrite("ident", &commodity_t::ident)
+ .def_readwrite("updater", &commodity_t::updater)
+
+ .add_property("smaller",
+ make_getter(&commodity_t::smaller_,
+ return_value_policy<reference_existing_object>()))
+ .add_property("larger",
+ make_getter(&commodity_t::larger_,
+ return_value_policy<reference_existing_object>()))
+
+ .def(self_ns::str(self))
+
+ .def("add_price", &commodity_t::add_price)
+ .def("remove_price", &commodity_t::remove_price)
+ .def("value", &commodity_t::value)
+
+ .def("valid", &commodity_t::valid)
+ ;
+
+ scope().attr("NullCommodity") = commodity_t::null_commodity;
+
+ def("add_commodity", &commodity_t::add_commodity);
+ def("remove_commodity", &commodity_t::remove_commodity);
+ def("find_commodity", py_find_commodity_1,
+ return_value_policy<reference_existing_object>());
+ def("find_commodity", py_find_commodity_2,
+ return_value_policy<reference_existing_object>());
+
+#define EXC_TRANSLATE(type) \
+ register_exception_translator<type>(&exc_translate_ ## type);
+
+ EXC_TRANSLATE(amount_error);
+}
+
+#endif // USE_BOOST_PYTHON
amount.cc
@@ -190,3 +190,202 @@ balance_pair_t& balance_pair_t::add(const amount_t& amount,
}
} // namespace ledger
+
+#ifdef USE_BOOST_PYTHON
+
+#include <boost/python.hpp>
+
+using namespace boost::python;
+using namespace ledger;
+
+unsigned int balance_len(balance_t& bal)
+{
+ return bal.amounts.size();
+}
+
+amount_t balance_getitem(balance_t& bal, int i)
+{
+ std::size_t len = bal.amounts.size();
+
+ if (abs(i) >= len) {
+ PyErr_SetString(PyExc_IndexError, "Index out of range");
+ throw_error_already_set();
+ }
+
+ int x = i < 0 ? len + i : i;
+ amounts_map::iterator elem = bal.amounts.begin();
+ while (--x >= 0)
+ elem++;
+
+ return (*elem).second;
+}
+
+unsigned int balance_pair_len(balance_pair_t& bal_pair)
+{
+ return balance_len(bal_pair.quantity);
+}
+
+amount_t balance_pair_getitem(balance_pair_t& bal_pair, int i)
+{
+ return balance_getitem(bal_pair.quantity, i);
+}
+
+void export_balance()
+{
+ class_< balance_t > ("Balance")
+ .def(init<balance_t>())
+ .def(init<amount_t>())
+ .def(init<long>())
+ .def(init<unsigned long>())
+ .def(init<double>())
+
+ .def(self += self)
+ .def(self += other<amount_t>())
+ .def(self += long())
+ .def(self + self)
+ .def(self + other<amount_t>())
+ .def(self + long())
+ .def(self -= self)
+ .def(self -= other<amount_t>())
+ .def(self -= long())
+ .def(self - self)
+ .def(self - other<amount_t>())
+ .def(self - long())
+ .def(self *= self)
+ .def(self *= other<amount_t>())
+ .def(self *= long())
+ .def(self * self)
+ .def(self * other<amount_t>())
+ .def(self * long())
+ .def(self /= self)
+ .def(self /= other<amount_t>())
+ .def(self /= long())
+ .def(self / self)
+ .def(self / other<amount_t>())
+ .def(self / long())
+ .def(- self)
+
+ .def(self < self)
+ .def(self < other<amount_t>())
+ .def(self < long())
+ .def(self <= self)
+ .def(self <= other<amount_t>())
+ .def(self <= long())
+ .def(self > self)
+ .def(self > other<amount_t>())
+ .def(self > long())
+ .def(self >= self)
+ .def(self >= other<amount_t>())
+ .def(self >= long())
+ .def(self == self)
+ .def(self == other<amount_t>())
+ .def(self == long())
+ .def(self != self)
+ .def(self != other<amount_t>())
+ .def(self != long())
+ .def(! self)
+
+ .def(abs(self))
+ .def(self_ns::str(self))
+
+ .def("__len__", balance_len)
+ .def("__getitem__", balance_getitem)
+
+ .def("negate", &balance_t::negate)
+ .def("amount", &balance_t::amount)
+ .def("value", &balance_t::value)
+ .def("write", &balance_t::write)
+ .def("valid", &balance_t::valid)
+ ;
+
+ class_< balance_pair_t > ("BalancePair")
+ .def(init<balance_pair_t>())
+ .def(init<balance_t>())
+ .def(init<amount_t>())
+ .def(init<long>())
+ .def(init<unsigned long>())
+ .def(init<double>())
+
+ .def(self += self)
+ .def(self += other<balance_t>())
+ .def(self += other<amount_t>())
+ .def(self += long())
+ .def(self + self)
+ .def(self + other<balance_t>())
+ .def(self + other<amount_t>())
+ .def(self + long())
+ .def(self -= self)
+ .def(self -= other<balance_t>())
+ .def(self -= other<amount_t>())
+ .def(self -= long())
+ .def(self - self)
+ .def(self - other<balance_t>())
+ .def(self - other<amount_t>())
+ .def(self - long())
+ .def(self *= self)
+ .def(self *= other<balance_t>())
+ .def(self *= other<amount_t>())
+ .def(self *= long())
+ .def(self * self)
+ .def(self * other<balance_t>())
+ .def(self * other<amount_t>())
+ .def(self * long())
+ .def(self /= self)
+ .def(self /= other<balance_t>())
+ .def(self /= other<amount_t>())
+ .def(self /= long())
+ .def(self / self)
+ .def(self / other<balance_t>())
+ .def(self / other<amount_t>())
+ .def(self / long())
+ .def(- self)
+
+ .def(self < self)
+ .def(self < other<balance_t>())
+ .def(self < other<amount_t>())
+ .def(self < long())
+ .def(self <= self)
+ .def(self <= other<balance_t>())
+ .def(self <= other<amount_t>())
+ .def(self <= long())
+ .def(self > self)
+ .def(self > other<balance_t>())
+ .def(self > other<amount_t>())
+ .def(self > long())
+ .def(self >= self)
+ .def(self >= other<balance_t>())
+ .def(self >= other<amount_t>())
+ .def(self >= long())
+ .def(self == self)
+ .def(self == other<balance_t>())
+ .def(self == other<amount_t>())
+ .def(self == long())
+ .def(self != self)
+ .def(self != other<balance_t>())
+ .def(self != other<amount_t>())
+ .def(self != long())
+ .def(! self)
+
+ .def(abs(self))
+ .def(self_ns::str(self))
+
+ .def("__len__", balance_pair_len)
+ .def("__getitem__", balance_pair_getitem)
+
+ .add_property("price",
+ make_getter(&balance_pair_t::price,
+ return_value_policy<reference_existing_object>()))
+ .add_property("cost",
+ make_getter(&balance_pair_t::cost,
+ return_value_policy<reference_existing_object>()))
+
+ .def("negate", &balance_pair_t::negate)
+ .def("amount", &balance_pair_t::amount)
+ .def("value", &balance_pair_t::value)
+ .def("write", &balance_pair_t::write)
+
+ .def("valid", &balance_pair_t::valid)
+ ;
+}
+
+#endif // USE_BOOST_PYTHON
balance.cc
@@ -12,9 +12,9 @@ namespace ledger {
static unsigned long binary_magic_number = 0xFFEED765;
#ifdef DEBUG_ENABLED
-static unsigned long format_version = 0x0002050b;
+static unsigned long format_version = 0x00020601;
#else
-static unsigned long format_version = 0x0002050a;
+static unsigned long format_version = 0x00020600;
#endif
static account_t ** accounts;
binary.cc
@@ -2,8 +2,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT(ledger, 2.5, johnw@newartisans.com)
-AM_INIT_AUTOMAKE(ledger, 2.5)
+AC_INIT(ledger, 2.6, johnw@newartisans.com)
+AM_INIT_AUTOMAKE(ledger, 2.6)
AC_CONFIG_SRCDIR([main.cc])
AC_CONFIG_HEADER([acconf.h])
@@ -129,7 +129,13 @@ if [test x$xml = xtrue ]; then
[libexpat_avail=false])
AC_LANG_POP
LIBS=$libexpat_save_libs])
- AM_CONDITIONAL(HAVE_EXPAT, test x$libexpat_avail = xtrue)
+
+ if [test x$libexpat_avail = xtrue ]; then
+ AM_CONDITIONAL(HAVE_EXPAT, true)
+ LIBS="-lexpat $LIBS"
+ else
+ AM_CONDITIONAL(HAVE_EXPAT, false)
+ fi
else
AM_CONDITIONAL(HAVE_EXPAT, false)
fi
@@ -153,7 +159,13 @@ if [test x$xml = xtrue ]; then
[libxmlparse_avail=false])
AC_LANG_POP
LIBS=$libxmlparse_save_libs])
- AM_CONDITIONAL(HAVE_XMLPARSE, test x$libxmlparse_avail = xtrue)
+
+ if [test x$libxmlparse_avail = xtrue ]; then
+ AM_CONDITIONAL(HAVE_XMLPARSE, true)
+ LIBS="-lxmlparse -lxmltok $LIBS"
+ else
+ AM_CONDITIONAL(HAVE_XMLPARSE, false)
+ fi
else
AM_CONDITIONAL(HAVE_XMLPARSE, false)
fi
@@ -185,11 +197,61 @@ if [test x$ofx = xtrue ]; then
[libofx_avail=false])
AC_LANG_POP
LIBS=$libofx_save_libs])
- AM_CONDITIONAL(HAVE_LIBOFX, test x$libofx_avail = xtrue)
+
+ if [test x$libofx_avail = xtrue ]; then
+ AM_CONDITIONAL(HAVE_LIBOFX, true)
+ LIBS="-lofx $LIBS"
+ else
+ AM_CONDITIONAL(HAVE_LIBOFX, false)
+ fi
else
AM_CONDITIONAL(HAVE_LIBOFX, false)
fi
+# check for Python
+AC_ARG_ENABLE(python,
+ [ --enable-python Build the amounts library as a Python module],
+ [case "${enableval}" in
+ yes) python=true ;;
+ no) python=false ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-python) ;;
+ esac],[python=false])
+AM_CONDITIONAL(USE_PYTHON, test x$python = xtrue)
+
+if [test x$python = xtrue ]; then
+ AM_PATH_PYTHON(2.2,, :)
+ if [test "$PYTHON" != :]; then
+ AC_CACHE_CHECK(
+ [if boost_python is available],
+ [boost_python_cpplib_avail],
+ [boost_python_save_libs=$LIBS
+ LIBS="-lboost_python -lpython$PYTHON_VERSION $LIBS"
+ AC_LANG_PUSH(C++)
+ AC_TRY_LINK(
+ [#include <boost/python.hpp>
+ using namespace boost::python;
+ class foo {};
+ BOOST_PYTHON_MODULE(samp) {
+ class_< foo > ("foo") ;
+ }],
+ [return 0],
+ [boost_python_cpplib_avail=true],
+ [boost_python_cpplib_avail=false])
+ AC_LANG_POP
+ LIBS=$boost_python_save_libs])
+ if [test x$boost_python_cpplib_avail = xtrue ]; then
+ AM_CONDITIONAL(HAVE_BOOST_PYTHON, true)
+ LIBS="-lboost_python -lpython$PYTHON_VERSION $LIBS"
+ else
+ AM_CONDITIONAL(HAVE_BOOST_PYTHON, false)
+ fi
+ else
+ AM_CONDITIONAL(HAVE_BOOST_PYTHON, false)
+ fi
+else
+ AM_CONDITIONAL(HAVE_BOOST_PYTHON, false)
+fi
+
# Check for options
AC_ARG_ENABLE(debug,
[ --enable-debug Turn on debugging],
configure.in
@@ -814,3 +814,274 @@ value_t& value_t::add(const amount_t& amount,
}
} // namespace ledger
+
+#ifdef USE_BOOST_PYTHON
+
+#include <boost/python.hpp>
+
+using namespace boost::python;
+using namespace ledger;
+
+long balance_len(balance_t& bal);
+amount_t balance_getitem(balance_t& bal, int i);
+long balance_pair_len(balance_pair_t& bal_pair);
+amount_t balance_pair_getitem(balance_pair_t& bal_pair, int i);
+
+long value_len(value_t& value)
+{
+ switch (value.type) {
+ case value_t::BOOLEAN:
+ case value_t::INTEGER:
+ case value_t::AMOUNT:
+ return 1;
+
+ case value_t::BALANCE:
+ return balance_len(*((balance_t *) value.data));
+
+ case value_t::BALANCE_PAIR:
+ return balance_pair_len(*((balance_pair_t *) value.data));
+
+ default:
+ assert(0);
+ break;
+ }
+ assert(0);
+ return 0;
+}
+
+amount_t value_getitem(value_t& value, int i)
+{
+ std::size_t len = value_len(value);
+
+ if (abs(i) >= len) {
+ PyErr_SetString(PyExc_IndexError, "Index out of range");
+ throw_error_already_set();
+ }
+
+ switch (value.type) {
+ case value_t::BOOLEAN:
+ case value_t::INTEGER:
+ return long(value);
+
+ case value_t::AMOUNT:
+ return *((amount_t *) value.data);
+
+ case value_t::BALANCE:
+ return balance_getitem(*((balance_t *) value.data), i);
+
+ case value_t::BALANCE_PAIR:
+ return balance_pair_getitem(*((balance_pair_t *) value.data), i);
+
+ default:
+ assert(0);
+ break;
+ }
+ assert(0);
+ return 0L;
+}
+
+double py_to_float(value_t& value)
+{
+ return double(value);
+}
+
+void export_value()
+{
+ scope in_value = class_< value_t > ("Value")
+ .def(init<value_t>())
+ .def(init<balance_pair_t>())
+ .def(init<balance_t>())
+ .def(init<amount_t>())
+ .def(init<std::string>())
+ .def(init<double>())
+ .def(init<long>())
+
+ .def(self + self)
+ .def(self + other<balance_pair_t>())
+ .def(self + other<balance_t>())
+ .def(self + other<amount_t>())
+ .def(self + long())
+ .def(self + double())
+
+ .def(other<balance_pair_t>() + self)
+ .def(other<balance_t>() + self)
+ .def(other<amount_t>() + self)
+ .def(long() + self)
+ .def(double() + self)
+
+ .def(self - self)
+ .def(self - other<balance_pair_t>())
+ .def(self - other<balance_t>())
+ .def(self - other<amount_t>())
+ .def(self - long())
+ .def(self - double())
+
+ .def(other<balance_pair_t>() - self)
+ .def(other<balance_t>() - self)
+ .def(other<amount_t>() - self)
+ .def(long() - self)
+ .def(double() - self)
+
+ .def(self * self)
+ .def(self * other<balance_pair_t>())
+ .def(self * other<balance_t>())
+ .def(self * other<amount_t>())
+ .def(self * long())
+ .def(self * double())
+
+ .def(other<balance_pair_t>() * self)
+ .def(other<balance_t>() * self)
+ .def(other<amount_t>() * self)
+ .def(long() * self)
+ .def(double() * self)
+
+ .def(self / self)
+ .def(self / other<balance_pair_t>())
+ .def(self / other<balance_t>())
+ .def(self / other<amount_t>())
+ .def(self / long())
+ .def(self / double())
+
+ .def(other<balance_pair_t>() / self)
+ .def(other<balance_t>() / self)
+ .def(other<amount_t>() / self)
+ .def(long() / self)
+ .def(double() / self)
+
+ .def(- self)
+
+ .def(self += self)
+ .def(self += other<balance_pair_t>())
+ .def(self += other<balance_t>())
+ .def(self += other<amount_t>())
+ .def(self += long())
+ .def(self += double())
+
+ .def(self -= self)
+ .def(self -= other<balance_pair_t>())
+ .def(self -= other<balance_t>())
+ .def(self -= other<amount_t>())
+ .def(self -= long())
+ .def(self -= double())
+
+ .def(self *= self)
+ .def(self *= other<balance_pair_t>())
+ .def(self *= other<balance_t>())
+ .def(self *= other<amount_t>())
+ .def(self *= long())
+ .def(self *= double())
+
+ .def(self /= self)
+ .def(self /= other<balance_pair_t>())
+ .def(self /= other<balance_t>())
+ .def(self /= other<amount_t>())
+ .def(self /= long())
+ .def(self /= double())
+
+ .def(self < self)
+ .def(self < other<balance_pair_t>())
+ .def(self < other<balance_t>())
+ .def(self < other<amount_t>())
+ .def(self < long())
+ .def(self < double())
+
+ .def(other<balance_pair_t>() < self)
+ .def(other<balance_t>() < self)
+ .def(other<amount_t>() < self)
+ .def(long() < self)
+ .def(double() < self)
+
+ .def(self <= self)
+ .def(self <= other<balance_pair_t>())
+ .def(self <= other<balance_t>())
+ .def(self <= other<amount_t>())
+ .def(self <= long())
+ .def(self <= double())
+
+ .def(other<balance_pair_t>() <= self)
+ .def(other<balance_t>() <= self)
+ .def(other<amount_t>() <= self)
+ .def(long() <= self)
+ .def(double() <= self)
+
+ .def(self > self)
+ .def(self > other<balance_pair_t>())
+ .def(self > other<balance_t>())
+ .def(self > other<amount_t>())
+ .def(self > long())
+ .def(self > double())
+
+ .def(other<balance_pair_t>() > self)
+ .def(other<balance_t>() > self)
+ .def(other<amount_t>() > self)
+ .def(long() > self)
+ .def(double() > self)
+
+ .def(self >= self)
+ .def(self >= other<balance_pair_t>())
+ .def(self >= other<balance_t>())
+ .def(self >= other<amount_t>())
+ .def(self >= long())
+ .def(self >= double())
+
+ .def(other<balance_pair_t>() >= self)
+ .def(other<balance_t>() >= self)
+ .def(other<amount_t>() >= self)
+ .def(long() >= self)
+ .def(double() >= self)
+
+ .def(self == self)
+ .def(self == other<balance_pair_t>())
+ .def(self == other<balance_t>())
+ .def(self == other<amount_t>())
+ .def(self == long())
+ .def(self == double())
+
+ .def(other<balance_pair_t>() == self)
+ .def(other<balance_t>() == self)
+ .def(other<amount_t>() == self)
+ .def(long() == self)
+ .def(double() == self)
+
+ .def(self != self)
+ .def(self != other<balance_pair_t>())
+ .def(self != other<balance_t>())
+ .def(self != other<amount_t>())
+ .def(self != long())
+ .def(self != double())
+
+ .def(other<balance_pair_t>() != self)
+ .def(other<balance_t>() != self)
+ .def(other<amount_t>() != self)
+ .def(long() != self)
+ .def(double() != self)
+
+ .def(! self)
+
+ .def(self_ns::int_(self))
+ .def(self_ns::float_(self))
+ .def(self_ns::str(self))
+ .def(abs(self))
+
+ .def_readonly("type", &value_t::type)
+
+ .def("__len__", value_len)
+ .def("__getitem__", value_getitem)
+
+ .def("cast", &value_t::cast)
+ .def("negate", &value_t::negate)
+ .def("price", &value_t::price)
+ .def("cost", &value_t::cost)
+ .def("add", &value_t::add, return_internal_reference<>())
+ ;
+
+ enum_< value_t::type_t > ("ValueType")
+ .value("BOOLEAN", value_t::BOOLEAN)
+ .value("INTEGER", value_t::INTEGER)
+ .value("AMOUNT", value_t::AMOUNT)
+ .value("BALANCE", value_t::BALANCE)
+ .value("BALANCE_PAIR", value_t::BALANCE_PAIR)
+ ;
+}
+
+#endif // USE_BOOST_PYTHON
value.cc
9db08c4c7de7b2058363bec4a3000f48fc78d580
John Wiegley
johnw@newartisans.com
http://github.com/jwiegley/ledger/commit/0c55a5ee1b5b35f399de7286cd8c6565a61e9634
0c55a5ee1b5b35f399de7286cd8c6565a61e9634
2008-04-12T23:41:28-07:00
2006-02-28T06:40:49-08:00
(read_binary_journal): Fixed a tiny memory leak when reading from a
binary cache.
47c247481db46d478133eddade540f90c34402b3
John Wiegley
johnw@newartisans.com