X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaScript.ml;h=4c53f113bd9d0db4b7707d628a320be84f00dee8;hb=f7aedf0ebd0fb55d3587db4f0753521927dcbb69;hp=469676fa7601121a20daddf07bf26b7bad799762;hpb=aa0d60227b785da3355b31519ba11cb4fbd2c925;p=helm.git diff --git a/helm/matita/matitaScript.ml b/helm/matita/matitaScript.ml index 469676fa7..4c53f113b 100644 --- a/helm/matita/matitaScript.ml +++ b/helm/matita/matitaScript.ml @@ -35,6 +35,7 @@ let debug_print = if debug then prerr_endline else ignore (** raised when one of the script margins (top or bottom) is reached *) exception Margin +exception NoUnfinishedProof let safe_substring s i j = try String.sub s i j with Invalid_argument _ -> assert false @@ -78,21 +79,7 @@ let eval_with_engine guistuff lexicon_status grafite_status user_goal parsed_text st = let module TAPp = GrafiteAstPp in - let include_ = - match guistuff.filenamedata with - | None,None -> [] - | None,Some devel -> [MatitamakeLib.root_for_development devel ] - | Some f,_ -> - match MatitamakeLib.development_for_dir (Filename.dirname f) with - | None -> [] - | Some devel -> [MatitamakeLib.root_for_development devel ] - in - let include_ = - include_ @ (Helm_registry.get_list Helm_registry.string "matita.includes") - in let parsed_text_length = String.length parsed_text in - let loc, ex = - match st with TA.Executable (loc,ex) -> loc, ex | _ -> assert false in let initial_space,parsed_text = try let pieces = Pcre.extract ~rex:heading_nl_RE' parsed_text in @@ -102,7 +89,9 @@ let eval_with_engine guistuff lexicon_status grafite_status user_goal let inital_space,new_grafite_status,new_lexicon_status,new_status_and_text_list' = (* the code commented out adds the "select" command if needed *) initial_space,grafite_status,lexicon_status,[] in -(* match grafite_status.proof_status with +(* let loc, ex = + match st with TA.Executable (loc,ex) -> loc, ex | _ -> assert false in + match grafite_status.proof_status with | Incomplete_proof { stack = stack } when not (List.mem user_goal (Continuationals.head_goals stack)) -> let grafite_status = @@ -214,7 +203,7 @@ let pp_eager_statement_ast = GrafiteAstPp.pp_statement ~term_pp:CicNotationPp.pp_term ~lazy_term_pp:(fun _ -> assert false) ~obj_pp:(fun _ -> assert false) -let rec eval_macro (buffer : GText.buffer) guistuff lexicon_status grafite_status user_goal unparsed_text parsed_text script mac = +let rec eval_macro include_paths (buffer : GText.buffer) guistuff lexicon_status grafite_status user_goal unparsed_text parsed_text script mac = let module TAPp = GrafiteAstPp in let module MQ = MetadataQuery in let module MDB = LibraryDb in @@ -264,8 +253,13 @@ let rec eval_macro (buffer : GText.buffer) guistuff lexicon_status grafite_statu [], parsed_text_length (* REAL macro *) | TA.Hint loc -> + let user_goal' = + match user_goal with + Some n -> n + | None -> raise NoUnfinishedProof + in let proof = GrafiteTypes.get_current_proof grafite_status in - let proof_status = proof,user_goal 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 (match selected with @@ -284,8 +278,8 @@ let rec eval_macro (buffer : GText.buffer) guistuff lexicon_status grafite_statu let loc = HExtlib.floc_of_loc (0,text_len) in let statement = `Ast (GrafiteParser.LSome (ast loc),text) in let res,_parsed_text_len = - eval_statement buffer guistuff lexicon_status grafite_status - user_goal script statement + eval_statement include_paths buffer guistuff lexicon_status + grafite_status user_goal script statement in (* we need to replace all the parsed_text *) res,String.length parsed_text @@ -298,7 +292,10 @@ let rec eval_macro (buffer : GText.buffer) guistuff lexicon_status grafite_statu assert false) | TA.Check (_,term) -> let metasenv = GrafiteTypes.get_proof_metasenv grafite_status in - let context = GrafiteTypes.get_proof_context grafite_status user_goal in + let context = + match user_goal with + None -> [] + | Some n -> GrafiteTypes.get_proof_context grafite_status n in let ty,_ = CTC.type_of_aux' metasenv context term CicUniv.empty_ugraph in let t_and_ty = Cic.Cast (term,ty) in guistuff.mathviewer#show_entry (`Cic (t_and_ty,metasenv)); @@ -309,7 +306,7 @@ let rec eval_macro (buffer : GText.buffer) guistuff lexicon_status grafite_statu | TA.Search_pat (_, search_kind, str) -> failwith "not implemented" | TA.Search_term (_, search_kind, term) -> failwith "not implemented" -and eval_executable (buffer : GText.buffer) guistuff lexicon_status grafite_status user_goal unparsed_text parsed_text script loc ex +and eval_executable include_paths (buffer : GText.buffer) guistuff lexicon_status grafite_status user_goal unparsed_text parsed_text script loc ex = let module TAPp = GrafiteAstPp in let module MD = GrafiteDisambiguator in @@ -340,11 +337,15 @@ and eval_executable (buffer : GText.buffer) guistuff lexicon_status grafite_stat with MatitaTypes.Cancel -> [], 0 | GrafiteEngine.Macro (_loc,lazy_macro) -> - let grafite_status,macro = lazy_macro user_goal in - eval_macro buffer guistuff lexicon_status grafite_status user_goal - unparsed_text parsed_text script macro - -and eval_statement (buffer : GText.buffer) guistuff lexicon_status + let context = + match user_goal with + None -> [] + | Some n -> GrafiteTypes.get_proof_context grafite_status n in + let grafite_status,macro = lazy_macro context in + eval_macro include_paths buffer guistuff lexicon_status grafite_status + user_goal unparsed_text parsed_text script macro + +and eval_statement include_paths (buffer : GText.buffer) guistuff lexicon_status grafite_status user_goal script statement = let (lexicon_status,st), unparsed_text = @@ -352,9 +353,7 @@ and eval_statement (buffer : GText.buffer) guistuff lexicon_status | `Raw text -> if Pcre.pmatch ~rex:only_dust_RE text then raise Margin; GrafiteParser.parse_statement (Ulexing.from_utf8_string text) - ~include_paths:(Helm_registry.get_list - Helm_registry.string "matita.includes") - lexicon_status, text + ~include_paths lexicon_status, text | `Ast (st, text) -> (lexicon_status, st), text in let text_of_loc loc = @@ -373,8 +372,8 @@ and eval_statement (buffer : GText.buffer) guistuff lexicon_status let s = String.sub unparsed_text parsed_text_length remain_len in let s,len = try - eval_statement buffer guistuff lexicon_status grafite_status user_goal - script (`Raw s) + eval_statement include_paths buffer guistuff lexicon_status + grafite_status user_goal script (`Raw s) with HExtlib.Localized (floc, exn) -> HExtlib.raise_localized_exception ~offset:parsed_text_length floc exn @@ -389,8 +388,8 @@ and eval_statement (buffer : GText.buffer) guistuff lexicon_status | [] -> [], 0) | GrafiteParser.LSome (GrafiteAst.Executable (loc, ex)) -> let parsed_text, parsed_text_length = text_of_loc loc in - eval_executable buffer guistuff lexicon_status grafite_status user_goal - unparsed_text parsed_text script loc ex + eval_executable include_paths buffer guistuff lexicon_status + grafite_status user_goal unparsed_text parsed_text script loc ex let fresh_script_id = let i = ref 0 in @@ -406,6 +405,7 @@ class script ~(source_view: GSourceView.source_view) let buffer = source_view#buffer in let source_buffer = source_view#source_buffer in let initial_statuses = + (* these include_paths are used only to load the initial notation *) let include_paths = Helm_registry.get_list Helm_registry.string "matita.includes" in let lexicon_status = @@ -415,6 +415,9 @@ let initial_statuses = grafite_status,lexicon_status in object (self) + val mutable include_paths = + Helm_registry.get_list Helm_registry.string "matita.includes" + val scriptId = fresh_script_id () val guistuff = { @@ -449,7 +452,7 @@ object (self) * Invariant: this list length is 1 + length of statements *) (** goal as seen by the user (i.e. metano corresponding to current tab) *) - val mutable userGoal = ~-1 + val mutable userGoal = None (** text mark and tag representing locked part of a script *) val locked_mark = @@ -467,33 +470,37 @@ object (self) method lexicon_status = match history with (_,ss)::_ -> ss | _ -> assert false method private _advance ?statement () = - let rec aux st = - let (entries, parsed_len) = - eval_statement buffer guistuff self#lexicon_status self#grafite_status - userGoal self st - in - let new_statuses, new_statements = - let statuses, texts = List.split entries in - statuses, texts - in - history <- new_statuses @ history; - statements <- new_statements @ statements; - let start = buffer#get_iter_at_mark (`MARK locked_mark) in - let new_text = String.concat "" (List.rev new_statements) in - if statement <> None then - buffer#insert ~iter:start new_text - else begin - let s = match st with `Raw s | `Ast (_, s) -> s in - if new_text <> String.sub s 0 parsed_len then begin - buffer#delete ~start ~stop:(start#copy#forward_chars parsed_len); - buffer#insert ~iter:start new_text; - end; - end; - self#moveMark (String.length new_text) - in - let s = match statement with Some s -> s | None -> self#getFuture in - HLog.debug ("evaluating: " ^ first_line s ^ " ..."); - (try aux (`Raw s) with End_of_file -> raise Margin) + let s = match statement with Some s -> s | None -> self#getFuture in + HLog.debug ("evaluating: " ^ first_line s ^ " ..."); + let (entries, parsed_len) = + try + eval_statement include_paths buffer guistuff self#lexicon_status + self#grafite_status userGoal self (`Raw s) + with End_of_file -> raise Margin + in + let new_statuses, new_statements = + let statuses, texts = List.split entries in + statuses, texts + in + history <- new_statuses @ history; + statements <- new_statements @ statements; + let start = buffer#get_iter_at_mark (`MARK locked_mark) in + let new_text = String.concat "" (List.rev new_statements) in + if statement <> None then + buffer#insert ~iter:start new_text + else begin + if new_text <> String.sub s 0 parsed_len then begin + buffer#delete ~start ~stop:(start#copy#forward_chars parsed_len); + buffer#insert ~iter:start new_text; + end; + end; + self#moveMark (String.length new_text); + (* here we need to set the Goal in case we are going to cursor (or to + bottom) and we will face a macro *) + match self#grafite_status.proof_status with + Incomplete_proof p -> + userGoal <- Some (Continuationals.Stack.find_goal p.stack) + | _ -> userGoal <- None method private _retract offset lexicon_status grafite_status new_statements new_history @@ -581,8 +588,17 @@ object (self) method assignFileName file = let abspath = MatitaMisc.absolute_path file in - let devel = MatitamakeLib.development_for_dir (Filename.dirname abspath) in - guistuff.filenamedata <- Some abspath, devel + let dirname = Filename.dirname abspath in + let devel = MatitamakeLib.development_for_dir dirname in + guistuff.filenamedata <- Some abspath, devel; + let include_ = + match MatitamakeLib.development_for_dir dirname with + None -> [] + | Some devel -> [MatitamakeLib.root_for_development devel] in + let include_ = + include_ @ (Helm_registry.get_list Helm_registry.string "matita.includes") + in + include_paths <- include_ method saveToFile () = let oc = open_out self#getFilename in @@ -618,7 +634,7 @@ object (self) method private reset_buffer = statements <- []; history <- [ initial_statuses ]; - userGoal <- ~-1; + userGoal <- None; self#notify; buffer#remove_tag locked_tag ~start:buffer#start_iter ~stop:buffer#end_iter; buffer#move_mark (`MARK locked_mark) ~where:buffer#start_iter @@ -633,10 +649,19 @@ object (self) method template () = let template = HExtlib.input_file BuildTimeConf.script_template in buffer#insert ~iter:(buffer#get_iter `START) template; - guistuff.filenamedata <- - (None,MatitamakeLib.development_for_dir (Unix.getcwd ())); - buffer#set_modified false; - set_star (Filename.basename self#ppFilename) false + let development = MatitamakeLib.development_for_dir (Unix.getcwd ()) in + guistuff.filenamedata <- (None,development); + let include_ = + match development with + None -> [] + | Some devel -> [MatitamakeLib.root_for_development devel ] + in + let include_ = + include_ @ (Helm_registry.get_list Helm_registry.string "matita.includes") + in + include_paths <- include_ ; + buffer#set_modified false; + set_star (Filename.basename self#ppFilename) false method goto (pos: [`Top | `Bottom | `Cursor]) () = let old_locked_mark = @@ -727,10 +752,18 @@ object (self) (* method proofStatus = MatitaTypes.get_proof_status self#status *) method proofMetasenv = GrafiteTypes.get_proof_metasenv self#grafite_status + method proofContext = - GrafiteTypes.get_proof_context self#grafite_status userGoal + match userGoal with + None -> [] + | Some n -> GrafiteTypes.get_proof_context self#grafite_status n + method proofConclusion = - GrafiteTypes.get_proof_conclusion self#grafite_status userGoal + match userGoal with + None -> assert false + | Some n -> + GrafiteTypes.get_proof_conclusion self#grafite_status n + method stack = GrafiteTypes.get_stack self#grafite_status method setGoal n = userGoal <- n method goal = userGoal @@ -741,9 +774,7 @@ object (self) if Pcre.pmatch ~rex:only_dust_RE s then raise Margin; let lexicon_status,st = GrafiteParser.parse_statement (Ulexing.from_utf8_string s) - ~include_paths:(Helm_registry.get_list - Helm_registry.string "matita.includes") - lexicon_status + ~include_paths lexicon_status in match st with GrafiteParser.LNone loc