diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-02-24 06:31:46 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-02-24 06:31:46 +0000 |
| commit | 8e0d8383d1c9ee1ae269400dac75f185d465dcc1 (patch) | |
| tree | 42a7409e3d4fc9bf10bc49f96cdea0c618314918 | |
| parent | f2d31d8bc90b46e0c3373d2980cfa6f730148d1e (diff) | |
| download | open-axiom-8e0d8383d1c9ee1ae269400dac75f185d465dcc1.tar.gz | |
small cleanups
| -rw-r--r-- | src/interp/functor.boot | 6 | ||||
| -rw-r--r-- | src/interp/g-opt.boot | 2 | ||||
| -rw-r--r-- | src/interp/nruncomp.boot | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/interp/functor.boot b/src/interp/functor.boot index 96622dba..c75d34da 100644 --- a/src/interp/functor.boot +++ b/src/interp/functor.boot @@ -460,10 +460,10 @@ DescendCodeAdd1(base,flag,target,formalArgs,formalArgModes) == if update(u,copyvec,[]) then code:=delete(u,code)) where update(code,copyvec,sofar) == atom code =>nil - code.op in '(getShellEntry ELT QREFELT) => + code.op in '(getShellEntry ELT) => copyvec.(third code):=union(copyvec.(third code), sofar) true - code is [x,name,number,u'] and x in '(setShellEntry QSETREFV) => + code is ['setShellEntry,name,number,u'] => update(u',copyvec,[[name,:number],:sofar]) for i in 6..n repeat for u in copyvec.i repeat @@ -563,7 +563,7 @@ DescendCode(code,flag,viewAssoc,EnvToPass) == ConstantCreator u == null u => false - u is [q,.,.,u'] and (q in '(setShellEntry QSETREFV)) => + u is ['setShellEntry,.,.,u'] => ConstantCreator u' u is ['CONS,:.] => false true diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot index cb4788a1..9ed6cf3a 100644 --- a/src/interp/g-opt.boot +++ b/src/interp/g-opt.boot @@ -270,7 +270,7 @@ optCall (x is ['%call,:u]) == x.first := 'SPADCALL x.rest := [:a,name] x - fn is [q,R,n] and q in '(getShellEntry ELT QREFELT CONST) => + fn is [q,R,n] and q in '(getShellEntry ELT CONST) => q = 'CONST => ['spadConstant,R,n] emitIndirectCall(fn,a,x) systemErrorHere ['optCall,x] diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot index 7eb5e004..0fc885c5 100644 --- a/src/interp/nruncomp.boot +++ b/src/interp/nruncomp.boot @@ -365,7 +365,7 @@ consDomainForm(x,dc) == NRTdescendCodeTran(u,condList) == null u => nil u is ['%list] => nil - u is [op,.,i,a] and op in '(setShellEntry QSETREFV) => + u is ['setShellEntry,.,i,a] => null condList and a is ['CONS,fn,:.] => u.first := '%list u.rest := nil @@ -688,7 +688,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 dom ~='$ and elt in '(getShellEntry ELT QREFELT CONST) => + fn is [elt,dom,ind] and dom ~='$ and elt in '(getShellEntry ELT CONST) => k := NRTassocIndex dom => lastNode(bod).first := ['%vref,'_$,k] nil NRTputInHead fn |