diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-05-11 12:21:28 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-05-11 12:21:28 +0000 |
| commit | 9be496672521ccbeb6bef0cebb563c6124fc84ca (patch) | |
| tree | 8a13ce0a685493de7e7536e30271bee7648649dd /src/interp | |
| parent | d3eeff8c0c553fd276f475590b2967bf388bdbed (diff) | |
| download | open-axiom-9be496672521ccbeb6bef0cebb563c6124fc84ca.tar.gz | |
* interp/property.lisp: "not" is prefix operator with "not " for
rendering.
* interp/i-output.boot ($allClassicOps): Include not.
* algebra/boolean.spad.pamphlet (PropositionalFormula): Rework.
Diffstat (limited to 'src/interp')
| -rw-r--r-- | src/interp/i-output.boot | 4 | ||||
| -rw-r--r-- | src/interp/property.lisp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot index 41dacca2..ca24779d 100644 --- a/src/interp/i-output.boot +++ b/src/interp/i-output.boot @@ -2592,10 +2592,10 @@ maPrin u == --% Rendering of InputForm $allClassicOps == - ["~","#","**","^","*","/","rem","quo","+","-","@","::", "pretend"] + ["~","#","not","**","^","*","/","rem","quo","+","-","@","::", "pretend"] isUnaryPrefix op == - op in '(_~ _# _-) + op in '(_~ _# _- _not) primaryForm2String x == x = nil => '"" diff --git a/src/interp/property.lisp b/src/interp/property.lisp index 62e93bf3..1a8a2323 100644 --- a/src/interp/property.lisp +++ b/src/interp/property.lisp @@ -112,7 +112,7 @@ (REPEAT (IN X '( (= "=") (|:| ":") - (|not| "^ ") + (|not| "not ") (\| " \| ") (SEGMENT "..") ;" 0.. is represented by (SEGMENT 0)" )) (MAKEPROP (CAR X) 'PREFIXOP (CADR X))) |