diff --git a/src/bin/cli_helpers.ml b/src/bin/cli_helpers.ml index 59cf5c57e..6bf5c96d7 100644 --- a/src/bin/cli_helpers.ml +++ b/src/bin/cli_helpers.ml @@ -13,7 +13,7 @@ let toplevel : display_format:ex_display_format -> displayable -> (unit -> unit match t with | Human_readable -> convert ~display_format:t disp ; | Dev -> convert ~display_format:t disp ; - | Json -> Yojson.Basic.to_string @@ convert ~display_format:t disp in + | Json -> Yojson.to_string @@ convert ~display_format:t disp in Format.printf "%s\n" as_str ; return () diff --git a/src/main/main_errors/formatter.ml b/src/main/main_errors/formatter.ml index f928f1bd6..965b77f9b 100644 --- a/src/main/main_errors/formatter.ml +++ b/src/main/main_errors/formatter.ml @@ -1,4 +1,3 @@ -open Trace open Display let error_suggest: string = "\n @@ -147,7 +146,7 @@ let error_ppformat : display_format:string display_format -> (error_ppformat' ~display_format) a error_suggest -let rec error_jsonformat : Types.all -> J.t = fun a -> +let rec error_jsonformat : Types.all -> Yojson.t = fun a -> let json_error ~stage ~content = `Assoc [ ("status", `String "error") ; diff --git a/src/passes/01-parsing/errors.ml b/src/passes/01-parsing/errors.ml index ce2533f15..537694d5a 100644 --- a/src/passes/01-parsing/errors.ml +++ b/src/passes/01-parsing/errors.ml @@ -1,4 +1,3 @@ -open Trace open Simple_utils.Display module CST = Cst.Cameligo @@ -49,7 +48,7 @@ let error_ppformat : display_format:string display_format -> Format.pp_print_string f s ; ) -let error_jsonformat : parser_error -> J.t = fun a -> +let error_jsonformat : parser_error -> Yojson.t = fun a -> let json_error ~stage ~content = `Assoc [ ("status", `String "error") ; diff --git a/src/passes/03-tree_abstraction/cameligo/errors.ml b/src/passes/03-tree_abstraction/cameligo/errors.ml index 05b407590..57546656c 100644 --- a/src/passes/03-tree_abstraction/cameligo/errors.ml +++ b/src/passes/03-tree_abstraction/cameligo/errors.ml @@ -1,4 +1,3 @@ -open Trace open Simple_utils.Display module Raw = Cst.Cameligo @@ -147,7 +146,7 @@ let rec error_ppformat : display_format:string display_format -> ) -let rec error_jsonformat : abs_error -> J.t = fun a -> +let rec error_jsonformat : abs_error -> Yojson.t = fun a -> let json_error ~stage ~content = `Assoc [ ("status", `String "error") ; diff --git a/src/passes/03-tree_abstraction/pascaligo/errors.ml b/src/passes/03-tree_abstraction/pascaligo/errors.ml index 7760ea91a..22fffac9a 100644 --- a/src/passes/03-tree_abstraction/pascaligo/errors.ml +++ b/src/passes/03-tree_abstraction/pascaligo/errors.ml @@ -1,4 +1,3 @@ -open Trace open Simple_utils.Display module Raw = Cst.Pascaligo @@ -126,7 +125,7 @@ let rec error_ppformat : display_format:string display_format -> ) -let rec error_jsonformat : abs_error -> J.t = fun a -> +let rec error_jsonformat : abs_error -> Yojson.t = fun a -> let json_error ~stage ~content = `Assoc [ ("status", `String "error") ; diff --git a/src/passes/04-self_ast_imperative/errors.ml b/src/passes/04-self_ast_imperative/errors.ml index 19553aaf2..33c122b23 100644 --- a/src/passes/04-self_ast_imperative/errors.ml +++ b/src/passes/04-self_ast_imperative/errors.ml @@ -1,6 +1,5 @@ open Simple_utils.Display open Ast_imperative -open Trace let stage = "self_ast_imperative" @@ -67,7 +66,7 @@ let error_ppformat : display_format:string display_format -> Location.pp e.location ) -let error_jsonformat : self_ast_imperative_error -> J.t = fun a -> +let error_jsonformat : self_ast_imperative_error -> Yojson.t = fun a -> let json_error ~stage ~content = `Assoc [ ("status", `String "error") ; diff --git a/src/passes/05-purification/errors.ml b/src/passes/05-purification/errors.ml index d24057d6a..79338edd2 100644 --- a/src/passes/05-purification/errors.ml +++ b/src/passes/05-purification/errors.ml @@ -1,4 +1,3 @@ -open Trace open Simple_utils.Display let stage = "purification" @@ -21,7 +20,7 @@ let error_ppformat : display_format:string display_format -> s ) -let error_jsonformat : purification_error -> J.t = fun a -> +let error_jsonformat : purification_error -> Yojson.t = fun a -> let json_error ~stage ~content = `Assoc [ ("status", `String "error") ; diff --git a/src/passes/09-typing/08-typer-common/errors.ml b/src/passes/09-typing/08-typer-common/errors.ml index 4e09f3285..f5f134c12 100644 --- a/src/passes/09-typing/08-typer-common/errors.ml +++ b/src/passes/09-typing/08-typer-common/errors.ml @@ -1,4 +1,3 @@ -open Trace open Simple_utils.Display @@ -580,7 +579,7 @@ let rec error_ppformat : display_format:string display_format -> error_ppformat ~display_format f err ) -let rec error_jsonformat : typer_error -> J.t = fun a -> +let rec error_jsonformat : typer_error -> Yojson.t = fun a -> let json_error ~stage ~content = `Assoc [ ("status", `String "error") ; diff --git a/src/passes/10-self_ast_typed/errors.ml b/src/passes/10-self_ast_typed/errors.ml index aedf38d2b..a08c1d501 100644 --- a/src/passes/10-self_ast_typed/errors.ml +++ b/src/passes/10-self_ast_typed/errors.ml @@ -1,5 +1,4 @@ open Simple_utils.Display -open Trace let stage = "self_ast_typed" @@ -104,7 +103,7 @@ let error_ppformat : display_format:string display_format -> Location.pp loc ) -let error_jsonformat : self_ast_typed_error -> J.t = fun a -> +let error_jsonformat : self_ast_typed_error -> Yojson.t = fun a -> let json_error ~stage ~content = `Assoc [ ("status", `String "error") ; diff --git a/src/passes/11-spilling/errors.ml b/src/passes/11-spilling/errors.ml index eef709b4f..039c21b33 100644 --- a/src/passes/11-spilling/errors.ml +++ b/src/passes/11-spilling/errors.ml @@ -1,4 +1,3 @@ -open Trace open Simple_utils.Display type spilling_error = [ @@ -77,7 +76,7 @@ let rec error_ppformat : display_format:string display_format -> Format.pp_print_string f s ) -let rec error_jsonformat : spilling_error -> J.t = fun a -> +let rec error_jsonformat : spilling_error -> Yojson.t = fun a -> let json_error ~stage ~content = `Assoc [ ("status", `String "error") ; diff --git a/src/passes/12-self_mini_c/errors.ml b/src/passes/12-self_mini_c/errors.ml index 24a1c15a7..4e03badba 100644 --- a/src/passes/12-self_mini_c/errors.ml +++ b/src/passes/12-self_mini_c/errors.ml @@ -1,5 +1,4 @@ open Simple_utils.Display -open Trace let stage = "self_mini_c" @@ -27,7 +26,7 @@ let error_ppformat : display_format:string display_format -> | `Self_mini_c_aggregation -> Format.fprintf f "could not aggregate" ) -let error_jsonformat : self_mini_c_error -> J.t = fun a -> +let error_jsonformat : self_mini_c_error -> Yojson.t = fun a -> let json_error ~stage ~content = `Assoc [ ("status", `String "error") ; diff --git a/src/passes/13-stacking/errors.ml b/src/passes/13-stacking/errors.ml index f6fe0a84b..c7df6a4aa 100644 --- a/src/passes/13-stacking/errors.ml +++ b/src/passes/13-stacking/errors.ml @@ -1,4 +1,3 @@ -open Trace open Simple_utils.Display open Stage_common.Types @@ -92,7 +91,7 @@ let rec error_ppformat : display_format:string display_format -> Mini_c.PP.constant c ) -let rec error_jsonformat : stacking_error -> J.t = fun a -> +let rec error_jsonformat : stacking_error -> Yojson.t = fun a -> let json_error ~stage ~content = `Assoc [ ("status", `String "error") ; diff --git a/src/stages/5-ast_typed/PP_json.ml b/src/stages/5-ast_typed/PP_json.ml index 53d09100f..d1430a4e1 100644 --- a/src/stages/5-ast_typed/PP_json.ml +++ b/src/stages/5-ast_typed/PP_json.ml @@ -2,7 +2,7 @@ open Types open Fold open Format -type json = Yojson.Basic.t +type json = Yojson.t module M = struct type no_state = NoState diff --git a/src/test/adt_generator/use_a_fold.ml b/src/test/adt_generator/use_a_fold.ml index 1de7e353a..150f6951d 100644 --- a/src/test/adt_generator/use_a_fold.ml +++ b/src/test/adt_generator/use_a_fold.ml @@ -9,7 +9,7 @@ let (|>) v f = f v (* TODO: how should we plug these into our test framework? *) let test (x : (unit,_) result) : unit = match x with | Ok (() , _annotation_thunk) -> () -(* | Error err -> failwith (Yojson.Basic.to_string @@ err ()) *) +(* | Error err -> failwith (Yojson.to_string @@ err ()) *) | Error _err -> failwith ("TODO") let () = diff --git a/vendors/ligo-utils/simple-utils/display.ml b/vendors/ligo-utils/simple-utils/display.ml index 0b52d5635..06e0d7662 100644 --- a/vendors/ligo-utils/simple-utils/display.ml +++ b/vendors/ligo-utils/simple-utils/display.ml @@ -1,4 +1,4 @@ -type json = Yojson.Basic.t +type json = Yojson.t type 'a display_format = | Human_readable : string display_format diff --git a/vendors/ligo-utils/simple-utils/display.mli b/vendors/ligo-utils/simple-utils/display.mli index e8fe2d1bf..fe3e4d10e 100644 --- a/vendors/ligo-utils/simple-utils/display.mli +++ b/vendors/ligo-utils/simple-utils/display.mli @@ -1,4 +1,4 @@ -type json = Yojson.Basic.t +type json = Yojson.t type 'a display_format = | Human_readable : string display_format diff --git a/vendors/ligo-utils/simple-utils/trace.ml b/vendors/ligo-utils/simple-utils/trace.ml index 9728a6e50..46d976a9f 100644 --- a/vendors/ligo-utils/simple-utils/trace.ml +++ b/vendors/ligo-utils/simple-utils/trace.ml @@ -212,15 +212,12 @@ module Trace_tutorial = struct end (* end Trace_tutorial. *) -module J = Yojson.Basic - - (* Annotations should be used in debug mode to aggregate information about some value history. Where it was produced, when it was modified, etc. It is currently not being used. *) type 'a thunk = unit -> 'a -type annotation = J.t +type annotation = Yojson.t (* Even in debug mode, building annotations can be quite resource-intensive. Instead, a thunk is passed, that is computed @@ -554,5 +551,3 @@ module Assert = struct assert_true err List.(length lsta = length lstb) end - -let json_of_error = J.to_string