X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaInterpreter.ml;h=c9d5a71612d7e1893c11b033307b518d54759eec;hb=7fa9e7d3dc6f62aa3ec0b21375c43f4b512fb5f2;hp=b891f4e9457c2d059d710445dbc61ee03a42e270;hpb=e3c0cc9893402419e363ad6616a599f194438273;p=helm.git diff --git a/helm/matita/matitaInterpreter.ml b/helm/matita/matitaInterpreter.ml index b891f4e94..c9d5a7161 100644 --- a/helm/matita/matitaInterpreter.ml +++ b/helm/matita/matitaInterpreter.ml @@ -46,9 +46,11 @@ let uri name = UriManager.uri_of_string (sprintf "%s/%s" BuildTimeConf.base_uri name) *) -let baseuri = ref "cic:/matita" +let baseuri = lazy (ref ("cic:/matita/" ^ Helm_registry.get "matita.owner")) +let basedir = ref ((Unix.getpwuid (Unix.getuid ())).Unix.pw_dir) ;; + let qualify name = - let baseuri = !baseuri in + let baseuri = !(Lazy.force baseuri) in if baseuri.[String.length baseuri - 1] = '/' then baseuri ^ name else @@ -149,17 +151,28 @@ class sharedState (* do nothing, just for compatibility with coq syntax *) New_state Command | TacticAst.Command (TacticAst.Baseuri (Some uri)) -> - baseuri := uri; + Lazy.force baseuri := uri; console#echo_message (sprintf "base uri set to \"%s\"" uri); Quiet | TacticAst.Command (TacticAst.Baseuri None) -> - console#echo_message (sprintf "base uri is \"%s\"" !baseuri); + console#echo_message (sprintf "base uri is \"%s\"" + !(Lazy.force baseuri)); + Quiet + | TacticAst.Command (TacticAst.Basedir (Some path)) -> + basedir := path; + console#echo_message (sprintf "base dir set to \"%s\"" path); + Quiet + | TacticAst.Command (TacticAst.Basedir None) -> + console#echo_message (sprintf "base dir is \"%s\"" !basedir); Quiet | TacticAst.Command (TacticAst.Check term) -> let (_, _, term,ugraph) = disambiguate ~disambiguator ~currentProof term in let (context, metasenv) = get_context_and_metasenv currentProof in +(* this is the Eval Compute + let term = CicReduction.whd context term in +*) let dummyno = CicMkImplicit.new_meta metasenv [] in let ty,ugraph1 = CicTypeChecker.type_of_aux' metasenv context term ugraph @@ -180,6 +193,20 @@ class sharedState in (* TODO ZACK: show URIs to the user *) Quiet + | TacticAst.Command (TacticAst.Print `Env) -> + let uris = CicEnvironment.list_uri () in + console#echo_message "Environment:"; + List.iter (fun u -> + console#echo_message (" " ^ (UriManager.string_of_uri u)) + ) uris; + Quiet + | TacticAst.Command (TacticAst.Print `Coer) -> + let uris = CoercGraph.get_coercions_list () in + console#echo_message "Coercions:"; + List.iter (fun (s,t,u) -> + console#echo_message (" " ^ (UriManager.string_of_uri u)) + ) uris; + Quiet | tactical -> raise (Command_error (TacticAstPp.pp_tactical tactical)) end @@ -256,17 +283,110 @@ let inddef_of_ast params indTypes (disambiguator:MatitaTypes.disambiguator) = let cicIndTypes = List.rev cicIndTypes in (UriManager.uri_of_string uri, (cicIndTypes, [], paramsno)) +let + save_object_to_disk uri obj += + (* generate annobj, ids_to_inner_sorts and ids_to_inner_types *) + let annobj,_,_,ids_to_inner_sorts,ids_to_inner_types,_,_ = + Cic2acic.acic_object_of_cic_object ~eta_fix:false obj + in + + (* prepare XML *) + let xml, bodyxml = + Cic2Xml.print_object uri ~ids_to_inner_sorts ~ask_dtd_to_the_getter:false + annobj + in + let xmlinnertypes = + Cic2Xml.print_inner_types uri ~ids_to_inner_sorts ~ids_to_inner_types + ~ask_dtd_to_the_getter:false + in + + (* prepare URIs and paths *) + let innertypesuri = UriManager.innertypesuri_of_uri uri in + let bodyuri = UriManager.bodyuri_of_uri uri in + let innertypesfilename = Str.replace_first (Str.regexp "^cic:") "" + (UriManager.string_of_uri innertypesuri) ^ ".xml" in + let innertypespath = !basedir ^ "/" ^ innertypesfilename in + let xmlfilename = Str.replace_first (Str.regexp "^cic:") "" + (UriManager.string_of_uri uri) ^ ".xml" in + let xmlpath = !basedir ^ "/" ^ xmlfilename in + let xmlbodyfilename = Str.replace_first (Str.regexp "^cic:") "" + (UriManager.string_of_uri uri) ^ ".body.xml" in + let xmlbodypath = !basedir ^ "/" ^ xmlbodyfilename in + let path_scheme_of path = "file:/" ^ path in + + (* now write to disk *) + Xml.pp ~quiet:true xmlinnertypes (Some innertypespath) ; + Xml.pp ~quiet:true xml (Some xmlpath) ; + + (* now register to the getter *) + Http_getter.register' innertypesuri (path_scheme_of innertypespath); + Http_getter.register' uri (path_scheme_of xmlpath); + + (* now the optional body, both write and register *) + (match bodyxml,bodyuri with + None,None -> () + | Some bodyxml,Some bodyuri-> + Xml.pp ~quiet:true bodyxml (Some xmlbodypath) ; + Http_getter.register' bodyuri (path_scheme_of xmlbodypath) + | _-> assert false) +;; + + + (* TODO Zack a lot more to be done here: * - save object to disk in xml format * - register uri to the getter * - save universe file *) -let add_constant_to_world ~dbd ~uri ?body ~ty ?(attrs = []) ~ugraph () = - let name = UriManager.name_of_uri uri in - let obj = Cic.Constant (name, body, ty, [], attrs) in - let ugraph = CicUnivUtils.clean_and_fill uri obj ugraph in - CicEnvironment.add_type_checked_term uri (obj, ugraph); - MetadataDb.index_constant ~dbd - ~owner:(Helm_registry.get "matita.owner") ~uri ~body ~ty +let add_constant_to_world ~(console:MatitaTypes.console) + ~dbd ~uri ?body ~ty ?(params = []) ?(attrs = []) ~ugraph () += + let suri = UriManager.string_of_uri uri in + if CicEnvironment.in_library uri then + error (sprintf "%s constant already defined" suri) + else begin + let name = UriManager.name_of_uri uri in + let obj = Cic.Constant (name, body, ty, params, attrs) in + let ugraph = CicUnivUtils.clean_and_fill uri obj ugraph in + CicEnvironment.add_type_checked_term uri (obj, ugraph); + MetadataDb.index_constant ~dbd + ~owner:(Helm_registry.get "matita.owner") ~uri ~body ~ty; + save_object_to_disk uri obj; + console#echo_message (sprintf "%s constant defined" suri) + end + +let add_inductive_def_to_world ~(console:MatitaTypes.console) + ~dbd ~uri ~indTypes ?(params = []) ?(leftno = 0) ?(attrs = []) ~ugraph () += + let suri = UriManager.string_of_uri uri in + if CicEnvironment.in_library uri then + error (sprintf "%s inductive type already defined" suri) + else begin + let name = UriManager.name_of_uri uri in + let obj = Cic.InductiveDefinition (indTypes, params, leftno, attrs) in + let ugraph = CicUnivUtils.clean_and_fill uri obj ugraph in + CicEnvironment.put_inductive_definition uri (obj, ugraph); + MetadataDb.index_inductive_def ~dbd + ~owner:(Helm_registry.get "matita.owner") ~uri ~types:indTypes; + save_object_to_disk uri obj; + console#echo_message (sprintf "%s inductive type defined" suri); + let elim sort = + try + let obj = CicElim.elim_of ~sort uri 0 in + let (name, body, ty, attrs) = split_obj obj in + let suri = qualify name ^ ".con" in + let uri = UriManager.uri_of_string suri in + (* TODO Zack: make CicElim returns a universe *) + let ugraph = CicUniv.empty_ugraph in + add_constant_to_world ~console ~dbd ~uri ?body ~ty ~attrs ~ugraph (); +(* + console#echo_message + (sprintf "%s eliminator (automatically) defined" suri) +*) + with CicElim.Can_t_eliminate -> () + in + List.iter elim [ Cic.Prop; Cic.Set; (Cic.Type (CicUniv.fresh ())) ]; + end (** Implements phrases that should be accepted only in Command state *) class commandState @@ -310,9 +430,10 @@ class commandState in let body = CicMetaSubst.apply_subst subst body_cic in let ty = CicMetaSubst.apply_subst subst type_cic in - add_constant_to_world ~dbd ~uri ~body ~ty ~ugraph (); + add_constant_to_world ~console ~dbd ~uri ~body ~ty ~ugraph (); Quiet | TacticAst.Command (TacticAst.Inductive (params, indTypes)) -> + let (uri, (indTypes, params, leftno)) = inddef_of_ast params indTypes disambiguator in @@ -320,25 +441,9 @@ class commandState let ugraph = CicTypeChecker.typecheck_mutual_inductive_defs uri (indTypes, params, leftno) CicUniv.empty_ugraph - in - let ugraph = CicUnivUtils.clean_and_fill uri obj ugraph in - CicEnvironment.put_inductive_definition uri (obj, ugraph); - MetadataDb.index_inductive_def ~dbd - ~owner:(Helm_registry.get "matita.owner") ~uri ~types:indTypes; - let elim sort = - try - let obj = CicElim.elim_of ~sort uri 0 in - let (name, body, ty, attrs) = split_obj obj in - let suri = qualify name ^ ".con" in - let uri = UriManager.uri_of_string suri in - (* TODO Zack: make CicElim returns a universe *) - let ugraph = CicUniv.empty_ugraph in - add_constant_to_world ~dbd ~uri ?body ~ty ~attrs ~ugraph (); - console#echo_message - (sprintf "%s eliminator (automatically) defined" suri) - with CicElim.Can_t_eliminate -> () in - List.iter elim [ Cic.Prop; Cic.Set; (Cic.Type (CicUniv.fresh ())) ]; + add_inductive_def_to_world ~console + ~dbd ~uri ~indTypes ~params ~leftno ~ugraph (); Quiet | TacticAst.Command TacticAst.Quit -> currentProof#quit (); @@ -346,6 +451,84 @@ class commandState | TacticAst.Command TacticAst.Proof -> (* do nothing, just for compatibility with coq syntax *) New_state Command + | TacticAst.Command (TacticAst.Coercion c_ast) -> + let env, metasenv, coercion, ugraph = + disambiguator#disambiguateTermAst c_ast + in + let coer_uri,coer_ty = + match coercion with + | Cic.Const (uri,_) + | Cic.Var (uri,_) -> + let o,_ = + CicEnvironment.get_obj CicUniv.empty_ugraph uri + in + (match o with + | Cic.Constant (_,_,ty,_,_) + | Cic.Variable (_,_,ty,_,_) -> + uri,ty + | _ -> assert false) + | Cic.MutConstruct (uri,t,c,_) -> + let o,_ = + CicEnvironment.get_obj CicUniv.empty_ugraph uri + in + (match o with + | Cic.InductiveDefinition (l,_,_,_) -> + let (_,_,_,cl) = List.nth l t in + let (_,cty) = List.nth cl c in + uri,cty + | _ -> assert false) + | _ -> assert false + in + (* we have to get the source and the tgt type uri + * in Coq syntax we have already their names, but + * since we don't support Funclass and similar I think + * all the coercion should be of the form + * (A:?)(B:?)T1->T2 + * So we should be able to extract them from the coercion type + *) + let extract_last_two_p ty = + let rec aux = function + | Cic.Prod( _, src, Cic.Prod (n,t1,t2)) -> aux (Cic.Prod(n,t1,t2)) + | Cic.Prod( _, src, tgt) -> src, tgt + | _ -> assert false + in + aux ty + in + let rec uri_of_term = function + | Cic.Const(u,_) -> u + | Cic.MutInd (u, i , _) -> + (* we have to build by hand the #xpointer *) + let base = UriManager.string_of_uri u in + let xp = "#xpointer(1/" ^ (string_of_int (i+1)) ^ ")" in + UriManager.uri_of_string (base ^ xp) + | Cic.Appl (he::_) -> uri_of_term he + | t -> + prerr_endline ("Fallisco a estrarre la uri di " ^ + (CicPp.ppterm t)); + assert false + in + let ty_src,ty_tgt = extract_last_two_p coer_ty in + let src_uri = uri_of_term ty_src in + let tgt_uri = uri_of_term ty_tgt in + let coercions_to_add = + CoercGraph.close_coercion_graph src_uri tgt_uri coer_uri + in + (* FIXME: we should chek it this object can be a coercion + * maybe add the check to extract_last_two_p + *) + console#echo_message (sprintf "Coercion %s" + (UriManager.string_of_uri coer_uri)); + List.iter (fun (uri,obj,ugraph) -> + (* + console#echo_message + (sprintf "Coercion (automatic) %s" + (UriManager.string_of_uri uri)); + *) + let (name, body, ty, attrs) = split_obj obj in + add_constant_to_world ~console + ~dbd ~uri ?body ~ty ~attrs ~ugraph (); + ) coercions_to_add; + Quiet | tactical -> shared#evalTactical tactical end @@ -453,7 +636,7 @@ class proofState CicReduction.are_convertible [] proved_ty ty ugraph in if not b then failwith "Wrong proof"; - add_constant_to_world ~dbd ~uri ~body:bo ~ty ~ugraph (); + add_constant_to_world ~console ~dbd ~uri ~body:bo ~ty ~ugraph (); currentProof#abort (); (match mathViewer with None -> () | Some v -> v#unload ()); console#echo_message (sprintf "%s defined" suri); @@ -496,7 +679,7 @@ class interpreter | _ -> () method private eval f = - let ok () = console#clear (); (true, true) in + let ok () = (* console#clear (); *) (true, true) in match console#wrap_exn f with | Some (New_state Command) -> (state <- commandState); ok () | Some (New_state Proof) -> (state <- proofState); ok ()