diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-08-05 20:27:43 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-08-05 20:27:43 +0000 |
| commit | ec54e41af6a45f9e5399dc30672f67ba8ef19cde (patch) | |
| tree | 3d9b895167d6280eca2935fde37d527ec89b204f /src | |
| parent | 207c5a13c6987ad88975c35006d16c74d0e58e1a (diff) | |
| download | open-axiom-ec54e41af6a45f9e5399dc30672f67ba8ef19cde.tar.gz | |
* boot/tokens.boot: Remove unused and antiquated tokens.
* interp/i-output.boot: Escape caret.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/boot/strap/tokens.clisp | 14 | ||||
| -rw-r--r-- | src/boot/tokens.boot | 5 | ||||
| -rw-r--r-- | src/interp/i-output.boot | 8 |
4 files changed, 15 insertions, 17 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7d236371..2cf0c419 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2011-08-05 Gabriel Dos Reis <gdr@cs.tamu.edu> + * boot/tokens.boot: Remove unused and antiquated tokens. + * interp/i-output.boot: Escape caret. + +2011-08-05 Gabriel Dos Reis <gdr@cs.tamu.edu> + * algebra/boolean.spad.pamphlet (Boolean) [test]: Remove. 2011-08-04 Gabriel Dos Reis <gdr@cs.tamu.edu> 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"] ] diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot index 1231614b..53949ca0 100644 --- a/src/interp/i-output.boot +++ b/src/interp/i-output.boot @@ -319,10 +319,10 @@ for x in '((+ APP plusApp) (** WIDTH exptWidth) (** SUBSPAN exptSub) (** SUPERSPAN exptSuper) - (^ APP exptApp) - (^ WIDTH exptWidth) - (^ SUBSPAN exptSub) - (^ SUPERSPAN exptSuper) + (_^ APP exptApp) + (_^ WIDTH exptWidth) + (_^ SUBSPAN exptSub) + (_^ SUPERSPAN exptSuper) (STEP APP stepApp) (STEP WIDTH stepWidth) (STEP SUBSPAN stepSub) |