diff options
| author | John Wiegley <johnw@newartisans.com> | 2009-11-05 04:24:15 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2009-11-05 04:24:15 -0500 |
| commit | 15555d497f56e4b4d39e9a14f74b2c82cce52b90 (patch) | |
| tree | 1e6c661379f02fdc52ef107fd500438ab69f3e60 /src/py_value.cc | |
| parent | 94b2518c4156e5a6b2be45bdbeeacf1ced0cd17f (diff) | |
| parent | 060fc0e00bacb96d1d16163779d98c45c3999014 (diff) | |
| download | fork-ledger-15555d497f56e4b4d39e9a14f74b2c82cce52b90.tar.gz fork-ledger-15555d497f56e4b4d39e9a14f74b2c82cce52b90.tar.bz2 fork-ledger-15555d497f56e4b4d39e9a14f74b2c82cce52b90.zip | |
Merge branch 'next'
Diffstat (limited to 'src/py_value.cc')
| -rw-r--r-- | src/py_value.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/py_value.cc b/src/py_value.cc index 34ee2d82..6e4afaf7 100644 --- a/src/py_value.cc +++ b/src/py_value.cc @@ -51,7 +51,7 @@ namespace { { if (value.is_scope()) { if (scope_t * scope = value.as_scope()) - return expr_t(scope->lookup(name), scope); + return expr_t(scope->lookup(symbol_t::FUNCTION, name), scope); } throw_(value_error, _("Cannot lookup attributes in %1") << value.label()); return expr_t(); @@ -112,7 +112,7 @@ void export_value() .def(init<balance_t>()) .def(init<mask_t>()) .def(init<std::string>()) - // jww (2009-11-02): Need to support conversion of sequences + // jww (2009-11-02): Need to support conversion eof value_t::sequence_t //.def(init<value_t::sequence_t>()) .def(init<value_t>()) @@ -314,7 +314,9 @@ void export_value() implicitly_convertible<long, value_t>(); implicitly_convertible<string, value_t>(); - // jww (2009-11-02): ask mask objects here + implicitly_convertible<amount_t, value_t>(); + implicitly_convertible<balance_t, value_t>(); + implicitly_convertible<mask_t, value_t>(); implicitly_convertible<date_t, value_t>(); implicitly_convertible<datetime_t, value_t>(); |