aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorherbelin2002-03-22 16:55:25 +0000
committerherbelin2002-03-22 16:55:25 +0000
commit75eedc50871a2e94dc35881bc5c86123091bf980 (patch)
tree50966db22e80c67be3e4189a21b53f47ed0a614c
parentc2f4625e7e0fea969da5b44a0ea543ebfdc32d87 (diff)
Bug d'affichage des réels dû à une collision entre les APPLINSIDETAIL de Zsyntax et de Rsyntax (dont les règles ne s'appliquent plus dans le même ordre depuis la modification de l'ordre de chargement des Require)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@2564 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--theories/Reals/Rsyntax.v8
-rw-r--r--theories/ZArith/Zsyntax.v8
2 files changed, 8 insertions, 8 deletions
diff --git a/theories/Reals/Rsyntax.v b/theories/Reals/Rsyntax.v
index 21a33391c2..dcd8f941ce 100644
--- a/theories/Reals/Rsyntax.v
+++ b/theories/Reals/Rsyntax.v
@@ -137,10 +137,10 @@ Syntax constr
level 4:
Rappl_inside [<<(REXPR (APPLIST $h ($LIST $t)))>>]
- -> [ [<hov 0> "("(REXPR $h):E [1 0] (APPLINSIDETAIL ($LIST $t)):E ")"] ]
- | Rappl_inside_tail [<<(APPLINSIDETAIL $h ($LIST $t))>>]
- -> [(REXPR $h):E [1 0] (APPLINSIDETAIL ($LIST $t)):E]
- | Rappl_inside_one [<<(APPLINSIDETAIL $e)>>] ->[(REXPR $e):E]
+ -> [ [<hov 0> "("(REXPR $h):E [1 0] (RAPPLINSIDETAIL ($LIST $t)):E ")"] ]
+ | Rappl_inside_tail [<<(RAPPLINSIDETAIL $h ($LIST $t))>>]
+ -> [(REXPR $h):E [1 0] (RAPPLINSIDETAIL ($LIST $t)):E]
+ | Rappl_inside_one [<<(RAPPLINSIDETAIL $e)>>] ->[(REXPR $e):E]
| rpair_inside [<<(REXPR <<(pair $s1 $s2 $r1 $r2)>>)>>]
-> [ [<hov 0> "("(REXPR $r1):E "," [1 0] (REXPR $r2):E ")"] ]
;
diff --git a/theories/ZArith/Zsyntax.v b/theories/ZArith/Zsyntax.v
index 92ddd5942e..a9c050191a 100644
--- a/theories/ZArith/Zsyntax.v
+++ b/theories/ZArith/Zsyntax.v
@@ -155,12 +155,12 @@ Syntax constr
level 4:
Zappl_inside [ << (ZEXPR (APPLIST $h ($LIST $t))) >> ]
- -> [ [<hov 0> "("(ZEXPR $h):E [1 0] (APPLINSIDETAIL ($LIST $t)):E ")"] ]
+ -> [ [<hov 0> "("(ZEXPR $h):E [1 0] (ZAPPLINSIDETAIL ($LIST $t)):E ")"] ]
| Zappl_inject_nat [ << (ZEXPR (APPLIST <<inject_nat>> $n)) >> ]
-> [ (APPLIST <<inject_nat>> $n) ]
- | Zappl_inside_tail [ << (APPLINSIDETAIL $h ($LIST $t)) >> ]
- -> [(ZEXPR $h):E [1 0] (APPLINSIDETAIL ($LIST $t)):E]
- | Zappl_inside_one [ << (APPLINSIDETAIL $e) >> ] ->[(ZEXPR $e):E]
+ | Zappl_inside_tail [ << (ZAPPLINSIDETAIL $h ($LIST $t)) >> ]
+ -> [(ZEXPR $h):E [1 0] (ZAPPLINSIDETAIL ($LIST $t)):E]
+ | Zappl_inside_one [ << (ZAPPLINSIDETAIL $e) >> ] ->[(ZEXPR $e):E]
| pair_inside [ << (ZEXPR <<(pair $s1 $s2 $z1 $z2)>>) >> ]
-> [ [<hov 0> "("(ZEXPR $z1):E "," [1 0] (ZEXPR $z2):E ")"] ]
;