ENCODE for SYMBOLs indirected as well.

Author: phmarek

doc.xml

@@ -384,6 +384,18 @@ CL-USER> (let* ((yason:*parse-json-arrays-as-vectors* t)
       </clix:special-variable>
 
 
+      <clix:special-variable name="*symbol-encoder*">
+        <clix:description>
+          Function to call to translate a CL symbol into a JSON string.
+		  The default is to error out, to provide backwards-compatible behaviour.
+		  <p>
+			  A useful function that can be bound to this variable is 
+			  <clix:ref>YASON:ENCODE-SYMBOL-AS-LOWERCASE.</clix:ref>
+		  </p>
+        </clix:description>
+      </clix:special-variable>
+
+
 		<clix:special-variable name="*symbol-key-encoder*">
           <clix:description>
 			  Defines the policy to encode symbols as keys (eg. in hash tables).

encode.lisp

@@ -25,6 +25,12 @@
 (defparameter *symbol-key-encoder* 'encode-symbol-key-error
   "The actual function used to encode a SYMBOL when seen as a key.
   You might want ENCODE-SYMBOL-AS-LOWERCASE or
+  ENCODE-SYMBOL-AS-STRING here.
+  The function returns just a string - the quotes are added when writing the key.")
+
+(defparameter *symbol-encoder* 'encode-symbol-error
+  "The actual function used to encode a SYMBOL.
+  You might want ENCODE-SYMBOL-AS-LOWERCASE or
   ENCODE-SYMBOL-AS-STRING here.")
 
 
@@ -146,20 +152,31 @@
 (defmethod encode ((object list) &optional (stream *json-output*))
   (funcall *list-encoder* object stream))
 
+(defmethod encode ((object symbol) &optional (stream *json-output*))
+  (let ((new (funcall *symbol-encoder* object)))
+    (assert (stringp new))
+    (encode new stream))
+  )
 
 (defun encode-symbol-key-error (key)
   (declare (ignore key))
   (error "No policy for symbols as keys defined. ~
          Please check YASON:*SYMBOL-KEY-ENCODER*."))
 
+(defun encode-symbol-error (key)
+  (declare (ignore key))
+  (error "No policy for symbols as keys defined. ~
+         Please check YASON:*SYMBOL-ENCODER*."))
+
+
 (defun encode-symbol-as-lowercase (key)
   "Encodes a symbol KEY as a lowercase string.
   Ensure that there's no intentional lower-case character lost."
   (let ((name (symbol-name key)))
     (assert (notany #'lower-case-p name))
     (string-downcase name)))
 
-(defun encode-symbol-as-string (sym &optional stream prefix)
+(defun encode-symbol-as-string (sym &optional prefix)
   "Encodes a symbol SYM as string PACKAGE:SYMBOL-NAME.
   Always prints a double colon, as exportedness
   might not make sense for the receiver;
@@ -169,8 +186,10 @@
   (let ((*print-readably* t)
         (*package* (symbol-package sym)))
     (if (keywordp sym)
-        (format stream "~a~s" prefix sym)
-        (format stream "~a~a::~s"
+        (format nil "~a~s"
+                (or prefix "") 
+                sym)
+        (format nil "~a~a::~s"
                 (or prefix "")
                 (package-name *package*)
                 sym))))

package.lisp

@@ -31,6 +31,7 @@
    #:encode-alist
    #:encode-plain-list-to-array
    #:*list-encoder*
+   #:*symbol-encoder*
    #:*symbol-key-encoder*
    #:encode-symbol-as-lowercase
    #:encode-symbol-as-string