X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaScript.ml;h=1bd4b9fd1226e35b503e8891959fc5aeb279c9f3;hb=6565cd51fb866a80838003cd65dc00e4d5a9814b;hp=811b1a858a4b98f873445d76ee4d247d08f8f834;hpb=db88f09dfd6da59000c93e2ea1ea8565ec8e101d;p=helm.git diff --git a/helm/matita/matitaScript.ml b/helm/matita/matitaScript.ml index 811b1a858..1bd4b9fd1 100644 --- a/helm/matita/matitaScript.ml +++ b/helm/matita/matitaScript.ml @@ -26,8 +26,8 @@ open Printf open MatitaTypes -let debug = true -let debug_print = if debug then prerr_endline else ignore +let debug = false +let debug_print = if debug then prerr_endline else ignore (** raised when one of the script margins (top or bottom) is reached *) exception Margin @@ -36,15 +36,16 @@ let safe_substring s i j = try String.sub s i j with Invalid_argument _ -> assert false let heading_nl_RE = Pcre.regexp "^\\s*\n\\s*" +let heading_nl_RE' = Pcre.regexp "^(\\s*\n\\s*)((.|\n)*)" let only_dust_RE = Pcre.regexp "^(\\s|\n|%%[^\n]*\n)*$" let multiline_RE = Pcre.regexp "^\n[^\n]+$" let newline_RE = Pcre.regexp "\n" let comment str = if Pcre.pmatch ~rex:multiline_RE str then - "\n(** " ^ (Pcre.replace ~rex:newline_RE str) ^ " **)" + "\n(** " ^ (Pcre.replace ~rex:newline_RE str) ^ " *)" else - "\n(**\n" ^ str ^ "\n**)" + "\n(**\n" ^ str ^ "\n*)" let first_line s = let s = Pcre.replace ~rex:heading_nl_RE s in @@ -53,12 +54,6 @@ let first_line s = String.sub s 0 nl_pos with Not_found -> s -let prepend_text header base = - if Pcre.pmatch ~rex:heading_nl_RE base then - sprintf "\n%s%s" header base - else - sprintf "\n%s\n%s" header base - (** creates a statement AST for the Goal tactic, e.g. "goal 7" *) let goal_ast n = let module A = GrafiteAst in @@ -87,33 +82,44 @@ let eval_with_engine guistuff status user_goal parsed_text st = 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 goal_changed = ref false in - let status = + 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 + pieces.(1), pieces.(2) + with + Not_found -> "", parsed_text in + (* we add the goal command if needed *) + let inital_space,new_status,new_status_and_text_list' = match status.proof_status with | Incomplete_proof (_, goal) when goal <> user_goal -> - goal_changed := true; + let status = MatitaEngine.eval_ast ~include_paths:include_ - ~do_heavy_checks:true status (goal_ast user_goal) - | _ -> status - in + ~do_heavy_checks:true status (goal_ast user_goal) in + let initial_space = + if initial_space = "" then "\n" else initial_space + in + "\n", status, + [status, initial_space ^ TAPp.pp_tactic (TA.Goal (loc, user_goal))] + | _ -> initial_space,status,[] in let new_status = MatitaEngine.eval_ast - ~include_paths:include_ ~do_heavy_checks:true status st + ~include_paths:include_ ~do_heavy_checks:true new_status st in let new_aliases = match ex with | TA.Command (_, TA.Alias _) - | TA.Command (_, TA.Include _) -> DisambiguateTypes.Environment.empty + | TA.Command (_, TA.Include _) + | TA.Command (_, TA.Interpretation _) -> + DisambiguateTypes.Environment.empty | _ -> MatitaSync.alias_diff ~from:status new_status in - (* we remove the defined object since we consider them "automathic aliases" *) - let new_aliases = + (* we remove the defined object since we consider them "automatic aliases" *) + let initial_space,status,new_status_and_text_list_rev = let module DTE = DisambiguateTypes.Environment in let module UM = UriManager in - DTE.fold ( - fun k ((v,_) as value) acc -> + DTE.fold_flatten ( + fun k ((v,_) as value) (initial_space,status,acc) -> let b = try let v = UM.strip_xpointer (UM.uri_of_string v) in @@ -121,33 +127,31 @@ let eval_with_engine guistuff status user_goal parsed_text st = with UM.IllFormedUri _ -> false in if b then - acc + initial_space,status,acc else - DTE.add k value acc - ) new_aliases DTE.empty + let new_text = + let initial_space = + if initial_space = "" then "\n" else initial_space in + initial_space ^ + DisambiguatePp.pp_environment(DTE.cons k value DTE.empty) in + let new_status = + {status with aliases = DTE.cons k value status.aliases} + in + "\n",new_status,((new_status, new_text)::acc) + ) new_aliases (initial_space,status,[]) in + let parsed_text = initial_space ^ parsed_text in + let res = + List.rev new_status_and_text_list_rev @ new_status_and_text_list' @ + [new_status, parsed_text] in - let new_text = - if DisambiguateTypes.Environment.is_empty new_aliases then - parsed_text - else - prepend_text (DisambiguatePp.pp_environment new_aliases) - parsed_text - in - let new_text = - if !goal_changed then - prepend_text - (TAPp.pp_tactic (TA.Goal (loc, user_goal))(* ^ "\n"*)) - new_text - else - new_text - in - [ new_status, new_text ], parsed_text_length + res,parsed_text_length let eval_with_engine guistuff status user_goal parsed_text st = try eval_with_engine guistuff status user_goal parsed_text st with - MatitaEngine.UnableToInclude what as exc -> + | MatitaEngine.UnableToInclude what + | MatitaEngine.IncludedFileNotCompiled what as exc -> let compile_needed_and_go_on d = let target = what in let refresh_cb () = @@ -171,7 +175,7 @@ let eval_with_engine guistuff status user_goal parsed_text st = | `NO -> raise exc | `CANCEL -> do_nothing ()) in - let handle_withoud_devel filename = + let handle_without_devel filename = let title = "Unable to include " ^ what in let message = what ^ " is not handled by a development.\n" ^ @@ -189,11 +193,11 @@ let eval_with_engine guistuff status user_goal parsed_text st = | `CANCEL -> do_nothing()) in match guistuff.filenamedata with - | None,None -> handle_withoud_devel None + | None,None -> handle_without_devel None | None,Some d -> handle_with_devel d | Some f,_ -> match MatitamakeLib.development_for_dir (Filename.dirname f) with - | None -> handle_withoud_devel (Some f) + | None -> handle_without_devel (Some f) | Some d -> handle_with_devel d ;; @@ -205,11 +209,10 @@ let disambiguate term status = let aliases = MatitaMisc.get_proof_aliases status in let interps = MD.disambiguate_term dbd context metasenv aliases term in match interps with - | [_,_,x,_] -> x + | [_,_,x,_], _ -> x | _ -> assert false -let eval_macro guistuff status parsed_text script mac -= +let eval_macro guistuff status unparsed_text parsed_text script mac = let module TA = GrafiteAst in let module TAPp = GrafiteAstPp in let module MQ = MetadataQuery in @@ -225,7 +228,11 @@ let eval_macro guistuff status parsed_text script mac | TA.WMatch (loc, term) -> let term = disambiguate term status in let l = MQ.match_term ~dbd term in - let entry = `Whelp (TAPp.pp_macro_cic (TA.WMatch (loc, term)), l) in + let query_url = + MatitaMisc.strip_suffix ~suffix:"." + (MatitaMisc.trim_blanks unparsed_text) + in + let entry = `Whelp (query_url, l) in guistuff.mathviewer#show_uri_list ~reuse:true ~entry l; [], parsed_text_length | TA.WInstance (loc, term) -> @@ -294,7 +301,7 @@ let eval_macro guistuff status parsed_text script mac in let _, metasenv , term, ugraph = match interps with - | [x] -> x + | [x], _ -> x | _ -> assert false in let ty,_ = CTC.type_of_aux' metasenv context term ugraph in @@ -324,7 +331,9 @@ let eval_macro guistuff status parsed_text script mac | TA.Search_term (_, search_kind, term) -> failwith "not implemented" -let eval_executable guistuff status user_goal parsed_text script ex = +let eval_executable guistuff status user_goal unparsed_text parsed_text script + ex += let module TA = GrafiteAst in let module TAPp = GrafiteAstPp in let module MD = MatitaDisambiguator in @@ -352,15 +361,15 @@ let eval_executable guistuff status user_goal parsed_text script ex = guistuff status user_goal parsed_text (TA.Executable (loc, ex)) with MatitaTypes.Cancel -> [], 0) | TA.Macro (_,mac) -> - eval_macro guistuff status parsed_text script mac + eval_macro guistuff status unparsed_text parsed_text script mac let rec eval_statement baseoffset parsedlen error_tag (buffer : GText.buffer) - guistuff status user_goal script s + guistuff status user_goal script unparsed_text = - if Pcre.pmatch ~rex:only_dust_RE s then raise Margin; + if Pcre.pmatch ~rex:only_dust_RE unparsed_text then raise Margin; let st = try - GrafiteParser.parse_statement (Stream.of_string s) + GrafiteParser.parse_statement (Stream.of_string unparsed_text) with CicNotationParser.Parse_error (floc,err) as exc -> let (x, y) = CicNotationPt.loc_of_floc floc in @@ -390,14 +399,14 @@ let rec eval_statement baseoffset parsedlen error_tag (buffer : GText.buffer) in let text_of_loc loc = let parsed_text_length = snd (CicNotationPt.loc_of_floc loc) in - let parsed_text = safe_substring s 0 parsed_text_length in + let parsed_text = safe_substring unparsed_text 0 parsed_text_length in parsed_text, parsed_text_length in match st with - | GrafiteAst.Comment (loc,_)-> + | GrafiteAst.Comment (loc, _) -> let parsed_text, parsed_text_length = text_of_loc loc in - let remain_len = String.length s - parsed_text_length in - let s = String.sub s parsed_text_length remain_len in + let remain_len = String.length unparsed_text - parsed_text_length in + let s = String.sub unparsed_text parsed_text_length remain_len in let s,len = eval_statement baseoffset (parsedlen + parsed_text_length) error_tag buffer guistuff status user_goal script s @@ -408,13 +417,14 @@ let rec eval_statement baseoffset parsedlen error_tag (buffer : GText.buffer) | [] -> [], 0) | GrafiteAst.Executable (loc, ex) -> let parsed_text, parsed_text_length = text_of_loc loc in - eval_executable guistuff status user_goal parsed_text script ex + eval_executable guistuff status user_goal unparsed_text parsed_text + script ex let fresh_script_id = let i = ref 0 in fun () -> incr i; !i -class script ~(view: GText.view) +class script ~(source_view: GSourceView.source_view) ~(init: MatitaTypes.status) ~(mathviewer: MatitaTypes.mathViewer) ~set_star @@ -422,7 +432,8 @@ class script ~(view: GText.view) ~urichooser ~develcreator () = -let buffer = view#buffer in +let buffer = source_view#buffer in +let source_buffer = source_view#source_buffer in object (self) val scriptId = fresh_script_id () @@ -467,6 +478,7 @@ object (self) val error_tag = buffer#create_tag [`UNDERLINE `SINGLE; `FOREGROUND "red"] method locked_mark = locked_mark + method locked_tag = locked_tag (* history can't be empty, the invariant above grant that it contains at * least the init status *) @@ -551,10 +563,10 @@ object (self) | _ -> () end ; let mark_position = buffer#get_iter_at_mark mark in - if view#move_mark_onscreen mark then + if source_view#move_mark_onscreen mark then begin buffer#move_mark mark mark_position; - view#scroll_to_mark ~use_align:true ~xalign:1.0 ~yalign:0.1 mark; + source_view#scroll_to_mark ~use_align:true ~xalign:1.0 ~yalign:0.1 mark; end; while Glib.Main.pending () do ignore(Glib.Main.iteration false); done @@ -610,7 +622,9 @@ object (self) method reset () = self#goto_top; + source_buffer#begin_not_undoable_action (); buffer#delete ~start:buffer#start_iter ~stop:buffer#end_iter; + source_buffer#end_not_undoable_action (); self#notify; buffer#set_modified false @@ -706,6 +720,7 @@ object (self) method proofStatus = MatitaMisc.get_proof_status self#status method proofMetasenv = MatitaMisc.get_proof_metasenv self#status method proofContext = MatitaMisc.get_proof_context self#status + method proofConclusion = MatitaMisc.get_proof_conclusion self#status method setGoal n = userGoal <- n method eos = @@ -744,10 +759,10 @@ end let _script = ref None -let script ~view ~init ~mathviewer ~urichooser ~develcreator ~ask_confirmation ~set_star () +let script ~source_view ~init ~mathviewer ~urichooser ~develcreator ~ask_confirmation ~set_star () = let s = new script - ~view ~init ~mathviewer ~ask_confirmation ~urichooser ~develcreator ~set_star () + ~source_view ~init ~mathviewer ~ask_confirmation ~urichooser ~develcreator ~set_star () in _script := Some s; s