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

Fixed how valexpr function defs and calls work

Browse source
This commit is contained in:
John Wiegley 2010-06-24 20:22:11 -04:00
parent 2f50e30b89
commit 024fb4f3e0
1 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/op.cc
View file

@ -151,15 +151,21 @@ value_t expr_t::op_t::calc(scope_t& scope, ptr_op_t * locus, const int depth)
break; break;
case IDENT: { case IDENT: {
if (! left()) ptr_op_t definition = left();
if (! definition) {
// If no definition was pre-compiled for this identifier, look it
// up in the current scope.
definition = scope.lookup(symbol_t::FUNCTION, as_ident());
}
if (! definition)
throw_(calc_error, _("Unknown identifier '%1'") << as_ident()); throw_(calc_error, _("Unknown identifier '%1'") << as_ident());
// Evaluating an identifier is the same as calling its definition // Evaluating an identifier is the same as calling its definition
// directly, so we create an empty call_scope_t to reflect the scope for // directly, so we create an empty call_scope_t to reflect the scope for
// this implicit call. // this implicit call.
call_scope_t call_args(scope, locus, depth); call_scope_t call_args(scope, locus, depth);
result = left()->compile(call_args, depth + 1) result = definition->compile(call_args, depth + 1)
->calc(call_args, locus, depth + 1); ->calc(call_args, locus, depth + 1);
check_type_context(scope, result); check_type_context(scope, result);
break; break;
} }
@ -184,28 +190,37 @@ value_t expr_t::op_t::calc(scope_t& scope, ptr_op_t * locus, const int depth)
assert(left()->kind == O_CALL); assert(left()->kind == O_CALL);
for (ptr_op_t sym = left()->right(); ptr_op_t sym = left()->right();
sym; if (sym->kind == O_SEQ)
sym = sym->has_right() ? sym->right() : NULL) { sym = sym->left();
symbol_scope_t call_scope(call_args);
for (; sym; sym = sym->has_right() ? sym->right() : NULL) {
ptr_op_t varname = sym; ptr_op_t varname = sym;
if (sym->kind == O_CONS) if (sym->kind == O_CONS)
varname = sym->left(); varname = sym->left();
if (! varname->is_ident()) if (! varname->is_ident()) {
throw_(calc_error, _("Invalid function definition")); throw_(calc_error, _("Invalid function definition"));
else if (args_index == args_count) }
scope.define(symbol_t::FUNCTION, varname->as_ident(), else if (args_index == args_count) {
wrap_value(false)); call_scope.define(symbol_t::FUNCTION, varname->as_ident(),
else wrap_value(NULL_VALUE));
scope.define(symbol_t::FUNCTION, varname->as_ident(), }
wrap_value(call_args[args_index++])); else {
DEBUG("expr.compile",
"Defining function parameter " << varname->as_ident());
call_scope.define(symbol_t::FUNCTION, varname->as_ident(),
wrap_value(call_args[args_index++]));
}
} }
if (args_index < args_count) if (args_index < args_count)
throw_(calc_error, throw_(calc_error,
_("Too many arguments in function call (saw %1)") << args_count); _("Too few arguments in function call (saw %1)") << args_count);
result = right()->calc(scope, locus, depth + 1); result = right()->calc(call_scope, locus, depth + 1);
break; break;
} }
@ -244,6 +259,8 @@ value_t expr_t::op_t::calc(scope_t& scope, ptr_op_t * locus, const int depth)
const string& name(func->as_ident()); const string& name(func->as_ident());
func = func->left(); func = func->left();
if (! func)
func = scope.lookup(symbol_t::FUNCTION, name);
if (! func) if (! func)
throw_(calc_error, _("Calling unknown function '%1'") << name); throw_(calc_error, _("Calling unknown function '%1'") << name);