aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-12-27 18:13:45 +0000
committerDavid Robillard <d@drobilla.net>2012-12-27 18:13:45 +0000
commit72f0c3c64ccde328b1d592d2d741811a33408060 (patch)
tree0d2287ce44838f5843a0faee950089699af11528
parent7603b847aab2a7ef8a2d3342cb9326607e218bb9 (diff)
downloadresp-72f0c3c64ccde328b1d592d2d741811a33408060.tar.gz
resp-72f0c3c64ccde328b1d592d2d741811a33408060.tar.bz2
resp-72f0c3c64ccde328b1d592d2d741811a33408060.zip
Update error messages for new Scheme style names.
git-svn-id: http://svn.drobilla.net/resp/trunk@451 ad02d1e2-f140-0410-9f75-f8b11f17cedd
-rw-r--r--src/constrain.cpp6
-rw-r--r--src/expand.cpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/constrain.cpp b/src/constrain.cpp
index 66b4505..b644833 100644
--- a/src/constrain.cpp
+++ b/src/constrain.cpp
@@ -113,10 +113,10 @@ constrain_dot(TEnv& tenv, Constraints& c, const ATuple* call) throw(Error)
static void
constrain_def(TEnv& tenv, Constraints& c, const ATuple* call) throw(Error)
{
- THROW_IF(call->list_len() != 3, call->loc, "`def' requires exactly 2 arguments");
- THROW_IF(!call->frst()->to_symbol(), call->frst()->loc, "`def' name is not a symbol");
+ THROW_IF(call->list_len() != 3, call->loc, "`define' requires exactly 2 arguments");
+ THROW_IF(!call->frst()->to_symbol(), call->frst()->loc, "`define' name is not a symbol");
const ASymbol* const sym = call->list_ref(1)->as_symbol();
- THROW_IF(!sym, call->loc, "`def' has no symbol")
+ THROW_IF(!sym, call->loc, "`define' has no symbol")
const AST* const body = call->list_ref(2);
const AST* tvar = tenv.var(body);
diff --git a/src/expand.cpp b/src/expand.cpp
index 72d83cd..7eece67 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -141,8 +141,8 @@ expand_fn(PEnv& penv, const AST* exp)
{
const ATuple* tup = exp->to_tuple();
ATuple::const_iterator a = tup->begin();
- THROW_IF(++a == tup->end(), exp->loc, "Unexpected end of `fn' form");
- THROW_IF(!(*a)->to_tuple(), (*a)->loc, "First argument of `fn' is not a list");
+ THROW_IF(++a == tup->end(), exp->loc, "Unexpected end of `lambda' form");
+ THROW_IF(!(*a)->to_tuple(), (*a)->loc, "First argument of `lambda' is not a list");
const ATuple* prot = (*a++)->to_tuple();
List ret(new ATuple(penv.sym("lambda"), NULL, exp->loc));
ret.push_back(prot);
@@ -155,7 +155,7 @@ static const AST*
expand_def(PEnv& penv, const AST* exp)
{
const ATuple* tup = exp->as_tuple();
- THROW_IF(tup->list_len() < 3, tup->loc, "`def' requires at least 2 arguments");
+ THROW_IF(tup->list_len() < 3, tup->loc, "`define' requires at least 2 arguments");
ATuple::const_iterator i = tup->begin();
const AST* arg1 = *(++i);