module GE = GrafiteEngine
module LS = LibrarySync
module Ds = CicDischarge
+module PO = ProceduralOptimizer
+module N = CicNotationPt
let mpres_document pres_box =
Xml.add_xml_declaration (CicNotationPres.print_box pres_box)
(asequent,
(ids_to_terms,ids_to_father_ids,ids_to_hypotheses,ids_to_inner_sorts)))
+let nmml_of_cic_sequent metasenv subst sequent =
+ let content_sequent = NTermCicContent.nmap_sequent ~subst sequent in
+ let pres_sequent =
+ Sequent2pres.nsequent2pres subst content_sequent in
+ let xmlpres = mpres_document pres_sequent in
+ Xml2Gdome.document_of_xml DomMisc.domImpl xmlpres
+
let mml_of_cic_object obj =
let (annobj, ids_to_terms, ids_to_father_ids, ids_to_inner_sorts,
ids_to_inner_types, ids_to_conjectures, ids_to_hypotheses)
let s = BoxPp.render_to_string ~map_unicode_to_tex render n mpres in
remove_closed_substs s
+let enable_notations = function
+ | true ->
+ CicNotation.set_active_notations
+ (List.map fst (CicNotation.get_all_notations ()))
+ | false ->
+ CicNotation.set_active_notations []
+
let txt_of_cic_object
~map_unicode_to_tex ?skip_thm_and_qed ?skip_initial_lambdas
n style ?flavour prefix obj
Content2pres.content2pres
?skip_initial_lambdas ?skip_thm_and_qed ~ids_to_inner_sorts cobj
in
- remove_closed_substs ("\n\n" ^
+ remove_closed_substs (
BoxPp.render_to_string ~map_unicode_to_tex
(function _::x::_ -> x | _ -> assert false) n
(CicNotationPres.mpres_of_box bobj)
- )
+ ^ "\n\n" )
| G.Procedural depth ->
- let obj = ProceduralOptimizer.optimize_obj obj in
+(*
+ PO.debug := true;
+ PO.critical := false;
+ Acic2Procedural.tex_formatter := Some Format.std_formatter;
+ let _ = ProceduralTeX.tex_of_obj Format.std_formatter obj in
+*)
+ let obj, info = PO.optimize_obj obj in
+(*
+ let _ = ProceduralTeX.tex_of_obj Format.std_formatter obj in
+*)
let aobj, ids_to_inner_sorts, ids_to_inner_types = get_aobj obj in
let term_pp = term2pres ~map_unicode_to_tex (n - 8) ids_to_inner_sorts in
let lazy_term_pp = term_pp in
let obj_pp = CicNotationPp.pp_obj term_pp in
- let aux = GrafiteAstPp.pp_statement
- ~map_unicode_to_tex ~term_pp ~lazy_term_pp ~obj_pp in
+ let stm_pp =
+ GrafiteAstPp.pp_statement
+ ~map_unicode_to_tex ~term_pp ~lazy_term_pp ~obj_pp
+ in
+ let aux = function
+ | G.Executable (_, G.Command (_, G.Obj (_, N.Inductive _))) as stm
+ ->
+ enable_notations false;
+ let str = stm_pp stm in enable_notations true; str
+(* FG: we disable notation for Inductive to avoid recursive notation *)
+ | stm -> stm_pp stm
+ in
let script =
Acic2Procedural.procedural_of_acic_object
- ~ids_to_inner_sorts ~ids_to_inner_types
+ ~ids_to_inner_sorts ~ids_to_inner_types ~info
?depth ?flavour prefix aobj
in
- "\n\n" ^ String.concat "" (List.map aux script)
+ String.concat "" (List.map aux script) ^ "\n\n"
let cic_prefix = Str.regexp_string "cic:/"
let matita_prefix = Str.regexp_string "cic:/matita/"
let _, s = List.fold_left replacement (false, s) replacements in
UM.uri_of_string s
+let discharge_name s = s ^ "_discharged"
+
let txt_of_inline_uri ~map_unicode_to_tex style ?flavour prefix suri =
+(*
+ Ds.debug := true;
+*)
let print_exc = function
| ProofEngineHelpers.Bad_pattern s as e ->
Printexc.to_string e ^ " " ^ Lazy.force s
in
let dbd = LibraryDb.instance () in
let sorted_uris = MetadataDeps.sorted_uris_of_baseuri ~dbd suri in
+ let error uri e =
+ let msg =
+ Printf.sprintf
+ "ERROR IN THE GENERATION OF %s\nEXCEPTION: %s"
+ (UM.string_of_uri uri) e
+ in
+ Printf.eprintf "%s\n" msg;
+ GrafiteTypes.command_error msg
+ in
let map uri =
+ Librarian.time_stamp "AT: BEGIN MAP";
try
(* FG: for now the explicit variables must be discharged *)
- let do_it obj = txt_of_cic_object ~map_unicode_to_tex 78 style ?flavour prefix obj in
- let obj, real = Ds.discharge_uri (discharge_uri style) uri in
+ let do_it obj =
+ let r = txt_of_cic_object ~map_unicode_to_tex 78 style ?flavour prefix obj in
+ Librarian.time_stamp "AT: END MAP "; r
+ in
+ let obj, real =
+ let s = UM.string_of_uri uri in
+ if Str.string_match matita_prefix s 0 then begin
+ Librarian.time_stamp "AT: GETTING OBJECT";
+ let obj, _ = E.get_obj Un.default_ugraph uri in
+ Librarian.time_stamp "AT: DONE ";
+ obj, true
+ end else
+ Ds.discharge_uri discharge_name (discharge_uri style) uri
+ in
if real then do_it obj else
let newuri = discharge_uri style uri in
- let _lemmas = LS.add_obj GE.refinement_toolkit newuri obj in
+ let _lemmas = LS.add_obj ~pack_coercion_obj:CicRefine.pack_coercion_obj newuri obj in
do_it obj
with
- | e ->
- let msg =
- Printf.sprintf
- "ERROR IN THE GENERATION OF %s\nEXCEPTION: %s"
- (UM.string_of_uri uri) (print_exc e)
- in
- Printf.eprintf "%s\n" msg;
- GrafiteTypes.command_error msg
+ | TC.TypeCheckerFailure s ->
+ error uri ("failure : " ^ Lazy.force s)
+ | TC.AssertFailure s ->
+ error uri ("assert : " ^ Lazy.force s)
+ | E.Object_not_found u ->
+ error uri ("not found: " ^ UM.string_of_uri u)
+ | e -> error uri (print_exc e)
in
String.concat "" (List.map map sorted_uris)
(* procedural_txt_of_cic_term *)
let procedural_txt_of_cic_term ~map_unicode_to_tex n ?depth context term =
+ let term, _info = PO.optimize_term context term in
let annterm, ids_to_inner_sorts, ids_to_inner_types =
try Cic2acic.acic_term_of_cic_term context term
with e ->
~ids_to_inner_sorts ~ids_to_inner_types ?depth "" context annterm
in
String.concat "" (List.map aux script)
+;;
+
+(****************************************************************************)
+
+let txt_of_macro ~map_unicode_to_tex metasenv context m =
+ GrafiteAstPp.pp_macro
+ ~term_pp:(txt_of_cic_term ~map_unicode_to_tex 80 metasenv context)
+ ~lazy_term_pp:(fun (f : Cic.lazy_term) ->
+ let t,metasenv,_ = f context metasenv CicUniv.empty_ugraph in
+ txt_of_cic_term ~map_unicode_to_tex 80 metasenv context t)
+ m
+;;
+
+
projects / helm.git / blobdiff