Merge branch 'next'
This commit is contained in:
commit
55c7792c93
22 changed files with 210 additions and 104 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -61,5 +61,7 @@
|
|||
/shave-libtool
|
||||
/stamp-h1
|
||||
/test/python/
|
||||
/tmpcvs*/
|
||||
/tmpwrk*/
|
||||
/util_tests
|
||||
/mkinstalldirs
|
||||
|
|
|
|||
26
acprep
26
acprep
|
|
@ -234,7 +234,7 @@ class PrepareBuild(CommandLineApp):
|
|||
type='int', action='store', dest='jobs',
|
||||
default=1, help='Allow N make jobs at once')
|
||||
op.add_option('', '--boost', metavar='SUFFIX',
|
||||
action="callback",
|
||||
action="callback", type="string",
|
||||
callback=self.option_boost,
|
||||
help='Set Boost library suffix (ex: "--boost=-mt")')
|
||||
op.add_option('', '--force', action="callback",
|
||||
|
|
@ -751,6 +751,10 @@ class PrepareBuild(CommandLineApp):
|
|||
self.sys_include_dirs.insert(0, '/usr/local/stow/cppunit/include')
|
||||
self.sys_library_dirs.insert(0, '/usr/local/stow/cppunit/lib')
|
||||
|
||||
if exists('/usr/local/stow/icu/include'):
|
||||
self.sys_include_dirs.insert(0, '/usr/local/stow/icu/include')
|
||||
self.sys_library_dirs.insert(0, '/usr/local/stow/icu/lib')
|
||||
|
||||
self.CXXFLAGS.append('-march=nocona')
|
||||
self.CXXFLAGS.append('-msse3')
|
||||
self.CPPFLAGS.append('-D_GLIBCXX_FULLY_DYNAMIC_STRING=1')
|
||||
|
|
@ -979,6 +983,14 @@ class PrepareBuild(CommandLineApp):
|
|||
self.sys_include_dirs.insert(0, '/usr/local/stow/cppunit-debug/include')
|
||||
self.sys_library_dirs.insert(0, '/usr/local/stow/cppunit-debug/lib')
|
||||
|
||||
if exists('/usr/local/stow/icu-debug/include'):
|
||||
if '/usr/local/stow/icu/include' in self.sys_include_dirs:
|
||||
self.sys_include_dirs.remove('/usr/local/stow/icu/include')
|
||||
self.sys_library_dirs.remove('/usr/local/stow/icu/lib')
|
||||
|
||||
self.sys_include_dirs.insert(0, '/usr/local/stow/icu-debug/include')
|
||||
self.sys_library_dirs.insert(0, '/usr/local/stow/icu-debug/lib')
|
||||
|
||||
if exists('/opt/local/lib/libboost_regex-d.a'):
|
||||
self.envvars['BOOST_HOME'] = '/opt/local'
|
||||
self.envvars['BOOST_SUFFIX'] = '-d'
|
||||
|
|
@ -995,6 +1007,14 @@ class PrepareBuild(CommandLineApp):
|
|||
self.envvars['BOOST_SUFFIX'])
|
||||
|
||||
self.sys_include_dirs.append('/usr/local/include/boost-1_40')
|
||||
|
||||
elif exists('/usr/local/lib/libboost_regex-xgcc44-d-1_40.a'):
|
||||
self.envvars['BOOST_HOME'] = '/usr/local'
|
||||
self.envvars['BOOST_SUFFIX'] = '-xgcc44-d-1_40'
|
||||
self.log.info('Setting BOOST_SUFFIX => %s' %
|
||||
self.envvars['BOOST_SUFFIX'])
|
||||
|
||||
self.sys_include_dirs.append('/usr/local/include/boost-1_40')
|
||||
else:
|
||||
if exists('/opt/local/lib/libboost_regex.a'):
|
||||
self.envvars['BOOST_HOME'] = '/opt/local'
|
||||
|
|
@ -1005,9 +1025,9 @@ class PrepareBuild(CommandLineApp):
|
|||
|
||||
self.sys_include_dirs.append('/opt/local/include/boost')
|
||||
|
||||
elif exists('/usr/local/lib/libboost_regex-xgcc44-s-1_40.a'):
|
||||
elif exists('/usr/local/lib/libboost_regex-xgcc44-1_40.a'):
|
||||
self.envvars['BOOST_HOME'] = '/usr/local'
|
||||
self.envvars['BOOST_SUFFIX'] = '-xgcc44-s-1_40'
|
||||
self.envvars['BOOST_SUFFIX'] = '-xgcc44-1_40'
|
||||
self.log.info('Setting BOOST_SUFFIX => %s' %
|
||||
self.envvars['BOOST_SUFFIX'])
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ N $
|
|||
Income:Salary
|
||||
|
||||
2004/05/14 * Another dày in which there is Páying
|
||||
Русский язык:Русский язык:Русский язык:Русский язык $1000.00
|
||||
Русский язык:Активы:Русский язык:Русский язык $1000.00
|
||||
Income:Salary
|
||||
|
||||
2004/05/27 Book Store
|
||||
|
|
|
|||
71
lib/Makefile
71
lib/Makefile
|
|
@ -2,34 +2,79 @@
|
|||
# This is only important if you intend to produce a Ledger binary for
|
||||
# installation.
|
||||
|
||||
#ARCH_CFLAGS = -g -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk
|
||||
#ARCH_LDFLAGS = -g -arch i386 -arch ppc -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk
|
||||
|
||||
STOW_ROOT = /usr/local/stow
|
||||
PRODUCTS = $(HOME)/Products
|
||||
|
||||
EXTRA_DEFINES = -D_GLIBCXX_FULLY_DYNAMIC_STRING=1
|
||||
|
||||
BOOST_SOURCE = boost
|
||||
BOOST_VERSION = 1_40_0
|
||||
BOOST_TOOLSET = darwin
|
||||
BOOST_DEFINES = define=_GLIBCXX_FULLY_DYNAMIC_STRING=1
|
||||
BOOST_FLAGS = --toolset=$(BOOST_TOOLSET) \
|
||||
--build-type=complete --layout=versioned \
|
||||
$(BOOST_DEFINES)
|
||||
ICU_FLAGS = -sHAVE_ICU=1 -sICU_PATH=$(STOW_ROOT)/icu
|
||||
ICU_DBG_FLAGS = -sHAVE_ICU=1 -sICU_PATH=$(STOW_ROOT)/icu-debug
|
||||
|
||||
icu-release:
|
||||
-(cd icu/source; make distclean)
|
||||
(cd icu/source; sh autogen.sh; \
|
||||
./configure CPPFLAGS="$(EXTRA_DEFINES)" \
|
||||
CFLAGS="$(EXTRA_DEFINES) $(ARCH_CFLAGS)" \
|
||||
LDFLAGS="$(ARCH_LDFLAGS)" \
|
||||
CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \
|
||||
--enable-static \
|
||||
--prefix=$(STOW_ROOT)/icu && \
|
||||
make install)
|
||||
|
||||
icu-debug:
|
||||
-(cd icu/source; make distclean)
|
||||
(cd icu/source; sh autogen.sh; \
|
||||
./configure CPPFLAGS="-D_GLIBCXX_DEBUG=1 $(EXTRA_DEFINES)" \
|
||||
CFLAGS="-g $(EXTRA_DEFINES) $(ARCH_CFLAGS)" \
|
||||
LDFLAGS="-g $(ARCH_LDFLAGS)" \
|
||||
CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \
|
||||
--enable-static --enable-debug \
|
||||
--prefix=$(STOW_ROOT)/icu-debug && \
|
||||
make install)
|
||||
|
||||
icu-build: icu-release icu-debug
|
||||
|
||||
boost-icu-release:
|
||||
(cd $(BOOST_SOURCE) && \
|
||||
bjam release --prefix=$(STOW_ROOT)/boost_$(BOOST_VERSION)-icu \
|
||||
--build-dir=$(PRODUCTS)/boost_$(BOOST_VERSION)-icu \
|
||||
$(BOOST_FLAGS) $(ICU_FLAGS) install)
|
||||
|
||||
boost-icu-debug:
|
||||
(cd $(BOOST_SOURCE) && \
|
||||
bjam debug --prefix=$(STOW_ROOT)/boost_$(BOOST_VERSION)-icu \
|
||||
--build-dir=$(PRODUCTS)/boost_$(BOOST_VERSION)-icu \
|
||||
$(BOOST_FLAGS) define=_GLIBCXX_DEBUG=1 \
|
||||
$(ICU_DBG_FLAGS) install)
|
||||
|
||||
boost-icu-build: boost-icu-release boost-icu-debug
|
||||
|
||||
# architecture=combined
|
||||
boost-release:
|
||||
(cd $(BOOST_SOURCE) && \
|
||||
bjam release --prefix=$(STOW_ROOT)/boost_$(BOOST_VERSION) \
|
||||
--build-dir=$(HOME)/Products/boost_$(BOOST_VERSION) \
|
||||
--toolset=darwin --build-type=complete --layout=versioned install)
|
||||
--build-dir=$(PRODUCTS)/boost_$(BOOST_VERSION) \
|
||||
$(BOOST_FLAGS) install)
|
||||
|
||||
boost-debug:
|
||||
(cd $(BOOST_SOURCE) && \
|
||||
bjam debug --prefix=$(STOW_ROOT)/boost_$(BOOST_VERSION) \
|
||||
--build-dir=$(HOME)/Products/boost_$(BOOST_VERSION) \
|
||||
--toolset=darwin --build-type=complete --layout=versioned \
|
||||
define=_GLIBCXX_DEBUG=1 install)
|
||||
--build-dir=$(PRODUCTS)/boost_$(BOOST_VERSION) \
|
||||
$(BOOST_FLAGS) define=_GLIBCXX_DEBUG=1 install)
|
||||
|
||||
boost-build: boost-release boost-debug
|
||||
|
||||
cppunit-release:
|
||||
-(cd cppunit; make distclean)
|
||||
(cd cppunit; sh autogen.sh; \
|
||||
./configure CFLAGS="$(ARCH_CFLAGS)" \
|
||||
./configure CPPFLAGS="$(EXTRA_DEFINES)" \
|
||||
CFLAGS="$(EXTRA_DEFINES) $(ARCH_CFLAGS)" \
|
||||
LDFLAGS="$(ARCH_LDFLAGS)" \
|
||||
CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \
|
||||
--prefix=$(STOW_ROOT)/cppunit && \
|
||||
|
|
@ -38,8 +83,8 @@ cppunit-release:
|
|||
cppunit-debug:
|
||||
-(cd cppunit; make distclean)
|
||||
(cd cppunit; sh autogen.sh; \
|
||||
./configure CPPFLAGS="-D_GLIBCXX_DEBUG=1" \
|
||||
CFLAGS="-g $(ARCH_CFLAGS)" \
|
||||
./configure CPPFLAGS="-D_GLIBCXX_DEBUG=1 $(EXTRA_DEFINES)" \
|
||||
CFLAGS="-g $(EXTRA_DEFINES) $(ARCH_CFLAGS)" \
|
||||
LDFLAGS="-g $(ARCH_LDFLAGS)" \
|
||||
CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \
|
||||
--prefix=$(STOW_ROOT)/cppunit-debug && \
|
||||
|
|
@ -47,4 +92,4 @@ cppunit-debug:
|
|||
|
||||
cppunit-build: cppunit-release cppunit-debug
|
||||
|
||||
build-all: boost-build cppunit-build
|
||||
all: boost-build boost-icu-build cppunit-build
|
||||
|
|
|
|||
|
|
@ -512,7 +512,7 @@ void commodity_t::parse_symbol(std::istream& in, string& symbol)
|
|||
for (std::size_t i = 0; i < bytes; i++) {
|
||||
in.get(c);
|
||||
if (in.bad() || in.eof())
|
||||
break;
|
||||
throw_(amount_error, _("Invalid UTF-8 encoding for commodity name"));
|
||||
*_p++ = c;
|
||||
}
|
||||
}
|
||||
|
|
@ -526,7 +526,7 @@ void commodity_t::parse_symbol(std::istream& in, string& symbol)
|
|||
if (c == '\\') {
|
||||
in.get(c);
|
||||
if (in.eof())
|
||||
break;
|
||||
throw_(amount_error, _("Backslash at end of commodity name"));
|
||||
}
|
||||
*_p++ = c;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -307,7 +307,7 @@ namespace {
|
|||
DEBUG("derive.xact", "Setting note from match: " << *added->note);
|
||||
#endif
|
||||
} else {
|
||||
added->payee = tmpl.payee_mask.expr.str();
|
||||
added->payee = tmpl.payee_mask.str();
|
||||
DEBUG("derive.xact", "Setting payee from template: " << added->payee);
|
||||
}
|
||||
|
||||
|
|
@ -403,14 +403,14 @@ namespace {
|
|||
|
||||
account_t * acct = NULL;
|
||||
if (! acct) {
|
||||
acct = journal.find_account_re(post.account_mask->expr.str());
|
||||
acct = journal.find_account_re(post.account_mask->str());
|
||||
#if defined(DEBUG_ON)
|
||||
if (acct)
|
||||
DEBUG("derive.xact", "Found account as a regular expression");
|
||||
#endif
|
||||
}
|
||||
if (! acct) {
|
||||
acct = journal.find_account(post.account_mask->expr.str());
|
||||
acct = journal.find_account(post.account_mask->str());
|
||||
#if defined(DEBUG_ON)
|
||||
if (acct)
|
||||
DEBUG("derive.xact", "Found (or created) account by name");
|
||||
|
|
|
|||
|
|
@ -469,14 +469,6 @@ void global_scope_t::normalize_report_options(const string& verb)
|
|||
else if (verb == "equity") {
|
||||
rep.HANDLER(equity).on_only(string("?normalize"));
|
||||
}
|
||||
else if (rep.HANDLED(related)) {
|
||||
if (verb[0] == 'r') {
|
||||
rep.HANDLER(invert).on_only(string("?normalize"));
|
||||
} else {
|
||||
rep.HANDLER(subtotal).on_only(string("?normalize"));
|
||||
rep.HANDLER(related_all).on_only(string("?normalize"));
|
||||
}
|
||||
}
|
||||
|
||||
if (verb == "print")
|
||||
rep.HANDLER(limit_).on(string("?normalize"), "actual");
|
||||
|
|
@ -538,6 +530,8 @@ void global_scope_t::normalize_report_options(const string& verb)
|
|||
cols = rep.HANDLER(columns_).value.to_long();
|
||||
else if (const char * columns = std::getenv("COLUMNS"))
|
||||
cols = lexical_cast<long>(columns);
|
||||
else
|
||||
cols = 80L;
|
||||
|
||||
if (cols > 0) {
|
||||
DEBUG("auto.columns", "cols = " << cols);
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ journal_t::~journal_t()
|
|||
void journal_t::initialize()
|
||||
{
|
||||
master = new account_t;
|
||||
basket = NULL;
|
||||
bucket = NULL;
|
||||
was_loaded = false;
|
||||
|
||||
commodity_pool.reset(new commodity_pool_t);
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ public:
|
|||
};
|
||||
|
||||
account_t * master;
|
||||
account_t * basket;
|
||||
account_t * bucket;
|
||||
xacts_list xacts;
|
||||
auto_xacts_list auto_xacts;
|
||||
period_xacts_list period_xacts;
|
||||
|
|
@ -202,7 +202,7 @@ private:
|
|||
template<class Archive>
|
||||
void serialize(Archive& ar, const unsigned int /* version */) {
|
||||
ar & master;
|
||||
ar & basket;
|
||||
ar & bucket;
|
||||
ar & xacts;
|
||||
ar & auto_xacts;
|
||||
ar & period_xacts;
|
||||
|
|
|
|||
|
|
@ -43,7 +43,11 @@ mask_t::mask_t(const string& pat) : expr()
|
|||
|
||||
mask_t& mask_t::operator=(const string& pat)
|
||||
{
|
||||
expr.assign(pat.c_str(), regex::perl | regex::icase);
|
||||
#if defined(HAVE_BOOST_REGEX_UNICODE)
|
||||
expr = boost::make_u32regex(pat.c_str(), boost::regex::perl | boost::regex::icase);
|
||||
#else
|
||||
expr.assign(pat.c_str(), boost::regex::perl | boost::regex::icase);
|
||||
#endif
|
||||
VERIFY(valid());
|
||||
return *this;
|
||||
}
|
||||
|
|
|
|||
43
src/mask.h
43
src/mask.h
|
|
@ -45,6 +45,9 @@
|
|||
#define _MASK_H
|
||||
|
||||
#include "utils.h"
|
||||
#if defined(HAVE_BOOST_REGEX_UNICODE)
|
||||
#include "unistring.h"
|
||||
#endif
|
||||
|
||||
namespace ledger {
|
||||
|
||||
|
|
@ -56,7 +59,11 @@ namespace ledger {
|
|||
class mask_t
|
||||
{
|
||||
public:
|
||||
#if defined(HAVE_BOOST_REGEX_UNICODE)
|
||||
boost::u32regex expr;
|
||||
#else
|
||||
boost::regex expr;
|
||||
#endif
|
||||
|
||||
explicit mask_t(const string& pattern);
|
||||
|
||||
|
|
@ -76,17 +83,41 @@ public:
|
|||
return expr == other.expr;
|
||||
}
|
||||
|
||||
bool match(const string& str) const {
|
||||
bool match(const string& text) const {
|
||||
#if defined(HAVE_BOOST_REGEX_UNICODE)
|
||||
DEBUG("mask.match",
|
||||
"Matching: \"" << str << "\" =~ /" << expr.str() << "/ = "
|
||||
<< (boost::regex_search(str, expr) ? "true" : "false"));
|
||||
return boost::regex_search(str, expr);
|
||||
"Matching: \"" << text << "\" =~ /" << str() << "/ = "
|
||||
<< (boost::u32regex_search(text, expr) ? "true" : "false"));
|
||||
return boost::u32regex_search(text, expr);
|
||||
#else
|
||||
DEBUG("mask.match",
|
||||
"Matching: \"" << text << "\" =~ /" << str() << "/ = "
|
||||
<< (boost::regex_search(text, expr) ? "true" : "false"));
|
||||
return boost::regex_search(text, expr);
|
||||
#endif
|
||||
}
|
||||
|
||||
bool empty() const {
|
||||
return expr.empty();
|
||||
}
|
||||
|
||||
string str() const {
|
||||
if (! empty()) {
|
||||
#if defined(HAVE_BOOST_REGEX_UNICODE)
|
||||
assert(sizeof(boost::uint32_t) == sizeof(UChar32));
|
||||
unistring ustr;
|
||||
std::basic_string<UChar32> expr_str = expr.str();
|
||||
std::copy(expr_str.begin(), expr_str.end(),
|
||||
std::back_inserter(ustr.utf32chars));
|
||||
return ustr.extract();
|
||||
#else
|
||||
return expr.str();
|
||||
#endif
|
||||
} else {
|
||||
return empty_string;
|
||||
}
|
||||
}
|
||||
|
||||
bool valid() const {
|
||||
if (expr.status() != 0) {
|
||||
DEBUG("ledger.validate", "mask_t: expr.status() != 0");
|
||||
|
|
@ -108,7 +139,7 @@ private:
|
|||
ar & temp;
|
||||
*this = temp;
|
||||
} else {
|
||||
temp = expr.str();
|
||||
temp = str();
|
||||
ar & temp;
|
||||
}
|
||||
}
|
||||
|
|
@ -116,7 +147,7 @@ private:
|
|||
};
|
||||
|
||||
inline std::ostream& operator<<(std::ostream& out, const mask_t& mask) {
|
||||
out << mask.expr.str();
|
||||
out << mask.str();
|
||||
return out;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -246,7 +246,7 @@ namespace {
|
|||
if (env.value_at(0).is_string())
|
||||
account = master->find_account(env.get<string>(0), false);
|
||||
else if (env.value_at(0).is_mask())
|
||||
account = master->find_account_re(env.get<mask_t>(0).expr.str());
|
||||
account = master->find_account_re(env.get<mask_t>(0).str());
|
||||
} else {
|
||||
account = env->reported_account();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -166,6 +166,11 @@ namespace {
|
|||
journal.xact_finalize_hooks.run_hooks(xact, post);
|
||||
}
|
||||
|
||||
std::size_t py_read(journal_t& journal, const string& pathname)
|
||||
{
|
||||
return journal.read(pathname);
|
||||
}
|
||||
|
||||
} // unnamed namespace
|
||||
|
||||
void export_journal()
|
||||
|
|
@ -193,10 +198,10 @@ void export_journal()
|
|||
|
||||
.add_property("master", make_getter(&journal_t::master,
|
||||
return_internal_reference<>()))
|
||||
.add_property("basket",
|
||||
make_getter(&journal_t::basket,
|
||||
.add_property("bucket",
|
||||
make_getter(&journal_t::bucket,
|
||||
return_internal_reference<>()),
|
||||
make_setter(&journal_t::basket))
|
||||
make_setter(&journal_t::bucket))
|
||||
.add_property("was_loaded", make_getter(&journal_t::was_loaded))
|
||||
.add_property("commodity_pool",
|
||||
make_getter(&journal_t::commodity_pool,
|
||||
|
|
@ -236,6 +241,8 @@ void export_journal()
|
|||
.def("sources", range<return_internal_reference<> >
|
||||
(&journal_t::sources_begin, &journal_t::sources_end))
|
||||
|
||||
.def("read", py_read)
|
||||
|
||||
.def("clear_xdata", &journal_t::clear_xdata)
|
||||
|
||||
.def("valid", &journal_t::valid)
|
||||
|
|
|
|||
|
|
@ -255,7 +255,17 @@ value_t python_interpreter_t::python_command(call_scope_t& args)
|
|||
std::strcpy(argv[i + 1], arg.c_str());
|
||||
}
|
||||
|
||||
int status = Py_Main(static_cast<int>(args.size()) + 1, argv);
|
||||
int status;
|
||||
|
||||
try {
|
||||
status = Py_Main(static_cast<int>(args.size()) + 1, argv);
|
||||
}
|
||||
catch (...) {
|
||||
for (std::size_t i = 0; i < args.size() + 1; i++)
|
||||
delete[] argv[i];
|
||||
delete[] argv;
|
||||
throw;
|
||||
}
|
||||
|
||||
for (std::size_t i = 0; i < args.size() + 1; i++)
|
||||
delete[] argv[i];
|
||||
|
|
@ -287,6 +297,9 @@ expr_t::ptr_op_t python_interpreter_t::lookup(const symbol_t::kind_t kind,
|
|||
|
||||
switch (kind) {
|
||||
case symbol_t::FUNCTION:
|
||||
if (option_t<python_interpreter_t> * handler = lookup_option(name.c_str()))
|
||||
return MAKE_OPT_FUNCTOR(python_interpreter_t, handler);
|
||||
|
||||
if (is_initialized && main_nspace.has_key(name.c_str())) {
|
||||
DEBUG("python.interp", "Python lookup: " << name);
|
||||
|
||||
|
|
@ -354,14 +367,7 @@ value_t python_interpreter_t::functor_t::operator()(call_scope_t& args)
|
|||
std::signal(SIGINT, sigint_handler);
|
||||
if (val.check())
|
||||
return val();
|
||||
#if 1
|
||||
// jww (2009-02-24): Distinguish between "no return" and values with
|
||||
// unconvertable type
|
||||
return NULL_VALUE;
|
||||
#else
|
||||
throw_(calc_error,
|
||||
_("Could not evaluate Python variable '%1'") << name);
|
||||
#endif
|
||||
}
|
||||
else if (args.size() > 0) {
|
||||
list arglist;
|
||||
|
|
|
|||
|
|
@ -322,7 +322,7 @@ value_t report_t::fn_account_total(call_scope_t& args)
|
|||
acct = session.journal->find_account(name, false);
|
||||
}
|
||||
else if (args[0].is_mask()) {
|
||||
name = args[0].as_mask().expr.str();
|
||||
name = args[0].as_mask().str();
|
||||
acct = session.journal->find_account_re(name);
|
||||
}
|
||||
else {
|
||||
|
|
|
|||
36
src/report.h
36
src/report.h
|
|
@ -869,16 +869,7 @@ public:
|
|||
});
|
||||
|
||||
OPTION_(report_t, wide, DO() { // -w
|
||||
parent->HANDLER(date_width_).on_with(string("--wide"), 9L);
|
||||
parent->HANDLER(date_width_).specified = true;
|
||||
parent->HANDLER(payee_width_).on_with(string("--wide"), 35L);
|
||||
parent->HANDLER(payee_width_).specified = true;
|
||||
parent->HANDLER(account_width_).on_with(string("--wide"), 39L);
|
||||
parent->HANDLER(account_width_).specified = true;
|
||||
parent->HANDLER(amount_width_).on_with(string("--wide"), 22L);
|
||||
parent->HANDLER(amount_width_).specified = true;
|
||||
parent->HANDLER(total_width_).on_with(string("--wide"), 22L);
|
||||
parent->HANDLER(total_width_).specified = true;
|
||||
parent->HANDLER(columns_).on_with(string("--wide"), 132L);
|
||||
});
|
||||
|
||||
OPTION_(report_t, yearly, DO() { // -Y
|
||||
|
|
@ -887,38 +878,23 @@ public:
|
|||
|
||||
OPTION__(report_t, date_width_,
|
||||
bool specified;
|
||||
CTOR(report_t, date_width_) {
|
||||
on_with(none, 9L);
|
||||
specified = false;
|
||||
}
|
||||
CTOR(report_t, date_width_) { specified = false; }
|
||||
DO_(args) { value = args[1].to_long(); specified = true; });
|
||||
OPTION__(report_t, payee_width_,
|
||||
bool specified;
|
||||
CTOR(report_t, payee_width_) {
|
||||
on_with(none, 20L);
|
||||
specified = false;
|
||||
}
|
||||
CTOR(report_t, payee_width_) { specified = false; }
|
||||
DO_(args) { value = args[1].to_long(); specified = true; });
|
||||
OPTION__(report_t, account_width_,
|
||||
bool specified;
|
||||
CTOR(report_t, account_width_) {
|
||||
on_with(none, 23L);
|
||||
specified = false;
|
||||
}
|
||||
CTOR(report_t, account_width_) { specified = false; }
|
||||
DO_(args) { value = args[1].to_long(); specified = true; });
|
||||
OPTION__(report_t, amount_width_,
|
||||
bool specified;
|
||||
CTOR(report_t, amount_width_) {
|
||||
on_with(none, 12L);
|
||||
specified = false;
|
||||
}
|
||||
CTOR(report_t, amount_width_) { specified = false; }
|
||||
DO_(args) { value = args[1].to_long(); specified = true; });
|
||||
OPTION__(report_t, total_width_,
|
||||
bool specified;
|
||||
CTOR(report_t, total_width_) {
|
||||
on_with(none, 12L);
|
||||
specified = false;
|
||||
}
|
||||
CTOR(report_t, total_width_) { specified = false; }
|
||||
DO_(args) { value = args[1].to_long(); specified = true; });
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -164,7 +164,11 @@ typedef std::ostream::pos_type ostream_pos_type;
|
|||
#include <boost/random/uniform_int.hpp>
|
||||
#include <boost/random/uniform_real.hpp>
|
||||
#include <boost/random/variate_generator.hpp>
|
||||
#if defined(HAVE_BOOST_REGEX_UNICODE)
|
||||
#include <boost/regex/icu.hpp>
|
||||
#else
|
||||
#include <boost/regex.hpp>
|
||||
#endif // HAVE_BOOST_REGEX_UNICODE
|
||||
#include <boost/variant.hpp>
|
||||
#include <boost/version.hpp>
|
||||
|
||||
|
|
|
|||
|
|
@ -442,8 +442,8 @@ void instance_t::default_commodity_directive(char * line)
|
|||
|
||||
void instance_t::default_account_directive(char * line)
|
||||
{
|
||||
journal.basket = account_stack.front()->find_account(skip_ws(line + 1));
|
||||
journal.basket->add_flags(ACCOUNT_KNOWN);
|
||||
journal.bucket = account_stack.front()->find_account(skip_ws(line + 1));
|
||||
journal.bucket->add_flags(ACCOUNT_KNOWN);
|
||||
}
|
||||
|
||||
void instance_t::price_conversion_directive(char * line)
|
||||
|
|
@ -487,17 +487,8 @@ void instance_t::option_directive(char * line)
|
|||
*p++ = '\0';
|
||||
}
|
||||
|
||||
#if 0
|
||||
if (! process_option(pathname.string(), line + 2, scope, p, line) &&
|
||||
! dynamic_cast<session_t *>(&scope)) {
|
||||
if (std::strlen(line + 2) == 1)
|
||||
throw_(option_error, _("Illegal option -%1") << line + 2);
|
||||
else
|
||||
throw_(option_error, _("Illegal option --%1") << line + 2);
|
||||
}
|
||||
#else
|
||||
process_option(pathname.string(), line + 2, scope, p, line);
|
||||
#endif
|
||||
if (! process_option(pathname.string(), line + 2, scope, p, line))
|
||||
throw_(option_error, _("Illegal option --%1") << line + 2);
|
||||
}
|
||||
|
||||
void instance_t::automated_xact_directive(char * line)
|
||||
|
|
|
|||
|
|
@ -59,12 +59,15 @@ namespace ledger {
|
|||
*/
|
||||
class unistring
|
||||
{
|
||||
public:
|
||||
std::vector<boost::uint32_t> utf32chars;
|
||||
|
||||
public:
|
||||
unistring() {
|
||||
TRACE_CTOR(unistring, "");
|
||||
}
|
||||
unistring(const std::string& input)
|
||||
{
|
||||
TRACE_CTOR(unistring, "");
|
||||
TRACE_CTOR(unistring, "std::string");
|
||||
|
||||
const char * p = input.c_str();
|
||||
std::size_t len = input.length();
|
||||
|
|
|
|||
|
|
@ -156,8 +156,8 @@ bool xact_base_t::finalize()
|
|||
// If there is only one post, balance against the default account if one has
|
||||
// been set.
|
||||
|
||||
if (journal && journal->basket && posts.size() == 1 && ! balance.is_null()) {
|
||||
null_post = new post_t(journal->basket, ITEM_GENERATED);
|
||||
if (journal && journal->bucket && posts.size() == 1 && ! balance.is_null()) {
|
||||
null_post = new post_t(journal->bucket, ITEM_GENERATED);
|
||||
null_post->_state = (*posts.begin())->_state;
|
||||
add_post(null_post);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ reg --wide
|
|||
Assets:Investments:Vanguard:VMMXX 0.350 VMMXX @ $1.00
|
||||
Income:Dividends:Vanguard:VMMXX $-0.35
|
||||
>>>1
|
||||
07-Feb-02 RD VMMXX Assets:Investments:Vanguard:VMMXX 0.350 VMMXX 0.350 VMMXX
|
||||
Income:Dividends:Vanguard:VMMXX $-0.35 $-0.35
|
||||
0.350 VMMXX
|
||||
07-Feb-02 RD VMMXX Assets:Investments:Vanguard:VMMXX 0.350 VMMXX 0.350 VMMXX
|
||||
Income:Dividends:Vanguard:VMMXX $-0.35 $-0.35
|
||||
0.350 VMMXX
|
||||
>>>2
|
||||
=== 0
|
||||
|
|
|
|||
|
|
@ -193,6 +193,29 @@ else
|
|||
AC_MSG_FAILURE("Could not find boost_regex library (set CPPFLAGS and LDFLAGS?)")
|
||||
fi
|
||||
|
||||
AC_CACHE_CHECK(
|
||||
[if boost_regex w/ICU is available],
|
||||
[boost_regex_icu_avail_cv_],
|
||||
[boost_regex_icu_save_libs=$LIBS
|
||||
LIBS="-licuuc $LIBS"
|
||||
AC_LANG_PUSH(C++)
|
||||
AC_LINK_IFELSE(
|
||||
[AC_LANG_PROGRAM(
|
||||
[[#include <boost/regex/icu.hpp>
|
||||
using namespace boost;]],
|
||||
[[std::string text = "Активы";
|
||||
u32regex r = make_u32regex("активы", regex::perl | regex::icase);
|
||||
return u32regex_search(text, r) ? 0 : 1;]])],
|
||||
[boost_regex_icu_avail_cv_=true],
|
||||
[boost_regex_icu_avail_cv_=false])
|
||||
AC_LANG_POP
|
||||
LIBS=$boost_regex_icu_save_libs])
|
||||
|
||||
if [test x$boost_regex_icu_avail_cv_ = xtrue ]; then
|
||||
AC_DEFINE([HAVE_BOOST_REGEX_UNICODE], [1], [If the boost_regex library w/ICU is available])
|
||||
LIBS="-licuuc $LIBS"
|
||||
fi
|
||||
|
||||
# check for boost_date_time
|
||||
AC_CACHE_CHECK(
|
||||
[if boost_date_time is available],
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue