diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-07-25 00:12:57 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-07-25 00:12:57 +0000 |
| commit | f5181e8acaf34cb5a26a30bd3901a19485933c6d (patch) | |
| tree | e30eb7600dbe651222f96e3d977e052285475227 /src/interp/clam.boot | |
| parent | c19e54f03e3230811e6c86998568ce63ccbc42c9 (diff) | |
| download | open-axiom-f5181e8acaf34cb5a26a30bd3901a19485933c6d.tar.gz | |
* interp/cattable.boot: Use %true for truth value in VM expressions.
* interp/clam.boot: Likewise.
* interp/define.boot: Likewise.
* interp/format.boot: Likewise.
* interp/functor.boot: Likewise.
* interp/g-opt.boot: Likewise.
* interp/mark.boot: Likewise.
* interp/pspad1.boot: Likewise.
* interp/pspad2.boot: Likewise.
* interp/slam.boot: Likewise.
* interp/wi1.boot: Likewise.
* interp/wi2.boot: Likewise.
* interp/sys-constants.boot: Remove $true and $false as unused.
Diffstat (limited to 'src/interp/clam.boot')
| -rw-r--r-- | src/interp/clam.boot | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/interp/clam.boot b/src/interp/clam.boot index 608aff79..bf66a8a0 100644 --- a/src/interp/clam.boot +++ b/src/interp/clam.boot @@ -134,10 +134,9 @@ compClam(op,argl,body,$clamList) == countFl => ['CONS,1,g2] g2 thirdPredPair:= --- null argl => ['(QUOTE T),['SETQ,cacheName,computeValue]] - ['(QUOTE T), - ['SETQ,g2,computeValue], - ['SETQ,g3,['CAR,cacheName]], + ['%true, + ['%store,g2,computeValue], + ['%store,g3,['CAR,cacheName]], ['RPLACA,g3,g1], ['RPLACD,g3,resetCacheEntry], g2] @@ -247,7 +246,7 @@ compHash(op,argl,body,cacheNameOrNil,eqEtc,countFl) == if cacheNameOrNil then putCode := ['UNWIND_-PROTECT,['PROG1,putCode,['SETQ,g2,'T]], ['COND,[['NOT,g2],['HREM,cacheName,MKQ op]]]] - thirdPredPair:= ['(QUOTE T),putCode] + thirdPredPair:= ['%true,putCode] codeBody:= ['PROG,[g2], :callCountCode,['RETURN,['COND,secondPredPair,thirdPredPair]]] lamex:= ['LAM,arg,codeBody] @@ -299,12 +298,12 @@ compHashGlobal(op,argl,body,cacheName,eqEtc,countFl) == countFl => ['CDRwithIncrement,g2] g2 getCode:= ['HGET,cacheName,cacheArgKey] - secondPredPair:= [['SETQ,g2,getCode],returnFoundValue] + secondPredPair:= [['%store,g2,getCode],returnFoundValue] putForm:= ['CONS,MKQ op,g1] putCode:= countFl => ['HPUT,cacheName,putForm,['CONS,1,computeValue]] ['HPUT,cacheName,putForm,computeValue] - thirdPredPair:= ['(QUOTE T),putCode] + thirdPredPair:= ['%true,putCode] codeBody:= ['PROG,[g2], ['RETURN,['COND,secondPredPair,thirdPredPair]]] lamex:= ['LAM,arg,codeBody] mainFunction:= [op,lamex] |