aboutsummaryrefslogtreecommitdiff
path: root/src/boot
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2009-08-17 13:34:29 +0000
committerdos-reis <gdr@axiomatics.org>2009-08-17 13:34:29 +0000
commitcd78da3860f838c41aedc3a0c475cfc8c23eaad3 (patch)
treed5ff533c51c40fcfec604902bfc78c83db950a7b /src/boot
parentf20eeee3e9937d7696cc06841f6c411a0022963e (diff)
downloadopen-axiom-cd78da3860f838c41aedc3a0c475cfc8c23eaad3.tar.gz
* boot/tokens.boot: Retire "^" as negation operator.
* interp/br-search.boot: Use "not" instead of "^". * interp/br-util.boot: Likewise. * interp/database.boot: Likewise. * interp/define.boot: Likewise. * interp/format.boot: Likewise. * interp/g-error.boot: Likewise. * interp/i-analy.boot: Likewise. * interp/i-coerce.boot: Likewise. * interp/i-coerfn.boot: Likewise. * interp/i-funsel.boot: Likewise. * interp/i-map.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/mark.boot: Likewise. * interp/modemap.boot: Likewise. * interp/pspad1.boot: Likewise. * interp/pspad2.boot: Likewise. * interp/spad-parser.boot: Likewise. * interp/trace.boot: Likewise. * interp/wi1.boot: Likewise. * interp/wi2.boot: Likewise.
Diffstat (limited to 'src/boot')
-rw-r--r--src/boot/strap/tokens.clisp15
-rw-r--r--src/boot/tokens.boot2
2 files changed, 9 insertions, 8 deletions
diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp
index 618d4f4d..9e45927d 100644
--- a/src/boot/strap/tokens.clisp
+++ b/src/boot/strap/tokens.clisp
@@ -20,13 +20,14 @@
(LIST ";" 'SEMICOLON) (LIST "*" 'TIMES) (LIST "**" 'POWER)
(LIST "/" 'SLASH) (LIST "+" 'PLUS) (LIST "-" 'MINUS)
(LIST "<" 'LT) (LIST ">" 'GT) (LIST "<=" 'LE) (LIST ">=" 'GE)
- (LIST "=" 'SHOEEQ) (LIST "^" 'NOT) (LIST "^=" 'SHOENERETIRED)
- (LIST "~=" 'SHOENE) (LIST ".." 'SEG) (LIST "#" 'LENGTH)
- (LIST "=>" 'EXIT) (LIST "->" 'ARROW) (LIST ":=" 'BEC)
- (LIST "==" 'DEF) (LIST "==>" 'MDEF) (LIST "<=>" 'TDEF)
- (LIST "(" 'OPAREN) (LIST ")" 'CPAREN) (LIST "(|" 'OBRACK)
- (LIST "|)" 'CBRACK) (LIST "[" 'OBRACK) (LIST "]" 'CBRACK)
- (LIST "suchthat" 'BAR) (LIST "'" 'QUOTE) (LIST "|" 'BAR)))
+ (LIST "=" 'SHOEEQ) (LIST "^" 'NOTRETIRED)
+ (LIST "^=" 'SHOENERETIRED) (LIST "~=" 'SHOENE)
+ (LIST ".." 'SEG) (LIST "#" 'LENGTH) (LIST "=>" 'EXIT)
+ (LIST "->" 'ARROW) (LIST ":=" 'BEC) (LIST "==" 'DEF)
+ (LIST "==>" 'MDEF) (LIST "<=>" 'TDEF) (LIST "(" 'OPAREN)
+ (LIST ")" 'CPAREN) (LIST "(|" 'OBRACK) (LIST "|)" 'CBRACK)
+ (LIST "[" 'OBRACK) (LIST "]" 'CBRACK) (LIST "suchthat" 'BAR)
+ (LIST "'" 'QUOTE) (LIST "|" 'BAR)))
(DEFUN |shoeKeyTableCons| ()
(PROG (|KeyTable|)
diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot
index 1623d61e..d03205fe 100644
--- a/src/boot/tokens.boot
+++ b/src/boot/tokens.boot
@@ -77,7 +77,7 @@ shoeKeyWords == [ _
['"<=","LE" ], _
['">=","GE" ], _
['"=", "SHOEEQ"], _
- ['"^", "NOT"], _
+ ['"^", "NOTRETIRED"], _
['"^=","SHOENERETIRED" ], _
['"~=","SHOENE" ], _
['"..","SEG" ], _