*)
open Printf
-open MatitaTypes
+open GrafiteTypes
module TA = GrafiteAst
(* | Incomplete_proof { stack = stack }
when not (List.mem user_goal (Continuationals.head_goals stack)) ->
let status =
- MatitaEngine.eval_ast ~include_paths:include_
+ MatitaEngine.eval_ast
~do_heavy_checks:true status (goal_ast user_goal)
in
let initial_space = if initial_space = "" then "\n" else initial_space
initial_space ^ TAPp.pp_tactical (TA.Select (loc, [user_goal])) ] *)
| _ -> initial_space,status,[] in
let new_status =
- MatitaEngine.eval_ast
- ~include_paths:include_ ~do_heavy_checks:true new_status st
+ GrafiteEngine.eval_ast
+ ~baseuri_of_script:(GrafiteParserMisc.baseuri_of_script ~include_paths:include_)
+ ~disambiguate_tactic:GrafiteDisambiguate.disambiguate_tactic
+ ~disambiguate_command:GrafiteDisambiguate.disambiguate_command
+ ~do_heavy_checks:true new_status st
in
let new_aliases =
match ex with
let initial_space,status,new_status_and_text_list_rev =
let module DTE = DisambiguateTypes.Environment in
let module UM = UriManager in
+ let baseuri = GrafiteTypes.get_string_option new_status "baseuri" in
List.fold_left (
fun (initial_space,status,acc) (k,((v,_) as value)) ->
- let b =
- try
- let v = UM.strip_xpointer (UM.uri_of_string v) in
- List.exists (fun (s,_) -> s = v) new_status.objects
- with UM.IllFormedUri _ -> false
+ let b =
+ try
+ UM.buri_of_uri (UM.uri_of_string v) = baseuri
+ with
+ UriManager.IllFormedUri _ -> false (* v is a description, not a URI *)
in
if b then
initial_space,status,acc
try
eval_with_engine guistuff status user_goal parsed_text st
with
- | MatitaEngine.UnableToInclude what
- | MatitaEngine.IncludedFileNotCompiled what as exc ->
+ | GrafiteParserMisc.UnableToInclude what
+ | GrafiteEngine.IncludedFileNotCompiled what as exc ->
let compile_needed_and_go_on d =
let target = what in
let refresh_cb () =
let disambiguate_macro_term term status user_goal =
let module MD = MatitaDisambiguator in
- let dbd = MatitaDb.instance () in
- let metasenv = MatitaTypes.get_proof_metasenv status in
- let context = MatitaTypes.get_proof_context status user_goal in
+ let dbd = LibraryDb.instance () in
+ let metasenv = GrafiteTypes.get_proof_metasenv status in
+ let context = GrafiteTypes.get_proof_context status user_goal in
let interps =
MD.disambiguate_term ~dbd ~context ~metasenv ~aliases:status.aliases
~universe:(Some status.multi_aliases) term in
let eval_macro guistuff status user_goal unparsed_text parsed_text script mac =
let module TAPp = GrafiteAstPp in
let module MQ = MetadataQuery in
- let module MDB = MatitaDb in
+ let module MDB = LibraryDb in
let module CTC = CicTypeChecker in
let module CU = CicUniv in
(* no idea why ocaml wants this *)
let parsed_text_length = String.length parsed_text in
- let dbd = MatitaDb.instance () in
+ let dbd = LibraryDb.instance () in
match mac with
(* WHELP's stuff *)
| TA.WMatch (loc, term) ->
[], parsed_text_length
(* REAL macro *)
| TA.Hint loc ->
- let proof = MatitaTypes.get_current_proof status in
+ let proof = GrafiteTypes.get_current_proof status in
let proof_status = proof, user_goal in
let l = List.map fst (MQ.experimental_hint ~dbd proof_status) in
let selected = guistuff.urichooser l in
TA.Apply (loc, CicNotationPt.Uri (suri, None))),
Some (TA.Dot loc))))
in
- let new_status = MatitaEngine.eval_ast status ast in
+ let new_status =
+ GrafiteEngine.eval_ast
+ ~baseuri_of_script:(fun _ -> assert false)
+ ~disambiguate_tactic:GrafiteDisambiguate.disambiguate_tactic
+ ~disambiguate_command:GrafiteDisambiguate.disambiguate_command
+ status ast in
let extra_text =
comment parsed_text ^
"\n" ^ TAPp.pp_statement ast
in
[ new_status , (extra_text, ast) ], parsed_text_length
| _ ->
- MatitaLog.error
+ HLog.error
"The result of the urichooser should be only 1 uri, not:\n";
List.iter (
- fun u -> MatitaLog.error (UriManager.string_of_uri u ^ "\n")
+ fun u -> HLog.error (UriManager.string_of_uri u ^ "\n")
) selected;
assert false)
| TA.Check (_,term) ->
- let metasenv = MatitaTypes.get_proof_metasenv status in
- let context = MatitaTypes.get_proof_context status user_goal in
+ let metasenv = GrafiteTypes.get_proof_metasenv status in
+ let context = GrafiteTypes.get_proof_context status user_goal in
let interps =
MatitaDisambiguator.disambiguate_term ~dbd ~context ~metasenv
~aliases:status.aliases ~universe:(Some status.multi_aliases) term
=
let module TAPp = GrafiteAstPp in
let module MD = MatitaDisambiguator in
- let module ML = MatitacleanLib in
+ let module ML = MatitaMisc in
match ex with
| TA.Command (loc, _) | TA.Tactical (loc, _, _) ->
(try
- (match MatitaMisc.baseuri_of_baseuri_decl (TA.Executable (loc,ex)) with
+ (match GrafiteParserMisc.baseuri_of_baseuri_decl (TA.Executable (loc,ex)) with
| None -> ()
| Some u ->
- if not (MatitaMisc.is_empty u) then
+ if not (GrafiteMisc.is_empty u) then
match
guistuff.ask_confirmation
~title:"Baseuri redefinition"
"Do you want to redefine the corresponding "^
"part of the library?")
with
- | `YES -> MatitacleanLib.clean_baseuris [u]
+ | `YES ->
+ let basedir = Helm_registry.get "matita.basedir" in
+ LibraryClean.clean_baseuris ~basedir [u]
| `NO -> ()
| `CANCEL -> raise MatitaTypes.Cancel);
- eval_with_engine
- guistuff status user_goal parsed_text (TA.Executable (loc, ex))
+ eval_with_engine
+ guistuff status user_goal parsed_text (TA.Executable (loc, ex))
with MatitaTypes.Cancel -> [], 0)
| TA.Macro (_,mac) ->
eval_macro guistuff status user_goal unparsed_text parsed_text script mac
fun () -> incr i; !i
class script ~(source_view: GSourceView.source_view)
- ~(init: MatitaTypes.status)
+ ~(init: GrafiteTypes.status)
~(mathviewer: MatitaTypes.mathViewer)
~set_star
~ask_confirmation
*)
in
let s = match statement with Some s -> s | None -> self#getFuture in
- MatitaLog.debug ("evaluating: " ^ first_line s ^ " ...");
+ HLog.debug ("evaluating: " ^ first_line s ^ " ...");
(try aux (`Raw s) with End_of_file -> raise Margin)
method private _retract offset status new_statements new_history =
val mutable observers = []
- method addObserver (o: MatitaTypes.status -> unit) =
+ method addObserver (o: GrafiteTypes.status -> unit) =
observers <- o :: observers
method private notify =
output_string oc (buffer#get_text ~start:buffer#start_iter
~stop:buffer#end_iter ());
close_out oc;
- MatitaLog.debug ("backup " ^ f ^ " saved")
+ HLog.debug ("backup " ^ f ^ " saved")
end
method private goto_top =
| Intermediate _ -> assert false
(* method proofStatus = MatitaTypes.get_proof_status self#status *)
- method proofMetasenv = MatitaTypes.get_proof_metasenv self#status
- method proofContext = MatitaTypes.get_proof_context self#status userGoal
- method proofConclusion = MatitaTypes.get_proof_conclusion self#status userGoal
- method stack = MatitaTypes.get_stack self#status
+ method proofMetasenv = GrafiteTypes.get_proof_metasenv self#status
+ method proofContext = GrafiteTypes.get_proof_context self#status userGoal
+ method proofConclusion= GrafiteTypes.get_proof_conclusion self#status userGoal
+ method stack = GrafiteTypes.get_stack self#status
method setGoal n = userGoal <- n
method goal = userGoal
(* debug *)
method dump () =
- MatitaLog.debug "script status:";
- MatitaLog.debug ("history size: " ^ string_of_int (List.length history));
- MatitaLog.debug (sprintf "%d statements:" (List.length statements));
- List.iter MatitaLog.debug statements;
- MatitaLog.debug ("Current file name: " ^
+ HLog.debug "script status:";
+ HLog.debug ("history size: " ^ string_of_int (List.length history));
+ HLog.debug (sprintf "%d statements:" (List.length statements));
+ List.iter HLog.debug statements;
+ HLog.debug ("Current file name: " ^
(match guistuff.filenamedata with
|None,_ -> "[ no name ]"
| Some f,_ -> f));
projects / helm.git / blobdiff