Minor reorganization.

Author: sfwc

core.c

@@ -56,43 +56,6 @@ pair list(void *o) {
   return cons(o, emptyList);
 }
 
-pair nreverse(pair l) {
-  pair next, last = emptyList;
-  while (!empty(l)) {
-    next = cdr(l);
-    setcdr(l, last);
-    last = l;
-    l = next;
-  }
-  return last;
-}
-
-pair nappend(pair x, pair y) {
-  pair first = x, next;
-  while (!empty(next = cdr(x))) x = next;
-  setcdr(x, y);
-  return first;
-}
-
-int length(pair l) {
-  int i = 0;
-  while (!empty(l)) {
-    l = cdr(l);
-    i++;
-  }
-  return i;
-}
-
-vector listToVector(vector list) {
-  vector v = makeVector(length(list));
-  for (int i = 0; !empty(list); i++, list = cdr(list)) setIdx(v, i, car(list));
-  return v;
-}
-
-pair map(void *fn, pair list) {
-  return empty(list) ? list : cons(((void *(*)(void *))fn)(car(list)), map(fn, cdr(list)));
-}
-
 typedef vector continuation;
 
 continuation newContinuation(void *origin,
@@ -382,15 +345,11 @@ void *cdr(vector pair) { return idx(pair, 1); }
 vector setcar(vector pair, void *val) { return setIdx(pair, 0, val); }
 vector setcdr(vector pair, void *val) { return setIdx(pair, 1, val); }
 
-int isEmpty(vector v) {
-  return vectorLength(v) == 0; 
-}
-
 obj intern(obj symbol) {
   acquireSymbolTableLock();
   obj symbolTable = hiddenEntity(oInternals);
   char *string = stringData(symbol);
-  for (pair st = symbolTable; !empty(st); st = cdr(st))
+  for (pair st = symbolTable; st; st = cdr(st))
     if (!strcmp(string, stringData(car(st)))) {
       releaseSymbolTableLock();
       return car(st);
@@ -492,14 +451,6 @@ void *loadStream(FILE *, obj, obj);
 #undef retarget
 #undef check
 
-obj appendSymbols(pair symbols) {
-  obj s = string("");
-  for (; !empty(symbols); symbols = cdr(symbols))
-    s = appendStrings(s, car(symbols));
-  setProto(s, oSymbol);
-  return intern(s);
-}
-
 obj symbol(const char *s) {
   obj o = string(s);
   setProto(o, oSymbol);

core.h

@@ -40,7 +40,7 @@ obj integer(int);
 int integerValue(obj);
 
 obj symbol(const char *c);
-obj appendSymbols(vector);
+obj intern(obj);
 
 obj message(obj, obj, vector);
 obj setMessageTarget(obj, obj);

parser.y

@@ -22,6 +22,9 @@
 #include "objects.h"
 #include <stdio.h>
 
+vector nreverse(vector);
+vector listToVector(vector);
+obj appendSymbols(vector);
 obj keywordMessage(obj target, pair args);
 void yyerror(YYLTYPE *, int *, int *, void **, void *, char const *);
 
@@ -278,6 +281,44 @@ lines:
 
 %%
 
+pair nreverse(pair l) {
+  pair next, last = emptyList;
+  while (l) {
+    next = cdr(l);
+    setcdr(l, last);
+    last = l;
+    l = next;
+  }
+  return last;
+}
+
+int length(pair l) {
+  int i = 0;
+  while (l) {
+    l = cdr(l);
+    i++;
+  }
+  return i;
+}
+
+vector listToVector(vector list) {
+  vector v = makeVector(length(list));
+  for (int i = 0; list; i++, list = cdr(list)) setIdx(v, i, car(list));
+  return v;
+}
+
+pair map(void *fn, pair list) {
+  return list ? cons(((void *(*)(void *))fn)(car(list)), map(fn, cdr(list))) : list;
+}
+
+obj appendSymbols(pair symbols) {
+  obj s = string("");
+  for (; symbols; symbols = cdr(symbols))
+    s = appendStrings(s, car(symbols));
+  setProto(s, oSymbol);
+  return intern(s);
+}
+
 obj keywordMessage(obj target, pair args) {
   return message(target,
                  appendSymbols(map(car, args)),

test.c

@@ -46,10 +46,6 @@ test(integer,
 test(intern,
   assert_equal(symbol("foo"), symbol("foo"));
 )
-test(appendSymbols,
-  assert_equal(appendSymbols(cons(symbol("foo"), list(symbol("bar")))),
-               symbol("foobar"));
-)
 test(appendStrings,
   obj s1 = string("foo"),
       s2 = string("bar"),
@@ -64,14 +60,6 @@ test(freeSpaceCount,
   // Free space should now be reduced by the size of a zero-length vector and its edenspace.
   assert_equal(freeSpaceCount(), oldCount - 3 - EDEN_OVERHEAD);
 )
-test(listToVector,
-  vector n = integer(42),
-         m = symbol("foo"),
-         v = listToVector(cons(n, list(m)));
-  assert_equal(vectorLength(v), 2);
-  assert_equal(idx(v, 0), n);
-  assert_equal(idx(v, 1), m);
-)
 test(spawn,
   void *p = newPromise();
   vector i = integer(42);