aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaëtan Gilbert2019-02-22 15:29:43 +0100
committerGaëtan Gilbert2019-02-22 15:29:43 +0100
commit7b282a5d041147a54b4553fe27db5c4c03c3e0f5 (patch)
treec1f9379f75f6f4370e19307cc042051c159fec54
parentfa3a97426013cf940cd25abde43c0191766218b1 (diff)
parent80a6828ede8441380f42f463521282e4b60d3193 (diff)
Merge PR #9539: [coqdoc] Add the From keyword
Reviewed-by: SkySkimmer
-rw-r--r--tools/coqdoc/cpretty.mll1
-rw-r--r--tools/coqdoc/output.ml2
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/coqdoc/cpretty.mll b/tools/coqdoc/cpretty.mll
index 1be440a750..230c5524b7 100644
--- a/tools/coqdoc/cpretty.mll
+++ b/tools/coqdoc/cpretty.mll
@@ -409,6 +409,7 @@ let set_kw =
let gallina_kw_to_hide =
"Implicit" space+ "Arguments"
| ("Local" space+)? "Ltac"
+ | "From"
| "Require"
| "Import"
| "Export"
diff --git a/tools/coqdoc/output.ml b/tools/coqdoc/output.ml
index 606d954672..b703af934d 100644
--- a/tools/coqdoc/output.ml
+++ b/tools/coqdoc/output.ml
@@ -32,7 +32,7 @@ let is_keyword =
build_table
[ "About"; "AddPath"; "Axiom"; "Abort"; "Chapter"; "Check"; "Coercion"; "Compute"; "CoFixpoint";
"CoInductive"; "Corollary"; "Defined"; "Definition"; "End"; "Eval"; "Example";
- "Export"; "Fact"; "Fix"; "Fixpoint"; "Function"; "Generalizable"; "Global"; "Grammar";
+ "Export"; "Fact"; "Fix"; "Fixpoint"; "From"; "Function"; "Generalizable"; "Global"; "Grammar";
"Guarded"; "Goal"; "Hint"; "Debug"; "On";
"Hypothesis"; "Hypotheses";
"Resolve"; "Unfold"; "Immediate"; "Extern"; "Constructors"; "Rewrite";