aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2008-08-08 16:18:48 +0000
committerdos-reis <gdr@axiomatics.org>2008-08-08 16:18:48 +0000
commitc59c1cdcdf3d651acbc892b1ea0f1d56d9d8961f (patch)
treec1e6e26ec926bd3827107ee0724c8f7e89accbfd
parent7727c94cc7b39a4ddb33c31ae328f2aa6a32d296 (diff)
downloadopen-axiom-c59c1cdcdf3d651acbc892b1ea0f1d56d9d8961f.tar.gz
* interp/pf2sex.boot (pfApplication2Sex): Don't transform ">",
"=>", and "<=" expressions.
-rw-r--r--src/ChangeLog6
-rw-r--r--src/algebra/pleqn.spad.pamphlet2
-rw-r--r--src/algebra/qalgset.spad.pamphlet3
-rw-r--r--src/interp/pf2sex.boot6
4 files changed, 9 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a11f5e22..30200632 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,10 +1,16 @@
2008-08-08 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * interp/pf2sex.boot (pfApplication2Sex): Don't transform ">",
+ "=>", and "<=" expressions.
* algebra/aggcat.spad.pamphlet (part?$SetAggregate): Rename
from <$SetAggregate.
(part?$FiniteSetAggregate): Rename from <$FiniteSetAggregate
* algebra/mset.spad.pamphlet (part?$Multiset): Rename from
<$Mulitset.
+ * algebra/pleqn.spad.pamphlet (overset?$ParametricLinearEquations):
+ Use part? instead of <.
+ * algebra/qalgset.spad.pamphlet (overset?$QuasiAlgebraicSet): Likewise.
* input/mset.input.pamphlet: Adjust.
* input/mset2.input.pamphlet: Likewise.
diff --git a/src/algebra/pleqn.spad.pamphlet b/src/algebra/pleqn.spad.pamphlet
index 057c9bc3..f5653815 100644
--- a/src/algebra/pleqn.spad.pamphlet
+++ b/src/algebra/pleqn.spad.pamphlet
@@ -625,7 +625,7 @@ ParametricLinearEquations(R,Var,Expon,GR):
overset?(p,qlist) ==
empty? qlist => false
- or/[(brace$(Set GR) q) <$(Set GR) (brace$(Set GR) p) _
+ or/[part?(brace(q)$Set(GR), brace(p)$Set(GR))$Set(GR) _
for q in qlist]
diff --git a/src/algebra/qalgset.spad.pamphlet b/src/algebra/qalgset.spad.pamphlet
index e6dfe5aa..400aba47 100644
--- a/src/algebra/qalgset.spad.pamphlet
+++ b/src/algebra/qalgset.spad.pamphlet
@@ -193,7 +193,8 @@ QuasiAlgebraicSet(R, Var,Expon,Dpoly) : C == T
overset?(p,qlist) ==
empty? qlist => false
- or/[(brace$(Set Dpoly) q) <$(Set Dpoly) (brace$(Set Dpoly) p) for q in qlist]
+ or/[part?(brace(q)$Set(Dpoly), brace(p)$Set(Dpoly))$Set(Dpoly)
+ for q in qlist]
@
\section{package QALGSET2 QuasiAlgebraicSet2}
diff --git a/src/interp/pf2sex.boot b/src/interp/pf2sex.boot
index cd358954..0c8aa475 100644
--- a/src/interp/pf2sex.boot
+++ b/src/interp/pf2sex.boot
@@ -240,12 +240,6 @@ pfApplication2Sex pf ==
symEqual(op, "|") and $insideRule = 'left =>
pfSuchThat2Sex args
argSex := rest pf2Sex1 args
- symEqual(op, ">") =>
- ["<", second argSex, first argSex]
- symEqual(op, ">=") =>
- ["not", ["<", first argSex, second argSex]]
- symEqual(op, "<=") =>
- ["not", ["<", second argSex, first argSex]]
-- symEqual(op, "reduce") and (#argSex) = 2 =>
-- ["REDUCE", first argSex, 0, second argSex]
symEqual(op, "AND") =>