From 575e4d4e00ca20eed4dfc537340634f2779e06c2 Mon Sep 17 00:00:00 2001 From: Swrup Date: Thu, 31 Mar 2022 00:01:52 +0200 Subject: [PATCH] change bindings.ml to syntax.ml --- src/babillard.ml | 2 +- src/discuss.ml | 8 ++++---- src/dune | 2 +- src/pp_babillard.ml | 4 ++-- src/{bindings.ml => syntax.ml} | 0 src/user.ml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename src/{bindings.ml => syntax.ml} (100%) diff --git a/src/babillard.ml b/src/babillard.ml index 754fa90..b38df76 100644 --- a/src/babillard.ml +++ b/src/babillard.ml @@ -1,5 +1,5 @@ open Db -include Bindings +open Syntax type moderation_action = | Ignore diff --git a/src/discuss.ml b/src/discuss.ml index 916de87..bc9ac1f 100644 --- a/src/discuss.ml +++ b/src/discuss.ml @@ -29,7 +29,7 @@ let find_comrades = "SELECT from_id, to_id FROM msg WHERE from_id=? OR to_id=?" in fun user_id -> - let open Bindings in + let open Syntax in let^ comrades = Db.Db.collect_list find_comrades (user_id, user_id) in let comrades = List.map (fun (l, r) -> if l = user_id then r else l) comrades @@ -46,7 +46,7 @@ let find_messages = (from_id=? AND to_id=?)" in fun k1 k2 -> - let open Bindings in + let open Syntax in let^ comrades = Db.Db.collect_list find_messages ((k1, k2), (k2, k1)) in Ok comrades @@ -63,7 +63,7 @@ let render request = | Error e -> Template_utils.render_unsafe e request | Ok comrades -> ( let comrades = - Bindings.unwrap_list + Syntax.unwrap_list (fun id -> match User.get_nick id with | Error _e as e -> e @@ -140,7 +140,7 @@ let insert_msg = "INSERT INTO msg VALUES (NULL, ?, ?, ?);" in fun from_id to_id msg -> - let open Bindings in + let open Syntax in let^ () = Db.Db.exec insert_msg (from_id, to_id, msg) in Ok () diff --git a/src/dune b/src/dune index d7e57a5..27ae89a 100644 --- a/src/dune +++ b/src/dune @@ -4,7 +4,6 @@ app babillard babillard_page - bindings catalog_page content db @@ -15,6 +14,7 @@ pp_babillard register report_page + syntax template template_utils thread_page diff --git a/src/pp_babillard.ml b/src/pp_babillard.ml index eddc3cb..ca7de6f 100644 --- a/src/pp_babillard.ml +++ b/src/pp_babillard.ml @@ -1,5 +1,5 @@ -include Bindings -include Babillard +open Syntax +open Babillard open Db let pp_post fmt t = diff --git a/src/bindings.ml b/src/syntax.ml similarity index 100% rename from src/bindings.ml rename to src/syntax.ml diff --git a/src/user.ml b/src/user.ml index 8cf67a5..d099004 100644 --- a/src/user.ml +++ b/src/user.ml @@ -1,4 +1,4 @@ -include Bindings +open Syntax open Db type t =