Commit bd7ebdec authored by Robbert Krebbers's avatar Robbert Krebbers
Browse files

Use new Import/Export syntax everywhere.

Also, make our redefinition of done more robust under different
orders of Importing modules.
parent 3a18b722
Require Export algebra.cmra. From algebra Require Export cmra.
Require Import algebra.functor. From algebra Require Import functor.
Local Hint Extern 10 (_ _) => omega. Local Hint Extern 10 (_ _) => omega.
Record agree (A : Type) : Type := Agree { Record agree (A : Type) : Type := Agree {
......
Require Export algebra.excl. From algebra Require Export excl.
Require Import algebra.functor. From algebra Require Import functor.
Local Arguments validN _ _ _ !_ /. Local Arguments validN _ _ _ !_ /.
Record auth (A : Type) : Type := Auth { authoritative : excl A ; own : A }. Record auth (A : Type) : Type := Auth { authoritative : excl A ; own : A }.
......
Require Export mathcomp.ssreflect.ssreflect. From mathcomp.ssreflect Require Export ssreflect.
Require Export prelude.prelude. From prelude Require Export prelude.
Global Set Bullet Behavior "Strict Subproofs". Global Set Bullet Behavior "Strict Subproofs".
Global Open Scope general_if_scope. Global Open Scope general_if_scope.
\ No newline at end of file Ltac done := prelude.tactics.done.
\ No newline at end of file
Require Export algebra.cofe. From algebra Require Export cofe.
Class Unit (A : Type) := unit : A A. Class Unit (A : Type) := unit : A A.
Instance: Params (@unit) 2. Instance: Params (@unit) 2.
......
Require Export algebra.cmra. From algebra Require Export cmra.
Require Import prelude.fin_maps. From prelude Require Import fin_maps.
Fixpoint big_op {A : cmraT} `{Empty A} (xs : list A) : A := Fixpoint big_op {A : cmraT} `{Empty A} (xs : list A) : A :=
match xs with [] => | x :: xs => x big_op xs end. match xs with [] => | x :: xs => x big_op xs end.
......
Require Export algebra.cmra. From algebra Require Export cmra.
Require Import algebra.cmra_big_op. From algebra Require Import cmra_big_op.
(** * Simple solver for validity and inclusion by reflection *) (** * Simple solver for validity and inclusion by reflection *)
Module ra_reflection. Section ra_reflection. Module ra_reflection. Section ra_reflection.
......
Require Export algebra.base. From algebra Require Export base.
(** Unbundeled version *) (** Unbundeled version *)
Class Dist A := dist : nat relation A. Class Dist A := dist : nat relation A.
......
Require Export algebra.cofe. From algebra Require Export cofe.
Record solution (F : cofeT cofeT cofeT) := Solution { Record solution (F : cofeT cofeT cofeT) := Solution {
solution_car :> cofeT; solution_car :> cofeT;
......
Require Export algebra.cmra. From algebra Require Export cmra.
(** From disjoint pcm *) (** From disjoint pcm *)
Record validity {A} (P : A Prop) : Type := Validity { Record validity {A} (P : A Prop) : Type := Validity {
......
Require Export algebra.cmra. From algebra Require Export cmra.
Require Import algebra.functor. From algebra Require Import functor.
Local Arguments validN _ _ _ !_ /. Local Arguments validN _ _ _ !_ /.
Local Arguments valid _ _ !_ /. Local Arguments valid _ _ !_ /.
......
Require Export algebra.cmra prelude.gmap algebra.option. From algebra Require Export cmra option.
Require Import algebra.functor. From prelude Require Export gmap.
From algebra Require Import functor.
Section cofe. Section cofe.
Context `{Countable K} {A : cofeT}. Context `{Countable K} {A : cofeT}.
......
Require Export algebra.cmra. From algebra Require Export cmra.
(** * Functors from COFE to CMRA *) (** * Functors from COFE to CMRA *)
(* TODO RJ: Maybe find a better name for this? It is not PL-specific any more. *) (* TODO RJ: Maybe find a better name for this? It is not PL-specific any more. *)
......
Require Export algebra.cmra. From algebra Require Export cmra.
Require Import algebra.functor. From algebra Require Import functor.
(** * Indexed product *) (** * Indexed product *)
(** Need to put this in a definition to make canonical structures to work. *) (** Need to put this in a definition to make canonical structures to work. *)
......
Require Export algebra.cmra. From algebra Require Export cmra.
Require Import algebra.functor. From algebra Require Import functor.
(* COFE *) (* COFE *)
Section cofe. Section cofe.
......
Require Export algebra.cmra. From algebra Require Export cmra.
Require Import prelude.sets algebra.dra. From prelude Require Import sets.
From algebra Require Import dra.
Local Arguments valid _ _ !_ /. Local Arguments valid _ _ !_ /.
Local Arguments op _ _ !_ !_ /. Local Arguments op _ _ !_ !_ /.
Local Arguments unit _ _ !_ /. Local Arguments unit _ _ !_ /.
......
Require Export algebra.cmra. From algebra Require Export cmra.
Local Hint Extern 1 (_ _) => etransitivity; [eassumption|]. Local Hint Extern 1 (_ _) => etransitivity; [eassumption|].
Local Hint Extern 1 (_ _) => etransitivity; [|eassumption]. Local Hint Extern 1 (_ _) => etransitivity; [|eassumption].
Local Hint Extern 10 (_ _) => omega. Local Hint Extern 10 (_ _) => omega.
......
Require Export heap_lang.lifting. From heap_lang Require Export lifting.
Import uPred. Import uPred.
(** Define some derived forms, and derived lemmas about them. *) (** Define some derived forms, and derived lemmas about them. *)
......
Require Export program_logic.language prelude.strings. From program_logic Require Export language.
Require Import prelude.gmap. From prelude Require Export strings.
From prelude Require Import gmap.
Module heap_lang. Module heap_lang.
Open Scope Z_scope. Open Scope Z_scope.
......
Require Export program_logic.weakestpre heap_lang.heap_lang. From program_logic Require Export weakestpre.
Require Import program_logic.lifting. From heap_lang Require Export heap_lang.
Require Import program_logic.ownership. (* for ownP *) From program_logic Require Import lifting.
Require Import heap_lang.tactics. From program_logic Require Import ownership. (* for ownP *)
From heap_lang Require Import tactics.
Export heap_lang. (* Prefer heap_lang names over language names. *) Export heap_lang. (* Prefer heap_lang names over language names. *)
Import uPred. Import uPred.
Local Hint Extern 0 (language.reducible _ _) => do_step ltac:(eauto 2). Local Hint Extern 0 (language.reducible _ _) => do_step ltac:(eauto 2).
......
Require Export heap_lang.derived. From heap_lang Require Export derived.
(* What about Arguments for hoare triples?. *) (* What about Arguments for hoare triples?. *)
Arguments wp {_ _} _ _%L _. Arguments wp {_ _} _ _%L _.
...@@ -62,4 +62,4 @@ Notation "'rec:' f x y := e" := (RecV f x (Lam y e%L)) ...@@ -62,4 +62,4 @@ Notation "'rec:' f x y := e" := (RecV f x (Lam y e%L))
Notation "'rec:' f x y z := e" := (Rec f x (Lam y (Lam z e%L))) Notation "'rec:' f x y z := e" := (Rec f x (Lam y (Lam z e%L)))
(at level 102, f, x, y, z at level 1, e at level 200) : lang_scope. (at level 102, f, x, y, z at level 1, e at level 200) : lang_scope.
Notation "'rec:' f x y z := e" := (RecV f x (Lam y (Lam z e%L))) Notation "'rec:' f x y z := e" := (RecV f x (Lam y (Lam z e%L)))
(at level 102, f, x, y, z at level 1, e at level 200) : lang_scope. (at level 102, f, x, y, z at level 1, e at level 200) : lang_scope.
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment