Changed the list structure to not respect cons(nil, nil) == nil.

I think this is a mistake, but at the moment I'm not clever enough to
figure out how to properly acknowledge an end-of-list without a special
sentinel, which I'm trying to avoid.

TODO: Revisit this.

Modified Makefile to produce JUnit-compatible error messages.

Style (coffee-lint cleanup)

.gitignore

@@ -16,4 +16,5 @@ bin/escodegen
 bin/esgenerate
 bin/mocha
 *.js
+test-reports.xml
 

Makefile

@@ -18,7 +18,11 @@ node_modules: package.json
 	mkdir -p node_modules
 	npm install
 
-test: node_modules
+test: clean node_modules
+	@JUNIT_REPORT_PATH=test-reports.xml JUNIT_REPORT_STACK=1 ./node_modules/.bin/mocha \
+		--reporter mocha-jenkins-reporter --compilers coffee:coffee-script/register || true
+
+ltest: node_modules
 	@node_modules/.bin/mocha --compilers coffee:coffee-script/register
 
 clean: 

src/lists.coffee

@@ -13,7 +13,7 @@ nilp = (a) -> cellp(a) and a.length == 0
 nil = (-> l = []; l.__list = true; l)()
 
 cons = (a, b = nil) ->
-  l = if not (a?) then [] else if (nilp a) then b else [a, b]
+  l = if (not (a?)) then b else [a, b]
   l.__list = true
   l
 

src/reduce.coffee

@@ -1,7 +1,9 @@
-{car, cdr, cons, listp, pairp, nilp, nil, list, listToString} = require './lists'
+{car, cdr, cons, listp, pairp, nilp,
+  nil, list, listToString} = require './lists'
 
 reduce = (lst, iteratee, memo, context) ->
   count = 0
+  console.log lst
   return memo if nilp lst
   memo = iteratee.call(context, memo, (car lst), count)
   lst = cdr lst
@@ -13,43 +15,28 @@ reduce = (lst, iteratee, memo, context) ->
     null
   memo
 
-map = (lst, iteratee, context) ->
+
+map = (lst, iteratee, context, count = 0) ->
   return nil if nilp lst
-  root = cons()
+  product = iteratee.call(context, (car lst), count, lst)
+  rest = if (nilp cdr lst) then nil else
+    map((cdr lst), iteratee, context, count + 1)
+  cons product, rest
 
-  reducer = (memo, item, count) ->
+rmap = (lst, iteratee, context, count = 0) ->
-    next = cons(iteratee.call(context, item, count, lst))
-    memo[1] = next
-    next
-
-  reduce(lst, reducer, root, context)
-  (cdr root)
-
-rmap = (lst, iteratee, context) ->
   return nil if nilp lst
-  root = cons()
+  product = (if (nilp cdr lst) then nil else
-
+    map((cdr lst), iteratee, context, count + 1))
-  reducer = (memo, item, count) ->
+  cons product, iteratee.call(context, (car lst), count, lst)
-    cons(iteratee.call(context, item, count, lst), memo)
-
-  reduce(lst, reducer, root, context)
 
 filter = (lst, iteratee, context) ->
   return nil if nilp lst
-  root = cons()
+  if iteratee.call(context, (car lst), lst)
-
+    cons (car lst), filter (cdr lst)
-  reducer = (memo, item, count) ->
-    if iteratee.call(context, item, count, lst)
-      next = cons(item)
-      memo[1] = next
-      next
   else
-      memo
+    filter (cdr list)
 
-  reduce(lst, reducer, root, context)
+reverse = (lst) -> rmap lst, (i) -> i
-  if (pairp root) then (cdr root) else root
-
-reverse = (lst) -> reduce(lst, ((memo, value) -> cons(value, memo)), cons())
 
 module.exports =
   reduce: reduce

test/lists.coffee

@@ -7,14 +7,10 @@ expect = chai.expect
 describe "Basic list building", ->
   for [t, v] in [
     [cons(), cons()]
-    [cons(nil), cons()]
-    [cons(), cons(nil)]
     [cons('a'), cons('a')]
     [cons('a', cons('b', cons('c'))), cons('a', cons('b', cons('c')))]
     [cons('a', cons('b', cons('c'))), cons('a', cons('b', cons('c', nil)))]
-    [cons('a', cons('b', cons('c', nil))), cons('a', cons('b', cons('c')))]
+    [cons('a', cons('b', cons('c', nil))), cons('a', cons('b', cons('c')))]]
-    [cons(nil, cons('a')), cons('a')]  # Test for identity; consing nil to anything results in anything
-    [cons(nil, cons(nil, cons(nil))), nil]]
     do (t, v) ->
       it "should match #{t}", ->
         expect(t).to.deep.equal(v)
@@ -32,7 +28,7 @@ describe 'Round trip equivalence', ->
 describe 'List Building', ->
   for [t, v] in [
     [cons(), []]
-    [cons(nil), []]
+    [cons(nil), [nil]]
     [cons('a'), ['a']]
     [cons('a', cons('b')), ['a', 'b']]
     [cons('a', cons('b', cons('c'))), ['a', 'b', 'c']]
@@ -62,7 +58,11 @@ describe 'Metacadr Simple', ->
       it "The #{t} should read #{v}", ->
         expect(metacadr(t)(mcsimple)).to.equal(v)
 
-mccomplex = vectorToList([['a', 'b', 'c'], ['1', '2', '3'], ['X', 'Y', 'Z'], ['f', 'g', 'h']])
+mccomplex = vectorToList([
+  ['a', 'b', 'c'],
+  ['1', '2', '3'],
+  ['X', 'Y', 'Z'],
+  ['f', 'g', 'h']])
 
 describe 'Metacadr Complex', ->
   for [t, v, r] in [

test/reduce.coffee

@@ -2,7 +2,8 @@ chai = require 'chai'
 chai.should()
 expect = chai.expect
 
-{listToVector, vectorToList, listToString, cons, list, nil} = require '../src/lists'
+{listToVector, vectorToList,
+  listToString, cons, list, nil} = require '../src/lists'
 {map, reduce, filter, reverse} = require '../src/reduce'
 
 id = (item) -> item