summaryrefslogtreecommitdiff
path: root/src/global.cc
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2009-11-09 13:25:45 -0500
committerJohn Wiegley <johnw@newartisans.com>2009-11-09 13:25:45 -0500
commit865c0ff828f88ed1d00eea73a3fc55b3e57d21b3 (patch)
tree5acdfae32811b25fb46271bf349a216bea41fddb /src/global.cc
parent55c7792c9329f97dd19fc5aeca466cb2de4fbf9c (diff)
parent9b396b41220646cf73fcd2a8afebcee06dde2a29 (diff)
downloadledger-865c0ff828f88ed1d00eea73a3fc55b3e57d21b3.tar.gz
ledger-865c0ff828f88ed1d00eea73a3fc55b3e57d21b3.tar.bz2
ledger-865c0ff828f88ed1d00eea73a3fc55b3e57d21b3.zip
Merge branch 'next'
Diffstat (limited to 'src/global.cc')
-rw-r--r--src/global.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/global.cc b/src/global.cc
index afc63eb0..0c8cedd8 100644
--- a/src/global.cc
+++ b/src/global.cc
@@ -179,9 +179,9 @@ void global_scope_t::execute_command(strings_list args, bool at_repl)
// If such a command is found, create the output stream for the result and
// then invoke the command.
- function_t command;
- bool is_precommand = false;
- bind_scope_t bound_scope(*this, report());
+ expr_t::func_t command;
+ bool is_precommand = false;
+ bind_scope_t bound_scope(*this, report());
if (bool(command = look_for_precommand(bound_scope, verb)))
is_precommand = true;
@@ -398,22 +398,22 @@ void global_scope_t::normalize_session_options()
INFO("Journal file is " << pathname.string());
}
-function_t global_scope_t::look_for_precommand(scope_t& scope,
- const string& verb)
+expr_t::func_t global_scope_t::look_for_precommand(scope_t& scope,
+ const string& verb)
{
if (expr_t::ptr_op_t def = scope.lookup(symbol_t::PRECOMMAND, verb))
return def->as_function();
else
- return function_t();
+ return expr_t::func_t();
}
-function_t global_scope_t::look_for_command(scope_t& scope,
- const string& verb)
+expr_t::func_t global_scope_t::look_for_command(scope_t& scope,
+ const string& verb)
{
if (expr_t::ptr_op_t def = scope.lookup(symbol_t::COMMAND, verb))
return def->as_function();
else
- return function_t();
+ return expr_t::func_t();
}
void global_scope_t::normalize_report_options(const string& verb)