From f8a4f52b88af2bea94008b6b66cdd3f38eb46df7 Mon Sep 17 00:00:00 2001
From: Pierre Courtieu <Pierre.Courtieu@cnam.fr>
Date: Thu, 26 Jan 2017 15:56:09 +0100
Subject: Fixing #147 and #91 + others indentation bugs.

While fixing these I discovered several flaws in indentation (what a
suprise). The probem is the following: since we don't have a precise
grammar of tactics, smie often decides that the parent of a sub-part
of a tactic is the previous command instead of the current tacic.

Typical example (fixed now but in general):

             foo.
  apply bar
             with bar'.

Since "apply ... bar'" is considered as one leaf of the grammar, it is
considered to be a child of the previous dot.

     .
     /\
    /  \
  foo  apply...bar'

Therefore indentation of "with" wants to align with parent "." and
hence with "foo".

Basically we should try to define a much more precise grammar of
complex tactics (with with, as, using etc) in order to fix the
problem. Of course this has the drawback of making impossible to
support user tactic notations.
---
 coq/ex/indent.v | 68 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 36 insertions(+), 32 deletions(-)

(limited to 'coq/ex')

diff --git a/coq/ex/indent.v b/coq/ex/indent.v
index 27b64942..411347f0 100644
--- a/coq/ex/indent.v
+++ b/coq/ex/indent.v
@@ -60,26 +60,33 @@ Let xxx                        (* Precedence of "else" w.r.t "," and "->"!  *)
       3).
 
 Module Y.
-  Lemma L : forall x:nat , nat_iter x (A:=nat) (plus 2) 0 >= x.
+  Lemma L : forall x:nat , Nat.iter x (A:=nat) (plus 2) 0 >= x.
   Proof with auto with arith.
     intros x.
     induction x;simpl;intros...
   Qed.
-  Lemma L2 : forall x:nat , nat_iter x (A:=nat) (plus 2) 0 >= x.
+  Lemma L2 : forall x:nat , Nat.iter x (A:=nat) (plus 2) 0 >= x.
   Proof with auto with arith.
     idtac.
     (* "as" tactical *)
     induction x
       as
         [ | x IHx]. 
-    - auto with arith.
+    - cbn.
+      apply Nat.le_trans
+        with
+          (n:=0) (* aligning the different closes of a "with". *)
+          (m:=0)
+          (p:=0).
+      + auto with arith.
+      + auto with arith.
     - simpl.
       intros.
       auto with arith.
   Qed.
 
-  Lemma L' : forall x:nat , nat_iter x (A:=nat) (plus 2) 0 >= x
-  with L'' : forall x:nat , nat_iter x (A:=nat) (plus 2) 0 >= x.
+  Lemma L' : forall x:nat , Nat.iter x (A:=nat) (plus 2) 0 >= x
+  with L'' : forall x:nat , Nat.iter x (A:=nat) (plus 2) 0 >= x.
   Proof with auto with arith.
     - induction x;simpl;intros...
     - induction x;simpl;intros...
@@ -249,32 +256,29 @@ Module X.
     intros r.
     {{
         idtac;
-        exists
-          {|
-            fld1:=r.(fld2);
-            fld2:=r.(fld1);
-            fld3:=false
-          |}.
+          exists
+            {|
+              fld1:=r.(fld2);
+              fld2:=r.(fld1);
+              fld3:=false
+            |}.
         (* ltac *)
-        match goal with
-        | _:rec |- ?a /\ ?b => split
-        | _ => fail
-        end.
-
         match goal with
           _:rec |- ?a /\ ?b => split
         | _ => fail
         end.
 
-        lazymatch goal with
-          _:rec |- ?a /\ ?b => split
-        | _ => fail
-        end.
+        Fail
+          lazymatch goal with
+            _:rec |- ?a /\ ?b => split
+          | _ => fail
+          end.
 
-        multimatch goal with
-          _:rec |- ?a /\ ?b => split
-        | _ => fail
-        end.
+        Fail
+          multimatch goal with
+            _:rec |- ?a /\ ?b => split
+          | _ => fail
+          end.
 
         { simpl. auto. }
         { simpl. auto. }}}
@@ -337,13 +341,13 @@ Section SET.
   Fixpoint setVecProd (T : Type) (n : nat) (v1:Vector.t (set T) n) {struct v1}:
     (Vector.t T n) ->  Prop :=
     match v1 with
-      Vector.nil =>
+      Vector.nil _ =>
       fun v2 =>
         match v2 with 
-          Vector.nil => True
+          Vector.nil _ => True
         | _ => False
         end
-    | (Vector.cons x n' v1') =>
+    | (Vector.cons _ x n' v1') =>
       fun v2 =>
         (* indentation of dependen "match" clause. *)
         match v2
@@ -354,8 +358,8 @@ Section SET.
               return
               (Vector.t T (pred n'') -> Prop) -> Prop
         with 
-        | Vector.nil => fun _ => False 
-        | (Vector.cons y n'' v2') => fun v2'' => (x y) /\ (v2'' v2')
+        | Vector.nil _ => fun _ => False 
+        | (Vector.cons _ y n'' v2') => fun v2'' => (x y) /\ (v2'' v2')
         end (setVecProd T n' v1')
     end.
   
@@ -373,7 +377,7 @@ Module curlybracesatend.
       reflexivity. }
     exists (S (S n)).
     simpl.
-    rewrite NPeano.Nat.add_1_r.
+    rewrite Nat.add_1_r.
     reflexivity.
   Qed.
   
@@ -388,7 +392,7 @@ Module curlybracesatend.
     
     exists (S (S n)).
     simpl.
-    rewrite NPeano.Nat.add_1_r.
+    rewrite Nat.add_1_r.
     reflexivity.
   Qed.
   
@@ -402,7 +406,7 @@ Module curlybracesatend.
         reflexivity. } {
         exists (S (S n)).
         simpl.
-        rewrite NPeano.Nat.add_1_r.
+        rewrite Nat.add_1_r.
         reflexivity. }
     }
     idtac.
-- 
cgit v1.2.3