Skip to content
Snippets Groups Projects
Commit 216605be authored by Loïc Correnson's avatar Loïc Correnson
Browse files

[server] avoid deprecated Basic.json

parent 339a4db2
No related branches found
No related tags found
No related merge requests found
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
module Json = Yojson.Basic module Json = Yojson.Basic
module Jutil = Yojson.Basic.Util module Jutil = Yojson.Basic.Util
type json = Json.json type json = Json.t
let pretty = Json.pretty_print ~std:false let pretty = Json.pretty_print ~std:false
module type S = module type S =
......
...@@ -125,7 +125,7 @@ let index () = ...@@ -125,7 +125,7 @@ let index () =
(fun (title,entry) -> Markdown.href ~title entry) (fun (title,entry) -> Markdown.href ~title entry)
(List.sort (fun (a,_) (b,_) -> String.compare a b) !entries) (List.sort (fun (a,_) (b,_) -> String.compare a b) !entries)
type json = Yojson.Basic.json type json = Json.t
let link ~toc ~title ~href : json = let link ~toc ~title ~href : json =
let link = [ "title" , `String title ; "href" , `String href ] in let link = [ "title" , `String title ; "href" , `String href ] in
...@@ -141,7 +141,7 @@ let link_page page : json list = ...@@ -141,7 +141,7 @@ let link_page page : json list =
else links else links
) (pages_of_chapter page.chapter) [] ) (pages_of_chapter page.chapter) []
let maindata : Yojson.Basic.json = let maindata : json =
`Assoc [ `Assoc [
"document", `String "Frama-C Server" ; "document", `String "Frama-C Server" ;
"title",`String "Documentation" ; "title",`String "Documentation" ;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
(* *) (* *)
(**************************************************************************) (**************************************************************************)
type json = Yojson.Basic.json type json = Json.t
type buffer = { type buffer = {
text : FCBuffer.t ; text : FCBuffer.t ;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
(* *) (* *)
(**************************************************************************) (**************************************************************************)
type json = Yojson.Basic.json type json = Json.t
(** All-in-one formatter. Return the JSON encoding of formatted text. *) (** All-in-one formatter. Return the JSON encoding of formatted text. *)
val format : ?indent:int -> ?margin:int -> val format : ?indent:int -> ?margin:int ->
......
...@@ -55,7 +55,7 @@ let exec request data = (snd (Hashtbl.find registry request)) data ...@@ -55,7 +55,7 @@ let exec request data = (snd (Hashtbl.find registry request)) data
(* --- Public API --- *) (* --- Public API --- *)
(* -------------------------------------------------------------------------- *) (* -------------------------------------------------------------------------- *)
type json = Json.json type json = Json.t
type 'a request = [ type 'a request = [
| `Poll | `Poll
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
(** Server Main Process *) (** Server Main Process *)
(* -------------------------------------------------------------------------- *) (* -------------------------------------------------------------------------- *)
type json = Yojson.Basic.json type json = Json.t
type kind = [ `GET | `SET | `EXEC ] type kind = [ `GET | `SET | `EXEC ]
val string_of_kind : kind -> string val string_of_kind : kind -> string
val pp_kind : Format.formatter -> kind -> unit val pp_kind : Format.formatter -> kind -> unit
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment