diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-12-11 01:27:32 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-12-11 01:27:32 +0000 |
| commit | c95606b43200927a9b54c5bba9670020aee6712d (patch) | |
| tree | 9162dcb1a1cf9b40554a2be87233558b92d852cb /src/interp/i-funsel.boot | |
| parent | 5e866b934c19a52da052a4cb97f972c7968968cc (diff) | |
| download | open-axiom-c95606b43200927a9b54c5bba9670020aee6712d.tar.gz | |
* boot/ast.boot (bfMmeber): Tidy.
* interp/alql.boot: Clean up.
* interp/br-con.boot: Likewise.
* interp/br-op1.boot: Likewise.
* interp/br-op2.boot: Likewise.
* interp/br-saturn.boot: Likewise.
* interp/br-search.boot: Likewise.
* interp/br-util.boot: Likewise.
* interp/c-doc.boot: Likewise.
* interp/format.boot: Likewise.
* interp/g-error.boot: Likewise.
* interp/i-funsel.boot: Likewise.
* interp/i-syscmd.boot: Likewise.
* interp/mark.boot: Likewise.
* interp/msgdb.boot: Likewise.
* interp/newfort.boot: Likewise.
* interp/pspad1.boot: Likewise.
* interp/trace.boot: Likewise.
Diffstat (limited to 'src/interp/i-funsel.boot')
| -rw-r--r-- | src/interp/i-funsel.boot | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/interp/i-funsel.boot b/src/interp/i-funsel.boot index 5bf952e7..dfaaef34 100644 --- a/src/interp/i-funsel.boot +++ b/src/interp/i-funsel.boot @@ -265,7 +265,7 @@ defaultTarget(opNode,op,nargs,args) == op = 'infinity => putTarget(opNode, target := ['OnePointCompletion, $Integer]) target - member(op, '(plusInfinity minusInfinity)) => + op in '(plusInfinity minusInfinity) => putTarget(opNode, target := ['OrderedCompletion, $Integer]) target target @@ -773,7 +773,7 @@ findFunctionInDomain(op,dc,tar,args1,args2,$Coerce,$SubDom) == -- tar may be NIL (= unknown) null isLegitimateMode(tar, nil, nil) => nil dcName:= first dc - member(dcName,'(Union Record Mapping Enumeration)) => + dcName in '(Union Record Mapping Enumeration) => -- First cut code that ignores args2, $Coerce and $SubDom -- When domains no longer have to have Set, the hard coded 6 and 7 -- should go. @@ -788,7 +788,7 @@ findFunctionInDomain(op,dc,tar,args1,args2,$Coerce,$SubDom) == args1.0 ~= dc => NIL tar and tar ~= $Expression => NIL [[[dc, $Expression, dc], [$Expression,'$], [NIL, NIL]]] - member(dcName,'(Record Union)) => + dcName in '(Record Union) => findFunctionInCategory(op,dc,tar,args1,args2,$Coerce,$SubDom) NIL fun:= NIL @@ -1421,14 +1421,14 @@ hasCateSpecial(v,dom,cat,SL) == -- to be used in $newSystem only hasCateSpecialNew(v,dom,cat,SL) == - fe := member(cat.op, '(ElementaryFunctionCategory + fe := cat.op in '(ElementaryFunctionCategory TrigonometricFunctionCategory ArcTrigonometricFunctionCategory HyperbolicFunctionCategory ArcHyperbolicFunctionCategory PrimitiveFunctionCategory SpecialFunctionCategory Evalable CombinatorialOpsCategory TranscendentalFunctionCategory AlgebraicallyClosedFunctionSpace ExpressionSpace - LiouvillianFunctionCategory FunctionSpace)) - alg := member(cat.op, '(RadicalCategory AlgebraicallyClosedField)) + LiouvillianFunctionCategory FunctionSpace) + alg := cat.op in '(RadicalCategory AlgebraicallyClosedField) fefull := fe or alg or cat = $CombinatorialFunctionCategory partialResult := dom is ["Variable",:.] or dom = $Symbol => |