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

Merge branch 'next'

Browse source
This commit is contained in:
John Wiegley 2009-11-13 13:41:54 -05:00
commit 73baf9cd72
11 changed files with 71 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
acprep
View file

@ -751,22 +751,26 @@ class PrepareBuild(CommandLineApp):
def setup_for_johnw(self): def setup_for_johnw(self):
# jww (2009-03-09): Some peculiarities specific to my system # jww (2009-03-09): Some peculiarities specific to my system
if exists('/Users/johnw/Dropbox/Accounts/ledger.dat'): if exists('/Users/johnw/Dropbox/Accounts/ledger.dat'):
if exists('/usr/local/stow/cppunit/include'): if self.current_flavor == 'debug':
self.sys_include_dirs.insert(0, '/usr/local/stow/cppunit/include') if exists('/usr/local/stow/cppunit/include'):
self.sys_library_dirs.insert(0, '/usr/local/stow/cppunit/lib') 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'): if exists('/usr/local/stow/icu/include'):
self.sys_include_dirs.insert(0, '/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.sys_library_dirs.insert(0, '/usr/local/stow/icu/lib')
self.CPPFLAGS.append('-D_GLIBCXX_FULLY_DYNAMIC_STRING=1')
self.options.use_glibcxx_debug = True
self.CXXFLAGS.append('-march=nocona') self.CXXFLAGS.append('-march=nocona')
self.CXXFLAGS.append('-msse3') self.CXXFLAGS.append('-msse3')
self.CPPFLAGS.append('-D_GLIBCXX_FULLY_DYNAMIC_STRING=1')
self.configure_args.append('--disable-shared') self.configure_args.append('--disable-shared')
self.configure_args.append('--enable-doxygen') self.configure_args.append('--enable-doxygen')
self.configure_args.append('--enable-python')
self.options.use_glibcxx_debug = True
self.locate_my_libraries() self.locate_my_libraries()
def setup_for_system(self): def setup_for_system(self):
@ -1049,7 +1053,9 @@ class PrepareBuild(CommandLineApp):
def setup_flavor_opt(self): def setup_flavor_opt(self):
self.CXXFLAGS.append('-O3') self.CXXFLAGS.append('-O3')
self.LDFLAGS.append('-O3')
self.CXXFLAGS.append('-fomit-frame-pointer') self.CXXFLAGS.append('-fomit-frame-pointer')
self.LDFLAGS.append('-fomit-frame-pointer')
def setup_flavor_gcov(self): def setup_flavor_gcov(self):
self.CXXFLAGS.append('-g') self.CXXFLAGS.append('-g')

2
src/draft.h
View file

@ -93,7 +93,7 @@ public:
void parse_args(const value_t& args); void parse_args(const value_t& args);
virtual result_type real_calc(scope_t&) { virtual result_type real_calc(scope_t&) {
assert(0); assert(false);
return true; return true;
} }

2
src/filters.cc
View file

@ -710,7 +710,7 @@ void transfer_details::operator()(post_t& post)
switch (which_element) { switch (which_element) {
case SET_DATE: case SET_DATE:
xact.set_date(substitute.to_date()); temp.xdata().date = substitute.to_date();
break; break;
case SET_ACCOUNT: { case SET_ACCOUNT: {

6
src/item.h
View file

@ -172,12 +172,6 @@ public:
virtual optional<date_t> effective_date() const { virtual optional<date_t> effective_date() const {
return _date_eff; return _date_eff;
} }
virtual void set_date(const date_t& date) {
if (use_effective_date)
_date_eff = date;
else
_date = date;
}
void set_state(state_t new_state) { void set_state(state_t new_state) {
_state = new_state; _state = new_state;

2
src/query.cc
View file

@ -333,7 +333,7 @@ query_t::parser_t::parse_query_term(query_t::lexer_t::token_t::kind_t tok_contex
case lexer_t::token_t::TOK_NOTE: case lexer_t::token_t::TOK_NOTE:
ident->set_ident("note"); break; ident->set_ident("note"); break;
default: default:
assert(0); break; assert(false); break;
} }
expr_t::ptr_op_t mask = new expr_t::op_t(expr_t::op_t::VALUE); expr_t::ptr_op_t mask = new expr_t::op_t(expr_t::op_t::VALUE);

4
src/query.h
View file

@ -157,12 +157,12 @@ public:
case END_REACHED: return "<EOF>"; case END_REACHED: return "<EOF>";
case TERM: case TERM:
assert(0); assert(false);
return "<TERM>"; return "<TERM>";
case UNKNOWN: case UNKNOWN:
default: default:
assert(0); assert(false);
return "<UNKNOWN>"; return "<UNKNOWN>";
} }
} }

8
src/times.cc
View file

@ -789,8 +789,8 @@ std::string format_datetime(const datetime_t& when,
return printed_datetime_io->format(when); return printed_datetime_io->format(when);
} }
else { else {
assert(0); assert(false);
return ""; return empty_string;
} }
} }
@ -815,8 +815,8 @@ std::string format_date(const date_t& when,
return printed_date_io->format(when); return printed_date_io->format(when);
} }
else { else {
assert(0); assert(false);
return ""; return empty_string;
} }
} }

4
src/times.h
View file

@ -174,7 +174,7 @@ public:
case YEARS: case YEARS:
return date + gregorian::years(length); return date + gregorian::years(length);
default: default:
assert(0); return date_t(); assert(false); return date_t();
} }
} }
@ -189,7 +189,7 @@ public:
case YEARS: case YEARS:
return date - gregorian::years(length); return date - gregorian::years(length);
default: default:
assert(0); return date_t(); assert(false); return date_t();
} }
} }

