(Cic.term, Cic.lazy_term, Cic.lazy_term GrafiteAst.reduction, string)
GrafiteAst.tactic
-let singleton = function
+let singleton msg = function
| [x], _ -> x
- | _ -> assert false
+ | l, _ ->
+ let debug =
+ Printf.sprintf "GrafiteDisambiguate.singleton (%s): %u interpretations"
+ msg (List.length l)
+ in
+ HLog.debug debug; assert false
+
+
+let lookup_in_library interactive_user_uri_choice input_or_locate_uri item =
+ let dbd = LibraryDb.instance () in
+ let choices_of_id id =
+ let uris = Whelp.locate ~dbd id in
+ let uris =
+ 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
+ List.map
+ (fun uri ->
+ (UriManager.string_of_uri uri,
+ let term =
+ try
+ CicUtil.term_of_uri uri
+ with exn ->
+ assert false
+ in
+ fun _ _ _ -> term))
+ uris
+ in
+ match item with
+ | DisambiguateTypes.Id id -> choices_of_id id
+ | DisambiguateTypes.Symbol (symb, _) ->
+ (try
+ List.map DisambiguateChoices.mk_choice
+ (TermAcicContent.lookup_interpretations symb)
+ with
+ TermAcicContent.Interpretation_not_found -> [])
+ | DisambiguateTypes.Num instance ->
+ DisambiguateChoices.lookup_num_choices ()
;;
(** @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, _) =
- singleton
- (GrafiteDisambiguator.disambiguate_term ~dbd:(LibraryDb.instance ())
+ let (diff, metasenv, subst, cic, _) =
+ singleton "first"
+ (GrafiteDisambiguator.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
+ ~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) =
- singleton
- (GrafiteDisambiguator.disambiguate_term ~dbd:(LibraryDb.instance ())
+ let (diff, metasenv, _, cic, ugraph) =
+ singleton "second"
+ (GrafiteDisambiguator.disambiguate_term ~lookup_in_library
~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;
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
- | `Reduce
| `Simpl
| `Unfold None
| `Whd as kind -> kind
;;
+let disambiguate_auto_params
+ disambiguate_term metasenv context (terms, params)
+=
+ let metasenv, terms =
+ List.fold_right
+ (fun t (metasenv, terms) ->
+ let metasenv,t = disambiguate_term context metasenv t in
+ metasenv,t::terms) terms (metasenv, [])
+ in
+ metasenv, (terms, params)
+;;
+
+let disambiguate_just disambiguate_term context metasenv =
+ function
+ `Term t ->
+ let metasenv,t = disambiguate_term context metasenv t in
+ metasenv, `Term t
+ | `Auto params ->
+ let metasenv,params = disambiguate_auto_params disambiguate_term metasenv
+ context params
+ in
+ metasenv, `Auto params
+;;
+
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
in
match tactic with
(* Higher order tactics *)
| 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)
| GrafiteAst.ApplyS (loc, term, params) ->
+ let metasenv, params = disambiguate_auto_params metasenv params in
let metasenv,cic = disambiguate_term context metasenv term in
metasenv,GrafiteAst.ApplyS (loc, cic, params)
| GrafiteAst.Assumption loc ->
metasenv,GrafiteAst.Assumption loc
| GrafiteAst.AutoBatch (loc,params) ->
+ let metasenv, params = disambiguate_auto_params metasenv params in
metasenv,GrafiteAst.AutoBatch (loc,params)
- | GrafiteAst.Cases (loc, what, idents) ->
+ | GrafiteAst.Cases (loc, what, pattern, idents) ->
let metasenv,what = disambiguate_term context metasenv what in
- metasenv,GrafiteAst.Cases (loc, what, idents)
+ let pattern = disambiguate_pattern pattern in
+ metasenv,GrafiteAst.Cases (loc, what, pattern, idents)
| GrafiteAst.Change (loc, pattern, with_what) ->
let with_what = disambiguate_lazy_term with_what in
let pattern = disambiguate_pattern pattern in
metasenv,GrafiteAst.Cut (loc, ident, cic)
| GrafiteAst.Decompose (loc, names) ->
metasenv,GrafiteAst.Decompose (loc, names)
- | GrafiteAst.Demodulate loc ->
- metasenv,GrafiteAst.Demodulate loc
+ | GrafiteAst.Demodulate (loc, params) ->
+ let metasenv, params = disambiguate_auto_params metasenv params in
+ metasenv,GrafiteAst.Demodulate (loc, params)
| GrafiteAst.Destruct (loc, Some terms) ->
let map term (metasenv, terms) =
let metasenv, term = disambiguate_term context metasenv term in
let metasenv,t = disambiguate_term context metasenv t in
metasenv,Some t in
metasenv,GrafiteAst.Suppose (loc, cic, id, cic')
- | GrafiteAst.Bydone (loc,term) ->
- let metasenv,cic =
- match term with
- None -> metasenv,None
- |Some t ->
- let metasenv,t = disambiguate_term context metasenv t in
- metasenv,Some t in
- metasenv,GrafiteAst.Bydone (loc, cic)
+ | GrafiteAst.Bydone (loc,just) ->
+ let metasenv,just =
+ disambiguate_just disambiguate_term context metasenv just
+ in
+ metasenv,GrafiteAst.Bydone (loc, just)
| GrafiteAst.We_need_to_prove (loc,term,id,term') ->
let metasenv,cic = disambiguate_term context metasenv term in
let metasenv,cic' =
let metasenv,t = disambiguate_term context metasenv t in
metasenv,Some t in
metasenv,GrafiteAst.We_need_to_prove (loc,cic,id,cic')
- | GrafiteAst.By_term_we_proved (loc,term,term',id,term'') ->
- let metasenv,cic =
- match term with
- None -> metasenv,None
- | Some t ->
- let metasenv,t = disambiguate_term context metasenv t in
- metasenv,Some t in
+ | GrafiteAst.By_just_we_proved (loc,just,term',id,term'') ->
+ let metasenv,just =
+ disambiguate_just disambiguate_term context metasenv just in
let metasenv,cic' = disambiguate_term context metasenv term' in
let metasenv,cic'' =
match term'' with
| Some t ->
let metasenv,t = disambiguate_term context metasenv t in
metasenv,Some t in
- metasenv,GrafiteAst.By_term_we_proved (loc,cic,cic',id,cic'')
+ metasenv,GrafiteAst.By_just_we_proved (loc,just,cic',id,cic'')
| GrafiteAst.We_proceed_by_cases_on (loc, term, term') ->
let metasenv,cic = disambiguate_term context metasenv term in
let metasenv,cic' = disambiguate_term context metasenv term' in
| GrafiteAst.Thesisbecomes (loc, term) ->
let metasenv,cic = disambiguate_term context metasenv term in
metasenv,GrafiteAst.Thesisbecomes (loc, cic)
- | GrafiteAst.ExistsElim (loc, term, id1, term1, id2, term2) ->
- let metasenv,cic =
- match term with
- None -> metasenv,None
- | Some t ->
- let metasenv,t = disambiguate_term context metasenv t in
- metasenv,Some t in
+ | GrafiteAst.ExistsElim (loc, just, id1, term1, id2, term2) ->
+ let metasenv,just =
+ disambiguate_just disambiguate_term context metasenv just in
let metasenv,cic' = disambiguate_term context metasenv term1 in
let cic''= disambiguate_lazy_term term2 in
- metasenv,GrafiteAst.ExistsElim(loc, cic, id1, cic', id2, cic'')
- | GrafiteAst.AndElim (loc, term, id, term1, id1, term2) ->
- let metasenv,cic = disambiguate_term context metasenv term in
+ metasenv,GrafiteAst.ExistsElim(loc, just, id1, cic', id2, cic'')
+ | GrafiteAst.AndElim (loc, just, id, term1, id1, term2) ->
+ let metasenv,just =
+ disambiguate_just disambiguate_term context metasenv just in
let metasenv,cic'= disambiguate_term context metasenv term1 in
let metasenv,cic''= disambiguate_term context metasenv term2 in
- metasenv,GrafiteAst.AndElim(loc, cic, id, cic', id1, cic'')
+ metasenv,GrafiteAst.AndElim(loc, just, id, cic', id1, cic'')
| GrafiteAst.Case (loc, id, params) ->
let metasenv,params' =
List.fold_right
let metasenv,cic'= disambiguate_term context metasenv term2 in
let metasenv,cic'' =
match term3 with
- `Auto _ as t -> metasenv,t
+ | `SolveWith term ->
+ let metasenv,term = disambiguate_term context metasenv term in
+ metasenv, `SolveWith term
+ | `Auto params ->
+ let metasenv, params = disambiguate_auto_params metasenv params in
+ metasenv,`Auto params
| `Term t ->
let metasenv,t = disambiguate_term context metasenv t in
metasenv,`Term t
metasenv,GrafiteAst.RewritingStep (loc, cic, cic', cic'', cont)
-let disambiguate_obj lexicon_status ~baseuri metasenv (text,prefix_len,obj) =
+let disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj) =
let uri =
match obj with
| CicNotationPt.Inductive (_,(name,_,_,_)::_)
| None -> raise BaseUriNotSetYet)
| CicNotationPt.Inductive _ -> assert false
| CicNotationPt.Theorem _ -> None in
- let (diff, metasenv, cic, _) =
- singleton
- (GrafiteDisambiguator.disambiguate_obj ~dbd:(LibraryDb.instance ())
+ let (diff, metasenv, _, cic, _) =
+ singleton "third"
+ (GrafiteDisambiguator.disambiguate_obj ~lookup_in_library
~aliases:lexicon_status.LexiconEngine.aliases
~universe:(Some lexicon_status.LexiconEngine.multi_aliases) ~uri
(text,prefix_len,obj)) in
let lexicon_status = LexiconEngine.set_proof_aliases lexicon_status diff in
lexicon_status, metasenv, cic
-let disambiguate_command lexicon_status ~baseuri metasenv (text,prefix_len,cmd)=
+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
in
let metasenv,key = disambiguate_term_option metasenv key in
!lexicon_status_ref, metasenv,GrafiteAst.Index(loc,key,uri)
- | GrafiteAst.Coercion _
+ | GrafiteAst.Coercion (loc,t,b,a,s) ->
+ 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.Coercion (loc,t,b,a,s)
| GrafiteAst.Default _
| GrafiteAst.Drop _
| GrafiteAst.Include _
lexicon_status,metasenv,cmd
| GrafiteAst.Obj (loc,obj) ->
let lexicon_status,metasenv,obj =
- disambiguate_obj lexicon_status ~baseuri metasenv (text,prefix_len,obj)in
+ disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj)in
lexicon_status, metasenv, GrafiteAst.Obj (loc,obj)
| 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.AutoInteractive _
+ | 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
+ metasenv, GrafiteAst.AutoInteractive (loc, params)
| GrafiteAst.Hint _
| GrafiteAst.WLocate _
| GrafiteAst.Inline _ as macro ->
projects / helm.git / blobdiff