check symbols are exist.

rudolph-miller · Aug 27, 2015 · abeb816 · abeb816
1 parent 2db3ad7
commit abeb816
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/helper.lisp b/src/helper.lisp
@@ -51,14 +51,14 @@
 
 (defun normalize-form (object)
   (flet ((unquote-when-comma (item)
-           #+sbcl
+           #+sb-impl-comma
            (if (comma-p item)
                (normalize-form (comma-expr item))
                (if (or (keywordp item)
                        (stringp item))
                    item
                    (list 'quote item)))
-           #-sbcl
+           #+sb-impl-comma
            (error "Not supported."))
          (make-quote (sym)
            (if (or (keywordp sym)

diff --git a/src/util.lisp b/src/util.lisp
@@ -11,8 +11,10 @@
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   #+sbcl
-  (when (find-package :sb-impl)
-    (push :sb-impl *features*)))
+  (when (and (find-package :sb-impl)
+             (find-symbol "COMMA-P" :sb-impl)
+             (find-symbol "COMMA-EXPR") :sb-impl)
+    (push :sb-impl-comma *features*)))
 
 (defun my-plist-p (list)
   (typecase list
@@ -32,19 +34,19 @@
   (intern str #.(find-package :keyword)))
 
 (defun comma-p (comma)
-  #+sb-impl
+  #+sb-impl-comma
   (sb-impl::comma-p comma)
-  #-sb-impl
+  #-sb-impl-comma
   (error "Not supported."))
 
 (defun comma-expr (comma)
-  #+sb-impl
+  #+sb-impl-comma
   (sb-impl::comma-expr comma)
-  #-sb-impl
+  #-sb-impl-comma
   nil)
 
 (defvar *quasiquote*
-  #+sb-impl
+  #+sb-impl-comma
   'sb-int:quasiquote
-  #-sb-impl
+  #-sb-impl-comma
   nil)