From b20a97ed9fbc3bfcbf12158f4c2001d983e50c2d Mon Sep 17 00:00:00 2001
From: Yuichi Nishiwaki <yuichi.nishiwaki@gmail.com>
Date: Sat, 13 Sep 2014 18:51:20 +0900
Subject: [PATCH] move map/for-each to pair.c

---
 pair.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 proc.c | 59 ----------------------------------------------------------
 2 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/pair.c b/pair.c
index 3ca55610..d9960347 100644
--- a/pair.c
+++ b/pair.c
@@ -667,6 +667,63 @@ pic_pair_list_copy(pic_state *pic)
   return pic_list_copy(pic, obj);
 }
 
+static pic_value
+pic_pair_map(pic_state *pic)
+{
+  struct pic_proc *proc;
+  size_t argc;
+  pic_value *args;
+  int i;
+  pic_value cars, ret;
+
+  pic_get_args(pic, "l*", &proc, &argc, &args);
+
+  ret = pic_nil_value();
+  do {
+    cars = pic_nil_value();
+    for (i = argc - 1; i >= 0; --i) {
+      if (! pic_pair_p(args[i])) {
+        break;
+      }
+      cars = pic_cons(pic, pic_car(pic, args[i]), cars);
+      args[i] = pic_cdr(pic, args[i]);
+    }
+    if (i >= 0)
+      break;
+    ret = pic_cons(pic, pic_apply(pic, proc, cars), ret);
+  } while (1);
+
+  return pic_reverse(pic, ret);
+}
+
+static pic_value
+pic_pair_for_each(pic_state *pic)
+{
+  struct pic_proc *proc;
+  size_t argc;
+  pic_value *args;
+  int i;
+  pic_value cars;
+
+  pic_get_args(pic, "l*", &proc, &argc, &args);
+
+  do {
+    cars = pic_nil_value();
+    for (i = argc - 1; i >= 0; --i) {
+      if (! pic_pair_p(args[i])) {
+        break;
+      }
+      cars = pic_cons(pic, pic_car(pic, args[i]), cars);
+      args[i] = pic_cdr(pic, args[i]);
+    }
+    if (i >= 0)
+      break;
+    pic_apply(pic, proc, cars);
+  } while (1);
+
+  return pic_none_value();
+}
+
 static pic_value
 pic_pair_memq(pic_state *pic)
 {
@@ -754,6 +811,8 @@ pic_init_pair(pic_state *pic)
   pic_defun(pic, "list-ref", pic_pair_list_ref);
   pic_defun(pic, "list-set!", pic_pair_list_set);
   pic_defun(pic, "list-copy", pic_pair_list_copy);
+  pic_defun(pic, "map", pic_pair_map);
+  pic_defun(pic, "for-each", pic_pair_for_each);
   pic_defun(pic, "memq", pic_pair_memq);
   pic_defun(pic, "memv", pic_pair_memv);
   pic_defun(pic, "member", pic_pair_member);
diff --git a/proc.c b/proc.c
index a518214f..e68965fc 100644
--- a/proc.c
+++ b/proc.c
@@ -102,63 +102,6 @@ pic_proc_apply(pic_state *pic)
   return pic_apply_trampoline(pic, proc, arg_list);
 }
 
-static pic_value
-pic_proc_map(pic_state *pic)
-{
-  struct pic_proc *proc;
-  size_t argc;
-  pic_value *args;
-  int i;
-  pic_value cars, ret;
-
-  pic_get_args(pic, "l*", &proc, &argc, &args);
-
-  ret = pic_nil_value();
-  do {
-    cars = pic_nil_value();
-    for (i = argc - 1; i >= 0; --i) {
-      if (! pic_pair_p(args[i])) {
-        break;
-      }
-      cars = pic_cons(pic, pic_car(pic, args[i]), cars);
-      args[i] = pic_cdr(pic, args[i]);
-    }
-    if (i >= 0)
-      break;
-    ret = pic_cons(pic, pic_apply(pic, proc, cars), ret);
-  } while (1);
-
-  return pic_reverse(pic, ret);
-}
-
-static pic_value
-pic_proc_for_each(pic_state *pic)
-{
-  struct pic_proc *proc;
-  size_t argc;
-  pic_value *args;
-  int i;
-  pic_value cars;
-
-  pic_get_args(pic, "l*", &proc, &argc, &args);
-
-  do {
-    cars = pic_nil_value();
-    for (i = argc - 1; i >= 0; --i) {
-      if (! pic_pair_p(args[i])) {
-        break;
-      }
-      cars = pic_cons(pic, pic_car(pic, args[i]), cars);
-      args[i] = pic_cdr(pic, args[i]);
-    }
-    if (i >= 0)
-      break;
-    pic_apply(pic, proc, cars);
-  } while (1);
-
-  return pic_none_value();
-}
-
 static pic_value
 pic_proc_attribute(pic_state *pic)
 {
@@ -174,8 +117,6 @@ pic_init_proc(pic_state *pic)
 {
   pic_defun(pic, "procedure?", pic_proc_proc_p);
   pic_defun(pic, "apply", pic_proc_apply);
-  pic_defun(pic, "map", pic_proc_map);
-  pic_defun(pic, "for-each", pic_proc_for_each);
 
   pic_defun(pic, "attribute", pic_proc_attribute);
 }