jadedctrl/activity-servist
jadedctrl/ activity-servist
1
0
Disbranĉigi 0
Fontkodo Issues Tirpetoj Activity

Fix JSON serialization issue with double-commas 

… I forgot to add an output to YASON:ENCODE!
This commit is contained in:
Jaidyn Ann 2024-06-22 13:33:05 -05:00
parent 8e58c7b1a4
commit fdbda3672f
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/activity-vocabulary.lisp
View File

@ -128,7 +128,7 @@ CLASS’es slots with JSON keys based on the camel-cased slot name."
This returns a function to create a quoted function that should be called for each slot, This returns a function to create a quoted function that should be called for each slot,
again and again, by YASON:ENCODE-SLOTS." again and again, by YASON:ENCODE-SLOTS."
(lambda (slot-key-pair) (lambda (slot-key-pair)
`(let ((key ',(car slot-key-pair)) `(let ((key ',(car slot-key-pair))
(value (slot-value obj ',(car slot-key-pair)))) (value (slot-value obj ',(car slot-key-pair))))
(cond ((eq key '@context) ; Encoded in YASON:ENCODE-OBJECT using *@context* (cond ((eq key '@context) ; Encoded in YASON:ENCODE-OBJECT using *@context*
(setq *@context* (merge-@contexts *@context* value))) (setq *@context* (merge-@contexts *@context* value)))
@ -280,19 +280,20 @@ into one. Otherwise, parse it into an associative list."
;;; ———————————————————————————————————————— ;;; ————————————————————————————————————————
;; Note-worthy: See the above-defined DEFINE-YASON-ENCODE-SLOTS. ;; Note-worthy: See the above-defined DEFINE-YASON-ENCODE-SLOTS.
(defmethod yason:encode ((obj object) &optional (stream *standard-output*)) (defmethod yason:encode ((obj object) &optional (stream *standard-output*))
(yason:encode-object obj)) (yason:with-output (stream)
(yason:encode-object obj)))
(defmethod yason:encode-object ((obj object)) (defmethod yason:encode-object ((obj object))
(typecase *@context* (typecase *@context*
(null ; If this is the top-level (non-nested) object, establish a @context. (null ; If this is the top-level (non-nested) object, establish a @context.
(let ((*@context* 'top-level)) (let ((*@context* 'top-level))
(yason:encode-object obj))) (yason:encode-object obj)))
(symbol ; In the top-level, encode slots and then @context. (symbol ; In the top-level, encode slots and then @context.
(setq *@context* (slot-value obj '@context)) (setq *@context* (slot-value obj '@context))
(yason:with-object () (yason:with-object ()
(yason:encode-slots obj) (yason:encode-slots obj)
(yason:encode-object-element "@context" *@context*))) (yason:encode-object-element "@context" *@context*)))
(T ; In nested objects, only encode slots — not *@context*. (T ; In nested objects, only encode slots — not *@context*.
(yason:with-object () (yason:with-object ()
(yason:encode-slots obj))))) (yason:encode-slots obj)))))