X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Flibrary%2FlibrarySync.ml;h=11dccaaa1208b870e8c5d1028adf7fdbd5ac6487;hb=53c57446be6916c1f4c450e8a9de07f8448a26ae;hp=5897d62ba8c81256b3213af333c9a1d0cbf03baa;hpb=262d2831a751e4fb4c3eef6fbfaaf7146b793aac;p=helm.git diff --git a/helm/software/components/library/librarySync.ml b/helm/software/components/library/librarySync.ml index 5897d62ba..11dccaaa1 100644 --- a/helm/software/components/library/librarySync.ml +++ b/helm/software/components/library/librarySync.ml @@ -70,24 +70,24 @@ let save_object_to_disk uri obj ugraph univlist = HExtlib.mkdir dir in (* generate annobj, ids_to_inner_sorts and ids_to_inner_types *) - let annobj, innertypes = + let annobj, innertypes, ids_to_inner_sorts = if Helm_registry.get_bool "matita.system" then - let annobj, _, _, ids_to_inner_sorts, ids_to_inner_types, _, _ = + let annobj, _, _, ids_to_inner_sorts, ids_to_inner_types, _, _ = Cic2acic.acic_object_of_cic_object obj in let innertypesxml = Cic2Xml.print_inner_types uri ~ids_to_inner_sorts ~ids_to_inner_types ~ask_dtd_to_the_getter:false in - annobj, Some innertypesxml + annobj, Some innertypesxml, Some ids_to_inner_sorts else let annobj = Cic2acic.plain_acic_object_of_cic_object obj in - annobj, None + annobj, None, None in (* prepare XML *) let xml, bodyxml = Cic2Xml.print_object - uri ?ids_to_inner_sorts:None ~ask_dtd_to_the_getter:false annobj + uri ?ids_to_inner_sorts ~ask_dtd_to_the_getter:false annobj in let xmlpath, xmlbodypath, innertypespath, bodyuri, innertypesuri, xmlunivgraphpath, univgraphuri = @@ -314,13 +314,13 @@ let add_coercion ~add_composites refinement_toolkit uri arity saturations baseuri in let new_coercions = - List.filter (fun (s,t,u,saturations,obj) -> not(already_in_obj s t u obj)) + List.filter (fun (s,t,u,_,obj,_) -> not(already_in_obj s t u obj)) new_coercions in - let composite_uris = List.map (fun (_,_,uri,_,_) -> uri) new_coercions in + let composite_uris = List.map (fun (_,_,uri,_,_,_) -> uri) new_coercions in (* update the DB *) List.iter - (fun (src,tgt,uri,saturations,_) -> + (fun (src,tgt,uri,saturations,_,_) -> CoercDb.add_coercion (src,tgt,uri,saturations)) new_coercions; CoercDb.add_coercion (src_carr, tgt_carr, uri, saturations); @@ -328,9 +328,8 @@ let add_coercion ~add_composites refinement_toolkit uri arity saturations let lemmas = if add_composites then List.fold_left - (fun acc (_,tgt,uri,saturations,obj) -> + (fun acc (_,tgt,uri,saturations,obj,arity) -> add_single_obj uri obj refinement_toolkit; - let arity = match tgt with CoercDb.Fun n -> n | _ -> 0 in (uri,arity,saturations)::acc) [] new_coercions else