let name,ty =
match defs with
| (params,(N.Ident (name, None), ty),_,_) :: _ ->
- let ty = match ty with Some ty -> ty | None -> N.Implicit in
+ let ty = match ty with Some ty -> ty | None -> N.Implicit `JustOne in
let ty =
List.fold_right
(fun var ty -> N.Binder (`Pi,var,ty)
let deannotate = function
| N.AttributedTerm (_,t) | t -> t
in match deannotate params with
- | N.Implicit -> [false]
+ | N.Implicit _ -> [false]
| N.UserInput -> [true]
| N.Appl l ->
List.map (fun x -> match deannotate x with
- | N.Implicit -> false
+ | 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)) ]
G.NReduce (loc, kind, p)
| IDENT "nrewrite"; dir = direction; what = tactic_term ; where = pattern_spec ->
G.NRewrite (loc, dir, what, where)
- | IDENT "ntry"; LPAREN ; tac = SELF ; RPAREN -> G.NTry (loc,tac)
+ | IDENT "ntry"; tac = SELF -> G.NTry (loc,tac)
+ | IDENT "nrepeat"; tac = SELF -> G.NRepeat (loc,tac)
+ | LPAREN; l = LIST1 SELF; RPAREN -> G.NBlock (loc,l)
| IDENT "nassumption" -> G.NAssumption loc
| SYMBOL "#"; n=IDENT -> G.NIntro (loc,n)
| SYMBOL "#"; SYMBOL "_" -> G.NIntro (loc,"_")
in
(params,name,typ,fields)
] ];
+
+ nmacro: [
+ [ [ IDENT "ncheck" ]; t = term -> G.NCheck (loc,t)
+ ]
+ ];
macro: [
[ [ IDENT "check" ]; t = term ->
G.NObj (loc, N.Theorem (nflavour, name, typ, body))
| nflavour = ntheorem_flavour; name = IDENT; SYMBOL <:unicode<def>> (* ≝ *);
body = term ->
- G.NObj (loc, N.Theorem (nflavour, name, N.Implicit, Some body))
+ G.NObj (loc, N.Theorem (nflavour, name, N.Implicit `JustOne, Some body))
| IDENT "naxiom"; name = IDENT; SYMBOL ":"; typ = term ->
G.NObj (loc, N.Theorem (`Axiom, name, typ, None))
| NLETCOREC ; defs = let_defs ->
G.NUnivConstraint (loc, strict,u1,u2)
| IDENT "unification"; IDENT "hint"; n = int; t = tactic_term ->
G.UnificationHint (loc, t, n)
+ | IDENT "ncoercion"; 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 ->
G.NObj (loc, N.Record (params,name,ty,fields))
+ | IDENT "ncopy" ; 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)
]];
grafite_command: [ [
| flavour = theorem_flavour; name = IDENT; SYMBOL <:unicode<def>> (* ≝ *);
body = term ->
G.Obj (loc,
- N.Theorem (flavour, name, N.Implicit, Some body))
+ N.Theorem (flavour, name, N.Implicit `JustOne, Some body))
| IDENT "axiom"; name = IDENT; SYMBOL ":"; typ = term ->
G.Obj (loc, N.Theorem (`Axiom, name, typ, None))
| LETCOREC ; defs = let_defs ->
punct = punctuation_tactical ->
G.NTactic (loc, [nnon_punct_of_punct tac; npunct_of_punct punct])
| mac = macro; SYMBOL "." -> G.Macro (loc, mac)
+ | mac = nmacro; SYMBOL "." -> G.NMacro (loc, mac)
]
];
comment: [