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/nruncomp.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/nruncomp.boot')
| -rw-r--r-- | src/interp/nruncomp.boot | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot index 7fd6aa3c..f09552ea 100644 --- a/src/interp/nruncomp.boot +++ b/src/interp/nruncomp.boot @@ -124,7 +124,7 @@ NRTencode(x,y) == encode(x,y,true) where encode(x,compForm,firstTime) == for [.,a,b] in rest x for [.,=a,c] in rest compForm]] (x' := isQuasiquote x) => quasiquote encode(x',isQuasiquote compForm,false) - IDENTP op and (constructor? op or MEMQ(op,'(Union Mapping))) => + IDENTP op and (constructor? op or op in '(Union Mapping)) => [op,:[encode(y,z,false) for y in rest x for z in rest compForm]] -- enumeration constants are like field names, they do not need -- to be encoded. @@ -144,7 +144,7 @@ listOfBoundVars form == form = '$ => [] IDENTP form and (u:=get(form,'value,$e)) => u:=u.expr - MEMQ(KAR u,'(Union Record)) => listOfBoundVars u + KAR u in '(Union Record) => listOfBoundVars u [form] atom form => [] first form = 'QUOTE => [] @@ -363,7 +363,7 @@ consDomainForm(x,dc) == NRTdescendCodeTran(u,condList) == null u => nil u is ['LIST] => nil - u is [op,.,i,a] and MEMQ(op,'(setShellEntry SETELT QSETREFV)) => + u is [op,.,i,a] and op in '(setShellEntry SETELT QSETREFV) => null condList and a is ['CONS,fn,:.] => RPLACA(u,'LIST) RPLACD(u,nil) @@ -720,7 +720,7 @@ NRTsubstDelta(initSig) == u:= $NRTdeltaList.($NRTdeltaLength+5-t) first u = 'domain => second u error "bad $NRTdeltaList entry" - MEMQ(first t,'(Mapping Union Record _:)) => + first t in '(Mapping Union Record _:) => [first t,:[replaceSlotTypes(x) for x in rest t]] t @@ -763,7 +763,7 @@ NRTputInHead bod == bod is ['SPADCALL,:args,fn] => NRTputInTail rest bod --NOTE: args = COPY of rest bod -- The following test allows function-returning expressions - fn is [elt,dom,ind] and not (dom='$) and MEMQ(elt,'(getShellEntry ELT QREFELT CONST)) => + fn is [elt,dom,ind] and not (dom='$) and elt in '(getShellEntry ELT QREFELT CONST) => k:= NRTassocIndex dom => RPLACA(LASTNODE bod,[$elt,'_$,k]) nil NRTputInHead fn |