Merge branch 'ralf/wand-format' into 'master'

make binary wand/view shift connectives 'block' formated

See merge request iris/iris!727

CHANGELOG.md

@@ -68,7 +68,8 @@ Coq 8.11 is no longer supported in this version of Iris.
   by combining the embeddings of `PROP1` into `PROP2` and `PROP2` into `PROP3`.
   This construct is *not* declared as an instance to avoid TC search divergence.
   (by Hai Dang, BedRock Systems)
-* Improve notation printing around `WP`, Texan triples, and logically atomic triples.
+* Improve notation printing around magic wands, view shifts, `WP`, Texan
+  triples, and logically atomic triples.
 * Slight change to the `AACC` notation for atomic accessors (which is usually
   only printed, not parsed): added a `,` before `ABORT`, for consistency with `COMM`.
 * Add the lemmas `big_sepM_impl_strong` and `big_sepM_impl_dom_subseteq` that

iris/bi/notation.v

@@ -37,7 +37,7 @@ Reserved Notation "'⌜' φ '⌝'" (at level 1, φ at level 200, format "⌜ φ
 Reserved Notation "P ∗ Q" (at level 80, right associativity, format "P  ∗  '/' Q").
 Reserved Notation "P -∗ Q"
   (at level 99, Q at level 200, right associativity,
-   format "'[' P  -∗  '/' Q ']'").
+   format "'[' P  -∗  '/' '[' Q ']' ']'").
 
 Reserved Notation "⎡ P ⎤".
 
@@ -85,14 +85,14 @@ Reserved Notation "|={ E1 , E2 }=> Q"
    format "'[  ' |={ E1 , E2 }=>  '/' Q ']'").
 Reserved Notation "P ={ E1 , E2 }=∗ Q"
   (at level 99, E1,E2 at level 50, Q at level 200,
-   format "'[' P  ={ E1 , E2 }=∗  '/' Q ']'").
+   format "'[' P  ={ E1 , E2 }=∗  '/' '[' Q ']' ']'").
 
 Reserved Notation "|={ E }=> Q"
   (at level 99, E at level 50, Q at level 200,
    format "'[  ' |={ E }=>  '/' Q ']'").
 Reserved Notation "P ={ E }=∗ Q"
   (at level 99, E at level 50, Q at level 200,
-   format "'[' P  ={ E }=∗  '/' Q ']'").
+   format "'[' P  ={ E }=∗  '/' '[' Q ']' ']'").
 
 (** Step-taking fancy updates *)
 Reserved Notation "|={ E1 } [ E2 ]▷=> Q"
@@ -100,13 +100,13 @@ Reserved Notation "|={ E1 } [ E2 ]▷=> Q"
    format "'[  ' |={ E1 } [ E2 ]▷=>  '/' Q ']'").
 Reserved Notation "P ={ E1 } [ E2 ]▷=∗ Q"
   (at level 99, E1, E2 at level 50, Q at level 200,
-   format "'[' P  ={ E1 } [ E2 ]▷=∗  '/' Q ']'").
+   format "'[' P  ={ E1 } [ E2 ]▷=∗  '/' '[' Q ']' ']'").
 Reserved Notation "|={ E }▷=> Q"
   (at level 99, E at level 50, Q at level 200,
    format "'[  ' |={ E }▷=>  '/' Q ']'").
 Reserved Notation "P ={ E }▷=∗ Q"
   (at level 99, E at level 50, Q at level 200,
-   format "'[' P  ={ E }▷=∗  '/' Q ']'").
+   format "'[' P  ={ E }▷=∗  '/' '[' Q ']' ']'").
 
 (** Multi-step-taking fancy updates *)
 Reserved Notation "|={ E1 } [ E2 ]▷=>^ n Q"
@@ -114,13 +114,13 @@ Reserved Notation "|={ E1 } [ E2 ]▷=>^ n Q"
    format "'[  ' |={ E1 } [ E2 ]▷=>^ n  '/' Q ']'").
 Reserved Notation "P ={ E1 } [ E2 ]▷=∗^ n Q"
   (at level 99, E1, E2 at level 50, n at level 9, Q at level 200,
-   format "'[' P  ={ E1 } [ E2 ]▷=∗^ n  '/' Q ']'").
+   format "'[' P  ={ E1 } [ E2 ]▷=∗^ n  '/' '[' Q ']' ']'").
 Reserved Notation "|={ E }▷=>^ n Q"
   (at level 99, E at level 50, n at level 9, Q at level 200,
    format "'[  ' |={ E }▷=>^ n  '/' Q ']'").
 Reserved Notation "P ={ E }▷=∗^ n Q"
   (at level 99, E at level 50, n at level 9, Q at level 200,
-   format "'[' P  ={ E }▷=∗^ n  '/' Q ']'").
+   format "'[' P  ={ E }▷=∗^ n  '/' '[' Q ']' ']'").
 
 (** * Big Ops *)
 Reserved Notation "'[∗' 'list]' k ↦ x ∈ l , P"

tests/proofmode.ref

@@ -456,8 +456,8 @@ Tactic failure: iFrame: cannot frame Q.
   PPPPPPPPPPPPPPPPP, QQQQQQQQQQQQQQQQQQ : PROP
   ============================
   --------------------------------------∗
-  PPPPPPPPPPPPPPPPP -∗ QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ ∗
-  QQQQQQQQQQQQQQQQQQ
+  PPPPPPPPPPPPPPPPP -∗
+  QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ
 "long_wand_nested"
      : string
 1 goal
@@ -480,8 +480,8 @@ Tactic failure: iFrame: cannot frame Q.
   PPPPPPPPPPPPPPPPP, QQQQQQQQQQQQQQQQQQ : PROP
   ============================
   --------------------------------------∗
-  PPPPPPPPPPPPPPPPP ={E}=∗ QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ ∗
-  QQQQQQQQQQQQQQQQQQ
+  PPPPPPPPPPPPPPPPP ={E}=∗
+  QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ
 "long_fupd_nested"
      : string
 1 goal

tests/proofmode_iris.ref

@@ -111,7 +111,7 @@
   P : iProp Σ
   ============================
   ↑N ⊆ E2
-  → na_inv t N (<pers> P) ∗ na_own t E1 ∗ na_own t E2 ={⊤}=∗ 
+  → na_inv t N (<pers> P) ∗ na_own t E1 ∗ na_own t E2 ={⊤}=∗
     na_own t E1 ∗ na_own t E2 ∗ ▷ P
 1 goal