move the logic of left_closeds/tighters/left_opens to situation.ml

Author: mikeshulman

lib/parser/scope.ml

@@ -98,19 +98,12 @@ module Situation = struct
     x
 
   let left_closeds : unit -> (No.plus_omega, No.strict) Notation.entry =
-   fun () ->
-    let s = get () in
-    (Situation.EntryMap.find_opt No.plus_omega s.tighters <|> Anomaly "missing left_closeds").strict
+   fun () -> left_closeds (get ())
 
   let tighters : type strict tight. (tight, strict) No.iinterval -> (tight, strict) Notation.entry =
-   fun { strictness; endpoint } ->
-    let ep = Situation.EntryMap.find_opt endpoint (get ()).tighters <|> Anomaly "missing tighters" in
-    match strictness with
-    | Nonstrict -> ep.nonstrict
-    | Strict -> ep.strict
-
-  let left_opens : Token.t -> No.interval option =
-   fun tok -> Notation.TokMap.find_opt tok (get ()).left_opens
+   fun i -> tighters (get ()) i
+
+  let left_opens : Token.t -> No.interval option = fun tok -> left_opens (get ()) tok
 
   let unparse : Situation.PrintKey.t -> User.notation option =
    fun c -> Situation.PrintMap.find_opt c (get ()).unparse

lib/parser/situation.ml

@@ -123,3 +123,15 @@ let add_user_to : User.prenotation -> t -> (User.notation * User.key list) * t =
   let notn = User.make_user user in
   let shadow = List.filter (fun key -> PrintMap.mem key sit.unparse) notn.keys in
   ((notn, shadow), add_with_print notn sit)
+
+let left_closeds : t -> (No.plus_omega, No.strict) entry =
+ fun s -> (EntryMap.find_opt No.plus_omega s.tighters <|> Anomaly "missing left_closeds").strict
+
+let tighters : type strict tight. t -> (tight, strict) No.iinterval -> (tight, strict) entry =
+ fun s { strictness; endpoint } ->
+  let ep = EntryMap.find_opt endpoint s.tighters <|> Anomaly "missing tighters" in
+  match strictness with
+  | Nonstrict -> ep.nonstrict
+  | Strict -> ep.strict
+
+let left_opens : t -> Token.t -> No.interval option = fun s tok -> TokMap.find_opt tok s.left_opens