Partial fix for AW/193 and AW/334.

	* algebra/algfunc.spad.pamphlet: Remove OrderedSet requirements.
	* algebra/combfunc.spad.pamphlet: Likewise.
	* algebra/defintef.spad.pamphlet: Likewise.
	* algebra/defintrf.spad.pamphlet: Likewise.
	* algebra/degred.spad.pamphlet: Likewise.
	* algebra/efstruc.spad.pamphlet: Likewise.
	* algebra/elemntry.spad.pamphlet: Likewise.
	* algebra/expexpan.spad.pamphlet: Likewise.
	* algebra/expr.spad.pamphlet: Likewise.
	* algebra/expr2ups.spad.pamphlet: Likewise.
	* algebra/exprode.spad.pamphlet: Likewise.
	* algebra/fortran.spad.pamphlet: Likewise.
	* algebra/fr.spad.pamphlet: Likewise.
	* algebra/fraction.spad.pamphlet: Likewise.
	* algebra/fs2expxp.spad.pamphlet: Likewise.
	* algebra/fspace.spad.pamphlet: Likewise.
	* algebra/funcpkgs.spad.pamphlet: Likewise.
	* algebra/gaussian.spad.pamphlet: Likewise.
	* algebra/genups.spad.pamphlet: Likewise.
	* algebra/intalg.spad.pamphlet: Likewise.
	* algebra/intef.spad.pamphlet: Likewise.
	* algebra/integrat.spad.pamphlet: Likewise.
	* algebra/intpm.spad.pamphlet: Likewise.
	* algebra/irexpand.spad.pamphlet: Likewise.
	* algebra/kl.spad.pamphlet: Likewise.
	* algebra/laplace.spad.pamphlet: Likewise.
	* algebra/limitps.spad.pamphlet: Likewise.
	* algebra/liouv.spad.pamphlet: Likewise.
	* algebra/manip.spad.pamphlet: Likewise.
	* algebra/nlode.spad.pamphlet: Likewise.
	* algebra/odeef.spad.pamphlet: Likewise.
	* algebra/oderf.spad.pamphlet: Likewise.
	* algebra/openmath.spad.pamphlet: Likewise.
	* algebra/patmatch1.spad.pamphlet: Likewise.
	* algebra/patmatch2.spad.pamphlet: Likewise.
	* algebra/pfo.spad.pamphlet: Likewise.
	* algebra/polycat.spad.pamphlet: Likewise.
	* algebra/primelt.spad.pamphlet: Likewise.
	* algebra/rdeef.spad.pamphlet: Likewise.
	* algebra/rdesys.spad.pamphlet: Likewise.
	* algebra/rule.spad.pamphlet: Likewise.
	* algebra/solverad.spad.pamphlet: Likewise.
	* algebra/sum.spad.pamphlet: Likewise.
	* algebra/transsolve.spad.pamphlet: Likewise.
	* testsuite/interpreter/aw-193.input: New.
	* testsuite/interpreter/aw-334.input: Likewise.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/algebra/combfunc.spad.pamphlet b/src/algebra/combfunc.spad.pamphlet
index 41fe5af5..25e7d3e4 100644
--- a/src/algebra/combfunc.spad.pamphlet
+++ b/src/algebra/combfunc.spad.pamphlet
@@ -60,7 +60,7 @@ to reduce to zero.
 
 
 CombinatorialFunction(R, F): Exports == Implementation where
-  R: Join(OrderedSet, IntegralDomain)
+  R: IntegralDomain
   F: FunctionSpace R
 
   OP  ==> BasicOperator
@@ -518,7 +518,7 @@ dummy variable is introduced to make the indexing variable \lq local\rq.
       if R has RetractableTo(Z) and F has Algebra(Fraction(Z)) then
          iibinom l ==
            (s:=retractIfCan(first l-second l)@Union(R,"failed")) case R and
-             (t:=retractIfCan(s)@Union(Z,"failed")) case Z and s>0=>
+             (t:=retractIfCan(s)@Union(Z,"failed")) case Z and t > 0 =>
               ans:=1::F
               for i in 1..t repeat
                   ans:=ans*(second l+i::R::F)
@@ -616,7 +616,7 @@ equality.
 ++ Description: Provides some special functions over an integral domain.
 ++ Keywords: special, function.
 FunctionalSpecialFunction(R, F): Exports == Implementation where
-  R: Join(OrderedSet, IntegralDomain)
+  R: IntegralDomain
   F: FunctionSpace R
 
   OP  ==> BasicOperator
@@ -716,7 +716,7 @@ FunctionalSpecialFunction(R, F): Exports == Implementation where
     iabs x ==
       zero? x => 0
       is?(x, opabs) => x
-      x < 0 => kernel(opabs, -x)
+      before?(x,0) => kernel(opabs, -x)
       kernel(opabs, x)
 
     -- Could put more conditional special rules for other functions here
@@ -805,7 +805,7 @@ FunctionalSpecialFunction(R, F): Exports == Implementation where
 ++ Date Last Updated: 19 April 1991
 ++ Description: computes sums of top-level expressions;
 FunctionSpaceSum(R, F): Exports == Implementation where
-  R: Join(IntegralDomain, OrderedSet,
+  R: Join(IntegralDomain,
           RetractableTo Integer, LinearlyExplicitRingOver Integer)
   F: Join(FunctionSpace R, CombinatorialOpsCategory,
           AlgebraicallyClosedField, TranscendentalFunctionCategory)