Rename modures -> algebra and iris -> program_logic.

_CoqProject

@@ -34,35 +34,35 @@ prelude/sets.v
 prelude/decidable.v
 prelude/list.v
 prelude/error.v
-modures/option.v
-modures/cmra.v
-modures/cmra_big_op.v
-modures/cmra_tactics.v
-modures/sts.v
-modures/auth.v
-modures/fin_maps.v
-modures/logic.v
-modures/cofe.v
-modures/base.v
-modures/dra.v
-modures/cofe_solver.v
-modures/agree.v
-modures/excl.v
-iris/model.v
-iris/adequacy.v
-iris/hoare_lifting.v
-iris/lifting.v
-iris/namespace.v
-iris/viewshifts.v
-iris/wsat.v
-iris/ownership.v
-iris/weakestpre.v
-iris/pviewshifts.v
-iris/resources.v
-iris/hoare.v
-iris/language.v
-iris/functor.v
-iris/tests.v
+algebra/option.v
+algebra/cmra.v
+algebra/cmra_big_op.v
+algebra/cmra_tactics.v
+algebra/sts.v
+algebra/auth.v
+algebra/fin_maps.v
+logic/upred.v
+algebra/cofe.v
+algebra/base.v
+algebra/dra.v
+algebra/cofe_solver.v
+algebra/agree.v
+algebra/excl.v
+program_logic/model.v
+program_logic/adequacy.v
+program_logic/hoare_lifting.v
+program_logic/lifting.v
+program_logic/namespace.v
+program_logic/viewshifts.v
+program_logic/wsat.v
+program_logic/ownership.v
+program_logic/weakestpre.v
+program_logic/pviewshifts.v
+program_logic/resources.v
+program_logic/hoare.v
+program_logic/language.v
+program_logic/functor.v
+program_logic/tests.v
 heap_lang/heap_lang.v
 heap_lang/heap_lang_tactics.v
 heap_lang/lifting.v

modures/agree.v → algebra/agree.v

