diff options
| author |  Emilio Jesus Gallego Arias <e+git@x80.org> | 2018-05-20 22:23:02 +0200 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias <e+git@x80.org> | 2018-05-27 15:18:08 +0200 |
| commit | 311e87f261b5e7f1dca61ac19d9b7b695b411ce0 (patch) | |
| tree | ba75b995a5b9a58b76d016f46adc934dfe9e29ba | |
| parent | b2f746e41abf53fc481f90804ba4d70edd73fc86 (diff) | |
[api] [parsing] Move Egram* to `vernac/`
The extension mechanism is specific to metasyntax and vernacinterp,
thus it makes sense to place them next to each other.
We also fix the META entry for the `grammar` camlp5 plugin.
| -rw-r--r-- | META.coq | 24 | ||||
| -rw-r--r-- | parsing/parsing.mllib | 2 | ||||
| -rw-r--r-- | printing/printing.mllib | 1 | ||||
| -rw-r--r-- | vernac/egramcoq.ml (renamed from parsing/egramcoq.ml) | 0 | ||||
| -rw-r--r-- | vernac/egramcoq.mli (renamed from parsing/egramcoq.mli) | 0 | ||||
| -rw-r--r-- | vernac/egramml.ml (renamed from parsing/egramml.ml) | 0 | ||||
| -rw-r--r-- | vernac/egramml.mli (renamed from parsing/egramml.mli) | 0 | ||||
| -rw-r--r-- | vernac/ppvernac.ml (renamed from printing/ppvernac.ml) | 0 | ||||
| -rw-r--r-- | vernac/ppvernac.mli (renamed from printing/ppvernac.mli) | 0 | ||||
| -rw-r--r-- | vernac/vernac.mllib | 11 |
10 files changed, 19 insertions, 19 deletions
@@ -6,6 +6,18 @@ version = "8.8" directory = "" requires = "camlp5" +package "grammar" ( + + description = "Coq Camlp5 Grammar Extensions for Plugins" + version = "8.8" + + requires = "camlp5.gramlib" + directory = "grammar" + + archive(byte) = "grammar.cma" + archive(native) = "grammar.cmxa" +) + package "config" ( description = "Coq Configuration Variables" @@ -126,18 +138,6 @@ package "interp" ( ) -package "grammar" ( - - description = "Coq Camlp5 Grammar Extensions for Plugins" - version = "8.8" - - requires = "camlp5.gramlib" - directory = "grammar" - - archive(byte) = "grammar.cma" - archive(native) = "grammar.cmxa" -) - package "proofs" ( description = "Coq Proof Engine" diff --git a/parsing/parsing.mllib b/parsing/parsing.mllib index 103e1188a..e5a0a31cc 100644 --- a/parsing/parsing.mllib +++ b/parsing/parsing.mllib @@ -3,8 +3,6 @@ CLexer Extend Vernacexpr Pcoq -Egramml -Egramcoq G_constr G_vernac G_prim diff --git a/printing/printing.mllib b/printing/printing.mllib index 86b68d8fb..b69d8a9ef 100644 --- a/printing/printing.mllib +++ b/printing/printing.mllib @@ -4,4 +4,3 @@ Ppconstr Printer Printmod Prettyp -Ppvernac diff --git a/parsing/egramcoq.ml b/vernac/egramcoq.ml index 5f63d21c4..5f63d21c4 100644 --- a/parsing/egramcoq.ml +++ b/vernac/egramcoq.ml diff --git a/parsing/egramcoq.mli b/vernac/egramcoq.mli index e15add10f..e15add10f 100644 --- a/parsing/egramcoq.mli +++ b/vernac/egramcoq.mli diff --git a/parsing/egramml.ml b/vernac/egramml.ml index 90cd7d10b..90cd7d10b 100644 --- a/parsing/egramml.ml +++ b/vernac/egramml.ml diff --git a/parsing/egramml.mli b/vernac/egramml.mli index 31aa1a989..31aa1a989 100644 --- a/parsing/egramml.mli +++ b/vernac/egramml.mli diff --git a/printing/ppvernac.ml b/vernac/ppvernac.ml index 7a34e8027..7a34e8027 100644 --- a/printing/ppvernac.ml +++ b/vernac/ppvernac.ml diff --git a/printing/ppvernac.mli b/vernac/ppvernac.mli index 4aa24bf5d..4aa24bf5d 100644 --- a/printing/ppvernac.mli +++ b/vernac/ppvernac.mli diff --git a/vernac/vernac.mllib b/vernac/vernac.mllib index f001b572a..6fceda56d 100644 --- a/vernac/vernac.mllib +++ b/vernac/vernac.mllib @@ -1,10 +1,14 @@ Vernacprop -Proof_using -Lemmas Himsg ExplainErr -Class Locality +Egramml +Vernacinterp +Ppvernac +Proof_using +Lemmas +Class +Egramcoq Metasyntax Auto_ind_decl Search @@ -20,7 +24,6 @@ Classes Record Assumptions Vernacstate -Vernacinterp Mltop Topfmt Vernacentries |