| Cic.ASort (id,Cic.Type u) -> idref id (Ast.Sort (`Type u))
| Cic.ASort (id,Cic.CProp u) -> idref id (Ast.Sort (`CProp u))
| Cic.AImplicit (id, Some `Hole) -> idref id Ast.UserInput
- | Cic.AImplicit (id, _) -> idref id Ast.Implicit
+ | Cic.AImplicit (id, _) -> idref id (Ast.Implicit `JustOne)
| Cic.AProd (id,n,s,t) ->
let binder_kind =
match sort_of_id id with
try HExtlib.split_nth (cpos+sats+1) tl with Failure _ -> [],[]
in
if rest = [] then
- idref aid (List.nth (List.map k tl) cpos)
+ idref aid (k (List.nth tl cpos))
else
idref aid (Ast.Appl (List.map k (List.nth tl cpos::rest)))
else
- idref aid (Ast.Appl (List.map k tl))
+ idref aid (Ast.Appl (List.map k args))
else
idref aid (Ast.Appl (List.map k args)))
| Cic.AAppl (aid,args) ->
let compiled32 = ref None
let pattern32_matrix = ref []
let counter = ref ~-1
+let find_level2_patterns32 pid = Hashtbl.find !level2_patterns32 pid;;
let stack = ref []
in
let _, symbol, args, _ =
try
- Hashtbl.find !level2_patterns32 pid
+ find_level2_patterns32 pid
with Not_found -> assert false
in
let ast = instantiate32 term_info idrefs env' symbol args in
Ast.AttributedTerm (`IdRef (CicUtil.id_of_annterm annterm), ast)
-let load_patterns32 t =
+let load_patterns32s =
+ let load_patterns32 t =
let t =
HExtlib.filter_map (function (true, ap, id) -> Some (ap, id) | _ -> None) t
in
- set_compiled32 (lazy (Acic2astMatcher.Matcher32.compiler t))
+ set_compiled32 (lazy (Acic2astMatcher.Matcher32.compiler t))
+ in
+ ref [load_patterns32]
+;;
+
+let add_load_patterns32 f = load_patterns32s := f :: !load_patterns32s;;
let ast_of_acic ~output_type id_to_sort annterm =
debug_print (lazy ("ast_of_acic <- "
let id = fresh_id () in
Hashtbl.add !level2_patterns32 id (dsc, symbol, args, appl_pattern);
pattern32_matrix := (true, appl_pattern, id) :: !pattern32_matrix;
- load_patterns32 !pattern32_matrix;
+ List.iter (fun f -> f !pattern32_matrix) !load_patterns32s;
(try
let ids = Hashtbl.find !interpretations symbol in
ids := id :: !ids
!pattern32_matrix
in
pattern32_matrix := pattern32_matrix';
- load_patterns32 !pattern32_matrix
+ List.iter (fun f -> f !pattern32_matrix) !load_patterns32s
exception Interpretation_not_found
with Not_found -> raise Interpretation_not_found);
pattern32_matrix :=
List.filter (fun (_, _, id') -> id <> id') !pattern32_matrix;
- load_patterns32 !pattern32_matrix
+ List.iter (fun f -> f !pattern32_matrix) !load_patterns32s
-let _ = load_patterns32 []
+let init () = List.iter (fun f -> f []) !load_patterns32s
let instantiate_appl_pattern
- ~mk_appl ~mk_implicit ~term_of_uri env appl_pattern
+ ~mk_appl ~mk_implicit ~term_of_uri ~term_of_nref env appl_pattern
=
let lookup name =
try List.assoc name env
in
let rec aux = function
| Ast.UriPattern uri -> term_of_uri uri
+ | Ast.NRefPattern nref -> term_of_nref nref
| Ast.ImplicitPattern -> mk_implicit false
| Ast.VarPattern name -> lookup name
| Ast.ApplPattern terms -> mk_appl (List.map aux terms)