open Printf
open MatitaTypes
+module TA = GrafiteAst
+
let debug = false
let debug_print = if debug then prerr_endline else ignore
let goal_ast n =
let module A = GrafiteAst in
let loc = DisambiguateTypes.dummy_floc in
- A.Executable (loc, A.Tactical (loc, A.Tactic (loc, A.Goal (loc, n))))
+ A.Executable (loc, A.Tactical (loc,
+ A.Tactic (loc, A.Goal (loc, n)),
+ Some (A.Dot loc)))
type guistuff = {
mathviewer:MatitaTypes.mathViewer;
}
let eval_with_engine guistuff status user_goal parsed_text st =
- let module TA = GrafiteAst in
let module TAPp = GrafiteAstPp in
let include_ =
match guistuff.filenamedata with
(* 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 ->
- let status =
+(* | Incomplete_proof { stack = stack }
+ when not (List.mem user_goal (Continuationals.head_goals stack)) ->
+ let status =
MatitaEngine.eval_ast ~include_paths:include_
- ~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))]
+ ~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_tactical (TA.Select (loc, [user_goal])) ] *)
| _ -> initial_space,status,[] in
let new_status =
MatitaEngine.eval_ast
| _ -> MatitaSync.alias_diff ~from:status new_status
in
(* we remove the defined object since we consider them "automatic aliases" *)
+ let dummy_st =
+ TA.Comment (DisambiguateTypes.dummy_floc,
+ TA.Note (DisambiguateTypes.dummy_floc, ""))
+ in
let initial_space,status,new_status_and_text_list_rev =
let module DTE = DisambiguateTypes.Environment in
let module UM = UriManager in
let new_status =
MatitaSync.set_proof_aliases status [k,value]
in
- "\n",new_status,((new_status, new_text)::acc)
+ "\n",new_status,((new_status, (new_text, dummy_st))::acc)
) (initial_space,status,[]) new_aliases 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]
+ [new_status, (parsed_text, st)]
in
res,parsed_text_length
| Some d -> handle_with_devel d
;;
-let disambiguate term status =
+let disambiguate_macro_term term status user_goal =
let module MD = MatitaDisambiguator in
let dbd = MatitaDb.instance () in
- let metasenv = MatitaMisc.get_proof_metasenv status in
- let context = MatitaMisc.get_proof_context status in
+ let metasenv = MatitaTypes.get_proof_metasenv status in
+ let context = MatitaTypes.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
| [_,_,x,_], _ -> x
| _ -> assert false
-let eval_macro guistuff status unparsed_text parsed_text script mac =
- let module TA = GrafiteAst 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
match mac with
(* WHELP's stuff *)
| TA.WMatch (loc, term) ->
- let term = disambiguate term status in
+ let term = disambiguate_macro_term term status user_goal in
let l = MQ.match_term ~dbd term in
let query_url =
MatitaMisc.strip_suffix ~suffix:"."
guistuff.mathviewer#show_uri_list ~reuse:true ~entry l;
[], parsed_text_length
| TA.WInstance (loc, term) ->
- let term = disambiguate term status in
+ let term = disambiguate_macro_term term status user_goal in
let l = MQ.instance ~dbd term in
let entry = `Whelp (TAPp.pp_macro_cic (TA.WInstance (loc, term)), l) in
guistuff.mathviewer#show_uri_list ~reuse:true ~entry l;
guistuff.mathviewer#show_uri_list ~reuse:true ~entry l;
[], parsed_text_length
| TA.WElim (loc, term) ->
- let term = disambiguate term status in
+ let term = disambiguate_macro_term term status user_goal in
let uri =
match term with
| Cic.MutInd (uri,n,_) -> UriManager.uri_of_uriref uri n None
guistuff.mathviewer#show_uri_list ~reuse:true ~entry l;
[], parsed_text_length
| TA.WHint (loc, term) ->
- let term = disambiguate term status in
+ let term = disambiguate_macro_term term status user_goal in
let s = ((None,[0,[],term], Cic.Meta (0,[]) ,term),0) in
let l = List.map fst (MQ.experimental_hint ~dbd s) in
let entry = `Whelp (TAPp.pp_macro_cic (TA.WHint (loc, term)), l) in
[], parsed_text_length
(* REAL macro *)
| TA.Hint loc ->
- let s = MatitaMisc.get_proof_status status in
- let l = List.map fst (MQ.experimental_hint ~dbd s) in
+ let proof = MatitaTypes.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
(match selected with
| [] -> [], parsed_text_length
| [uri] ->
- let ast =
- TA.Executable (loc,
- (TA.Tactical (loc,
- TA.Tactic (loc,
- TA.Apply (loc, CicNotationPt.Uri (UriManager.string_of_uri uri,None))))))
- in
+ let suri = UriManager.string_of_uri uri in
+ let ast =
+ TA.Executable (loc, (TA.Tactical (loc,
+ TA.Tactic (loc,
+ TA.Apply (loc, CicNotationPt.Uri (suri, None))),
+ Some (TA.Dot loc))))
+ in
let new_status = MatitaEngine.eval_ast status ast in
let extra_text =
comment parsed_text ^
"\n" ^ TAPp.pp_statement ast
in
- [ new_status , extra_text ], parsed_text_length
+ [ new_status , (extra_text, ast) ], parsed_text_length
| _ ->
MatitaLog.error
"The result of the urichooser should be only 1 uri, not:\n";
) selected;
assert false)
| TA.Check (_,term) ->
- let metasenv = MatitaMisc.get_proof_metasenv status in
- let context = MatitaMisc.get_proof_context status in
+ let metasenv = MatitaTypes.get_proof_metasenv status in
+ let context = MatitaTypes.get_proof_context status user_goal in
let interps =
MatitaDisambiguator.disambiguate_term ~dbd ~context ~metasenv
~aliases:status.aliases ~universe:(Some status.multi_aliases) term
| TA.Print (_,kind) -> failwith "not implemented"
| TA.Search_pat (_, search_kind, str) -> failwith "not implemented"
| TA.Search_term (_, search_kind, term) -> failwith "not implemented"
-
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
let module ML = MatitacleanLib in
let parsed_text_length = String.length parsed_text in
match ex with
- | TA.Command (loc, _) | TA.Tactical (loc, _) ->
+ | TA.Command (loc, _) | TA.Tactical (loc, _, _) ->
(try
(match MatitaMisc.baseuri_of_baseuri_decl (TA.Executable (loc,ex)) with
| None -> ()
guistuff status user_goal parsed_text (TA.Executable (loc, ex))
with MatitaTypes.Cancel -> [], 0)
| TA.Macro (_,mac) ->
- eval_macro guistuff status unparsed_text parsed_text script mac
+ eval_macro guistuff status user_goal unparsed_text parsed_text script mac
+
+let parse_statement baseoffset parsedlen ?error_tag (buffer: GText.buffer) text
+=
+ try
+ GrafiteParser.parse_statement (Ulexing.from_utf8_string text)
+ with CicNotationParser.Parse_error (floc, err) as exn ->
+ match error_tag with
+ | None -> raise exn
+ | Some error_tag ->
+ 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
+ buffer#place_cursor (buffer#get_iter (`OFFSET x'));
+ raise (CicNotationParser.Parse_error (floc, err))
let rec eval_statement baseoffset parsedlen error_tag (buffer : GText.buffer)
- guistuff status user_goal script unparsed_text
+ guistuff status user_goal script statement
=
- if Pcre.pmatch ~rex:only_dust_RE unparsed_text then raise Margin;
- let st =
- try
- GrafiteParser.parse_statement (Ulexing.from_utf8_string unparsed_text)
- 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))
+ let st, unparsed_text =
+ match statement with
+ | `Raw text ->
+ if Pcre.pmatch ~rex:only_dust_RE text then raise Margin;
+ parse_statement baseoffset parsedlen ~error_tag buffer text, text
+ | `Ast (st, text) -> st, text
in
let text_of_loc loc =
let parsed_text_length = snd (CicNotationPt.loc_of_floc loc) 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
+ buffer guistuff status user_goal script (`Raw s)
in
(match s with
- | (status, text) :: tl ->
- ((status, parsed_text ^ text)::tl), (parsed_text_length + len)
+ | (status, (text, ast)) :: tl ->
+ ((status, (parsed_text ^ text, ast))::tl), (parsed_text_length + len)
| [] -> [], 0)
| GrafiteAst.Executable (loc, ex) ->
let parsed_text, parsed_text_length = text_of_loc loc in
method private getFilename =
match guistuff.filenamedata with Some f,_ -> f | _ -> assert false
+
+ method filename = self#getFilename
method private ppFilename =
match guistuff.filenamedata with
method status = match history with hd :: _ -> hd | _ -> assert false
method private _advance ?statement () =
+ let rec aux st =
+ let baseoffset = (buffer#get_iter_at_mark (`MARK locked_mark))#offset in
+ let (entries, parsed_len) =
+ eval_statement baseoffset 0 error_tag buffer guistuff self#status
+ userGoal self st
+ in
+ let (new_statuses, new_statements, new_asts) =
+ let statuses, statements = List.split entries in
+ let texts, asts = List.split statements in
+ statuses, texts, asts
+ in
+ 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 statement <> None then
+ buffer#insert ~iter:start new_text
+ else
+ let s = match st with `Raw s | `Ast (_, s) -> s in
+ if new_text <> String.sub s 0 parsed_len then
+ begin
+ 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);
+ (*
+ (match List.rev new_asts with (* advance again on punctuation *)
+ | TA.Executable (_, TA.Tactical (_, tac, _)) :: _ ->
+ let baseoffset =
+ (buffer#get_iter_at_mark (`MARK locked_mark))#offset
+ in
+ let text = self#getFuture in
+ (try
+ (match parse_statement baseoffset 0 ?error_tag:None buffer text with
+ | TA.Executable (loc, TA.Tactical (_, tac, None)) as st
+ when GrafiteAst.is_punctuation tac ->
+ let len = snd (CicNotationPt.loc_of_floc loc) in
+ aux (`Ast (st, String.sub text 0 len))
+ | _ -> ())
+ with CicNotationParser.Parse_error _ | End_of_file -> ())
+ | _ -> ())
+ *)
+ in
let s = match statement with Some s -> s | None -> self#getFuture in
MatitaLog.debug ("evaluating: " ^ first_line s ^ " ...");
- let (entries, parsed_len) =
- 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
- 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 statement <> None then
- buffer#insert ~iter:start new_text
- else
- if new_text <> String.sub s 0 parsed_len then
- begin
- 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)
+ (try aux (`Raw s) with End_of_file -> raise Margin)
method private _retract offset status new_statements new_history =
- let cur_status = match history with s::_ -> s | [] -> assert false in
+ 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;
buffer#move_mark mark ~where:new_mark_pos;
buffer#apply_tag locked_tag ~start:buffer#start_iter ~stop:new_mark_pos;
buffer#move_mark `INSERT old_insert;
- begin
- match self#status.proof_status with
- Incomplete_proof (_,goal) -> self#setGoal goal
- | _ -> ()
- end ;
let mark_position = buffer#get_iter_at_mark mark in
if source_view#move_mark_onscreen mark then
begin
| Incomplete_proof _ -> true
| Intermediate _ -> assert false
- 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 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 setGoal n = userGoal <- n
+ method goal = userGoal
method eos =
let s = self#getFuture in
is_there_and_executable s
with
| CicNotationParser.Parse_error _ -> false
- | Margin -> true
-
-
-
+ | Margin | End_of_file -> true
+
(* debug *)
method dump () =
MatitaLog.debug "script status:";
_script := Some s;
s
-let instance () = match !_script with None -> assert false | Some s -> s
-
+let current () = match !_script with None -> assert false | Some s -> s
projects / helm.git / blobdiff