diff options
-rw-r--r-- | src/ChangeLog | 7 | ||||
-rw-r--r-- | src/interp/define.boot | 1 | ||||
-rw-r--r-- | src/interp/lisplib.boot | 2 | ||||
-rw-r--r-- | src/interp/nruncomp.boot | 6 |
4 files changed, 10 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 69718a1f..9d358a8d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,12 @@ 2011-09-05 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/define.boot (compDefineFunctor1): Do not set + $lisplibFunctions. + * interp/lisplib.boot: Remove $lisplibOpAlist. + * interp/nruncomp.boot: Likewise. + +2011-09-05 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/nruncomp.boot (updateSlot1DataBase)e: Remove. (newLookupInCategories1): Remove. (newLookupInCategories): Do not call it. diff --git a/src/interp/define.boot b/src/interp/define.boot index 8e9e7969..38854d13 100644 --- a/src/interp/define.boot +++ b/src/interp/define.boot @@ -1422,7 +1422,6 @@ compDefineFunctor1(df is ['DEF,form,signature,nils,body], if $LISPLIB then if not $bootStrapMode then $NRTslot1Info := NRTmakeSlot1Info() - $lisplibFunctionLocations := applySubst($pairlis,$functionLocations) libFn := getConstructorAbbreviationFromDB op' $lookupFunction: local := NRTgetLookupFunction($functorForm,modemap.mmTarget,$NRTaddForm,$e) diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot index 4debd68e..72ac576d 100644 --- a/src/interp/lisplib.boot +++ b/src/interp/lisplib.boot @@ -447,7 +447,6 @@ compConLib1(fun,infileOrNil,outfileOrNil,auxOp,editFlag,traceFlag) == $lisplibPredicates: local := nil $lisplibModemapAlist: local := nil $lisplibOperationAlist: local := nil - $lisplibOpAlist: local:= nil $libFile: local := nil $lisplibVariableAlist: local := nil $lisplibSignatureAlist: local := nil @@ -471,7 +470,6 @@ compDefineLisplib(df:=["DEF",[op,:.],:.],m,e,prefix,fal,fn) == $lisplibPredicates: local := nil -- set by makePredicateBitVector $lisplibModemapAlist: local := nil $lisplibOperationAlist: local := nil - $lisplibOpAlist: local := nil --operations alist for new runtime system $lisplibSignatureAlist: local := nil $libFile: local := nil $lisplibVariableAlist: local := nil diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot index 04603869..117b5946 100644 --- a/src/interp/nruncomp.boot +++ b/src/interp/nruncomp.boot @@ -627,12 +627,12 @@ NRTmakeSlot1Info() == [:argl,dollarName] := rest $form [[dollarName,:'_$],:mkSlot1sublis argl] mkSlot1sublis rest $form - $lisplibOpAlist := + exports := transformOperationAlist applySubst(pairlis,categoryExports $domainShell) opList := $NRTderivedTargetIfTrue => 'derived - $insideCategoryPackageIfTrue => slot1Filter $lisplibOpAlist - $lisplibOpAlist + $insideCategoryPackageIfTrue => slot1Filter exports + exports addList := applySubst(pairlis,$NRTaddForm) [$form.op,[addList,:opList]] |