diff options
| author | dos-reis <gdr@axiomatics.org> | 2012-01-13 02:03:31 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2012-01-13 02:03:31 +0000 |
| commit | 7d98b7fa7d816f132fb09bf439333f4145c603f8 (patch) | |
| tree | 8575dd6cb449b3ed52b68d7aa763216bfdce0c79 /src/interp/functor.boot | |
| parent | 4ebf86fc014d407548be8af728191fe02401bf1a (diff) | |
| download | open-axiom-7d98b7fa7d816f132fb09bf439333f4145c603f8.tar.gz | |
* interp/category.boot: Rename AncestorP to ancestor?.
Rename DescendantP to descendant?.
* interp/define.boot: Likewise.
* interp/functor.boot: Likewise.
Diffstat (limited to 'src/interp/functor.boot')
| -rw-r--r-- | src/interp/functor.boot | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/interp/functor.boot b/src/interp/functor.boot index 91564e08..ae7073a2 100644 --- a/src/interp/functor.boot +++ b/src/interp/functor.boot @@ -631,7 +631,7 @@ InvestigateConditions(catvecListMaker,env) == old=true => old for [newS2,:morecond] in newS repeat old:= - not AncestorP(sec,[newS2],env) => old + not ancestor?(sec,[newS2],env) => old cond2 := mkAnd(cond,morecond,env) null old => cond2 mkOr(cond2,old,env) @@ -678,7 +678,7 @@ ICformat(u,env) == --check that v causes descendants to go for v in l | not (v=u) and v is ['HasCategory, =name,['QUOTE, cond2]] repeat - if DescendantP(cond,cond2,env) then l:= remove(l,u) + if descendant?(cond,cond2,env) then l:= remove(l,u) --v subsumes u for u in l | u is ['AND,:l'] or u is ['and,:l'] repeat for u' in l' | u' is ['HasCategory,name,cond] and cond is ['QUOTE, @@ -686,7 +686,7 @@ ICformat(u,env) == --check that v causes descendants to go for v in l | v is ['HasCategory, =name,['QUOTE, cond2]] repeat - if DescendantP(cond,cond2,env) then l:= remove(l,u) + if descendant?(cond,cond2,env) then l:= remove(l,u) --v subsumes u l # l=1 => first l |