in
HLog.debug debug; assert false
+let __Implicit = "__Implicit__"
+let __Closed_Implicit = "__Closed_Implicit__"
+
+let cic_mk_choice = function
+ | LexiconAst.Symbol_alias (name, _, dsc) ->
+ if name = __Implicit then
+ dsc, `Sym_interp (fun _ -> Cic.Implicit None)
+ else if name = __Closed_Implicit then
+ dsc, `Sym_interp (fun _ -> Cic.Implicit (Some `Closed))
+ else
+ DisambiguateChoices.cic_lookup_symbol_by_dsc name dsc
+ | LexiconAst.Number_alias (_, dsc) ->
+ DisambiguateChoices.lookup_num_by_dsc dsc
+ | LexiconAst.Ident_alias (name, uri) ->
+ uri, `Sym_interp
+ (fun l->assert(l = []);CicUtil.term_of_uri (UriManager.uri_of_string uri))
+;;
+
+let ncic_mk_choice = function
+ | LexiconAst.Symbol_alias (name, _, dsc) ->
+ if name = __Implicit then
+ dsc, `Sym_interp (fun _ -> NCic.Implicit `Term)
+ else if name = __Closed_Implicit then
+ dsc, `Sym_interp (fun _ -> NCic.Implicit `Closed)
+ else
+ DisambiguateChoices.lookup_symbol_by_dsc
+ ~mk_implicit:(function
+ | true -> NCic.Implicit `Closed
+ | false -> NCic.Implicit `Term)
+ ~mk_appl:(function
+ (NCic.Appl l)::tl -> NCic.Appl (l@tl) | l -> NCic.Appl l)
+ ~term_of_uri:(fun uri ->
+ fst (OCic2NCic.convert_term uri (CicUtil.term_of_uri uri)))
+ name dsc
+ | LexiconAst.Number_alias (_, dsc) ->
+ let desc,f = DisambiguateChoices.lookup_num_by_dsc dsc in
+ desc, `Num_interp
+ (fun num ->
+ fst (OCic2NCic.convert_term
+ (UriManager.uri_of_string "cic:/xxx/x.con")
+ (match f with `Num_interp f -> f num | _ -> assert false)))
+ | LexiconAst.Ident_alias (name, uri) ->
+ uri, `Sym_interp
+ (fun l->assert(l = []);
+ let uri = UriManager.uri_of_string uri in
+ fst (OCic2NCic.convert_term uri (CicUtil.term_of_uri uri)))
+;;
+
+
+let mk_implicit b =
+ match b with
+ | false ->
+ LexiconAst.Symbol_alias (__Implicit,-1,"Fake Implicit")
+ | true ->
+ LexiconAst.Symbol_alias (__Closed_Implicit,-1,"Fake Closed Implicit")
+;;
+
+let lookup_in_library
+ interactive_user_uri_choice input_or_locate_uri item
+=
+ let mk_ident_alias id u =
+ LexiconAst.Ident_alias (id,UriManager.string_of_uri u)
+ in
+ let mk_num_alias instance =
+ List.map
+ (fun dsc,_ -> LexiconAst.Number_alias (instance,dsc))
+ (DisambiguateChoices.lookup_num_choices())
+ in
+ let mk_symbol_alias symb ino (dsc, _,_) =
+ LexiconAst.Symbol_alias (symb,ino,dsc)
+ in
+ let dbd = LibraryDb.instance () in
+ let choices_of_id id =
+ let uris = Whelp.locate ~dbd id in
+ match uris with
+ | [] ->
+ (match
+ (input_or_locate_uri
+ ~title:("URI matching \"" ^ id ^ "\" unknown.")
+ ?id:(Some id) ())
+ with
+ | None -> []
+ | Some uri -> [uri])
+ | [uri] -> [uri]
+ | _ ->
+ interactive_user_uri_choice ~selection_mode:`MULTIPLE
+ ?ok:(Some "Try selected.")
+ ?enable_button_for_non_vars:(Some true)
+ ~title:"Ambiguous input."
+ ~msg: ("Ambiguous input \"" ^ id ^
+ "\". Please, choose one or more interpretations:")
+ ~id
+ uris
+ in
+ match item with
+ | DisambiguateTypes.Id id ->
+ let uris = choices_of_id id in
+ List.map (mk_ident_alias id) uris
+ | DisambiguateTypes.Symbol (symb, ino) ->
+ (try
+ List.map (mk_symbol_alias symb ino)
+ (TermAcicContent.lookup_interpretations symb)
+ with
+ TermAcicContent.Interpretation_not_found -> [])
+ | DisambiguateTypes.Num instance -> mk_num_alias instance
+;;
+
(** @param term not meaningful when context is given *)
-let disambiguate_term text prefix_len lexicon_status_ref context metasenv term =
+let disambiguate_term goal text prefix_len lexicon_status_ref context metasenv
+term =
let lexicon_status = !lexicon_status_ref in
- let (diff, metasenv, cic, _) =
+ let (diff, metasenv, subst, cic, _) =
singleton "first"
- (GrafiteDisambiguator.disambiguate_term ~dbd:(LibraryDb.instance ())
+ (CicDisambiguate.disambiguate_term
~aliases:lexicon_status.LexiconEngine.aliases
- ~universe:(Some lexicon_status.LexiconEngine.multi_aliases)
- ~context ~metasenv (text,prefix_len,term))
+ ?goal ~universe:(Some lexicon_status.LexiconEngine.multi_aliases)
+ ~lookup_in_library
+ ~mk_choice:cic_mk_choice
+ ~mk_implicit
+ ~description_of_alias:LexiconAst.description_of_alias
+ ~context ~metasenv ~subst:[] (text,prefix_len,term))
in
let lexicon_status = LexiconEngine.set_proof_aliases lexicon_status diff in
lexicon_status_ref := lexicon_status;
- metasenv,cic
+ metasenv,(*subst,*) cic
;;
(** disambiguate_lazy_term (circa): term -> (unit -> status) * lazy_term
* each invocation will disambiguate the term and can add aliases. Once all
* disambiguations have been performed, the first returned function can be
* used to obtain the resulting aliases *)
-let disambiguate_lazy_term text prefix_len lexicon_status_ref term =
+let disambiguate_lazy_term goal text prefix_len lexicon_status_ref term =
(fun context metasenv ugraph ->
let lexicon_status = !lexicon_status_ref in
- let (diff, metasenv, cic, ugraph) =
+ let (diff, metasenv, _, cic, ugraph) =
singleton "second"
- (GrafiteDisambiguator.disambiguate_term ~dbd:(LibraryDb.instance ())
+ (CicDisambiguate.disambiguate_term
+ ~lookup_in_library
+ ~mk_choice:cic_mk_choice
+ ~mk_implicit
+ ~description_of_alias:LexiconAst.description_of_alias
~initial_ugraph:ugraph ~aliases:lexicon_status.LexiconEngine.aliases
~universe:(Some lexicon_status.LexiconEngine.multi_aliases)
- ~context ~metasenv
+ ~context ~metasenv ~subst:[] ?goal
(text,prefix_len,term)) in
let lexicon_status = LexiconEngine.set_proof_aliases lexicon_status diff in
lexicon_status_ref := lexicon_status;
let disambiguate_pattern
text prefix_len lexicon_status_ref (wanted, hyp_paths, goal_path)
=
- let interp path = Disambiguate.interpretate_path [] path in
+ let interp path =CicDisambiguate.interpretate_path [] path in
let goal_path = HExtlib.map_option interp goal_path in
let hyp_paths = List.map (fun (name, path) -> name, interp path) hyp_paths in
let wanted =
None -> None
| Some wanted ->
let wanted =
- disambiguate_lazy_term text prefix_len lexicon_status_ref wanted
+ disambiguate_lazy_term None text prefix_len lexicon_status_ref wanted
in
Some wanted
in
let disambiguate_reduction_kind text prefix_len lexicon_status_ref = function
| `Unfold (Some t) ->
- let t = disambiguate_lazy_term text prefix_len lexicon_status_ref t in
+ let t =
+ disambiguate_lazy_term None text prefix_len lexicon_status_ref t in
`Unfold (Some t)
| `Normalize
| `Simpl
;;
let rec disambiguate_tactic
- lexicon_status_ref context metasenv (text,prefix_len,tactic)
+ lexicon_status_ref context metasenv goal (text,prefix_len,tactic)
=
+ let disambiguate_term_hint =
+ disambiguate_term goal text prefix_len lexicon_status_ref in
let disambiguate_term =
- disambiguate_term text prefix_len lexicon_status_ref in
+ disambiguate_term None text prefix_len lexicon_status_ref in
let disambiguate_pattern =
disambiguate_pattern text prefix_len lexicon_status_ref in
let disambiguate_reduction_kind =
disambiguate_reduction_kind text prefix_len lexicon_status_ref in
let disambiguate_lazy_term =
- disambiguate_lazy_term text prefix_len lexicon_status_ref in
+ disambiguate_lazy_term None text prefix_len lexicon_status_ref in
let disambiguate_tactic metasenv tac =
- disambiguate_tactic lexicon_status_ref context metasenv (text,prefix_len,tac)
+ disambiguate_tactic lexicon_status_ref context metasenv goal (text,prefix_len,tac)
in
let disambiguate_auto_params m p =
disambiguate_auto_params disambiguate_term m context p
| GrafiteAst.Apply (loc, term) ->
let metasenv,cic = disambiguate_term context metasenv term in
metasenv,GrafiteAst.Apply (loc, cic)
+ | GrafiteAst.ApplyRule (loc, term) ->
+ let metasenv,cic = disambiguate_term_hint context metasenv term in
+ metasenv,GrafiteAst.ApplyRule (loc, cic)
| GrafiteAst.ApplyP (loc, term) ->
let metasenv,cic = disambiguate_term context metasenv term in
metasenv,GrafiteAst.ApplyP (loc, cic)
| `Proof as t -> metasenv,t in
metasenv,GrafiteAst.RewritingStep (loc, cic, cic', cic'', cont)
-
let disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj) =
let uri =
match obj with
| None -> raise BaseUriNotSetYet)
| CicNotationPt.Inductive _ -> assert false
| CicNotationPt.Theorem _ -> None in
- let (diff, metasenv, cic, _) =
+ let try_new cic =
+ (NCicLibrary.clear_cache ();
+ NCicEnvironment.invalidate ();
+ OCic2NCic.clear ();
+ (match obj with
+ CicNotationPt.Theorem (_,_,ty,_) ->
+ let graph =
+ match cic with
+ | Cic.CurrentProof (_,metasenv, _, ty,_,_) ->
+ let _, ugraph =
+ CicTypeChecker.type_of_aux' metasenv [] ty CicUniv.empty_ugraph
+ in
+ ugraph
+ | Cic.Constant (_,_, ty,_,_) ->
+ let _, ugraph =
+ CicTypeChecker.type_of_aux' [] [] ty CicUniv.empty_ugraph
+ in
+ ugraph
+ | _ -> CicUniv.empty_ugraph
+ in
+(*
+ let _,l = CicUniv.do_rank graph in
+ List.iter (fun k ->
+ prerr_endline (CicUniv.string_of_universe k ^ " = " ^ string_of_int
+ (CicUniv.get_rank k))) l;
+*)
+ let graph =
+ List.fold_left
+ (fun graph (_,_,l) ->
+ List.fold_left
+ (fun graph (uri,_,_) ->
+ let _,g = CicTypeChecker.typecheck uri in
+ CicUniv.merge_ugraphs ~base_ugraph:graph ~increment:(g,uri))
+ graph l)
+ graph (CoercDb.to_list ())
+ in
+ ignore(CicUniv.do_rank graph);
+ prerr_endline "INIZIO NUOVA DISAMBIGUAZIONE";
+ let time = Unix.gettimeofday () in
+ (try
+ (match
+ NCicDisambiguate.disambiguate_term
+ ~lookup_in_library:lookup_in_library
+ ~description_of_alias:LexiconAst.description_of_alias
+ ~mk_choice:ncic_mk_choice
+ ~mk_implicit
+ ~coercion_db:(NCicCoercion.db ())
+ ~context:[] ~metasenv:[] ~subst:[]
+ ~aliases:lexicon_status.LexiconEngine.aliases
+ ~universe:(Some lexicon_status.LexiconEngine.multi_aliases)
+ (text,prefix_len,ty)
+ with
+ | [_,metasenv,subst,ty],_ ->
+ let time = Unix.gettimeofday () -. time in
+ prerr_endline ("NUOVA DISAMBIGUAZIONE OK: "^ string_of_float time);
+ prerr_endline (NCicPp.ppterm ~metasenv ~subst ~context:[] ty)
+ | _ ->
+ prerr_endline ("NUOVA DISAMBIGUAZIONE AMBIGUO!!!!!!!!! "))
+ with
+ | MultiPassDisambiguator.DisambiguationError (_,s) ->
+ prerr_endline ("ERRORE NUOVA DISAMBIGUAZIONE:\n" ^
+ String.concat "\n"
+ (List.map (fun _,_,x,_ -> snd (Lazy.force x)) (List.flatten s)))
+(* | exn -> prerr_endline (Printexc.to_string exn) *)
+ )
+ | _ -> ())
+ )
+ in
+
+(*
+ try
+ let time = Unix.gettimeofday () in
+*)
+
+ let (diff, metasenv, _, cic, _) =
singleton "third"
- (GrafiteDisambiguator.disambiguate_obj ~dbd:(LibraryDb.instance ())
+ (CicDisambiguate.disambiguate_obj
+ ~lookup_in_library
+ ~mk_choice:cic_mk_choice
+ ~mk_implicit
+ ~description_of_alias:LexiconAst.description_of_alias
~aliases:lexicon_status.LexiconEngine.aliases
~universe:(Some lexicon_status.LexiconEngine.multi_aliases) ~uri
(text,prefix_len,obj)) in
+
+(*
+ let time = Unix.gettimeofday () -. time in
+ prerr_endline ("VECCHIA DISAMBIGUAZIONE: " ^ string_of_float time);
+ try_new cic;
+*)
+
+
let lexicon_status = LexiconEngine.set_proof_aliases lexicon_status diff in
lexicon_status, metasenv, cic
+
+(*
+ with
+ | Sys.Break as exn -> raise exn
+ | exn ->
+ try_new (Cic.InductiveDefinition ([],[],0,[]));
+ raise exn
+*)
+
+;;
let disambiguate_command lexicon_status ?baseuri metasenv (text,prefix_len,cmd)=
match cmd with
| GrafiteAst.Index(loc,key,uri) ->
let lexicon_status_ref = ref lexicon_status in
let disambiguate_term =
- disambiguate_term text prefix_len lexicon_status_ref [] in
+ disambiguate_term None text prefix_len lexicon_status_ref [] in
let disambiguate_term_option metasenv =
function
None -> metasenv,None
| GrafiteAst.Coercion (loc,t,b,a,s) ->
let lexicon_status_ref = ref lexicon_status in
let disambiguate_term =
- disambiguate_term text prefix_len lexicon_status_ref [] in
+ disambiguate_term None text prefix_len lexicon_status_ref [] in
let metasenv,t = disambiguate_term metasenv t in
!lexicon_status_ref, metasenv, GrafiteAst.Coercion (loc,t,b,a,s)
+ | GrafiteAst.UnificationHint (loc, t) ->
+ let lexicon_status_ref = ref lexicon_status in
+ let disambiguate_term =
+ disambiguate_term None text prefix_len lexicon_status_ref [] in
+ let metasenv,t = disambiguate_term metasenv t in
+ !lexicon_status_ref, metasenv, GrafiteAst.UnificationHint (loc,t)
| GrafiteAst.Default _
| GrafiteAst.Drop _
| GrafiteAst.Include _
| GrafiteAst.Relation (loc,id,a,aeq,refl,sym,trans) ->
let lexicon_status_ref = ref lexicon_status in
let disambiguate_term =
- disambiguate_term text prefix_len lexicon_status_ref [] in
+ disambiguate_term None text prefix_len lexicon_status_ref [] in
let disambiguate_term_option metasenv =
function
None -> metasenv,None
let disambiguate_macro
lexicon_status_ref metasenv context (text,prefix_len, macro)
=
- let disambiguate_term = disambiguate_term text prefix_len lexicon_status_ref in
+ let disambiguate_term = disambiguate_term None text prefix_len lexicon_status_ref in
+ let disambiguate_reduction_kind =
+ disambiguate_reduction_kind text prefix_len lexicon_status_ref in
match macro with
| GrafiteAst.WMatch (loc,term) ->
let metasenv,term = disambiguate_term context metasenv term in
| GrafiteAst.Check (loc,term) ->
let metasenv,term = disambiguate_term context metasenv term in
metasenv,GrafiteAst.Check (loc,term)
+ | GrafiteAst.Eval (loc,kind,term) ->
+ let metasenv, term = disambiguate_term context metasenv term in
+ let kind = disambiguate_reduction_kind kind in
+ metasenv,GrafiteAst.Eval (loc,kind,term)
| GrafiteAst.AutoInteractive (loc, params) ->
let metasenv, params =
disambiguate_auto_params disambiguate_term metasenv context params in
projects / helm.git / blobdiff