5
src/utils.cc
View file

@ -550,8 +550,13 @@ bool logger_func(log_level_t level)
logger_has_run = true; logger_has_run = true;
logger_start = TRUE_CURRENT_TIME(); logger_start = TRUE_CURRENT_TIME();
#if defined(VERIFY_ON)
IF_VERIFY() IF_VERIFY()
*_log_stream << " TIME OBJSZ MEMSZ" << std::endl; *_log_stream << " TIME OBJSZ MEMSZ" << std::endl;
#else
IF_VERIFY()
*_log_stream << " TIME" << std::endl;
#endif
} }
*_log_stream << std::right << std::setw(5) *_log_stream << std::right << std::setw(5)

2
src/value.cc
View file

@ -696,7 +696,7 @@ value_t& value_t::operator/=(const value_t& val)
as_amount_lval() /= simpler.as_amount(); as_amount_lval() /= simpler.as_amount();
break; break;
default: default:
assert(0); assert(false);
break; break;
} }
return *this; return *this;

65
tools/configure.ac
View file

@ -62,6 +62,14 @@ AC_ARG_ENABLE(doxygen,
AM_CONDITIONAL(USE_DOXYGEN, test x$doxygen = xtrue) AM_CONDITIONAL(USE_DOXYGEN, test x$doxygen = xtrue)
AC_ARG_ENABLE(python,
[ --enable-python Turn on Python support (experimental)],
[case "${enableval}" in
yes) python=true ;;
no) python=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-python) ;;
esac],[python=false])
AC_ARG_WITH(boost-suffix, AC_ARG_WITH(boost-suffix,
[ --with-boost-suffix=X Append X to the Boost library names], [ --with-boost-suffix=X Append X to the Boost library names],
[BOOST_SUFFIX="${withval}"], [BOOST_SUFFIX="${withval}"],
@ -336,37 +344,42 @@ fi
AM_CONDITIONAL(HAVE_BOOST_SERIALIZATION, test x$boost_serialization_cpplib_avail_cv_ = xtrue) AM_CONDITIONAL(HAVE_BOOST_SERIALIZATION, test x$boost_serialization_cpplib_avail_cv_ = xtrue)
# check for Python # check for Python
AM_PATH_PYTHON(2.4,, :) if [ test x$python = xtrue ]; then
if [test "$PYTHON" != :]; then AM_PATH_PYTHON(2.4,, :)
AM_CONDITIONAL(HAVE_PYTHON, true) if [test "$PYTHON" != :]; then
AC_CACHE_CHECK( AM_CONDITIONAL(HAVE_PYTHON, true)
[if boost_python is available], AC_CACHE_CHECK(
[boost_python_cpplib_avail_cv_], [if boost_python is available],
[boost_python_save_libs=$LIBS [boost_python_cpplib_avail_cv_],
LIBS="-lboost_python$BOOST_SUFFIX -lpython$PYTHON_VERSION $LIBS" [boost_python_save_libs=$LIBS
AC_LANG_PUSH(C++) LIBS="-lboost_python$BOOST_SUFFIX -lpython$PYTHON_VERSION $LIBS"
AC_LINK_IFELSE( AC_LANG_PUSH(C++)
[AC_LANG_PROGRAM( AC_LINK_IFELSE(
[[#include <boost/python.hpp> [AC_LANG_PROGRAM(
using namespace boost::python; [[#include <boost/python.hpp>
class foo {}; using namespace boost::python;
BOOST_PYTHON_MODULE(samp) { class foo {};
class_< foo > ("foo") ; BOOST_PYTHON_MODULE(samp) {
}]], class_< foo > ("foo") ;
[[return 0]])], }]],
[boost_python_cpplib_avail_cv_=true], [[return 0]])],
[boost_python_cpplib_avail_cv_=false]) [boost_python_cpplib_avail_cv_=true],
AC_LANG_POP [boost_python_cpplib_avail_cv_=false])
LIBS=$boost_python_save_libs]) AC_LANG_POP
LIBS=$boost_python_save_libs])
if [ test x$boost_python_cpplib_avail_cv_ = xtrue ]; then if [ test x$boost_python_cpplib_avail_cv_ = xtrue ]; then
AC_DEFINE([HAVE_BOOST_PYTHON], [1], [Whether Boost.Python is available]) AC_DEFINE([HAVE_BOOST_PYTHON], [1], [Whether Boost.Python is available])
LIBS="-lboost_python$BOOST_SUFFIX -lpython$PYTHON_VERSION $LIBS" LIBS="-lboost_python$BOOST_SUFFIX -lpython$PYTHON_VERSION $LIBS"
fi
else
AM_CONDITIONAL(HAVE_PYTHON, false)
fi fi
AM_CONDITIONAL(HAVE_BOOST_PYTHON, test x$boost_python_cpplib_avail_cv_ = xtrue)
else else
AM_CONDITIONAL(HAVE_PYTHON, false) AM_CONDITIONAL(HAVE_PYTHON, false)
AM_CONDITIONAL(HAVE_BOOST_PYTHON, false)
fi fi
AM_CONDITIONAL(HAVE_BOOST_PYTHON, test x$boost_python_cpplib_avail_cv_ = xtrue)
# check for CppUnit # check for CppUnit
AC_CACHE_CHECK( AC_CACHE_CHECK(