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/br-op2.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/br-op2.boot')
| -rw-r--r-- | src/interp/br-op2.boot | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/interp/br-op2.boot b/src/interp/br-op2.boot index c89e727d..f82cea01 100644 --- a/src/interp/br-op2.boot +++ b/src/interp/br-op2.boot @@ -105,14 +105,14 @@ htSayValue t == htSay '" to " htSayArgument target t = '(Category) => htSay('"a category") - t is [op,:.] and MEMQ(op,'(Join CATEGORY)) or constructor? opOf t => + t is [op,:.] and op in '(Join CATEGORY) or constructor? opOf t => htSayConstructor(nil,t) htSay('"an element of domain ") htSayArgument t --continue for operations htSayArgument t == --called only for operations not for constructors null $signature => htSay ['"{\em ",t,'"}"] - MEMQ(t, '(_$ _%)) => + t in '(_$ _%) => $conkind = '"category" and $conlength > 20 => $generalSearch? => htSay '"{\em D} of the origin category" addWhereList("$",'is,nil) @@ -464,7 +464,7 @@ koCatAttrsAdd(catform,pred) == exists := HGET($if,name) if existingPred := LASSOC(argl,exists)_ then npred := quickOr(npred,existingPred) - if not MEMQ(name,'(nil nothing)) _ + if not (name in '(nil nothing)) _ then HPUT($if,name,[[argl,simpHasPred npred],:exists]) --======================================================================= @@ -592,7 +592,7 @@ hasPatternVar x == getDcForm(dc, condlist) == [ofWord,id,cform] := or/[x for x in condlist | x is [k,=dc,:.] - and MEMQ(k, '(ofCategory isDomain))] or return nil + and k in '(ofCategory isDomain)] or return nil conform := getConstructorForm opOf cform ofWord = 'ofCategory => [conform, ["*1", :rest cform], ["%", :rest conform]] |