- applyTransformation: notation disabled when rendering reconstructed inductive types to avoid notation conflict between notation and inductive type syntax
- lexicon/lexiconEngine: better error messages and one callback removed
- termAcicContent: in lookup_interpretations, sorting the returned interpretations is optional and defaults to true (as before)
- disambiguateChoices: in lookup_symbol_by_dsc, the interpretations are not sorted before choosing, sorting them here is a bug because their order is lost so the chosen one is not the most recent
- grafiteParser: better callback functions for the drop feature of matitac, we introduced module name abbreviations for our convenience
- syntax_extensions/.depend: something is wrong with the Makefiles, this .depend is commited every time :(
exception Interpretation_not_found
exception Interpretation_not_found
-let lookup_interpretations symbol =
+let lookup_interpretations ?(sorted=true) symbol =
- HExtlib.list_uniq
- (List.sort Pervasives.compare
- (List.map
- (fun id ->
- let (dsc, _, args, appl_pattern) =
- try
- Hashtbl.find !level2_patterns32 id
- with Not_found -> assert false
- in
- dsc, args, appl_pattern)
- !(Hashtbl.find !interpretations symbol)))
+ let raw =
+ List.map (
+ fun id ->
+ let (dsc, _, args, appl_pattern) =
+ try
+ Hashtbl.find !level2_patterns32 id
+ with Not_found -> assert false
+ in
+ dsc, args, appl_pattern
+ )
+ !(Hashtbl.find !interpretations symbol)
+ in
+ if sorted then HExtlib.list_uniq (List.sort Pervasives.compare raw)
+ else raw
with Not_found -> raise Interpretation_not_found
let remove_interpretation id =
with Not_found -> raise Interpretation_not_found
let remove_interpretation id =
(** @raise Interpretation_not_found *)
val lookup_interpretations:
(** @raise Interpretation_not_found *)
val lookup_interpretations:
+ ?sorted:bool -> string -> (* symbol *)
(string * CicNotationPt.argument_pattern list *
CicNotationPt.cic_appl_pattern) list
(string * CicNotationPt.argument_pattern list *
CicNotationPt.cic_appl_pattern) list
| _::_ -> mk_appl (combined::rest))
let lookup_symbol_by_dsc ~mk_appl ~mk_implicit ~term_of_uri symbol dsc =
| _::_ -> mk_appl (combined::rest))
let lookup_symbol_by_dsc ~mk_appl ~mk_implicit ~term_of_uri symbol dsc =
+ let interpretations = TermAcicContent.lookup_interpretations ~sorted:false symbol in
try
mk_choice ~mk_appl ~mk_implicit ~term_of_uri
try
mk_choice ~mk_appl ~mk_implicit ~term_of_uri
- (List.find
- (fun (dsc', _, _) -> dsc = dsc')
- (TermAcicContent.lookup_interpretations symbol))
+ (List.find (fun (dsc', _, _) -> dsc = dsc') interpretations)
with TermAcicContent.Interpretation_not_found | Not_found ->
raise (Choice_not_found (lazy (sprintf "Symbol %s, dsc %s" symbol dsc)))
with TermAcicContent.Interpretation_not_found | Not_found ->
raise (Choice_not_found (lazy (sprintf "Symbol %s, dsc %s" symbol dsc)))
-let out = ref ignore
-let set_callback f = out := f
-
-module Ast = CicNotationPt
+module N = CicNotationPt
+module G = GrafiteAst
+module L = LexiconAst
+module LE = LexiconEngine
exception NoInclusionPerformed of string (* full path *)
type 'a localized_option =
LSome of 'a
exception NoInclusionPerformed of string (* full path *)
type 'a localized_option =
LSome of 'a
- | LNone of GrafiteAst.loc
- (CicNotationPt.term, CicNotationPt.term,
- CicNotationPt.term GrafiteAst.reduction,
- CicNotationPt.term CicNotationPt.obj, string)
- GrafiteAst.statement
+ (N.term, N.term, N.term G.reduction, N.term N.obj, string) G.statement
- ?never_include:bool ->
- include_paths:string list ->
- LexiconEngine.status ->
- LexiconEngine.status * ast_statement localized_option
+ ?never_include:bool -> include_paths:string list -> LE.status ->
+ LE.status * ast_statement localized_option
type parser_status = {
grammar : Grammar.g;
type parser_status = {
grammar : Grammar.g;
- term : CicNotationPt.term Grammar.Entry.e;
+ term : N.term Grammar.Entry.e;
statement : statement Grammar.Entry.e;
}
statement : statement Grammar.Entry.e;
}
+let grafite_callback = ref (fun _ _ -> ())
+let set_grafite_callback cb = grafite_callback := cb
+
+let lexicon_callback = ref (fun _ _ -> ())
+let set_lexicon_callback cb = lexicon_callback := cb
+
let initial_parser () =
let grammar = CicNotationParser.level2_ast_grammar () in
let term = CicNotationParser.term () in
let initial_parser () =
let grammar = CicNotationParser.level2_ast_grammar () in
let term = CicNotationParser.term () in
let grafite_parser = ref (initial_parser ())
let grafite_parser = ref (initial_parser ())
-let add_raw_attribute ~text t = Ast.AttributedTerm (`Raw text, t)
+let add_raw_attribute ~text t = N.AttributedTerm (`Raw text, t)
let default_associativity = Gramext.NonA
let default_associativity = Gramext.NonA
`MutualDefinition to rememer this. *)
let name,ty =
match defs with
`MutualDefinition to rememer this. *)
let name,ty =
match defs with
- | (params,(Ast.Ident (name, None), Some ty),_,_) :: _ ->
+ | (params,(N.Ident (name, None), Some ty),_,_) :: _ ->
- (fun var ty -> Ast.Binder (`Pi,var,ty)
+ (fun var ty -> N.Binder (`Pi,var,ty)
- | (_,(Ast.Ident (name, None), None),_,_) :: _ ->
- name, Ast.Implicit
+ | (_,(N.Ident (name, None), None),_,_) :: _ ->
+ name, N.Implicit
- let body = Ast.Ident (name,None) in
+ let body = N.Ident (name,None) in
let flavour =
if List.length defs = 1 then
`Definition
let flavour =
if List.length defs = 1 then
`Definition
`MutualDefinition
in
if ng then
`MutualDefinition
in
if ng then
- GrafiteAst.NObj (loc, Ast.Theorem(flavour, name, ty,
- Some (Ast.LetRec (ind_kind, defs, body))))
+ G.NObj (loc, N.Theorem(flavour, name, ty,
+ Some (N.LetRec (ind_kind, defs, body))))
- GrafiteAst.Obj (loc, Ast.Theorem(flavour, name, ty,
- Some (Ast.LetRec (ind_kind, defs, body))))
+ G.Obj (loc, N.Theorem(flavour, name, ty,
+ Some (N.LetRec (ind_kind, defs, body))))
type by_continuation =
BYC_done
type by_continuation =
BYC_done
- | BYC_weproved of CicNotationPt.term * string option * CicNotationPt.term option
- | BYC_letsuchthat of string * CicNotationPt.term * string * CicNotationPt.term
- | BYC_wehaveand of string * CicNotationPt.term * string * CicNotationPt.term
+ | BYC_weproved of N.term * string option * N.term option
+ | BYC_letsuchthat of string * N.term * string * N.term
+ | BYC_wehaveand of string * N.term * string * N.term
let initialize_parser () =
(* {{{ parser initialization *)
let initialize_parser () =
(* {{{ parser initialization *)
LIST0
[ id = IDENT ;
path = OPT [SYMBOL ":" ; path = tactic_term -> path ] ->
LIST0
[ id = IDENT ;
path = OPT [SYMBOL ":" ; path = tactic_term -> path ] ->
- (id,match path with Some p -> p | None -> Ast.UserInput) ];
+ (id,match path with Some p -> p | None -> N.UserInput) ];
goal_path = OPT [ SYMBOL <:unicode<vdash>>; term = tactic_term -> term ] ->
let goal_path =
match goal_path, hyp_paths with
goal_path = OPT [ SYMBOL <:unicode<vdash>>; term = tactic_term -> term ] ->
let goal_path =
match goal_path, hyp_paths with
- None, [] -> Some Ast.UserInput
+ None, [] -> Some N.UserInput
| None, _::_ -> None
| Some goal_path, _ -> Some goal_path
in
| None, _::_ -> None
| Some goal_path, _ -> Some goal_path
in
] ->
let wanted,hyp_paths,goal_path =
match wanted_and_sps with
] ->
let wanted,hyp_paths,goal_path =
match wanted_and_sps with
- wanted,None -> wanted, [], Some Ast.UserInput
+ wanted,None -> wanted, [], Some N.UserInput
| wanted,Some (hyp_paths,goal_path) -> wanted,hyp_paths,goal_path
in
wanted, hyp_paths, goal_path ] ->
match res with
| wanted,Some (hyp_paths,goal_path) -> wanted,hyp_paths,goal_path
in
wanted, hyp_paths, goal_path ] ->
match res with
- None -> None,[],Some Ast.UserInput
+ None -> None,[],Some N.UserInput
| Some ps -> ps]
];
inverter_param_list: [
[ params = tactic_term ->
let deannotate = function
| Some ps -> ps]
];
inverter_param_list: [
[ params = tactic_term ->
let deannotate = function
- | Ast.AttributedTerm (_,t) | t -> t
+ | N.AttributedTerm (_,t) | t -> t
in match deannotate params with
in match deannotate params with
- | Ast.Implicit -> [false]
- | Ast.UserInput -> [true]
- | Ast.Appl l ->
+ | N.Implicit -> [false]
+ | N.UserInput -> [true]
+ | N.Appl l ->
List.map (fun x -> match deannotate x with
List.map (fun x -> match deannotate x with
- | Ast.Implicit -> false
- | Ast.UserInput -> true
+ | N.Implicit -> false
+ | N.UserInput -> true
| _ -> raise (Invalid_argument "malformed target parameter list 1")) l
| _ -> raise (Invalid_argument ("malformed target parameter list 2\n" ^ CicNotationPp.pp_term params)) ]
];
| _ -> raise (Invalid_argument "malformed target parameter list 1")) l
| _ -> raise (Invalid_argument ("malformed target parameter list 2\n" ^ CicNotationPp.pp_term params)) ]
];
];
using: [ [ using = OPT [ IDENT "using"; t = tactic_term -> t ] -> using ] ];
ntactic: [
];
using: [ [ using = OPT [ IDENT "using"; t = tactic_term -> t ] -> using ] ];
ntactic: [
- [ IDENT "napply"; t = tactic_term -> GrafiteAst.NApply (loc, t)
+ [ IDENT "napply"; t = tactic_term -> G.NApply (loc, t)
| IDENT "nassert";
seqs = LIST0 [
hyps = LIST0
| IDENT "nassert";
seqs = LIST0 [
hyps = LIST0
id,`Def (bo,ty)];
SYMBOL <:unicode<vdash>>;
concl = tactic_term -> (List.rev hyps,concl) ] ->
id,`Def (bo,ty)];
SYMBOL <:unicode<vdash>>;
concl = tactic_term -> (List.rev hyps,concl) ] ->
- GrafiteAst.NAssert (loc, seqs)
| IDENT "ncases"; what = tactic_term ; where = pattern_spec ->
| IDENT "ncases"; what = tactic_term ; where = pattern_spec ->
- GrafiteAst.NCases (loc, what, where)
+ G.NCases (loc, what, where)
| IDENT "nchange"; what = pattern_spec; "with"; with_what = tactic_term ->
| IDENT "nchange"; what = pattern_spec; "with"; with_what = tactic_term ->
- GrafiteAst.NChange (loc, what, with_what)
+ G.NChange (loc, what, with_what)
| IDENT "nelim"; what = tactic_term ; where = pattern_spec ->
| IDENT "nelim"; what = tactic_term ; where = pattern_spec ->
- GrafiteAst.NElim (loc, what, where)
+ G.NElim (loc, what, where)
| IDENT "ngeneralize"; p=pattern_spec ->
| IDENT "ngeneralize"; p=pattern_spec ->
- GrafiteAst.NGeneralize (loc, p)
| IDENT "nletin"; name = IDENT ; SYMBOL <:unicode<def>> ; t = tactic_term;
where = pattern_spec ->
| IDENT "nletin"; name = IDENT ; SYMBOL <:unicode<def>> ; t = tactic_term;
where = pattern_spec ->
- GrafiteAst.NLetIn (loc,where,t,name)
+ G.NLetIn (loc,where,t,name)
| IDENT "nrewrite"; dir = direction; what = tactic_term ; where = pattern_spec ->
| IDENT "nrewrite"; dir = direction; what = tactic_term ; where = pattern_spec ->
- GrafiteAst.NRewrite (loc, dir, what, where)
+ G.NRewrite (loc, dir, what, where)
| IDENT "nwhd"; delta = OPT [ IDENT "nodelta" -> () ];
where = pattern_spec ->
let delta = match delta with None -> true | _ -> false in
| IDENT "nwhd"; delta = OPT [ IDENT "nodelta" -> () ];
where = pattern_spec ->
let delta = match delta with None -> true | _ -> false in
- GrafiteAst.NEval (loc, where, `Whd delta)
- | SYMBOL "#"; n=IDENT -> GrafiteAst.NIntro (loc,n)
- | SYMBOL "#"; SYMBOL "_" -> GrafiteAst.NIntro (loc,"_")
- | SYMBOL "*" -> GrafiteAst.NCase1 (loc,"_")
+ G.NEval (loc, where, `Whd delta)
+ | SYMBOL "#"; n=IDENT -> G.NIntro (loc,n)
+ | SYMBOL "#"; SYMBOL "_" -> G.NIntro (loc,"_")
+ | SYMBOL "*" -> G.NCase1 (loc,"_")
- GrafiteAst.NCase1 (loc,n)
]
];
tactic: [
[ IDENT "absurd"; t = tactic_term ->
]
];
tactic: [
[ IDENT "absurd"; t = tactic_term ->
- GrafiteAst.Absurd (loc, t)
| IDENT "apply"; IDENT "rule"; t = tactic_term ->
| IDENT "apply"; IDENT "rule"; t = tactic_term ->
- GrafiteAst.ApplyRule (loc, t)
| IDENT "apply"; t = tactic_term ->
| IDENT "apply"; t = tactic_term ->
- GrafiteAst.Apply (loc, t)
| IDENT "applyP"; t = tactic_term ->
| IDENT "applyP"; t = tactic_term ->
- GrafiteAst.ApplyP (loc, t)
| IDENT "applyS"; t = tactic_term ; params = auto_params ->
| IDENT "applyS"; t = tactic_term ; params = auto_params ->
- GrafiteAst.ApplyS (loc, t, params)
+ G.ApplyS (loc, t, params)
- GrafiteAst.Assumption loc
| IDENT "autobatch"; params = auto_params ->
| IDENT "autobatch"; params = auto_params ->
- GrafiteAst.AutoBatch (loc,params)
+ G.AutoBatch (loc,params)
| IDENT "cases"; what = tactic_term;
pattern = OPT pattern_spec;
specs = intros_spec ->
let pattern = match pattern with
| IDENT "cases"; what = tactic_term;
pattern = OPT pattern_spec;
specs = intros_spec ->
let pattern = match pattern with
- | None -> None, [], Some Ast.UserInput
+ | None -> None, [], Some N.UserInput
| Some pattern -> pattern
in
| Some pattern -> pattern
in
- GrafiteAst.Cases (loc, what, pattern, specs)
+ G.Cases (loc, what, pattern, specs)
| IDENT "clear"; ids = LIST1 IDENT ->
| IDENT "clear"; ids = LIST1 IDENT ->
- GrafiteAst.Clear (loc, ids)
| IDENT "clearbody"; id = IDENT ->
| IDENT "clearbody"; id = IDENT ->
- GrafiteAst.ClearBody (loc,id)
| IDENT "change"; what = pattern_spec; "with"; t = tactic_term ->
| IDENT "change"; what = pattern_spec; "with"; t = tactic_term ->
- GrafiteAst.Change (loc, what, t)
+ G.Change (loc, what, t)
| IDENT "compose"; times = OPT int; t1 = tactic_term; t2 =
OPT [ "with"; t = tactic_term -> t ]; specs = intros_spec ->
let times = match times with None -> 1 | Some i -> i in
| IDENT "compose"; times = OPT int; t1 = tactic_term; t2 =
OPT [ "with"; t = tactic_term -> t ]; specs = intros_spec ->
let times = match times with None -> 1 | Some i -> i in
- GrafiteAst.Compose (loc, t1, t2, times, specs)
+ G.Compose (loc, t1, t2, times, specs)
| IDENT "constructor"; n = int ->
| IDENT "constructor"; n = int ->
- GrafiteAst.Constructor (loc, n)
| IDENT "contradiction" ->
| IDENT "contradiction" ->
- GrafiteAst.Contradiction loc
| IDENT "cut"; t = tactic_term; ident = OPT [ "as"; id = IDENT -> id] ->
| IDENT "cut"; t = tactic_term; ident = OPT [ "as"; id = IDENT -> id] ->
- GrafiteAst.Cut (loc, ident, t)
| IDENT "decompose"; idents = OPT [ "as"; idents = LIST1 new_name -> idents ] ->
let idents = match idents with None -> [] | Some idents -> idents in
| IDENT "decompose"; idents = OPT [ "as"; idents = LIST1 new_name -> idents ] ->
let idents = match idents with None -> [] | Some idents -> idents in
- GrafiteAst.Decompose (loc, idents)
- | IDENT "demodulate"; p = auto_params -> GrafiteAst.Demodulate (loc, p)
+ G.Decompose (loc, idents)
+ | IDENT "demodulate"; p = auto_params -> G.Demodulate (loc, p)
| IDENT "destruct"; xts = OPT [ ts = tactic_term_list1 -> ts ] ->
| IDENT "destruct"; xts = OPT [ ts = tactic_term_list1 -> ts ] ->
- GrafiteAst.Destruct (loc, xts)
| IDENT "elim"; what = tactic_term; using = using;
pattern = OPT pattern_spec;
ispecs = intros_spec ->
let pattern = match pattern with
| IDENT "elim"; what = tactic_term; using = using;
pattern = OPT pattern_spec;
ispecs = intros_spec ->
let pattern = match pattern with
- | None -> None, [], Some Ast.UserInput
+ | None -> None, [], Some N.UserInput
| Some pattern -> pattern
in
| Some pattern -> pattern
in
- GrafiteAst.Elim (loc, what, using, pattern, ispecs)
+ G.Elim (loc, what, using, pattern, ispecs)
| IDENT "elimType"; what = tactic_term; using = using;
(num, idents) = intros_spec ->
| IDENT "elimType"; what = tactic_term; using = using;
(num, idents) = intros_spec ->
- GrafiteAst.ElimType (loc, what, using, (num, idents))
+ G.ElimType (loc, what, using, (num, idents))
| IDENT "exact"; t = tactic_term ->
| IDENT "exact"; t = tactic_term ->
- GrafiteAst.Exact (loc, t)
- GrafiteAst.Exists loc
- | IDENT "fail" -> GrafiteAst.Fail loc
+ G.Exists loc
+ | IDENT "fail" -> G.Fail loc
| IDENT "fold"; kind = reduction_kind; t = tactic_term; p = pattern_spec ->
let (pt,_,_) = p in
if pt <> None then
| IDENT "fold"; kind = reduction_kind; t = tactic_term; p = pattern_spec ->
let (pt,_,_) = p in
if pt <> None then
("the pattern cannot specify the term to replace, only its"
^ " paths in the hypotheses and in the conclusion")))
else
("the pattern cannot specify the term to replace, only its"
^ " paths in the hypotheses and in the conclusion")))
else
- GrafiteAst.Fold (loc, kind, t, p)
+ G.Fold (loc, kind, t, p)
| IDENT "fwd"; hyp = IDENT; idents = OPT [ "as"; idents = LIST1 new_name -> idents ] ->
let idents = match idents with None -> [] | Some idents -> idents in
| IDENT "fwd"; hyp = IDENT; idents = OPT [ "as"; idents = LIST1 new_name -> idents ] ->
let idents = match idents with None -> [] | Some idents -> idents in
- GrafiteAst.FwdSimpl (loc, hyp, idents)
+ G.FwdSimpl (loc, hyp, idents)
| IDENT "generalize"; p=pattern_spec; id = OPT ["as" ; id = IDENT -> id] ->
| IDENT "generalize"; p=pattern_spec; id = OPT ["as" ; id = IDENT -> id] ->
- GrafiteAst.Generalize (loc,p,id)
- | IDENT "id" -> GrafiteAst.IdTac loc
+ G.Generalize (loc,p,id)
+ | IDENT "id" -> G.IdTac loc
| IDENT "intro"; ident = OPT IDENT ->
let idents = match ident with None -> [] | Some id -> [Some id] in
| IDENT "intro"; ident = OPT IDENT ->
let idents = match ident with None -> [] | Some id -> [Some id] in
- GrafiteAst.Intros (loc, (Some 1, idents))
+ G.Intros (loc, (Some 1, idents))
| IDENT "intros"; specs = intros_spec ->
| IDENT "intros"; specs = intros_spec ->
- GrafiteAst.Intros (loc, specs)
| IDENT "inversion"; t = tactic_term ->
| IDENT "inversion"; t = tactic_term ->
- GrafiteAst.Inversion (loc, t)
| IDENT "lapply";
linear = OPT [ IDENT "linear" ];
depth = OPT [ IDENT "depth"; SYMBOL "="; i = int -> i ];
| IDENT "lapply";
linear = OPT [ IDENT "linear" ];
depth = OPT [ IDENT "depth"; SYMBOL "="; i = int -> i ];
ident = OPT [ "as" ; ident = IDENT -> ident ] ->
let linear = match linear with None -> false | Some _ -> true in
let to_what = match to_what with None -> [] | Some to_what -> to_what in
ident = OPT [ "as" ; ident = IDENT -> ident ] ->
let linear = match linear with None -> false | Some _ -> true in
let to_what = match to_what with None -> [] | Some to_what -> to_what in
- GrafiteAst.LApply (loc, linear, depth, to_what, what, ident)
- | IDENT "left" -> GrafiteAst.Left loc
+ G.LApply (loc, linear, depth, to_what, what, ident)
+ | IDENT "left" -> G.Left loc
| IDENT "letin"; where = IDENT ; SYMBOL <:unicode<def>> ; t = tactic_term ->
| IDENT "letin"; where = IDENT ; SYMBOL <:unicode<def>> ; t = tactic_term ->
- GrafiteAst.LetIn (loc, t, where)
+ G.LetIn (loc, t, where)
| kind = reduction_kind; p = pattern_spec ->
| kind = reduction_kind; p = pattern_spec ->
- GrafiteAst.Reduce (loc, kind, p)
+ G.Reduce (loc, kind, p)
- GrafiteAst.Reflexivity loc
| IDENT "replace"; p = pattern_spec; "with"; t = tactic_term ->
| IDENT "replace"; p = pattern_spec; "with"; t = tactic_term ->
- GrafiteAst.Replace (loc, p, t)
| IDENT "rewrite" ; d = direction; t = tactic_term ; p = pattern_spec;
xnames = OPT [ "as"; n = ident_list0 -> n ] ->
let (pt,_,_) = p in
| IDENT "rewrite" ; d = direction; t = tactic_term ; p = pattern_spec;
xnames = OPT [ "as"; n = ident_list0 -> n ] ->
let (pt,_,_) = p in
"the pattern cannot specify the term to rewrite, only its paths in the hypotheses and in the conclusion")))
else
let n = match xnames with None -> [] | Some names -> names in
"the pattern cannot specify the term to rewrite, only its paths in the hypotheses and in the conclusion")))
else
let n = match xnames with None -> [] | Some names -> names in
- GrafiteAst.Rewrite (loc, d, t, p, n)
+ G.Rewrite (loc, d, t, p, n)
- GrafiteAst.Symmetry loc
| IDENT "transitivity"; t = tactic_term ->
| IDENT "transitivity"; t = tactic_term ->
- GrafiteAst.Transitivity (loc, t)
+ G.Transitivity (loc, t)
(* Produzioni Aggiunte *)
| IDENT "assume" ; id = IDENT ; SYMBOL ":" ; t = tactic_term ->
(* Produzioni Aggiunte *)
| IDENT "assume" ; id = IDENT ; SYMBOL ":" ; t = tactic_term ->
- GrafiteAst.Assume (loc, id, t)
| IDENT "suppose" ; t = tactic_term ; LPAREN ; id = IDENT ; RPAREN ;
t1 = OPT [IDENT "that" ; IDENT "is" ; IDENT "equivalent" ; "to" ;
t' = tactic_term -> t']->
| IDENT "suppose" ; t = tactic_term ; LPAREN ; id = IDENT ; RPAREN ;
t1 = OPT [IDENT "that" ; IDENT "is" ; IDENT "equivalent" ; "to" ;
t' = tactic_term -> t']->
- GrafiteAst.Suppose (loc, t, id, t1)
+ G.Suppose (loc, t, id, t1)
| "let" ; id1 = IDENT ; SYMBOL ":" ; t1 = tactic_term ;
IDENT "such" ; IDENT "that" ; t2=tactic_term ; LPAREN ;
id2 = IDENT ; RPAREN ->
| "let" ; id1 = IDENT ; SYMBOL ":" ; t1 = tactic_term ;
IDENT "such" ; IDENT "that" ; t2=tactic_term ; LPAREN ;
id2 = IDENT ; RPAREN ->
- GrafiteAst.ExistsElim (loc, `Auto ([],[]), id1, t1, id2, t2)
+ G.ExistsElim (loc, `Auto ([],[]), id1, t1, id2, t2)
| just =
[ IDENT "using"; t=tactic_term -> `Term t
| params = auto_params -> `Auto params] ;
cont=by_continuation ->
(match cont with
| just =
[ IDENT "using"; t=tactic_term -> `Term t
| params = auto_params -> `Auto params] ;
cont=by_continuation ->
(match cont with
- BYC_done -> GrafiteAst.Bydone (loc, just)
+ BYC_done -> G.Bydone (loc, just)
| BYC_weproved (ty,id,t1) ->
| BYC_weproved (ty,id,t1) ->
- GrafiteAst.By_just_we_proved(loc, just, ty, id, t1)
+ G.By_just_we_proved(loc, just, ty, id, t1)
| BYC_letsuchthat (id1,t1,id2,t2) ->
| BYC_letsuchthat (id1,t1,id2,t2) ->
- GrafiteAst.ExistsElim (loc, just, id1, t1, id2, t2)
+ G.ExistsElim (loc, just, id1, t1, id2, t2)
| BYC_wehaveand (id1,t1,id2,t2) ->
| BYC_wehaveand (id1,t1,id2,t2) ->
- GrafiteAst.AndElim (loc, just, id1, t1, id2, t2))
+ G.AndElim (loc, just, id1, t1, id2, t2))
| IDENT "we" ; IDENT "need" ; "to" ; IDENT "prove" ; t = tactic_term ; id = OPT [ LPAREN ; id = IDENT ; RPAREN -> id ] ; t1 = OPT [IDENT "or" ; IDENT "equivalently"; t' = tactic_term -> t']->
| IDENT "we" ; IDENT "need" ; "to" ; IDENT "prove" ; t = tactic_term ; id = OPT [ LPAREN ; id = IDENT ; RPAREN -> id ] ; t1 = OPT [IDENT "or" ; IDENT "equivalently"; t' = tactic_term -> t']->
- GrafiteAst.We_need_to_prove (loc, t, id, t1)
+ G.We_need_to_prove (loc, t, id, t1)
| IDENT "we" ; IDENT "proceed" ; IDENT "by" ; IDENT "cases" ; "on" ; t=tactic_term ; "to" ; IDENT "prove" ; t1=tactic_term ->
| IDENT "we" ; IDENT "proceed" ; IDENT "by" ; IDENT "cases" ; "on" ; t=tactic_term ; "to" ; IDENT "prove" ; t1=tactic_term ->
- GrafiteAst.We_proceed_by_cases_on (loc, t, t1)
+ G.We_proceed_by_cases_on (loc, t, t1)
| IDENT "we" ; IDENT "proceed" ; IDENT "by" ; IDENT "induction" ; "on" ; t=tactic_term ; "to" ; IDENT "prove" ; t1=tactic_term ->
| IDENT "we" ; IDENT "proceed" ; IDENT "by" ; IDENT "induction" ; "on" ; t=tactic_term ; "to" ; IDENT "prove" ; t1=tactic_term ->
- GrafiteAst.We_proceed_by_induction_on (loc, t, t1)
+ G.We_proceed_by_induction_on (loc, t, t1)
| IDENT "by" ; IDENT "induction" ; IDENT "hypothesis" ; IDENT "we" ; IDENT "know" ; t=tactic_term ; LPAREN ; id = IDENT ; RPAREN ->
| IDENT "by" ; IDENT "induction" ; IDENT "hypothesis" ; IDENT "we" ; IDENT "know" ; t=tactic_term ; LPAREN ; id = IDENT ; RPAREN ->
- GrafiteAst.Byinduction(loc, t, id)
+ G.Byinduction(loc, t, id)
| IDENT "the" ; IDENT "thesis" ; IDENT "becomes" ; t=tactic_term ->
| IDENT "the" ; IDENT "thesis" ; IDENT "becomes" ; t=tactic_term ->
- GrafiteAst.Thesisbecomes(loc, t)
+ G.Thesisbecomes(loc, t)
| IDENT "case" ; id = IDENT ; params=LIST0[LPAREN ; i=IDENT ;
SYMBOL":" ; t=tactic_term ; RPAREN -> i,t] ->
| IDENT "case" ; id = IDENT ; params=LIST0[LPAREN ; i=IDENT ;
SYMBOL":" ; t=tactic_term ; RPAREN -> i,t] ->
- GrafiteAst.Case(loc,id,params)
(* DO NOT FACTORIZE with the two following, camlp5 sucks*)
| IDENT "conclude";
termine = tactic_term;
(* DO NOT FACTORIZE with the two following, camlp5 sucks*)
| IDENT "conclude";
termine = tactic_term;
| IDENT "proof" -> `Proof
| params = auto_params -> `Auto params];
cont = rewriting_step_continuation ->
| IDENT "proof" -> `Proof
| params = auto_params -> `Auto params];
cont = rewriting_step_continuation ->
- GrafiteAst.RewritingStep(loc, Some (None,termine), t1, t2, cont)
+ G.RewritingStep(loc, Some (None,termine), t1, t2, cont)
| IDENT "obtain" ; name = IDENT;
termine = tactic_term;
SYMBOL "=" ;
| IDENT "obtain" ; name = IDENT;
termine = tactic_term;
SYMBOL "=" ;
| IDENT "proof" -> `Proof
| params = auto_params -> `Auto params];
cont = rewriting_step_continuation ->
| IDENT "proof" -> `Proof
| params = auto_params -> `Auto params];
cont = rewriting_step_continuation ->
- GrafiteAst.RewritingStep(loc, Some (Some name,termine), t1, t2, cont)
+ G.RewritingStep(loc, Some (Some name,termine), t1, t2, cont)
| SYMBOL "=" ;
t1=tactic_term ;
t2 =
| SYMBOL "=" ;
t1=tactic_term ;
t2 =
| IDENT "proof" -> `Proof
| params = auto_params -> `Auto params];
cont = rewriting_step_continuation ->
| IDENT "proof" -> `Proof
| params = auto_params -> `Auto params];
cont = rewriting_step_continuation ->
- GrafiteAst.RewritingStep(loc, None, t1, t2, cont)
+ G.RewritingStep(loc, None, t1, t2, cont)
[ t1 = SELF; SYMBOL ";"; t2 = SELF ->
let ts =
match t1 with
[ t1 = SELF; SYMBOL ";"; t2 = SELF ->
let ts =
match t1 with
- | GrafiteAst.Seq (_, l) -> l @ [ t2 ]
+ | G.Seq (_, l) -> l @ [ t2 ]
- GrafiteAst.Seq (loc, ts)
]
| "then" NONA
[ tac = SELF; SYMBOL ";";
SYMBOL "["; tacs = LIST0 SELF SEP SYMBOL "|"; SYMBOL "]"->
]
| "then" NONA
[ tac = SELF; SYMBOL ";";
SYMBOL "["; tacs = LIST0 SELF SEP SYMBOL "|"; SYMBOL "]"->
- (GrafiteAst.Then (loc, tac, tacs))
+ (G.Then (loc, tac, tacs))
]
| "loops" RIGHTA
[ IDENT "do"; count = int; tac = SELF ->
]
| "loops" RIGHTA
[ IDENT "do"; count = int; tac = SELF ->
- GrafiteAst.Do (loc, count, tac)
- | IDENT "repeat"; tac = SELF -> GrafiteAst.Repeat (loc, tac)
+ G.Do (loc, count, tac)
+ | IDENT "repeat"; tac = SELF -> G.Repeat (loc, tac)
]
| "simple" NONA
[ IDENT "first";
SYMBOL "["; tacs = LIST0 SELF SEP SYMBOL "|"; SYMBOL "]"->
]
| "simple" NONA
[ IDENT "first";
SYMBOL "["; tacs = LIST0 SELF SEP SYMBOL "|"; SYMBOL "]"->
- GrafiteAst.First (loc, tacs)
- | IDENT "try"; tac = SELF -> GrafiteAst.Try (loc, tac)
+ G.First (loc, tacs)
+ | IDENT "try"; tac = SELF -> G.Try (loc, tac)
| IDENT "solve";
SYMBOL "["; tacs = LIST0 SELF SEP SYMBOL "|"; SYMBOL "]"->
| IDENT "solve";
SYMBOL "["; tacs = LIST0 SELF SEP SYMBOL "|"; SYMBOL "]"->
- GrafiteAst.Solve (loc, tacs)
- | IDENT "progress"; tac = SELF -> GrafiteAst.Progress (loc, tac)
+ G.Solve (loc, tacs)
+ | IDENT "progress"; tac = SELF -> G.Progress (loc, tac)
| LPAREN; tac = SELF; RPAREN -> tac
| tac = tactic -> tac
]
];
punctuation_tactical:
[
| LPAREN; tac = SELF; RPAREN -> tac
| tac = tactic -> tac
]
];
punctuation_tactical:
[
- [ SYMBOL "[" -> GrafiteAst.Branch loc
- | SYMBOL "|" -> GrafiteAst.Shift loc
- | i = LIST1 int SEP SYMBOL ","; SYMBOL ":" -> GrafiteAst.Pos (loc, i)
- | SYMBOL "*"; SYMBOL ":" -> GrafiteAst.Wildcard loc
- | SYMBOL "]" -> GrafiteAst.Merge loc
- | SYMBOL ";" -> GrafiteAst.Semicolon loc
- | SYMBOL "." -> GrafiteAst.Dot loc
+ [ SYMBOL "[" -> G.Branch loc
+ | SYMBOL "|" -> G.Shift loc
+ | i = LIST1 int SEP SYMBOL ","; SYMBOL ":" -> G.Pos (loc, i)
+ | SYMBOL "*"; SYMBOL ":" -> G.Wildcard loc
+ | SYMBOL "]" -> G.Merge loc
+ | SYMBOL ";" -> G.Semicolon loc
+ | SYMBOL "." -> G.Dot loc
]
];
non_punctuation_tactical:
[ "simple" NONA
]
];
non_punctuation_tactical:
[ "simple" NONA
- [ IDENT "focus"; goals = LIST1 int -> GrafiteAst.Focus (loc, goals)
- | IDENT "unfocus" -> GrafiteAst.Unfocus loc
- | IDENT "skip" -> GrafiteAst.Skip loc
+ [ IDENT "focus"; goals = LIST1 int -> G.Focus (loc, goals)
+ | IDENT "unfocus" -> G.Unfocus loc
+ | IDENT "skip" -> G.Skip loc
macro: [
[ [ IDENT "check" ]; t = term ->
macro: [
[ [ IDENT "check" ]; t = term ->
- GrafiteAst.Check (loc, t)
| [ IDENT "eval" ]; kind = reduction_kind; "on"; t = tactic_term ->
| [ IDENT "eval" ]; kind = reduction_kind; "on"; t = tactic_term ->
- GrafiteAst.Eval (loc, kind, t)
| [ IDENT "inline"];
style = OPT [ IDENT "procedural"; depth = OPT int -> depth ];
suri = QSTRING; prefix = OPT QSTRING;
flavour = OPT [ "as"; attr = inline_flavour -> attr ] ->
let style = match style with
| [ IDENT "inline"];
style = OPT [ IDENT "procedural"; depth = OPT int -> depth ];
suri = QSTRING; prefix = OPT QSTRING;
flavour = OPT [ "as"; attr = inline_flavour -> attr ] ->
let style = match style with
- | None -> GrafiteAst.Declarative
- | Some depth -> GrafiteAst.Procedural depth
+ | None -> G.Declarative
+ | Some depth -> G.Procedural depth
in
let prefix = match prefix with None -> "" | Some prefix -> prefix in
in
let prefix = match prefix with None -> "" | Some prefix -> prefix in
- GrafiteAst.Inline (loc,style,suri,prefix, flavour)
+ G.Inline (loc,style,suri,prefix, flavour)
| [ IDENT "hint" ]; rew = OPT (IDENT "rewrite") ->
| [ IDENT "hint" ]; rew = OPT (IDENT "rewrite") ->
- if rew = None then GrafiteAst.Hint (loc, false) else GrafiteAst.Hint (loc,true)
+ if rew = None then G.Hint (loc, false) else G.Hint (loc,true)
| IDENT "auto"; params = auto_params ->
| IDENT "auto"; params = auto_params ->
- GrafiteAst.AutoInteractive (loc,params)
+ G.AutoInteractive (loc,params)
| [ IDENT "whelp"; "match" ] ; t = term ->
| [ IDENT "whelp"; "match" ] ; t = term ->
- GrafiteAst.WMatch (loc,t)
| [ IDENT "whelp"; IDENT "instance" ] ; t = term ->
| [ IDENT "whelp"; IDENT "instance" ] ; t = term ->
- GrafiteAst.WInstance (loc,t)
| [ IDENT "whelp"; IDENT "locate" ] ; id = QSTRING ->
| [ IDENT "whelp"; IDENT "locate" ] ; id = QSTRING ->
- GrafiteAst.WLocate (loc,id)
| [ IDENT "whelp"; IDENT "elim" ] ; t = term ->
| [ IDENT "whelp"; IDENT "elim" ] ; t = term ->
- GrafiteAst.WElim (loc, t)
| [ IDENT "whelp"; IDENT "hint" ] ; t = term ->
| [ IDENT "whelp"; IDENT "hint" ] ; t = term ->
- GrafiteAst.WHint (loc,t)
if (try ignore (UriManager.uri_of_string uri); true
with UriManager.IllFormedUri _ -> false)
then
if (try ignore (UriManager.uri_of_string uri); true
with UriManager.IllFormedUri _ -> false)
then
- LexiconAst.Ident_alias (id, uri)
+ L.Ident_alias (id, uri)
else
raise
(HExtlib.Localized (loc, CicNotationParser.Parse_error (Printf.sprintf "Not a valid uri: %s" uri)))
else
raise
(HExtlib.Localized (loc, CicNotationParser.Parse_error (Printf.sprintf "Not a valid uri: %s" uri)))
let instance =
match instance with Some i -> i | None -> 0
in
let instance =
match instance with Some i -> i | None -> 0
in
- LexiconAst.Symbol_alias (symbol, instance, dsc)
+ L.Symbol_alias (symbol, instance, dsc)
| IDENT "num";
instance = OPT [ LPAREN; IDENT "instance"; n = int; RPAREN -> n ];
SYMBOL "="; dsc = QSTRING ->
let instance =
match instance with Some i -> i | None -> 0
in
| IDENT "num";
instance = OPT [ LPAREN; IDENT "instance"; n = int; RPAREN -> n ];
SYMBOL "="; dsc = QSTRING ->
let instance =
match instance with Some i -> i | None -> 0
in
- LexiconAst.Number_alias (instance, dsc)
+ L.Number_alias (instance, dsc)
]
];
argument: [
[ l = LIST0 [ SYMBOL <:unicode<eta>> (* η *); SYMBOL "." -> () ];
id = IDENT ->
]
];
argument: [
[ l = LIST0 [ SYMBOL <:unicode<eta>> (* η *); SYMBOL "." -> () ];
id = IDENT ->
- Ast.IdentArg (List.length l, id)
+ N.IdentArg (List.length l, id)
- [ u = URI -> Ast.UriPattern (UriManager.uri_of_string u)
- | id = IDENT -> Ast.VarPattern id
- | SYMBOL "_" -> Ast.ImplicitPattern
+ [ u = URI -> N.UriPattern (UriManager.uri_of_string u)
+ | id = IDENT -> N.VarPattern id
+ | SYMBOL "_" -> N.ImplicitPattern
| LPAREN; terms = LIST1 SELF; RPAREN ->
(match terms with
| [] -> assert false
| [term] -> term
| LPAREN; terms = LIST1 SELF; RPAREN ->
(match terms with
| [] -> assert false
| [term] -> term
- | terms -> Ast.ApplPattern terms)
+ | terms -> N.ApplPattern terms)
include_command: [ [
IDENT "include" ; path = QSTRING ->
include_command: [ [
IDENT "include" ; path = QSTRING ->
- loc,path,LexiconAst.WithPreferences
+ loc,path,L.WithPreferences
| IDENT "include'" ; path = QSTRING ->
| IDENT "include'" ; path = QSTRING ->
- loc,path,LexiconAst.WithoutPreferences
+ loc,path,L.WithoutPreferences
]];
grafite_command: [ [
IDENT "set"; n = QSTRING; v = QSTRING ->
]];
grafite_command: [ [
IDENT "set"; n = QSTRING; v = QSTRING ->
- GrafiteAst.Set (loc, n, v)
- | IDENT "drop" -> GrafiteAst.Drop loc
- | IDENT "print"; s = IDENT -> GrafiteAst.Print (loc,s)
- | IDENT "qed" -> GrafiteAst.Qed loc
- | IDENT "nqed" -> GrafiteAst.NQed loc
+ G.Set (loc, n, v)
+ | IDENT "drop" -> G.Drop loc
+ | IDENT "print"; s = IDENT -> G.Print (loc,s)
+ | IDENT "qed" -> G.Qed loc
+ | IDENT "nqed" -> G.NQed loc
| IDENT "variant" ; name = IDENT; SYMBOL ":";
typ = term; SYMBOL <:unicode<def>> ; newname = IDENT ->
| IDENT "variant" ; name = IDENT; SYMBOL ":";
typ = term; SYMBOL <:unicode<def>> ; newname = IDENT ->
- GrafiteAst.Obj (loc,
- Ast.Theorem
- (`Variant,name,typ,Some (Ast.Ident (newname, None))))
+ G.Obj (loc,
+ N.Theorem
+ (`Variant,name,typ,Some (N.Ident (newname, None))))
| nflavour = ntheorem_flavour; name = IDENT; SYMBOL ":"; typ = term;
body = OPT [ SYMBOL <:unicode<def>> (* ≝ *); body = term -> body ] ->
| nflavour = ntheorem_flavour; name = IDENT; SYMBOL ":"; typ = term;
body = OPT [ SYMBOL <:unicode<def>> (* ≝ *); body = term -> body ] ->
- GrafiteAst.NObj (loc, Ast.Theorem (nflavour, name, typ, body))
+ G.NObj (loc, N.Theorem (nflavour, name, typ, body))
| flavour = theorem_flavour; name = IDENT; SYMBOL ":"; typ = term;
body = OPT [ SYMBOL <:unicode<def>> (* ≝ *); body = term -> body ] ->
| flavour = theorem_flavour; name = IDENT; SYMBOL ":"; typ = term;
body = OPT [ SYMBOL <:unicode<def>> (* ≝ *); body = term -> body ] ->
- GrafiteAst.Obj (loc, Ast.Theorem (flavour, name, typ, body))
+ G.Obj (loc, N.Theorem (flavour, name, typ, body))
| flavour = theorem_flavour; name = IDENT; SYMBOL <:unicode<def>> (* ≝ *);
body = term ->
| flavour = theorem_flavour; name = IDENT; SYMBOL <:unicode<def>> (* ≝ *);
body = term ->
- GrafiteAst.Obj (loc,
- Ast.Theorem (flavour, name, Ast.Implicit, Some body))
+ G.Obj (loc,
+ N.Theorem (flavour, name, N.Implicit, Some body))
| IDENT "axiom"; name = IDENT; SYMBOL ":"; typ = term ->
| IDENT "axiom"; name = IDENT; SYMBOL ":"; typ = term ->
- GrafiteAst.Obj (loc, Ast.Theorem (`Axiom, name, typ, None))
+ G.Obj (loc, N.Theorem (`Axiom, name, typ, None))
| IDENT "naxiom"; name = IDENT; SYMBOL ":"; typ = term ->
| IDENT "naxiom"; name = IDENT; SYMBOL ":"; typ = term ->
- GrafiteAst.NObj (loc, Ast.Theorem (`Axiom, name, typ, None))
+ G.NObj (loc, N.Theorem (`Axiom, name, typ, None))
| LETCOREC ; defs = let_defs ->
mk_rec_corec false `CoInductive defs loc
| LETREC ; defs = let_defs ->
| LETCOREC ; defs = let_defs ->
mk_rec_corec false `CoInductive defs loc
| LETREC ; defs = let_defs ->
mk_rec_corec true `Inductive defs loc
| IDENT "inductive"; spec = inductive_spec ->
let (params, ind_types) = spec in
mk_rec_corec true `Inductive defs loc
| IDENT "inductive"; spec = inductive_spec ->
let (params, ind_types) = spec in
- GrafiteAst.Obj (loc, Ast.Inductive (params, ind_types))
+ G.Obj (loc, N.Inductive (params, ind_types))
| IDENT "ninductive"; spec = inductive_spec ->
let (params, ind_types) = spec in
| IDENT "ninductive"; spec = inductive_spec ->
let (params, ind_types) = spec in
- GrafiteAst.NObj (loc, Ast.Inductive (params, ind_types))
+ G.NObj (loc, N.Inductive (params, ind_types))
| IDENT "coinductive"; spec = inductive_spec ->
let (params, ind_types) = spec in
let ind_types = (* set inductive flags to false (coinductive) *)
List.map (fun (name, _, term, ctors) -> (name, false, term, ctors))
ind_types
in
| IDENT "coinductive"; spec = inductive_spec ->
let (params, ind_types) = spec in
let ind_types = (* set inductive flags to false (coinductive) *)
List.map (fun (name, _, term, ctors) -> (name, false, term, ctors))
ind_types
in
- GrafiteAst.Obj (loc, Ast.Inductive (params, ind_types))
+ G.Obj (loc, N.Inductive (params, ind_types))
| IDENT "ncoinductive"; spec = inductive_spec ->
let (params, ind_types) = spec in
let ind_types = (* set inductive flags to false (coinductive) *)
List.map (fun (name, _, term, ctors) -> (name, false, term, ctors))
ind_types
in
| IDENT "ncoinductive"; spec = inductive_spec ->
let (params, ind_types) = spec in
let ind_types = (* set inductive flags to false (coinductive) *)
List.map (fun (name, _, term, ctors) -> (name, false, term, ctors))
ind_types
in
- GrafiteAst.NObj (loc, Ast.Inductive (params, ind_types))
+ G.NObj (loc, N.Inductive (params, ind_types))
- t = [ u = URI -> Ast.Uri (u,None) | t = tactic_term ; OPT "with" -> t ] ;
+ t = [ u = URI -> N.Uri (u,None) | t = tactic_term ; OPT "with" -> t ] ;
arity = OPT int ; saturations = OPT int;
composites = OPT (IDENT "nocomposites") ->
let arity = match arity with None -> 0 | Some x -> x in
let saturations = match saturations with None -> 0 | Some x -> x in
let composites = match composites with None -> true | Some _ -> false in
arity = OPT int ; saturations = OPT int;
composites = OPT (IDENT "nocomposites") ->
let arity = match arity with None -> 0 | Some x -> x in
let saturations = match saturations with None -> 0 | Some x -> x in
let composites = match composites with None -> true | Some _ -> false in
(loc, t, composites, arity, saturations)
| IDENT "prefer" ; IDENT "coercion"; t = tactic_term ->
(loc, t, composites, arity, saturations)
| IDENT "prefer" ; IDENT "coercion"; t = tactic_term ->
- GrafiteAst.PreferCoercion (loc, t)
+ G.PreferCoercion (loc, t)
| IDENT "pump" ; steps = int ->
| IDENT "pump" ; steps = int ->
- GrafiteAst.Pump(loc,steps)
| IDENT "unification"; IDENT "hint"; n = int; t = tactic_term ->
| IDENT "unification"; IDENT "hint"; n = int; t = tactic_term ->
- GrafiteAst.UnificationHint (loc, t, n)
+ G.UnificationHint (loc, t, n)
| IDENT "inverter"; name = IDENT; IDENT "for";
indty = tactic_term; paramspec = inverter_param_list ->
| IDENT "inverter"; name = IDENT; IDENT "for";
indty = tactic_term; paramspec = inverter_param_list ->
(loc, name, indty, paramspec)
| IDENT "record" ; (params,name,ty,fields) = record_spec ->
(loc, name, indty, paramspec)
| IDENT "record" ; (params,name,ty,fields) = record_spec ->
- GrafiteAst.Obj (loc, Ast.Record (params,name,ty,fields))
+ G.Obj (loc, N.Record (params,name,ty,fields))
| IDENT "default" ; what = QSTRING ; uris = LIST1 URI ->
let uris = List.map UriManager.uri_of_string uris in
| IDENT "default" ; what = QSTRING ; uris = LIST1 URI ->
let uris = List.map UriManager.uri_of_string uris in
- GrafiteAst.Default (loc,what,uris)
+ G.Default (loc,what,uris)
| IDENT "relation" ; aeq = tactic_term ; "on" ; a = tactic_term ;
refl = OPT [ IDENT "reflexivity" ; IDENT "proved" ; IDENT "by" ;
refl = tactic_term -> refl ] ;
| IDENT "relation" ; aeq = tactic_term ; "on" ; a = tactic_term ;
refl = OPT [ IDENT "reflexivity" ; IDENT "proved" ; IDENT "by" ;
refl = tactic_term -> refl ] ;
trans = OPT [ IDENT "transitivity" ; IDENT "proved" ; IDENT "by" ;
trans = tactic_term -> trans ] ;
"as" ; id = IDENT ->
trans = OPT [ IDENT "transitivity" ; IDENT "proved" ; IDENT "by" ;
trans = tactic_term -> trans ] ;
"as" ; id = IDENT ->
- GrafiteAst.Relation (loc,id,a,aeq,refl,sym,trans)
+ G.Relation (loc,id,a,aeq,refl,sym,trans)
]];
lexicon_command: [ [
IDENT "alias" ; spec = alias_spec ->
]];
lexicon_command: [ [
IDENT "alias" ; spec = alias_spec ->
- LexiconAst.Alias (loc, spec)
| IDENT "notation"; (dir, l1, assoc, prec, l2) = notation ->
| IDENT "notation"; (dir, l1, assoc, prec, l2) = notation ->
- LexiconAst.Notation (loc, dir, l1, assoc, prec, l2)
+ L.Notation (loc, dir, l1, assoc, prec, l2)
| IDENT "interpretation"; id = QSTRING;
(symbol, args, l3) = interpretation ->
| IDENT "interpretation"; id = QSTRING;
(symbol, args, l3) = interpretation ->
- LexiconAst.Interpretation (loc, id, (symbol, args), l3)
+ L.Interpretation (loc, id, (symbol, args), l3)
- [ cmd = grafite_command; SYMBOL "." -> GrafiteAst.Command (loc, cmd)
+ [ cmd = grafite_command; SYMBOL "." -> G.Command (loc, cmd)
| tac = atomic_tactical LEVEL "loops"; punct = punctuation_tactical ->
| tac = atomic_tactical LEVEL "loops"; punct = punctuation_tactical ->
- GrafiteAst.Tactic (loc, Some tac, punct)
- | punct = punctuation_tactical -> GrafiteAst.Tactic (loc, None, punct)
+ G.Tactic (loc, Some tac, punct)
+ | punct = punctuation_tactical -> G.Tactic (loc, None, punct)
| tac = ntactic; punct = punctuation_tactical ->
| tac = ntactic; punct = punctuation_tactical ->
- GrafiteAst.NTactic (loc, tac, punct)
+ G.NTactic (loc, tac, punct)
| SYMBOL "#" ; SYMBOL "#" ; punct = punctuation_tactical ->
| SYMBOL "#" ; SYMBOL "#" ; punct = punctuation_tactical ->
- GrafiteAst.NTactic (loc, GrafiteAst.NId loc, punct)
+ G.NTactic (loc, G.NId loc, punct)
| tac = non_punctuation_tactical; punct = punctuation_tactical ->
| tac = non_punctuation_tactical; punct = punctuation_tactical ->
- GrafiteAst.NonPunctuationTactical (loc, tac, punct)
- | mac = macro; SYMBOL "." -> GrafiteAst.Macro (loc, mac)
+ G.NonPunctuationTactical (loc, tac, punct)
+ | mac = macro; SYMBOL "." -> G.Macro (loc, mac)
]
];
comment: [
[ BEGINCOMMENT ; ex = executable ; ENDCOMMENT ->
]
];
comment: [
[ BEGINCOMMENT ; ex = executable ; ENDCOMMENT ->
- GrafiteAst.Code (loc, ex)
- GrafiteAst.Note (loc, str)
]
];
statement: [
[ ex = executable ->
]
];
statement: [
[ ex = executable ->
- fun ?(never_include=false) ~include_paths status -> status,LSome(GrafiteAst.Executable (loc,ex))
+ fun ?(never_include=false) ~include_paths status ->
+ let stm = G.Executable (loc, ex) in
+ !grafite_callback status stm;
+ status, LSome stm
| com = comment ->
fun ?(never_include=false) ~include_paths status ->
| com = comment ->
fun ?(never_include=false) ~include_paths status ->
- status,LSome (GrafiteAst.Comment (loc, com))
+ let stm = G.Comment (loc, com) in
+ !grafite_callback status stm;
+ status, LSome stm
| (iloc,fname,mode) = include_command ; SYMBOL "." ->
| (iloc,fname,mode) = include_command ; SYMBOL "." ->
fun ?(never_include=false) ~include_paths status ->
fun ?(never_include=false) ~include_paths status ->
- let _root, buri, fullpath, _rrelpath =
- Librarian.baseuri_of_script ~include_paths fname
- in
- let status =
- if never_include then raise (NoInclusionPerformed fullpath)
- else LexiconEngine.eval_command status
- (LexiconAst.Include (iloc,buri,mode,fullpath))
- in
- status,
- LSome
- (GrafiteAst.Executable
- (loc,GrafiteAst.Command
- (loc,GrafiteAst.Include (iloc,buri))))
+ let stm =
+ G.Executable (loc, G.Command (loc, G.Include (iloc, fname)))
+ in
+ !grafite_callback status stm;
+ let _root, buri, fullpath, _rrelpath =
+ Librarian.baseuri_of_script ~include_paths fname
+ in
+ let stm =
+ G.Executable (loc, G.Command (loc, G.Include (iloc, buri)))
+ in
+ let status =
+ if never_include then raise (NoInclusionPerformed fullpath)
+ else LE.eval_command status (L.Include (iloc,buri,mode,fullpath))
+ in
+ status, LSome stm
| scom = lexicon_command ; SYMBOL "." ->
fun ?(never_include=false) ~include_paths status ->
| scom = lexicon_command ; SYMBOL "." ->
fun ?(never_include=false) ~include_paths status ->
- let status = LexiconEngine.eval_command status scom in
- status,LNone loc
+ !lexicon_callback status scom;
+ let status = LE.eval_command status scom in
+ status, LNone loc
| EOI -> raise End_of_file
]
];
| EOI -> raise End_of_file
]
];
val statement: unit -> statement Grammar.Entry.e
val statement: unit -> statement Grammar.Entry.e
-(* this callback is called on every include command *)
-val set_callback: (string -> unit) -> unit
+(* this callback is called before every grafite statement *)
+val set_grafite_callback:
+ (LexiconEngine.status -> ast_statement -> unit) -> unit
+
+(* this callback is called before every lexicon command *)
+val set_lexicon_callback:
+ (LexiconEngine.status -> LexiconAst.command -> unit) -> unit
val push : unit -> unit
val pop : unit -> unit
val push : unit -> unit
val pop : unit -> unit
-let set_callback f = out := f
(* lexicon file name * ma file name *)
exception IncludedFileNotCompiled of string * string
exception MetadataNotFound of string (* file name *)
type status = {
(* lexicon file name * ma file name *)
exception IncludedFileNotCompiled of string * string
exception MetadataNotFound of string (* file name *)
type status = {
- aliases: LexiconAst.alias_spec DisambiguateTypes.Environment.t;
- multi_aliases: LexiconAst.alias_spec list DisambiguateTypes.Environment.t;
+ aliases: L.alias_spec DisambiguateTypes.Environment.t;
+ multi_aliases: L.alias_spec list DisambiguateTypes.Environment.t;
lexicon_content_rev: LexiconMarshal.lexicon;
notation_ids: CicNotation.notation_id list; (** in-scope notation ids *)
}
lexicon_content_rev: LexiconMarshal.lexicon;
notation_ids: CicNotation.notation_id list; (** in-scope notation ids *)
}
+let dump_aliases out msg status =
+ out (if msg = "" then "aliases dump:" else msg ^ ": aliases dump:");
+ DisambiguateTypes.Environment.iter
+ (fun _ x -> out (LexiconAstPp.pp_alias x))
+ status.aliases
+
let initial_status = {
aliases = DisambiguateTypes.Environment.empty;
multi_aliases = DisambiguateTypes.Environment.empty;
let initial_status = {
aliases = DisambiguateTypes.Environment.empty;
multi_aliases = DisambiguateTypes.Environment.empty;
List.fold_right
(fun cmd acc ->
match cmd with
List.fold_right
(fun cmd acc ->
match cmd with
- | LexiconAst.Alias _
- | LexiconAst.Include _
- | LexiconAst.Notation _ -> cmd :: (List.filter ((<>) cmd) acc)
- | LexiconAst.Interpretation _ -> if List.exists ((=) cmd) acc then acc else cmd::acc)
+ | L.Alias _
+ | L.Include _
+ | L.Notation _ -> cmd :: (List.filter ((<>) cmd) acc)
+ | L.Interpretation _ -> if List.exists ((=) cmd) acc then acc else cmd::acc)
-(* prerr_endline ("new lexicon content: " ^ String.concat " " (List.map
- LexiconAstPp.pp_command content')); *)
+(*
+ prerr_endline ("new lexicon content: " ^
+ String.concat "; " (List.map LexiconAstPp.pp_command content')
+ );
+*)
{ status with lexicon_content_rev = content' }
let set_proof_aliases mode status new_aliases =
{ status with lexicon_content_rev = content' }
let set_proof_aliases mode status new_aliases =
- if mode = LexiconAst.WithoutPreferences then
+ if mode = L.WithoutPreferences then
status
else
let commands_of_aliases =
List.map
status
else
let commands_of_aliases =
List.map
- (fun _,alias -> LexiconAst.Alias (HExtlib.dummy_floc, alias))
+ (fun _,alias -> L.Alias (HExtlib.dummy_floc, alias))
in
let aliases =
List.fold_left (fun acc (d,c) -> DisambiguateTypes.Environment.add d c acc)
status.aliases new_aliases in
let multi_aliases =
List.fold_left (fun acc (d,c) ->
in
let aliases =
List.fold_left (fun acc (d,c) -> DisambiguateTypes.Environment.add d c acc)
status.aliases new_aliases in
let multi_aliases =
List.fold_left (fun acc (d,c) ->
- DisambiguateTypes.Environment.cons LexiconAst.description_of_alias
+ DisambiguateTypes.Environment.cons L.description_of_alias
d c acc)
status.multi_aliases new_aliases
in
d c acc)
status.multi_aliases new_aliases
in
-let rec eval_command ?(mode=LexiconAst.WithPreferences) status cmd =
+let rec eval_command ?(mode=L.WithPreferences) status cmd =
+(*
+ let bmode = match mode with L.WithPreferences -> true | _ -> false in
+ Printf.eprintf "Include preferences: %b\n" bmode;
+*)
- | LexiconAst.Interpretation (loc, dsc, (symbol, args), cic_appl_pattern) ->
+ | L.Interpretation (loc, dsc, (symbol, args), cic_appl_pattern) ->
let rec disambiguate =
function
CicNotationPt.ApplPattern l ->
let rec disambiguate =
function
CicNotationPt.ApplPattern l ->
(function (CicNotationPt.IdentArg (_,id')) -> id'=id) args)
->
let item = DisambiguateTypes.Id id in
(function (CicNotationPt.IdentArg (_,id')) -> id'=id) args)
->
let item = DisambiguateTypes.Id id in
let uri =
match DisambiguateTypes.Environment.find item status.aliases with
let uri =
match DisambiguateTypes.Environment.find item status.aliases with
- LexiconAst.Ident_alias (_, uri)-> UriManager.uri_of_string uri
+ L.Ident_alias (_, uri)-> UriManager.uri_of_string uri
| _ -> assert false
in
CicNotationPt.UriPattern uri
with Not_found ->
| _ -> assert false
in
CicNotationPt.UriPattern uri
with Not_found ->
- prerr_endline ("Domain item not found: " ^
+ prerr_endline ("LexiconEngine.eval_command: domain item not found: " ^
(DisambiguateTypes.string_of_domain_item item));
(DisambiguateTypes.string_of_domain_item item));
+ dump_aliases prerr_endline "" status;
+ assert false
+ end
- LexiconAst.Interpretation
(loc, dsc, (symbol, args), disambiguate cic_appl_pattern)
| _-> cmd
in
(loc, dsc, (symbol, args), disambiguate cic_appl_pattern)
| _-> cmd
in
let notation_ids' = CicNotation.process_notation cmd in
let status =
{ status with notation_ids = notation_ids' @ status.notation_ids } in
match cmd with
let notation_ids' = CicNotation.process_notation cmd in
let status =
{ status with notation_ids = notation_ids' @ status.notation_ids } in
match cmd with
- | LexiconAst.Include (loc, baseuri, mode, fullpath) ->
+ | L.Include (loc, baseuri, mode, fullpath) ->
let lexiconpath_rw, lexiconpath_r =
LibraryMisc.lexicon_file_of_baseuri
~must_exist:false ~writable:true ~baseuri,
let lexiconpath_rw, lexiconpath_r =
LibraryMisc.lexicon_file_of_baseuri
~must_exist:false ~writable:true ~baseuri,
let lexicon = LexiconMarshal.load_lexicon lexiconpath in
let status = List.fold_left (eval_command ~mode) status lexicon in
status
let lexicon = LexiconMarshal.load_lexicon lexiconpath in
let status = List.fold_left (eval_command ~mode) status lexicon in
status
- | LexiconAst.Alias (loc, spec) ->
+ | L.Alias (loc, spec) ->
let diff =
(*CSC: Warning: this code should be factorized with the corresponding
code in DisambiguatePp *)
match spec with
let diff =
(*CSC: Warning: this code should be factorized with the corresponding
code in DisambiguatePp *)
match spec with
- | LexiconAst.Ident_alias (id,uri) ->
+ | L.Ident_alias (id,uri) ->
[DisambiguateTypes.Id id,spec]
[DisambiguateTypes.Id id,spec]
- | LexiconAst.Symbol_alias (symb, instance, desc) ->
+ | L.Symbol_alias (symb, instance, desc) ->
[DisambiguateTypes.Symbol (symb,instance),spec]
[DisambiguateTypes.Symbol (symb,instance),spec]
- | LexiconAst.Number_alias (instance,desc) ->
+ | L.Number_alias (instance,desc) ->
[DisambiguateTypes.Num instance,spec]
in
set_proof_aliases mode status diff
[DisambiguateTypes.Num instance,spec]
in
set_proof_aliases mode status diff
- | LexiconAst.Interpretation (_, dsc, (symbol, _), _) as stm ->
+ | L.Interpretation (_, dsc, (symbol, _), _) as stm ->
let status = add_lexicon_content [stm] status in
let diff =
try
[DisambiguateTypes.Symbol (symbol, 0),
let status = add_lexicon_content [stm] status in
let diff =
try
[DisambiguateTypes.Symbol (symbol, 0),
- LexiconAst.Symbol_alias (symbol,0,dsc)]
+ L.Symbol_alias (symbol,0,dsc)]
with
DisambiguateChoices.Choice_not_found msg ->
prerr_endline (Lazy.force msg);
with
DisambiguateChoices.Choice_not_found msg ->
prerr_endline (Lazy.force msg);
in
let status = set_proof_aliases mode status diff in
status
in
let status = set_proof_aliases mode status diff in
status
- | LexiconAst.Notation _ as stm ->
+ | L.Notation _ as stm ->
add_lexicon_content [stm] status
add_lexicon_content [stm] status
-let eval_command = eval_command ?mode:None
+let eval_command status cmd =
+ if !debug then dump_aliases prerr_endline "before eval_command" status;
+ let status = eval_command ?mode:None status cmd in
+ if !debug then dump_aliases prerr_endline "after eval_command" status;
+ status
-let set_proof_aliases = set_proof_aliases LexiconAst.WithPreferences
-
+let set_proof_aliases status aliases =
+ if !debug then dump_aliases prerr_endline "before set_proof_aliases" status;
+ let status = set_proof_aliases L.WithPreferences status aliases in
+ if !debug then dump_aliases prerr_endline "after set_proof_aliases" status;
+ status
status -> (DisambiguateTypes.domain_item * LexiconAst.alias_spec) list ->
status
status -> (DisambiguateTypes.domain_item * LexiconAst.alias_spec) list ->
status
-(* this callback is called on every lexicon command *)
-val set_callback: (LexiconAst.command -> unit) -> unit
+(* args: print function, message (may be empty), status *)
+val dump_aliases: (string -> unit) -> string -> status -> unit
-utf8Macro.cmi:
-utf8MacroTable.cmo:
-utf8MacroTable.cmx:
utf8Macro.cmo: utf8MacroTable.cmo utf8Macro.cmi
utf8Macro.cmx: utf8MacroTable.cmx utf8Macro.cmi
utf8Macro.cmo: utf8MacroTable.cmo utf8Macro.cmi
utf8Macro.cmx: utf8MacroTable.cmx utf8Macro.cmi
module LS = LibrarySync
module Ds = CicDischarge
module PO = ProceduralOptimizer
module LS = LibrarySync
module Ds = CicDischarge
module PO = ProceduralOptimizer
+module N = CicNotationPt
let mpres_document pres_box =
Xml.add_xml_declaration (CicNotationPres.print_box pres_box)
let mpres_document pres_box =
Xml.add_xml_declaration (CicNotationPres.print_box pres_box)
let s = BoxPp.render_to_string ~map_unicode_to_tex render n mpres in
remove_closed_substs s
let s = BoxPp.render_to_string ~map_unicode_to_tex render n mpres in
remove_closed_substs s
+let enable_notations x = () (* function
+ | true ->
+ CicNotation.set_active_notations
+ (List.map fst (CicNotation.get_all_notations ()))
+ | false ->
+ CicNotation.set_active_notations []
+*)
let txt_of_cic_object
~map_unicode_to_tex ?skip_thm_and_qed ?skip_initial_lambdas
n style ?flavour prefix obj
let txt_of_cic_object
~map_unicode_to_tex ?skip_thm_and_qed ?skip_initial_lambdas
n style ?flavour prefix obj
let term_pp = term2pres ~map_unicode_to_tex (n - 8) ids_to_inner_sorts in
let lazy_term_pp = term_pp in
let obj_pp = CicNotationPp.pp_obj term_pp in
let term_pp = term2pres ~map_unicode_to_tex (n - 8) ids_to_inner_sorts in
let lazy_term_pp = term_pp in
let obj_pp = CicNotationPp.pp_obj term_pp in
- let aux = GrafiteAstPp.pp_statement
- ~map_unicode_to_tex ~term_pp ~lazy_term_pp ~obj_pp in
+ let stm_pp =
+ GrafiteAstPp.pp_statement
+ ~map_unicode_to_tex ~term_pp ~lazy_term_pp ~obj_pp
+ in
+ let aux = function
+ | G.Executable (_, G.Command (_, G.Obj (_, N.Inductive _))) as stm
+ ->
+ enable_notations false;
+ let str = stm_pp stm in enable_notations true; str
+(* FG: we disable notation for Inductive to avoid recursive notation *)
+ | stm -> stm_pp stm
+ in
let script =
Acic2Procedural.procedural_of_acic_object
~ids_to_inner_sorts ~ids_to_inner_types ~info
?depth ?flavour prefix aobj
in
let script =
Acic2Procedural.procedural_of_acic_object
~ids_to_inner_sorts ~ids_to_inner_types ~info
?depth ?flavour prefix aobj
in
- "\n\n" ^ String.concat "" (List.map aux script)
+ String.concat "" (List.map aux script) ^ "\n\n"
let cic_prefix = Str.regexp_string "cic:/"
let matita_prefix = Str.regexp_string "cic:/matita/"
let cic_prefix = Str.regexp_string "cic:/"
let matita_prefix = Str.regexp_string "cic:/matita/"
Helm_registry.set_bool "matita.moo" false;
let floc = H.dummy_floc in
let nl_ast = G.Comment (floc, G.Note (floc, "")) in
Helm_registry.set_bool "matita.moo" false;
let floc = H.dummy_floc in
let nl_ast = G.Comment (floc, G.Note (floc, "")) in
- let pp_ast_statement st =
GrafiteAstPp.pp_statement ~term_pp:CicNotationPp.pp_term
~map_unicode_to_tex:(Helm_registry.get_bool
"matita.paste_unicode_as_tex")
~lazy_term_pp:CicNotationPp.pp_term
GrafiteAstPp.pp_statement ~term_pp:CicNotationPp.pp_term
~map_unicode_to_tex:(Helm_registry.get_bool
"matita.paste_unicode_as_tex")
~lazy_term_pp:CicNotationPp.pp_term
- ~obj_pp:(CicNotationPp.pp_obj CicNotationPp.pp_term) st
+ ~obj_pp:(CicNotationPp.pp_obj CicNotationPp.pp_term) stm
+ let pp_lexicon = LexiconAstPp.pp_command in
- let nl () = output_string och (pp_ast_statement nl_ast) in
+ let nl () = output_string och (pp_statement nl_ast) in
MatitaMisc.out_preamble och;
MatitaMisc.out_preamble och;
- let grafite_parser_cb fname =
- let ast = G.Executable
- (floc, G.Command (floc, G.Include (floc, fname))) in
- output_string och (pp_ast_statement ast); nl (); nl ()
+ let grafite_parser_cb status = function
+ | G.Executable (_, G.Macro (_, G.Inline _)) -> ()
+ | stm ->
+ output_string och (pp_statement stm); nl (); nl ()
+ let lexicon_parser_cb status cmd =
+ output_string och (pp_lexicon cmd); nl (); nl ()
+ in
+(*
let matita_engine_cb = function
| G.Executable (_, G.Macro (_, G.Inline _))
| G.Executable (_, G.Command (_, G.Include _)) -> ()
| ast ->
let matita_engine_cb = function
| G.Executable (_, G.Macro (_, G.Inline _))
| G.Executable (_, G.Command (_, G.Include _)) -> ()
| ast ->
- output_string och (pp_ast_statement ast); nl (); nl ()
- in
let matitac_lib_cb = output_string och in
let matitac_lib_cb = output_string och in
- GrafiteParser.set_callback grafite_parser_cb;
- MatitaEngine.set_callback matita_engine_cb;
- set_callback matitac_lib_cb;
- fun x ->
+ begin fun () ->
+ GrafiteParser.set_grafite_callback grafite_parser_cb;
+ GrafiteParser.set_lexicon_callback lexicon_parser_cb;
+(*
+ MatitaEngine.set_callback matita_engine_cb;
+*)
+ set_callback matitac_lib_cb
+ end,
+ begin fun x ->
- GrafiteParser.set_callback ignore;
- MatitaEngine.set_callback ignore;
+ GrafiteParser.set_grafite_callback (fun _ _ -> ());
+ GrafiteParser.set_lexicon_callback (fun _ _ -> ());
;;
let get_macro_context = function
;;
let get_macro_context = function
-let compile options fname =
+let compile atstart options fname =
let matita_debug = Helm_registry.get_bool "matita.debug" in
let include_paths = get_include_paths options in
let root,baseuri,fname,_tgt =
let matita_debug = Helm_registry.get_bool "matita.debug" in
let include_paths = get_include_paths options in
let root,baseuri,fname,_tgt =
CicNotation2.load_notation ~include_paths:[]
BuildTimeConf.core_notation_script
in
CicNotation2.load_notation ~include_paths:[]
BuildTimeConf.core_notation_script
in
let grafite_status = GrafiteSync.init lexicon_status baseuri in
let big_bang = Unix.gettimeofday () in
let { Unix.tms_utime = big_bang_u ; Unix.tms_stime = big_bang_s} =
let grafite_status = GrafiteSync.init lexicon_status baseuri in
let big_bang = Unix.gettimeofday () in
let { Unix.tms_utime = big_bang_u ; Unix.tms_stime = big_bang_s} =
let (x, y) = HExtlib.loc_of_floc floc in
HLog.error (sprintf "Parse error at %d-%d: %s" x y err)
| exn when matita_debug -> raise exn'
let (x, y) = HExtlib.loc_of_floc floc in
HLog.error (sprintf "Parse error at %d-%d: %s" x y err)
| exn when matita_debug -> raise exn'
- | exn -> HLog.error (snd (MatitaExcPp.to_string exn)));
+ | exn -> HLog.error (snd (MatitaExcPp.to_string exn))
+ );
(* LexiconSync.time_travel ~present:lex_stat ~past:initial_lexicon_status;
* *)
pp_times fname false big_bang big_bang_u big_bang_s;
(* LexiconSync.time_travel ~present:lex_stat ~past:initial_lexicon_status;
* *)
pp_times fname false big_bang big_bang_u big_bang_s;
let build options fname =
let matita_debug = Helm_registry.get_bool "matita.debug" in
let build options fname =
let matita_debug = Helm_registry.get_bool "matita.debug" in
- let compile opts fname =
+ let compile atstart opts fname =
try
GrafiteSync.push ();
GrafiteParser.push ();
try
GrafiteSync.push ();
GrafiteParser.push ();
- let rc = compile opts fname in
+ let rc = compile atstart opts fname in
GrafiteParser.pop ();
GrafiteSync.pop ();
rc
GrafiteParser.pop ();
GrafiteSync.pop ();
rc
in
if Filename.check_suffix fname ".mma" then
let generated = Filename.chop_suffix fname ".mma" ^ ".ma" in
in
if Filename.check_suffix fname ".mma" then
let generated = Filename.chop_suffix fname ".mma" ^ ".ma" in
- let atexit = dump generated in
- let res = compile options fname in
+ let atstart, atexit = dump generated in
+ let res = compile atstart options fname in
let r = compact (atexit res) in
if r then r else begin
let r = compact (atexit res) in
if r then r else begin
+(* Sys.remove generated; *)
Printf.printf "rm %s\n" generated; flush stdout; r
end
else
Printf.printf "rm %s\n" generated; flush stdout; r
end
else
+ compile ignore options fname
;;
let load_deps_file = Librarian.load_deps_file;;
;;
let load_deps_file = Librarian.load_deps_file;;