From 9be496672521ccbeb6bef0cebb563c6124fc84ca Mon Sep 17 00:00:00 2001 From: dos-reis Date: Mon, 11 May 2009 12:21:28 +0000 Subject: * interp/property.lisp: "not" is prefix operator with "not " for rendering. * interp/i-output.boot ($allClassicOps): Include not. * algebra/boolean.spad.pamphlet (PropositionalFormula): Rework. --- src/interp/i-output.boot | 4 ++-- src/interp/property.lisp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/interp') 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))) -- cgit v1.2.3