generate()

lib/cons.js

@@ -12,7 +12,7 @@ Cons.list = function(array) {
 };
 
 Cons.prototype.toString = function() {
-  return "(" + this.car + " . " . this.cdr + ")";
+  return "(" + this.car + " . " + this.cdr + ")";
 };
 
 Cons.prototype.forEach = function(callback) {

lib/generate.js

@@ -2,31 +2,48 @@ var util   = require('util')
   , Symbol = require('./symbol')
   , Cons   = require('./cons');
 
-var generate = function(obj) {
-  switch (typeof obj) {
-    case 'string':
-    return '"' + obj + '"';
+var generate = function(obj, options) {
+  var result;
 
-    case 'boolean':
-    return obj ? 't' : 'nil';
+  options = options || { object: 'alist' };
 
-    case 'object':
+  switch (typeof obj) {
+  case 'string':
+    result = '"' + obj + '"';
+    break;
+  case 'boolean':
+    result = obj ? 't' : 'nil';
+    break;
+  case 'object':
     if (obj === null) {
-      return 'nil';
-    } else if (obj instanceof Symbol || obj instanceof Cons) {
-      return obj.toString();
+      result = 'nil';
+    } else if (util.isArray(obj)) {
+      if (obj.length) {
+        result = '(' + obj.map(function(v) { return generate(v) }).join(' ') + ')';
+      } else {
+        result = 'nil';
+      }
+    } else if (obj instanceof Symbol) {
+      result = obj.toString();
     } else if ('car' in obj && 'cdr' in obj) {
-      return "(" + obj.car + " . " + obj.cdr + ")";
+      result = '(' + generate(obj.car) + ' . ' + generate(obj.cdr) + ')';
     } else {
-      return undefined;
+      result = [];
+      for (var key in obj) {
+        result.push(generate(new Cons(key, obj[key])));
+      }
+      result = '(' + result.join(' ') + ')';
     }
-
-    case 'function':
+    break;
+  case 'function':
     throw new Error('Function object cannt convert sexpression');
-
-    default:
-    return obj.toString();
+    break;
+  default:
+    result = obj.toString();
+    break;
   }
+
+  return result;
 };
 
 module.exports = generate;

test/generate.test.js

@@ -1,6 +1,7 @@
-var expect = require('expect.js')
+var expect      = require('expect.js')
   , sexpression = require('../')
-  , generate = sexpression.generate;
+  , generate    = sexpression.generate
+  , intern      = sexpression.Symbol.intern;
 
 describe('generate()', function() {
   describe('number', function() {
@@ -43,12 +44,35 @@ describe('generate()', function() {
     });
 
     it('should to be symbol name', function() {
-      var intern = sexpression.Symbol.intern;
       expect(generate(intern('a'))).to.be(intern('a').toString());
     });
 
     it('should to be cons cell', function() {
       expect(generate({ car: 1, cdr: 2 })).to.be('(1 . 2)');
     });
+
+    it('should to be null from empty', function() {
+      expect(generate([])).to.be('nil');
+    });
+
+    it('should be number list from number array', function() {
+      expect(generate([1, 2, 3])).to.be('(1 2 3)');
+    });
+
+    it('should be nested list', function() {
+      expect(generate([1, [2, 3], 4, 5])).to.be('(1 (2 3) 4 5)');
+    });
+
+    it('should be string list from string array', function() {
+      expect(generate(["a", "b", "c"])).to.be('("a" "b" "c")');
+    });
+
+    it('should be mixed list from mixed array', function() {
+      expect(generate([1, "abcde", intern('hoge')])).to.be('(1 "abcde" hoge)');
+    });
+
+    it('should be alist from object', function() {
+      expect(generate({ a: 1, b: 2 })).to.be('(("a" . 1) ("b" . 2))');
+    });
   });
 });