aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/interp/define.boot5
-rw-r--r--src/interp/lisplib.boot12
3 files changed, 12 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d6fab4f5..6110e775 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
2011-09-04 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * interp/lisplib.boot: Likewise.
+ * interp/define.boot: Remove $lisplibAncestors.
+
+2011-09-04 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* interp/br-data.boot: Don't use $lisplibParents.
* interp/define.boot: Likewise.
* interp/lisplib.boot: Likewise.
diff --git a/src/interp/define.boot b/src/interp/define.boot
index ee3236ab..4ec4fb55 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -67,7 +67,6 @@ $functionStats := nil
$functorStats := nil
$lisplibCategory := nil
-$lisplibAncestors := nil
$CheckVectorList := []
$pairlis := []
$functorTarget := nil
@@ -1056,8 +1055,8 @@ compDefineCategory2(form,signature,specialCases,body,m,e,
dbConstructorModemap(constructorDB op') := [[parForm,:parSignature],[true,op']]
$lisplibCategory:= formalBody
dbPrincipals(db) := getParentsFor(db,$FormalMapVariableList,$lisplibCategory)
+ dbAncestors(db) := computeAncestorsOf($form,nil)
if $LISPLIB then
- $lisplibAncestors := computeAncestorsOf($form,nil)
augLisplibModemapsFromCategory([op',:sargl],formalBody,signature')
dbBeingDefined?(db) := false
[fun,$Category,e]
@@ -1421,7 +1420,7 @@ compDefineFunctor1(df is ['DEF,form,signature,nils,body],
dbConstructorModemap(constructorDB op') := modemap
$lisplibCategory := modemap.mmTarget
dbPrincipals(db) := getParentsFor(db,$FormalMapVariableList,$lisplibCategory)
- $lisplibAncestors := computeAncestorsOf($form,nil)
+ dbAncestors(db) := computeAncestorsOf($form,nil)
$insideFunctorIfTrue:= false
if $LISPLIB then
if not $bootStrapMode then
diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot
index 7c03dce3..898b46cf 100644
--- a/src/interp/lisplib.boot
+++ b/src/interp/lisplib.boot
@@ -445,7 +445,6 @@ compConLib1(fun,infileOrNil,outfileOrNil,auxOp,editFlag,traceFlag) ==
$PrettyPrint: local := 'T
$LISPLIB: local := 'T
$lisplibPredicates: local := nil
- $lisplibAncestors: local := nil
$lisplibModemapAlist: local := nil
$lisplibSlot1 : local := nil --used by NRT mechanisms
$lisplibOperationAlist: local := nil
@@ -471,7 +470,6 @@ compDefineLisplib(df:=["DEF",[op,:.],:.],m,e,prefix,fal,fn) ==
$LISPLIB: local := 'T
$op: local := op
$lisplibPredicates: local := nil -- set by makePredicateBitVector
- $lisplibAncestors: local := nil
$lisplibModemapAlist: local := nil
$lisplibSlot1 : local := nil -- used by NRT mechanisms
$lisplibOperationAlist: local := nil
@@ -577,8 +575,8 @@ leaveIfErrors(libName,kind) ==
++ Finalize `libName' compilation; returns true if everything is OK.
finalizeLisplib(ctor,libName) ==
db := constructorDB ctor
- kind := dbConstructorKind constructorDB ctor
- form := dbConstructorForm constructorDB ctor
+ kind := dbConstructorKind db
+ form := dbConstructorForm db
mm := getConstructorModemap ctor
writeConstructorForm(ctor,form,$libFile)
writeKind(ctor,kind,$libFile)
@@ -595,15 +593,15 @@ finalizeLisplib(ctor,libName) ==
$pairlis : local := pairList(form,$FormalMapVariableList)
$NRTslot1PredicateList : local := []
NRTgenInitialAttributeAlist(db,rest opsAndAtts)
- writeSuperDomain(ctor,dbSuperDomain constructorDB ctor,$libFile)
+ writeSuperDomain(ctor,dbSuperDomain db,$libFile)
lisplibWrite('"signaturesAndLocals",
removeZeroOne mergeSignatureAndLocalVarAlists($lisplibSignatureAlist,
$lisplibVariableAlist),$libFile)
writeAttributes(ctor,removeZeroOne dbAttributes db,$libFile)
lisplibWrite('"predicates",removeZeroOne $lisplibPredicates,$libFile)
- lisplibWrite('"abbreviation",dbAbbreviation constructorDB ctor,$libFile)
+ lisplibWrite('"abbreviation",dbAbbreviation db,$libFile)
writePrincipals(ctor,removeZeroOne dbPrincipals db,$libFile)
- writeAncestors(ctor,removeZeroOne $lisplibAncestors,$libFile)
+ writeAncestors(ctor,removeZeroOne dbAncestors db,$libFile)
lisplibWrite('"documentation",finalizeDocumentation ctor,$libFile)
lisplibWrite('"slot1Info",removeZeroOne $lisplibSlot1,$libFile)
if $profileCompiler then profileWrite()