[Guile-commits] 79/99: Implement list builtins

[Christopher Allan Webber]

cwebber pushed a commit to branch compile-to-js-merge
in repository guile.

commit 8321baee15cf65c45a608458792a0e028cbded5e
Author: Ian Price <ianprice90@googlemail.com>
AuthorDate: Wed Aug 16 21:40:39 2017 +0100

    Implement list builtins
    
    * module/language/js-il/runtime.js
      (cons, memq, member, delete!): Implement builtins
---
 module/language/js-il/runtime.js | 40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/module/language/js-il/runtime.js b/module/language/js-il/runtime.js
index c337fc4..5398868 100644
--- a/module/language/js-il/runtime.js
+++ b/module/language/js-il/runtime.js
@@ -945,6 +945,10 @@ def_guile0("make-list", function (self, cont, n, obj) {
     return cont(list);
 });
 
+def_guile0("cons", function (self, cont, car, cdr) {
+    return cont(scheme.primitives.cons(car, cdr));
+});
+
 def_guile0("length", function (self, cont, list) {
    var len = 0;
 
@@ -1027,18 +1031,46 @@ def_guile0("equal?", function (self, cont, x, y) {
     return cont(coerce_bool(scm_equal(x,y)));
 });
 
-def_guile0("memq", function (self, cont, val, args) {
+def_guile0("memq", function (self, cont, elt, list) {
+    // FIXME: validate list
+    for (; list != scheme.EMPTY && list != scheme.NIL; list = list.cdr) {
+        if (elt === list.car) { // FIXME: eqv
+            return cont(list);
+        }
+    }
     return cont(scheme.FALSE);
 });
 
 def_guile0("member", function (self, cont, elt, list) {
-    // FIXME: needs equal? console.log("member", arguments);
-    // throw "";
+    // FIXME: validate list
+    for (; list != scheme.EMPTY && list != scheme.NIL; list = list.cdr) {
+        if (scm_equal(elt, list.car)) {
+            return cont(list);
+        }
+    }
     return cont(scheme.FALSE);
 });
 
 def_guile0("delete!", function (self, cont, elt, list) {
-    // FIXME:
+    // FIXME: validate list
+    if (list instanceof scheme.Pair) {
+        // initially skip car;
+        for (var prev = list, walk = list.cdr;
+             walk instanceof scheme.Pair;
+             walk = walk.cdr) {
+
+            if (scm_equal(walk.car, elt)) {
+                prev.cdr = walk.cdr;
+            } else {
+                prev = prev.cdr;
+            }
+        }
+        // fixup car in return value, but can't delete
+        if (scm_equal(list.car, elt)) {
+            return cont(list.cdr);
+        }
+    }
+
     return cont(list);
 });