FreshNamesGenerator.mk_fresh_name ~subst:[] metasenv context name ~typ
let tactic_of_ast = function
- | TacticAst.Intros (_, _, names) ->
+ | TacticAst.Intros (_, None, names) ->
(* TODO Zack implement intros length *)
PrimitiveTactics.intros_tac ~mk_fresh_name_callback:(namer_of names) ()
+ | TacticAst.Intros (_, Some num, names) ->
+ (* TODO Zack implement intros length *)
+ PrimitiveTactics.intros_tac ~howmany:num ~mk_fresh_name_callback:(namer_of names) ()
| TacticAst.Reflexivity _ -> Tactics.reflexivity
| TacticAst.Assumption _ -> Tactics.assumption
| TacticAst.Contradiction _ -> Tactics.contradiction
| TacticAst.Cut (_, term) -> Tactics.cut term
| TacticAst.Elim (_, term, _) ->
(* TODO Zack implement "using" argument *)
- Tactics.elim_intros_simpl term
+ (* old: Tactics.elim_intros_simpl term *)
+ Tactics.elim_intros term
| TacticAst.ElimType (_, term) -> Tactics.elim_type term
| TacticAst.Replace (_, what, with_what) -> Tactics.replace ~what ~with_what
| TacticAst.Auto (_,num) ->
| TacticAst.Fold of reduction_kind * 'term
| TacticAst.Injection of 'ident
| TacticAst.LetIn of 'term * 'ident
- | TacticAst.Reduce of reduction_kind * 'term pattern * 'ident option
| TacticAst.Replace_pattern of 'term pattern * 'term
- | TacticAst.Rewrite of direction * 'term * 'ident option
*)
+ | TacticAst.Reduce (_,reduction_kind,opts) ->
+ let terms, also_in_hypotheses =
+ match opts with
+ | Some (l,`Goal) -> Some l, false
+ | Some (l,`Everywhere) -> Some l, true
+ | None -> None, false
+ in
+ (match reduction_kind with
+ | `Reduce -> Tactics.reduce ~also_in_hypotheses ~terms
+ | `Simpl -> Tactics.simpl ~also_in_hypotheses ~terms
+ | `Whd -> Tactics.whd ~also_in_hypotheses ~terms)
+ | TacticAst.Rewrite (_,dir,t,ident) ->
+ if dir = `Left then
+ EqualityTactics.rewrite_tac ~term:t
+ else
+ EqualityTactics.rewrite_back_tac ~term:t
| _ -> assert false
let eval_tactical status tac =
in
apply_tactic (tactical_of_ast tac)
+(** given a uri and a type list (the contructors types) builds a list of pairs
+ * (name,uri) that is used to generate authomatic aliases **)
+let extract_alias types uri =
+ fst(List.fold_left (
+ fun (acc,i) (name, _, _, cl) ->
+ ((name, UriManager.string_of_uriref (uri,[i]))
+ ::
+ (fst(List.fold_left (
+ fun (acc,j) (name,_) ->
+ (((name,UriManager.string_of_uriref (uri,[i;j])) :: acc) , j+1)
+ ) (acc,1) cl))),i+1
+ ) ([],0) types)
+
+(** adds a (name,uri) list l to a disambiguation environment e **)
+let env_of_list l e =
+ let module DT = DisambiguateTypes in
+ let module DTE = DisambiguateTypes.Environment in
+ List.fold_left (
+ fun e (name,uri) ->
+ DTE.add
+ (DT.Id name)
+ (uri,fun _ _ _ -> CicUtil.term_of_uri uri)
+ e
+ ) e l
+
let eval_command status cmd =
match cmd with
| TacticAst.Set (loc, name, value) -> set_option status name value
"type you've declared!");
MatitaLog.message (sprintf "%s defined" suri);
let status = MatitaSync.add_constant ~uri ~body:bo ~ty ~ugraph status in
+ let status =
+ let name = UriManager.name_of_uri uri in
+ let new_env = env_of_list [(name,suri)] status.aliases in
+ {status with aliases = new_env }
+ in
{status with proof_status = No_proof }
| TacticAst.Inductive (loc, dummy_params, types) ->
(* dummy_params are not real params, it is a list of nothing, and the only
CicTypeChecker.typecheck_mutual_inductive_defs uri
(types, [], leftno) CicUniv.empty_ugraph
in
+ let status =
MatitaSync.add_inductive_def
- ~uri ~types ~params:[] ~leftno ~ugraph status;
+ ~uri ~types ~params:[] ~leftno ~ugraph status
+ in
+ (* aliases for the constructors and types *)
+ let aliases = env_of_list (extract_alias types uri) status.aliases in
+ (* aliases for the eliminations principles *)
+ let aliases =
+ let base = String.sub suri 0 (String.length suri - 4) in
+ env_of_list
+ (List.fold_left (
+ fun acc suffix ->
+ if List.exists (
+ fun (uri,_) -> UriManager.string_of_uri uri = base ^ suffix
+ ) status.objects then
+ let u = base ^ suffix in
+ (UriManager.name_of_uri (UriManager.uri_of_string u),u)::acc
+ else
+ acc
+ ) [] ["_ind.con";"_rec.con";"_rec_t.con"]) aliases
+ in
+ let status = {status with proof_status = No_proof } in
+ { status with aliases = aliases}
| TacticAst.Theorem (loc, thm_flavour, Some name, ty, None) ->
let uri =
UriManager.uri_of_string (MatitaMisc.qualify status name ^ ".con")
"metasenv not empty while giving a definition with body";
let body = CicMetaSubst.apply_subst subst body in
let ty = CicMetaSubst.apply_subst subst ty in
- MatitaSync.add_constant ~uri ~body ~ty ~ugraph status
+ let status = MatitaSync.add_constant ~uri ~body ~ty ~ugraph status in
+ let status =
+ let suri = UriManager.string_of_uri uri in
+ let new_env = env_of_list [(name,suri)] status.aliases in
+ {status with aliases = new_env }
+ in
+ {status with proof_status = No_proof}
| TacticAst.Theorem (_, _, None, _, _) ->
command_error "The grammas should avoid having unnamed theorems!"
| TacticAst.Coercion (loc, term) -> assert false (** TODO *)
(DisambiguateTypes.Num instance)
(DisambiguateChoices.lookup_num_by_dsc desc) status.aliases }
-let eval status st =
- match st with
+let eval_executable status ex =
+ match ex with
| TacticAst.Tactical (_, tac) -> eval_tactical status tac
| TacticAst.Command (_, cmd) -> eval_command status cmd
| TacticAst.Macro (_, mac) ->
command_error (sprintf "The macro %s can't be in a script"
(TacticAstPp.pp_macro_cic mac))
+let eval_comment status c = status
+
+let eval status st =
+ match st with
+ | TacticAst.Executable (_,ex) -> eval_executable status ex
+ | TacticAst.Comment (_,c) -> eval_comment status c
+
let disambiguate_term status term =
let (aliases, metasenv, cic, _) =
match
| TacticAst.Fold of reduction_kind * 'term
| TacticAst.Injection of 'ident
| TacticAst.LetIn of 'term * 'ident
- | TacticAst.Reduce of reduction_kind * 'term pattern * 'ident option
| TacticAst.Replace_pattern of 'term pattern * 'term
- | TacticAst.Rewrite of direction * 'term * 'ident option
*)
+ | TacticAst.Reduce (loc, reduction_kind, opts) ->
+ let status, opts =
+ match opts with
+ | None -> status, None
+ | Some (l,pat) ->
+ let status, l =
+ List.fold_right (fun t (status,acc) ->
+ let status',t' = disambiguate_term status t in
+ status', t'::acc)
+ l (status,[])
+ in
+ status, Some (l, pat)
+ in
+ status, TacticAst.Reduce (loc, reduction_kind, opts)
+ | TacticAst.Rewrite (loc,dir,t,ident) ->
+ let status, term = disambiguate_term status t in
+ status, TacticAst.Rewrite (loc,dir,term,ident)
| TacticAst.Intros (loc, num, names) ->
status, TacticAst.Intros (loc, num, names)
| TacticAst.Auto (loc,num) -> status, TacticAst.Auto (loc,num)
status, cmd
| TacticAst.Alias _ as x -> status, x
-let disambiguate_statement status statement =
- match statement with
+let disambiguate_executable status ex =
+ match ex with
| TacticAst.Tactical (loc, tac) ->
let status, tac = disambiguate_tactical status tac in
status, (TacticAst.Tactical (loc, tac))
command_error
(sprintf ("The engine is not allowed to disambiguate any macro, "^^
"in particular %s") (TacticAstPp.pp_macro_ast mac))
+
+let disambiguate_comment status c =
+ match c with
+ | TacticAst.Note (loc,n) -> status, TacticAst.Note (loc,n)
+ | TacticAst.Code (loc,ex) ->
+ let status, ex = disambiguate_executable status ex in
+ status, TacticAst.Code (loc,ex)
+
+let disambiguate_statement status statement =
+ match statement with
+ | TacticAst.Comment (loc,c) ->
+ let status, c = disambiguate_comment status c in
+ status, TacticAst.Comment (loc,c)
+ | TacticAst.Executable (loc,ex) ->
+ let status, ex = disambiguate_executable status ex in
+ status, TacticAst.Executable (loc,ex)
let eval_ast status ast =
let status,st = disambiguate_statement status ast in
(* this disambiguation step should be deferred to support tacticals *)
eval status st
-let eval_from_stream status str =
- let st = CicTextualParser2.parse_statement str in
- eval_ast status st
+let eval_from_stream status str cb =
+ let stl = CicTextualParser2.parse_statements str in
+ List.fold_left
+ (fun status ast -> cb status ast;eval_ast status ast) status
+ stl
let eval_string status str =
- eval_from_stream status (Stream.of_string str)
+ eval_from_stream status (Stream.of_string str) (fun _ _ -> ())
let default_options () =
let options =
projects / helm.git / blobdiff