diff options
Diffstat (limited to 'src/boot/strap')
-rw-r--r-- | src/boot/strap/ast.clisp | 11 | ||||
-rw-r--r-- | src/boot/strap/tokens.clisp | 18 |
2 files changed, 17 insertions, 12 deletions
diff --git a/src/boot/strap/ast.clisp b/src/boot/strap/ast.clisp index bd54f16f..01cde61b 100644 --- a/src/boot/strap/ast.clisp +++ b/src/boot/strap/ast.clisp @@ -2964,17 +2964,22 @@ (SETQ |unstableArgs| (CONS |a| |unstableArgs|))))))) (SETQ |bfVar#174| (CDR |bfVar#174|)) (SETQ |bfVar#175| (CDR |bfVar#175|)))) + (SETQ |op'| + (COND + ((|%hasFeature| :WIN32) + (CONCAT "_" (SYMBOL-NAME |op'|))) + (#1='T (SYMBOL-NAME |op'|)))) (COND ((NULL |unstableArgs|) (LIST (LIST 'DEFUN |op| |args| (CONS (INTERN "ALIEN-FUNCALL" "SB-ALIEN") (CONS (LIST (INTERN "EXTERN-ALIEN" "SB-ALIEN") - (SYMBOL-NAME |op'|) + |op'| (CONS 'FUNCTION (CONS |rettype| |argtypes|))) |args|))))) - ('T + (#1# (LIST (LIST 'DEFUN |op| |args| (LIST (|bfColonColon| 'SB-SYS 'WITH-PINNED-OBJECTS) @@ -2983,7 +2988,7 @@ (CONS (LIST (INTERN "EXTERN-ALIEN" "SB-ALIEN") - (SYMBOL-NAME |op'|) + |op'| (CONS 'FUNCTION (CONS |rettype| |argtypes|))) (NREVERSE |newArgs|)))))))))))) diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp index 75e3f3f5..618d4f4d 100644 --- a/src/boot/strap/tokens.clisp +++ b/src/boot/strap/tokens.clisp @@ -20,13 +20,13 @@ (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 "^=" '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 "^" '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))) (DEFUN |shoeKeyTableCons| () (PROG (|KeyTable|) @@ -169,7 +169,7 @@ (LIST 'OR '|or|) (LIST 'SLASH '/) (LIST 'POWER '**) (LIST 'MINUS '-) (LIST 'LT '<) (LIST 'GT '>) (LIST 'LE '<=) - (LIST 'GE '>=) (LIST 'SHOENE '^=))) + (LIST 'GE '>=) (LIST 'SHOENE '~=))) (|i| NIL)) (LOOP (COND @@ -204,7 +204,7 @@ (LIST '|cons| 'CONS) (LIST '|copy| 'COPY) (LIST '|croak| 'CROAK) (LIST '|drop| 'DROP) (LIST '|exit| 'EXIT) (LIST '|false| 'NIL) - (LIST '|first| 'CAR) + (LIST '|first| 'CAR) (LIST '|fourth| 'CADDDR) (LIST '|function| 'FUNCTION) (LIST '|genvar| 'GENVAR) (LIST 'IN 'MEMBER) (LIST '|is| 'IS) (LIST '|isnt| 'ISNT) |