mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

mltools: JSON: Implement JSON.Float.

Browse Source 
This is not actually used anywhere, but it completes the JSON
implementation and it will be useful for unifying JSON with
JSON_parser.
This commit is contained in:
Richard W.M. Jones
2018-08-20 15:26:57 +01:00
parent a63d02f8f1
commit bd5c0b7c12
3 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/mltools/JSON.ml
View File

@@ -23,6 +23,7 @@ and json_t =
| String of string
| Int of int
| Int64 of int64
| Float of float
| Bool of bool
| List of json_t list
| Dict of field list
@@ -110,6 +111,11 @@ and output_field ~indent ~fmt = function
| Int i -> string_of_int i
| Bool b -> if b then "true" else "false"
| Int64 i -> Int64.to_string i
(* The JSON standard permits either "1" or "1.0" but not "1.".
* OCaml string_of_float will generate "1.", but the %g formatter
* will only generate the valid JSON values.
*)
| Float f -> Printf.sprintf "%g" f
| List l -> output_list ~indent:(indent + 1) ~fmt l
| Dict d -> output_dict ~indent:(indent + 1) ~fmt d

1
common/mltools/JSON.mli
View File

@@ -23,6 +23,7 @@ and json_t = (** JSON value. *)
| String of string (** string value, eg. ["string"] *)
| Int of int (** int value, eg. [99] *)
| Int64 of int64 (** int64 value, eg. [99] *)
| Float of float (** floating point value, eg. [9.9] *)
| Bool of bool (** boolean value, [true] or [false] *)
| List of json_t list (** array value, eg. [[1,2,3]] *)
| Dict of field list (** object, eg. [{ "a": 1, "b": "c" }] *)

20
common/mltools/JSON_tests.ml
View File

@@ -71,6 +71,25 @@ let test_int ctx =
}"
(JSON.string_of_doc ~fmt:JSON.Indented doc)
let test_float ctx =
let doc = [ "test_zero", JSON.Float 0.;
"test_one", JSON.Float 1.;
"test_frac", JSON.Float 1.5;
"test_neg_frac", JSON.Float (-1.5);
"test_exp", JSON.Float 1e100 ] in
assert_equal_string
"{ \"test_zero\": 0, \"test_one\": 1, \"test_frac\": 1.5, \"test_neg_frac\": -1.5, \"test_exp\": 1e+100 }"
(JSON.string_of_doc doc);
assert_equal_string
"{
\"test_zero\": 0,
\"test_one\": 1,
\"test_frac\": 1.5,
\"test_neg_frac\": -1.5,
\"test_exp\": 1e+100
}"
(JSON.string_of_doc ~fmt:JSON.Indented doc)
let test_list ctx =
let doc = [ "item", JSON.List [ JSON.String "foo"; JSON.Int 10; JSON.Bool true ] ] in
assert_equal_string
@@ -227,6 +246,7 @@ let suite =
"basic.string" >:: test_string;
"basic.bool" >:: test_bool;
"basic.int" >:: test_int;
"basic.float" >:: test_float;
"basic.list" >:: test_list;
"basic.nested_dict" >:: test_nested_dict;
"basic.nested_nested dict" >:: test_nested_nested_dict;