k s, k t))
| 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)) ->
+ | Cic.AAppl (aid,(Cic.AMutConstruct _ as he::tl as args)) as t ->
let last_n n l =
let rec aux =
function
idref aid (Ast.Appl (l@tl))
| l -> idref aid (Ast.Appl l)
in
- 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))
- else
- idref aid (Ast.Appl (List.map k args))
+ (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)))
+ else
+ idref aid (Ast.Appl (List.map k args)))
| Cic.AAppl (aid,args) ->
idref aid (Ast.Appl (List.map k args))
| Cic.AConst (id,uri,substs) ->
(fun (name, ty) pat ->
incr j;
let (capture_variables, rhs) = eat_branch lpsno ty pat in
- ((name, Some (ctor_puri !j), capture_variables), rhs))
- constructors patterns
+ Ast.Pattern (name, Some (ctor_puri !j), capture_variables), rhs
+ ) constructors patterns
with Invalid_argument _ -> assert false
in
idref id (Ast.Case (k te, Some case_indty, Some (k ty), patterns))