From ec54e41af6a45f9e5399dc30672f67ba8ef19cde Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Fri, 5 Aug 2011 20:27:43 +0000
Subject: 	* boot/tokens.boot: Remove unused and antiquated tokens. 
 * interp/i-output.boot: Escape caret.

---
 src/boot/strap/tokens.clisp | 14 ++++++--------
 src/boot/tokens.boot        |  5 -----
 2 files changed, 6 insertions(+), 13 deletions(-)

(limited to 'src/boot')

diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp
index 49017e4f..edc5b20a 100644
--- a/src/boot/strap/tokens.clisp
+++ b/src/boot/strap/tokens.clisp
@@ -45,14 +45,12 @@
           (LIST ";" 'SEMICOLON) (LIST "*" 'TIMES) (LIST "**" 'POWER)
           (LIST "/" 'SLASH) (LIST "+" 'PLUS) (LIST "-" 'MINUS)
           (LIST "<" 'LT) (LIST ">" 'GT) (LIST "<=" 'LE) (LIST ">=" 'GE)
-          (LIST "=" 'SHOEEQ) (LIST "^" 'NOTRETIRED)
-          (LIST "^=" 'SHOENERETIRED) (LIST "~=" 'SHOENE)
-          (LIST ".." 'SEG) (LIST "#" 'LENGTH) (LIST "=>" 'EXIT)
-          (LIST "->" 'ARROW) (LIST ":=" 'BEC) (LIST "+->" 'GIVES)
-          (LIST "==" 'DEF) (LIST "<=>" 'TDEF) (LIST "(" 'OPAREN)
-          (LIST ")" 'CPAREN) (LIST "(|" 'OBRACK) (LIST "|)" 'CBRACK)
-          (LIST "[" 'OBRACK) (LIST "]" 'CBRACK) (LIST "suchthat" 'BAR)
-          (LIST "'" 'QUOTE) (LIST "|" 'BAR)))
+          (LIST "=" 'SHOEEQ) (LIST "~=" 'SHOENE) (LIST ".." 'SEG)
+          (LIST "#" 'LENGTH) (LIST "=>" 'EXIT) (LIST "->" 'ARROW)
+          (LIST ":=" 'BEC) (LIST "+->" 'GIVES) (LIST "==" 'DEF)
+          (LIST "<=>" 'TDEF) (LIST "(" 'OPAREN) (LIST ")" 'CPAREN)
+          (LIST "[" 'OBRACK) (LIST "]" 'CBRACK) (LIST "'" 'QUOTE)
+          (LIST "|" 'BAR)))
 
 (DEFUN |shoeKeyTableCons| ()
   (PROG (|KeyTable|)
diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot
index bc66db93..cf2b05c9 100644
--- a/src/boot/tokens.boot
+++ b/src/boot/tokens.boot
@@ -105,8 +105,6 @@ shoeKeyWords == [  _
             ['"<=","LE" ], _
             ['">=","GE" ], _
             ['"=", "SHOEEQ"], _
-            ['"^", "NOTRETIRED"], _
-            ['"^=","SHOENERETIRED" ], _
             ['"~=","SHOENE" ], _
             ['"..","SEG" ], _
             ['"#", "LENGTH"], _
@@ -118,11 +116,8 @@ shoeKeyWords == [  _
             ['"<=>", "TDEF"], _
             ['"(", "OPAREN"], _
             ['")", "CPAREN"], _
-            ['"(|", "OBRACK"], _
-            ['"|)", "CBRACK"], _
             ['"[", "OBRACK"], _
             ['"]", "CBRACK"], _
-            ['"suchthat","BAR"], _
             ['"'", "QUOTE"], _
             ['"|", "BAR"]                          ]
  
-- 
cgit v1.2.3