aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/boot/scanner.boot2
-rw-r--r--src/boot/strap/tokens.clisp3
-rw-r--r--src/boot/tokens.boot1
-rw-r--r--src/interp/ax.boot2
-rw-r--r--src/interp/br-con.boot2
-rw-r--r--src/interp/br-util.boot2
-rw-r--r--src/interp/compiler.boot2
-rw-r--r--src/interp/format.boot2
-rw-r--r--src/interp/g-util.boot2
-rw-r--r--src/interp/hashcode.boot8
-rw-r--r--src/interp/i-eval.boot2
-rw-r--r--src/interp/i-output.boot4
-rw-r--r--src/interp/i-syscmd.boot6
-rw-r--r--src/interp/interop.boot8
-rw-r--r--src/interp/lisplib.boot2
-rw-r--r--src/interp/newfort.boot2
16 files changed, 26 insertions, 24 deletions
diff --git a/src/boot/scanner.boot b/src/boot/scanner.boot
index f148cd84..46325a56 100644
--- a/src/boot/scanner.boot
+++ b/src/boot/scanner.boot
@@ -355,7 +355,7 @@ shoeIdEnd(line,n)==
shoeDigit x==
- DIGIT_-CHAR_-P x
+ digit? x
shoeW(b)==
n1 := $n
diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp
index 101f143d..58a9b3d7 100644
--- a/src/boot/strap/tokens.clisp
+++ b/src/boot/strap/tokens.clisp
@@ -219,7 +219,8 @@
(LIST '|and| 'AND) (LIST '|append| 'APPEND)
(LIST '|apply| 'APPLY) (LIST '|atom| 'ATOM)
(LIST '|canonicalFilename| 'PROBE-FILE)
- (LIST '|char?| 'CHARACTERP) (LIST '|cons?| 'CONSP)
+ (LIST '|char?| 'CHARACTERP)
+ (LIST '|codePoint| 'CHAR-CODE) (LIST '|cons?| 'CONSP)
(LIST '|copy| 'COPY) (LIST '|croak| 'CROAK)
(LIST '|digit?| 'DIGIT-CHAR-P) (LIST '|drop| 'DROP)
(LIST '|exit| 'EXIT) (LIST '|false| 'NIL)
diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot
index bf7cb255..c931953a 100644
--- a/src/boot/tokens.boot
+++ b/src/boot/tokens.boot
@@ -262,6 +262,7 @@ for i in [ _
["atom", "ATOM"] , _
["canonicalFilename", "PROBE-FILE"], _
["char?", "CHARACTERP"] , _
+ ["codePoint", "CHAR-CODE"], _
["cons?", "CONSP"] , _
["copy", "COPY"] , _
["croak", "CROAK"] , _
diff --git a/src/interp/ax.boot b/src/interp/ax.boot
index 294e780a..5e843b71 100644
--- a/src/interp/ax.boot
+++ b/src/interp/ax.boot
@@ -121,7 +121,7 @@ modemapToAx(modemap) ==
null args =>
['Extend, ['Define, ['Declare, constructor, resultType],
['Add, ['PretendTo, ['Add, [], []], resultType], []]]]
- conscat := INTERN(strconc(SYMBOL_-NAME(constructor), "ExtendCategory"),"BOOT")
+ conscat := INTERN(strconc(symbolName(constructor), "ExtendCategory"),"BOOT")
rtype := ['Apply, conscat, :args]
-- if resultType is ['With,a,b] then
-- if not(b is ['Sequence,:withseq]) then withseq := [b]
diff --git a/src/interp/br-con.boot b/src/interp/br-con.boot
index f0c4ad18..9c2ff3f7 100644
--- a/src/interp/br-con.boot
+++ b/src/interp/br-con.boot
@@ -1317,7 +1317,7 @@ digits2Names s ==
for i in 0..MAXINDEX s repeat
c := s.i
segment :=
- n := DIGIT_-CHAR_-P c =>
+ n := digit? c =>
('("Zero" "One" "Two" "Three" "Four" "Five" "Six" "Seven" "Eight" "Nine")).n
c
strconc(str, segment)
diff --git a/src/interp/br-util.boot b/src/interp/br-util.boot
index 27c526da..518ace12 100644
--- a/src/interp/br-util.boot
+++ b/src/interp/br-util.boot
@@ -535,7 +535,7 @@ emptySearchPage(kind,filter,:options) ==
isLoaded? conform == GETL(constructor? opOf conform,'LOADED)
string2Integer s ==
- and/[DIGIT_-CHAR_-P (s.i) for i in 0..MAXINDEX s] => readInteger s
+ and/[digit? (s.i) for i in 0..MAXINDEX s] => readInteger s
nil
dbGetInputString htPage ==
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot
index eb0146de..4a5dd20b 100644
--- a/src/interp/compiler.boot
+++ b/src/interp/compiler.boot
@@ -1338,7 +1338,7 @@ compImport(["import",:doms],m,e) ==
bootDenotation: %Symbol -> %Symbol
bootDenotation s ==
- INTERN(SYMBOL_-NAME s,"BOOTTRAN")
+ INTERN(symbolName s,"BOOTTRAN")
++ Return the Boot denotation of a basic FFI type.
getBasicFFIType: %Mode -> %Symbol
diff --git a/src/interp/format.boot b/src/interp/format.boot
index 8843a680..3f496411 100644
--- a/src/interp/format.boot
+++ b/src/interp/format.boot
@@ -729,7 +729,7 @@ pred2English x ==
form2String x
mathObject2String x ==
- CHARACTERP x => COERCE([x],'STRING)
+ char? x => COERCE([x],'STRING)
object2String x
object2String x ==
diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot
index 5a2b32ab..13b381b7 100644
--- a/src/interp/g-util.boot
+++ b/src/interp/g-util.boot
@@ -596,7 +596,7 @@ homogeneousListToVector(t,l) ==
++ tests if x is an identifier beginning with #
isSharpVar x ==
- IDENTP x and SCHAR(SYMBOL_-NAME x,0) = char "#"
+ IDENTP x and SCHAR(symbolName x,0) = char "#"
isSharpVarWithNum x ==
not isSharpVar x => nil
diff --git a/src/interp/hashcode.boot b/src/interp/hashcode.boot
index 96161cc9..1b49d977 100644
--- a/src/interp/hashcode.boot
+++ b/src/interp/hashcode.boot
@@ -48,15 +48,15 @@ hashType(type, percentHash) ==
symbol? type =>
type = '$ => percentHash
type = "%" => percentHash
- hashString SYMBOL_-NAME type
+ hashString symbolName type
string? type => hashCombine(hashString type,
hashString('"Enumeration"))
type is ['QUOTE, val] => hashType(val, percentHash)
- type is [dom] => hashString SYMBOL_-NAME dom
+ type is [dom] => hashString symbolName dom
type is ['_:, ., type2] => hashType(type2, percentHash)
isDomain type => getDomainHash type
[op, :args] := type
- hash := hashString SYMBOL_-NAME op
+ hash := hashString symbolName op
op = 'Mapping =>
hash := hashString '"->"
[retType, :mapArgs] := args
@@ -95,7 +95,7 @@ $hashModulus := 1073741789 -- largest 30-bit prime
hashString str ==
h := 0
for i in 0..#str-1 repeat
- j := CHAR_-CODE char str.i
+ j := codePoint char str.i
h := LOGXOR(h, ASH(h, 8))
h := h + j + 200041
h := LOGAND(h, 1073741823) -- 0x3FFFFFFF
diff --git a/src/interp/i-eval.boot b/src/interp/i-eval.boot
index fff7367a..05de7540 100644
--- a/src/interp/i-eval.boot
+++ b/src/interp/i-eval.boot
@@ -286,7 +286,7 @@ evalForm(op,opName,argl,mmS) ==
evalFormMkValue(op,form,targetType)
sideEffectedArg?(t,sig,opName) ==
- opString := SYMBOL_-NAME opName
+ opString := symbolName opName
(opName ~= 'setelt) and (opString.(#opString-1) ~= char '_!) => nil
dc := first sig
t = dc
diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot
index 715e688b..654b2827 100644
--- a/src/interp/i-output.boot
+++ b/src/interp/i-output.boot
@@ -2618,7 +2618,7 @@ primaryForm2String x ==
IDENTP x =>
x = "$" => '"%"
x = "$$" => '"%%"
- SYMBOL_-NAME x
+ symbolName x
atom x => toString x
strconc('"(",inputForm2String x, '")")
@@ -2644,7 +2644,7 @@ callForm2String x ==
typedForm2String(s,x,t) ==
s = "pretend" =>
strconc(callForm2String x, '" pretend ", callForm2String t)
- strconc(callForm2String x, SYMBOL_-NAME s, callForm2String t)
+ strconc(callForm2String x, symbolName s, callForm2String t)
expForm2String x ==
x is [op,lhs,rhs] and op in '(** _^) =>
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index 03f9a925..60af6ca7 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -2187,7 +2187,7 @@ dewritify ob ==
vec := dewritifyInner ob.2
name := ob.3
not FBOUNDP name =>
- error strconc('"undefined function: ", SYMBOL_-NAME name)
+ error strconc('"undefined function: ", symbolName name)
nob := [SYMBOL_-FUNCTION name,:vec]
HPUT($seen, ob, nob)
HPUT($seen, nob, nob)
@@ -2361,7 +2361,7 @@ savesystem l ==
SETQ($SpadServer,false)
SETQ($openServerIfTrue,true)
)if not %hasFeature KEYWORD::ECL
- AxiomCore::saveCore SYMBOL_-NAME first l
+ AxiomCore::saveCore symbolName first l
)else
fatalError '"don't know how to save image"
)endif
@@ -3199,7 +3199,7 @@ tokTran tok ==
isIntegerString tok ==
for i in 0..#tok-1 repeat
- val := DIGIT_-CHAR_-P tok.i
+ val := digit? tok.i
not val => return nil
val
diff --git a/src/interp/interop.boot b/src/interp/interop.boot
index 07deb159..fd146ff0 100644
--- a/src/interp/interop.boot
+++ b/src/interp/interop.boot
@@ -98,7 +98,7 @@ SExprToDName(sexpr, cosigVal) ==
[DNameStringID,: StringToCompStr '"->"],
[DNameTupleID, : rest args],
[DNameTupleID, first args]]
- name0 := [DNameStringID, : StringToCompStr SYMBOL_-NAME first sexpr]
+ name0 := [DNameStringID, : StringToCompStr symbolName first sexpr]
first sexpr = 'Union or first sexpr = 'Record =>
[DNameApplyID, name0,
[DNameTupleID,: [ SExprToDName(sx,true) for sx in rest sexpr]]]
@@ -123,7 +123,7 @@ runOldAxiomFunctor(:allArgs) ==
makeLazyOldAxiomDispatchDomain domform ==
attribute? domform =>
- [$attributeDispatch, domform, hashString(SYMBOL_-NAME domform)]
+ [$attributeDispatch, domform, hashString(symbolName domform)]
getConstructorKindFromDB opOf domform = "category" =>
[$oldAxiomPreCategoryDispatch,: domform]
dd := [$lazyOldAxiomDomainDispatch, hashTypeForm(domform,0), domform]
@@ -232,7 +232,7 @@ $oldAxiomCategoryDispatch :=
attributeDevaluate(attrObj, env) ==
[name, hash] := attrObj
- StringToCompStr SYMBOL_-NAME name
+ StringToCompStr symbolName name
attributeLookupExport(attrObj, self, op, sig, box, env) ==
[name, hash] := attrObj
@@ -353,7 +353,7 @@ basicLookupCheckDefaults(op,sig,domain,dollar) ==
hashCode? sig => sig
hashType( ['Mapping,:sig], hashPercent)
- if symbol? op then op := hashString SYMBOL_-NAME op
+ if symbol? op then op := hashString symbolName op
first SPADCALL(rest dollar, dollar, op, hashSig, box, not $lookupDefaults, lookupFun)
first SPADCALL(rest dollar, dollar, op, sig, box, not $lookupDefaults, lookupFun)
diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot
index 938df89e..2270cbaf 100644
--- a/src/interp/lisplib.boot
+++ b/src/interp/lisplib.boot
@@ -381,7 +381,7 @@ compDefineLisplib(df:=["DEF",[op,:.],:.],m,e,prefix,fal,fn) ==
FRESH_-LINE $algebraOutputStream
sayMSG fillerSpaces(72,'"-")
unloadOneConstructor(op,libName)
- LOCALDATABASE([SYMBOL_-NAME getConstructorAbbreviationFromDB op],NIL)
+ LOCALDATABASE([symbolName getConstructorAbbreviationFromDB op],NIL)
$newConlist := [op, :$newConlist] ----------> bound in function "compiler"
res
diff --git a/src/interp/newfort.boot b/src/interp/newfort.boot
index c6b7590c..4280503c 100644
--- a/src/interp/newfort.boot
+++ b/src/interp/newfort.boot
@@ -851,7 +851,7 @@ isFloat e ==
checkPrecision e ==
-- Do we have a string?
- string?(e) and CHAR_-CODE(CHAR(e,0)) = 34 => e
+ string?(e) and codePoint CHAR(e,0) = 34 => e
e := delete(char " ",STRINGIMAGE e)
$fortranPrecision = "double" =>
iPart := SUBSEQ(e,0,(period:=POSITION(char ".",e))+1)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 17:07:14 +0000