Merge pull request #5 from thodg/master

Fix for lodash.js
mishoo · Jun 20, 2015 · 429c5e1 · 429c5e1
2 parents c42d452 + 244106a
commit 429c5e1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/codegen.lisp b/src/codegen.lisp
@@ -18,7 +18,12 @@ characters in string S to STREAM."
        do (write-char #\\ stream) (write-char ch stream)
      else if (setq special (car (rassoc ch +json-lisp-escaped-chars+)))
        do (write-char #\\ stream) (write-char special stream)
-     else do (write-char ch stream))
+     else if (< #x1f code #x7f)
+       do (write-char ch stream)
+     else
+       do (let ((special '#.(rassoc-if #'consp +json-lisp-escaped-chars+)))
+            (destructuring-bind (esc . (width . radix)) special
+              (format stream "\\~C~V,V,'0R" esc radix width code))))
   (write-char quote stream))
 ;;; </cl-json>
 

diff --git a/src/constants.lisp b/src/constants.lisp
@@ -3,6 +3,7 @@
 ;;; <cl-json> --- the following is taken from cl-json
 (defparameter +json-lisp-escaped-chars+
   '((#\\ . #\\)
+    (#\/ . #\/)
     (#\b . #\Backspace)
     (#\f . #\)
     (#\n . #\Newline)

diff --git a/src/squeeze.lisp b/src/squeeze.lisp
@@ -18,7 +18,8 @@
     (:method ((op (eql :*)) (left number) (right number))
       (* left right))
     (:method ((op (eql :/)) (left number) (right number))
-      (/ left right))
+      (unless (zerop right)
+	(/ left right)))
     (:method ((op (eql :<<)) (left number) (right number))
       (ash left right))
     (:method ((op (eql :>>)) (left number) (right number))