[Pkg-ocaml-maint-commits] [yojson] 04/08: Imported Upstream version 1.2.2
Stéphane Glondu
glondu at moszumanska.debian.org
Fri Sep 11 13:55:03 UTC 2015
This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository yojson.
commit 532729a9df81e3de124af47880dbbd096584313f
Author: Stephane Glondu <steph at glondu.net>
Date: Thu Sep 10 11:56:46 2015 +0200
Imported Upstream version 1.2.2
---
.gitignore | 14 ++++++++++++++
Makefile | 2 +-
test.json | 3 ++-
write.ml | 4 ++--
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..999cfd3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,14 @@
+*.cmi
+*.cmo
+*.cmx
+*.cmxs
+*.o
+*.a
+*.annot
+META
+basic.mli
+out.html
+read.ml
+ydump
+yojson.ml
+yojson.mli
diff --git a/Makefile b/Makefile
index 7e63f83..dd43a46 100755
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 1.2.1
+VERSION = 1.2.2
ifeq "$(shell ocamlfind ocamlc -config |grep os_type)" "os_type: Win32"
EXE=.exe
diff --git a/test.json b/test.json
index 6f0f2db..3a37d99 100644
--- a/test.json
+++ b/test.json
@@ -13,5 +13,6 @@
],
"'NULL' U+0000": "\u0000",
"'VULGAR FRACTION ONE HALF' U+00BD": "\u00BD",
- "'PILE OF POO' U+1F4A9": "\uD83D\uDCA9"
+ "'PILE OF POO' U+1F4A9": "\uD83D\uDCA9",
+ "min_int": "-4611686018427387904"
}
diff --git a/write.ml b/write.ml
index d5968ed..6e3f51f 100644
--- a/write.ml
+++ b/write.ml
@@ -85,7 +85,7 @@ let rec write_digits s pos x =
else
let d = x mod 10 in
let pos = write_digits s pos (x / 10) in
- s.[pos] <- dec d;
+ s.[pos] <- dec (abs d);
pos + 1
let write_int ob x =
@@ -96,7 +96,7 @@ let write_int ob x =
let s = ob.o_s in
let pos = ob.o_len in
s.[pos] <- '-';
- ob.o_len <- write_digits s (pos + 1) (abs x)
+ ob.o_len <- write_digits s (pos + 1) x
)
else
Bi_outbuf.add_char ob '0'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/yojson.git
More information about the Pkg-ocaml-maint-commits
mailing list