* eval.c (lookup_sym_lisp1): Bugfix: wasn't following the dynamic

environment at all, and still had vestiges of support for the the old
cptr based global variables.

1 files changed, 25 insertions, 25 deletions

diff --git a/eval.c b/eval.c
index 87398d64..c1b28671 100644
--- a/eval.c
+++ b/eval.c
@@ -154,6 +154,31 @@ val lookup_var(val env, val sym)
   return(gethash(top_vb, sym));
 }
 
+static val lookup_sym_lisp1(val env, val sym)
+{
+  uses_or2;
+
+  if (env) {
+    type_check(env, ENV);
+
+    for (; env; env = env->e.up_env) {
+      val binding = or2(assoc(sym, env->e.vbindings),
+                        assoc(sym, env->e.fbindings));
+      if (binding)
+        return binding;
+    }
+  }
+
+  for (env = dyn_env; env; env = env->e.up_env) {
+      val binding = or2(assoc(sym, env->e.vbindings),
+                        assoc(sym, env->e.fbindings));
+    if (binding)
+      return binding;
+  } 
+
+  return or2(gethash(top_vb, sym), gethash(top_fb, sym));
+}
+
 val *lookup_var_l(val env, val sym)
 {
   if (env) {
@@ -226,31 +251,6 @@ static val lookup_symac(val menv, val sym)
   }
 }
 
-static val lookup_sym_lisp1(val env, val sym)
-{
-  uses_or2;
-
-  if (nilp(env)) {
-    val bind = gethash(top_vb, sym);
-    if (cobjp(bind)) {
-      struct c_var *cv = (struct c_var *) cptr_get(bind);
-      set(cv->bind->c.cdr, *cv->loc);
-      return cv->bind;
-    }
-    return or2(bind, gethash(top_fb, sym));
-  } else  {
-    type_check(env, ENV);
-
-    {
-      val binding = or2(assoc(sym, env->e.vbindings),
-                        assoc(sym, env->e.fbindings));
-      if (binding)
-        return binding;
-      return lookup_sym_lisp1(env->e.up_env, sym);
-    }
-  }
-}
-
 static void mark_special(val sym)
 {
   sethash(special, sym, t);