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

Fixes for variable shadowing (2/28)

Browse source
This commit is contained in:
John Wiegley 2012-02-17 14:26:07 -06:00
parent 76f979901e
commit a3c9cc02d7
1 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/account.cc
View file

@ -316,89 +316,89 @@ namespace {
} }
expr_t::ptr_op_t account_t::lookup(const symbol_t::kind_t kind, expr_t::ptr_op_t account_t::lookup(const symbol_t::kind_t kind,
const string& name) const string& fn_name)
{ {
if (kind != symbol_t::FUNCTION) if (kind != symbol_t::FUNCTION)
return NULL; return NULL;
switch (name[0]) { switch (fn_name[0]) {
case 'a': case 'a':
if (name[1] == '\0' || name == "amount") if (fn_name[1] == '\0' || fn_name == "amount")
return WRAP_FUNCTOR(get_wrapper<&get_amount>); return WRAP_FUNCTOR(get_wrapper<&get_amount>);
else if (name == "account") else if (fn_name == "account")
return WRAP_FUNCTOR(&get_account); return WRAP_FUNCTOR(&get_account);
else if (name == "account_base") else if (fn_name == "account_base")
return WRAP_FUNCTOR(get_wrapper<&get_account_base>); return WRAP_FUNCTOR(get_wrapper<&get_account_base>);
else if (name == "addr") else if (fn_name == "addr")
return WRAP_FUNCTOR(get_wrapper<&get_addr>); return WRAP_FUNCTOR(get_wrapper<&get_addr>);
else if (name == "any") else if (fn_name == "any")
return WRAP_FUNCTOR(&fn_any); return WRAP_FUNCTOR(&fn_any);
else if (name == "all") else if (fn_name == "all")
return WRAP_FUNCTOR(&fn_all); return WRAP_FUNCTOR(&fn_all);
break; break;
case 'c': case 'c':
if (name == "count") if (fn_name == "count")
return WRAP_FUNCTOR(get_wrapper<&get_count>); return WRAP_FUNCTOR(get_wrapper<&get_count>);
else if (name == "cost") else if (fn_name == "cost")
return WRAP_FUNCTOR(get_wrapper<&get_cost>); return WRAP_FUNCTOR(get_wrapper<&get_cost>);
break; break;
case 'd': case 'd':
if (name == "depth") if (fn_name == "depth")
return WRAP_FUNCTOR(get_wrapper<&get_depth>); return WRAP_FUNCTOR(get_wrapper<&get_depth>);
else if (name == "depth_spacer") else if (fn_name == "depth_spacer")
return WRAP_FUNCTOR(get_wrapper<&get_depth_spacer>); return WRAP_FUNCTOR(get_wrapper<&get_depth_spacer>);
break; break;
case 'i': case 'i':
if (name == "is_account") if (fn_name == "is_account")
return WRAP_FUNCTOR(get_wrapper<&get_true>); return WRAP_FUNCTOR(get_wrapper<&get_true>);
else if (name == "is_index") else if (fn_name == "is_index")
return WRAP_FUNCTOR(get_wrapper<&get_subcount>); return WRAP_FUNCTOR(get_wrapper<&get_subcount>);
break; break;
case 'l': case 'l':
if (name == "latest_cleared") if (fn_name == "latest_cleared")
return WRAP_FUNCTOR(get_wrapper<&get_latest_cleared>); return WRAP_FUNCTOR(get_wrapper<&get_latest_cleared>);
else if (name[1] == '\0') else if (fn_name[1] == '\0')
return WRAP_FUNCTOR(get_wrapper<&get_depth>); return WRAP_FUNCTOR(get_wrapper<&get_depth>);
break; break;
case 'n': case 'n':
if (name[1] == '\0') if (fn_name[1] == '\0')
return WRAP_FUNCTOR(get_wrapper<&get_subcount>); return WRAP_FUNCTOR(get_wrapper<&get_subcount>);
break; break;
case 'p': case 'p':
if (name == "partial_account") if (fn_name == "partial_account")
return WRAP_FUNCTOR(get_partial_name); return WRAP_FUNCTOR(get_partial_name);
else if (name == "parent") else if (fn_name == "parent")
return WRAP_FUNCTOR(get_wrapper<&get_parent>); return WRAP_FUNCTOR(get_wrapper<&get_parent>);
break; break;
case 's': case 's':
if (name == "subcount") if (fn_name == "subcount")
return WRAP_FUNCTOR(get_wrapper<&get_subcount>); return WRAP_FUNCTOR(get_wrapper<&get_subcount>);
break; break;
case 't': case 't':
if (name == "total") if (fn_name == "total")
return WRAP_FUNCTOR(get_wrapper<&get_total>); return WRAP_FUNCTOR(get_wrapper<&get_total>);
break; break;
case 'u': case 'u':
if (name == "use_direct_amount") if (fn_name == "use_direct_amount")
return WRAP_FUNCTOR(get_wrapper<&ignore>); return WRAP_FUNCTOR(get_wrapper<&ignore>);
break; break;
case 'N': case 'N':
if (name[1] == '\0') if (fn_name[1] == '\0')
return WRAP_FUNCTOR(get_wrapper<&get_count>); return WRAP_FUNCTOR(get_wrapper<&get_count>);
break; break;
case 'O': case 'O':
if (name[1] == '\0') if (fn_name[1] == '\0')
return WRAP_FUNCTOR(get_wrapper<&get_total>); return WRAP_FUNCTOR(get_wrapper<&get_total>);
break; break;
} }