let string_tail s =
let len = String.length s in
String.sub s 1 (len-1)
-let nonvar s =
+let nonvar uri =
+ let s = UriManager.string_of_uri uri in
let len = String.length s in
let suffix = String.sub s (len-4) 4 in
not (suffix = ".var")
aux acc n
let send_results results
- ?(id_to_uris = CicTextualParser2.EnvironmentP3.of_string "")
+ ?(id_to_uris = DisambiguateTypes.empty_environment)
(req: Http_types.request) outchan
=
let query_kind = query_kind_of_req req in
in
iter_file
(fun line ->
- let new_aliases =
- CicTextualParser2.EnvironmentP3.to_string id_to_uris
- in
+ let new_aliases = DisambiguatePp.pp_environment id_to_uris in
let processed_line =
apply_substs
(* CSC: Bug here: this is a string, not an array! *)
| id::tail when id<>"" ->
(fun id' ->
if id = id' then
- Some (List.map (fun u -> Netencoding.Url.decode u) tail)
+ Some (List.map
+ (fun u -> UriManager.uri_of_string
+ (Netencoding.Url.decode u))
+ tail)
else
f id')
| _ -> failwith "Can't parse choices")
(fun _ -> None)
choices
in
- let id_to_uris = CicTextualParser2.EnvironmentP3.of_string id_to_uris_raw in
+ let id_to_uris = DisambiguatePp.parse_environment id_to_uris_raw in
let id_to_choices =
try
parse_choices (req#param "choices")
struct
let interactive_user_uri_choice ~selection_mode ?ok
?enable_button_for_non_vars ~(title: string) ~(msg: string)
- ~(id: string) (choices: string list)
+ ~(id: string) (choices: UriManager.uri list)
=
match id_to_choices id with
| Some choices -> choices
end
in
let module Disambiguate' = Disambiguate.Make(Chat) in
- let ast = CicTextualParser2.parse_term (Stream.of_string term_str) in
+ let ast = Grammar.Entry.parse CicNotationParser.term (Stream.of_string term_str) in
let (id_to_uris, metasenv, term) =
match
Disambiguate'.disambiguate_term ~dbd ~context ~metasenv
let uri =
match term with
| Cic.MutInd (uri, typeno, _) ->
- UriManager.string_of_uriref (uri, [typeno])
+ UriManager.uri_of_uriref uri typeno None
| _ -> raise Not_a_MutInd
in
MetadataQuery.elim ~dbd uri
| _ -> assert false
in
+ let uris = List.map UriManager.string_of_uri uris in
send_results ~id_to_uris (`Results uris) req outchan
with
| Not_a_MutInd ->
send_results (`Results []) req outchan
else begin
let results = MetadataQuery.locate ~dbd expression in
+ let results = List.map UriManager.string_of_uri results in
send_results (`Results results) req outchan
end
| "/hint"
| Chat_unfinished -> ()
| Http_types.Param_not_found attr_name ->
bad_request (sprintf "Parameter '%s' is missing" attr_name) outchan
- | CicTextualParser2.Parse_error (_, msg) ->
+ | CicNotationParser.Parse_error (_, msg) ->
send_results (`Error (MooglePp.pp_error "Parse error" msg)) req outchan
| Unbound_identifier id ->
send_results (`Error (MooglePp.pp_error "Unbound identifier" id)) req
close_in ic;
printf "done!\n"; flush stdout
+let read_notation () =
+ CicNotation.load_notation (Helm_registry.get "search_engine.notations");
+ CicNotation.load_notation (Helm_registry.get "search_engine.interpretations")
+
let _ =
printf "%s started and listening on port %d\n" daemon_name port;
printf "Current directory is %s\n" (Sys.getcwd ());
()
in
restore_environment ();
+ read_notation ();
Http_daemon.start' ~port (callback dbd);
printf "%s is terminating, bye!\n" daemon_name