diff options
| author | herbelin | 2008-10-20 19:11:25 +0000 |
|---|---|---|
| committer | herbelin | 2008-10-20 19:11:25 +0000 |
| commit | 05f91178923218b864d8c921dfb557c7c13f14ca (patch) | |
| tree | 106252ae90224eb41970fecea35a7c459456148b | |
| parent | de1077e22c9f928edd2f78b76a75762c673abc39 (diff) | |
Renommage "Global Instance" en "Instance Global" pour uniformisation
de l'utilisation des modificateurs Global/Local
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11480 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | doc/refman/Classes.tex | 2 | ||||
| -rw-r--r-- | parsing/g_vernac.ml4 | 6 |
3 files changed, 7 insertions, 5 deletions
@@ -165,7 +165,9 @@ Libraries (DOC TO CHECK) - Definition of pred and minus made compatible with the structural decreasing criterion for use in fixpoints. - Files Relations/Rstar.v and Relations/Newman.v moved out to the user - contribution repository (contribution CoC_History). + contribution repository (contribution CoC_History). New lemmas about + transitive closure added and some bound variables renamed (exceptional + risk of incompatibilities). Notations, coercions, implicit arguments and type inference diff --git a/doc/refman/Classes.tex b/doc/refman/Classes.tex index 2db0ab2862..986397c38d 100644 --- a/doc/refman/Classes.tex +++ b/doc/refman/Classes.tex @@ -284,7 +284,7 @@ An arbitrary context of the form {\tt \binder$_1$ \ldots \binder$_n$} can be put after the name of the instance and before the colon to declare a parameterized instance. \begin{Variants} -\item {\tt Global Instance} One can use the \texttt{Global} modifier on +\item {\tt Instance Global} One can use the \texttt{Global} modifier on instances declared in a section so that their generalization is automatically redeclared after the section is closed. diff --git a/parsing/g_vernac.ml4 b/parsing/g_vernac.ml4 index b22ae3fedd..f0ea35d923 100644 --- a/parsing/g_vernac.ml4 +++ b/parsing/g_vernac.ml4 @@ -504,8 +504,8 @@ GEXTEND Gram | IDENT "Context"; c = binders_let -> VernacContext c - | global = [ IDENT "Global" -> true | -> false ]; - IDENT "Instance"; name = identref; sup = OPT binders_let; ":"; + | IDENT "Instance"; local = non_locality; name = identref; + sup = OPT binders_let; ":"; expl = [ "!" -> Rawterm.Implicit | -> Rawterm.Explicit ] ; t = operconstr LEVEL "200"; pri = OPT [ "|"; i = natural -> i ] ; props = typeclass_field_defs -> let sup = @@ -517,7 +517,7 @@ GEXTEND Gram let (loc, id) = name in (loc, Name id) in - VernacInstance (global, sup, (n, expl, t), props, pri) + VernacInstance (not local, sup, (n, expl, t), props, pri) | IDENT "Existing"; IDENT "Instance"; is = identref -> VernacDeclareInstance is |