aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog3
-rw-r--r--src/interp/br-data.boot5
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 392dbfda..bbd3dc1e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,9 @@
-2012-02-11 Gabriel Dos Reis <gdr@cse.tamu.edu>
+2012-02-11 Gabriel Dos Reis <gdr@cs.tamu.edu>
* interp/br-data.boot (getParentsFor): Move to define.boot.
(explodeIfs): Likewise.
(getParentsForDomain): Tidy.
+ (ancestorsRecur): Likewise.
2012-02-09 Gabriel Dos Reis <gdr@cs.tamu.edu>
diff --git a/src/interp/br-data.boot b/src/interp/br-data.boot
index 6c8c5d38..ab28dc08 100644
--- a/src/interp/br-data.boot
+++ b/src/interp/br-data.boot
@@ -587,14 +587,13 @@ ancestorsRecur(conform,domform,pred,firstTime?) == --called by ancestorsOf
op := opOf conform
pred = tableValue($done,conform) => nil --skip if already processed
parents :=
- firstTime? and ($insideCategoryIfTrue or $insideFunctorIfTrue) =>
- dbPrincipals constructorDB op
+ firstTime? => dbPrincipals constructorDB op
parentsOf op
originalConform :=
firstTime? and ($insideCategoryIfTrue or $insideFunctorIfTrue) => $form
getConstructorForm op
if conform ~= originalConform then
- parents := applySubst(pairList(IFCDR originalConform,IFCDR conform),parents)
+ parents := applySubst(pairList(originalConform.args,conform.args),parents)
for [newform,:p] in parents repeat
if domform and domform.args then
newdomform := applySubst(pairList(conform.args,domform.args),newform)