diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/interp/br-data.boot | 2 | ||||
| -rw-r--r-- | src/interp/functor.boot | 6 | ||||
| -rw-r--r-- | src/interp/nruncomp.boot | 4 | ||||
| -rw-r--r-- | src/interp/showimp.boot | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/interp/br-data.boot b/src/interp/br-data.boot index 1014fbd0..45d947b1 100644 --- a/src/interp/br-data.boot +++ b/src/interp/br-data.boot @@ -463,7 +463,7 @@ getImports conname == --called by mkUsersHashTable u := [doImport(i,template) for i in 5..(maxIndex template) | test] where test() == template.i is [op,:.] and ident? op - and not (op in '(Mapping Union Record Enumeration CONS QUOTE local)) + and not (op in '(Mapping Union Record Enumeration CONS QUOTE local %closure)) doImport(x,template) == x is [op,:args] => op = 'QUOTE or op = '%eval => first args diff --git a/src/interp/functor.boot b/src/interp/functor.boot index d58357b7..30c5a5df 100644 --- a/src/interp/functor.boot +++ b/src/interp/functor.boot @@ -480,7 +480,7 @@ DescendCode(db,code,flag,viewAssoc,e) == dom := u := symbolTarget('$,viewAssoc) => ['getDomainView,'$,u] '$ - body:= ['CONS,implem,dom] + body:= ['%closure,implem,dom] SetFunctionSlots(sig,body,flag,'original) code is ['_:,:.] => (code.first := '%list; code.rest := nil) --Yes, I know that's a hack, but how else do you kill a line? @@ -520,8 +520,8 @@ SetFunctionSlots(sig,body,flag,mode) == --mode is either "original" or "adding" null body => return nil for catImplem in findOperatorImplementations sig repeat catImplem is [q,.,index] and q in '(ELT CONST) => - if q = 'CONST and body is ['CONS,a,b] then - body := ['CONS,'%constant,['FUNCALL,a,b]] + if q = 'CONST and body is ['%closure,a,b] then + body := ['%closure,'%constant,['FUNCALL,a,b]] body:= ['%store,['%tref,'$,index],body] not vector? $SetFunctions => nil --packages don't set it TruthP vectorRef($SetFunctions,index) => -- the function was already assigned diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot index 1e413c64..260d4fd1 100644 --- a/src/interp/nruncomp.boot +++ b/src/interp/nruncomp.boot @@ -334,7 +334,7 @@ descendCodeTran(db,u,condList) == null u => nil u is ['%list] => nil u is ['%store,['%tref,.,i],a] => - null condList and a is ['CONS,fn,:.] => + null condList and a is ['%closure,fn,:.] => u.first := '%list u.rest := nil domainRef(dbTemplate db,i) := @@ -379,7 +379,7 @@ stuffSlot(dollar,i,item) == vectorRef(dollar,i) := item isnt [.,:.] => [symbolFunction item,:dollar] item is [n,:op] and integer? n => ['newGoGet,dollar,:item] - item is ['CONS,.,['FUNCALL,a,b]] => + item is ['%closure,.,['FUNCALL,a,b]] => b is '$ => ['makeSpadConstant,eval a,dollar,i] sayBrightlyNT '"Unexpected constant environment!!" pp devaluate b diff --git a/src/interp/showimp.boot b/src/interp/showimp.boot index 8f65d5e5..633b7d22 100644 --- a/src/interp/showimp.boot +++ b/src/interp/showimp.boot @@ -283,7 +283,7 @@ dcSlots con == item is [n,:op] and integer? n => dcOpLatchPrint(op,n) null item and i > 5 => sayBrightly ['"arg ",strconc('"#",toString(i - 5))] item isnt [.,:.] => sayBrightly ['"fun ",item] - item is ['CONS,.,['FUNCALL,[.,a],b]] => sayBrightly ['"constant ",a] + item is ['%closure,.,['FUNCALL,[.,a],b]] => sayBrightly ['"constant ",a] sayBrightly concat('"lazy ",form2String formatSlotDomain i) dcOpLatchPrint(op,index) == @@ -364,7 +364,7 @@ dcOpPrint(op,index) == slotNumber = 1 => '"missing" name := $infovec.0.slotNumber name isnt [.,:.] => name - name is ["CONS",'%constant, + name is ['%closure,'%constant, ["FUNCALL", ['%function, impl],"$"]] => kind := 'CONST impl |