aboutsummaryrefslogtreecommitdiff
path: root/src/boot
diff options
context:
space:
mode:
Diffstat (limited to 'src/boot')
-rw-r--r--src/boot/ast.boot8
-rw-r--r--src/boot/includer.boot4
-rw-r--r--src/boot/scanner.boot4
-rw-r--r--src/boot/strap/ast.clisp11
-rw-r--r--src/boot/strap/tokens.clisp18
-rw-r--r--src/boot/tokens.boot5
-rw-r--r--src/boot/translator.boot6
7 files changed, 31 insertions, 25 deletions
diff --git a/src/boot/ast.boot b/src/boot/ast.boot
index 95d7cbc5..8fe59706 100644
--- a/src/boot/ast.boot
+++ b/src/boot/ast.boot
@@ -756,7 +756,7 @@ bfReName x==
x
$translatingOldBoot and not bfSameMeaning x =>
oldName := bfGetOldBootName x
- if newName ^= oldName then
+ if newName ~= oldName then
warn [PNAME x, '" as `", PNAME newName, _
'"_' differs from Old Boot `", PNAME oldName,_
'"_' at ", diagnosticLocation $stok]
@@ -1192,7 +1192,7 @@ bfCI(g,x,y)==
if null a
then [first x,y]
else
- b:=[[i,bfCARCDR(j,g)] for i in a for j in 0.. | i ^= "DOT"]
+ b:=[[i,bfCARCDR(j,g)] for i in a for j in 0.. | i ~= "DOT"]
null b => [first x,y]
[first x,["LET",b,y]]
@@ -1419,7 +1419,7 @@ nativeArgumentType t ==
-- Allow 'string' for `pass-by-value'
t = "string" => nativeType t
-- anything else must use a modified reference type.
- atom t or #t ^= 2 =>
+ atom t or #t ~= 2 =>
coreError '"invalid argument type for a native function"
[m,[c,t']] := t
-- Require a modifier.
@@ -1469,7 +1469,7 @@ genGCLnativeTranslation(op,s,t,op') ==
ccode :=
"strconc"/[gclTypeInC t, '" ", cop, '"(",
:[cparm(x,a) for x in tails s for a in tails cargs],
- '") { ", (t ^= "void" => '"return "; ""),
+ '") { ", (t ~= "void" => '"return "; ""),
SYMBOL_-NAME op', '"(",
:[gclArgsInC(x,a) for x in tails s for a in tails cargs],
'"); }" ]
diff --git a/src/boot/includer.boot b/src/boot/includer.boot
index 481f099c..86f3a648 100644
--- a/src/boot/includer.boot
+++ b/src/boot/includer.boot
@@ -1,6 +1,6 @@
-- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
-- All rights reserved.
--- Copyright (C) 2007-2008, Gabriel Dos Reis.
+-- Copyright (C) 2007-2009, Gabriel Dos Reis.
-- All rights reserved.
--
-- Redistribution and use in source and binary forms, with or without
@@ -285,7 +285,7 @@ shoePrefix?(prefix,whole) ==
shoePlainLine?(s) ==
#s = 0 => true
- s.0 ^= char ")"
+ s.0 ~= char ")"
shoeSay? s == shoePrefix?('")say", s)
shoeEval? s == shoePrefix?('")eval", s)
diff --git a/src/boot/scanner.boot b/src/boot/scanner.boot
index 5e939d99..8872c9df 100644
--- a/src/boot/scanner.boot
+++ b/src/boot/scanner.boot
@@ -389,7 +389,7 @@ shoeW(b)==
$n:=$n+1
l:=$sz
endid:=shoeIdEnd($ln,$n)
- if endid=l or QENUM($ln,endid)^=shoeESCAPE
+ if endid=l or QENUM($ln,endid)~=shoeESCAPE
then
$n:=endid
[b,SUBSTRING($ln,n1,endid-n1)]
@@ -421,7 +421,7 @@ shoeInteger1(zro) ==
n:=$n
l:= $sz
while $n<l and shoeDigit($ln.$n) repeat $n:=$n+1
- if $n=l or QENUM($ln,$n)^=shoeESCAPE
+ if $n=l or QENUM($ln,$n)~=shoeESCAPE
then if n=$n and zro
then '"0"
else SUBSTRING($ln,n,$n-n)
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)
diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot
index a51fe58b..1623d61e 100644
--- a/src/boot/tokens.boot
+++ b/src/boot/tokens.boot
@@ -78,7 +78,8 @@ shoeKeyWords == [ _
['">=","GE" ], _
['"=", "SHOEEQ"], _
['"^", "NOT"], _
- ['"^=","SHOENE" ], _
+ ['"^=","SHOENERETIRED" ], _
+ ['"~=","SHOENE" ], _
['"..","SEG" ], _
['"#", "LENGTH"], _
['"=>","EXIT" ], _
@@ -194,7 +195,7 @@ for i in [ _
["GT" ,">"], _
["LE" ,"<="], _
["GE" ,">="], _
- ["SHOENE" ,"^="] _
+ ["SHOENE" ,"~="] _
]_
repeat SETF (GET(first i,'SHOEINF),second i)
diff --git a/src/boot/translator.boot b/src/boot/translator.boot
index 50574ee5..c3e50f44 100644
--- a/src/boot/translator.boot
+++ b/src/boot/translator.boot
@@ -427,7 +427,7 @@ translateToplevel(b,export?) ==
:[first translateToplevel(d,true) for d in ds]]
Import(m) =>
- if getOptionValue "import" ^= '"skip" then
+ if getOptionValue "import" ~= '"skip" then
bootImport STRING m
[["IMPORT-MODULE", STRING m]]
@@ -755,7 +755,7 @@ defaultBootToLispFile file ==
getIntermediateLispFile(file,options) ==
out := NAMESTRING getOutputPathname(options)
- out ^= nil =>
+ out ~= nil =>
strconc(shoeRemoveStringIfNec
(strconc('".",$effectiveFaslType),out),'".clisp")
defaultBootToLispFile file
@@ -766,7 +766,7 @@ translateBootFile(progname, options, file) ==
compileBootHandler(progname, options, file) ==
intFile := BOOTTOCL(file, getIntermediateLispFile(file,options))
- errorCount() ^= 0 => nil
+ errorCount() ~= 0 => nil
intFile =>
objFile := compileLispHandler(progname, options, intFile)
DELETE_-FILE intFile
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-08 15:45:54 +0000