X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaScript.ml;h=60fc01032cb9ed52ca0908ca9808010e2916fa85;hb=e6b28085c97ae7b9bd3f3262b105f6b84f42b047;hp=f339ebb40f3547756b9349666d1637408b98371d;hpb=efdb0db81ef2594a2aced0310997ef0d74462254;p=helm.git diff --git a/helm/matita/matitaScript.ml b/helm/matita/matitaScript.ml index f339ebb40..60fc01032 100644 --- a/helm/matita/matitaScript.ml +++ b/helm/matita/matitaScript.ml @@ -36,6 +36,7 @@ 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" @@ -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,20 +82,29 @@ 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 @@ -108,12 +112,12 @@ 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" *) - 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 -> + 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 +125,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 - in - let new_text = - if DisambiguateTypes.Environment.is_empty new_aliases then - parsed_text - else - prepend_text (DisambiguatePp.pp_environment new_aliases) - parsed_text + let new_text = + let initial_space = + if initial_space = "" then "\n" else initial_space in + initial_space ^ + DisambiguatePp.pp_environment(DTE.add k value DTE.empty) in + let new_status = + {status with aliases = DTE.add 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 !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 +173,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 +191,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 ;; @@ -354,9 +356,40 @@ 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 = GrafiteParser.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 (CicNotationPt.loc_of_floc loc) in let parsed_text = safe_substring s 0 parsed_text_length in @@ -368,7 +401,8 @@ let rec eval_statement guistuff status user_goal script s = 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 -> @@ -382,7 +416,7 @@ 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 @@ -390,7 +424,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 () @@ -432,8 +467,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 *) @@ -443,25 +480,22 @@ 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) @@ -521,10 +555,10 @@ List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements; | _ -> () 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 @@ -542,8 +576,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 @@ -580,7 +614,9 @@ List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements; 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 @@ -676,6 +712,7 @@ List.iter (fun s -> prerr_endline ("'" ^ s ^ "'")) new_statements; 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 = @@ -714,10 +751,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