let inject_unification_hint =
let basic_eval_unification_hint (t,n)
- ~refresh_uri_in_universe
- ~refresh_uri_in_term
+ ~refresh_uri_in_universe ~refresh_uri_in_term ~refresh_uri_in_reference
=
let t = refresh_uri_in_term t in basic_eval_unification_hint (t,n)
in
let inject_interpretation =
let basic_eval_interpretation (dsc, (symbol, args), cic_appl_pattern)
- ~refresh_uri_in_universe ~refresh_uri_in_term
+ ~refresh_uri_in_universe ~refresh_uri_in_term ~refresh_uri_in_reference
=
let rec refresh =
function
;;
let inject_alias =
- let basic_eval_alias (mode,diff) ~refresh_uri_in_universe ~refresh_uri_in_term=
+ let basic_eval_alias (mode,diff) ~refresh_uri_in_universe ~refresh_uri_in_term
+ ~refresh_uri_in_reference =
basic_eval_alias (mode,diff)
in
GrafiteTypes.Serializer.register#run "alias" basic_eval_alias
let inject_input_notation =
let basic_eval_input_notation (l1,l2)
- ~refresh_uri_in_universe ~refresh_uri_in_term
+ ~refresh_uri_in_universe ~refresh_uri_in_term ~refresh_uri_in_reference
=
- let l1 = CicNotationParser.refresh_uri_in_checked_l1_pattern l1 in
- let l2 = NotationUtil.refresh_uri_in_term l2 in
+ let l1 =
+ CicNotationParser.refresh_uri_in_checked_l1_pattern
+ ~refresh_uri_in_term ~refresh_uri_in_reference l1 in
+ let l2 = NotationUtil.refresh_uri_in_term
+ ~refresh_uri_in_term ~refresh_uri_in_reference l2
+ in
basic_eval_input_notation (l1,l2)
in
GrafiteTypes.Serializer.register#run "input_notation"
let inject_output_notation =
let basic_eval_output_notation (l1,l2)
- ~refresh_uri_in_universe ~refresh_uri_in_term
+ ~refresh_uri_in_universe ~refresh_uri_in_term ~refresh_uri_in_reference
=
- let l1 = CicNotationParser.refresh_uri_in_checked_l1_pattern l1 in
- let l2 = NotationUtil.refresh_uri_in_term l2 in
+ let l1 =
+ CicNotationParser.refresh_uri_in_checked_l1_pattern
+ ~refresh_uri_in_term ~refresh_uri_in_reference l1 in
+ let l2 = NotationUtil.refresh_uri_in_term
+ ~refresh_uri_in_term ~refresh_uri_in_reference l2
+ in
basic_eval_output_notation (l1,l2)
in
GrafiteTypes.Serializer.register#run "output_notation"
;;
let record_index_obj =
- let aux l
- ~refresh_uri_in_universe
- ~refresh_uri_in_term
+ let aux l ~refresh_uri_in_universe
+ ~refresh_uri_in_term ~refresh_uri_in_reference
=
basic_index_obj
(List.map
let record_index_eq =
let basic_index_eq uri
- ~refresh_uri_in_universe
- ~refresh_uri_in_term
+ ~refresh_uri_in_universe ~refresh_uri_in_term ~refresh_uri_in_reference
= index_eq (NCicLibrary.refresh_uri uri)
in
GrafiteTypes.Serializer.register#run "index_eq" basic_index_eq
let inject_constraint =
let basic_eval_add_constraint (u1,u2)
- ~refresh_uri_in_universe
- ~refresh_uri_in_term
+ ~refresh_uri_in_universe ~refresh_uri_in_term ~refresh_uri_in_reference
=
let u1 = refresh_uri_in_universe u1 in
let u2 = refresh_uri_in_universe u2 in
| GrafiteAst.NUnfocus _ -> NTactics.unfocus_tac
| GrafiteAst.NWildcard _ -> NTactics.wildcard_tac
| GrafiteAst.NTry (_,tac) -> NTactics.try_tac
- (aux f (text, prefix_len, tac))
+ (f f (text, prefix_len, tac))
| GrafiteAst.NAssumption _ -> NTactics.assumption_tac
| GrafiteAst.NBlock (_,l) ->
NTactics.block_tac (List.map (fun x -> aux f (text,prefix_len,x)) l)
status#set_obj(u,h,NCicUntrusted.apply_subst_metasenv subst metasenv,subst,o)
;;
+let is_proof_irrelevant context ty =
+ match
+ NCicReduction.whd ~subst:[] context
+ (NCicTypeChecker.typeof ~subst:[] ~metasenv:[] context ty)
+ with
+ NCic.Sort NCic.Prop -> true
+ | NCic.Sort _ -> false
+ | _ -> assert false
+;;
+
+let rec relevance_of ?(context=[]) ty =
+ match NCicReduction.whd ~subst:[] context ty with
+ NCic.Prod (n,s,t) ->
+ not (is_proof_irrelevant context s) ::
+ relevance_of ~context:((n,NCic.Decl s)::context) t
+ | _ -> []
+;;
+
+let compute_relevance uri =
+ function
+ NCic.Constant (_,name,bo,ty,attrs) ->
+ let relevance = relevance_of ty in
+ NCic.Constant (relevance,name,bo,ty,attrs)
+ | NCic.Fixpoint (ind,funs,attrs) ->
+ let funs =
+ List.map
+ (fun (_,name,recno,ty,bo) ->
+ let relevance = relevance_of ty in
+ relevance,name,recno,ty,bo
+ ) funs
+ in
+ NCic.Fixpoint (ind,funs,attrs)
+ | NCic.Inductive (ind,leftno,tys,attrs) ->
+ let context =
+ List.rev_map (fun (_,name,arity,_) -> name,NCic.Decl arity) tys in
+ let tysno = List.length tys in
+ let tys =
+ List.map
+ (fun (_,name,arity,cons) ->
+ let relevance = relevance_of arity in
+ let cons =
+ List.map
+ (fun (_,name,ty) ->
+ let dety =
+ NCicTypeChecker.debruijn uri tysno ~subst:[] [] ty in
+ let relevance = relevance_of ~context dety in
+ relevance,name,ty
+ ) cons
+ in
+ (relevance,name,arity,cons)
+ ) tys
+ in
+ NCic.Inductive (ind,leftno,tys,attrs)
+;;
+
let rec eval_ncommand ~include_paths opts status (text,prefix_len,cmd) =
match cmd with
GrafiteTypes.Serializer.require ~baseuri:(NUri.uri_of_string baseuri)
status in
let status = status#set_dump (obj::status#dump) in
+ let status = status#set_dependencies (fname::status#dependencies) in
(*assert false;*) (* MATITA 1.0mode must be passed to GrafiteTypes.Serializer.require
somehow *)
status
| GrafiteAst.UnificationHint (loc, t, n) -> eval_unification_hint status t n
| GrafiteAst.NCoercion (loc, name, t, ty, source, target) ->
let status, composites =
- NCicCoercDeclaration.eval_ncoercion status name t ty source target
- in
- GrafiteDisambiguate.add_aliases_for_objs status composites
+ NCicCoercDeclaration.eval_ncoercion status name t ty source target in
+ let mode = GrafiteAst.WithPreferences in (* MATITA 1.0: fixme *)
+ let aliases = GrafiteDisambiguate.aliases_for_objs composites in
+ eval_alias status (mode,aliases)
| GrafiteAst.NQed loc ->
if status#ng_mode <> `ProofMode then
raise (GrafiteTypes.Command_error "Not in proof mode")
NCicUntrusted.map_obj_kind (fix ()) obj_kind
| _ -> obj_kind
in
+ let obj_kind = compute_relevance uri obj_kind in
let obj = uri,height,[],[],obj_kind in
let old_status = status in
let status = NCicLibrary.add_obj status obj in
let uris = uri::List.rev uris_rev in
*)
let status = status#set_ng_mode `CommandMode in
- let status = GrafiteDisambiguate.add_aliases_for_objs status [uri] in
+ let xxaliases = GrafiteDisambiguate.aliases_for_objs [uri] in
+ let mode = GrafiteAst.WithPreferences in (* MATITA 1.0: fixme *)
+ let status = eval_alias status (mode,xxaliases) in
let status =
List.fold_left
(fun status boxml ->
let status, nuris =
NCicCoercDeclaration.
basic_eval_and_record_ncoercion_from_t_cpos_arity
- status (name,t,cpos,arity)
- in
- GrafiteDisambiguate.add_aliases_for_objs status nuris
+ status (name,t,cpos,arity) in
+ let aliases = GrafiteDisambiguate.aliases_for_objs nuris in
+ eval_alias status (mode,aliases)
with MultiPassDisambiguator.DisambiguationError _->
HLog.warn ("error in generating coercion: "^name);
status)
projects / helm.git / blobdiff