X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_parser%2FgrafiteDisambiguate.ml;h=73e71c815f764e2f9a3f79933d4300c9c13da102;hb=8c4659819a1c1f2e450d9a588ecca37d95ae48e9;hp=fd1849760f986010be8a950833a5bf8eb47aca11;hpb=1acfe506c30e7fcc9d6e427d2523130c371a1159;p=helm.git diff --git a/helm/software/components/grafite_parser/grafiteDisambiguate.ml b/helm/software/components/grafite_parser/grafiteDisambiguate.ml index fd1849760..73e71c815 100644 --- a/helm/software/components/grafite_parser/grafiteDisambiguate.ml +++ b/helm/software/components/grafite_parser/grafiteDisambiguate.ml @@ -36,16 +36,20 @@ type lazy_tactic = (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 (** @param term not meaningful when context is given *) let disambiguate_term text prefix_len lexicon_status_ref context metasenv term = let lexicon_status = !lexicon_status_ref in let (diff, metasenv, cic, _) = - singleton + singleton "first" (GrafiteDisambiguator.disambiguate_term ~dbd:(LibraryDb.instance ()) ~aliases:lexicon_status.LexiconEngine.aliases ~universe:(Some lexicon_status.LexiconEngine.multi_aliases) @@ -65,7 +69,7 @@ let disambiguate_lazy_term text prefix_len lexicon_status_ref term = (fun context metasenv ugraph -> let lexicon_status = !lexicon_status_ref in let (diff, metasenv, cic, ugraph) = - singleton + singleton "second" (GrafiteDisambiguator.disambiguate_term ~dbd:(LibraryDb.instance ()) ~initial_ugraph:ugraph ~aliases:lexicon_status.LexiconEngine.aliases ~universe:(Some lexicon_status.LexiconEngine.multi_aliases) @@ -99,12 +103,35 @@ let disambiguate_reduction_kind text prefix_len lexicon_status_ref = function let t = disambiguate_lazy_term 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) = @@ -118,6 +145,9 @@ let rec disambiguate_tactic disambiguate_lazy_term text prefix_len lexicon_status_ref in let disambiguate_tactic metasenv tac = disambiguate_tactic lexicon_status_ref context metasenv (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 *) @@ -178,12 +208,14 @@ let rec disambiguate_tactic let metasenv,cic = disambiguate_term context metasenv term in metasenv,GrafiteAst.Apply (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.Auto (loc,params) -> - metasenv,GrafiteAst.Auto (loc,params) + | GrafiteAst.AutoBatch (loc,params) -> + let metasenv, params = disambiguate_auto_params metasenv params in + metasenv,GrafiteAst.AutoBatch (loc,params) | GrafiteAst.Cases (loc, what, idents) -> let metasenv,what = disambiguate_term context metasenv what in metasenv,GrafiteAst.Cases (loc, what, idents) @@ -195,6 +227,16 @@ let rec disambiguate_tactic metasenv,GrafiteAst.Clear (loc,id) | GrafiteAst.ClearBody (loc,id) -> metasenv,GrafiteAst.ClearBody (loc,id) + | GrafiteAst.Compose (loc, t1, t2, times, spec) -> + let metasenv,t1 = disambiguate_term context metasenv t1 in + let metasenv,t2 = + match t2 with + | None -> metasenv, None + | Some t2 -> + let m, t2 = disambiguate_term context metasenv t2 in + m, Some t2 + in + metasenv, GrafiteAst.Compose (loc, t1, t2, times, spec) | GrafiteAst.Constructor (loc,n) -> metasenv,GrafiteAst.Constructor (loc,n) | GrafiteAst.Contradiction loc -> @@ -204,11 +246,18 @@ let rec disambiguate_tactic metasenv,GrafiteAst.Cut (loc, ident, cic) | GrafiteAst.Decompose (loc, names) -> metasenv,GrafiteAst.Decompose (loc, names) - | GrafiteAst.Demodulate loc -> - metasenv,GrafiteAst.Demodulate loc - | GrafiteAst.Destruct (loc,term) -> - let metasenv,term = disambiguate_term context metasenv term in - metasenv,GrafiteAst.Destruct(loc,term) + | 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 + metasenv, term :: terms + in + let metasenv, terms = List.fold_right map terms (metasenv, []) in + metasenv, GrafiteAst.Destruct(loc, Some terms) + | GrafiteAst.Destruct (loc, None) -> + metasenv,GrafiteAst.Destruct(loc,None) | GrafiteAst.Exact (loc, term) -> let metasenv,cic = disambiguate_term context metasenv term in metasenv,GrafiteAst.Exact (loc, cic) @@ -252,12 +301,12 @@ let rec disambiguate_tactic let metasenv,term = disambiguate_term context metasenv term in metasenv,GrafiteAst.Inversion (loc, term) | GrafiteAst.LApply (loc, linear, depth, to_what, what, ident) -> - let f term to_what = - let metasenv,term = disambiguate_term context metasenv term in - term :: to_what + let f term (metasenv, to_what) = + let metasenv, term = disambiguate_term context metasenv term in + metasenv, term :: to_what in - let to_what = List.fold_right f to_what [] in - let metasenv,what = disambiguate_term context metasenv what in + let metasenv, to_what = List.fold_right f to_what (metasenv, []) in + let metasenv, what = disambiguate_term context metasenv what in metasenv,GrafiteAst.LApply (loc, linear, depth, to_what, what, ident) | GrafiteAst.Left loc -> metasenv,GrafiteAst.Left loc @@ -284,8 +333,6 @@ let rec disambiguate_tactic metasenv,GrafiteAst.Ring loc | GrafiteAst.Split loc -> metasenv,GrafiteAst.Split loc - | GrafiteAst.Subst loc -> - metasenv, GrafiteAst.Subst loc | GrafiteAst.Symmetry loc -> metasenv,GrafiteAst.Symmetry loc | GrafiteAst.Transitivity (loc, term) -> @@ -304,14 +351,11 @@ let rec disambiguate_tactic 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' = @@ -321,13 +365,9 @@ let rec disambiguate_tactic 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 @@ -335,7 +375,7 @@ let rec disambiguate_tactic | 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 @@ -350,21 +390,18 @@ let rec disambiguate_tactic | 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 @@ -384,14 +421,20 @@ let rec disambiguate_tactic 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 in + metasenv,`Term t + | `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 disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj) = let uri = match obj with | CicNotationPt.Inductive (_,(name,_,_,_)::_) @@ -403,7 +446,7 @@ let disambiguate_obj lexicon_status ~baseuri metasenv (text,prefix_len,obj) = | CicNotationPt.Inductive _ -> assert false | CicNotationPt.Theorem _ -> None in let (diff, metasenv, cic, _) = - singleton + singleton "third" (GrafiteDisambiguator.disambiguate_obj ~dbd:(LibraryDb.instance ()) ~aliases:lexicon_status.LexiconEngine.aliases ~universe:(Some lexicon_status.LexiconEngine.multi_aliases) ~uri @@ -411,7 +454,7 @@ let disambiguate_obj lexicon_status ~baseuri metasenv (text,prefix_len,obj) = 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 @@ -436,7 +479,7 @@ let disambiguate_command lexicon_status ~baseuri metasenv (text,prefix_len,cmd)= 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 @@ -477,6 +520,10 @@ let disambiguate_macro | GrafiteAst.Check (loc,term) -> let metasenv,term = disambiguate_term context metasenv term in metasenv,GrafiteAst.Check (loc,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 ->