X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Facic_content%2FtermAcicContent.ml;h=508411d2847b1b84083141efa5bbe14aed16a8fa;hb=84e770b58ae08a345087de816aba29bc2fc727ba;hp=470ab6b3f413d710ef4f502e3f4232c258da2587;hpb=eb9ca860db8cb06083765f7698179f16dee5303e;p=helm.git diff --git a/helm/software/components/acic_content/termAcicContent.ml b/helm/software/components/acic_content/termAcicContent.ml index 470ab6b3f..508411d28 100644 --- a/helm/software/components/acic_content/termAcicContent.ml +++ b/helm/software/components/acic_content/termAcicContent.ml @@ -109,7 +109,7 @@ let ast_of_acic0 ~output_type term_info acic k = | Cic.AProd (id,n,s,t) -> let binder_kind = match sort_of_id id with - | `Set | `Type _ -> `Pi + | `Set | `Type _ | `NType _ -> `Pi | `Prop | `CProp _ -> `Forall in idref id (Ast.Binder (binder_kind, @@ -470,7 +470,9 @@ let remove_interpretation id = let _ = load_patterns32 [] -let instantiate_appl_pattern env appl_pattern = +let instantiate_appl_pattern + ~mk_appl ~mk_implicit ~term_of_uri env appl_pattern += let lookup name = try List.assoc name env with Not_found -> @@ -478,10 +480,10 @@ let instantiate_appl_pattern env appl_pattern = assert false in let rec aux = function - | Ast.UriPattern uri -> CicUtil.term_of_uri uri - | Ast.ImplicitPattern -> Cic.Implicit None + | Ast.UriPattern uri -> term_of_uri uri + | Ast.ImplicitPattern -> mk_implicit false | Ast.VarPattern name -> lookup name - | Ast.ApplPattern terms -> Cic.Appl (List.map aux terms) + | Ast.ApplPattern terms -> mk_appl (List.map aux terms) in aux appl_pattern