diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-06-04 04:09:59 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-06-04 04:09:59 +0000 |
| commit | 063d1ff23831ed4d081e1edbee9c5eb2cfa4d051 (patch) | |
| tree | 176e41d9301c3692651c61abc1f454edecece7dd /src/interp/i-funsel.boot | |
| parent | 2504b96ac76f31c60ab32979509e6f3b4b7a8b10 (diff) | |
| download | open-axiom-063d1ff23831ed4d081e1edbee9c5eb2cfa4d051.tar.gz | |
* interp/br-con.boot: More cleanup.
* interp/br-op1.boot: Likewise.
* interp/br-saturn.boot: Likewise.
* interp/c-util.boot: Likewise.
* interp/category.boot: Likewise.
* interp/clam.boot: Likewise.
* interp/database.boot: Likewise.
* interp/functor.boot: Likewise.
* interp/g-cndata.boot: Likewise.
* interp/g-util.boot: Likewise.
* interp/guess.boot: Likewise.
* interp/i-coerce.boot: Likewise.
* interp/i-funsel.boot: Likewise.
* interp/i-intern.boot: Likewise.
* interp/i-syscmd.boot: Likewise.
* interp/interop.boot: Likewise.
* interp/newfort.boot: Likewise.
* interp/nruncomp.boot: Likewise.
* interp/nrunfast.boot: Likewise.
* interp/nrunopt.boot: Likewise.
* interp/setvars.boot: Likewise.
* interp/slam.boot: Likewise.
* interp/topics.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 b75f710a..b46ef322 100644 --- a/src/interp/i-funsel.boot +++ b/src/interp/i-funsel.boot @@ -272,7 +272,7 @@ defaultTarget(opNode,op,nargs,args) == a1 := first args atom a1 => target - a1f := QCAR a1 + a1f := first a1 nargs = 1 => op = 'kernel => @@ -443,8 +443,8 @@ defaultTarget(opNode,op,nargs,args) == mkRationalFunction D == ['Fraction, ['Polynomial, D]] defaultTargetFE(a,:options) == - a is ['Variable,.] or a = $RationalNumber or MEMQ(QCAR a, - [QCAR $Symbol, 'RationalRadicals, + a is ['Variable,.] or a = $RationalNumber or MEMQ(a.op, + [$Symbol.op, 'RationalRadicals, 'Pi]) or typeIsASmallInteger(a) or isEqualOrSubDomain(a, $Integer) or a = '(AlgebraicNumber) => IFCAR options => [$FunctionalExpression, ['Complex, $Integer]] @@ -1037,7 +1037,7 @@ selectMmsGen(op,tar,args1,args2) == for a in removeDuplicates args repeat a => atom a => nil - fa := QCAR a + fa := a.op fa in '(Record Union) => NIL conNames := insert(STRINGIMAGE fa, conNames) @@ -1421,14 +1421,14 @@ hasCateSpecial(v,dom,cat,SL) == -- to be used in $newSystem only hasCateSpecialNew(v,dom,cat,SL) == - fe := member(QCAR cat, '(ElementaryFunctionCategory + fe := member(cat.op, '(ElementaryFunctionCategory TrigonometricFunctionCategory ArcTrigonometricFunctionCategory HyperbolicFunctionCategory ArcHyperbolicFunctionCategory PrimitiveFunctionCategory SpecialFunctionCategory Evalable CombinatorialOpsCategory TranscendentalFunctionCategory AlgebraicallyClosedFunctionSpace ExpressionSpace LiouvillianFunctionCategory FunctionSpace)) - alg := member(QCAR cat, '(RadicalCategory AlgebraicallyClosedField)) + alg := member(cat.op, '(RadicalCategory AlgebraicallyClosedField)) fefull := fe or alg or cat = $CombinatorialFunctionCategory partialResult := dom is ["Variable",:.] or dom = $Symbol => |