summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2014-02-15 02:00:46 -0800
committerKaz Kylheku <kaz@kylheku.com>2014-02-15 02:00:46 -0800
commitf90caa20a5a1928cc3be9bf304e3f8760b6ea8ba (patch)
tree6e7eb119d470d5ff203212331f2f6204441974eb
parent161cb223ab5ff9a6e1b42de021d4b99ce3b53701 (diff)
downloadtxr-f90caa20a5a1928cc3be9bf304e3f8760b6ea8ba.tar.gz
txr-f90caa20a5a1928cc3be9bf304e3f8760b6ea8ba.tar.bz2
txr-f90caa20a5a1928cc3be9bf304e3f8760b6ea8ba.zip
* eval.c (bind_args, op_modplace): Use ~s consistently
in error messages.
-rw-r--r--ChangeLog5
-rw-r--r--eval.c28
2 files changed, 19 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index e62dde8c..f7e8e5b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2014-02-15 Kaz Kylheku <kaz@kylheku.com>
+ * eval.c (bind_args, op_modplace): Use ~s consistently
+ in error messages.
+
+2014-02-15 Kaz Kylheku <kaz@kylheku.com>
+
* eval.c (bindings_helper): Fixed misspelling of "symbol" in exception
message.
diff --git a/eval.c b/eval.c
index d5dab8e0..296558f3 100644
--- a/eval.c
+++ b/eval.c
@@ -247,11 +247,11 @@ static val bind_args(val env, val params, val args, val ctx_form)
}
if (!bindable(param))
- eval_error(ctx_form, lit("~a: ~s is not a bindable symbol"),
+ eval_error(ctx_form, lit("~s: ~s is not a bindable symbol"),
car(ctx_form), param, nao);
if (presentsym && !bindable(presentsym))
- eval_error(ctx_form, lit("~a: ~s is not a bindable symbol"),
+ eval_error(ctx_form, lit("~s: ~s is not a bindable symbol"),
car(ctx_form), presentsym, nao);
if (optargs) {
@@ -297,14 +297,14 @@ static val bind_args(val env, val params, val args, val ctx_form)
val presentsym = pop(&param);
val initval = eval(initform, new_env, ctx_form);
if (!bindable(sym))
- eval_error(ctx_form, lit("~a: ~s is not a bindable symbol"),
+ eval_error(ctx_form, lit("~s: ~s is not a bindable symbol"),
car(ctx_form), sym, nao);
new_env = make_env(nil, nil, new_env);
env_vbind(new_env, sym, initval);
if (presentsym) {
if (!bindable(presentsym))
- eval_error(ctx_form, lit("~a: ~s is not a bindable symbol"),
+ eval_error(ctx_form, lit("~s: ~s is not a bindable symbol"),
car(ctx_form), presentsym, nao);
env_vbind(new_env, presentsym, nil);
}
@@ -316,7 +316,7 @@ static val bind_args(val env, val params, val args, val ctx_form)
if (bindable(params))
env_vbind(new_env, params, nil);
} else if (params) {
- eval_error(ctx_form, lit("~a: ~s is not a bindable sybol"),
+ eval_error(ctx_form, lit("~s: ~s is not a bindable sybol"),
car(ctx_form), params, nao);
} else if (args) {
eval_error(ctx_form, lit("~s: too many arguments"), car(ctx_form), nao);
@@ -325,7 +325,7 @@ static val bind_args(val env, val params, val args, val ctx_form)
return new_env;
twocol:
- eval_error(ctx_form, lit("~a: multiple colons in parameter list"),
+ eval_error(ctx_form, lit("~s: multiple colons in parameter list"),
car(ctx_form), nao);
}
@@ -1039,7 +1039,7 @@ static val op_modplace(val form, val env)
if (op == push_s) {
val tmp = place;
if (!third_arg_p)
- eval_error(form, lit("~a: missing argument"), op, place, nao);
+ eval_error(form, lit("~s: missing argument"), op, place, nao);
place = third(form);
newform = tmp;
newval = eval(newform, env, form);
@@ -1047,7 +1047,7 @@ static val op_modplace(val form, val env)
if (symbolp(place)) {
if (!bindable(place))
- eval_error(form, lit("~a: ~s is not a bindable sybol"), op, place, nao);
+ eval_error(form, lit("~s: ~s is not a bindable sybol"), op, place, nao);
loc = lookup_var_l(env, place);
if (!loc)
eval_error(form, lit("unbound variable ~s"), place, nao);
@@ -1082,19 +1082,19 @@ static val op_modplace(val form, val env)
val ind = eval(third(place), env, form);
loc = vecref_l(vec, ind);
} else {
- eval_error(form, lit("~a: ~s is not a recognized place form"),
+ eval_error(form, lit("~s: ~s is not a recognized place form"),
op, place, nao);
}
} else {
- eval_error(form, lit("~a: ~s is not a place"), op, place, nao);
+ eval_error(form, lit("~s: ~s is not a place"), op, place, nao);
}
if (!loc)
- eval_error(form, lit("~a: place ~s doesn't exist"), op, place, nao);
+ eval_error(form, lit("~s: place ~s doesn't exist"), op, place, nao);
if (op == set_s) {
if (!third_arg_p)
- eval_error(form, lit("~a: missing argument"), op, nao);
+ eval_error(form, lit("~s: missing argument"), op, nao);
return set(*loc, eval(newform, env, form));
} else if (op == inc_s) {
val inc = or2(eval(newform, env, form), one);
@@ -1106,12 +1106,12 @@ static val op_modplace(val form, val env)
return mpush(newval, *loc);
} else if (op == pop_s) {
if (third_arg_p)
- eval_error(form, lit("~a: superfluous argument"), op, nao);
+ eval_error(form, lit("~s: superfluous argument"), op, nao);
return pop(loc);
} else if (op == flip_s) {
return *loc = nullp(*loc);
} else if (op == del_s) {
- eval_error(form, lit("~a: cannot delete ~a"), op, place, nao);
+ eval_error(form, lit("~s: cannot delete ~a"), op, place, nao);
}
internal_error("unhandled place modifier");