3409

021eval.cc

@@ -382,13 +382,11 @@ void bind_aliases(cell* param, bool is_params_quoted, cell* arg, cell* scope, ce
       }
       else if (is_cons(alias)) {
         trace("bind") << "destructured alias (as-param) " << alias << '\n';
-        if (!is_cons(arg)) {
-          bind_params(alias, true, nil, scope, new_scope, is_macro);
-        }
-        else {
-          TEMP(val, eval_arg(arg, scope));
-          bind_params(alias, true, val, scope, new_scope, is_macro);
+        if (!eval_done) {
+          update(val, eval_arg(arg, scope));
+          eval_done = true;
         }
+        bind_params(alias, true, is_cons(val) ? val : nil, scope, new_scope, is_macro);
       }
       else {
         RAISE << "unknown alias in " << param << '\n';

021eval.test.cc

@@ -645,6 +645,14 @@ void test_eval_binds_as_params() {
   CHECK_TRACE_CONTENTS("bind", "a: (1 2)b: 1c: 2");
 }
 
+void test_eval_binds_as_params2() {
+  TEMP(val, read("(1 2)"));
+  new_dynamic_scope("x", val);
+  run("((fn ((a | (b c))) 3) x)");
+  CHECK_TRACE_CONTENTS("bind", "a: (1 2)b: 1c: 2");
+  end_dynamic_scope("x");
+}
+
 void test_eval_binds_as_params_with_keyword_args() {
   run("((fn (a | (b c)) 3) 1 :b 2)");
   CHECK_TRACE_CONTENTS("bind", "a: (1 :b 2)b: 2c: 1");

045check.test

@@ -204,7 +204,6 @@
 (test "match? - atom positive"
   :valueof (match? 3 3)
   :should be_true)
-exit 0
 
 (test "match? - atom negative"
   :valueof (match? 3 4)

050list2.test

@@ -172,6 +172,7 @@
 (test "pos works"
   :valueof (pos 2 '(1 2 3))
   :should be_true)
+exit 0
 
 (test "pos works - 2"
   :valueof (pos 4 '(1 2 3))

050list2.wart

@@ -27,7 +27,11 @@ def (pos x (seq | (head ... tail)) n)
   if seq
     if (head = x)
       n
-      (pos x tail n+1)
+      trace "bind"
+        (pos x tail n+1)
+
+prn (pos 2 '(1 2 3))
+exit 0
 
 def (rpos x seq n)
   aif (pos x rev.seq n)