changeset 334:386b7ad8849b

Change some template annotations
author Adam Chlipala <adam@chlipala.net>
date Tue, 04 Oct 2011 13:38:21 -0400
parents c27d97176c85
children 1f57a8d0ed3d
files src/LogicProg.v src/Match.v
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/LogicProg.v	Mon Oct 03 11:19:12 2011 -0400
+++ b/src/LogicProg.v	Tue Oct 04 13:38:21 2011 -0400
@@ -576,6 +576,7 @@
 End autorewrite.
 
 
+(* begin thide *)
 (** * Exercises *)
 
 (** printing * $\cdot$ *)
@@ -645,3 +646,4 @@
    I also proved a few hint lemmas tailored to particular theorems, but which do not give common algebraic simplification rules.  You will probably want to use some, too, in cases where [eauto] does not find a proof within a reasonable amount of time.  In total, beside the main theorems to be proved, my sample solution includes 6 lemmas, with a mix of the two kinds of lemmas.  You may use more in your solution, but I suggest trying to minimize the number.
 
 #</ol>#%\end{enumerate}% *)
+(* end thide *)
--- a/src/Match.v	Mon Oct 03 11:19:12 2011 -0400
+++ b/src/Match.v	Tue Oct 04 13:38:21 2011 -0400
@@ -437,6 +437,7 @@
 
 (** One other gotcha shows up when we want to debug our Ltac functional programs.  We might expect the following code to work, to give us a version of [length] that prints a debug trace of the arguments it is called with. *)
 
+(* begin thide *)
 (* begin hide *)
 Reset length.
 (* end hide *)
@@ -481,9 +482,11 @@
     | nil => k O
     | _ :: ?ls' => length ls' ltac:(fun n => k (S n))
   end.
+(* end thide *)
 
 (** The new [length] takes a new input: a %\emph{%#<i>#continuation#</i>#%}% [k], which is a function to be called to continue whatever proving process we were in the middle of when we called [length].  The argument passed to [k] may be thought of as the return value of [length]. *)
 
+(* begin thide *)
 Goal False.
   length (1 :: 2 :: 3 :: nil) ltac:(fun n => pose n).
 (** [[
@@ -494,6 +497,7 @@
 ]]
 *)
 Abort.
+(* end thide *)
 
 (** We see exactly the trace of function arguments that we expected initially, and an examination of the proof state afterward would show that variable [n] has been added with value [3]. *)
 
@@ -998,6 +1002,7 @@
 Qed.
 
 
+(* begin thide *)
 (** * Exercises *)
 
 (** %\begin{enumerate}%#<ol>#
@@ -1165,3 +1170,4 @@
 There are different kinds of backtracking, corresponding to different sorts of decisions to be made.  The examples considered above can be handled with backtracking that only reconsiders decisions about the order in which to apply rewriting lemmas.  A full-credit solution need only handle that kind of backtracking, considering all rewriting sequences up to the length bound passed to your tactic.  A good test of this level of applicability is to prove both [test1] and [test2] above.  However, some theorems could only be proved using a smarter tactic that considers not only order of rewriting lemma uses, but also choice of arguments to the lemmas.  That is, at some points in a proof, the same lemma may apply at multiple places within the goal formula, and some choices may lead to stuck proof states while others lead to success.  For an extra challenge (without any impact on the grade for the problem), you might try beefing up your tactic to do backtracking on argument choice, too.#</li>#
 
 #</ol>#%\end{enumerate}% *)
+(* end thide *)