aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/interp/as.boot2
-rw-r--r--src/interp/category.boot2
-rw-r--r--src/interp/fortcall.boot4
-rw-r--r--src/interp/functor.boot12
-rw-r--r--src/interp/g-opt.boot2
-rw-r--r--src/interp/g-util.boot4
-rw-r--r--src/interp/i-analy.boot4
-rw-r--r--src/interp/i-funsel.boot4
-rw-r--r--src/interp/i-output.boot6
-rw-r--r--src/interp/i-syscmd.boot4
-rw-r--r--src/interp/info.boot2
-rw-r--r--src/interp/int-top.boot2
-rw-r--r--src/interp/interop.boot4
-rw-r--r--src/interp/mark.boot8
-rw-r--r--src/interp/msgdb.boot4
-rw-r--r--src/interp/newfort.boot14
-rw-r--r--src/interp/nrunopt.boot2
-rw-r--r--src/interp/pf2atree.boot2
-rw-r--r--src/interp/pf2sex.boot2
-rw-r--r--src/interp/posit.boot2
-rw-r--r--src/interp/pspad2.boot2
-rw-r--r--src/interp/server.boot2
-rw-r--r--src/interp/slam.boot2
-rw-r--r--src/interp/sys-os.boot2
-rw-r--r--src/interp/wi2.boot2
25 files changed, 48 insertions, 48 deletions
diff --git a/src/interp/as.boot b/src/interp/as.boot
index 1473192c..fef01d2e 100644
--- a/src/interp/as.boot
+++ b/src/interp/as.boot
@@ -956,7 +956,7 @@ asyCATEGORY x ==
cats := r
operations := ops
exportPart :=
- ['CATEGORY,'domain,:"APPEND"/[asyCatItem y for y in operations]]
+ ['CATEGORY,'domain,:append/[asyCatItem y for y in operations]]
[attribs, na] := asyFindAttrs joins
joins := na
cats := "append"/[asyCattran c for c in cats]
diff --git a/src/interp/category.boot b/src/interp/category.boot
index 85084b2b..beabe110 100644
--- a/src/interp/category.boot
+++ b/src/interp/category.boot
@@ -420,7 +420,7 @@ JoinInner(l,$e) ==
for u in rest pred | not member(u,get("$Information","special",$e))
and not (u=true)]
null pred' => l:= [:l,CatEval at2]
- LENGTH pred'=1 => CondList:= [[CatEval at2,pred'],:CondList]
+ # pred'=1 => CondList:= [[CatEval at2,pred'],:CondList]
CondList:= [[CatEval at2,["and",:pred']],:CondList]
[$NewCatVec,:l]:= l
l':= [:CondList,:[[u,true] for u in l]]
diff --git a/src/interp/fortcall.boot b/src/interp/fortcall.boot
index 1071470e..cde953fc 100644
--- a/src/interp/fortcall.boot
+++ b/src/interp/fortcall.boot
@@ -648,7 +648,7 @@ writeData(tmpFile,indata) ==
for i in 0..rows-1 repeat xdrWrite(xstr,v.i)
-- this is used for lists of booleans apparently in f01
LISTP v =>
- xdrWrite(xstr,LENGTH v)
+ xdrWrite(xstr,# v)
for el in v repeat
if el then xdrWrite(xstr,1) else xdrWrite(xstr,0)
-- integers
@@ -667,7 +667,7 @@ readData(tmpFile,results) ==
xstr := xdrOpen(str,false)
results := [xdrRead1(xstr,r) for r in results] where
xdrRead1(x,dummy) ==
- VECTORP(dummy) and ZEROP(LENGTH dummy) => dummy
+ VECTORP(dummy) and ZEROP(# dummy) => dummy
xdrRead(x,dummy)
SHUT(str)
results
diff --git a/src/interp/functor.boot b/src/interp/functor.boot
index 4e747b44..aabc7ec2 100644
--- a/src/interp/functor.boot
+++ b/src/interp/functor.boot
@@ -296,7 +296,7 @@ worthlessCode x ==
cons5(p,l) ==
l and (CAAR l = first p) => [p,: rest l]
- LENGTH l < 5 => [p,:l]
+ # l < 5 => [p,:l]
RPLACD(QCDDDDR l,nil)
[p,:l]
@@ -434,7 +434,7 @@ setVector4Onecat(name,instantiator,info) ==
u:= ['QUOTE,[cat,:first eval(cat).4]]
['COND,[TryGDC cond,['SETQ,'TrueDomain,['CONS,['CONS,u,name],
'TrueDomain]]]]
- LENGTH slist=1 => [CADAR slist]
+ # slist=1 => [CADAR slist]
--return a list, since it is CONSed
slist:= ['PROGN,:slist]
[['(QUOTE T),slist]]
@@ -781,7 +781,7 @@ InvestigateConditions catvecListMaker ==
--newS is a list of secondaries and conditions (over and above
--u) for which they apply
u:=
- LENGTH u=1 => first u
+ # u=1 => first u
['AND,:u]
for [v,:.] in newS repeat
for v' in [v,:first CatEval(v).4] repeat
@@ -823,14 +823,14 @@ ICformat u ==
u is ['AND,:l] or u is ['and,:l] =>
l:= removeDuplicates [ICformat v for [v,:l'] in tails l | not member(v,l')]
-- we could have duplicates after, even if not before
- LENGTH l=1 => first l
+ # l=1 => first l
l1:= first l
for u in rest l repeat
l1:=mkAnd(u,l1)
l1
u is ['OR,:l] =>
(l:= ORreduce l)
- LENGTH l=1 => ICformat first l
+ # l=1 => ICformat first l
l:= ORreduce removeDuplicates [ICformat u for u in l]
--causes multiple ANDs to be squashed, etc.
-- and duplicates that have been built up by tidying
@@ -850,7 +850,7 @@ ICformat u ==
cond2]] repeat if DescendantP(cond,cond2) then l:= delete(u,l)
--v subsumes u
l
- LENGTH l=1 => first l
+ # l=1 => first l
['OR,:l]
systemErrorHere ["ICformat",u]
where
diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot
index 00b6e5a4..65368f84 100644
--- a/src/interp/g-opt.boot
+++ b/src/interp/g-opt.boot
@@ -106,7 +106,7 @@ optimize x ==
y is [["XLAM",argl,body],:a] =>
optimize rest x
argl = "ignore" => x.first := body
- if not (LENGTH argl<=LENGTH a) then
+ if not (# argl<= # a) then
SAY '"length mismatch in XLAM expression"
PRETTYPRINT y
x.first := optimize optXLAMCond SUBLIS(pairList(argl,a),body)
diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot
index f2ddb1b8..fbbab606 100644
--- a/src/interp/g-util.boot
+++ b/src/interp/g-util.boot
@@ -554,10 +554,10 @@ update() ==
listSort(pred,list,:optional) ==
NOT functionp pred => error "listSort: first arg must be a function"
NOT LISTP list => error "listSort: second argument must be a list"
- null optional => mergeSort(pred,function Identity,list,LENGTH list)
+ null optional => mergeSort(pred,function Identity,list,# list)
key := first optional
NOT functionp key => error "listSort: last arg must be a function"
- mergeSort(pred,key,list,LENGTH list)
+ mergeSort(pred,key,list,# list)
-- non-destructive merge sort using NOT GGREATERP as predicate
MSORT list == listSort(function GLESSEQP, COPY_-LIST list)
diff --git a/src/interp/i-analy.boot b/src/interp/i-analy.boot
index de533d43..b42551f3 100644
--- a/src/interp/i-analy.boot
+++ b/src/interp/i-analy.boot
@@ -124,7 +124,7 @@ pushDownTargetInfo(op,target,arglist) ==
-- put target info on args for certain operations
target = $OutputForm => NIL
target = $Any => NIL
- n := LENGTH arglist
+ n := # arglist
pushDownOnArithmeticVariables(op,target,arglist)
(pdArgs := pushDownOp?(op,n)) =>
for i in pdArgs repeat
@@ -192,7 +192,7 @@ pushDownOp?(op,n) ==
-- sameAsTarg is a vector that counts the number of modemaps that
-- have the corresponding argument equal to the target type
sameAsTarg := GETZEROVEC n
- numMms := LENGTH ops
+ numMms := # ops
for [.,targ,:argl] in ops repeat
for arg in argl for i in 0.. repeat
targ = arg => setShellEntry(sameAsTarg,i,1 + sameAsTarg.i)
diff --git a/src/interp/i-funsel.boot b/src/interp/i-funsel.boot
index 345b67f9..68cafbdb 100644
--- a/src/interp/i-funsel.boot
+++ b/src/interp/i-funsel.boot
@@ -1639,8 +1639,8 @@ unifyStruct(s1,s2,SL) ==
s1=s2 => SL
if s1 is [":",x,.] then s1:= x
if s2 is [":",x,.] then s2:= x
- if not atom s1 and first s1 = '_# then s1:= LENGTH second s1
- if not atom s2 and first s2 = '_# then s2:= LENGTH second s2
+ if not atom s1 and first s1 = '_# then s1:= # second s1
+ if not atom s2 and first s2 = '_# then s2:= # second s2
s1=s2 => SL
isPatternVar s1 => unifyStructVar(s1,s2,SL)
isPatternVar s2 => unifyStructVar(s2,s1,SL)
diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot
index a0bb9991..57d041ef 100644
--- a/src/interp/i-output.boot
+++ b/src/interp/i-output.boot
@@ -2280,7 +2280,7 @@ matSub(x) ==
matWidth(x) ==
y := CDDR x -- list of rows, each of form ((ROW . w) element element ...)
- numOfColumns := LENGTH CDAR y
+ numOfColumns := # CDAR y
widthList := matLSum2 matWList(y, NLIST(numOfColumns, 0))
--returns ["max width of entries in column i" for i in 1..numberOfRows]
subspanList := matLSum matSubList y
@@ -2289,10 +2289,10 @@ matWidth(x) ==
CAAR x.1
matLSum(x) ==
- [sumoverlist x + LENGTH x,:x]
+ [sumoverlist x + # x,:x]
matLSum2(x) ==
- [sumoverlist x + 2*(LENGTH x),:x]
+ [sumoverlist x + 2*(# x),:x]
matWList(x, y) ==
null x => y
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index 0c0df310..90c4073d 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -1655,7 +1655,7 @@ setHistoryCore inCore ==
$internalHistoryTable := NIL
if $IOindex ~= 0 then
-- actually put something in there
- l := LENGTH RKEYIDS histFileName()
+ l := # RKEYIDS histFileName()
for i in 1..l repeat
vec:= UNWIND_-PROTECT(readHiFi(i),disableHist())
$internalHistoryTable := [[i,:vec],:$internalHistoryTable]
@@ -1875,7 +1875,7 @@ restoreHistory(fn) ==
histFileErase curfile
_$FCOPY(restfile,curfile)
- l:= LENGTH RKEYIDS curfile
+ l:= # RKEYIDS curfile
$HiFiAccess:= true
oldInternal := $useInternalHistoryTable
$useInternalHistoryTable := NIL
diff --git a/src/interp/info.boot b/src/interp/info.boot
index 2e168e03..15d0bb08 100644
--- a/src/interp/info.boot
+++ b/src/interp/info.boot
@@ -133,7 +133,7 @@ chaseInferences(pred,$e) ==
ante is ["and",:ante'] and member(pred,ante') =>
ante':= delete(pred,ante')
v':=
- LENGTH ante'=1 => first ante'
+ # ante'=1 => first ante'
["and",:ante']
v':= ["COND",[v',:conseq]]
member(v',get("$Information","special",$e)) => nil
diff --git a/src/interp/int-top.boot b/src/interp/int-top.boot
index 67242955..db0257b2 100644
--- a/src/interp/int-top.boot
+++ b/src/interp/int-top.boot
@@ -164,7 +164,7 @@ intloopReadConsole(b, n)==
not $leanMode and printPrompt()
intloopReadConsole('"", c)
a:=strconc(b,a)
- ncloopEscaped a => intloopReadConsole(SUBSEQ(a, 0, (LENGTH a) - 1),n)
+ ncloopEscaped a => intloopReadConsole(SUBSEQ(a, 0, (# a) - 1),n)
c := intloopProcessString(a, n)
not $leanMode and printPrompt()
intloopReadConsole('"", c)
diff --git a/src/interp/interop.boot b/src/interp/interop.boot
index 4e94b750..e8da2cd9 100644
--- a/src/interp/interop.boot
+++ b/src/interp/interop.boot
@@ -111,7 +111,7 @@ StringToCompStr(str) ==
strconc(str, STRING (CODE_-CHAR 0))
CompStrToString(str) ==
- SUBSTRING(str, 0, (LENGTH str - 1))
+ SUBSTRING(str, 0, (# str - 1))
-- local garbage ends
runOldAxiomFunctor(:allArgs) ==
@@ -208,7 +208,7 @@ oldAxiomCategoryLookupExport(catenv, self, op, sig, box, env) ==
fun := basicLookup(op, sig, pack, self) => [fun]
nil
-oldAxiomCategoryParentCount([.,.,.,parents,.], env) == LENGTH parents
+oldAxiomCategoryParentCount([.,.,.,parents,.], env) == # parents
oldAxiomCategoryNthParent([.,.,.,parvec,dom], n, env) ==
catform := parvec.(n-1)
VECTORP KAR catform => catform
diff --git a/src/interp/mark.boot b/src/interp/mark.boot
index 6c0c26a2..6c5c5f0e 100644
--- a/src/interp/mark.boot
+++ b/src/interp/mark.boot
@@ -683,8 +683,8 @@ markPaths(x,y,s) == --x < y; find location s of x in y (initially s=nil)
-- markCons(p,s)
y is ["%Call",:r] => markPaths(x,r,s) --for loops
y is [fn,m,y1] and fn in '(PART CATCH THROW) => markPaths(x,y1,s) or
- "APPEND"/[markPaths(x,u,markCons(i,s)) for u in y1 for i in 0..]
- "APPEND"/[markPaths(x,u,markCons(i,s)) for u in y for i in 0..]
+ append/[markPaths(x,u,markCons(i,s)) for u in y1 for i in 0..]
+ append/[markPaths(x,u,markCons(i,s)) for u in y for i in 0..]
mymy x == x
@@ -1337,7 +1337,7 @@ diff1(x,y) ==
x = y => nil
atom x or atom y => [[x,y]]
#x ~= #y => [x,y]
- "APPEND"/[diff1(u,v) for u in x for v in y]
+ append/[diff1(u,v) for u in x for v in y]
markConstructorForm name == --------> same as getConstructorForm
name = 'Union => '(Union (_: a A) (_: b B))
@@ -1399,7 +1399,7 @@ mkPaths(x,y) == --x < y; find location s of x in y (initially s=nil)
y is [['elt,.,op],:r] and (u := mkPaths(x,[op,:r])) => u
x is ['elt,:r] and (u := mkPaths(r,y)) => u
y is ['elt,:r] and (u := mkPaths(x,r)) => u
- "APPEND"/[u for z in y | u := mkPaths(x,z)]
+ append/[u for z in y | u := mkPaths(x,z)]
getLocationsOf(u,y,s) == [getLocOf(x,y,s) for x in u]
diff --git a/src/interp/msgdb.boot b/src/interp/msgdb.boot
index 8df46589..446ccd09 100644
--- a/src/interp/msgdb.boot
+++ b/src/interp/msgdb.boot
@@ -207,7 +207,7 @@ substituteSegmentedMsg(msg,args) ==
--end of the list. (using %n and %y)
l :=
cons?(arg) =>
- MEMQ(char 'y,q) or (first arg = '"%y") or ((LENGTH arg) = 1) =>
+ MEMQ(char 'y,q) or (first arg = '"%y") or ((# arg) = 1) =>
append(reverse arg, l)
head := first arg
tail := rest arg
@@ -227,7 +227,7 @@ addBlanks msg ==
-- adds proper blanks
atom msg => msg
null msg => msg
- LENGTH msg = 1 => msg
+ # msg = 1 => msg
blanksOff := false
x := first msg
if x = '"%n" then
diff --git a/src/interp/newfort.boot b/src/interp/newfort.boot
index 03e3695c..c42e63cd 100644
--- a/src/interp/newfort.boot
+++ b/src/interp/newfort.boot
@@ -656,7 +656,7 @@ fortFormatHead(returnType,name,args) ==
changeExprLength(l := -11)
else
asp := [s := checkType STRINGIMAGE returnType,'" FUNCTION "]
- changeExprLength(l := -10-LENGTH(s))
+ changeExprLength(l := -10-#(s))
displayLines fortran2Lines [:asp,:statement2Fortran [name,:CDADR args] ]
changeExprLength(-l)
@@ -676,7 +676,7 @@ mkParameterList l ==
:rest [:['",",:statement2Fortran(v)] for v in rest u],'")"])
nameLen n ==>
- +/[1+LENGTH(u) for u in n]
+ +/[1+#(u) for u in n]
fortFormatTypes(typeName,names) ==
null names => return nil
@@ -692,11 +692,11 @@ fortFormatTypes(typeName,names) ==
fortFormatTypes1(typeName,mkParameterList names)
fortFormatTypes1(typeName,names) ==
- l := $maximumFortranExpressionLength-1-LENGTH(typeName)
+ l := $maximumFortranExpressionLength-1-#(typeName)
while nameLen(names) > l repeat
n := []
ln := 0
- while (ln := ln + LENGTH(first names) + 1) < l repeat
+ while (ln := ln + #(first names) + 1) < l repeat
n := [first names,:n]
names := rest names
displayLines fortran2Lines [typeName,'" ",:addCommas n]
@@ -858,7 +858,7 @@ checkPrecision e ==
expt := if ePos := POSITION(char "E",e) then SUBSEQ(e,ePos+1) else "0"
rPart :=
ePos => SUBSEQ(e,period+1,ePos)
- period+1 < LENGTH e => SUBSEQ(e,period+1)
+ period+1 < # e => SUBSEQ(e,period+1)
"0"
strconc(iPart,rPart,"D",expt)
e
@@ -874,7 +874,7 @@ fortExpSize e ==
-- This function overestimates the size because it assumes that e.g.
-- (+ x (+ y z)) will be printed as "x+(y+z)" rather than "x+y+z"
-- which is the actual case.
- atom e => LENGTH STRINGIMAGE e
+ atom e => # STRINGIMAGE e
#e > 3 => 2+fortSize MAPCAR(function fortExpSize, e)
#e < 3 => 2+fortSize MAPCAR(function fortExpSize, e)
[op,arg1,arg2] := e
@@ -895,7 +895,7 @@ fortSize e ==
atom z => z
first z
-tempLen () == 1 + LENGTH STRINGIMAGE $exp2FortTempVarIndex
+tempLen () == 1 + # STRINGIMAGE $exp2FortTempVarIndex
segment l ==
not $fortranSegment => l
diff --git a/src/interp/nrunopt.boot b/src/interp/nrunopt.boot
index ef33f475..c373e219 100644
--- a/src/interp/nrunopt.boot
+++ b/src/interp/nrunopt.boot
@@ -80,7 +80,7 @@ makeGoGetSlot(item,index) ==
--=======================================================================
--> called by getInfovecCode (see top of this file) from compDefineFunctor1
makeCompactDirect u ==
- $predListLength :local := LENGTH $NRTslot1PredicateList
+ $predListLength :local := # $NRTslot1PredicateList
$byteVecAcc: local := nil
[nam,[addForm,:opList]] := u
--pp opList
diff --git a/src/interp/pf2atree.boot b/src/interp/pf2atree.boot
index 9f9fd30d..70b0edc6 100644
--- a/src/interp/pf2atree.boot
+++ b/src/interp/pf2atree.boot
@@ -428,7 +428,7 @@ pfSequence2Atree0(seqList, pf) ==
-- dotIndex => SUBSEQ(mantPart, dotIndex+1)
-- '"0"
-- bfForm := MAKE_-FLOAT(intPart, READ_-FROM_-STRING fracPartString,
--- LENGTH fracPartString, expPart)
+-- # fracPartString, expPart)
-- [., frac, :exp] := bfForm
-- [["$elt", intNewFloat(), 'float], frac, exp, 10]
--
diff --git a/src/interp/pf2sex.boot b/src/interp/pf2sex.boot
index bdc6b70f..58e11767 100644
--- a/src/interp/pf2sex.boot
+++ b/src/interp/pf2sex.boot
@@ -385,7 +385,7 @@ float2Sex num ==
dotIndex => SUBSEQ(mantPart, dotIndex+1)
'"0"
bfForm := MAKE_-FLOAT(intPart, READ_-FROM_-STRING fracPartString,
- LENGTH fracPartString, expPart)
+ # fracPartString, expPart)
$useBFasDefault =>
[., frac, :exp] := bfForm
[["$elt", intNewFloat(), 'float], frac, exp, 10]
diff --git a/src/interp/posit.boot b/src/interp/posit.boot
index 974c5bdf..fe155c7c 100644
--- a/src/interp/posit.boot
+++ b/src/interp/posit.boot
@@ -177,7 +177,7 @@ pfSourcePositions form ==
pfSourcePositionlist x==
if null x
then nil
- else APPEND(pfSourcePositions first x,pfSourcePositionlist rest x)
+ else append(pfSourcePositions first x,pfSourcePositionlist rest x)
poCharPosn posn == rest posn
diff --git a/src/interp/pspad2.boot b/src/interp/pspad2.boot
index 21c48538..f181c5d0 100644
--- a/src/interp/pspad2.boot
+++ b/src/interp/pspad2.boot
@@ -66,7 +66,7 @@ formatDeftran(u,SEQflag) ==
u is ['PROGN,:l,x] => formatDeftran(['SEQ,:l,['exit,1,x]],SEQflag)
u is ['SEQ,:l,[.,n,x]] =>
v := [:l,x]
- a := "APPEND"/[formatDeftranSEQ(x,true) for x in l]
+ a := append/[formatDeftranSEQ(x,true) for x in l]
b := formatDeftranSEQ(x,false)
if b is [:.,c] and c = '(void) then b := DROP(-1, b)
[:m,y] := [:a,:b]
diff --git a/src/interp/server.boot b/src/interp/server.boot
index dbf79ac1..1aa9abbf 100644
--- a/src/interp/server.boot
+++ b/src/interp/server.boot
@@ -113,7 +113,7 @@ executeQuietCommand() ==
parseAndEvalToHypertex str ==
lines := parseAndEvalToStringForHypertex str
- len := LENGTH lines
+ len := # lines
sockSendInt($MenuServer, len)
for s in lines repeat
sockSendString($MenuServer, s)
diff --git a/src/interp/slam.boot b/src/interp/slam.boot
index 399d7fd2..b2d2e5a3 100644
--- a/src/interp/slam.boot
+++ b/src/interp/slam.boot
@@ -178,7 +178,7 @@ compileRecurrenceRelation(op,nam,argl,junk,[body,sharpArg,n,:initCode]) ==
stateNam:= GENVAR()
stateVar:= GENSYM()
stateVal:= GENSYM()
- lastArg := INTERNL strconc('"#",STRINGIMAGE QSADD1 LENGTH argl)
+ lastArg := INTERNL strconc('"#",STRINGIMAGE QSADD1 # argl)
decomposeCode:=
[["%LET",gIndex,["ELT",lastArg,0]],:[["%LET",g,["ELT",lastArg,i]]
for g in gsList for i in 1..]]
diff --git a/src/interp/sys-os.boot b/src/interp/sys-os.boot
index dd7dd33c..52a2b1e3 100644
--- a/src/interp/sys-os.boot
+++ b/src/interp/sys-os.boot
@@ -164,7 +164,7 @@ import sock__send__string__len: (int, string, int) -> int
for doSendString
sockSendString(type,str) ==
- doSendString(type, str, LENGTH str)
+ doSendString(type, str, # str)
import sock__get__float: int -> double for sockGetFloat
diff --git a/src/interp/wi2.boot b/src/interp/wi2.boot
index f73710de..f40823ab 100644
--- a/src/interp/wi2.boot
+++ b/src/interp/wi2.boot
@@ -927,7 +927,7 @@ chaseInferences(origPred,$e) ==
ante is ["and",:ante'] and member(pred,ante') =>
ante':= delete(pred,ante')
v':=
- LENGTH ante'=1 => first ante'
+ # ante'=1 => first ante'
["and",:ante']
v':= ["COND",[v',:conseq]]
member(v',get("$Information","special",$e)) => nil