diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-04-22 02:42:48 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-04-22 02:42:48 +0000 |
| commit | a8469b11f4b06fd70bf1e2082fcd0016de428053 (patch) | |
| tree | 2ef2d7419ab531414dcf0fe4deb33feaf3b062ff /src/interp/cattable.boot | |
| parent | d2883391871a704dd5c5d9a28c947d5a54784b48 (diff) | |
| download | open-axiom-a8469b11f4b06fd70bf1e2082fcd0016de428053.tar.gz | |
* interp/br-data.boot: Tidy.
* interp/br-util.boot: Likewise.
* interp/c-doc.boot: Likewise.
* interp/cattable.boot: Likewise.
* interp/clammed.boot: Likewise.
* interp/define.boot: Likewise.
* interp/g-cndata.boot: Likewise.
* interp/g-util.boot: Likewise.
* interp/ht-util.boot: Likewise.
* interp/i-map.boot: Likewise.
* interp/modemap.boot: Likewise.
* interp/nrungo.boot: Likewise.
* interp/rulesets.boot: Likewise.
* interp/slam.boot: Likewise.
* interp/i-spec1.boot: Likewise.
* interp/Makefile.pamphlet (br-util.$(FASLEXT)): Don't compile as
Old Boot.
(bc-solve.$(FASLEXT)): Likewise.
(ht-util.$(FASLEXT)): Likewise.
(rulesets.$(FASLEXT)): Likewise.
(i-object.$(FASLEXT)): Likewise.
(i-util.$(FASLEXT)): Likewise.
(nrunfast.$(FASLEXT)): Likewise.
(nrungo.$(FASLEXT)): Likewise.
(iterator.$(FASLEXT)): Likewise.
(cattable.$(FASLEXT)): Likewise.
(c-doc.$(FASLEXT)): Likewise.
(posit.$(FASLEXT)): Likewise.
(modemap.$(FASLEXT)): Likewise.
(slam.$(FASLEXT)): Likewise.
(clammed.$(FASLEXT)): Likewise.
(g-opt.$(FASLEXT)): Likewise.
(g-error.$(FASLEXT)): Likewise.
(pathname.$(FASLEXT)): Likewise.
(g-util.$(FASLEXT)): Likewise.
(g-cndata.$(FASLEXT)): Likewise.
* boot/tokens.boot: Remove renaming of NOT to NULL, when compiling
Old Boot.
Diffstat (limited to 'src/interp/cattable.boot')
| -rw-r--r-- | src/interp/cattable.boot | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/interp/cattable.boot b/src/interp/cattable.boot index 27cdebd5..86508063 100644 --- a/src/interp/cattable.boot +++ b/src/interp/cattable.boot @@ -77,7 +77,7 @@ genCategoryTable() == simpTempCategoryTable() == for id in HKEYS _*ANCESTORS_-HASH_* repeat for (u:=[a,:b]) in getConstructorAncestorsFromDB id repeat - RPLACA(u,SUBST('Type,'Object,a)) + RPLACA(u,substitute('Type,'Object,a)) RPLACD(u,simpHasPred b) simpCategoryTable() == main where @@ -116,7 +116,7 @@ simpHasPred(pred,:options) == main where pred in '(T etc) => pred null pred => nil pred - simpDevaluate a == EVAL SUBST('QUOTE,'devaluate,a) + simpDevaluate a == EVAL substitute('QUOTE,'devaluate,a) simpHas(pred,a,b) == b is ['ATTRIBUTE,attr] => simpHasAttribute(pred,a,attr) b is ['SIGNATURE,op,sig] => simpHasSignature(pred,a,op,sig) @@ -400,9 +400,9 @@ categoryParts(conform,category,:options) == main where item is ['IF,pred1,s1,s2] => build(s1,quickAnd(pred,pred1)) s2 => build(s2,quickAnd(pred,['NOT,pred1])) - item is ['PROGN,:r] => for x in r repeat build(x,pred) - item in '(%noBranch) => 'ok null item => 'ok + item = "%noBranch" => 'ok + item is ['PROGN,:r] => for x in r repeat build(x,pred) systemError '"build error" exportsOf(target) == target is ['CATEGORY,.,:r] => r |