diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-06-11 19:30:07 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-06-11 19:30:07 +0000 |
| commit | fb75980589a0611aee3b8e5e25408725a5c5a531 (patch) | |
| tree | 561a8a25ed1178792b7f1112ac1276dc2684c774 /src/algebra/boolean.spad.pamphlet | |
| parent | 9d0b4c5d09c2d07feb863f500172bcc8f6f17adf (diff) | |
| download | open-axiom-fb75980589a0611aee3b8e5e25408725a5c5a531.tar.gz | |
* interp/newaux.lisp: Remove digraphs '(<' and '>) as alternate
spelling for '{' and '}'.
* interp/fnewmeta.lisp (|PARSE-Primary1|): Use PARSE-Data for
quoted forms.
(|PARSE-Sexpr1|): Tidy.
* interp/parse.boot (washOperatorName): New. Issue deprecation
diagnostics for string syntax for operator names in signatures.
(parseHas): Use it.
(transCategoryItem): Likewise.
* interp/metalex.lisp (advance-token): Likewise.
* algebra/boolean.spad.pamphlet: Tidy.
Diffstat (limited to 'src/algebra/boolean.spad.pamphlet')
| -rw-r--r-- | src/algebra/boolean.spad.pamphlet | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/algebra/boolean.spad.pamphlet b/src/algebra/boolean.spad.pamphlet index 76c3c49b..12b6ad33 100644 --- a/src/algebra/boolean.spad.pamphlet +++ b/src/algebra/boolean.spad.pamphlet @@ -92,10 +92,10 @@ PropositionalFormula(T: SetCategory): Public == Private where per [[o, l, r]$Record(op: Symbol, lhs: %, rhs: %)]$FORMULA p and q == - binaryForm('_and, p, q) + binaryForm('and, p, q) p or q == - binaryForm('_or, p, q) + binaryForm('or, p, q) implies(p,q) == binaryForm('implies, p, q) @@ -123,11 +123,11 @@ PropositionalFormula(T: SetCategory): Public == Private where nothing isAnd f == - isBinaryNode?(f,'_and) => just binaryOperands f + isBinaryNode?(f,'and) => just binaryOperands f nothing isOr f == - isBinaryNode?(f,'_or) => just binaryOperands f + isBinaryNode?(f,'or) => just binaryOperands f nothing isImplies f == @@ -195,7 +195,7 @@ PropositionalFormula(T: SetCategory): Public == Private where notFormula(p: %): OutputForm == isNot p case % => - elt(outputForm '_not, [notFormula((rep p).unForm)])$OutputForm + elt(outputForm 'not, [notFormula((rep p).unForm)])$OutputForm primaryFormula p andFormula(p: %): OutputForm == @@ -203,7 +203,7 @@ PropositionalFormula(T: SetCategory): Public == Private where p' := (rep p).binForm -- ??? idealy, we should be using `and$OutputForm' but -- ??? a bug in the compiler currently prevents that. - infix(outputForm '_and, notFormula p'.lhs, + infix(outputForm 'and, notFormula p'.lhs, andFormula p'.rhs)$OutputForm notFormula p @@ -212,7 +212,7 @@ PropositionalFormula(T: SetCategory): Public == Private where p' := (rep p).binForm -- ??? idealy, we should be using `or$OutputForm' but -- ??? a bug in the compiler currently prevents that. - infix(outputForm '_or, andFormula p'.lhs, + infix(outputForm 'or, andFormula p'.lhs, orFormula p'.rhs)$OutputForm andFormula p |