diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-09-26 00:33:26 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-09-26 00:33:26 +0000 |
| commit | 868f1d56a5bcd7d712855e98085e0e15d32a3264 (patch) | |
| tree | 4d35d3eab5979f150c3ff32e91ef21bf2d6853be /src/interp/cattable.boot | |
| parent | 489cfd14dccfcaf7b0ebd41e9d0f8e081a9d1d9f (diff) | |
| download | open-axiom-868f1d56a5bcd7d712855e98085e0e15d32a3264.tar.gz | |
* interp/as.boot: Clean up.
* interp/ax.boot: Likewise.
* interp/br-con.boot: Likewise.
* interp/br-data.boot: Likewise.
* interp/br-op1.boot: Likewise.
* interp/br-op2.boot: Likewise.
* interp/br-saturn.boot: Likewise.
* interp/br-search.boot: Likewise.
* interp/c-util.boot: Likewise.
* interp/category.boot: Likewise.
* interp/cattable.boot: Likewise.
* interp/clam.boot: Likewise.
* interp/compiler.boot: Likewise.
* interp/cstream.boot: Likewise.
* interp/define.boot: Likewise.
* interp/format.boot: Likewise.
* interp/fortcall.boot: Likewise.
* interp/functor.boot: Likewise.
* interp/g-boot.boot: Likewise.
* interp/g-opt.boot: Likewise.
* interp/g-timer.boot: Likewise.
* interp/guess.boot: Likewise.
* interp/i-analy.boot: Likewise.
* interp/i-coerce.boot: Likewise.
* interp/i-coerfn.boot: Likewise.
* interp/i-eval.boot: Likewise.
* interp/i-funsel.boot: Likewise.
* interp/i-intern.boot: Likewise.
* interp/i-map.boot: Likewise.
* interp/i-object.boot: Likewise.
* interp/i-output.boot: Likewise.
* interp/i-resolv.boot: Likewise.
* interp/i-spec1.boot: Likewise.
* interp/i-spec2.boot: Likewise.
* interp/i-syscmd.boot: Likewise.
* interp/int-top.boot: Likewise.
* interp/interop.boot: Likewise.
* interp/lisplib.boot: Likewise.
* interp/mark.boot: Likewise.
* interp/modemap.boot: Likewise.
* interp/msg.boot: Likewise.
* interp/msgdb.boot: Likewise.
* interp/newfort.boot: Likewise.
* interp/nrunfast.boot: Likewise.
* interp/nrungo.boot: Likewise.
* interp/nrunopt.boot: Likewise.
* interp/pf2atree.boot: Likewise.
* interp/pile.boot: Likewise.
* interp/pspad1.boot: Likewise.
* interp/ptrees.boot: Likewise.
* interp/scan.boot: Likewise.
* interp/sfsfun.boot: Likewise.
* interp/showimp.boot: Likewise.
* interp/slam.boot: Likewise.
* interp/trace.boot: Likewise.
* interp/wi1.boot: Likewise.
* interp/word.boot: Likewise.
Diffstat (limited to 'src/interp/cattable.boot')
| -rw-r--r-- | src/interp/cattable.boot | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/interp/cattable.boot b/src/interp/cattable.boot index 10afbecd..78831c76 100644 --- a/src/interp/cattable.boot +++ b/src/interp/cattable.boot @@ -96,12 +96,12 @@ simpHasPred(pred,:options) == main where simp pred == pred is [op,:r] => op = "has" => simpHas(pred,first r,first rest r) - op = 'HasCategory => simp ["has",CAR r,simpDevaluate CADR r] + op = 'HasCategory => simp ["has",CAR r,simpDevaluate second r] op = 'HasSignature => - [op,sig] := simpDevaluate CADR r + [op,sig] := simpDevaluate second r ["has",CAR r,['SIGNATURE,op,sig]] op = 'HasAttribute => - form := ["has",a := CAR r,['ATTRIBUTE,b := simpDevaluate CADR r]] + form := ["has",a := CAR r,['ATTRIBUTE,b := simpDevaluate second r]] simpHasAttribute(form,a,b) op in '(AND OR NOT) => null (u := MKPF([simp p for p in r],op)) => nil |