move some files around

README.md

@@ -35,10 +35,14 @@ running:
 * The folder `program_logic` builds the semantic domain of Iris, defines and
   verifies primitive view shifts and weakest preconditions, and builds some
   language-independent derived constructions (e.g., STSs).
-* The folder `heap_lang` defines the ML-like concurrent heap language, and a
-  few derived constructions (e.g., parallel composition).
-* The folder `barrier` contains the implementation and proof of the barrier
-  <http://doi.acm.org/10.1145/2818638>.
+* The folder `heap_lang` defines the ML-like concurrent heap language
+  * The subfolder `lib` contains a few derived constructions within this
+    language, e.g., parallel composition.
+    Most notable here s `lib/barrier`, the implementation and proof of a barrier
+    as described in <http://doi.acm.org/10.1145/2818638>.
+* The folder `tests` contains modules we use to test our infrastructure.
+  Users of the Iris Coq library should *not* depend on these modules; they may
+  change or disappear without any notice.
 
 ## Documentation
 

_CoqProject

@@ -69,7 +69,6 @@ program_logic/pviewshifts.v
 program_logic/resources.v
 program_logic/hoare.v
 program_logic/language.v
-program_logic/tests.v
 program_logic/ghost_ownership.v
 program_logic/global_functor.v
 program_logic/saved_prop.v
@@ -83,15 +82,16 @@ heap_lang/tactics.v
 heap_lang/wp_tactics.v
 heap_lang/lifting.v
 heap_lang/derived.v
-heap_lang/heap.v
 heap_lang/notation.v
-heap_lang/spawn.v
-heap_lang/par.v
-heap_lang/tests.v
 heap_lang/substitution.v
-heap_lang/assert.v
-barrier/barrier.v
-barrier/specification.v
-barrier/protocol.v
-barrier/proof.v
-barrier/client.v
+heap_lang/lib/heap.v
+heap_lang/lib/spawn.v
+heap_lang/lib/par.v
+heap_lang/lib/assert.v
+heap_lang/lib/barrier/barrier.v
+heap_lang/lib/barrier/specification.v
+heap_lang/lib/barrier/protocol.v
+heap_lang/lib/barrier/proof.v
+heap_lang/lib/barrier/client.v
+tests/heap_lang.v
+tests/program_logic.v

barrier/client.v → heap_lang/lib/barrier/client.v

-From iris.barrier Require Import proof.
+From iris.heap_lang.lib.barrier Require Import proof.
 From iris.heap_lang Require Import par.
 From iris.program_logic Require Import auth sts saved_prop hoare ownership.
 Import uPred.

barrier/proof.v → heap_lang/lib/barrier/proof.v

@@ -2,8 +2,8 @@ From iris.prelude Require Import functions.
 From iris.algebra Require Import upred_big_op.
 From iris.program_logic Require Import sts saved_prop tactics.
 From iris.heap_lang Require Export heap wp_tactics.
-From iris.barrier Require Export barrier.
-From iris.barrier Require Import protocol.
+From iris.heap_lang.lib.barrier Require Export barrier.
+From iris.heap_lang.lib.barrier Require Import protocol.
 Import uPred.
 
 (** The CMRAs we need. *)

barrier/specification.v → heap_lang/lib/barrier/specification.v

 From iris.program_logic Require Export hoare.
-From iris.barrier Require Export barrier.
-From iris.barrier Require Import proof.
+From iris.heap_lang.lib.barrier Require Export barrier.
+From iris.heap_lang.lib.barrier Require Import proof.
 Import uPred.
 
 Section spec.