From b14c814fec11ab450c552bccf5fe7d96dc2c4e18 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 4 Nov 2009 20:07:32 -0500 Subject: Whitespace fix --- src/scope.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/scope.h') diff --git a/src/scope.h b/src/scope.h index 7f2680d6..f7c2f46b 100644 --- a/src/scope.h +++ b/src/scope.h @@ -75,7 +75,7 @@ private: friend class boost::serialization::access; template - void serialize(Archive &, const unsigned int /* version */) {} + void serialize(Archive&, const unsigned int /* version */) {} #endif // HAVE_BOOST_SERIALIZATION }; @@ -118,7 +118,7 @@ private: friend class boost::serialization::access; template - void serialize(Archive & ar, const unsigned int /* version */) { + void serialize(Archive& ar, const unsigned int /* version */) { ar & boost::serialization::base_object(*this); ar & parent; } @@ -158,7 +158,7 @@ private: friend class boost::serialization::access; template - void serialize(Archive & ar, const unsigned int /* version */) { + void serialize(Archive& ar, const unsigned int /* version */) { ar & boost::serialization::base_object(*this); ar & symbols; } @@ -228,7 +228,7 @@ private: friend class boost::serialization::access; template - void serialize(Archive & ar, const unsigned int /* version */) { + void serialize(Archive& ar, const unsigned int /* version */) { ar & boost::serialization::base_object(*this); ar & args; } @@ -274,7 +274,7 @@ private: friend class boost::serialization::access; template - void serialize(Archive & ar, const unsigned int /* version */) { + void serialize(Archive& ar, const unsigned int /* version */) { ar & boost::serialization::base_object(*this); ar & grandchild; } -- cgit v1.2.3 From 4a14f3224b9063202ca39a67c9aff42ae4274942 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 4 Nov 2009 20:07:44 -0500 Subject: Added value_t::push_front --- src/option.h | 1 + src/scope.h | 3 +++ src/value.h | 10 +++++++++- 3 files changed, 13 insertions(+), 1 deletion(-) (limited to 'src/scope.h') diff --git a/src/option.h b/src/option.h index 0600779c..7e2e0629 100644 --- a/src/option.h +++ b/src/option.h @@ -190,6 +190,7 @@ public: virtual value_t operator()(call_scope_t& args) { if (! args.empty()) { + args.push_front(string_value("?expr")); return handler_wrapper(args); } else if (wants_arg) { diff --git a/src/scope.h b/src/scope.h index f7c2f46b..36eb54f1 100644 --- a/src/scope.h +++ b/src/scope.h @@ -196,6 +196,9 @@ public: return args[index]; } + void push_front(const value_t& val) { + args.push_front(val); + } void push_back(const value_t& val) { args.push_back(val); } diff --git a/src/value.h b/src/value.h index a0bb533d..0993305e 100644 --- a/src/value.h +++ b/src/value.h @@ -87,7 +87,7 @@ public: * The sequence_t member type abstracts the type used to represent a * resizable "array" of value_t objects. */ - typedef std::vector sequence_t; + typedef std::deque sequence_t; typedef sequence_t::iterator iterator; typedef sequence_t::const_iterator const_iterator; typedef sequence_t::difference_type difference_type; @@ -800,6 +800,14 @@ public: return null; } + void push_front(const value_t& val) { + if (is_null()) + *this = sequence_t(); + if (! is_sequence()) + in_place_cast(SEQUENCE); + as_sequence_lval().push_front(val); + } + void push_back(const value_t& val) { if (is_null()) *this = sequence_t(); -- cgit v1.2.3 From 78e6770c4c276db3647952f21a6bf3ea465edb88 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 4 Nov 2009 20:40:07 -0500 Subject: Segregated symbols into 5 separate namespaces The different namespaces are: Function Value expression functions, which receive a "context" Option Command-line options Precommand Commands which are invoked before reading the journal Command Commands which are invoked after reading the journal Directive Directives that occur at column 0 in a data file This greatly eases the ability for Python uses to add intercept hooks to change how the basic Ledger module functions. An example of what should be possible soon: import ledger def my_foo_handler(value): print "--foo received:", value ledger.add_handler(ledger.Option, "foo=", my_foo_handler) --- src/account.cc | 6 +- src/account.h | 3 +- src/global.cc | 44 +++-- src/global.h | 3 +- src/item.cc | 6 +- src/item.h | 3 +- src/op.cc | 14 +- src/option.cc | 22 +-- src/option.h | 24 --- src/post.cc | 8 +- src/post.h | 3 +- src/py_value.cc | 2 +- src/pyinterp.cc | 46 ++--- src/pyinterp.h | 3 +- src/report.cc | 562 +++++++++++++++++++++++++++++--------------------------- src/report.h | 6 +- src/scope.cc | 23 ++- src/scope.h | 93 ++++++++-- src/session.cc | 29 +-- src/session.h | 3 +- src/textual.cc | 14 +- src/xact.cc | 8 +- src/xact.h | 3 +- 23 files changed, 507 insertions(+), 421 deletions(-) (limited to 'src/scope.h') diff --git a/src/account.cc b/src/account.cc index 23761049..2a75a6ac 100644 --- a/src/account.cc +++ b/src/account.cc @@ -241,8 +241,12 @@ namespace { } } -expr_t::ptr_op_t account_t::lookup(const string& name) +expr_t::ptr_op_t account_t::lookup(const symbol_t::kind_t kind, + const string& name) { + if (kind != symbol_t::FUNCTION) + return NULL; + switch (name[0]) { case 'a': if (name == "amount") diff --git a/src/account.h b/src/account.h index ac4a4788..7d51a08e 100644 --- a/src/account.h +++ b/src/account.h @@ -119,7 +119,8 @@ public: } bool remove_post(post_t * post); - virtual expr_t::ptr_op_t lookup(const string& name); + virtual expr_t::ptr_op_t lookup(const symbol_t::kind_t kind, + const string& name); bool valid() const; diff --git a/src/global.cc b/src/global.cc index d9028dd7..97a46cce 100644 --- a/src/global.cc +++ b/src/global.cc @@ -314,28 +314,32 @@ option_t * global_scope_t::lookup_option(const char * p) return NULL; } -expr_t::ptr_op_t global_scope_t::lookup(const string& name) +expr_t::ptr_op_t global_scope_t::lookup(const symbol_t::kind_t kind, + const string& name) { - const char * p = name.c_str(); - switch (*p) { - case 'o': - if (WANT_OPT()) { p += OPT_PREFIX_LEN; - if (option_t * handler = lookup_option(p)) - return MAKE_OPT_HANDLER(global_scope_t, handler); - } + switch (kind) { + case symbol_t::FUNCTION: + if (option_t * handler = lookup_option(name.c_str())) + return MAKE_OPT_FUNCTOR(global_scope_t, handler); break; - case 'p': - if (WANT_PRECMD()) { const char * q = p + PRECMD_PREFIX_LEN; - switch (*q) { - case 'p': - if (is_eq(q, "push")) - return MAKE_FUNCTOR(global_scope_t::push_command); - else if (is_eq(q, "pop")) - return MAKE_FUNCTOR(global_scope_t::pop_command); - break; - } + case symbol_t::OPTION: + if (option_t * handler = lookup_option(name.c_str())) + return MAKE_OPT_HANDLER(global_scope_t, handler); + break; + + case symbol_t::PRECOMMAND: { + const char * p = name.c_str(); + switch (*p) { + case 'p': + if (is_eq(p, "push")) + return MAKE_FUNCTOR(global_scope_t::push_command); + else if (is_eq(p, "pop")) + return MAKE_FUNCTOR(global_scope_t::pop_command); + break; } + } + default: break; } @@ -396,7 +400,7 @@ void global_scope_t::normalize_session_options() function_t global_scope_t::look_for_precommand(scope_t& scope, const string& verb) { - if (expr_t::ptr_op_t def = scope.lookup(string(PRECMD_PREFIX) + verb)) + if (expr_t::ptr_op_t def = scope.lookup(symbol_t::PRECOMMAND, verb)) return def->as_function(); else return function_t(); @@ -405,7 +409,7 @@ function_t global_scope_t::look_for_precommand(scope_t& scope, function_t global_scope_t::look_for_command(scope_t& scope, const string& verb) { - if (expr_t::ptr_op_t def = scope.lookup(string(CMD_PREFIX) + verb)) + if (expr_t::ptr_op_t def = scope.lookup(symbol_t::COMMAND, verb)) return def->as_function(); else return function_t(); diff --git a/src/global.h b/src/global.h index df9845d5..34577656 100644 --- a/src/global.h +++ b/src/global.h @@ -117,7 +117,8 @@ See LICENSE file included with the distribution for details and disclaimer."); option_t * lookup_option(const char * p); - virtual expr_t::ptr_op_t lookup(const string& name); + virtual expr_t::ptr_op_t lookup(const symbol_t::kind_t kind, + const string& name); OPTION(global_scope_t, args_only); OPTION(global_scope_t, debug_); diff --git a/src/item.cc b/src/item.cc index 37e19a82..acef2e44 100644 --- a/src/item.cc +++ b/src/item.cc @@ -304,8 +304,12 @@ value_t get_comment(item_t& item) } } -expr_t::ptr_op_t item_t::lookup(const string& name) +expr_t::ptr_op_t item_t::lookup(const symbol_t::kind_t kind, + const string& name) { + if (kind != symbol_t::FUNCTION) + return NULL; + switch (name[0]) { case 'a': if (name == "actual") diff --git a/src/item.h b/src/item.h index 98b30c70..ea510a5e 100644 --- a/src/item.h +++ b/src/item.h @@ -189,7 +189,8 @@ public: return _state; } - virtual expr_t::ptr_op_t lookup(const string& name); + virtual expr_t::ptr_op_t lookup(const symbol_t::kind_t kind, + const string& name); bool valid() const; diff --git a/src/op.cc b/src/op.cc index 67db5136..c4925143 100644 --- a/src/op.cc +++ b/src/op.cc @@ -43,7 +43,7 @@ expr_t::ptr_op_t expr_t::op_t::compile(scope_t& scope, const int depth) if (is_ident()) { DEBUG("expr.compile", "lookup: " << as_ident()); - if (ptr_op_t def = scope.lookup(as_ident())) { + if (ptr_op_t def = scope.lookup(symbol_t::FUNCTION, as_ident())) { // Identifier references are first looked up at the point of // definition, and then at the point of every use if they could // not be found there. @@ -65,11 +65,11 @@ expr_t::ptr_op_t expr_t::op_t::compile(scope_t& scope, const int depth) if (kind == O_DEFINE) { switch (left()->kind) { case IDENT: - scope.define(left()->as_ident(), right()); + scope.define(symbol_t::FUNCTION, left()->as_ident(), right()); break; case O_CALL: if (left()->left()->is_ident()) - scope.define(left()->left()->as_ident(), this); + scope.define(symbol_t::FUNCTION, left()->left()->as_ident(), this); else throw_(compile_error, _("Invalid function definition")); break; @@ -152,9 +152,10 @@ value_t expr_t::op_t::calc(scope_t& scope, ptr_op_t * locus, const int depth) if (! varname->is_ident()) throw_(calc_error, _("Invalid function definition")); else if (args_index == args_count) - local_scope.define(varname->as_ident(), wrap_value(false)); + local_scope.define(symbol_t::FUNCTION, varname->as_ident(), + wrap_value(false)); else - local_scope.define(varname->as_ident(), + local_scope.define(symbol_t::FUNCTION, varname->as_ident(), wrap_value(call_args[args_index++])); } @@ -178,7 +179,8 @@ value_t expr_t::op_t::calc(scope_t& scope, ptr_op_t * locus, const int depth) _("Left operand of . operator is NULL")); } else { scope_t& objscope(*obj.as_scope()); - if (ptr_op_t member = objscope.lookup(right()->as_ident())) { + if (ptr_op_t member = + objscope.lookup(symbol_t::FUNCTION, right()->as_ident())) { result = member->calc(objscope, NULL, depth + 1); break; } diff --git a/src/option.cc b/src/option.cc index 8da66b36..6d230939 100644 --- a/src/option.cc +++ b/src/option.cc @@ -41,8 +41,7 @@ namespace { op_bool_tuple find_option(scope_t& scope, const string& name) { char buf[128]; - std::strcpy(buf, "opt_"); - char * p = &buf[4]; + char * p = buf; foreach (char ch, name) { if (ch == '-') *p++ = '_'; @@ -52,28 +51,27 @@ namespace { *p++ = '_'; *p = '\0'; - if (expr_t::ptr_op_t op = scope.lookup(buf)) + if (expr_t::ptr_op_t op = scope.lookup(symbol_t::OPTION, buf)) return op_bool_tuple(op, true); *--p = '\0'; - return op_bool_tuple(scope.lookup(buf), false); + return op_bool_tuple(scope.lookup(symbol_t::OPTION, buf), false); } op_bool_tuple find_option(scope_t& scope, const char letter) { - char buf[10]; - std::strcpy(buf, "opt_"); - buf[4] = letter; - buf[5] = '_'; - buf[6] = '\0'; + char buf[4]; + buf[0] = letter; + buf[1] = '_'; + buf[2] = '\0'; - if (expr_t::ptr_op_t op = scope.lookup(buf)) + if (expr_t::ptr_op_t op = scope.lookup(symbol_t::OPTION, buf)) return op_bool_tuple(op, true); - buf[5] = '\0'; + buf[1] = '\0'; - return op_bool_tuple(scope.lookup(buf), false); + return op_bool_tuple(scope.lookup(symbol_t::OPTION, buf), false); } void process_option(const string& whence, const function_t& opt, diff --git a/src/option.h b/src/option.h index 7e2e0629..c9903c03 100644 --- a/src/option.h +++ b/src/option.h @@ -283,30 +283,6 @@ inline bool is_eq(const char * p, const char * n) { } \ END(name) -#define OPT_PREFIX "opt_" -#define OPT_PREFIX_LEN 4 - -#define WANT_OPT() \ - (std::strncmp(p, OPT_PREFIX, OPT_PREFIX_LEN) == 0) - -#define PRECMD_PREFIX "precmd_" -#define PRECMD_PREFIX_LEN 7 - -#define WANT_PRECMD() \ - (std::strncmp(p, PRECMD_PREFIX, PRECMD_PREFIX_LEN) == 0) - -#define CMD_PREFIX "cmd_" -#define CMD_PREFIX_LEN 4 - -#define WANT_CMD() \ - (std::strncmp(p, CMD_PREFIX, CMD_PREFIX_LEN) == 0) - -#define DIR_PREFIX "dir_" -#define DIR_PREFIX_LEN 4 - -#define WANT_DIR() \ - (std::strncmp(p, DIR_PREFIX, DIR_PREFIX_LEN) == 0) - bool process_option(const string& whence, const string& name, scope_t& scope, const char * arg, const string& varname); diff --git a/src/post.cc b/src/post.cc index 2a1663cb..d7923866 100644 --- a/src/post.cc +++ b/src/post.cc @@ -271,8 +271,12 @@ namespace { } } -expr_t::ptr_op_t post_t::lookup(const string& name) +expr_t::ptr_op_t post_t::lookup(const symbol_t::kind_t kind, + const string& name) { + if (kind != symbol_t::FUNCTION) + return item_t::lookup(kind, name); + switch (name[0]) { case 'a': if (name[1] == '\0' || name == "amount") @@ -366,7 +370,7 @@ expr_t::ptr_op_t post_t::lookup(const string& name) break; } - return item_t::lookup(name); + return item_t::lookup(kind, name); } bool post_t::valid() const diff --git a/src/post.h b/src/post.h index 5a07299e..42217d60 100644 --- a/src/post.h +++ b/src/post.h @@ -119,7 +119,8 @@ public: return ! has_flags(POST_VIRTUAL) || has_flags(POST_MUST_BALANCE); } - virtual expr_t::ptr_op_t lookup(const string& name); + virtual expr_t::ptr_op_t lookup(const symbol_t::kind_t kind, + const string& name); bool valid() const; diff --git a/src/py_value.cc b/src/py_value.cc index 86311736..eec3b833 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(); diff --git a/src/pyinterp.cc b/src/pyinterp.cc index 005fc57a..8c79e9c7 100644 --- a/src/pyinterp.cc +++ b/src/pyinterp.cc @@ -285,38 +285,40 @@ python_interpreter_t::lookup_option(const char * p) return NULL; } -expr_t::ptr_op_t python_interpreter_t::lookup(const string& name) +expr_t::ptr_op_t python_interpreter_t::lookup(const symbol_t::kind_t kind, + const string& name) { // Give our superclass first dibs on symbol definitions - if (expr_t::ptr_op_t op = session_t::lookup(name)) + if (expr_t::ptr_op_t op = session_t::lookup(kind, name)) return op; - const char * p = name.c_str(); - switch (*p) { - case 'o': - if (WANT_OPT()) { const char * q = p + OPT_PREFIX_LEN; - if (option_t * handler = lookup_option(q)) - return MAKE_OPT_HANDLER(python_interpreter_t, handler); + switch (kind) { + case symbol_t::FUNCTION: + if (is_initialized && main_nspace.has_key(name.c_str())) { + DEBUG("python.interp", "Python lookup: " << name); + + if (python::object obj = main_nspace.get(name.c_str())) + return WRAP_FUNCTOR(functor_t(name, obj)); } break; - case 'p': - if (WANT_PRECMD()) { const char * q = p + PRECMD_PREFIX_LEN; - switch (*q) { - case 'p': - if (is_eq(q, "python")) - return MAKE_FUNCTOR(python_interpreter_t::python_command); - break; - } - } + case symbol_t::OPTION: + if (option_t * handler = lookup_option(name.c_str())) + return MAKE_OPT_HANDLER(python_interpreter_t, handler); break; - } - if (is_initialized && main_nspace.has_key(name.c_str())) { - DEBUG("python.interp", "Python lookup: " << name); + case symbol_t::PRECOMMAND: { + const char * p = name.c_str(); + switch (*p) { + case 'p': + if (is_eq(p, "python")) + return MAKE_FUNCTOR(python_interpreter_t::python_command); + break; + } + } - if (python::object obj = main_nspace.get(name.c_str())) - return WRAP_FUNCTOR(functor_t(name, obj)); + default: + break; } return NULL; diff --git a/src/pyinterp.h b/src/pyinterp.h index 4943eb2f..002e8af1 100644 --- a/src/pyinterp.h +++ b/src/pyinterp.h @@ -103,7 +103,8 @@ public: option_t * lookup_option(const char * p); - virtual expr_t::ptr_op_t lookup(const string& name); + virtual expr_t::ptr_op_t lookup(const symbol_t::kind_t kind, + const string& name); #if BOOST_VERSION >= 103700 OPTION_(python_interpreter_t, import_, DO_(scope) { diff --git a/src/report.cc b/src/report.cc index fe482a2e..883b324a 100644 --- a/src/report.cc +++ b/src/report.cc @@ -464,8 +464,8 @@ value_t report_t::echo_command(call_scope_t& scope) bool report_t::maybe_import(const string& module) { - if (lookup(string(OPT_PREFIX) + "import_")) { - expr_t(string(OPT_PREFIX) + "import_(\"" + module + "\")").calc(*this); + if (lookup(symbol_t::OPTION, "import_")) { + expr_t(string("import_(\"") + module + "\")").calc(*this); return true; } return false; @@ -707,304 +707,316 @@ option_t * report_t::lookup_option(const char * p) return NULL; } -void report_t::define(const string& name, expr_t::ptr_op_t def) +void report_t::define(const symbol_t::kind_t kind, const string& name, + expr_t::ptr_op_t def) { - session.define(name, def); + session.define(kind, name, def); } -expr_t::ptr_op_t report_t::lookup(const string& name) +expr_t::ptr_op_t report_t::lookup(const symbol_t::kind_t kind, + const string& name) { - if (expr_t::ptr_op_t def = session.lookup(name)) + if (expr_t::ptr_op_t def = session.lookup(kind, name)) return def; const char * p = name.c_str(); - switch (*p) { - case 'a': - if (is_eq(p, "amount_expr")) - return MAKE_FUNCTOR(report_t::fn_amount_expr); - else if (is_eq(p, "ansify_if")) - return MAKE_FUNCTOR(report_t::fn_ansify_if); - else if (is_eq(p, "abs")) - return MAKE_FUNCTOR(report_t::fn_abs); - break; - - case 'b': - if (is_eq(p, "black")) - return WRAP_FUNCTOR(fn_black); - else if (is_eq(p, "blink")) - return WRAP_FUNCTOR(fn_blink); - else if (is_eq(p, "blue")) - return WRAP_FUNCTOR(fn_blue); - else if (is_eq(p, "bold")) - return WRAP_FUNCTOR(fn_bold); - break; - - case 'c': - if (WANT_CMD()) { const char * q = p + CMD_PREFIX_LEN; - switch (*q) { - case 'b': - if (*(q + 1) == '\0' || is_eq(q, "bal") || is_eq(q, "balance")) { - return expr_t::op_t::wrap_functor - (reporter - (new format_accounts(*this, report_format(HANDLER(balance_format_))), - *this, "#balance")); - } - else if (is_eq(q, "budget")) { - HANDLER(amount_).set_expr(string("#budget"), "(amount, 0)"); - - budget_flags |= BUDGET_WRAP_VALUES; - if (! (budget_flags & ~BUDGET_WRAP_VALUES)) - budget_flags |= BUDGET_BUDGETED; - return expr_t::op_t::wrap_functor - (reporter - (new format_accounts(*this, report_format(HANDLER(budget_format_))), - *this, "#budget")); - } - break; - - case 'c': - if (is_eq(q, "csv")) { - return WRAP_FUNCTOR - (reporter<> - (new format_posts(*this, report_format(HANDLER(csv_format_))), - *this, "#csv")); - } - else if (is_eq(q, "cleared")) { - HANDLER(amount_).set_expr(string("#cleared"), - "(amount, cleared ? amount : 0)"); - - return expr_t::op_t::wrap_functor - (reporter - (new format_accounts(*this, report_format(HANDLER(cleared_format_))), - *this, "#cleared")); - } - break; - - case 'e': - if (is_eq(q, "equity")) - return WRAP_FUNCTOR - (reporter<> - (new format_posts(*this, report_format(HANDLER(print_format_))), - *this, "#equity")); - else if (is_eq(q, "entry")) - return WRAP_FUNCTOR(xact_command); - else if (is_eq(q, "emacs")) - return WRAP_FUNCTOR - (reporter<>(new format_emacs_posts(output_stream), *this, "#emacs")); - else if (is_eq(q, "echo")) - return MAKE_FUNCTOR(report_t::echo_command); - break; - - case 'p': - if (*(q + 1) == '\0' || is_eq(q, "print")) - return WRAP_FUNCTOR - (reporter<> - (new format_posts(*this, report_format(HANDLER(print_format_)), - HANDLED(raw)), *this, "#print")); - else if (is_eq(q, "prices")) - return expr_t::op_t::wrap_functor - (reporter - (new format_posts(*this, report_format(HANDLER(prices_format_))), - *this, "#prices")); - else if (is_eq(q, "pricesdb")) - return expr_t::op_t::wrap_functor - (reporter - (new format_posts(*this, report_format(HANDLER(pricesdb_format_))), - *this, "#pricesdb")); - else if (is_eq(q, "python") && maybe_import("ledger.interp")) - return session.lookup(string(CMD_PREFIX) + "python"); - break; - - case 'r': - if (*(q + 1) == '\0' || is_eq(q, "reg") || is_eq(q, "register")) - return WRAP_FUNCTOR - (reporter<> - (new format_posts(*this, report_format(HANDLER(register_format_))), - *this, "#register")); - else if (is_eq(q, "reload")) - return MAKE_FUNCTOR(report_t::reload_command); - break; - - case 's': - if (is_eq(q, "stats") || is_eq(q, "stat")) - return WRAP_FUNCTOR(report_statistics); - else - if (is_eq(q, "server") && maybe_import("ledger.server")) - return session.lookup(string(CMD_PREFIX) + "server"); - break; - - case 'x': - if (is_eq(q, "xact")) - return WRAP_FUNCTOR(xact_command); - break; - } + switch (kind) { + case symbol_t::FUNCTION: + switch (*p) { + case 'a': + if (is_eq(p, "amount_expr")) + return MAKE_FUNCTOR(report_t::fn_amount_expr); + else if (is_eq(p, "ansify_if")) + return MAKE_FUNCTOR(report_t::fn_ansify_if); + else if (is_eq(p, "abs")) + return MAKE_FUNCTOR(report_t::fn_abs); + break; + + case 'b': + if (is_eq(p, "black")) + return WRAP_FUNCTOR(fn_black); + else if (is_eq(p, "blink")) + return WRAP_FUNCTOR(fn_blink); + else if (is_eq(p, "blue")) + return WRAP_FUNCTOR(fn_blue); + else if (is_eq(p, "bold")) + return WRAP_FUNCTOR(fn_bold); + break; + + case 'c': + if (is_eq(p, "cyan")) + return WRAP_FUNCTOR(fn_cyan); + break; + + case 'd': + if (is_eq(p, "display_amount")) + return MAKE_FUNCTOR(report_t::fn_display_amount); + else if (is_eq(p, "display_total")) + return MAKE_FUNCTOR(report_t::fn_display_total); + else if (is_eq(p, "date")) + return MAKE_FUNCTOR(report_t::fn_now); + break; + + case 'f': + if (is_eq(p, "format_date")) + return MAKE_FUNCTOR(report_t::fn_format_date); + break; + + case 'g': + if (is_eq(p, "get_at")) + return MAKE_FUNCTOR(report_t::fn_get_at); + else if (is_eq(p, "green")) + return WRAP_FUNCTOR(fn_green); + break; + + case 'i': + if (is_eq(p, "is_seq")) + return MAKE_FUNCTOR(report_t::fn_is_seq); + break; + + case 'j': + if (is_eq(p, "justify")) + return MAKE_FUNCTOR(report_t::fn_justify); + else if (is_eq(p, "join")) + return MAKE_FUNCTOR(report_t::fn_join); + break; + + case 'm': + if (is_eq(p, "market")) + return MAKE_FUNCTOR(report_t::fn_market); + else if (is_eq(p, "magenta")) + return WRAP_FUNCTOR(fn_magenta); + break; + + case 'n': + if (is_eq(p, "null")) + return WRAP_FUNCTOR(fn_null); + else if (is_eq(p, "now")) + return MAKE_FUNCTOR(report_t::fn_now); + break; + + case 'o': + if (is_eq(p, "options")) + return MAKE_FUNCTOR(report_t::fn_options); + break; + + case 'p': + if (is_eq(p, "post")) + return WRAP_FUNCTOR(fn_false); + else if (is_eq(p, "percent")) + return MAKE_FUNCTOR(report_t::fn_percent); + else if (is_eq(p, "price")) + return MAKE_FUNCTOR(report_t::fn_price); + break; + + case 'q': + if (is_eq(p, "quoted")) + return MAKE_FUNCTOR(report_t::fn_quoted); + else if (is_eq(p, "quantity")) + return MAKE_FUNCTOR(report_t::fn_quantity); + break; + + case 'r': + if (is_eq(p, "rounded")) + return MAKE_FUNCTOR(report_t::fn_rounded); + else if (is_eq(p, "red")) + return WRAP_FUNCTOR(fn_red); + break; + + case 's': + if (is_eq(p, "scrub")) + return MAKE_FUNCTOR(report_t::fn_scrub); + else if (is_eq(p, "strip")) + return MAKE_FUNCTOR(report_t::fn_strip); + break; + + case 't': + if (is_eq(p, "truncated")) + return MAKE_FUNCTOR(report_t::fn_truncated); + else if (is_eq(p, "total_expr")) + return MAKE_FUNCTOR(report_t::fn_total_expr); + else if (is_eq(p, "today")) + return MAKE_FUNCTOR(report_t::fn_today); + else if (is_eq(p, "t")) + return MAKE_FUNCTOR(report_t::fn_display_amount); + break; + + case 'T': + if (is_eq(p, "T")) + return MAKE_FUNCTOR(report_t::fn_display_total); + break; + + case 'u': + if (is_eq(p, "underline")) + return WRAP_FUNCTOR(fn_underline); + else if (is_eq(p, "unrounded")) + return MAKE_FUNCTOR(report_t::fn_unrounded); + break; + + case 'w': + if (is_eq(p, "white")) + return WRAP_FUNCTOR(fn_white); + break; + + case 'y': + if (is_eq(p, "yellow")) + return WRAP_FUNCTOR(fn_yellow); + break; } - else if (is_eq(p, "cyan")) - return WRAP_FUNCTOR(fn_cyan); - break; - case 'd': - if (is_eq(p, "display_amount")) - return MAKE_FUNCTOR(report_t::fn_display_amount); - else if (is_eq(p, "display_total")) - return MAKE_FUNCTOR(report_t::fn_display_total); - else if (is_eq(p, "date")) - return MAKE_FUNCTOR(report_t::fn_now); + // Check if they are trying to access an option's setting or value. + if (option_t * handler = lookup_option(p)) + return MAKE_OPT_FUNCTOR(report_t, handler); break; - case 'f': - if (is_eq(p, "format_date")) - return MAKE_FUNCTOR(report_t::fn_format_date); - break; - - case 'g': - if (is_eq(p, "get_at")) - return MAKE_FUNCTOR(report_t::fn_get_at); - else if (is_eq(p, "green")) - return WRAP_FUNCTOR(fn_green); + case symbol_t::OPTION: + if (option_t * handler = lookup_option(p)) + return MAKE_OPT_HANDLER(report_t, handler); break; - case 'i': - if (is_eq(p, "is_seq")) - return MAKE_FUNCTOR(report_t::fn_is_seq); - break; - - case 'j': - if (is_eq(p, "justify")) - return MAKE_FUNCTOR(report_t::fn_justify); - else if (is_eq(p, "join")) - return MAKE_FUNCTOR(report_t::fn_join); - break; - - case 'm': - if (is_eq(p, "market")) - return MAKE_FUNCTOR(report_t::fn_market); - else if (is_eq(p, "magenta")) - return WRAP_FUNCTOR(fn_magenta); - break; - - case 'n': - if (is_eq(p, "null")) - return WRAP_FUNCTOR(fn_null); - else if (is_eq(p, "now")) - return MAKE_FUNCTOR(report_t::fn_now); - break; + case symbol_t::COMMAND: + switch (*p) { + case 'b': + if (*(p + 1) == '\0' || is_eq(p, "bal") || is_eq(p, "balance")) { + return expr_t::op_t::wrap_functor + (reporter + (new format_accounts(*this, report_format(HANDLER(balance_format_))), + *this, "#balance")); + } + else if (is_eq(p, "budget")) { + HANDLER(amount_).set_expr(string("#budget"), "(amount, 0)"); - case 'o': - if (WANT_OPT()) { const char * q = p + OPT_PREFIX_LEN; - if (option_t * handler = lookup_option(q)) - return MAKE_OPT_HANDLER(report_t, handler); - } - else if (is_eq(p, "options")) { - return MAKE_FUNCTOR(report_t::fn_options); - } - break; + budget_flags |= BUDGET_WRAP_VALUES; + if (! (budget_flags & ~BUDGET_WRAP_VALUES)) + budget_flags |= BUDGET_BUDGETED; - case 'p': - if (WANT_PRECMD()) { const char * q = p + PRECMD_PREFIX_LEN; - switch (*q) { - case 'a': - if (is_eq(q, "args")) - return WRAP_FUNCTOR(args_command); - break; - case 'e': - if (is_eq(q, "eval")) - return WRAP_FUNCTOR(eval_command); - break; - case 'f': - if (is_eq(q, "format")) - return WRAP_FUNCTOR(format_command); - break; - case 'g': - if (is_eq(q, "generate")) - return expr_t::op_t::wrap_functor - (reporter - (new format_posts(*this, report_format(HANDLER(print_format_)), - false), *this, "#generate")); - case 'h': - if (is_eq(q, "hello") && maybe_import("ledger.hello")) - return session.lookup(string(PRECMD_PREFIX) + "hello"); - break; - case 'p': - if (is_eq(q, "parse")) - return WRAP_FUNCTOR(parse_command); - else if (is_eq(q, "period")) - return WRAP_FUNCTOR(period_command); - break; - case 't': - if (is_eq(q, "template")) - return WRAP_FUNCTOR(template_command); - break; + return expr_t::op_t::wrap_functor + (reporter + (new format_accounts(*this, report_format(HANDLER(budget_format_))), + *this, "#budget")); + } + break; + + case 'c': + if (is_eq(p, "csv")) { + return WRAP_FUNCTOR + (reporter<> + (new format_posts(*this, report_format(HANDLER(csv_format_))), + *this, "#csv")); + } + else if (is_eq(p, "cleared")) { + HANDLER(amount_).set_expr(string("#cleared"), + "(amount, cleared ? amount : 0)"); + + return expr_t::op_t::wrap_functor + (reporter + (new format_accounts(*this, report_format(HANDLER(cleared_format_))), + *this, "#cleared")); } + break; + + case 'e': + if (is_eq(p, "equity")) + return WRAP_FUNCTOR + (reporter<> + (new format_posts(*this, report_format(HANDLER(print_format_))), + *this, "#equity")); + else if (is_eq(p, "entry")) + return WRAP_FUNCTOR(xact_command); + else if (is_eq(p, "emacs")) + return WRAP_FUNCTOR + (reporter<>(new format_emacs_posts(output_stream), *this, "#emacs")); + else if (is_eq(p, "echo")) + return MAKE_FUNCTOR(report_t::echo_command); + break; + + case 'p': + if (*(p + 1) == '\0' || is_eq(p, "print")) + return WRAP_FUNCTOR + (reporter<> + (new format_posts(*this, report_format(HANDLER(print_format_)), + HANDLED(raw)), *this, "#print")); + else if (is_eq(p, "prices")) + return expr_t::op_t::wrap_functor + (reporter + (new format_posts(*this, report_format(HANDLER(prices_format_))), + *this, "#prices")); + else if (is_eq(p, "pricesdb")) + return expr_t::op_t::wrap_functor + (reporter + (new format_posts(*this, report_format(HANDLER(pricesdb_format_))), + *this, "#pricesdb")); + else if (is_eq(p, "python") && maybe_import("ledger.interp")) + return session.lookup(symbol_t::COMMAND, "python"); + break; + + case 'r': + if (*(p + 1) == '\0' || is_eq(p, "reg") || is_eq(p, "register")) + return WRAP_FUNCTOR + (reporter<> + (new format_posts(*this, report_format(HANDLER(register_format_))), + *this, "#register")); + else if (is_eq(p, "reload")) + return MAKE_FUNCTOR(report_t::reload_command); + break; + + case 's': + if (is_eq(p, "stats") || is_eq(p, "stat")) + return WRAP_FUNCTOR(report_statistics); + else + if (is_eq(p, "server") && maybe_import("ledger.server")) + return session.lookup(symbol_t::COMMAND, "server"); + break; + + case 'x': + if (is_eq(p, "xact")) + return WRAP_FUNCTOR(xact_command); + break; } - else if (is_eq(p, "post")) - return WRAP_FUNCTOR(fn_false); - else if (is_eq(p, "percent")) - return MAKE_FUNCTOR(report_t::fn_percent); - else if (is_eq(p, "price")) - return MAKE_FUNCTOR(report_t::fn_price); - break; - - case 'q': - if (is_eq(p, "quoted")) - return MAKE_FUNCTOR(report_t::fn_quoted); - else if (is_eq(p, "quantity")) - return MAKE_FUNCTOR(report_t::fn_quantity); - break; - - case 'r': - if (is_eq(p, "rounded")) - return MAKE_FUNCTOR(report_t::fn_rounded); - else if (is_eq(p, "red")) - return WRAP_FUNCTOR(fn_red); - break; - - case 's': - if (is_eq(p, "scrub")) - return MAKE_FUNCTOR(report_t::fn_scrub); - else if (is_eq(p, "strip")) - return MAKE_FUNCTOR(report_t::fn_strip); - break; - - case 't': - if (is_eq(p, "truncated")) - return MAKE_FUNCTOR(report_t::fn_truncated); - else if (is_eq(p, "total_expr")) - return MAKE_FUNCTOR(report_t::fn_total_expr); - else if (is_eq(p, "today")) - return MAKE_FUNCTOR(report_t::fn_today); - else if (is_eq(p, "t")) - return MAKE_FUNCTOR(report_t::fn_display_amount); - break; - - case 'T': - if (is_eq(p, "T")) - return MAKE_FUNCTOR(report_t::fn_display_total); break; - case 'u': - if (is_eq(p, "underline")) - return WRAP_FUNCTOR(fn_underline); - else if (is_eq(p, "unrounded")) - return MAKE_FUNCTOR(report_t::fn_unrounded); - break; - - case 'w': - if (is_eq(p, "white")) - return WRAP_FUNCTOR(fn_white); + case symbol_t::PRECOMMAND: + switch (*p) { + case 'a': + if (is_eq(p, "args")) + return WRAP_FUNCTOR(args_command); + break; + case 'e': + if (is_eq(p, "eval")) + return WRAP_FUNCTOR(eval_command); + break; + case 'f': + if (is_eq(p, "format")) + return WRAP_FUNCTOR(format_command); + break; + case 'g': + if (is_eq(p, "generate")) + return expr_t::op_t::wrap_functor + (reporter + (new format_posts(*this, report_format(HANDLER(print_format_)), + false), *this, "#generate")); + case 'h': + if (is_eq(p, "hello") && maybe_import("ledger.hello")) + return session.lookup(symbol_t::PRECOMMAND, "hello"); + break; + case 'p': + if (is_eq(p, "parse")) + return WRAP_FUNCTOR(parse_command); + else if (is_eq(p, "period")) + return WRAP_FUNCTOR(period_command); + break; + case 't': + if (is_eq(p, "template")) + return WRAP_FUNCTOR(template_command); + break; + } break; - case 'y': - if (is_eq(p, "yellow")) - return WRAP_FUNCTOR(fn_yellow); + default: break; } - // Check if they are trying to access an option's setting or value. - if (option_t * handler = lookup_option(p)) - return MAKE_OPT_FUNCTOR(report_t, handler); - return NULL; } diff --git a/src/report.h b/src/report.h index e00c6460..32648648 100644 --- a/src/report.h +++ b/src/report.h @@ -311,9 +311,11 @@ public: option_t * lookup_option(const char * p); - virtual void define(const string& name, expr_t::ptr_op_t def); + virtual void define(const symbol_t::kind_t kind, const string& name, + expr_t::ptr_op_t def); - virtual expr_t::ptr_op_t lookup(const string& name); + virtual expr_t::ptr_op_t lookup(const symbol_t::kind_t kind, + const string& name); /** * Option handlers diff --git a/src/scope.cc b/src/scope.cc index 92d123ee..998eac64 100644 --- a/src/scope.cc +++ b/src/scope.cc @@ -35,31 +35,34 @@ namespace ledger { -void symbol_scope_t::define(const string& name, expr_t::ptr_op_t def) +void symbol_scope_t::define(const symbol_t::kind_t kind, + const string& name, expr_t::ptr_op_t def) { DEBUG("scope.symbols", "Defining '" << name << "' = " << def); std::pair result - = symbols.insert(symbol_map::value_type(name, def)); + = symbols.insert(symbol_map::value_type(symbol_t(kind, name, def), def)); if (! result.second) { - symbol_map::iterator i = symbols.find(name); + symbol_map::iterator i = symbols.find(symbol_t(kind, name)); assert(i != symbols.end()); symbols.erase(i); - std::pair result2 - = symbols.insert(symbol_map::value_type(name, def)); - if (! result2.second) - throw_(compile_error, _("Redefinition of '%1' in same scope") << name); + result = symbols.insert(symbol_map::value_type(symbol_t(kind, name, def), + def)); + if (! result.second) + throw_(compile_error, + _("Redefinition of '%1' in the same scope") << name); } } -expr_t::ptr_op_t symbol_scope_t::lookup(const string& name) +expr_t::ptr_op_t symbol_scope_t::lookup(const symbol_t::kind_t kind, + const string& name) { - symbol_map::const_iterator i = symbols.find(name); + symbol_map::const_iterator i = symbols.find(symbol_t(kind, name)); if (i != symbols.end()) return (*i).second; - return child_scope_t::lookup(name); + return child_scope_t::lookup(kind, name); } } // namespace ledger diff --git a/src/scope.h b/src/scope.h index 36eb54f1..7cf89c3e 100644 --- a/src/scope.h +++ b/src/scope.h @@ -50,6 +50,61 @@ namespace ledger { +/** + * @brief Brief + * + * Long. + */ +struct symbol_t +{ + enum kind_t { + UNKNOWN, + FUNCTION, + OPTION, + PRECOMMAND, + COMMAND, + DIRECTIVE + }; + + kind_t kind; + string name; + expr_t::ptr_op_t definition; + + symbol_t() : kind(UNKNOWN), name(""), definition(NULL) { + TRACE_CTOR(symbol_t, ""); + } + symbol_t(kind_t _kind, string _name, expr_t::ptr_op_t _definition = NULL) + : kind(_kind), name(_name), definition(_definition) { + TRACE_CTOR(symbol_t, "symbol_t::kind_t, string"); + } + symbol_t(const symbol_t& sym) + : kind(sym.kind), name(sym.name), + definition(sym.definition) { + TRACE_CTOR(symbol_t, "copy"); + } + ~symbol_t() throw() { + TRACE_DTOR(symbol_t); + } + + bool operator<(const symbol_t& sym) const { + return kind < sym.kind || name < sym.name; + } + +#if defined(HAVE_BOOST_SERIALIZATION) +private: + /** Serialization. */ + + friend class boost::serialization::access; + + template + void serialize(Archive& ar, const unsigned int /* version */) { + ar & kind; + ar & name; + ar & definition; + } +#endif // HAVE_BOOST_SERIALIZATION +}; + /** * @brief Brief * @@ -65,8 +120,10 @@ public: TRACE_DTOR(scope_t); } - virtual void define(const string&, expr_t::ptr_op_t) {} - virtual expr_t::ptr_op_t lookup(const string& name) = 0; + virtual void define(const symbol_t::kind_t, const string&, + expr_t::ptr_op_t) {} + virtual expr_t::ptr_op_t lookup(const symbol_t::kind_t kind, + const string& name) = 0; #if defined(HAVE_BOOST_SERIALIZATION) private: @@ -100,14 +157,16 @@ public: TRACE_DTOR(child_scope_t); } - virtual void define(const string& name, expr_t::ptr_op_t def) { + virtual void define(const symbol_t::kind_t kind, + const string& name, expr_t::ptr_op_t def) { if (parent) - parent->define(name, def); + parent->define(kind, name, def); } - virtual expr_t::ptr_op_t lookup(const string& name) { + virtual expr_t::ptr_op_t lookup(const symbol_t::kind_t kind, + const string& name) { if (parent) - return parent->lookup(name); + return parent->lookup(kind, name); return NULL; } @@ -132,7 +191,7 @@ private: */ class symbol_scope_t : public child_scope_t { - typedef std::map symbol_map; + typedef std::map symbol_map; symbol_map symbols; @@ -147,9 +206,11 @@ public: TRACE_DTOR(symbol_scope_t); } - virtual void define(const string& name, expr_t::ptr_op_t def); + virtual void define(const symbol_t::kind_t kind, const string& name, + expr_t::ptr_op_t def); - virtual expr_t::ptr_op_t lookup(const string& name); + virtual expr_t::ptr_op_t lookup(const symbol_t::kind_t kind, + const string& name); #if defined(HAVE_BOOST_SERIALIZATION) private: @@ -259,15 +320,17 @@ public: TRACE_DTOR(bind_scope_t); } - virtual void define(const string& name, expr_t::ptr_op_t def) { - parent->define(name, def); - grandchild.define(name, def); + virtual void define(const symbol_t::kind_t kind, const string& name, + expr_t::ptr_op_t def) { + parent->define(kind, name, def); + grandchild.define(kind, name, def); } - virtual expr_t::ptr_op_t lookup(const string& name) { - if (expr_t::ptr_op_t def = grandchild.lookup(name)) + virtual expr_t::ptr_op_t lookup(const symbol_t::kind_t kind, + const string& name) { + if (expr_t::ptr_op_t def = grandchild.lookup(kind, name)) return def; - return child_scope_t::lookup(name); + return child_scope_t::lookup(kind, name); } #if defined(HAVE_BOOST_SERIALIZATION) diff --git a/src/session.cc b/src/session.cc index 2b8d8d58..67f19ca9 100644 --- a/src/session.cc +++ b/src/session.cc @@ -284,23 +284,26 @@ option_t * session_t::lookup_option(const char * p) return NULL; } -expr_t::ptr_op_t session_t::lookup(const string& name) +expr_t::ptr_op_t session_t::lookup(const symbol_t::kind_t kind, + const string& name) { - const char * p = name.c_str(); - switch (*p) { - case 'o': - if (WANT_OPT()) { p += OPT_PREFIX_LEN; - if (option_t * handler = lookup_option(p)) - return MAKE_OPT_HANDLER(session_t, handler); - } + switch (kind) { + case symbol_t::FUNCTION: + // Check if they are trying to access an option's setting or value. + if (option_t * handler = lookup_option(name.c_str())) + return MAKE_OPT_FUNCTOR(session_t, handler); break; - } - // Check if they are trying to access an option's setting or value. - if (option_t * handler = lookup_option(p)) - return MAKE_OPT_FUNCTOR(session_t, handler); + case symbol_t::OPTION: + if (option_t * handler = lookup_option(name.c_str())) + return MAKE_OPT_HANDLER(session_t, handler); + break; + + default: + break; + } - return symbol_scope_t::lookup(name); + return symbol_scope_t::lookup(kind, name); } } // namespace ledger diff --git a/src/session.h b/src/session.h index 58e33f6b..972a97ba 100644 --- a/src/session.h +++ b/src/session.h @@ -116,7 +116,8 @@ public: option_t * lookup_option(const char * p); - virtual expr_t::ptr_op_t lookup(const string& name); + virtual expr_t::ptr_op_t lookup(const symbol_t::kind_t kind, + const string& name); /** * Option handlers diff --git a/src/textual.cc b/src/textual.cc index c2976ee1..6e2c919f 100644 --- a/src/textual.cc +++ b/src/textual.cc @@ -140,7 +140,8 @@ namespace { std::streamsize len, account_t * account); - virtual expr_t::ptr_op_t lookup(const string& name); + virtual expr_t::ptr_op_t lookup(const symbol_t::kind_t kind, + const string& name); }; void parse_amount_expr(scope_t& scope, @@ -749,11 +750,7 @@ void instance_t::general_directive(char * line) break; } - scoped_array directive(new char[std::strlen(p) + DIR_PREFIX_LEN + 1]); - std::strcpy(directive.get(), DIR_PREFIX); - std::strcpy(directive.get() + DIR_PREFIX_LEN, p); - - if (expr_t::ptr_op_t op = lookup(directive.get())) { + if (expr_t::ptr_op_t op = lookup(symbol_t::DIRECTIVE, p)) { call_scope_t args(*this); args.push_back(string_value(p)); op->as_function()(args); @@ -1233,9 +1230,10 @@ xact_t * instance_t::parse_xact(char * line, } } -expr_t::ptr_op_t instance_t::lookup(const string& name) +expr_t::ptr_op_t instance_t::lookup(const symbol_t::kind_t kind, + const string& name) { - return scope.lookup(name); + return scope.lookup(kind, name); } std::size_t journal_t::parse(std::istream& in, diff --git a/src/xact.cc b/src/xact.cc index 3291c5be..473837b6 100644 --- a/src/xact.cc +++ b/src/xact.cc @@ -422,8 +422,12 @@ namespace { } } -expr_t::ptr_op_t xact_t::lookup(const string& name) +expr_t::ptr_op_t xact_t::lookup(const symbol_t::kind_t kind, + const string& name) { + if (kind != symbol_t::FUNCTION) + return item_t::lookup(kind, name); + switch (name[0]) { case 'c': if (name == "code") @@ -448,7 +452,7 @@ expr_t::ptr_op_t xact_t::lookup(const string& name) break; } - return item_t::lookup(name); + return item_t::lookup(kind, name); } bool xact_t::valid() const diff --git a/src/xact.h b/src/xact.h index 781b073e..07fc68f5 100644 --- a/src/xact.h +++ b/src/xact.h @@ -123,7 +123,8 @@ public: string idstring() const; string id() const; - virtual expr_t::ptr_op_t lookup(const string& name); + virtual expr_t::ptr_op_t lookup(const symbol_t::kind_t kind, + const string& name); virtual bool valid() const; -- cgit v1.2.3 From 34ee358f5e16d4018adf3db5dac31d2d9c16b9f5 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Thu, 5 Nov 2009 02:26:06 -0500 Subject: Moved journal reading code into journal_t --- src/global.cc | 3 +- src/global.h | 8 +++-- src/journal.cc | 97 +++++++++++++++++++++++++++++++++++++++++++++++-------- src/journal.h | 12 +++++++ src/py_journal.cc | 5 +++ src/scope.cc | 2 ++ src/scope.h | 2 ++ src/session.cc | 46 +++----------------------- src/session.h | 8 ----- 9 files changed, 118 insertions(+), 65 deletions(-) (limited to 'src/scope.h') diff --git a/src/global.cc b/src/global.cc index 97a46cce..2103e32c 100644 --- a/src/global.cc +++ b/src/global.cc @@ -67,6 +67,7 @@ global_scope_t::global_scope_t(char ** envp) // open document, with a separate report_t object for each report it // generated. report_stack.push_front(new report_t(session())); + scope_t::default_scope = &report(); // Read the user's options, in the following order: // @@ -111,7 +112,7 @@ void global_scope_t::read_init() ifstream init(init_file); - if (session().read_journal(init_file, NULL, &report()) > 0 || + if (session().journal->read(init_file, NULL, &report()) > 0 || session().journal->auto_xacts.size() > 0 || session().journal->period_xacts.size() > 0) { throw_(parse_error, _("Transactions found in initialization file '%1'") diff --git a/src/global.h b/src/global.h index 34577656..31a0a480 100644 --- a/src/global.h +++ b/src/global.h @@ -75,10 +75,14 @@ public: void push_report() { report_stack.push_front(new report_t(report_stack.front())); + scope_t::default_scope = &report(); } void pop_report() { - if (! report_stack.empty()) - report_stack.pop_front(); + assert(! report_stack.empty()); + report_stack.pop_front(); + // There should always be the "default report" waiting on the stack. + assert(! report_stack.empty()); + scope_t::default_scope = &report(); } void report_error(const std::exception& err); diff --git a/src/journal.cc b/src/journal.cc index 4d6e084e..31557635 100644 --- a/src/journal.cc +++ b/src/journal.cc @@ -41,23 +41,23 @@ namespace ledger { journal_t::journal_t() - : master(new account_t), basket(NULL), was_loaded(false), - commodity_pool(new commodity_pool_t) { TRACE_CTOR(journal_t, ""); + initialize(); +} - // Add time commodity conversions, so that timelog's may be parsed - // in terms of seconds, but reported as minutes or hours. - if (commodity_t * commodity = commodity_pool->create("s")) - commodity->add_flags(COMMODITY_BUILTIN | COMMODITY_NOMARKET); - else - assert(false); +journal_t::journal_t(const path& pathname) +{ + TRACE_CTOR(journal_t, "path"); + initialize(); + read(pathname); +} - // Add a "percentile" commodity - if (commodity_t * commodity = commodity_pool->create("%")) - commodity->add_flags(COMMODITY_BUILTIN | COMMODITY_NOMARKET); - else - assert(false); +journal_t::journal_t(const string& str) +{ + TRACE_CTOR(journal_t, "string"); + initialize(); + read(str); } journal_t::~journal_t() @@ -80,6 +80,28 @@ journal_t::~journal_t() commodity_pool.reset(); } +void journal_t::initialize() +{ + master = new account_t; + basket = NULL; + was_loaded = false; + + commodity_pool.reset(new commodity_pool_t); + + // Add time commodity conversions, so that timelog's may be parsed + // in terms of seconds, but reported as minutes or hours. + if (commodity_t * commodity = commodity_pool->create("s")) + commodity->add_flags(COMMODITY_BUILTIN | COMMODITY_NOMARKET); + else + assert(false); + + // Add a "percentile" commodity + if (commodity_t * commodity = commodity_pool->create("%")) + commodity->add_flags(COMMODITY_BUILTIN | COMMODITY_NOMARKET); + else + assert(false); +} + void journal_t::add_account(account_t * acct) { master->add_account(acct); @@ -134,6 +156,55 @@ bool journal_t::remove_xact(xact_t * xact) return true; } +std::size_t journal_t::read(std::istream& in, + const path& pathname, + account_t * master_alt, + scope_t * scope) +{ + std::size_t count = 0; + try { + if (! scope) + scope = scope_t::default_scope; + + if (! scope) + throw_(std::runtime_error, + _("No default scope in which to read journal file '%1'") + << pathname); + + value_t strict = expr_t("strict").calc(*scope); + + count = parse(in, *scope, master_alt ? master_alt : master, + &pathname, strict.to_boolean()); + } + catch (...) { + clear_xdata(); + throw; + } + + // xdata may have been set for some accounts and transaction due to the use + // of balance assertions or other calculations performed in valexpr-based + // posting amounts. + clear_xdata(); + + return count; +} + +std::size_t journal_t::read(const path& pathname, + account_t * master, + scope_t * scope) +{ + path filename = resolve_path(pathname); + + if (! exists(filename)) + throw_(std::runtime_error, + _("Cannot read journal file '%1'") << filename); + + ifstream stream(filename); + std::size_t count = read(stream, filename, master, scope); + sources.push_back(fileinfo_t(filename)); + return count; +} + void journal_t::clear_xdata() { foreach (xact_t * xact, xacts) diff --git a/src/journal.h b/src/journal.h index 60d703e6..e2af0dde 100644 --- a/src/journal.h +++ b/src/journal.h @@ -126,8 +126,12 @@ public: hooks_t xact_finalize_hooks; journal_t(); + journal_t(const path& pathname); + journal_t(const string& str); ~journal_t(); + void initialize(); + std::list::iterator sources_begin() { return sources.begin(); } @@ -171,6 +175,14 @@ public: xact_finalize_hooks.remove_hook(finalizer); } + std::size_t read(std::istream& in, + const path& pathname, + account_t * master = NULL, + scope_t * scope = NULL); + std::size_t read(const path& pathname, + account_t * master = NULL, + scope_t * scope = NULL); + std::size_t parse(std::istream& in, scope_t& session_scope, account_t * master = NULL, diff --git a/src/py_journal.cc b/src/py_journal.cc index bc79101b..a9789840 100644 --- a/src/py_journal.cc +++ b/src/py_journal.cc @@ -171,6 +171,8 @@ namespace { void export_journal() { class_< journal_t::fileinfo_t > ("FileInfo") + .def(init()) + .add_property("filename", make_getter(&journal_t::fileinfo_t::filename), make_setter(&journal_t::fileinfo_t::filename)) @@ -186,6 +188,9 @@ void export_journal() ; class_< journal_t, boost::noncopyable > ("Journal") + .def(init()) + .def(init()) + .add_property("master", make_getter(&journal_t::master, return_internal_reference<1>())) .add_property("basket", diff --git a/src/scope.cc b/src/scope.cc index 998eac64..99f6b669 100644 --- a/src/scope.cc +++ b/src/scope.cc @@ -35,6 +35,8 @@ namespace ledger { +scope_t * scope_t::default_scope = NULL; + void symbol_scope_t::define(const symbol_t::kind_t kind, const string& name, expr_t::ptr_op_t def) { diff --git a/src/scope.h b/src/scope.h index 7cf89c3e..c2c9df20 100644 --- a/src/scope.h +++ b/src/scope.h @@ -113,6 +113,8 @@ private: class scope_t { public: + static scope_t * default_scope; + explicit scope_t() { TRACE_CTOR(scope_t, ""); } diff --git a/src/session.cc b/src/session.cc index 8cbef1e6..afc092f1 100644 --- a/src/session.cc +++ b/src/session.cc @@ -72,35 +72,6 @@ session_t::session_t() HANDLER(price_db_).on(none, path("./.pricedb").string()); } -std::size_t session_t::read_journal(std::istream& in, - const path& pathname, - account_t * master, - scope_t * scope) -{ - if (! master) - master = journal->master; - - std::size_t count = journal->parse(in, scope ? *scope : *this, - master, &pathname, HANDLED(strict)); - - // remove calculated totals and flags - clean_posts(); - clean_accounts(); - - return count; -} - -std::size_t session_t::read_journal(const path& pathname, - account_t * master, - scope_t * scope) -{ - if (! exists(pathname)) - throw_(std::logic_error, _("Cannot read file '%1'") << pathname); - - ifstream stream(pathname); - return read_journal(stream, pathname, master, scope); -} - std::size_t session_t::read_data(const string& master_account) { bool populated_data_files = false; @@ -144,16 +115,14 @@ std::size_t session_t::read_data(const string& master_account) cache->load(journal))) { if (price_db_path) { if (exists(*price_db_path)) { - if (read_journal(*price_db_path) > 0) + if (journal->read(*price_db_path) > 0) throw_(parse_error, _("Transactions not allowed in price history file")); - journal->sources.push_back(journal_t::fileinfo_t(*price_db_path)); } HANDLER(file_).data_files.remove(*price_db_path); } foreach (const path& pathname, HANDLER(file_).data_files) { - path filename = resolve_path(pathname); - if (filename == "-") { + if (pathname == "-") { // To avoid problems with stdin and pipes, etc., we read the entire // file in beforehand into a memory buffer, and then parcel it out // from there. @@ -169,15 +138,10 @@ std::size_t session_t::read_data(const string& master_account) std::istringstream buf_in(buffer.str()); - xact_count += read_journal(buf_in, "/dev/stdin", acct); + xact_count += journal->read(buf_in, "/dev/stdin", acct); journal->sources.push_back(journal_t::fileinfo_t()); - } - else if (exists(filename)) { - xact_count += read_journal(filename, acct); - journal->sources.push_back(journal_t::fileinfo_t(filename)); - } - else { - throw_(parse_error, _("Could not read journal file '%1'") << filename); + } else { + xact_count += journal->read(pathname, acct); } } diff --git a/src/session.h b/src/session.h index 8e73b660..7c5d47dd 100644 --- a/src/session.h +++ b/src/session.h @@ -80,14 +80,6 @@ public: flush_on_next_data_file = truth; } - std::size_t read_journal(std::istream& in, - const path& pathname, - account_t * master = NULL, - scope_t * scope = NULL); - std::size_t read_journal(const path& pathname, - account_t * master = NULL, - scope_t * scope = NULL); - std::size_t read_data(const string& master_account = ""); void read_journal_files(); -- cgit v1.2.3