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, 4 insertions, 4 deletions

diff --git a/src/algebra/kl.spad.pamphlet b/src/algebra/kl.spad.pamphlet
index d07e5b90..de767784 100644
--- a/src/algebra/kl.spad.pamphlet
+++ b/src/algebra/kl.spad.pamphlet
@@ -19,7 +19,7 @@
 ++ Description:
 ++   A cachable set is a set whose elements keep an integer as part
 ++   of their structure.
-CachableSet: Category == OrderedSet with
+CachableSet: Category == SetCategory with
   position   : % -> NonNegativeInteger
     ++ position(x) returns the integer n associated to x.
   setPosition: (%, NonNegativeInteger) -> Void
@@ -118,13 +118,13 @@ SortedCache(S:CachableSet): Exports == Implementation where
 ++ Description:
 ++ A kernel over a set S is an operator applied to a given list
 ++ of arguments from S.
-Kernel(S:OrderedSet): Exports == Implementation where
+Kernel(S: SetCategory): Exports == Implementation where
   O  ==> OutputForm
   N  ==> NonNegativeInteger
   OP ==> BasicOperator
 
 
-  Exports ==> Join(CachableSet, Patternable S) with
+  Exports ==> Join(CachableSet, OrderedSet, Patternable S) with
     name    : % -> Symbol
       ++ name(op(a1,...,an)) returns the name of op.
     operator: % -> OP
@@ -219,7 +219,7 @@ Kernel(S:OrderedSet): Exports == Implementation where
       ((func := property(operator k1, SPECIALEQUAL)) case None) and
         (((func@None) pretend ((%, %) -> Boolean)) (k1, k2)) => 0
       for x1 in argument(k1) for x2 in argument(k2) repeat
-        x1 ~= x2 => return B2Z(x1 < x2)
+        x1 ~= x2 => return B2Z before?(x1,x2)
       0
 
     if S has ConvertibleTo InputForm then