C.Sort C.Prop -> "Prop"
| C.Sort C.Set -> "Set"
| C.Sort C.Type -> "Type"
- | C.Sort C.CProp -> "CProp"
+ | C.Sort C.CProp -> "CProp"
+ | C.Meta _ ->
+prerr_endline "Cic2acic: string_of_sort applied to a meta" ;
+ "?"
| _ -> assert false
in
let ainnertypes,innertype,innersort,expected_available =
ids_to_terms,ids_to_father_ids,ids_to_inner_sorts,ids_to_hypotheses
;;
-let acic_object_of_cic_object obj =
+let acic_object_of_cic_object ?(eta_fix=true) obj =
let module C = Cic in
let module E = Eta_fixing in
let ids_to_terms = Hashtbl.create 503 in
let aconjecture_of_conjecture' = aconjecture_of_conjecture seed
ids_to_terms ids_to_father_ids ids_to_inner_sorts ids_to_inner_types
ids_to_hypotheses hypotheses_seed in
+ let eta_fix metasenv t =
+ if eta_fix then E.eta_fix metasenv t else t
+ in
let aobj =
match obj with
C.Constant (id,Some bo,ty,params) ->
- let bo' = E.eta_fix [] bo in
- let ty' = E.eta_fix [] ty in
+ let bo' = eta_fix [] bo in
+ let ty' = eta_fix [] ty in
let abo = acic_term_of_cic_term' bo' (Some ty') in
let aty = acic_term_of_cic_term' ty' None in
C.AConstant
("mettereaposto",Some "mettereaposto2",id,Some abo,aty,params)
| C.Constant (id,None,ty,params) ->
- let ty' = E.eta_fix [] ty in
+ let ty' = eta_fix [] ty in
let aty = acic_term_of_cic_term' ty' None in
C.AConstant
("mettereaposto",None,id,None,aty,params)
| C.Variable (id,bo,ty,params) ->
- let ty' = E.eta_fix [] ty in
+ let ty' = eta_fix [] ty in
let abo =
match bo with
None -> None
| Some bo ->
- let bo' = E.eta_fix [] bo in
+ let bo' = eta_fix [] bo in
Some (acic_term_of_cic_term' bo' (Some ty'))
in
let aty = acic_term_of_cic_term' ty' None in
("mettereaposto",id,abo,aty, params)
| C.CurrentProof (id,conjectures,bo,ty,params) ->
let conjectures' =
+ (*CSC: This code is bugged, since it does a List.map instead
+ * of a List.fold, withouth calling eta_fixing with the
+ * current context. Indeed, eta_fix always starts now in the
+ * empty context. Instead of fixing this piece of code and
+ * adding a new argument to eta_fix, I just skip eta_fixing
+ * of the CurrentProof metasenv. Does this break well-typedness?
List.map
(function (i,canonical_context,term) ->
let canonical_context' =
List.map
(function
None -> None
- | Some (n, C.Decl t)-> Some (n, C.Decl (E.eta_fix conjectures t))
+ | Some (n, C.Decl t)-> Some (n, C.Decl (eta_fix conjectures t))
| Some (n, C.Def (t,None)) ->
- Some (n, C.Def ((E.eta_fix conjectures t),None))
+ Some (n, C.Def ((eta_fix conjectures t),None))
| Some (_,C.Def (_,Some _)) -> assert false
) canonical_context
in
- let term' = E.eta_fix conjectures term in
+ let term' = eta_fix conjectures term in
(i,canonical_context',term')
- ) conjectures
+ ) conjectures *)
+ conjectures
in
let aconjectures =
List.map
(cid,i,(List.rev revacanonical_context),aterm)
) conjectures' in *)
let time1 = Sys.time () in
- let bo' = E.eta_fix conjectures' bo in
- let ty' = E.eta_fix conjectures' ty in
+ let bo' = eta_fix conjectures' bo in
+ let ty' = eta_fix conjectures' ty in
let time2 = Sys.time () in
prerr_endline
("++++++++++ Tempi della eta_fix: "^ string_of_float (time2 -. time1)) ;