coq: Update for 8.12, 8.13 compatibility

Closes GH-8.

Author: cpitclaudel

README.rst

@@ -30,14 +30,9 @@ Installing dependencies and building from source
 
 * OCaml 4.07 through 4.09, `opam <https://opam.ocaml.org/doc/Install.html>`_ 2.0 or later, GNU make.
 
-* Coq 8.9, 8.10, or 8.11::
+* Coq 8.11 through 8.13::
 
-    opam install coq=8.10.2
-
-* Coq's Ltac2 plugin, if using Coq < 8.9 or 8.10 (newer versions have it built-in)::
-
-    opam repo add coq-released https://coq.inria.fr/opam/released
-    opam install coq-ltac2
+    opam install coq=8.12.2
 
 * Dune 2.5 or later::
 

coq/CircuitOptimization.v

@@ -42,7 +42,7 @@ Section CircuitOptimizer.
 
     Fixpoint unannot {sz} (c: circuit sz) : circuit sz :=
       match c with
-      | CAnnot annot c => unannot c
+      | CAnnot _ c => unannot c
       | c => c
       end.
 
@@ -55,7 +55,7 @@ Section CircuitOptimizer.
     Definition asconst {sz} (c: circuit sz) : option (bits sz) :=
       match unannot c with
       | CConst cst => Some cst
-      | c => None
+      | _ => None
       end.
 
     Definition isconst {sz} (c: circuit sz) (cst: bits sz) :=
@@ -368,7 +368,7 @@ Section CircuitOptimizer.
         if select ~~ b1 then fun _ => c1
         else if select ~~ b0 then fun _ => c2
              else fun c0 => c0
-      | c => fun c0 => c0
+      | _ => fun c0 => c0
       end c.
 
     (** This pass performs the following simplification:

coq/Common.v

@@ -1,5 +1,6 @@
 (*! Utilities | Shared utilities !*)
-Require Export Coq.omega.Omega.
+Require Export Coq.micromega.Lia.
+Require Export Coq.Arith.Arith.
 Require Export Coq.Lists.List Coq.Bool.Bool Coq.Strings.String.
 Require Export Koika.EqDec Koika.Vect Koika.FiniteType Koika.Show.
 
@@ -288,7 +289,7 @@ Section Lists.
       skipn n (List.app l1 l2) = List.app (skipn n l1) l2.
   Proof.
     induction l1; destruct n; cbn; try (inversion 1; reflexivity).
-    - intros; apply IHl1; omega.
+    - intros; apply IHl1; lia.
   Qed.
 
   Lemma forallb_pointwise {A} :

coq/Environments.v

@@ -375,7 +375,7 @@ Section Folds.
       | CtxCons k v ctx => cfoldl ctx (f k v init)
       end.
 
-    Fixpoint cfoldl' {sig} (ctx: context V sig) (init: T) :=
+    Definition cfoldl' {sig} (ctx: context V sig) (init: T) :=
       match sig return context V sig -> T with
       | [] => fun _ => init
       | k :: sig => fun ctx => cfoldl (ctl ctx) (f k (chd ctx) init)

coq/EqDec.v

@@ -19,9 +19,8 @@ Qed.
 Lemma beq_dec_false_iff {A} (EQ: EqDec A) a1 a2 :
   beq_dec a1 a2 = false <-> a1 <> a2.
 Proof.
-  unfold beq_dec; destruct eq_dec; subst.
-  - firstorder.
-  - split; intro; (eauto || congruence).
+  unfold beq_dec; destruct eq_dec; subst;
+    intuition congruence.
 Qed.
 
 Hint Extern 1 (EqDec _) => econstructor; decide equality : typeclass_instances.

coq/FiniteType.v

@@ -1,6 +1,7 @@
 (*! Utilities | Finiteness typeclass !*)
 Require Import Coq.Lists.List.
-Require Import Coq.omega.Omega.
+Require Import Coq.micromega.Lia.
+Require Import Coq.Arith.Arith.
 Import ListNotations.
 
 Class FiniteType {T} :=
@@ -41,15 +42,15 @@ Proof.
   induction l; intros n H n' Hle Habs.
   - auto.
   - apply Bool.andb_true_iff in H; destruct H; apply PeanoNat.Nat.ltb_lt in H.
-    destruct Habs as [ ? | ? ]; subst; try omega.
-    eapply IHl; [ eassumption | .. | eassumption ]; omega.
+    destruct Habs as [ ? | ? ]; subst; try lia.
+    eapply IHl; [ eassumption | .. | eassumption ]; lia.
 Qed.
 
 Lemma increasing_not_In' :
   forall l n, increasing (n :: l) = true -> forall n', n' <? n = true -> ~ In n' (n :: l).
 Proof.
   unfold not; intros l n Hincr n' Hlt [ -> | Hin ]; apply PeanoNat.Nat.ltb_lt in Hlt.
-  - omega.
+  - lia.
   - eapply increasing_not_In;
       [ eassumption | apply Nat.lt_le_incl | eassumption ]; eauto.
 Qed.

coq/IndexUtils.v

@@ -143,8 +143,8 @@ Lemma list_sum_member_le:
     list_sum l.
 Proof.
   induction l; destruct idx.
-  - cbn; omega.
-  - specialize (IHl a0); unfold list_sum, list_sum' in *; cbn; omega.
+  - cbn; lia.
+  - specialize (IHl a0); unfold list_sum, list_sum' in *; cbn; lia.
 Qed.
 
 Instance Show_index (n: nat) : Show (index n) :=

coq/Interop.v

@@ -215,7 +215,7 @@ Section Compilation.
              (s: @koika_package_t pos_t var_t fn_name_t rule_name_t reg_t ext_fn_t)
              (opt: let circuit sz := circuit (lower_R s.(koika_reg_types))
                                             (lower_Sigma s.(koika_ext_fn_types)) sz in
-                   forall {sz}, circuit sz -> circuit sz)
+                   forall sz, circuit sz -> circuit sz)
     : circuit_package_t :=
     let _ := s.(koika_reg_finite) in
     let _ := s.(koika_var_names) in

coq/LoweredSyntaxFunctions.v

@@ -35,7 +35,7 @@ Section LoweredSyntaxFunctions.
     Definition action_footprint {sig tau} (a: action sig tau) :=
       action_footprint' [] a.
 
-    Fixpoint action_registers {sig tau} {EQ: EqDec reg_t} (a: action sig tau) : list reg_t :=
+    Definition action_registers {sig tau} {EQ: EqDec reg_t} (a: action sig tau) : list reg_t :=
       dedup [] (List.map (fun '(rs, _) => rs) (action_footprint a)).
 
     Context (rules: rule_name_t -> rule).

coq/Member.v

@@ -234,7 +234,7 @@ Proof.
     + exact (MemberTl k k' (sig ++ infix ++ sig') (minfix _ infix sig sig' k m')).
 Defined.
 
-Fixpoint mprefix_pair {K sig} (k: K) (p: {k': K & member k' sig})
+Definition mprefix_pair {K sig} (k: K) (p: {k': K & member k' sig})
   : {k': K & member k' (k :: sig)} :=
   let '(existT _ k' m) := p in
   existT _ k' (MemberTl k' k _ m).