diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-09-25 20:48:45 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-09-25 20:48:45 +0000 |
| commit | 489cfd14dccfcaf7b0ebd41e9d0f8e081a9d1d9f (patch) | |
| tree | 84a87ab3bdba58fe9fd2975efc829d1ed10b8781 /src/interp/i-coerce.boot | |
| parent | 7704713134cb251be6129f38833930228e09eee2 (diff) | |
| download | open-axiom-489cfd14dccfcaf7b0ebd41e9d0f8e081a9d1d9f.tar.gz | |
* boot/ast.boot (bfMember): Improve a bit.
* boot/tokens.boot: Don't rename 'is' and 'inst'.
* boot/parser.boot: Use 'in' instead of 'MEMQ' where approrpriate.
* interp/: Likewise.
Diffstat (limited to 'src/interp/i-coerce.boot')
| -rw-r--r-- | src/interp/i-coerce.boot | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/interp/i-coerce.boot b/src/interp/i-coerce.boot index a6012574..612fa4db 100644 --- a/src/interp/i-coerce.boot +++ b/src/interp/i-coerce.boot @@ -696,7 +696,7 @@ absolutelyCannotCoerce(t1,t2) == (t1 = QFI) and int2 => true num2 := int2 or MEMQ(n2,scalars) or (t2 = QFI) - isVar1 := MEMQ(n1,'(Variable Symbol)) + isVar1 := n1 in '(Variable Symbol) num2 and isVar1 => true num2 and MEMQ(n1,$univariateDomains) => true @@ -902,7 +902,7 @@ coerceInt1(triple,t2) == NIL NIL - EQ(CAR(t1),'Variable) and PAIRP(t2) and + EQ(CAR(t1),'Variable) and CONSP(t2) and (isEqualOrSubDomain(t2,$Integer) or (t2 = [$QuotientField, $Integer]) or MEMQ(CAR(t2), '(RationalNumber BigFloat NewFloat Float DoubleFloat))) => NIL |