diff options
| author |  Samuel Mimram <smimram@debian.org> | 2007-02-13 13:48:12 +0000 |
|---|---|---|
| committer | Samuel Mimram <smimram@debian.org> | 2007-02-13 13:48:12 +0000 |
| commit | 55ce117e8083477593cf1ff2e51a3641c7973830 (patch) | |
| tree | a82defb4105f175c71b0d13cae42831ce608c4d6 /parsing/g_vernac.ml4 | |
| parent | 208a0f7bfa5249f9795e6e225f309cbe715c0fad (diff) | |
Imported Upstream version 8.1+dfsgupstream/8.1+dfsg
Diffstat (limited to 'parsing/g_vernac.ml4')
| -rw-r--r-- | parsing/g_vernac.ml4 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/parsing/g_vernac.ml4 b/parsing/g_vernac.ml4 index 9bbdc1d4..9a98df80 100644 --- a/parsing/g_vernac.ml4 +++ b/parsing/g_vernac.ml4 @@ -6,7 +6,7 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(* $Id: g_vernac.ml4 9306 2006-10-28 18:28:19Z herbelin $ *) +(* $Id: g_vernac.ml4 9562 2007-01-31 09:00:36Z msozeau $ *) (*i camlp4deps: "parsing/grammar.cma" i*) open Pp @@ -264,8 +264,8 @@ GEXTEND Gram ; rec_annotation: [ [ "{"; IDENT "struct"; id=IDENT; "}" -> (Some (id_of_string id), CStructRec) - | "{"; IDENT "wf"; id=IDENT; rel=lconstr; "}" -> (Some (id_of_string id), CWfRec rel) - | "{"; IDENT "measure"; id=IDENT; rel=lconstr; "}" -> (Some (id_of_string id), CMeasureRec rel) + | "{"; IDENT "wf"; rel=constr; id=IDENT; "}" -> (Some (id_of_string id), CWfRec rel) + | "{"; IDENT "measure"; rel=constr; id=IDENT; "}" -> (Some (id_of_string id), CMeasureRec rel) | -> (None, CStructRec) ] ] ; @@ -459,7 +459,7 @@ GEXTEND Gram | IDENT "Implicit"; IDENT "Arguments"; qid = global; pos = OPT [ "["; l = LIST0 ident; "]" -> l ] -> let pos = option_map (List.map (fun id -> ExplByName id)) pos in - VernacDeclareImplicits (qid,pos) + VernacDeclareImplicits (true,qid,pos) | IDENT "Implicit"; ["Type" | IDENT "Types"]; idl = LIST1 identref; ":"; c = lconstr -> VernacReserve (idl,c) ] ] @@ -711,7 +711,7 @@ GEXTEND Gram refl = LIST1 class_rawexpr -> VernacBindScope (sc,refl) | IDENT "Arguments"; IDENT "Scope"; qid = global; - "["; scl = LIST0 opt_scope; "]" -> VernacArgumentsScope (qid,scl) + "["; scl = LIST0 opt_scope; "]" -> VernacArgumentsScope (true,qid,scl) | IDENT "Infix"; local = locality; op = ne_string; ":="; p = global; |