aboutsummaryrefslogtreecommitdiff
path: root/contrib/setoid_ring
diff options
context:
space:
mode:
authormsozeau2008-03-16 09:53:52 +0000
committermsozeau2008-03-16 09:53:52 +0000
commitb149e6e21f68d0851f4387dd7182aaca2021041d (patch)
treec0170c50e4dfe3f520f31acab6d3c75c52ac3427 /contrib/setoid_ring
parent189770d9cf98db9ba08da66707002c52f092d73f (diff)
Minor fixes on setoid rewriting. Now uses definitions of [relation] and
[id] instead of their expansions. Seems to slow things down a bit (1s. on Ring_polynom). git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@10680 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'contrib/setoid_ring')
-rw-r--r--contrib/setoid_ring/newring.ml46
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/setoid_ring/newring.ml4 b/contrib/setoid_ring/newring.ml4
index bce41b9b5f..6ed79f23b7 100644
--- a/contrib/setoid_ring/newring.ml4
+++ b/contrib/setoid_ring/newring.ml4
@@ -527,7 +527,7 @@ let ring_equality (r,add,mul,opp,req) =
(setoid,op_morph)
| _ ->
let setoid = setoid_of_relation (Global.env ()) r req in
- let signature = [Some (r,req);Some (r,req);Some(r,req)] in
+ let signature = [Some (r,req);Some (r,req)],Some(r,req) in
let add_m, add_m_lem =
try Class_tactics.default_morphism signature add
with Not_found ->
@@ -540,7 +540,7 @@ let ring_equality (r,add,mul,opp,req) =
match opp with
| Some opp ->
(let opp_m,opp_m_lem =
- try Class_tactics.default_morphism (List.tl signature) opp
+ try Class_tactics.default_morphism ([Some(r,req)],Some(r,req)) opp
with Not_found ->
error "ring opposite should be declared as a morphism" in
let op_morph =
@@ -1035,7 +1035,7 @@ let field_equality r inv req =
mkApp((Coqlib.build_coq_eq_data()).congr,[|r;r;inv|])
| _ ->
let _setoid = setoid_of_relation (Global.env ()) r req in
- let signature = [Some (r,req);Some(r,req)] in
+ let signature = [Some (r,req)],Some(r,req) in
let inv_m, inv_m_lem =
try Class_tactics.default_morphism signature inv
with Not_found ->