fix unquote-splicing of symbols #14

LIPS-scheme · May 15, 2019 · 6a36d6d · 6a36d6d
1 parent 11cd1e7
commit 6a36d6d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/dist/lips.js b/dist/lips.js
@@ -21,7 +21,7 @@
  * http://javascript.nwbox.com/ContentLoaded/
  * http://javascript.nwbox.com/ContentLoaded/MIT-LICENSE
  *
- * build: Wed, 15 May 2019 09:30:00 +0000
+ * build: Wed, 15 May 2019 09:52:55 +0000
  */
 (function () {
 'use strict';
@@ -4131,6 +4131,8 @@ function _typeof(obj) {
           }
 
           eval_pair.append(value);
+        } else if (eval_pair instanceof _Symbol) {
+          return eval_pair;
         } else {
           eval_pair = new Pair(eval_pair, value);
         }

diff --git a/dist/lips.min.js b/dist/lips.min.js
diff --git a/spec/lips.spec.js b/spec/lips.spec.js
@@ -224,6 +224,11 @@ describe('parser', function() {
             );
         });
     });
+    it('should join symbol', function() {
+        lips.exec("(let ((x 'foo)) `(a ,@x))").then(result => {
+            expect(result[0].toString()).toEqual('(a . foo)');
+        });
+    });
     it('should unquote from double quotation', function() {
         var code = `(let ((x '(1 2)))
                      \`(let ((x '(2 3)))

diff --git a/src/lips.js b/src/lips.js
@@ -2665,6 +2665,8 @@
                         return nil;
                     }
                     eval_pair.append(value);
+                } else if (eval_pair instanceof Symbol) {
+                    return eval_pair;
                 } else {
                     eval_pair = new Pair(
                         eval_pair,