diff options
Diffstat (limited to 'src/interp/i-coerce.boot')
| -rw-r--r-- | src/interp/i-coerce.boot | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/interp/i-coerce.boot b/src/interp/i-coerce.boot index 2ab91994..c86ebf13 100644 --- a/src/interp/i-coerce.boot +++ b/src/interp/i-coerce.boot @@ -416,7 +416,7 @@ canCoerce1(t1,t2) == -- the result is NIL if it fails t1 = t2 => true absolutelyCanCoerceByCheating(t1,t2) or t1 = $None or t2 = $Any or - t1 in '((Mode) (Category)) => + member(t1,'((Mode) (Category))) => t2 = $OutputForm => true NIL -- next is for tagged union selectors for the time being @@ -460,8 +460,8 @@ canCoerce1(t1,t2) == arg and t:= last arg canCoerce(t1,t) and canCoerceByFunction(t,t2) and 'T - ans or (t1 in '((PositiveInteger) (NonNegativeInteger)) - and canCoerce($Integer,t2)) + ans or member(t1,'((PositiveInteger) (NonNegativeInteger))) + and canCoerce($Integer,t2) canCoerceFrom0(t1,t2) == -- top level test for coercion, which transfers all RN, RF and RR into @@ -634,7 +634,7 @@ newCanCoerceCommute(t1,t2) == canCoercePermute(t1,t2) == -- try to generate a sequence of transpositions that will convert -- t1 into t2 - t2 in '((Integer) (OutputForm)) => NIL + member(t2,'((Integer) (OutputForm))) => NIL towers := computeTTTranspositions(t1,t2) -- at this point, CAR towers = t1 and last towers should be similar -- to t2 in the sense that the components of t1 are in the same order @@ -751,7 +751,7 @@ coerceInteractive(triple,t2) == t2 = '$NoValueMode => objNew(val,t2) if t2 is ['SubDomain,x,.] then t2:= x -- JHD added category Aug 1996 for BasicMath - t1 in $LangSupportTypes => + member(t1,$LangSupportTypes) => t2 = $OutputForm => objNew(val,t2) t1 = $Domain and conceptualType t2 = $Category and ofCategory(val,t2)=> objNew(val,t2) @@ -946,7 +946,7 @@ getSubDomainPredicate(tSuper, tSub, pred) == decl := ['_:, name, ['Mapping, $Boolean, tSuper]] interpret(decl, nil) arg := GENSYM() - pred' := SUBST(arg, "#1", pred) + pred' := substitute(arg, "#1", pred) defn := ['DEF, [name, arg], '(NIL NIL), '(NIL NIL), removeZeroOne pred'] interpret(defn, nil) op := mkAtree name @@ -1204,7 +1204,7 @@ coerceIntCommute(obj,target) == NIL coerceIntPermute(object,t2) == - t2 in '((Integer) (OutputForm)) => NIL + member(t2,'((Integer) (OutputForm))) => NIL t1 := objMode object towers := computeTTTranspositions(t1,t2) -- at this point, CAR towers = t1 and last towers should be similar |