Merge branch 'next'

1 files changed, 22 insertions, 2 deletions

diff --git a/src/session.cc b/src/session.cc
index 8adfef38..df6eaf7d 100644
--- a/src/session.cc
+++ b/src/session.cc
@@ -182,6 +182,16 @@ void session_t::close_journal_files()
   amount_t::initialize();
 }
 
+value_t session_t::fn_account(call_scope_t& args)
+{
+  if (args[0].is_string())
+    return scope_value(journal->find_account(args.get<string>(0), false));
+  else if (args[0].is_mask())
+    return scope_value(journal->find_account_re(args.get<mask_t>(0).str()));
+  else
+    return NULL_VALUE;
+}
+
 option_t<session_t> * session_t::lookup_option(const char * p)
 {
   switch (*p) {
@@ -224,15 +234,25 @@ option_t<session_t> * session_t::lookup_option(const char * p)
 expr_t::ptr_op_t session_t::lookup(const symbol_t::kind_t kind,
                                    const string& name)
 {
+  const char * p = name.c_str();
+
   switch (kind) {
   case symbol_t::FUNCTION:
+    switch (*p) {
+    case 'a':
+      if (is_eq(p, "account"))
+        return MAKE_FUNCTOR(session_t::fn_account);
+      break;
+    default:
+      break;
+    }
     // Check if they are trying to access an option's setting or value.
-    if (option_t<session_t> * handler = lookup_option(name.c_str()))
+    if (option_t<session_t> * handler = lookup_option(p))
       return MAKE_OPT_FUNCTOR(session_t, handler);
     break;
 
   case symbol_t::OPTION:
-    if (option_t<session_t> * handler = lookup_option(name.c_str()))
+    if (option_t<session_t> * handler = lookup_option(p))
       return MAKE_OPT_HANDLER(session_t, handler);
     break;