Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix the decoder to not use structures anymore; adjust package definit…

…ion.
  • Loading branch information...
commit 370cad71623ace4f80e5457cfff7a5ccdb51b8e8 1 parent f982fd8
Andreas Fuchs authored
Showing with 5 additions and 9 deletions.
  1. +4 −7 decoding.lisp
  2. +0 −1  package.lisp
  3. +1 −1  server.lisp
View
11 decoding.lisp
@@ -156,13 +156,10 @@
do (skip-characters source)))))
(:method ((type (eql :struct)) source)
(expecting-element/consuming (source "struct")
- (let ((struct (make-instance 'xrpc-struct)))
- (loop while (eql :start-element (klacks:peek source))
- do (expecting-element/consuming (source "member")
- (setf (member-value (decode-name source) struct)
- (decode-value source)))
- do (skip-characters source))
- struct)))
+ (loop while (eql :start-element (klacks:peek source))
+ collect (expecting-element/consuming (source "member")
+ (list (decode-name source) (decode-value source)))
+ do (skip-characters source))))
(:method ((type (eql :base64)) source)
(expecting-element/characters (source "base64" chars)
(cl-base64:base64-string-to-usb8-array chars)))
View
1  package.lisp
@@ -3,7 +3,6 @@
(:nicknames #:xml-rpc #:xrpc)
(:export #:encoder #:call #:call-with-encoder
#:encode-time #:decode-time
- #:xrpc-struct #:member-value #:member-names-of
;; server:
#:cxml-rpc-method-handler
;; conditions:
View
2  server.lisp
@@ -45,7 +45,7 @@
(report-error -32601 (princ-to-string c)))
(program-error (c)
(report-error -32603 (princ-to-string c)))
- #+(or) (klacks::klacks-error (c) ; doesn't seem to be defined?
+ (klacks::klacks-error (c) ; doesn't seem to be defined?
(report-error -32700
(format nil "Parse error from klacks: ~A" c)))
(error (c)
Please sign in to comment.
Something went wrong with that request. Please try again.