diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-07-11 00:10:17 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-07-11 00:10:17 +0000 |
| commit | 419a88b7d6a8c0248c17c47a9a46b0aab0b5936f (patch) | |
| tree | 64531f1f78bf1e38f86af1322d94ee101b022057 /src/algebra | |
| parent | aa7e3e2f0d8bbcafe488f536faa86ff9581efef0 (diff) | |
| download | open-axiom-419a88b7d6a8c0248c17c47a9a46b0aab0b5936f.tar.gz | |
* interp/compiler.boot (compQuote): Restrict quoting to literal
symbols.
* algebra/any.spad.pamphlet: Use nil for empty list.
* algebra/boolean.spad.pamphlet: Fix quoting.
Diffstat (limited to 'src/algebra')
| -rw-r--r-- | src/algebra/any.spad.pamphlet | 10 | ||||
| -rw-r--r-- | src/algebra/boolean.spad.pamphlet | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/algebra/any.spad.pamphlet b/src/algebra/any.spad.pamphlet index 42a50805..e0e93817 100644 --- a/src/algebra/any.spad.pamphlet +++ b/src/algebra/any.spad.pamphlet @@ -337,11 +337,12 @@ Scope(): Public == Private where Private ==> add import Contour + Rep == List Contour empty() == - '(()) + per NIL$Lisp contours s == - s pretend List(Contour) + rep s findBinding(n,s) == for c in contours s repeat @@ -394,11 +395,12 @@ Environment(): Public == Private where ++ the current category environment in the interpreter. Private ==> add + Rep == List Scope empty() == - '((())) + per NIL$Lisp scopes e == - e pretend List(Scope) + rep e getProperty(n,p,e) == v := get(n,p,e)$Lisp diff --git a/src/algebra/boolean.spad.pamphlet b/src/algebra/boolean.spad.pamphlet index b9761dcc..5ebd188d 100644 --- a/src/algebra/boolean.spad.pamphlet +++ b/src/algebra/boolean.spad.pamphlet @@ -253,7 +253,7 @@ PropositionalFormula(T: PropositionalLogic): PropositionalLogic with notFormula(p: %): OutputForm == not? p => - elt(outputForm '_not, [notFormula((rep p).'unForm)])$OutputForm + elt(outputForm '_not, [notFormula((rep p).unForm)])$OutputForm primaryFormula p andFormula(p: %): OutputForm == @@ -488,7 +488,7 @@ Boolean(): Join(OrderedSet, Finite, Logic, PropositionalLogic, ConvertibleTo Inp test a == a nt b == (b => false; true) - true == 'T + true == 'T pretend % false == NIL$Lisp sample() == true not b == (b => false; true) |