diff options
author | Chantal Keller <Chantal.Keller@lri.fr> | 2021-05-26 18:47:52 +0200 |
---|---|---|
committer | Chantal Keller <Chantal.Keller@lri.fr> | 2021-05-26 18:47:52 +0200 |
commit | 222031f6edc934ff4611a46780a148e1160c1d7b (patch) | |
tree | 59e4f9a0a7e7491b73e0490590f2187d94d16796 | |
parent | 7af9476426f4dff75cd1ce50fc3c4c81b2134eac (diff) | |
download | smtcoq-222031f6edc934ff4611a46780a148e1160c1d7b.tar.gz smtcoq-222031f6edc934ff4611a46780a148e1160c1d7b.zip |
Minor changes on the Coq part
-rw-r--r-- | src/SMT_terms.v | 2 | ||||
-rw-r--r-- | src/bva/BVList.v | 8 | ||||
-rw-r--r-- | src/classes/SMT_classes.v | 2 | ||||
-rw-r--r-- | src/classes/SMT_classes_instances.v | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/src/SMT_terms.v b/src/SMT_terms.v index c36a13b..0358806 100644 --- a/src/SMT_terms.v +++ b/src/SMT_terms.v @@ -18,7 +18,7 @@ Local Open Scope list_scope. Local Open Scope array_scope. Local Open Scope int63_scope. -Hint Unfold is_true : smtcoq_core. +#[export] Hint Unfold is_true : smtcoq_core. (* Remark: I use Notation instead of Definition du eliminate conversion check during the type checking *) diff --git a/src/bva/BVList.v b/src/bva/BVList.v index 91a110d..9e22f98 100644 --- a/src/bva/BVList.v +++ b/src/bva/BVList.v @@ -589,7 +589,7 @@ Definition ult_list (x y: list bool) := (ult_list_big_endian (List.rev x) (List.rev y)). -Fixpoint slt_list_big_endian (x y: list bool) := +Definition slt_list_big_endian (x y: list bool) := match x, y with | nil, _ => false | _ , nil => false @@ -2103,7 +2103,7 @@ Proof. intro a. induction a as [ | xa xsa IHa ]. - intros. simpl. easy. - intros. - case b in *. simpl. rewrite IHa. simpl. omega. + case b in *. simpl. rewrite IHa. simpl. lia. simpl. case (k - 1 <? 0)%Z; simpl; now rewrite IHa. Qed. @@ -2117,8 +2117,8 @@ Lemma prop_mult_bool_step: forall k' a b res k, length (mult_bool_step a b res k k') = (length res)%nat. Proof. intro k'. induction k'. - - intros. simpl. rewrite prop_mult_bool_step_k_h_len. simpl. omega. - - intros. simpl. rewrite IHk'. rewrite prop_mult_bool_step_k_h_len. simpl; omega. + - intros. simpl. rewrite prop_mult_bool_step_k_h_len. simpl. lia. + - intros. simpl. rewrite IHk'. rewrite prop_mult_bool_step_k_h_len. simpl; lia. Qed. Lemma and_with_bool_len: forall a b, length (and_with_bool a (nth 0 b false)) = length a. diff --git a/src/classes/SMT_classes.v b/src/classes/SMT_classes.v index d314aa0..5f8f17d 100644 --- a/src/classes/SMT_classes.v +++ b/src/classes/SMT_classes.v @@ -98,8 +98,6 @@ Class OrdType T := { lt_not_eq : forall x y : T, lt x y -> x <> y }. -Hint Resolve lt_not_eq lt_trans. - Global Instance StrictOrder_OrdType T `(OrdType T) : StrictOrder (lt : T -> T -> Prop). diff --git a/src/classes/SMT_classes_instances.v b/src/classes/SMT_classes_instances.v index aa2082e..92faf8c 100644 --- a/src/classes/SMT_classes_instances.v +++ b/src/classes/SMT_classes_instances.v @@ -682,4 +682,4 @@ Section list. End list. -Hint Resolve unit_compdec bool_compdec Z_compdec Nat_compdec Positive_compdec BV_compdec FArray_compdec int63_compdec option_compdec list_compdec : typeclass_instances. +#[export] Hint Resolve unit_compdec bool_compdec Z_compdec Nat_compdec Positive_compdec BV_compdec FArray_compdec int63_compdec option_compdec list_compdec : typeclass_instances. |