···11-type t = Xml_tree.content Xml_tree.vertex
11+type t = Types.content Types.vertex
22[@@deriving show]
3344let hash = Hashtbl.hash
55let compare = compare
66let equal = ( = )
7788-let iri_of_vertex : _ Xml_tree.vertex -> Iri.t option = function
88+let iri_of_vertex : _ Types.vertex -> Iri.t option = function
99 | Iri_vertex iri -> Some iri
1010 | Content_vertex _ -> None
+1-1
lib/core/Vertex.mli
···11open Base
2233-type t = Xml_tree.content Xml_tree.vertex
33+type t = Types.content Types.vertex
44include Set.OrderedType with type t := t
55val equal : t -> t -> bool
66val hash : t -> int
···11open Forester_core
2233-module T = Xml_tree
33+module T = Types
4455type resource = T.content T.resource
66
+1-1
lib/forest/Forest_util.ml
···2233module Make (F: Forest.S) = struct
44 module PT = Plain_text_client.Make(F)(Plain_text_client.Default_params)
55- module C = Xml_tree.Comparators(PT)
55+ module C = Types.Comparators(PT)
6677 let get_sorted_articles addrs =
88 addrs
+1-1
lib/forest/Json_manifest_client.ml
···11open Forester_prelude
22open Forester_core
3344-module T = Xml_tree
44+module T = Types
5566module Make (R: sig val route : Iri.t -> string end) (F: Forest.S) = struct
77
+1-1
lib/forest/Json_manifest_client.mli
···44 val render_trees :
55 dev: bool ->
66 host: string ->
77- Xml_tree.content Xml_tree.article list ->
77+ Types.content Types.article list ->
88 Yojson.Basic.t
99end
+3-3
lib/forest/Legacy_query_engine.ml
···22open Forester_core
3344module type S = sig
55- val run_query : Xml_tree.query -> Vertex_set.t
55+ val run_query : Types.query -> Vertex_set.t
66end
7788module Make (Graphs: Forest_graphs.S) : S = struct
···3232 | Q.Incoming -> Forest_graph.mem_edge gph vtx' vtx
3333 | Q.Outgoing -> Forest_graph.mem_edge gph vtx vtx'
34343535- let rec check_query ~env (q : Xml_tree.query) vtx =
3535+ let rec check_query ~env (q : Types.query) vtx =
3636 match q with
3737 | Rel (mode, pol, rel, vtx_val') ->
3838 let vtx' = eval_vertex ~env vtx_val' in
···6262 let@ q = List.exists @~ qs in
6363 check_query ~env q vtx
64646565- and run_query ~env (q : Xml_tree.query) : Vertex_set.t =
6565+ and run_query ~env (q : Types.query) : Vertex_set.t =
6666 match q with
6767 | Rel (mode, pol, rel, vtx_val) ->
6868 let vtx = eval_vertex ~env vtx_val in
+1-1
lib/forest/Legacy_query_engine.mli
···11open Forester_core
2233module type S = sig
44- val run_query : Xml_tree.query -> Vertex_set.t
44+ val run_query : Types.query -> Vertex_set.t
55end
6677module Make (_: Forest_graphs.S) : S
+1-1
lib/forest/Legacy_xml_client.ml
···22open Forester_xml_names
33open Forester_core
4455-module T = Xml_tree
55+module T = Types
66module P = Pure_html
77module X = Xml_forester
88
+1-1
lib/forest/Legacy_xml_client.mli
···11open Forester_core
2233-module T := Xml_tree
33+module T := Types
44module P := Pure_html
5566module type Params = sig
+3-3
lib/forest/Plain_text_client.ml
···11open Forester_core
2233-module T = Xml_tree
33+module T = Types
4455module type Params = sig
66 val route : iri -> string
···1111end
12121313module type S = sig
1414- val string_of_content : Xml_tree.content -> string
1515- val pp_content : Format.formatter -> Xml_tree.content -> unit
1414+ val string_of_content : Types.content -> string
1515+ val pp_content : Format.formatter -> Types.content -> unit
1616end
17171818module Make (F: Forest.S) (P: Params) : S = struct
+3-3
lib/forest/Plain_text_client.mli
···11open Forester_core
2233-module T := Xml_tree
33+module T := Types
4455module type Params = sig
66 val route : iri -> string
···99module Default_params: Params
10101111module type S = sig
1212- val string_of_content : Xml_tree.content -> string
1313- val pp_content : Format.formatter -> Xml_tree.content -> unit
1212+ val string_of_content : Types.content -> string
1313+ val pp_content : Format.formatter -> Types.content -> unit
1414end
15151616module Make (_: Forest.S) (_: Params) : S
+1-1
lib/frontend/DSL.ml
···11open Forester_core
22-module X = Forester_core.Xml_tree
22+module X = Forester_core.Types
3344let txt str = X.Text str
55
+1-1
lib/frontend/Forest_reader.ml
···22open Forester_core
33open Forester_compiler
4455-module T = Xml_tree
55+module T = Types
6677type env = Eio_unix.Stdenv.base
88
+1-1
lib/frontend/Forester.ml
···44open Forester_compiler
5566module M = Iri_map
77-module T = Xml_tree
77+module T = Types
88module F = Forest.Make(Forest_graphs.Make ())
99module FU = Forest_util.Make(F)
1010module PT = Plain_text_client.Make(F)(Plain_text_client.Default_params)