Return the last value in with-{string,octets}-parsing.

fukamachi · Apr 7, 2015 · 0e8910a · 0e8910a
1 parent 00d2958
commit 0e8910a
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/proc-parse.lisp b/src/proc-parse.lisp
@@ -338,8 +338,7 @@
                 (when (eofp)
                   (go :eof))
                 (setq ,elem (aref ,data ,p))
-                ,@body
-                (return-from ,body-block ,p)
+                (return-from ,body-block (progn ,@body))
               :eof)))))))
 
 (defmacro with-octets-parsing ((data &key start end) &body body)
@@ -400,8 +399,7 @@
                 (when (eofp)
                   (go :eof))
                 (setq ,elem (aref ,data ,p))
-                ,@body
-                (return-from ,body-block ,p)
+                (return-from ,body-block (progn ,@body))
               :eof)))))))
 
 (defmacro with-vector-parsing ((data &key (start 0) end) &body body &environment env)