X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2FmatitaScript.ml;h=4c35019bca8308c408b8462be9255a2a68cab40d;hb=37900b93fb87f68fefa0814abe24a123a4d20e02;hp=0e51213096292c4caf09b2b93058fbf024f8e169;hpb=bb42469b8aa1ccb0b2a5ca1d402c43ed0def1c08;p=helm.git diff --git a/helm/software/matita/matitaScript.ml b/helm/software/matita/matitaScript.ml index 0e5121309..4c35019bc 100644 --- a/helm/software/matita/matitaScript.ml +++ b/helm/software/matita/matitaScript.ml @@ -234,7 +234,7 @@ let rec eval_macro include_paths (buffer : GText.buffer) guistuff lexicon_status guistuff.mathviewer#show_uri_list ~reuse:true ~entry l; [], "", parsed_text_length | TA.WHint (loc, term) -> - let s = ((None,[0,[],term], Cic.Meta (0,[]) ,term),0) 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 (pp_macro mac, l) in guistuff.mathviewer#show_uri_list ~reuse:true ~entry l; @@ -288,7 +288,7 @@ let rec eval_macro include_paths (buffer : GText.buffer) guistuff lexicon_status let t_and_ty = Cic.Cast (term,ty) in guistuff.mathviewer#show_entry (`Cic (t_and_ty,metasenv)); [], "", parsed_text_length - | TA.Inline (_,suri) -> + | TA.Inline (_,style,suri,prefix) -> let dbd = LibraryDb.instance () in let uris = let sql_pat = @@ -328,10 +328,12 @@ prerr_endline "Fine sorting"; (fun uri -> prerr_endline ("Stampo " ^ UriManager.string_of_uri uri); try - ObjPp.obj_to_string 80 + ObjPp.obj_to_string 78 style prefix (* FG: mi pare meglio 78 *) (fst (CicEnvironment.get_obj CicUniv.empty_ugraph uri)) with - _ (* BRRRRRRRRR *) -> "ERRORE IN STAMPA DI " ^ UriManager.string_of_uri uri + | e (* BRRRRRRRRR *) -> + Printf.sprintf "\n(* ERRORE IN STAMPA DI %s\nEXCEPTION: %s *)\n" + (UriManager.string_of_uri uri) (Printexc.to_string e) ) sorted_uris_without_xpointer) in [],declarative,String.length parsed_text