From 62bebe7bc686fe486be9511a6160019b9a99ba26 Mon Sep 17 00:00:00 2001 From: Sami Samhuri Date: Sat, 23 Apr 2011 19:58:01 -0700 Subject: [PATCH] move warnings & error messages out of core libs --- src/env.c | 7 ------- src/eval.c | 3 +++ src/list.c | 3 --- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/env.c b/src/env.c index 63a503e..055d07c 100644 --- a/src/env.c +++ b/src/env.c @@ -35,9 +35,6 @@ static void env_put(Env *env, LakeSym *key, LakeVal *val) LakeVal *env_define(Env *env, LakeSym *key, LakeVal *val) { - if (env_is_defined(env, key) == env) { - printf("warning: redefining %s\n", SYM_S(key)); - } env_put(env, key, val); return val; } @@ -58,9 +55,5 @@ LakeVal *env_get(Env *env, LakeSym *key) if (!val && env->parent) { val = env_get(env->parent, key); } - if (!val) { - ERR("undefined variable: %s", SYM_S(key)); - val = NULL; - } return val; } diff --git a/src/eval.c b/src/eval.c index 5c35f21..445a693 100644 --- a/src/eval.c +++ b/src/eval.c @@ -253,6 +253,9 @@ LakeVal *eval(LakeCtx *ctx, Env *env, LakeVal *expr) case TYPE_SYM: result = env_get(env, (gpointer)SYM(expr)); + if (!result) { + ERR("undefined variable: %s", SYM_S(SYM(expr))); + } break; case TYPE_DLIST: diff --git a/src/list.c b/src/list.c index 563581d..86c9de8 100644 --- a/src/list.c +++ b/src/list.c @@ -97,9 +97,6 @@ LakeVal *list_set(LakeList *list, size_t i, LakeVal *val) if (i >= 0 && i < list->n) { list->vals[i] = val; } - else { - ERR("list_set: index %zu is out of bounds (%zu)", i, list->n); - } return NULL; }