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 eval_unification_hint status t n =
let metasenv,subst,status,t =
- GrafiteDisambiguate.disambiguate_nterm None status [] [] [] ("",0,t) in
+ GrafiteDisambiguate.disambiguate_nterm status None [] [] [] ("",0,t) in
assert (metasenv=[]);
let t = NCicUntrusted.apply_subst subst [] t in
let status = basic_eval_unification_hint (t,n) status in
status#auto_cache l)
;;
+let basic_eval_interpretation (dsc, (symbol, args), cic_appl_pattern) status =
+ let status =
+ Interpretations.add_interpretation status dsc (symbol, args) cic_appl_pattern
+ in
+ let mode = GrafiteAst.WithPreferences (*assert false*) in (* MATITA 1.0 VEDI SOTTO *)
+ let diff =
+ [DisambiguateTypes.Symbol (symbol, 0), GrafiteAst.Symbol_alias (symbol,0,dsc)]
+ in
+ GrafiteDisambiguate.set_proof_aliases status ~implicit_aliases:false mode diff
+;;
+
+let inject_interpretation =
+ let basic_eval_interpretation (dsc, (symbol, args), cic_appl_pattern)
+ ~refresh_uri_in_universe ~refresh_uri_in_term ~refresh_uri_in_reference
+ =
+ let rec refresh =
+ function
+ NotationPt.NRefPattern (NReference.Ref (uri,spec)) ->
+ NotationPt.NRefPattern
+ (NReference.reference_of_spec (NCicLibrary.refresh_uri uri) spec)
+ | NotationPt.VarPattern _
+ | NotationPt.ImplicitPattern as x -> x
+ | NotationPt.ApplPattern l -> NotationPt.ApplPattern (List.map refresh l)
+ in
+ let cic_appl_pattern = refresh cic_appl_pattern in
+ basic_eval_interpretation (dsc, (symbol, args), cic_appl_pattern)
+ in
+ GrafiteTypes.Serializer.register#run "interpretation"
+ basic_eval_interpretation
+;;
+
+let eval_interpretation status data=
+ let status = basic_eval_interpretation data status in
+ let dump = inject_interpretation data::status#dump in
+ status#set_dump dump
+;;
+
+let basic_eval_alias (mode,diff) status =
+ GrafiteDisambiguate.set_proof_aliases status ~implicit_aliases:false mode diff
+;;
+
+let inject_alias =
+ 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 eval_alias status data=
+ let status = basic_eval_alias data status in
+ let dump = inject_alias data::status#dump in
+ status#set_dump dump
+;;
+
+let basic_eval_input_notation (l1,l2) status =
+ GrafiteParser.extend status l1
+ (fun env loc ->
+ NotationPt.AttributedTerm
+ (`Loc loc,TermContentPres.instantiate_level2 env l2))
+;;
+
+let inject_input_notation =
+ let basic_eval_input_notation (l1,l2)
+ ~refresh_uri_in_universe ~refresh_uri_in_term ~refresh_uri_in_reference
+ =
+ 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"
+ basic_eval_input_notation
+;;
+
+let eval_input_notation status data=
+ let status = basic_eval_input_notation data status in
+ let dump = inject_input_notation data::status#dump in
+ status#set_dump dump
+;;
+
+let basic_eval_output_notation (l1,l2) status =
+ TermContentPres.add_pretty_printer status l2 l1
+;;
+
+let inject_output_notation =
+ let basic_eval_output_notation (l1,l2)
+ ~refresh_uri_in_universe ~refresh_uri_in_term ~refresh_uri_in_reference
+ =
+ 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"
+ basic_eval_output_notation
+;;
+
+let eval_output_notation status data=
+ let status = basic_eval_output_notation data status in
+ let dump = inject_output_notation data::status#dump in
+ status#set_dump dump
+;;
+
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
- assert false; (* mode must be passed to GrafiteTypes.Serializer.require
+ 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
- LexiconSync.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 = LexiconSync.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 ->
(fun status (name,cpos,arity) ->
try
let metasenv,subst,status,t =
- GrafiteDisambiguate.disambiguate_nterm None status [] [] []
+ GrafiteDisambiguate.disambiguate_nterm status None [] [] []
("",0,NotationPt.Ident (name,None)) in
assert (metasenv = [] && subst = []);
let status, nuris =
NCicCoercDeclaration.
basic_eval_and_record_ncoercion_from_t_cpos_arity
- status (name,t,cpos,arity)
- in
- LexiconSync.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)
else
let metasenv,subst,status,sort = match sort with
| None -> [],[],status,NCic.Sort NCic.Prop
- | Some s -> GrafiteDisambiguate.disambiguate_nterm None status [] [] []
- (text,prefix_len,s)
+ | Some s ->
+ GrafiteDisambiguate.disambiguate_nterm status None [] [] []
+ (text,prefix_len,s)
in
assert (metasenv = []);
let sort = NCicReduction.whd ~subst [] sort in
- let sort = match sort with
+ let sort =
+ match sort with
NCic.Sort s -> s
- | _ -> raise (Invalid_argument (Printf.sprintf "ninverter: found target %s, which is not a sort"
- (NCicPp.ppterm ~metasenv ~subst ~context:[] sort)))
- in
+ | _ ->
+ raise (Invalid_argument (Printf.sprintf
+ "ninverter: found target %s, which is not a sort"
+ (NCicPp.ppterm ~metasenv ~subst ~context:[] sort))) in
let status = status#set_ng_mode `ProofMode in
let metasenv,subst,status,indty =
- GrafiteDisambiguate.disambiguate_nterm None status [] [] subst (text,prefix_len,indty) in
- let indtyno,(_,leftno,tys,_,_) = match indty with
- NCic.Const ((NReference.Ref (_,NReference.Ind (_,indtyno,_))) as r) ->
- indtyno, NCicEnvironment.get_checked_indtys r
- | _ -> prerr_endline ("engine: indty =" ^ NCicPp.ppterm ~metasenv:[] ~subst:[] ~context:[] indty) ; assert false in
+ GrafiteDisambiguate.disambiguate_nterm status None [] [] subst
+ (text,prefix_len,indty) in
+ let indtyno,(_,leftno,tys,_,_) =
+ match indty with
+ NCic.Const ((NReference.Ref (_,NReference.Ind (_,indtyno,_))) as r) ->
+ indtyno, NCicEnvironment.get_checked_indtys r
+ | _ ->
+ prerr_endline ("engine: indty =" ^ NCicPp.ppterm ~metasenv:[]
+ ~subst:[] ~context:[] indty);
+ assert false in
let it = List.nth tys indtyno in
- let status,obj = NInversion.mk_inverter name true it leftno ?selection sort
- status status#baseuri in
- let _,_,menv,_,_ = obj in
- (match menv with
- [] ->
- eval_ncommand ~include_paths opts status ("",0,GrafiteAst.NQed Stdpp.dummy_loc)
- | _ -> assert false)
+ let status,obj =
+ NInversion.mk_inverter name true it leftno ?selection sort
+ status status#baseuri in
+ let _,_,menv,_,_ = obj in
+ (match menv with
+ [] ->
+ eval_ncommand ~include_paths opts status
+ ("",0,GrafiteAst.NQed Stdpp.dummy_loc)
+ | _ -> assert false)
| GrafiteAst.NUnivConstraint (loc,u1,u2) ->
eval_add_constraint status [`Type,u1] [`Type,u2]
(* ex lexicon commands *)
| GrafiteAst.Interpretation (loc, dsc, (symbol, args), cic_appl_pattern) ->
- let rec disambiguate =
- function
- NotationPt.ApplPattern l ->
- NotationPt.ApplPattern (List.map disambiguate l)
- | NotationPt.VarPattern id
- when not
- (List.exists
- (function (NotationPt.IdentArg (_,id')) -> id'=id) args)
- ->
- let item = DisambiguateTypes.Id id in
- begin try
- match DisambiguateTypes.Environment.find item status#lstatus.LexiconTypes.aliases with
- GrafiteAst.Ident_alias (_, uri) ->
- NotationPt.NRefPattern (NReference.reference_of_string uri)
- | _ -> assert false
- with Not_found ->
- prerr_endline
- ("LexiconEngine.eval_command: domain item not found: " ^
- (DisambiguateTypes.string_of_domain_item item));
- LexiconEngine.dump_aliases prerr_endline "" status;
- raise
- (Failure
- ((DisambiguateTypes.string_of_domain_item item) ^ " not found"))
- end
- | p -> p
+ let cic_appl_pattern =
+ GrafiteDisambiguate.disambiguate_cic_appl_pattern status args
+ cic_appl_pattern
in
- let cic_appl_pattern = disambiguate cic_appl_pattern in
- let status =
- Interpretations.add_interpretation status
- dsc (symbol, args) cic_appl_pattern in
- let mode = GrafiteAst.WithPreferences (*assert false*) in (* VEDI SOTTO *)
- let diff =
- [DisambiguateTypes.Symbol (symbol, 0),
- GrafiteAst.Symbol_alias (symbol,0,dsc)] in
- let status =
- LexiconEngine.set_proof_aliases status ~implicit_aliases:false mode diff
- in
- status
- (*assert false*) (* MANCA SALVATAGGIO SU DISCO CHE DEVE TENERE IN CONTO
- IL MODE WithPreference/WithOutPreferences*)
+ eval_interpretation status (dsc,(symbol, args),cic_appl_pattern)
| GrafiteAst.Notation (loc, dir, l1, associativity, precedence, l2) ->
let l1 =
CicNotationParser.check_l1_pattern
l1 (dir = Some `RightToLeft) precedence associativity
in
let status =
- if dir <> Some `RightToLeft then
- GrafiteParser.extend status l1
- (fun env loc ->
- NotationPt.AttributedTerm
- (`Loc loc,TermContentPres.instantiate_level2 env l2))
+ if dir <> Some `RightToLeft then eval_input_notation status (l1,l2)
else status
in
- let status =
- if dir <> Some `LeftToRight then
- let status = TermContentPres.add_pretty_printer status l2 l1 in
- status
- else
- status
- in
-(* assert false (* MANCA SALVATAGGIO SU DISCO *) *)
- status (* capire [] XX *)
+ if dir <> Some `LeftToRight then eval_output_notation status (l1,l2)
+ else status
| GrafiteAst.Alias (loc, spec) ->
let diff =
(*CSC: Warning: this code should be factorized with the corresponding
| GrafiteAst.Number_alias (instance,desc) ->
[DisambiguateTypes.Num instance,spec]
in
- let mode = assert false in (* VEDI SOPRA *)
- LexiconEngine.set_proof_aliases status ~implicit_aliases:false mode diff;
- assert false (* MANCA SALVATAGGIO SU DISCO *)
+ let mode = GrafiteAst.WithPreferences in(*assert false in (* VEDI SOPRA *) MATITA 1.0*)
+ eval_alias status (mode,diff)
;;
let eval_comment opts status (text,prefix_len,c) = status
projects / helm.git / blobdiff