-Require Export modures.cmra.
+Require Export algebra.cmra.
 Local Hint Extern 10 (_ ≤ _) => omega.
 
 Record agree (A : Type) : Type := Agree {

modures/auth.v → algebra/auth.v

-Require Export modures.excl.
+Require Export algebra.excl.
 Local Arguments validN _ _ _ !_ /.
 
 Record auth (A : Type) : Type := Auth { authoritative : excl A ; own : A }.

modures/cmra.v → algebra/cmra.v

-Require Export modures.cofe.
+Require Export algebra.cofe.
 
 Class Unit (A : Type) := unit : A → A.
 Instance: Params (@unit) 2.

modures/cmra_big_op.v → algebra/cmra_big_op.v

-Require Export modures.cmra.
+Require Export algebra.cmra.
 Require Import prelude.fin_maps.
 
 Fixpoint big_op {A : cmraT} `{Empty A} (xs : list A) : A :=

modures/cmra_tactics.v → algebra/cmra_tactics.v

-Require Export modures.cmra.
-Require Import modures.cmra_big_op.
+Require Export algebra.cmra.
+Require Import algebra.cmra_big_op.
 
 (** * Simple solver for validity and inclusion by reflection *)
 Module ra_reflection. Section ra_reflection.

modures/cofe.v → algebra/cofe.v

-Require Export modures.base.
+Require Export algebra.base.
 
 (** Unbundeled version *)
 Class Dist A := dist : nat → relation A.

modures/cofe_solver.v → algebra/cofe_solver.v

-Require Export modures.cofe.
+Require Export algebra.cofe.
 
 Record solution (F : cofeT → cofeT → cofeT) := Solution {
   solution_car :> cofeT;

modures/dra.v → algebra/dra.v

-Require Export modures.cmra.
+Require Export algebra.cmra.
 
 (** From disjoint pcm *)
 Record validity {A} (P : A → Prop) : Type := Validity {

modures/excl.v → algebra/excl.v

-Require Export modures.cmra.
+Require Export algebra.cmra.
 Local Arguments validN _ _ _ !_ /.
 Local Arguments valid _ _  !_ /.
 

modures/fin_maps.v → algebra/fin_maps.v

-Require Export modures.cmra prelude.gmap modures.option.
+Require Export algebra.cmra prelude.gmap algebra.option.
 
 Section cofe.
 Context `{Countable K} {A : cofeT}.

modures/option.v → algebra/option.v

-Require Export modures.cmra.
+Require Export algebra.cmra.
 
 (* COFE *)
 Section cofe.

modures/sts.v → algebra/sts.v

-Require Export modures.cmra.
-Require Import prelude.sets modures.dra.
+Require Export algebra.cmra.
+Require Import prelude.sets algebra.dra.
 Local Arguments valid _ _ !_ /.
 Local Arguments op _ _ !_ !_ /.
 Local Arguments unit _ _ !_ /.

heap_lang/heap_lang.v

 Require Export Autosubst.Autosubst.
-Require Export iris.language.
+Require Export program_logic.language.
 Require Import prelude.gmap.
 
 Module heap_lang.

heap_lang/lifting.v

-Require Import prelude.gmap iris.lifting.
-Require Export iris.weakestpre heap_lang.heap_lang_tactics.
+Require Import prelude.gmap program_logic.lifting.
+Require Export program_logic.weakestpre heap_lang.heap_lang_tactics.
 Import uPred.
 Import heap_lang.
 Local Hint Extern 0 (language.reducible _ _) => do_step ltac:(eauto 2).

heap_lang/tests.v

 (** This file is essentially a bunch of testcases. *)
-Require Import modures.logic.
+Require Import logic.upred.
 Require Import heap_lang.lifting heap_lang.sugar.
 Import heap_lang.
 Import uPred.

modures/logic.v → logic/upred.v

-Require Export modures.cmra.
+Require Export algebra.cmra.
 Local Hint Extern 1 (_ ≼ _) => etransitivity; [eassumption|].
 Local Hint Extern 1 (_ ≼ _) => etransitivity; [|eassumption].
 Local Hint Extern 10 (_ ≤ _) => omega.

iris/adequacy.v → program_logic/adequacy.v

-Require Export iris.hoare.
-Require Import iris.wsat.
+Require Export program_logic.hoare.
+Require Import program_logic.wsat.
 Local Hint Extern 10 (_ ≤ _) => omega.
 Local Hint Extern 100 (@eq coPset _ _) => eassumption || solve_elem_of.
 Local Hint Extern 10 (✓{_} _) =>

iris/functor.v → program_logic/functor.v

-Require Export modures.cmra.
+Require Export algebra.cmra.
 
 Structure iFunctor := IFunctor {
   ifunctor_car :> cofeT → cmraT;

iris/hoare.v → program_logic/hoare.v

-Require Export iris.weakestpre iris.viewshifts.
+Require Export program_logic.weakestpre program_logic.viewshifts.
 
 Definition ht {Λ Σ} (E : coPset) (P : iProp Λ Σ)
     (e : expr Λ) (Q : val Λ → iProp Λ Σ) : iProp Λ Σ :=

iris/hoare_lifting.v → program_logic/hoare_lifting.v

-Require Export iris.hoare iris.lifting.
+Require Export program_logic.hoare program_logic.lifting.
 
 Local Notation "{{ P } } ef ?@ E {{ Q } }" :=
   (default True%I ef (λ e, ht E P e Q))

iris/language.v → program_logic/language.v

-Require Export modures.cofe.
+Require Export algebra.cofe.
 
 Structure language := Language {
   expr : Type;

iris/lifting.v → program_logic/lifting.v

-Require Export iris.weakestpre.
-Require Import iris.wsat.
+Require Export program_logic.weakestpre.
+Require Import program_logic.wsat.
 Local Hint Extern 10 (_ ≤ _) => omega.
 Local Hint Extern 100 (@eq coPset _ _) => solve_elem_of.
 Local Hint Extern 10 (✓{_} _) =>

iris/model.v → program_logic/model.v

-Require Export modures.logic iris.resources.
-Require Import modures.cofe_solver.
+Require Export logic.upred program_logic.resources.
+Require Import algebra.cofe_solver.
 
 Module iProp.
 Definition F (Λ : language) (Σ : iFunctor) (A B : cofeT) : cofeT :=

iris/namespace.v → program_logic/namespace.v

-Require Export modures.base prelude.countable prelude.co_pset.
+Require Export algebra.base prelude.countable prelude.co_pset.
 
 Definition namespace := list positive.
 Definition nnil : namespace := nil.

iris/ownership.v → program_logic/ownership.v

-Require Export iris.model.
+Require Export program_logic.model.
 
 Definition inv {Λ Σ} (i : positive) (P : iProp Λ Σ) : iProp Λ Σ :=
   uPred_own (Res {[ i ↦ to_agree (Later (iProp_unfold P)) ]} ∅ ∅).

iris/pviewshifts.v → program_logic/pviewshifts.v

-Require Export iris.ownership prelude.co_pset.
-Require Import iris.wsat.
+Require Export program_logic.ownership prelude.co_pset.
+Require Import program_logic.wsat.
 Local Hint Extern 10 (_ ≤ _) => omega.
 Local Hint Extern 100 (@eq coPset _ _) => solve_elem_of.
 Local Hint Extern 100 (_ ∉ _) => solve_elem_of.

iris/resources.v → program_logic/resources.v

-Require Export modures.fin_maps modures.agree modures.excl.
-Require Export iris.language iris.functor.
+Require Export algebra.fin_maps algebra.agree algebra.excl.
+Require Export program_logic.language program_logic.functor.
 
 Record res (Λ : language) (Σ : iFunctor) (A : cofeT) := Res {
   wld : mapRA positive (agreeRA A);

iris/tests.v → program_logic/tests.v

 (** This file tests a bunch of things. *)
-Require Import iris.model.
+Require Import program_logic.model.
 
 Module ModelTest. (* Make sure we got the notations right. *)
   Definition iResTest {Λ : language} {Σ : iFunctor}

iris/viewshifts.v → program_logic/viewshifts.v

-Require Export iris.pviewshifts.
+Require Export program_logic.pviewshifts.
 
 Definition vs {Λ Σ} (E1 E2 : coPset) (P Q : iProp Λ Σ) : iProp Λ Σ :=
   (□ (P → pvs E1 E2 Q))%I.

iris/weakestpre.v → program_logic/weakestpre.v

-Require Export iris.pviewshifts.
-Require Import iris.wsat.
+Require Export program_logic.pviewshifts.
+Require Import program_logic.wsat.
 Local Hint Extern 10 (_ ≤ _) => omega.
 Local Hint Extern 100 (@eq coPset _ _) => eassumption || solve_elem_of.
 Local Hint Extern 100 (_ ∉ _) => solve_elem_of.

iris/wsat.v → program_logic/wsat.v

-Require Export iris.model prelude.co_pset.
-Require Export modures.cmra_big_op modures.cmra_tactics.
+Require Export program_logic.model prelude.co_pset.
+Require Export algebra.cmra_big_op algebra.cmra_tactics.
 Local Hint Extern 10 (_ ≤ _) => omega.
 Local Hint Extern 10 (✓{_} _) => solve_validN.
 Local Hint Extern 1 (✓{_} (gst _)) => apply gst_validN.