From 04608dfa938b011bce60031e7eccfb6cb67c2ced Mon Sep 17 00:00:00 2001 From: dos-reis Date: Thu, 24 Feb 2011 10:19:03 +0000 Subject: Cleanup long standing confusion --- src/interp/g-opt.boot | 2 +- src/interp/nruncomp.boot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot index baaab2e5..e70503c8 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 CONST) => + fn is [q,R,n] and q in '(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 0fc885c5..d98c966f 100644 --- a/src/interp/nruncomp.boot +++ b/src/interp/nruncomp.boot @@ -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 CONST) => + fn is [elt,dom,ind] and dom ~='$ and elt in '(ELT CONST) => k := NRTassocIndex dom => lastNode(bod).first := ['%vref,'_$,k] nil NRTputInHead fn -- cgit v1.2.3