let default_associativity = Gramext.NonA
let mk_rec_corec ind_kind defs loc =
- (* In case of mutual definitions here we produce just
- the syntax tree for the first one. The others will be
- generated from the completely specified term just before
- insertion in the environment. We use the flavour
- `MutualDefinition to rememer this. *)
let name,ty =
match defs with
| (params,(N.Ident (name, None), ty),_,_) :: _ ->
| _ -> assert false
in
let body = N.Ident (name,None) in
- let flavour =
- if List.length defs = 1 then
- `Definition
- else
- `MutualDefinition
- in
- (loc, N.Theorem(flavour, name, ty, Some (N.LetRec (ind_kind, defs, body)), `Regular))
+ (loc, N.Theorem(`Definition, name, ty, Some (N.LetRec (ind_kind, defs, body)), `Regular))
let nmk_rec_corec ind_kind defs loc =
let loc,t = mk_rec_corec ind_kind defs loc in
G.NObj (loc,t)
(*
-let npunct_of_punct = function
- | G.Branch loc -> G.NBranch loc
- | G.Shift loc -> G.NShift loc
- | G.Pos (loc, i) -> G.NPos (loc, i)
- | G.Wildcard loc -> G.NWildcard loc
- | G.Merge loc -> G.NMerge loc
- | G.Semicolon loc -> G.NSemicolon loc
- | G.Dot loc -> G.NDot loc
-;;
-
let nnon_punct_of_punct = function
| G.Skip loc -> G.NSkip loc
| G.Unfocus loc -> G.NUnfocus loc
| G.Focus (loc,l) -> G.NFocus (loc,l)
;; *)
-let cons_ntac t p =
- match t with
- | G.NTactic(loc,[t]) -> G.NTactic(loc,[t;p])
- | x -> x
-;;
-
type by_continuation =
BYC_done
| BYC_weproved of N.term * string option * N.term option
| IDENT "whd" -> `Whd ]
];
nreduction_kind: [
- [ IDENT "nnormalize" ; delta = OPT [ IDENT "nodelta" -> () ] ->
+ [ IDENT "normalize" ; delta = OPT [ IDENT "nodelta" -> () ] ->
let delta = match delta with None -> true | _ -> false in
`Normalize delta
(*| IDENT "unfold"; t = OPT tactic_term -> `Unfold t*)
- | IDENT "nwhd" ; delta = OPT [ IDENT "nodelta" -> () ] ->
+ | IDENT "whd" ; delta = OPT [ IDENT "nodelta" -> () ] ->
let delta = match delta with None -> true | _ -> false in
`Whd delta]
];
];
using: [ [ using = OPT [ IDENT "using"; t = tactic_term -> t ] -> using ] ];
ntactic: [
- [ IDENT "napply"; t = tactic_term -> G.NTactic(loc,[G.NApply (loc, t)])
- | IDENT "napplyS"; t = tactic_term -> G.NTactic(loc,[G.NSmartApply(loc, t)])
- | IDENT "nassert";
+ [ SYMBOL "@"; t = tactic_term -> G.NTactic(loc,[G.NApply (loc, t)])
+ | IDENT "apply"; t = tactic_term -> G.NTactic(loc,[G.NApply (loc, t)])
+ | IDENT "applyS"; t = tactic_term -> G.NTactic(loc,[G.NSmartApply(loc, t)])
+ | IDENT "assert";
seqs = LIST0 [
hyps = LIST0
[ id = IDENT ; SYMBOL ":" ; ty = tactic_term -> id,`Decl ty
SYMBOL <:unicode<vdash>>;
concl = tactic_term -> (List.rev hyps,concl) ] ->
G.NTactic(loc,[G.NAssert (loc, seqs)])
- | IDENT "nauto"; params = auto_params ->
+ | IDENT "auto"; params = auto_params ->
G.NTactic(loc,[G.NAuto (loc, params)])
| SYMBOL "/"; num = OPT NUMBER ;
params = nauto_params; SYMBOL "/" ;
| Some `Trace ->
G.NMacro(loc,
G.NAutoInteractive (loc, (None,["slir","";"depth",depth]@params))))
- | IDENT "nintros" -> G.NMacro (loc, G.NIntroGuess loc)
- | IDENT "ncheck"; t = term -> G.NMacro(loc,G.NCheck (loc,t))
+ | IDENT "intros" -> G.NMacro (loc, G.NIntroGuess loc)
+ | IDENT "check"; t = term -> G.NMacro(loc,G.NCheck (loc,t))
| IDENT "screenshot"; fname = QSTRING ->
G.NMacro(loc,G.Screenshot (loc, fname))
- | IDENT "ncases"; what = tactic_term ; where = pattern_spec ->
+ | IDENT "cases"; what = tactic_term ; where = pattern_spec ->
G.NTactic(loc,[G.NCases (loc, what, where)])
- | IDENT "nchange"; what = pattern_spec; "with"; with_what = tactic_term ->
+ | IDENT "change"; what = pattern_spec; "with"; with_what = tactic_term ->
G.NTactic(loc,[G.NChange (loc, what, with_what)])
| SYMBOL "@"; num = OPT NUMBER; l = LIST0 tactic_term ->
G.NTactic(loc,[G.NConstructor (loc, (match num with None -> None | Some x -> Some (int_of_string x)),l)])
- | IDENT "ncut"; t = tactic_term -> G.NTactic(loc,[G.NCut (loc, t)])
-(* | IDENT "ndiscriminate"; t = tactic_term -> G.NDiscriminate (loc, t)
- | IDENT "nsubst"; t = tactic_term -> G.NSubst (loc, t) *)
- | IDENT "ndestruct"; just = OPT [ dom = ident_list1 -> dom ];
+ | IDENT "cut"; t = tactic_term -> G.NTactic(loc,[G.NCut (loc, t)])
+(* | IDENT "discriminate"; t = tactic_term -> G.NDiscriminate (loc, t)
+ | IDENT "subst"; t = tactic_term -> G.NSubst (loc, t) *)
+ | IDENT "destruct"; just = OPT [ dom = ident_list1 -> dom ];
exclude = OPT [ IDENT "skip"; skip = ident_list1 -> skip ]
-> let exclude' = match exclude with None -> [] | Some l -> l in
G.NTactic(loc,[G.NDestruct (loc,just,exclude')])
- | IDENT "nelim"; what = tactic_term ; where = pattern_spec ->
+ | IDENT "elim"; what = tactic_term ; where = pattern_spec ->
G.NTactic(loc,[G.NElim (loc, what, where)])
- | IDENT "ngeneralize"; p=pattern_spec ->
+ | IDENT "generalize"; p=pattern_spec ->
G.NTactic(loc,[G.NGeneralize (loc, p)])
- | IDENT "ninversion"; what = tactic_term ; where = pattern_spec ->
+ | IDENT "inversion"; what = tactic_term ; where = pattern_spec ->
G.NTactic(loc,[G.NInversion (loc, what, where)])
- | IDENT "nlapply"; t = tactic_term -> G.NTactic(loc,[G.NLApply (loc, t)])
- | IDENT "nletin"; name = IDENT ; SYMBOL <:unicode<def>> ; t = tactic_term;
+ | IDENT "lapply"; t = tactic_term -> G.NTactic(loc,[G.NLApply (loc, t)])
+ | IDENT "letin"; name = IDENT ; SYMBOL <:unicode<def>> ; t = tactic_term;
where = pattern_spec ->
G.NTactic(loc,[G.NLetIn (loc,where,t,name)])
| kind = nreduction_kind; p = pattern_spec ->
G.NTactic(loc,[G.NReduce (loc, kind, p)])
- | IDENT "nrewrite"; dir = direction; what = tactic_term ; where = pattern_spec ->
+ | dir = direction; what = tactic_term ; where = pattern_spec ->
G.NTactic(loc,[G.NRewrite (loc, dir, what, where)])
- | IDENT "ntry"; tac = SELF ->
+ | IDENT "rewrite"; dir = direction; what = tactic_term ; where = pattern_spec ->
+ G.NTactic(loc,[G.NRewrite (loc, dir, what, where)])
+ | IDENT "try"; tac = SELF ->
let tac = match tac with G.NTactic(_,[t]) -> t | _ -> assert false in
G.NTactic(loc,[ G.NTry (loc,tac)])
- | IDENT "nrepeat"; tac = SELF ->
+ | IDENT "repeat"; tac = SELF ->
let tac = match tac with G.NTactic(_,[t]) -> t | _ -> assert false in
G.NTactic(loc,[ G.NRepeat (loc,tac)])
| LPAREN; l = LIST1 SELF; RPAREN ->
List.flatten
(List.map (function G.NTactic(_,t) -> t | _ -> assert false) l) in
G.NTactic(loc,[G.NBlock (loc,l)])
- | IDENT "nassumption" -> G.NTactic(loc,[ G.NAssumption loc])
- | SYMBOL "#"; ns=LIST0 IDENT -> G.NTactic(loc,[ G.NIntros (loc,ns)])
+ | IDENT "assumption" -> G.NTactic(loc,[ G.NAssumption loc])
+ | SYMBOL "#"; ns=IDENT -> G.NTactic(loc,[ G.NIntros (loc,[ns])])
| SYMBOL "#"; SYMBOL "_" -> G.NTactic(loc,[ G.NIntro (loc,"_")])
| SYMBOL "*" -> G.NTactic(loc,[ G.NCase1 (loc,"_")])
| SYMBOL "*"; n=IDENT -> G.NTactic(loc,[ G.NCase1 (loc,n)])
]
];
-(*
- tactic: [
- [ IDENT "absurd"; t = tactic_term ->
- G.Absurd (loc, t)
- | IDENT "apply"; IDENT "rule"; t = tactic_term ->
- G.ApplyRule (loc, t)
- | IDENT "apply"; t = tactic_term ->
- G.Apply (loc, t)
- | IDENT "applyP"; t = tactic_term ->
- G.ApplyP (loc, t)
- | IDENT "applyS"; t = tactic_term ; params = auto_params ->
- G.ApplyS (loc, t, params)
- | IDENT "assumption" ->
- G.Assumption loc
- | IDENT "autobatch"; params = auto_params ->
- G.AutoBatch (loc,params)
- | IDENT "cases"; what = tactic_term;
- pattern = OPT pattern_spec;
- specs = intros_spec ->
- let pattern = match pattern with
- | None -> None, [], Some N.UserInput
- | Some pattern -> pattern
- in
- G.Cases (loc, what, pattern, specs)
- | IDENT "clear"; ids = LIST1 IDENT ->
- G.Clear (loc, ids)
- | IDENT "clearbody"; id = IDENT ->
- G.ClearBody (loc,id)
- | IDENT "change"; what = pattern_spec; "with"; t = tactic_term ->
- 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
- G.Compose (loc, t1, t2, times, specs)
- | IDENT "constructor"; n = int ->
- G.Constructor (loc, n)
- | IDENT "contradiction" ->
- G.Contradiction loc
- | IDENT "cut"; t = tactic_term; ident = OPT [ "as"; id = IDENT -> id] ->
- G.Cut (loc, ident, t)
- | IDENT "decompose"; idents = OPT [ "as"; idents = LIST1 new_name -> idents ] ->
- let idents = match idents with None -> [] | Some idents -> idents in
- G.Decompose (loc, idents)
- | IDENT "demodulate"; p = auto_params -> G.Demodulate (loc, p)
- | IDENT "destruct"; xts = OPT [ ts = tactic_term_list1 -> ts ] ->
- G.Destruct (loc, xts)
- | IDENT "elim"; what = tactic_term; using = using;
- pattern = OPT pattern_spec;
- ispecs = intros_spec ->
- let pattern = match pattern with
- | None -> None, [], Some N.UserInput
- | Some pattern -> pattern
- in
- G.Elim (loc, what, using, pattern, ispecs)
- | IDENT "elimType"; what = tactic_term; using = using;
- (num, idents) = intros_spec ->
- G.ElimType (loc, what, using, (num, idents))
- | IDENT "exact"; t = tactic_term ->
- G.Exact (loc, t)
- | IDENT "exists" ->
- 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
- raise (HExtlib.Localized (loc, CicNotationParser.Parse_error
- ("the pattern cannot specify the term to replace, only its"
- ^ " paths in the hypotheses and in the conclusion")))
- else
- G.Fold (loc, kind, t, p)
- | IDENT "fourier" ->
- G.Fourier loc
- | IDENT "fwd"; hyp = IDENT; idents = OPT [ "as"; idents = LIST1 new_name -> idents ] ->
- let idents = match idents with None -> [] | Some idents -> idents in
- G.FwdSimpl (loc, hyp, idents)
- | IDENT "generalize"; p=pattern_spec; id = OPT ["as" ; id = IDENT -> id] ->
- 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
- G.Intros (loc, (Some 1, idents))
- | IDENT "intros"; specs = intros_spec ->
- G.Intros (loc, specs)
- | IDENT "inversion"; t = tactic_term ->
- G.Inversion (loc, t)
- | IDENT "lapply";
- linear = OPT [ IDENT "linear" ];
- depth = OPT [ IDENT "depth"; SYMBOL "="; i = int -> i ];
- what = tactic_term;
- to_what = OPT [ "to" ; t = tactic_term_list1 -> t ];
- 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
- G.LApply (loc, linear, depth, to_what, what, ident)
- | IDENT "left" -> G.Left loc
- | IDENT "letin"; where = IDENT ; SYMBOL <:unicode<def>> ; t = tactic_term ->
- G.LetIn (loc, t, where)
- | kind = reduction_kind; p = pattern_spec ->
- G.Reduce (loc, kind, p)
- | IDENT "reflexivity" ->
- G.Reflexivity loc
- | IDENT "replace"; p = pattern_spec; "with"; t = tactic_term ->
- G.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
- if pt <> None then
- raise
- (HExtlib.Localized (loc,
- (CicNotationParser.Parse_error
- "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
- G.Rewrite (loc, d, t, p, n)
- | IDENT "right" ->
- G.Right loc
- | IDENT "ring" ->
- G.Ring loc
- | IDENT "split" ->
- G.Split loc
- | IDENT "symmetry" ->
- G.Symmetry loc
- | IDENT "transitivity"; t = tactic_term ->
- G.Transitivity (loc, t)
- (* Produzioni Aggiunte *)
- | IDENT "assume" ; id = IDENT ; SYMBOL ":" ; t = tactic_term ->
- G.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']->
- G.Suppose (loc, t, id, t1)
- | "let" ; id1 = IDENT ; SYMBOL ":" ; t1 = tactic_term ;
- IDENT "such" ; IDENT "that" ; t2=tactic_term ; LPAREN ;
- id2 = IDENT ; RPAREN ->
- G.ExistsElim (loc, `Auto (None,[]), id1, t1, id2, t2)
- | just =
- [ IDENT "using"; t=tactic_term -> `Term t
- | params = auto_params -> `Auto params] ;
- cont=by_continuation ->
- (match cont with
- BYC_done -> G.Bydone (loc, just)
- | BYC_weproved (ty,id,t1) ->
- G.By_just_we_proved(loc, just, ty, id, t1)
- | BYC_letsuchthat (id1,t1,id2,t2) ->
- G.ExistsElim (loc, just, id1, t1, id2, t2)
- | BYC_wehaveand (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']->
- 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 ->
- 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 ->
- 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 ->
- G.Byinduction(loc, t, id)
- | IDENT "the" ; IDENT "thesis" ; IDENT "becomes" ; t=tactic_term ->
- G.Thesisbecomes(loc, t)
- | IDENT "case" ; id = IDENT ; params=LIST0[LPAREN ; i=IDENT ;
- SYMBOL":" ; t=tactic_term ; RPAREN -> i,t] ->
- G.Case(loc,id,params)
- (* DO NOT FACTORIZE with the two following, camlp5 sucks*)
- | IDENT "conclude";
- termine = tactic_term;
- SYMBOL "=" ;
- t1=tactic_term ;
- t2 =
- [ IDENT "using"; t=tactic_term -> `Term t
- | IDENT "using"; IDENT "once"; term=tactic_term -> `SolveWith term
- | IDENT "proof" -> `Proof
- | params = auto_params -> `Auto params];
- cont = rewriting_step_continuation ->
- G.RewritingStep(loc, Some (None,termine), t1, t2, cont)
- | IDENT "obtain" ; name = IDENT;
- termine = tactic_term;
- SYMBOL "=" ;
- t1=tactic_term ;
- t2 =
- [ IDENT "using"; t=tactic_term -> `Term t
- | IDENT "using"; IDENT "once"; term=tactic_term -> `SolveWith term
- | IDENT "proof" -> `Proof
- | params = auto_params -> `Auto params];
- cont = rewriting_step_continuation ->
- G.RewritingStep(loc, Some (Some name,termine), t1, t2, cont)
- | SYMBOL "=" ;
- t1=tactic_term ;
- t2 =
- [ IDENT "using"; t=tactic_term -> `Term t
- | IDENT "using"; IDENT "once"; term=tactic_term -> `SolveWith term
- | IDENT "proof" -> `Proof
- | params = auto_params -> `Auto params];
- cont = rewriting_step_continuation ->
- G.RewritingStep(loc, None, t1, t2, cont)
- ]
-]; *)
auto_fixed_param: [
[ IDENT "demod"
| IDENT "fast_paramod"
]
];
-(*
- inline_params:[
- [ params = LIST0
- [ IDENT "prefix"; SYMBOL "="; prefix = QSTRING -> G.IPPrefix prefix
- | flavour = inline_flavour -> G.IPAs flavour
- | IDENT "coercions" -> G.IPCoercions
- | IDENT "debug"; SYMBOL "="; debug = int -> G.IPDebug debug
- | IDENT "procedural" -> G.IPProcedural
- | IDENT "nodefaults" -> G.IPNoDefaults
- | IDENT "depth"; SYMBOL "="; depth = int -> G.IPDepth depth
- | IDENT "level"; SYMBOL "="; level = int -> G.IPLevel level
- | IDENT "comments" -> G.IPComments
- | IDENT "cr" -> G.IPCR
- ] -> params
- ]
-];*)
by_continuation: [
[ WEPROVED; ty = tactic_term ; LPAREN ; id = IDENT ; RPAREN ; t1 = OPT [IDENT "that" ; IDENT "is" ; IDENT "equivalent" ; "to" ; t2 = tactic_term -> t2] -> BYC_weproved (ty,Some id,t1)
| WEPROVED; ty = tactic_term ; t1 = OPT [IDENT "that" ; IDENT "is" ; IDENT "equivalent" ; "to" ; t2 = tactic_term -> t2] ;
| -> false
]
];
-(*
+(* MATITA 1.0
atomic_tactical:
[ "sequence" LEFTA
[ t1 = SELF; SYMBOL ";"; t2 = SELF ->
| SYMBOL "." -> G.NDot loc
]
];
-(*
- punctuation_tactical:
- [
- [ 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
- [ IDENT "focus"; goals = LIST1 int -> G.Focus (loc, goals)
- | IDENT "unfocus" -> G.Unfocus loc
- | IDENT "skip" -> G.Skip loc
- ]
- ];
-*)
nnon_punctuation_tactical:
[ "simple" NONA
[ IDENT "focus"; goals = LIST1 int -> G.NFocus (loc, goals)
]
];
ntheorem_flavour: [
- [ [ IDENT "ndefinition" ] -> `Definition
- | [ IDENT "nfact" ] -> `Fact
- | [ IDENT "nlemma" ] -> `Lemma
- | [ IDENT "nremark" ] -> `Remark
- | [ IDENT "ntheorem" ] -> `Theorem
- ]
- ];
- theorem_flavour: [
[ [ IDENT "definition" ] -> `Definition
| [ IDENT "fact" ] -> `Fact
| [ IDENT "lemma" ] -> `Lemma
- | [ IDENT "remark" ] -> `Remark
+ | [ IDENT "example" ] -> `Example
| [ IDENT "theorem" ] -> `Theorem
+ | [ IDENT "corollary" ] -> `Corollary
]
];
- inline_flavour: [
- [ attr = theorem_flavour -> attr
- | [ IDENT "axiom" ] -> `Axiom
- | [ IDENT "variant" ] -> `Variant
- ]
- ];
inductive_spec: [ [
fst_name = IDENT;
params = LIST0 protected_binder_vars;
let ident = "\\("^alpha^ident_cont^"*"^decoration^"*\\|_"^ident_cont^"+"^decoration^"*\\)" in
let rex = Str.regexp ("^"^ident^"$") in
if Str.string_match rex id 0 then
- if (try ignore (UriManager.uri_of_string uri); true
- with UriManager.IllFormedUri _ -> false) ||
- (try ignore (NReference.reference_of_string uri); true
+ if (try ignore (NReference.reference_of_string uri); true
with NReference.IllFormedReference _ -> false)
then
L.Ident_alias (id, uri)
]
];
level3_term: [
- [ u = URI -> N.UriPattern (UriManager.uri_of_string u)
- | r = NREF -> N.NRefPattern (NReference.reference_of_string r)
+ [ r = NREF -> N.NRefPattern (NReference.reference_of_string r)
| IMPLICIT -> N.ImplicitPattern
| id = IDENT -> N.VarPattern id
| LPAREN; terms = LIST1 SELF; RPAREN ->
]];
grafite_ncommand: [ [
- IDENT "nqed" -> G.NQed loc
+ IDENT "qed" -> G.NQed loc
| nflavour = ntheorem_flavour; name = IDENT; SYMBOL ":"; typ = term;
body = OPT [ SYMBOL <:unicode<def>> (* ≝ *); body = term -> body ] ->
G.NObj (loc, N.Theorem (nflavour, name, typ, body,`Regular))
| nflavour = ntheorem_flavour; name = IDENT; SYMBOL <:unicode<def>> (* ≝ *);
body = term ->
G.NObj (loc, N.Theorem (nflavour, name, N.Implicit `JustOne, Some body,`Regular))
- | IDENT "naxiom"; name = IDENT; SYMBOL ":"; typ = term ->
+ | IDENT "axiom"; name = IDENT; SYMBOL ":"; typ = term ->
G.NObj (loc, N.Theorem (`Axiom, name, typ, None, `Regular))
- | IDENT "ndiscriminator" ; indty = tactic_term -> G.NDiscriminator (loc,indty)
- | IDENT "ninverter"; name = IDENT; IDENT "for" ; indty = tactic_term ;
+ | IDENT "discriminator" ; indty = tactic_term -> G.NDiscriminator (loc,indty)
+ | IDENT "inverter"; name = IDENT; IDENT "for" ; indty = tactic_term ;
paramspec = OPT inverter_param_list ;
outsort = OPT [ SYMBOL ":" ; outsort = term -> outsort ] ->
G.NInverter (loc,name,indty,paramspec,outsort)
nmk_rec_corec `CoInductive defs loc
| NLETREC ; defs = let_defs ->
nmk_rec_corec `Inductive defs loc
- | IDENT "ninductive"; spec = inductive_spec ->
+ | IDENT "inductive"; spec = inductive_spec ->
let (params, ind_types) = spec in
G.NObj (loc, N.Inductive (params, ind_types))
- | IDENT "ncoinductive"; spec = inductive_spec ->
+ | 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))
G.NUnivConstraint (loc,u1,u2)
| IDENT "unification"; IDENT "hint"; n = int; t = tactic_term ->
G.UnificationHint (loc, t, n)
- | IDENT "ncoercion"; name = IDENT; SYMBOL ":"; ty = term;
+ | IDENT "coercion"; name = IDENT; SYMBOL ":"; ty = term;
SYMBOL <:unicode<def>>; t = term; "on";
id = [ IDENT | PIDENT ]; SYMBOL ":"; source = term;
"to"; target = term ->
G.NCoercion(loc,name,t,ty,(id,source),target)
- | IDENT "nrecord" ; (params,name,ty,fields) = record_spec ->
+ | IDENT "record" ; (params,name,ty,fields) = record_spec ->
G.NObj (loc, N.Record (params,name,ty,fields))
- | IDENT "ncopy" ; s = IDENT; IDENT "from"; u = URI; "with";
+ | IDENT "copy" ; s = IDENT; IDENT "from"; u = URI; "with";
m = LIST0 [ u1 = URI; SYMBOL <:unicode<mapsto>>; u2 = URI -> u1,u2 ] ->
G.NCopy (loc,s,NUri.uri_of_string u,
List.map (fun a,b -> NUri.uri_of_string a, NUri.uri_of_string b) m)
]];
executable: [
[ ncmd = grafite_ncommand; SYMBOL "." -> G.NCommand (loc, ncmd)
-(* | tac = atomic_tactical LEVEL "loops"; punct = punctuation_tactical ->
- G.Tactic (loc, Some tac, punct) *)
-(* | punct = punctuation_tactical -> G.Tactic (loc, None, punct) *)
- | tac = ntactic; OPT [ SYMBOL "#" ; SYMBOL "#" ] ;
- punct = npunctuation_tactical -> cons_ntac tac punct
+ | punct = npunctuation_tactical -> G.NTactic (loc, [punct])
+ | tac = nnon_punctuation_tactical(*; punct = npunctuation_tactical*) ->
+ G.NTactic (loc, [tac])
+ | tac = ntactic (*; punct = npunctuation_tactical*) ->
+ tac
(*
- | tac = ntactic; punct = punctuation_tactical ->
- cons_ntac tac (npunct_of_punct punct)
-*)
- | SYMBOL "#" ; SYMBOL "#" ; punct = npunctuation_tactical ->
- G.NTactic (loc, [punct])
- | SYMBOL "#" ; SYMBOL "#" ; tac = nnon_punctuation_tactical;
- SYMBOL "#" ; SYMBOL "#" ; punct = npunctuation_tactical ->
- G.NTactic (loc, [tac; punct])
- | SYMBOL "#" ; SYMBOL "#" ; tac = nnon_punctuation_tactical;
+ | tac = nnon_punctuation_tactical;
punct = npunctuation_tactical ->
G.NTactic (loc, [tac; punct])
+*)
]
];
comment: [
projects / helm.git / blobdiff