X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaScript.ml;h=48cc9111bdad5c9c8511ef8f36d35ef1ee3a4145;hb=8ab7608b1f6e6c4babea0f9d0a771e350d481229;hp=4a6115813e708ecbaf57c6394a155a5c62fd142d;hpb=9037b899d25db7e09e90e9b4689f073f0dc4c729;p=helm.git diff --git a/helm/matita/matitaScript.ml b/helm/matita/matitaScript.ml index 4a6115813..48cc9111b 100644 --- a/helm/matita/matitaScript.ml +++ b/helm/matita/matitaScript.ml @@ -57,12 +57,12 @@ let prepend_text header base = if Pcre.pmatch ~rex:heading_nl_RE base then sprintf "\n%s%s" header base else - sprintf "%s\n%s" header base + 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 = TacticAst in - let loc = CicAst.dummy_floc in + let module A = GrafiteAst in + let loc = Disambiguate.dummy_floc in A.Executable (loc, A.Tactical (loc, A.Tactic (loc, A.Goal (loc, n)))) type guistuff = { @@ -74,8 +74,8 @@ type guistuff = { } let eval_with_engine guistuff status user_goal parsed_text st = - let module TA = TacticAst in - let module TAPp = TacticAstPp in + let module TA = GrafiteAst in + let module TAPp = GrafiteAstPp in let include_ = match guistuff.filenamedata with | None,None -> [] @@ -108,7 +108,7 @@ let eval_with_engine guistuff status user_goal parsed_text st = | TA.Command (_, TA.Include _) -> DisambiguateTypes.Environment.empty | _ -> MatitaSync.alias_diff ~from:status new_status in - (* we remove the defined object since we consider them "automathic aliases" *) + (* we remove the defined object since we consider them "automatic aliases" *) let new_aliases = let module DTE = DisambiguateTypes.Environment in let module UM = UriManager in @@ -130,7 +130,7 @@ let eval_with_engine guistuff status user_goal parsed_text st = if DisambiguateTypes.Environment.is_empty new_aliases then parsed_text else - prepend_text (CicTextualParser2.EnvironmentP3.to_string new_aliases) + prepend_text (DisambiguatePp.pp_environment new_aliases) parsed_text in let new_text = @@ -149,9 +149,11 @@ let eval_with_engine guistuff status user_goal parsed_text st = with MatitaEngine.UnableToInclude what as exc -> let compile_needed_and_go_on d = - let root = MatitamakeLib.root_for_development d in - let target = root ^ "/" ^ what in - if not(MatitamakeLib.build_development ~target d) then + let target = what in + let refresh_cb () = + while Glib.Main.pending () do ignore(Glib.Main.iteration false); done + in + if not(MatitamakeLib.build_development_in_bg ~target refresh_cb d) then raise exc else eval_with_engine guistuff status user_goal parsed_text st @@ -208,8 +210,8 @@ let disambiguate term status = let eval_macro guistuff status parsed_text script mac = - let module TA = TacticAst in - let module TAPp = TacticAstPp in + let module TA = GrafiteAst in + let module TAPp = GrafiteAstPp in let module MQ = MetadataQuery in let module MDB = MatitaDb in let module CTC = CicTypeChecker in @@ -267,7 +269,7 @@ let eval_macro guistuff status parsed_text script mac TA.Executable (loc, (TA.Tactical (loc, TA.Tactic (loc, - TA.Apply (loc, CicAst.Uri (UriManager.string_of_uri uri,None)))))) + TA.Apply (loc, CicNotationPt.Uri (UriManager.string_of_uri uri,None)))))) in let new_status = MatitaEngine.eval_ast status ast in let extra_text = @@ -323,18 +325,18 @@ let eval_macro guistuff status parsed_text script mac let eval_executable guistuff status user_goal parsed_text script ex = - let module TA = TacticAst in - let module TAPp = TacticAstPp in + let module TA = GrafiteAst in + let module TAPp = GrafiteAstPp in let module MD = MatitaDisambiguator in let module ML = MatitacleanLib in let parsed_text_length = String.length parsed_text in match ex with | TA.Command (loc, _) | TA.Tactical (loc, _) -> (try - (match ML.baseuri_of_baseuri_decl (TA.Executable (loc,ex)) with + (match MatitaMisc.baseuri_of_baseuri_decl (TA.Executable (loc,ex)) with | None -> () | Some u -> - if not (MatitacleanLib.is_empty u) then + if not (MatitaMisc.is_empty u) then match guistuff.ask_confirmation ~title:"Baseuri redefinition" @@ -352,27 +354,59 @@ let eval_executable guistuff status user_goal parsed_text script ex = | TA.Macro (_,mac) -> eval_macro guistuff status parsed_text script mac -let rec eval_statement guistuff status user_goal script s = +let rec eval_statement baseoffset parsedlen error_tag (buffer : GText.buffer) + guistuff status user_goal script s += if Pcre.pmatch ~rex:only_dust_RE s then raise Margin; - let st = CicTextualParser2.parse_statement (Stream.of_string s) in + let st = + try + GrafiteParser.parse_statement (Stream.of_string s) + with + CicNotationParser.Parse_error (floc,err) as exc -> + let (x, y) = CicNotationPt.loc_of_floc floc in + let x = parsedlen + x in + let y = parsedlen + y in + let x' = baseoffset + x in + let y' = baseoffset + y in + let x_iter = buffer#get_iter (`OFFSET x') in + let y_iter = buffer#get_iter (`OFFSET y') in + buffer#apply_tag error_tag ~start:x_iter ~stop:y_iter; + let id = ref None in + id := + Some + (buffer#connect#changed + ~callback:( + fun () -> + buffer#remove_tag error_tag ~start:buffer#start_iter + ~stop:buffer#end_iter; + match !id with + None -> assert false (* a race condition occurred *) + | Some id -> + (new GObj.gobject_ops buffer#as_buffer)#disconnect id)); + let flocb,floce = floc in + let floc = + {flocb with Lexing.pos_cnum = x}, {floce with Lexing.pos_cnum = y } in + raise (CicNotationParser.Parse_error (floc,err)) + in let text_of_loc loc = - let parsed_text_length = snd (CicAst.loc_of_floc loc) in + let parsed_text_length = snd (CicNotationPt.loc_of_floc loc) in let parsed_text = safe_substring s 0 parsed_text_length in parsed_text, parsed_text_length in match st with - | TacticAst.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 s,len = - eval_statement guistuff status user_goal script s + eval_statement baseoffset (parsedlen + parsed_text_length) error_tag + buffer guistuff status user_goal script s in (match s with | (status, text) :: tl -> ((status, parsed_text ^ text)::tl), (parsed_text_length + len) | [] -> [], 0) - | TacticAst.Executable (loc, ex) -> + | 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 @@ -380,13 +414,15 @@ let fresh_script_id = let i = ref 0 in fun () -> incr i; !i -class script ~(buffer: GText.buffer) ~(init: MatitaTypes.status) +class script ~(view: GText.view) + ~(init: MatitaTypes.status) ~(mathviewer: MatitaTypes.mathViewer) ~set_star ~ask_confirmation ~urichooser ~develcreator () = +let buffer = view#buffer in object (self) val scriptId = fresh_script_id () @@ -412,9 +448,7 @@ object (self) (fun _ -> if buffer#modified then set_star self#ppFilename true else - set_star self#ppFilename false)); - self#reset (); - self#template () + set_star self#ppFilename false)) val mutable statements = []; (** executed statements *) val mutable history = [ init ]; @@ -430,6 +464,10 @@ object (self) val locked_mark = buffer#create_mark ~name:"locked" ~left_gravity:true buffer#start_iter val locked_tag = buffer#create_tag [`BACKGROUND "lightblue"; `EDITABLE false] + 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 *) @@ -439,36 +477,31 @@ object (self) let s = match statement with Some s -> s | None -> self#getFuture in MatitaLog.debug ("evaluating: " ^ first_line s ^ " ..."); let (entries, parsed_len) = - eval_statement guistuff self#status userGoal self s + eval_statement (buffer#get_iter_at_mark (`MARK locked_mark))#offset 0 + error_tag buffer guistuff self#status userGoal self s in let (new_statuses, new_statements) = List.split entries in -(* -prerr_endline "evalStatement returned"; -List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements; -*) history <- List.rev new_statuses @ history; statements <- List.rev new_statements @ statements; let start = buffer#get_iter_at_mark (`MARK locked_mark) in let new_text = String.concat "" new_statements in - if new_text <> String.sub s 0 parsed_len then + if statement <> None then + buffer#insert ~iter:start new_text + else + if new_text <> String.sub s 0 parsed_len then begin -(* prerr_endline ("new:" ^ new_text); *) -(* prerr_endline ("s:" ^ String.sub s 0 parsed_len); *) - let stop = start#copy#forward_chars parsed_len in - buffer#delete ~start ~stop; - buffer#insert ~iter:start new_text; -(* prerr_endline "AUTOMATICALLY MODIFIED!!!!!" *) + let stop = start#copy#forward_chars parsed_len in + buffer#delete ~start ~stop; + buffer#insert ~iter:start new_text; end; self#moveMark (String.length new_text) - method private _retract () = - match statements, history with - | last_statement :: _, cur_status :: prev_status :: _ -> - MatitaSync.time_travel ~present:cur_status ~past:prev_status; - statements <- List.tl statements; - history <- List.tl history; - self#moveMark (- (String.length last_statement)); - | _ -> raise Margin + method private _retract offset status new_statements new_history = + let cur_status = match history with s::_ -> s | [] -> assert false in + MatitaSync.time_travel ~present:cur_status ~past:status; + statements <- new_statements; + history <- new_history; + self#moveMark (- offset) method advance ?statement () = try @@ -480,8 +513,15 @@ List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements; method retract () = try - self#_retract (); - self#notify + let cmp,new_statements,new_history,status = + match statements,history with + stat::statements, _::(status::_ as history) -> + String.length stat, statements, history, status + | [],[_] -> raise Margin + | _,_ -> assert false + in + self#_retract cmp status new_statements new_history; + self#notify with | Margin -> self#notify | exc -> self#notify; raise exc @@ -511,6 +551,12 @@ List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements; Incomplete_proof (_,goal) -> self#setGoal goal | _ -> () end ; + let mark_position = buffer#get_iter_at_mark mark in + if 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; + end; while Glib.Main.pending () do ignore(Glib.Main.iteration false); done method clean_dirty_lock = @@ -527,8 +573,8 @@ List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements; let status = self#status in List.iter (fun o -> o status) observers - method loadFromFile () = - buffer#set_text (MatitaMisc.input_file self#getFilename); + method loadFromFile f = + buffer#set_text (MatitaMisc.input_file f); self#goto_top; buffer#set_modified false @@ -578,50 +624,79 @@ List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements; set_star self#ppFilename false method goto (pos: [`Top | `Bottom | `Cursor]) () = + let old_locked_mark = + `MARK + (buffer#create_mark ~name:"old_locked_mark" + ~left_gravity:true (buffer#get_iter_at_mark (`MARK locked_mark))) in let getpos _ = buffer#get_iter_at_mark (`MARK locked_mark) in + let getoldpos _ = buffer#get_iter_at_mark old_locked_mark in + let dispose_old_locked_mark () = buffer#delete_mark old_locked_mark in match pos with - | `Top -> self#goto_top; self#notify + | `Top -> dispose_old_locked_mark (); self#goto_top; self#notify | `Bottom -> (try - let rec dowhile pos = + let rec dowhile () = self#_advance (); - if pos#compare (getpos ()) < 0 then - dowhile (getpos ()) + let newpos = getpos () in + if (getoldpos ())#compare newpos < 0 then + begin + buffer#move_mark old_locked_mark newpos; + dowhile () + end in - dowhile (getpos ()); + dowhile (); + dispose_old_locked_mark (); self#notify with - | Margin -> self#notify - | exc -> self#notify; raise exc) + | Margin -> dispose_old_locked_mark (); self#notify + | exc -> dispose_old_locked_mark (); self#notify; raise exc) | `Cursor -> let locked_iter () = buffer#get_iter_at_mark (`NAME "locked") in let cursor_iter () = buffer#get_iter_at_mark `INSERT in + let remember = + `MARK + (buffer#create_mark ~name:"initial_insert" + ~left_gravity:true (cursor_iter ())) in + let dispose_remember () = buffer#delete_mark remember in + let remember_iter () = + buffer#get_iter_at_mark (`NAME "initial_insert") in + let cmp () = (locked_iter ())#offset - (remember_iter ())#offset in + let icmp = cmp () in let forward_until_cursor () = (* go forward until locked > cursor *) - let rec aux oldpos = + let rec aux () = self#_advance (); - if (locked_iter ())#compare (cursor_iter ()) < 0 && - oldpos#compare (getpos ()) < 0 + if cmp () < 0 && (getoldpos ())#compare (getpos ()) < 0 then - aux (getpos ()) + begin + buffer#move_mark old_locked_mark (getpos ()); + aux () + end in - aux (getpos ()) + aux () in - let rec back_until_cursor () = (* go backward until locked < cursor *) - self#_retract (); - if (locked_iter ())#compare (cursor_iter ()) > 0 then - back_until_cursor () + let rec back_until_cursor len = (* go backward until locked < cursor *) + function + statements, (status::_ as history) when len <= 0 -> + self#_retract (icmp - len) status statements history + | statement::tl1, _::tl2 -> + back_until_cursor (len - String.length statement) (tl1,tl2) + | _,_ -> assert false in - let cmp = (locked_iter ())#compare (cursor_iter ()) in (try - if cmp < 0 then (* locked < cursor *) - (forward_until_cursor (); self#notify) - else if cmp > 0 then (* locked > cursor *) - (back_until_cursor (); self#notify) - else (* cursor = locked *) - () + begin + if icmp < 0 then (* locked < cursor *) + (forward_until_cursor (); self#notify) + else if icmp > 0 then (* locked > cursor *) + (back_until_cursor icmp (statements,history); self#notify) + else (* cursor = locked *) + () + end ; + dispose_remember (); + dispose_old_locked_mark (); with - | Margin -> self#notify - | exc -> self#notify; raise exc) + | Margin -> dispose_remember (); dispose_old_locked_mark (); self#notify + | exc -> dispose_remember (); dispose_old_locked_mark (); + self#notify; raise exc) method onGoingProof () = match self#status.proof_status with @@ -638,19 +713,19 @@ List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements; let s = self#getFuture in let rec is_there_and_executable s = if Pcre.pmatch ~rex:only_dust_RE s then raise Margin; - let st = CicTextualParser2.parse_statement (Stream.of_string s) in + let st = GrafiteParser.parse_statement (Stream.of_string s) in match st with - | TacticAst.Comment (loc,_)-> - let parsed_text_length = snd (CicAst.loc_of_floc loc) in + | GrafiteAst.Comment (loc,_)-> + let parsed_text_length = snd (CicNotationPt.loc_of_floc loc) in let remain_len = String.length s - parsed_text_length in let next = String.sub s parsed_text_length remain_len in is_there_and_executable next - | TacticAst.Executable (loc, ex) -> false + | GrafiteAst.Executable (loc, ex) -> false in try is_there_and_executable s with - | CicTextualParser2.Parse_error _ -> false + | CicNotationParser.Parse_error _ -> false | Margin -> true @@ -670,10 +745,10 @@ end let _script = ref None -let script ~buffer ~init ~mathviewer ~urichooser ~develcreator ~ask_confirmation ~set_star () +let script ~view ~init ~mathviewer ~urichooser ~develcreator ~ask_confirmation ~set_star () = let s = new script - ~buffer ~init ~mathviewer ~ask_confirmation ~urichooser ~develcreator ~set_star () + ~view ~init ~mathviewer ~ask_confirmation ~urichooser ~develcreator ~set_star () in _script := Some s; s