Merge commit 'c30054a5338027983dbc5cc463fd96eb0f1eeffa'

lispBM/lispBM/src/eval_cps.c

@@ -2002,6 +2002,7 @@ static void cont_application_args(eval_context_t *ctx) {
     // no arguments
     sptr[1] = count;
     lbm_stack_drop(&ctx->K, 1);
+    ctx->curr_env = env;
     cont_application(ctx);
   } else if (lbm_is_cons(rest)) {
     sptr[1] = env;

lispBM/lispBM/src/qq_expand.c

@@ -37,7 +37,6 @@ lbm_value gen_cons(lbm_value a, lbm_value b) {
                         lbm_cons(b, ENC_SYM_NIL)));
 }
 
-
 lbm_value append(lbm_value front, lbm_value back) {
   return lbm_cons (ENC_SYM_APPEND,
                lbm_cons(front,

lispBM/lispBM/tests/test_setvar_let_0.lisp

@@ -0,0 +1,10 @@
+
+(defun q () 10)
+
+(define b (let ((a 2))
+            (progn 
+              (setvar 'a (q))
+              a)))
+
+
+(= b 10)

lispBM/lispBM/tests/test_setvar_let_1.lisp

@@ -0,0 +1,9 @@
+(define q 10)
+
+(define b (let ((a 2))
+            (progn 
+              (setvar 'a q)
+              a)))
+
+
+(= b 10)