X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2FmatitaScript.ml;h=b84180037b5ad92716267ce1022b19cc74e72550;hb=4e7e01cd771c07b3605ba54d3853ac34a02cb86d;hp=552d4907a757c7727135ab38d796ee8a7981b571;hpb=d46411c038cccb932638fd9d131c5d858c80ac5e;p=helm.git diff --git a/matita/matita/matitaScript.ml b/matita/matita/matitaScript.ml index 552d4907a..b84180037 100644 --- a/matita/matita/matitaScript.ml +++ b/matita/matita/matitaScript.ml @@ -67,7 +67,7 @@ let first_line s = type guistuff = { mathviewer:MatitaTypes.mathViewer; - urichooser: UriManager.uri list -> UriManager.uri list; + urichooser: NReference.reference list -> NReference.reference list; ask_confirmation: title:string -> message:string -> [`YES | `NO | `CANCEL]; } @@ -80,7 +80,7 @@ let eval_with_engine include_paths guistuff grafite_status user_goal let text = skipped_txt ^ nonskipped_txt in let prefix_len = MatitaGtkMisc.utf8_string_length skipped_txt in let enriched_history_fragment = - MatitaEngine.eval_ast ~do_heavy_checks:(Helm_registry.get_bool + MatitaEngine.eval_ast ~include_paths ~do_heavy_checks:(Helm_registry.get_bool "matita.do_heavy_checks") grafite_status (text,prefix_len,st) in @@ -92,279 +92,15 @@ let eval_with_engine include_paths guistuff grafite_status user_goal match alias with | None -> (status,to_prepend ^ nonskipped_txt)::acc,"" | Some (k,value) -> - let newtxt = LexiconAstPp.pp_alias value in + let newtxt = GrafiteAstPp.pp_alias value in (status,to_prepend ^ newtxt ^ "\n")::acc, "") ([],skipped_txt) enriched_history_fragment in res,"",parsed_text_length ;; -(* this function calls the parser in a way that it does not perform inclusions, - * so that we can ensure the inclusion is performed after the included file - * is compiled (if needed). matitac does not need that, since it compiles files - * in the good order, here files may be compiled on demand. *) -let wrap_with_make include_paths (f : #LexiconEngine.status GrafiteParser.statement) x = - try - f ~never_include:true ~include_paths x - with - | GrafiteParser.NoInclusionPerformed mafilename -> - let root, buri, _, tgt = - try Librarian.baseuri_of_script ~include_paths mafilename - with Librarian.NoRootFor _ -> - HLog.error ("The included file '"^mafilename^"' has no root file,"); - HLog.error "please create it."; - raise (Failure ("No root file for "^mafilename)) - in - let b = MatitacLib.Make.make root [tgt] in - if b then - try f ~include_paths x with LexiconEngine.IncludedFileNotCompiled _ -> - raise - (Failure ("Including: "^tgt^ - "\nNothing to do... did you run matitadep?")) - else raise (Failure ("Compiling: " ^ tgt)) -;; - -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 pp_eager_statement_ast = GrafiteAstPp.pp_statement -(* naive implementation of procedural proof script generation, - * starting from an applicatiove *auto generated) proof. - * this is out of place, but I like it :-P *) -let cic2grafite context menv t = - (* indents a proof script in a stupid way, better than nothing *) - let stupid_indenter s = - let next s = - let idx_square_o = try String.index s '[' with Not_found -> -1 in - let idx_square_c = try String.index s ']' with Not_found -> -1 in - let idx_pipe = try String.index s '|' with Not_found -> -1 in - let tok = - List.sort (fun (i,_) (j,_) -> compare i j) - [idx_square_o,'[';idx_square_c,']';idx_pipe,'|'] - in - let tok = List.filter (fun (i,_) -> i <> -1) tok in - match tok with - | (i,c)::_ -> Some (i,c) - | _ -> None - in - let break_apply n s = - let tab = String.make (n+1) ' ' in - Pcre.replace ~templ:(".\n" ^ tab ^ "apply") ~pat:"\\.apply" s - in - let rec ind n s = - match next s with - | None -> - s - | Some (position, char) -> - try - let s1, s2 = - String.sub s 0 position, - String.sub s (position+1) (String.length s - (position+1)) - in - match char with - | '[' -> break_apply n s1 ^ "\n" ^ String.make (n+2) ' ' ^ - "[" ^ ind (n+2) s2 - | '|' -> break_apply n s1 ^ "\n" ^ String.make n ' ' ^ - "|" ^ ind n s2 - | ']' -> break_apply n s1 ^ "\n" ^ String.make n ' ' ^ - "]" ^ ind (n-2) s2 - | _ -> assert false - with - Invalid_argument err -> - prerr_endline err; - s - in - ind 0 s - in - let module PT = CicNotationPt in - let module GA = GrafiteAst in - let pp_t context t = - let names = - List.map (function Some (n,_) -> Some n | None -> None) context - in - CicPp.pp t names - in - let sort_of context t = - try - let ty,_ = - CicTypeChecker.type_of_aux' menv context t - CicUniv.oblivion_ugraph - in - let sort,_ = CicTypeChecker.type_of_aux' menv context ty - CicUniv.oblivion_ugraph - in - match sort with - | Cic.Sort Cic.Prop -> true - | _ -> false - with - CicTypeChecker.TypeCheckerFailure _ -> - HLog.error "auto proof to sript transformation error"; false - in - let floc = HExtlib.dummy_floc in - (* minimalisti cic.term -> pt.term *) - let print_term c t = - let rec aux c = function - | Cic.Rel _ - | Cic.MutConstruct _ - | Cic.MutInd _ - | Cic.Const _ as t -> - PT.Ident (pp_t c t, None) - | Cic.Appl l -> PT.Appl (List.map (aux c) l) - | Cic.Implicit _ -> PT.Implicit `JustOne - | Cic.Lambda (Cic.Name n, s, t) -> - PT.Binder (`Lambda, (PT.Ident (n,None), Some (aux c s)), - aux (Some (Cic.Name n, Cic.Decl s)::c) t) - | Cic.Prod (Cic.Name n, s, t) -> - PT.Binder (`Forall, (PT.Ident (n,None), Some (aux c s)), - aux (Some (Cic.Name n, Cic.Decl s)::c) t) - | Cic.LetIn (Cic.Name n, s, ty, t) -> - PT.Binder (`Lambda, (PT.Ident (n,None), Some (aux c s)), - aux (Some (Cic.Name n, Cic.Def (s,ty))::c) t) - | Cic.Meta _ -> PT.Implicit `JustOne - | Cic.Sort (Cic.Type u) -> PT.Sort (`Type u) - | Cic.Sort Cic.Set -> PT.Sort `Set - | Cic.Sort (Cic.CProp u) -> PT.Sort (`CProp u) - | Cic.Sort Cic.Prop -> PT.Sort `Prop - | _ as t -> PT.Ident ("ERROR: "^CicPp.ppterm t, None) - in - aux c t - in - (* prints an applicative proof, that is an auto proof. - * don't use in the general case! *) - let rec print_proof context = function - | Cic.Rel _ - | Cic.Const _ as t -> - [GA.Executable (floc, - GA.Tactic (floc, - Some (GA.Apply (floc, print_term context t)), GA.Dot floc))] - | Cic.Appl (he::tl) -> - let tl = List.map (fun t -> t, sort_of context t) tl in - let subgoals = - HExtlib.filter_map (function (t,true) -> Some t | _ -> None) tl - in - let args = - List.map (function | (t,true) -> Cic.Implicit None | (t,_) -> t) tl - in - if List.length subgoals > 1 then - (* branch *) - [GA.Executable (floc, - GA.Tactic (floc, - Some (GA.Apply (floc, print_term context (Cic.Appl (he::args)))), - GA.Semicolon floc))] @ - [GA.Executable (floc, GA.Tactic (floc, None, GA.Branch floc))] @ - (HExtlib.list_concat - ~sep:[GA.Executable (floc, GA.Tactic (floc, None,GA.Shift floc))] - (List.map (print_proof context) subgoals)) @ - [GA.Executable (floc, GA.Tactic (floc, None,GA.Merge floc))] - else - (* simple apply *) - [GA.Executable (floc, - GA.Tactic (floc, - Some (GA.Apply - (floc, print_term context (Cic.Appl (he::args)) )), GA.Dot floc))] - @ - (match subgoals with - | [] -> [] - | [x] -> print_proof context x - | _ -> assert false) - | Cic.Lambda (Cic.Name n, ty, bo) -> - [GA.Executable (floc, - GA.Tactic (floc, - Some (GA.Cut (floc, Some n, (print_term context ty))), - GA.Branch floc))] @ - (print_proof (Some (Cic.Name n, Cic.Decl ty)::context) bo) @ - [GA.Executable (floc, GA.Tactic (floc, None,GA.Shift floc))] @ - [GA.Executable (floc, GA.Tactic (floc, - Some (GA.Assumption floc),GA.Merge floc))] - | _ -> [] - (* - debug_print (lazy (CicPp.ppterm t)); - assert false - *) - in - (* performs a lambda closure of the proof term abstracting metas. - * this is really an approximation of a closure, local subst of metas - * is not kept into account *) - let close_pt menv context t = - let metas = CicUtil.metas_of_term t in - let metas = - HExtlib.list_uniq ~eq:(fun (i,_) (j,_) -> i = j) - (List.sort (fun (i,_) (j,_) -> compare i j) metas) - in - let mk_rels_and_collapse_metas metas = - let rec aux i map acc acc1 = function - | [] -> acc, acc1, map - | (j,_ as m)::tl -> - let _,_,ty = CicUtil.lookup_meta j menv in - try - let n = List.assoc ty map in - aux i map (Cic.Rel n :: acc) (m::acc1) tl - with Not_found -> - let map = (ty, i)::map in - aux (i+1) map (Cic.Rel i :: acc) (m::acc1) tl - in - aux 1 [] [] [] metas - in - let rels, metas, map = mk_rels_and_collapse_metas metas in - let n_lambdas = List.length map in - let t = - if metas = [] then - t - else - let t = - ProofEngineReduction.replace_lifting - ~what:(List.map (fun (x,_) -> Cic.Meta (x,[])) metas) - ~with_what:rels - ~context:context - ~equality:(fun _ x y -> - match x,y with - | Cic.Meta(i,_), Cic.Meta(j,_) when i=j -> true - | _ -> false) - ~where:(CicSubstitution.lift n_lambdas t) - in - let rec mk_lam = function - | [] -> t - | (ty,n)::tl -> - let name = "fresh_"^ string_of_int n in - Cic.Lambda (Cic.Name name, ty, mk_lam tl) - in - mk_lam - (fst (List.fold_left - (fun (l,liftno) (ty,_) -> - (l @ [CicSubstitution.lift liftno ty,liftno] , liftno+1)) - ([],0) map)) - in - t - in - let ast = print_proof context (close_pt menv context t) in - let pp t = - (* ZACK: setting width to 80 will trigger a bug of BoxPp.render_to_string - * which will show up using the following command line: - * ./tptp2grafite -tptppath ~tassi/TPTP-v3.1.1 GRP170-1 *) - let width = max_int in - let term_pp content_term = - let pres_term = TermContentPres.pp_ast content_term in - let lookup_uri = fun _ -> None in - let markup = CicNotationPres.render ~lookup_uri pres_term in - let s = "(" ^ BoxPp.render_to_string - ~map_unicode_to_tex:(Helm_registry.get_bool - "matita.paste_unicode_as_tex") - List.hd width markup ^ ")" in - Pcre.substitute - ~pat:"\\\\forall [Ha-z][a-z0-9_]*" ~subst:(fun x -> "\n" ^ x) s - in - CicNotationPp.set_pp_term term_pp; - let lazy_term_pp = fun x -> assert false in - let obj_pp = CicNotationPp.pp_obj CicNotationPp.pp_term in - GrafiteAstPp.pp_statement - ~map_unicode_to_tex:(Helm_registry.get_bool - "matita.paste_unicode_as_tex") - ~term_pp ~lazy_term_pp ~obj_pp t - in - let script = String.concat "" (List.map pp ast) in - prerr_endline script; - stupid_indenter script -;; let eval_nmacro include_paths (buffer : GText.buffer) guistuff grafite_status user_goal unparsed_text parsed_text script mac = let parsed_text_length = String.length parsed_text in match mac with @@ -382,13 +118,18 @@ let eval_nmacro include_paths (buffer : GText.buffer) guistuff grafite_status us let status = script#grafite_status in let _,_,menv,subst,_ = status#obj in let ctx = - try let _,(_,ctx,_) = List.hd menv in ctx - with Failure "hd" -> [] - in + match Continuationals.Stack.head_goals status#stack with + [] -> [] + | g::tl -> + if tl <> [] then + HLog.warn + "Many goals focused. Using the context of the first one\n"; + let _, ctx, _ = NCicUtils.lookup_meta g menv in + ctx in let m, s, status, t = GrafiteDisambiguate.disambiguate_nterm - None status ctx menv subst (parsed_text,parsed_text_length, - CicNotationPt.Cast (t,CicNotationPt.Implicit `JustOne)) + status None ctx menv subst (parsed_text,parsed_text_length, + NotationPt.Cast (t,NotationPt.Implicit `JustOne)) (* XXX use the metasenv, if possible *) in guistuff.mathviewer#show_entry (`NCic (t,ctx,m,s)); @@ -418,7 +159,7 @@ let eval_nmacro include_paths (buffer : GText.buffer) guistuff grafite_status us | thms -> String.concat ", " (HExtlib.filter_map (function - | CicNotationPt.NRef r -> Some (NCicPp.r2s true r) + | NotationPt.NRef r -> Some (NCicPp.r2s true r) | _ -> None) thms) in @@ -427,132 +168,7 @@ let eval_nmacro include_paths (buffer : GText.buffer) guistuff grafite_status us [s, nl ^ trace ^ thms ^ ";"], "", parsed_text_length | TA.NAutoInteractive (_, (Some _,_)) -> assert false -let rec eval_macro include_paths (buffer : GText.buffer) guistuff grafite_status user_goal unparsed_text parsed_text script mac = - let module MQ = MetadataQuery in - let module CTC = CicTypeChecker in - (* no idea why ocaml wants this *) - let parsed_text_length = String.length parsed_text in - let dbd = LibraryDb.instance () in - match mac with - (* REAL macro *) - | TA.Hint (loc, rewrite) -> (* MATITA 1.0 *) assert false - | TA.Eval (_, kind, term) -> - let metasenv = GrafiteTypes.get_proof_metasenv grafite_status 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 term = - match kind with - | `Normalize -> - CicReduction.normalize ~delta:true ~subst:[] context term - | `Simpl -> - ProofEngineReduction.simpl context term - | `Unfold None -> - ProofEngineReduction.unfold ?what:None context term - | `Unfold (Some lazy_term) -> - let what, _, _ = - lazy_term context metasenv CicUniv.empty_ugraph in - ProofEngineReduction.unfold ~what context term - | `Whd -> - CicReduction.whd ~delta:true ~subst:[] context term - in - let t_and_ty = Cic.Cast (term,ty) in - guistuff.mathviewer#show_entry (`Cic (t_and_ty,metasenv)); - [(grafite_status#set_proof_status No_proof), parsed_text ],"", - parsed_text_length - | TA.Check (_,term) -> - let metasenv = GrafiteTypes.get_proof_metasenv grafite_status 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)); - [], "", parsed_text_length - | TA.AutoInteractive (_, params) -> - 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 - (try - let _,menv,_,_,_,_ = proof in - let i,cc,ty = CicUtil.lookup_meta user_goal' menv in - let timestamp = Unix.gettimeofday () in - let (_,menv,subst,_,_,_), _ = - ProofEngineTypes.apply_tactic - (Auto.auto_tac ~dbd ~params - ~automation_cache:grafite_status#automation_cache) - proof_status - in - let proof_term = - let irl = - CicMkImplicit.identity_relocation_list_for_metavariable cc - in - CicMetaSubst.apply_subst subst (Cic.Meta (i,irl)) - in - let time = Unix.gettimeofday () -. timestamp in - let size, depth = Auto.size_and_depth cc menv proof_term in - let trailer = - Printf.sprintf - "\n(* end auto(%s) proof: TIME=%4.2f SIZE=%d DEPTH=%d *)" - Auto.revision time size depth - in - let proof_script = - if List.exists (fun (s,_) -> s = "paramodulation") (snd params) then - let proof_term, how_many_lambdas = - Auto.lambda_close ~prefix_name:"orrible_hack_" - proof_term menv cc - in - let ty,_ = - CicTypeChecker.type_of_aux' - [] [] proof_term CicUniv.empty_ugraph - in - prerr_endline (CicPp.ppterm proof_term ^ " n lambda= " ^ string_of_int how_many_lambdas); - (* use declarative output *) - let obj = - (* il proof_term vive in cc, devo metterci i lambda no? *) - (Cic.CurrentProof ("xxx",[],proof_term,ty,[],[])) - in - ApplyTransformation.txt_of_cic_object - ~map_unicode_to_tex:(Helm_registry.get_bool - "matita.paste_unicode_as_tex") - ~skip_thm_and_qed:true - ~skip_initial_lambdas:how_many_lambdas - 80 [] obj - else - if true then - (* use cic2grafite *) - cic2grafite cc menv proof_term - else - (* alternative using FG stuff *) - let map_unicode_to_tex = - Helm_registry.get_bool "matita.paste_unicode_as_tex" - in - ApplyTransformation.procedural_txt_of_cic_term - ~map_unicode_to_tex 78 [] cc proof_term - in - let text = comment parsed_text ^ "\n" ^ proof_script ^ trailer in - [],text,parsed_text_length - with - ProofEngineTypes.Fail _ as exn -> - raise exn - (* [], comment parsed_text ^ "\nfail.\n", parsed_text_length *)) - | TA.Inline (_, suri, params) -> - let str = "\n\n" ^ - ApplyTransformation.txt_of_inline_macro - ~map_unicode_to_tex:(Helm_registry.get_bool - "matita.paste_unicode_as_tex") - params suri - in - [], str, String.length parsed_text - -and eval_executable include_paths (buffer : GText.buffer) guistuff +let rec eval_executable include_paths (buffer : GText.buffer) guistuff grafite_status user_goal unparsed_text skipped_txt nonskipped_txt script ex loc = @@ -565,14 +181,6 @@ script ex loc (TA.Executable (loc, ex)) with MatitaTypes.Cancel -> [], "", 0 - | GrafiteEngine.Macro (_loc,lazy_macro) -> - 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 grafite_status - user_goal unparsed_text (skipped_txt ^ nonskipped_txt) script macro | GrafiteEngine.NMacro (_loc,macro) -> eval_nmacro include_paths buffer guistuff grafite_status user_goal unparsed_text (skipped_txt ^ nonskipped_txt) script macro @@ -581,17 +189,16 @@ script ex loc and eval_statement include_paths (buffer : GText.buffer) guistuff grafite_status user_goal script statement = - let (grafite_status,st), unparsed_text = + let st,unparsed_text = match statement with | `Raw text -> if Pcre.pmatch ~rex:only_dust_RE text then raise Margin; - let ast = - wrap_with_make include_paths - (GrafiteParser.parse_statement (Ulexing.from_utf8_string text)) - grafite_status - in - ast, text - | `Ast (st, text) -> (grafite_status, st), text + let strm = + GrafiteParser.parsable_statement grafite_status + (Ulexing.from_utf8_string text) in + let ast = MatitaEngine.get_ast grafite_status include_paths strm in + ast, text + | `Ast (st, text) -> st, text in let text_of_loc floc = let nonskipped_txt,_ = MatitaGtkMisc.utf8_parsed_text unparsed_text floc in @@ -603,20 +210,16 @@ and eval_statement include_paths (buffer : GText.buffer) guistuff txt,nonskipped_txt,skipped_txt,len in match st with - | GrafiteParser.LNone loc -> - let parsed_text, _, _, parsed_text_length = text_of_loc loc in - [grafite_status,parsed_text],"", - parsed_text_length - | GrafiteParser.LSome (GrafiteAst.Executable (loc, ex)) -> + | GrafiteAst.Executable (loc, ex) -> let _, nonskipped, skipped, parsed_text_length = text_of_loc loc in eval_executable include_paths buffer guistuff grafite_status user_goal unparsed_text skipped nonskipped script ex loc - | GrafiteParser.LSome (GrafiteAst.Comment (loc, GrafiteAst.Code (_, ex))) + | GrafiteAst.Comment (loc, GrafiteAst.Code (_, ex)) when Helm_registry.get_bool "matita.execcomments" -> let _, nonskipped, skipped, parsed_text_length = text_of_loc loc in eval_executable include_paths buffer guistuff grafite_status user_goal unparsed_text skipped nonskipped script ex loc - | GrafiteParser.LSome (GrafiteAst.Comment (loc, _)) -> + | GrafiteAst.Comment (loc, _) -> let parsed_text, _, _, parsed_text_length = text_of_loc loc in let remain_len = String.length unparsed_text - parsed_text_length in let s = String.sub unparsed_text parsed_text_length remain_len in @@ -652,19 +255,16 @@ class script ~(source_view: GSourceView2.source_view) let buffer = source_view#buffer in let source_buffer = source_view#source_buffer in let initial_statuses current baseuri = - let empty_lstatus = new LexiconEngine.status in + let empty_lstatus = new GrafiteDisambiguate.status in (match current with Some current -> - LexiconSync.time_travel ~present:current ~past:empty_lstatus; - GrafiteSync.time_travel ~present:current (); + NCicLibrary.time_travel + ((new GrafiteTypes.status current#baseuri)#set_disambiguate_db current#disambiguate_db); (* CSC: there is a known bug in invalidation; temporary fix here *) NCicEnvironment.invalidate () | None -> ()); - let lexicon_status = - CicNotation2.load_notation ~include_paths:[] empty_lstatus - BuildTimeConf.core_notation_script - in - let grafite_status = GrafiteSync.init lexicon_status baseuri in + let lexicon_status = empty_lstatus in + let grafite_status = (new GrafiteTypes.status baseuri)#set_disambiguate_db lexicon_status#disambiguate_db in grafite_status in let read_include_paths file = @@ -737,7 +337,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 = None + val mutable userGoal = (None : int option) (** text mark and tag representing locked part of a script *) val locked_mark = @@ -791,21 +391,10 @@ object (self) buffer#insert ~iter:(buffer#get_iter_at_mark (`MARK locked_mark)) newtext; (* 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 <- - (try Some (Continuationals.Stack.find_goal p.stack) - with Failure _ -> None) - | _ -> userGoal <- None + userGoal <- None - method private _retract offset grafite_status new_statements - new_history - = - let cur_grafite_status = - match history with s::_ -> s | [] -> assert false - in - LexiconSync.time_travel ~present:cur_grafite_status ~past:grafite_status; - GrafiteSync.time_travel ~present:cur_grafite_status ~past:grafite_status (); + method private _retract offset grafite_status new_statements new_history = + NCicLibrary.time_travel grafite_status; statements <- new_statements; history <- new_history; self#moveMark (- offset) @@ -1063,27 +652,8 @@ object (self) with Invalid_argument "Array.make" -> HLog.error "The script is too big!\n" - method onGoingProof () = - match self#grafite_status#proof_status with - | No_proof | Proof _ -> false - | Incomplete_proof _ -> true - | Intermediate _ -> assert false - -(* method proofStatus = MatitaTypes.get_proof_status self#status *) - method proofMetasenv = GrafiteTypes.get_proof_metasenv self#grafite_status - - method proofContext = - match userGoal with - None -> [] - | Some n -> GrafiteTypes.get_proof_context self#grafite_status n - - method proofConclusion = - 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 stack = (assert false : Continuationals.Stack.t) (* MATITA 1.0 GrafiteTypes.get_stack + self#grafite_status *) method setGoal n = userGoal <- n method goal = userGoal @@ -1095,24 +665,22 @@ object (self) method eos = let rec is_there_only_comments lexicon_status s = 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:self#include_paths lexicon_status - in - match st with - | GrafiteParser.LSome (GrafiteAst.Comment (loc,_)) -> + let strm = + GrafiteParser.parsable_statement lexicon_status + (Ulexing.from_utf8_string s)in + match GrafiteParser.parse_statement lexicon_status strm with + | GrafiteAst.Comment (loc,_) -> let _,parsed_text_length = MatitaGtkMisc.utf8_parsed_text s loc in (* CSC: why +1 in the following lines ???? *) let parsed_text_length = parsed_text_length + 1 in let remain_len = String.length s - parsed_text_length in let next = String.sub s parsed_text_length remain_len in is_there_only_comments lexicon_status next - | GrafiteParser.LNone _ - | GrafiteParser.LSome (GrafiteAst.Executable _) -> false + | GrafiteAst.Executable _ -> false in try is_there_only_comments self#grafite_status self#getFuture with - | LexiconEngine.IncludedFileNotCompiled _ + | NCicLibrary.IncludedFileNotCompiled _ | HExtlib.Localized _ | CicNotationParser.Parse_error _ -> false | Margin | End_of_file -> true