X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaEngine.ml;h=5919a7bfc696f0fa05f16accf153b0f55397dd84;hb=6857e22b8a58162893119f7747c5848031fd59ce;hp=95de73528cf8ba1b273002e395026d11c2935d59;hpb=94c9255e1f3095440f4d49ea1d75443a5a343185;p=helm.git diff --git a/helm/matita/matitaEngine.ml b/helm/matita/matitaEngine.ml index 95de73528..5919a7bfc 100644 --- a/helm/matita/matitaEngine.ml +++ b/helm/matita/matitaEngine.ml @@ -27,8 +27,8 @@ let tactic_of_ast = function | TacticAst.Assumption _ -> Tactics.assumption | TacticAst.Auto (_,depth,width) -> AutoTactic.auto_tac ?depth ?width ~dbd:(MatitaDb.instance ()) () - | TacticAst.Change (_, what, with_what, pattern) -> - Tactics.change ~what ~with_what ~pattern + | TacticAst.Change (_, pattern, with_what) -> + Tactics.change ~pattern with_what | TacticAst.Clear (_,id) -> Tactics.clear id | TacticAst.ClearBody (_,id) -> Tactics.clearbody id | TacticAst.Contradiction _ -> Tactics.contradiction @@ -46,7 +46,7 @@ let tactic_of_ast = function | TacticAst.Exact (_, term) -> Tactics.exact term | TacticAst.Exists _ -> Tactics.exists | TacticAst.Fail _ -> Tactics.fail - | TacticAst.Fold (_, reduction_kind ,term, pattern) -> + | TacticAst.Fold (_, reduction_kind, term, pattern) -> let reduction = match reduction_kind with | `Normalize -> CicReduction.normalize ~delta:false ~subst:[] @@ -54,13 +54,13 @@ let tactic_of_ast = function | `Simpl -> ProofEngineReduction.simpl | `Whd -> CicReduction.whd ~delta:false ~subst:[] in - Tactics.fold ~reduction ~pattern ~term + Tactics.fold ~reduction ~term ~pattern | TacticAst.Fourier _ -> Tactics.fourier - | TacticAst.FwdSimpl (_, term) -> - Tactics.fwd_simpl ~what:term ~dbd:(MatitaDb.instance ()) - | TacticAst.Generalize (_,term,ident,pat) -> + | TacticAst.FwdSimpl (_, hyp, names) -> + Tactics.fwd_simpl ~mk_fresh_name_callback:(namer_of names) ~dbd:(MatitaDb.instance ()) hyp + | TacticAst.Generalize (_,pattern,ident) -> let names = match ident with None -> [] | Some id -> [id] in - Tactics.generalize ~term ~mk_fresh_name_callback:(namer_of names) pat + Tactics.generalize ~mk_fresh_name_callback:(namer_of names) pattern | TacticAst.Goal (_, n) -> Tactics.set_goal n | TacticAst.IdTac _ -> Tactics.id | TacticAst.Injection (_,term) -> Tactics.injection term @@ -69,9 +69,9 @@ let tactic_of_ast = function | TacticAst.Intros (_, Some num, names) -> PrimitiveTactics.intros_tac ~howmany:num ~mk_fresh_name_callback:(namer_of names) () - | TacticAst.LApply (_, to_what, what, ident) -> + | TacticAst.LApply (_, how_many, to_what, what, ident) -> let names = match ident with None -> [] | Some id -> [id] in - Tactics.lapply ~mk_fresh_name_callback:(namer_of names) ?to_what what + Tactics.lapply ~mk_fresh_name_callback:(namer_of names) ?how_many ~to_what what | TacticAst.Left _ -> Tactics.left | TacticAst.LetIn (loc,term,name) -> Tactics.letin term ~mk_fresh_name_callback:(namer_of [name]) @@ -84,11 +84,8 @@ let tactic_of_ast = function | TacticAst.Reflexivity _ -> Tactics.reflexivity | TacticAst.Replace (_, pattern, with_what) -> Tactics.replace ~pattern ~with_what - | TacticAst.Rewrite (_, dir, t, pattern) -> - if dir = `Left then - EqualityTactics.rewrite_tac ~where:pattern ~term:t () - else - EqualityTactics.rewrite_back_tac ~where:pattern ~term:t () + | TacticAst.Rewrite (_, direction, t, pattern) -> + EqualityTactics.rewrite_tac ~direction ~pattern t | TacticAst.Right _ -> Tactics.right | TacticAst.Ring _ -> Tactics.ring | TacticAst.Split _ -> Tactics.split @@ -135,18 +132,14 @@ let eval_coercion status coercion = match coercion with | Cic.Const (uri,_) | Cic.Var (uri,_) -> - let o,_ = - CicEnvironment.get_obj CicUniv.empty_ugraph uri - in + let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in (match o with | Cic.Constant (_,_,ty,_,_) | Cic.Variable (_,_,ty,_,_) -> uri,ty | _ -> assert false) | Cic.MutConstruct (uri,t,c,_) -> - let o,_ = - CicEnvironment.get_obj CicUniv.empty_ugraph uri - in + let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in (match o with | Cic.InductiveDefinition (l,_,_,_) -> let (_,_,_,cl) = List.nth l t in @@ -221,10 +214,30 @@ let generate_projections uri fields status = ("Unable to create projection " ^ name ^ " because it requires " ^ depend); status ) status projections + +(* to avoid a long list of recursive functions *) +let eval_from_stream_ref = ref (fun _ _ _ -> assert false);; let eval_command status cmd = match cmd with - | TacticAst.Set (loc, name, value) -> set_option status name value + | TacticAst.Default (loc, what, uris) as cmd -> + LibraryObjects.set_default what uris; + {status with moo_content_rev = + (TacticAstPp.pp_command cmd ^ "\n") :: status.moo_content_rev} + | TacticAst.Include (loc, path) -> + let path = MatitaMisc.obj_file_of_script path in + let stream = Stream.of_channel (open_in path) in + let status = ref status in + !eval_from_stream_ref status stream (fun _ _ -> ()); + !status + | TacticAst.Set (loc, name, value) -> + let value = + if name = "baseuri" then + MatitaMisc.strip_trailing_slash value + else + value + in + set_option status name value | TacticAst.Drop loc -> raise Drop | TacticAst.Qed loc -> let uri, metasenv, bo, ty = @@ -244,26 +257,31 @@ let eval_command status cmd = let obj = Cic.Constant (name,Some bo,ty,[],[]) in MatitaSync.add_obj uri obj status | TacticAst.Coercion (loc, coercion) -> - eval_coercion status coercion + let status = eval_coercion status coercion in + let moo_content_rev = + (TacticAstPp.pp_cic_command + (TacticAst.Coercion (CicAst.dummy_floc,coercion)) ^ ".\n") :: + status.moo_content_rev in + {status with moo_content_rev = moo_content_rev} | TacticAst.Alias (loc, spec) -> - (match spec with + let aliases = + match spec with | TacticAst.Ident_alias (id,uri) -> - {status with aliases = - DisambiguateTypes.Environment.add - (DisambiguateTypes.Id id) - ("boh?",(fun _ _ _ -> CicUtil.term_of_uri (UriManager.uri_of_string uri))) - status.aliases } + DisambiguateTypes.Environment.add + (DisambiguateTypes.Id id) + (uri,(fun _ _ _-> CicUtil.term_of_uri (UriManager.uri_of_string uri))) + status.aliases | TacticAst.Symbol_alias (symb, instance, desc) -> - {status with aliases = - DisambiguateTypes.Environment.add - (DisambiguateTypes.Symbol (symb,instance)) - (DisambiguateChoices.lookup_symbol_by_dsc symb desc) - status.aliases } + DisambiguateTypes.Environment.add + (DisambiguateTypes.Symbol (symb,instance)) + (DisambiguateChoices.lookup_symbol_by_dsc symb desc) + status.aliases | TacticAst.Number_alias (instance,desc) -> - {status with aliases = - DisambiguateTypes.Environment.add - (DisambiguateTypes.Num instance) - (DisambiguateChoices.lookup_num_by_dsc desc) status.aliases }) + DisambiguateTypes.Environment.add + (DisambiguateTypes.Num instance) + (DisambiguateChoices.lookup_num_by_dsc desc) status.aliases + in + MatitaSync.set_proof_aliases status aliases | TacticAst.Obj (loc,obj) -> let ext,name = match obj with @@ -339,11 +357,8 @@ let disambiguate_term status term = | Intermediate _ -> Intermediate metasenv | Proof _ -> assert false in - let status = - { status with - aliases = aliases; - proof_status = proof_status } - in + let status = { status with proof_status = proof_status } in + let status = MatitaSync.set_proof_aliases status aliases in status, cic let disambiguate_obj status obj = @@ -369,21 +384,22 @@ let disambiguate_obj status obj = | Intermediate _ | Proof _ -> assert false in - let status = - { status with - aliases = aliases; - proof_status = proof_status } - in + let status = { status with proof_status = proof_status } in + let status = MatitaSync.set_proof_aliases status aliases in status, cic -let disambiguate_pattern aliases (hyp_paths ,goal_path) = - let interp path = Disambiguate.interpretate_path [] aliases path in - let goal_path = - match goal_path with - | None -> None - | Some path -> Some (interp path) in +let disambiguate_pattern status (wanted, hyp_paths, goal_path) = + let interp path = Disambiguate.interpretate_path [] status.aliases path in + let goal_path = interp goal_path in let hyp_paths = List.map (fun (name, path) -> name, interp path) hyp_paths in - (hyp_paths ,goal_path) + let status,wanted = + match wanted with + None -> status,None + | Some wanted -> + let status,wanted = disambiguate_term status wanted in + status, Some wanted + in + status, (wanted, hyp_paths ,goal_path) let disambiguate_tactic status = function | TacticAst.Apply (loc, term) -> @@ -394,11 +410,10 @@ let disambiguate_tactic status = function status, TacticAst.Absurd (loc, cic) | TacticAst.Assumption loc -> status, TacticAst.Assumption loc | TacticAst.Auto (loc,depth,width) -> status, TacticAst.Auto (loc,depth,width) - | TacticAst.Change (loc, what, with_what, pattern) -> - let status, cic1 = disambiguate_term status what in - let status, cic2 = disambiguate_term status with_what in - let pattern = disambiguate_pattern status.aliases pattern in - status, TacticAst.Change (loc, cic1, cic2, pattern) + | TacticAst.Change (loc, pattern, with_what) -> + let status, with_what = disambiguate_term status with_what in + let status, pattern = disambiguate_pattern status pattern in + status, TacticAst.Change (loc, pattern, with_what) | TacticAst.Clear (loc,id) -> status,TacticAst.Clear (loc,id) | TacticAst.ClearBody (loc,id) -> status,TacticAst.ClearBody (loc,id) | TacticAst.Compare (loc,term) -> @@ -435,17 +450,15 @@ let disambiguate_tactic status = function | TacticAst.Exists loc -> status, TacticAst.Exists loc | TacticAst.Fail loc -> status,TacticAst.Fail loc | TacticAst.Fold (loc,reduction_kind, term, pattern) -> + let status, pattern = disambiguate_pattern status pattern in let status, term = disambiguate_term status term in - let pattern = disambiguate_pattern status.aliases pattern in status, TacticAst.Fold (loc,reduction_kind, term, pattern) - | TacticAst.FwdSimpl (loc, term) -> - let status, term = disambiguate_term status term in - status, TacticAst.FwdSimpl (loc, term) + | TacticAst.FwdSimpl (loc, hyp, names) -> + status, TacticAst.FwdSimpl (loc, hyp, names) | TacticAst.Fourier loc -> status, TacticAst.Fourier loc - | TacticAst.Generalize (loc,term,ident,pattern) -> - let status,term = disambiguate_term status term in - let pattern = disambiguate_pattern status.aliases pattern in - status, TacticAst.Generalize(loc,term,ident,pattern) + | TacticAst.Generalize (loc,pattern,ident) -> + let status, pattern = disambiguate_pattern status pattern in + status, TacticAst.Generalize(loc,pattern,ident) | TacticAst.Goal (loc, g) -> status, TacticAst.Goal (loc, g) | TacticAst.IdTac loc -> status,TacticAst.IdTac loc | TacticAst.Injection (loc,term) -> @@ -453,31 +466,29 @@ let disambiguate_tactic status = function status, TacticAst.Injection (loc,term) | TacticAst.Intros (loc, num, names) -> status, TacticAst.Intros (loc, num, names) - | TacticAst.LApply (loc, to_what, what, ident) -> - let status, to_what = - match to_what with - None -> status,None - | Some to_what -> - let status, to_what = disambiguate_term status to_what in - status, Some to_what + | TacticAst.LApply (loc, depth, to_what, what, ident) -> + let f term (status, to_what) = + let status, term = disambiguate_term status term in + status, term :: to_what in + let status, to_what = List.fold_right f to_what (status, []) in let status, what = disambiguate_term status what in - status, TacticAst.LApply (loc, to_what, what, ident) + status, TacticAst.LApply (loc, depth, to_what, what, ident) | TacticAst.Left loc -> status, TacticAst.Left loc | TacticAst.LetIn (loc, term, name) -> let status, term = disambiguate_term status term in status, TacticAst.LetIn (loc,term,name) | TacticAst.Reduce (loc, reduction_kind, pattern) -> - let pattern = disambiguate_pattern status.aliases pattern in + let status, pattern = disambiguate_pattern status pattern in status, TacticAst.Reduce(loc, reduction_kind, pattern) | TacticAst.Reflexivity loc -> status, TacticAst.Reflexivity loc | TacticAst.Replace (loc, pattern, with_what) -> - let pattern = disambiguate_pattern status.aliases pattern in + let status, pattern = disambiguate_pattern status pattern in let status, with_what = disambiguate_term status with_what in status, TacticAst.Replace (loc, pattern, with_what) | TacticAst.Rewrite (loc, dir, t, pattern) -> let status, term = disambiguate_term status t in - let pattern = disambiguate_pattern status.aliases pattern in + let status, pattern = disambiguate_pattern status pattern in status, TacticAst.Rewrite (loc, dir, term, pattern) | TacticAst.Right loc -> status, TacticAst.Right loc | TacticAst.Ring loc -> status, TacticAst.Ring loc @@ -525,12 +536,14 @@ and disambiguate_tacticals status tacticals = status, tacticals let disambiguate_command status = function + | TacticAst.Default _ + | TacticAst.Alias _ + | TacticAst.Include _ as cmd -> status,cmd | TacticAst.Coercion (loc, term) -> let status, term = disambiguate_term status term in status, TacticAst.Coercion (loc,term) | (TacticAst.Set _ | TacticAst.Qed _ | TacticAst.Drop _ ) as cmd -> status, cmd - | TacticAst.Alias _ as x -> status, x | TacticAst.Obj (loc,obj) -> let status,obj = disambiguate_obj status obj in status, TacticAst.Obj (loc,obj) @@ -570,8 +583,13 @@ let eval_ast status ast = let eval_from_stream status str cb = let stl = CicTextualParser2.parse_statements str in - List.iter (fun ast -> cb !status ast;status := eval_ast !status ast) stl + List.iter + (fun ast -> cb !status ast;status := eval_ast !status ast) stl +;; +(* to avoid a long list of recursive functions *) +eval_from_stream_ref := eval_from_stream;; + let eval_from_stream_greedy status str cb = while true do print_string "matita> "; @@ -580,27 +598,31 @@ let eval_from_stream_greedy status str cb = cb !status ast; status := eval_ast !status ast done - +;; + let eval_string status str = eval_from_stream status (Stream.of_string str) (fun _ _ -> ()) let default_options () = +(* let options = StringMap.add "baseuri" (String (Helm_registry.get "matita.baseuri" ^ Helm_registry.get "matita.owner")) no_options in +*) let options = StringMap.add "basedir" (String (Helm_registry.get "matita.basedir" )) - options + no_options in options let initial_status = lazy { aliases = DisambiguateTypes.empty_environment; + moo_content_rev = []; proof_status = No_proof; options = default_options (); objects = [];