diff options
| author | Théo Zimmermann | 2020-11-10 16:02:56 +0100 |
|---|---|---|
| committer | Théo Zimmermann | 2020-11-12 16:09:25 +0100 |
| commit | 1117058b39603bb42591961f4b13faa6c58c6ee2 (patch) | |
| tree | 49365ed6a2a4944102f3850c32f52394a0cfbe11 | |
| parent | 3fa2430e8c66408fa3a8fe95af54e53d20e5951b (diff) | |
Revert to "using" not being a keyword in -noinit mode.
The IDENT annotations in g_ltac.mlg are required to not break the
parser.
| -rw-r--r-- | plugins/ltac/g_ltac.mlg | 4 | ||||
| -rw-r--r-- | vernac/g_proofs.mlg | 2 | ||||
| -rw-r--r-- | vernac/g_vernac.mlg | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/plugins/ltac/g_ltac.mlg b/plugins/ltac/g_ltac.mlg index bd46e24a1c..c2e95c45f9 100644 --- a/plugins/ltac/g_ltac.mlg +++ b/plugins/ltac/g_ltac.mlg @@ -329,9 +329,9 @@ GRAMMAR EXTEND Gram ; command: [ [ IDENT "Proof"; "with"; ta = Pltac.tactic; - l = OPT [ "using"; l = G_vernac.section_subset_expr -> { l } ] -> + l = OPT [ IDENT "using"; l = G_vernac.section_subset_expr -> { l } ] -> { Vernacexpr.VernacProof (Some (in_tac ta), l) } - | IDENT "Proof"; "using"; l = G_vernac.section_subset_expr; + | IDENT "Proof"; IDENT "using"; l = G_vernac.section_subset_expr; "with"; ta = Pltac.tactic -> { Vernacexpr.VernacProof (Some (in_tac ta),Some l) } ] ] ; diff --git a/vernac/g_proofs.mlg b/vernac/g_proofs.mlg index 60ff9896bf..5b80ed6794 100644 --- a/vernac/g_proofs.mlg +++ b/vernac/g_proofs.mlg @@ -56,7 +56,7 @@ GRAMMAR EXTEND Gram [ [ IDENT "Goal"; c = lconstr -> { VernacDefinition (Decls.(NoDischarge, Definition), ((CAst.make ~loc Names.Anonymous), None), ProveBody ([], c)) } | IDENT "Proof" -> { VernacProof (None,None) } - | IDENT "Proof"; "using"; l = G_vernac.section_subset_expr -> + | IDENT "Proof"; IDENT "using"; l = G_vernac.section_subset_expr -> { VernacProof (None,Some l) } | IDENT "Proof" ; IDENT "Mode" ; mn = string -> { VernacProofMode mn } | IDENT "Proof"; c = lconstr -> { VernacExactProof c } diff --git a/vernac/g_vernac.mlg b/vernac/g_vernac.mlg index f192d67624..1c80d71ea5 100644 --- a/vernac/g_vernac.mlg +++ b/vernac/g_vernac.mlg @@ -114,7 +114,8 @@ GRAMMAR EXTEND Gram ; attribute: [ [ k = ident ; v = attr_value -> { Names.Id.to_string k, v } - | "using" ; v = attr_value -> { "using", v } ] + (* Required because "ident" is declared a keyword when loading Ltac. *) + | IDENT "using" ; v = attr_value -> { "using", v } ] ] ; attr_value: |