| 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,
| Cic.AAppl (aid,(Cic.AConst _ as he::tl as args))
| Cic.AAppl (aid,(Cic.AMutInd _ as he::tl as args))
| Cic.AAppl (aid,(Cic.AMutConstruct _ as he::tl as args)) as t ->
- let last_n n l =
- let rec aux =
- function
- [] -> assert false
- | [_] as l -> l,1
- | he::tl ->
- let (res,len) as res' = aux tl in
- if len < n then
- he::res,len + 1
- else
- res'
- in
- match fst (aux l) with
- [] -> assert false
- | [t] -> t
- | Ast.AttributedTerm (_,(Ast.Appl l))::tl ->
- idref aid (Ast.Appl (l@tl))
- | l -> idref aid (Ast.Appl l)
- in
(match LibraryObjects.destroy_nat t with
| Some n -> idref aid (Ast.Num (string_of_int n, -1))
| None ->
let deannot_he = Deannotate.deannotate_term he in
- if CoercDb.is_a_coercion' deannot_he && !Acic2content.hide_coercions
- then
- (match CoercDb.is_a_coercion_to_funclass deannot_he with
- | None -> idref aid (last_n 1 (List.map k tl))
- | Some i -> idref aid (last_n (i+1) (List.map k tl)))
+ let coercion_info = CoercDb.is_a_coercion deannot_he in
+ if coercion_info <> None && !Acic2content.hide_coercions then
+ match coercion_info with
+ | None -> assert false
+ | Some (_,_,_,sats,cpos) ->
+ if cpos < List.length tl then
+ let _,rest =
+ try HExtlib.split_nth (cpos+sats+1) tl with Failure _ -> [],[]
+ in
+ if rest = [] then
+ idref aid (List.nth (List.map k tl) cpos)
+ else
+ idref aid (Ast.Appl (List.map k (List.nth tl cpos::rest)))
+ else
+ idref aid (Ast.Appl (List.map k tl))
else
idref aid (Ast.Appl (List.map k args)))
| Cic.AAppl (aid,args) ->
(* persistent state *)
-let level2_patterns32 = Hashtbl.create 211
-let interpretations = Hashtbl.create 211 (* symb -> id list ref *)
+let initial_level2_patterns32 () = Hashtbl.create 211
+let initial_interpretations () = Hashtbl.create 211
+let level2_patterns32 = ref (initial_level2_patterns32 ())
+(* symb -> id list ref *)
+let interpretations = ref (initial_interpretations ())
let compiled32 = ref None
let pattern32_matrix = ref []
+let counter = ref ~-1
+
+let stack = ref []
+
+let push () =
+ stack := (!counter,!level2_patterns32,!interpretations,!compiled32,!pattern32_matrix)::!stack;
+ counter := ~-1;
+ level2_patterns32 := initial_level2_patterns32 ();
+ interpretations := initial_interpretations ();
+ compiled32 := None;
+ pattern32_matrix := []
+;;
+
+let pop () =
+ match !stack with
+ [] -> assert false
+ | (ocounter,olevel2_patterns32,ointerpretations,ocompiled32,opattern32_matrix)::old ->
+ stack := old;
+ counter := ocounter;
+ level2_patterns32 := olevel2_patterns32;
+ interpretations := ointerpretations;
+ compiled32 := ocompiled32;
+ pattern32_matrix := opattern32_matrix
+;;
let get_compiled32 () =
match !compiled32 with
let instantiate32 term_info idrefs env symbol args =
let rec instantiate_arg = function
| Ast.IdentArg (n, name) ->
- let t = (try List.assoc name env with Not_found -> assert false) in
+ let t =
+ try List.assoc name env
+ with Not_found -> prerr_endline ("name not found in env: "^name);
+ assert false
+ in
let rec count_lambda = function
| Ast.AttributedTerm (_, t) -> count_lambda t
| Ast.Binder (`Lambda, _, body) -> 1 + count_lambda body
in
let _, symbol, args, _ =
try
- Hashtbl.find level2_patterns32 pid
+ Hashtbl.find !level2_patterns32 pid
with Not_found -> assert false
in
let ast = instantiate32 term_info idrefs env' symbol args in
debug_print (lazy ("ast_of_acic -> " ^ CicNotationPp.pp_term ast));
ast, term_info.uri
-let counter = ref ~-1
-let reset () = counter := ~-1;;
let fresh_id =
fun () ->
incr counter;
let add_interpretation dsc (symbol, args) appl_pattern =
let id = fresh_id () in
- Hashtbl.add level2_patterns32 id (dsc, symbol, args, appl_pattern);
+ Hashtbl.add !level2_patterns32 id (dsc, symbol, args, appl_pattern);
pattern32_matrix := (true, appl_pattern, id) :: !pattern32_matrix;
load_patterns32 !pattern32_matrix;
(try
- let ids = Hashtbl.find interpretations symbol in
+ let ids = Hashtbl.find !interpretations symbol in
ids := id :: !ids
- with Not_found -> Hashtbl.add interpretations symbol (ref [id]));
+ with Not_found -> Hashtbl.add !interpretations symbol (ref [id]));
id
let get_all_interpretations () =
(function (_, _, id) ->
let (dsc, _, _, _) =
try
- Hashtbl.find level2_patterns32 id
+ Hashtbl.find !level2_patterns32 id
with Not_found -> assert false
in
(id, dsc))
(fun id ->
let (dsc, _, args, appl_pattern) =
try
- Hashtbl.find level2_patterns32 id
+ Hashtbl.find !level2_patterns32 id
with Not_found -> assert false
in
dsc, args, appl_pattern)
- !(Hashtbl.find interpretations symbol)))
+ !(Hashtbl.find !interpretations symbol)))
with Not_found -> raise Interpretation_not_found
let remove_interpretation id =
(try
- let _, symbol, _, _ = Hashtbl.find level2_patterns32 id in
- let ids = Hashtbl.find interpretations symbol in
+ let dsc, symbol, _, _ = Hashtbl.find !level2_patterns32 id in
+ let ids = Hashtbl.find !interpretations symbol in
ids := List.filter ((<>) id) !ids;
- Hashtbl.remove level2_patterns32 id;
+ Hashtbl.remove !level2_patterns32 id;
with Not_found -> raise Interpretation_not_found);
pattern32_matrix :=
List.filter (fun (_, _, id') -> id <> id') !pattern32_matrix;
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 ->
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