aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/interp/ChangeLog24
-rw-r--r--src/interp/Makefile.in49
-rw-r--r--src/interp/Makefile.pamphlet91
-rw-r--r--src/interp/br-con.boot.pamphlet34
-rw-r--r--src/interp/br-data.boot.pamphlet17
-rw-r--r--src/interp/br-op1.boot.pamphlet25
-rw-r--r--src/interp/br-op2.boot.pamphlet15
-rw-r--r--src/interp/br-saturn.boot.pamphlet15
-rw-r--r--src/interp/br-search.boot.pamphlet17
-rw-r--r--src/interp/br-util.boot.pamphlet8
10 files changed, 143 insertions, 152 deletions
diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index 5fe8e6a5..700dbfef 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,5 +1,29 @@
2007-11-13 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * Makefile.pamphlet (br-search.$(FASLEXT)): New rule.
+ (br-saturn.$(FASLEXT)): Likewise.
+ (br-op2.$(FASLEXT)): Likewise.
+ (br-op1.$(FASLEXT)): Likewise.
+ (br-con.$(FASLEXT)): Likewise.
+ (br-data.$(FASLEXT)): Likewise.
+ (br-util.$(FASLEXT)): Likewise.
+ (<<br-search.clisp>>): Remove.
+ (<<br-saturn.clisp>>): Likewise.
+ (<<br-op2.clisp>>): Likewise.
+ (<<br-op1.clisp>>): Likewise.
+ (<<br-con.clisp>>): Likewise.
+ (<<br-data.clisp>>): Likewise.
+ (<<br-util.clisp>>): Likewise.
+ * br-search.boot.pamphlet: Push into package "BOOT". Fix syntax.
+ * br-saturn.boot.pamphlet: Likewise.
+ * br-op2.boot.pamphlet: Likewise.
+ * br-op1.boot.pamphlet: Likewise.
+ * br-con.boot.pamphlet: Likewise.
+ * br-data.boot.pamphlet: Likewise.
+ * br-util.boot.pamphlet: Likewise.
+
+2007-11-13 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* i-funsel.boot (selectMms): Don't reject modemaps involving
Domain.
diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index 4e43137b..83faf679 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -386,6 +386,27 @@ fortcall.$(FASLEXT): fortcall.boot sys-macros.$(FASLEXT)
$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
## HyperDoc
+br-search.$(FASLEXT): br-search.boot bc-util.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+br-saturn.$(FASLEXT): br-saturn.boot bc-util.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+br-op2.$(FASLEXT): br-op2.boot br-op1.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+br-op1.$(FASLEXT): br-op1.boot bc-util.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+br-con.$(FASLEXT): br-con.boot bc-util.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+br-data.$(FASLEXT): br-data.boot bc-util.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+br-util.$(FASLEXT): br-util.boot bc-util.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
bc-solve.$(FASLEXT): bc-solve.boot bc-matrix.$(FASLEXT)
$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
@@ -713,34 +734,6 @@ vmlisp.$(FASLEXT): vmlisp.lisp boot-pkg.$(FASLEXT)
boot-pkg.$(FASLEXT): boot-pkg.lisp
$(BOOTSYS) -- --compile --output=$@ $<
-br-con.clisp: br-con.boot
- @ echo 467 making $@ from $<
- @ echo '(old-boot::boot "br-con.boot")' | ${DEPSYS}
-
-br-data.clisp: br-data.boot
- @ echo 483 making $@ from $<
- @ echo '(old-boot::boot "br-data.boot")' | ${DEPSYS}
-
-br-op1.clisp: br-op1.boot
- @ echo 475 making $@ from $<
- @ echo '(old-boot::boot "br-op1.boot")' | ${DEPSYS}
-
-br-op2.clisp: br-op2.boot
- @ echo 479 making $@ from $<
- @ echo '(old-boot::boot "br-op2.boot")' | ${DEPSYS}
-
-br-saturn.clisp: br-saturn.boot
- @ echo 491 making $@ from $<
- @ echo '(old-boot::boot "br-saturn.boot")' | ${DEPSYS}
-
-br-search.clisp: br-search.boot
- @ echo 471 making $@ from $<
- @ echo '(old-boot::boot "br-search.boot")' | ${DEPSYS}
-
-br-util.clisp: br-util.boot
- @ echo 487 making $@ from $<
- @ echo '(old-boot::boot "br-util.boot")' | ${DEPSYS}
-
clammed.clisp: clammed.boot
@ echo 226 making $@ from $<
@ echo '(old-boot::boot "clammed.boot")' | ${DEPSYS}
diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet
index 2a021500..a8aa9c8e 100644
--- a/src/interp/Makefile.pamphlet
+++ b/src/interp/Makefile.pamphlet
@@ -867,62 +867,6 @@ setvart.clisp: setvart.boot
@ echo '(old-boot::boot "setvart.boot")' | ${DEPSYS}
@
-\subsection{br-con.boot}
-
-<<br-con.clisp>>=
-br-con.clisp: br-con.boot
- @ echo 467 making $@ from $<
- @ echo '(old-boot::boot "br-con.boot")' | ${DEPSYS}
-@
-
-\subsection{br-search.boot}
-
-<<br-search.clisp>>=
-br-search.clisp: br-search.boot
- @ echo 471 making $@ from $<
- @ echo '(old-boot::boot "br-search.boot")' | ${DEPSYS}
-@
-
-\subsection{br-op1.boot}
-
-<<br-op1.clisp>>=
-br-op1.clisp: br-op1.boot
- @ echo 475 making $@ from $<
- @ echo '(old-boot::boot "br-op1.boot")' | ${DEPSYS}
-@
-
-\subsection{br-op2.boot}
-
-<<br-op2.clisp>>=
-br-op2.clisp: br-op2.boot
- @ echo 479 making $@ from $<
- @ echo '(old-boot::boot "br-op2.boot")' | ${DEPSYS}
-@
-
-\subsection{br-data.boot}
-
-<<br-data.clisp>>=
-br-data.clisp: br-data.boot
- @ echo 483 making $@ from $<
- @ echo '(old-boot::boot "br-data.boot")' | ${DEPSYS}
-@
-
-\subsection{br-util.boot}
-
-<<br-util.clisp>>=
-br-util.clisp: br-util.boot
- @ echo 487 making $@ from $<
- @ echo '(old-boot::boot "br-util.boot")' | ${DEPSYS}
-@
-
-\subsection{br-saturn.boot}
-
-<<br-saturn.clisp>>=
-br-saturn.clisp: br-saturn.boot
- @ echo 491 making $@ from $<
- @ echo '(old-boot::boot "br-saturn.boot")' | ${DEPSYS}
-@
-
\section{The databases}
\begin{verbatim}
@@ -1027,6 +971,27 @@ fortcall.$(FASLEXT): fortcall.boot sys-macros.$(FASLEXT)
$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
## HyperDoc
+br-search.$(FASLEXT): br-search.boot bc-util.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+br-saturn.$(FASLEXT): br-saturn.boot bc-util.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+br-op2.$(FASLEXT): br-op2.boot br-op1.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+br-op1.$(FASLEXT): br-op1.boot bc-util.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+br-con.$(FASLEXT): br-con.boot bc-util.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+br-data.$(FASLEXT): br-data.boot bc-util.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+br-util.$(FASLEXT): br-util.boot bc-util.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
bc-solve.$(FASLEXT): bc-solve.boot bc-matrix.$(FASLEXT)
$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
@@ -1354,20 +1319,6 @@ vmlisp.$(FASLEXT): vmlisp.lisp boot-pkg.$(FASLEXT)
boot-pkg.$(FASLEXT): boot-pkg.lisp
$(BOOTSYS) -- --compile --output=$@ $<
-<<br-con.clisp>>
-
-<<br-data.clisp>>
-
-<<br-op1.clisp>>
-
-<<br-op2.clisp>>
-
-<<br-saturn.clisp>>
-
-<<br-search.clisp>>
-
-<<br-util.clisp>>
-
<<clammed.clisp>>
<<bookvol5.lisp>>
diff --git a/src/interp/br-con.boot.pamphlet b/src/interp/br-con.boot.pamphlet
index 7c7dec66..6b77350c 100644
--- a/src/interp/br-con.boot.pamphlet
+++ b/src/interp/br-con.boot.pamphlet
@@ -50,6 +50,10 @@
<<*>>=
<<license>>
+import '"bc-util"
+)package "BOOT"
+
+
--====================> WAS b-con.boot <================================
--=======================================================================
@@ -282,7 +286,7 @@ mkDomTypeForm(typeForm,conform,domname) == --called by kargPage
nil
domainDescendantsOf(conform,domform) == main where --called by kargPage
- main ==
+ main() ==
conform is [op,:r] =>
op = 'Join => jfn(delete('(Type Object),r),delete('(Type Object),IFCDR domform))
op = 'CATEGORY => nil
@@ -424,7 +428,7 @@ dbSearchOrder(conform,domname,$domain) == --domain = nil or set to live domain
catinfo := CADR u
catvec := CADDR u
catforms := [[pakform,:pred] for i in 0..MAXINDEX catvec | test ] where
- test ==
+ test() ==
pred := simpCatPredicate
p:=SUBLISLIS(rest conform,$FormalMapVariableList,kTestPred catpredvec.i)
$domain => EVAL p
@@ -432,7 +436,7 @@ dbSearchOrder(conform,domname,$domain) == --domain = nil or set to live domain
if domname and CONTAINED('$,pred) then pred := SUBST(domname,'$,pred)
-- which = '"attribute" => pred --all categories
(pak := catinfo . i) and pred --only those with default packages
- pakform ==
+ pakform() ==
pak and not IDENTP pak => devaluate pak --in case it has been instantiated
catform := kFormatSlotDomain catvec . i
-- which = '"attribute" => dbSubConform(rest conform,catform)
@@ -600,7 +604,7 @@ augmentHasArgs(alist,conform) ==
conname := opOf conform
args := KDR conform or return alist
n := #args
- [[name,:pred] for [name,:p] in alist] where pred ==
+ [[name,:pred] for [name,:p] in alist] where pred() ==
extractHasArgs p is [a,:b] => p
quickAnd(p,['hasArgs,:TAKE(n,KDR getConstructorForm opOf name)])
@@ -649,7 +653,7 @@ kcnPage(htPage,junk) ==
htpSetProperty(htPage,'heading,heading)
conform:= htpProperty(htPage,'conform)
pakname :=
- kind = '"category" => INTERN STRCONC(PNAME conname,char '_&)
+ kind = '"category" => INTERN STRCONC(PNAME name,char '_&)
opOf conform
domList := getImports pakname
if domname then
@@ -718,7 +722,7 @@ kCheckArgumentNumbers t ==
[conname,:args] := t
cosig := KDR GETDATABASE(conname,'COSIG)
#cosig ^= #args => false
- and/[foo for domain? in cosig for x in args] where foo ==
+ and/[foo for domain? in cosig for x in args] where foo() ==
domain? => kCheckArgumentNumbers x
true
@@ -862,7 +866,7 @@ dbConstructorDoc(conform,$op,$sig) == fn conform where
fn (conform := [conname,:$args]) ==
or/[gn y for y in GETDATABASE(conname,'DOCUMENTATION)]
gn([op,:alist]) ==
- op = $op and or/[doc or '("") for [sig,:doc] in alist | hn sig]
+ op = $op and "or"/[doc or '("") for [sig,:doc] in alist | hn sig]
hn sig ==
#$sig = #sig and $sig = SUBLISLIS($args,$FormalMapVariableList,sig)
@@ -903,7 +907,7 @@ dbAddDocTable conform ==
dbGetDocTable(op,$sig,docTable,$which,aux) == main where
--docTable is [[origin,entry1,...,:code] ...] where
-- each entry is [sig,doc] and code is NIL or else a topic code for op
- main ==
+ main() ==
if null FIXP op and
DIGITP (s := STRINGIMAGE op).0 then op := string2Integer s
-- the above hack should be removed after 3/94 when 0 is not |0|
@@ -978,7 +982,7 @@ dbPresentCons(htPage,kind,:exclusions) == -- calist is ((catform . pred)...)
then htSay '"{\em kinds}"
else htMakePage [['bcLispLinks,['"kinds",'"",'dbShowCons,'kinds]]]
htSayStandard(if star? then '"\tab{29}" else '"\tab{25}")
- if empty? or member('parameters,exclusions) or not or/[CDAR x for x in cAlist]
+ if empty? or member('parameters,exclusions) or not "or"/[CDAR x for x in cAlist]
then htSay '"{\em parameters}"
else htMakePage [['bcLispLinks,['"parameters",'"",'dbShowCons,'parameters]]]
if star? then htSayStandard('"\tab{42}") else htSayStandard('"\tab{38}")
@@ -1002,7 +1006,7 @@ dbPresentCons(htPage,kind,:exclusions) == -- calist is ((catform . pred)...)
then htSay '"{\em files}"
else htMakePage [['bcLispLinks,['"files",'"",'dbShowCons,'files]]]
htSayStandard(if star? then '"\tab{29}" else '"\tab{25}")
- if empty? or member('conditions,exclusions) or and/[CDR x = true for x in cAlist]
+ if empty? or member('conditions,exclusions) or "and"/[CDR x = true for x in cAlist]
then htSay '"{\em conditions}"
else htMakePage [['bcLispLinks,['"conditions",'"",'dbShowCons,'conditions]]]
if star? then htSayStandard('"\tab{42}") else htSayStandard('"\tab{38}")
@@ -1017,7 +1021,7 @@ dbShowCons(htPage,key,:options) ==
filter := pmTransFilter(IFCAR options or dbGetInputString htPage)
filter is ['error,:.] => bcErrorPage filter
abbrev? := htpProperty(htPage,'exclusion) = 'abbrs
- u := [x for x in cAlist | test] where test ==
+ u := [x for x in cAlist | test] where test() ==
conname := CAAR x
subject := (abbrev? => constructor? conname; conname)
superMatch?(filter,DOWNCASE STRINGIMAGE subject)
@@ -1038,7 +1042,7 @@ conPageChoose conname ==
dbShowCons1(htPage,cAlist,key) ==
conlist := REMDUP [item for x in cAlist | pred] where
- pred ==
+ pred() ==
item := CAR x
$exposedOnlyIfTrue => isExposedConstructor opOf item
item
@@ -1126,7 +1130,7 @@ dbShowConsDoc(htPage,conlist) ==
index := 0
for x in REMDUP conlist repeat
-- for x in conlist repeat
- dbShowConsDoc1(htPage,getConstructorForm x,i) where i ==
+ dbShowConsDoc1(htPage,getConstructorForm x,i) where i() ==
while CAAAR cAlist ^= x repeat
index := index + 1
cAlist := rest cAlist
@@ -1157,7 +1161,7 @@ getConstructorDocumentation conname ==
is [[nil,line,:.],:.] and line or '""
dbSelectCon(htPage,which,index) ==
- conPage opOf first htpProperty(htPage,'cAlist) . index
+ conPage opOf first (htpProperty(htPage,'cAlist)).index
dbShowConditions(htPage,cAlist,kind) ==
conform := htpProperty(htPage,'conform)
@@ -1386,7 +1390,7 @@ PUT('Enumeration, 'documentation, SUBST(MESSAGE, 'MESSAGE, '(
mkConArgSublis args ==
[[arg,:INTERN digits2Names PNAME arg] for arg in args
- | (s := PNAME arg) and or/[DIGITP ELT(s,i) for i in 0..MAXINDEX s]]
+ | (s := PNAME arg) and "or"/[DIGITP ELT(s,i) for i in 0..MAXINDEX s]]
digits2Names s ==
--This is necessary since arguments of conforms CANNOT have digits in TechExplorer
diff --git a/src/interp/br-data.boot.pamphlet b/src/interp/br-data.boot.pamphlet
index fbee7b8f..bb3a1c9a 100644
--- a/src/interp/br-data.boot.pamphlet
+++ b/src/interp/br-data.boot.pamphlet
@@ -50,6 +50,9 @@
<<*>>=
<<license>>
+import '"bc-util"
+)package "BOOT"
+
lefts u ==
[x for x in HKEYS _*HASCATEGORY_-HASH_* | CDR x = u]
@@ -488,7 +491,7 @@ getImports conname == --called by mkUsersHashTable
template := infovec.0
u := [doImport(i,template)
for i in 5..(MAXINDEX template) | test] where
- test == template.i is [op,:.] and IDENTP op
+ test() == template.i is [op,:.] and IDENTP op
and not MEMQ(op,'(Mapping Union Record Enumeration CONS QUOTE local))
doImport(x,template) ==
x is [op,:args] =>
@@ -552,7 +555,7 @@ getParentsForDomain domname == --called by parentsOf
NREVERSE acc
explodeIfs x == main where --called by getParents, getParentsForDomain
- main ==
+ main() ==
x is ['IF,p,a,b] => fn(p,a,b)
[[x,:true]]
fn(p,a,b) ==
@@ -599,7 +602,7 @@ assocCar(x, al) == or/[pair for pair in al | x = CAAR pair]
childArgCheck(argl, nargl) ==
and/[fn for x in argl for y in nargl for i in 0..] where
- fn ==
+ fn() ==
x = y or constructor? opOf y => true
isSharpVar y => i = POSN1(y, $FormalMapVariableList)
false
@@ -621,7 +624,7 @@ ancestorsOf(conform,domform) == --called by kcaPage, originsInOrder,...
'category = GETDATABASE((conname := opOf conform),'CONSTRUCTORKIND) =>
alist := GETDATABASE(conname,'ANCESTORS)
argl := IFCDR domform or IFCDR conform
- [pair for [a,:b] in alist | pair] where pair ==
+ [pair for [a,:b] in alist | pair] where pair() ==
left := sublisFormal(argl,a)
right := sublisFormal(argl,b)
if domform then right := simpHasPred right
@@ -672,7 +675,7 @@ domainsOf(conform,domname,:options) ==
conname := opOf conform
u := [key for key in HKEYS _*HASCATEGORY_-HASH_*
| key is [anc,: =conname]]
- --u is list of pairs (a . b) where b = conname
+ --u is list of pairs (a . b) where b() = conname
--we sort u then replace each b by the predicate for which this is true
s := listSort(function GLESSEQP,COPY u)
s := [[CAR pair,:GETDATABASE(pair,'HASCATEGORY)] for pair in s]
@@ -692,7 +695,7 @@ catsOf(conform,domname,:options) ==
transKCatAlist(conform,domname,listSort(function GLESSEQP,alist))
transKCatAlist(conform,domname,s) == main where
- main ==
+ main() ==
domname => --accept only exact matches after substitution
domargs := rest domname
acc := nil
@@ -744,7 +747,7 @@ mkHasArgsPred subargs ==
systemError subargs
sublisFormal(args,exp,:options) == main where
- main == --use only on LIST structures; see also sublisFormalAlist
+ main() == --use only on LIST structures; see also sublisFormalAlist
$formals: local := IFCAR options or $FormalMapVariableList
null args => exp
sublisFormal1(args,exp,#args - 1)
diff --git a/src/interp/br-op1.boot.pamphlet b/src/interp/br-op1.boot.pamphlet
index aea5b89b..c37a4481 100644
--- a/src/interp/br-op1.boot.pamphlet
+++ b/src/interp/br-op1.boot.pamphlet
@@ -50,6 +50,9 @@
<<*>>=
<<license>>
+import '"bc-util"
+)package "BOOT"
+
--====================> WAS b-op1.boot <================================
--=======================================================================
@@ -154,7 +157,7 @@ dbPresentOps(htPage,which,:exclusions) ==
htTab s == htSay('"\tab{",s,'"}")
dbDoesOneOpHaveParameters? opAlist ==
- or/[(or/[fn for x in items]) for [op,:items] in opAlist] where fn ==
+ or/[(or/[fn for x in items]) for [op,:items] in opAlist] where fn() ==
STRINGP x => dbPart(x,2,1) ^= '"0"
KAR x
--============================================================================
@@ -204,7 +207,7 @@ reduceByGroup(htPage,opAlist) ==
dbExpandOpAlistIfNecessary(htPage,opAlist,'"operation",true,false)
bitNumber := HGET($topicHash,$groupChoice)
res := [[op,:newItems] for [op,:items] in opAlist | newItems] where
- newItems ==
+ newItems() ==
null bitNumber => items
[x for x in items | FIXP (code := myLastAtom x) and LOGBITP(bitNumber,code)]
res
@@ -229,7 +232,7 @@ dbShowOp1(htPage,opAlist,which,key) ==
if $exposedOnlyIfTrue and not dbFromConstructor?(htPage) then
--opAlist is expanded to form [[op,[sig,pred,origin,exposed,comments],...],...]
opAlist:=[item for [op,:items] in opAlist | item] where
- item ==
+ item() ==
acc := nil
for x in items | x.3 repeat acc:= [x,:acc]
null acc => nil
@@ -278,7 +281,7 @@ dbShowOp1(htPage,opAlist,which,key) ==
dbPresentOps(page,which,branch)
htShowPageNoScroll()
-opAlistCount(opAlist, which) == +/[foo for [op,:items] in opAlist] where foo ==
+opAlistCount(opAlist, which) == +/[foo for [op,:items] in opAlist] where foo() ==
null $exposedOnlyIfTrue or which = '"attribute" => #items
--count if unexpanded---CDDR(w) = nil---or if w.3 = true
+/[1 for w in items | null (p := CDDR w) or p . 1]
@@ -334,7 +337,7 @@ conform2StringList(form,opFn,argFn,exception) ==
atypes :=
special => cosig
rest CDAR GETDATABASE(op,'CONSTRUCTORMODEMAP)
- sargl := [fn for x in args for atype in atypes for pred in cosig] where fn ==
+ sargl := [fn for x in args for atype in atypes for pred in cosig] where fn() ==
keyword :=
x is [":",y,t] =>
x := t
@@ -378,7 +381,7 @@ dbOuttran form ==
args := nil
cosig := rest GETDATABASE(op,'COSIG)
atypes := rest CDAR GETDATABASE(op,'CONSTRUCTORMODEMAP)
- argl := [fn for x in args for atype in atypes for pred in cosig] where fn ==
+ argl := [fn for x in args for atype in atypes for pred in cosig] where fn() ==
pred => x
typ := sublisFormal(args,atype)
arg :=
@@ -436,7 +439,7 @@ conname2StringList form == [PNAME unAbbreviateIfNecessary opOf form]
dbGatherData(htPage,opAlist,which,key) ==
key = 'implementation => dbGatherDataImplementation(htPage,opAlist)
dataFunction := LASSOC(key,table) where
- table ==
+ table() ==
$dbDataFunctionAlist or
($dbDataFunctionAlist := [
['signatures,:function dbMakeSignature],
@@ -566,7 +569,7 @@ dbReduceByOpSignature(opAlist,datalist) ==
ops := [CAAR x for x in datalist] --x is [[op,sig,:implementor],:.]
acc := nil
for [op,:alist] in opAlist | MEMQ(op,ops) repeat
- entryList := [entry for (entry := [sig,:.]) in alist | test] where test ==
+ entryList := [entry for (entry := [sig,:.]) in alist | test] where test() ==
or/[x for x in datalist | x is [[=op,=sig,:.],:.]]
entryList => acc := [[op,:NREVERSE entryList],:acc]
NREVERSE acc
@@ -888,7 +891,7 @@ reduceOpAlistForDomain(opAlist,domform,conform) ==
form1 := [domform,:rest domform]
form2 := ['$,:rest conform]
for pair in opAlist repeat
- RPLACD(pair,[test for item in rest pair | test]) where test ==
+ RPLACD(pair,[test for item in rest pair | test]) where test() ==
[head,:tail] := item
CAR tail = true => item
pred := simpHasPred SUBLISLIS(form1,form2,QCAR tail)
@@ -1047,7 +1050,7 @@ evalableConstructor2HtString domform ==
--argtypes:= sublisFormal(arglist,fargtypes)
form2HtString([conname,:[fn for arg in arglist for x in coSig
for ftype in fargtypes]],nil,true) where
- fn ==
+ fn() ==
x => arg
typ := sublisFormal(arglist,ftype)
mathform2HtString algCoerceInteractive(arg,typ,'(OutputForm))
@@ -1095,7 +1098,7 @@ getDomainOpTable(dom,fromIfTrue,:options) ==
EQ(op,'One) => MEMQ(1,ops) and 1
EQ(op,'Zero) => MEMQ(0,ops) and 0
false
- fn ==
+ fn() ==
sig1 := sublisFormal(rest domname,sig)
predValue := evalDomainOpPred(dom,pred)
info :=
diff --git a/src/interp/br-op2.boot.pamphlet b/src/interp/br-op2.boot.pamphlet
index 3fca3f73..58056718 100644
--- a/src/interp/br-op2.boot.pamphlet
+++ b/src/interp/br-op2.boot.pamphlet
@@ -50,6 +50,9 @@
<<*>>=
<<license>>
+import '"br-op1"
+)package "BOOT"
+
--====================> WAS br-op2.boot <================================
--=======================================================================
@@ -434,7 +437,7 @@ whoUsesOperation(htPage,which,key) == --see dbPresentOps
sofar := LASSOC(opsig,nopAlist)
nopAlist := insertAlist(opsig,[name,:LASSOC(opsig,nopAlist)],nopAlist)
usedList := nil
- for [(pair := [op,:sig]),:namelist] in nopAlist repeat
+ for [pair := [op,:sig],:namelist] in nopAlist repeat
ops := escapeSpecialChars STRINGIMAGE op
usedList := [pair,:usedList]
htSay('"Users of {\em ",ops,'": ")
@@ -523,7 +526,7 @@ koAttrs(conform,domname) ==
koOps(conform,domname,:options) == main where
--returns alist of form ((op (sig . pred) ...) ...)
- main ==
+ main() ==
$packageItem: local := nil
-- relatives? := IFCAR options
ours :=
@@ -597,7 +600,7 @@ koCatOps(conform,domname) ==
[[zeroOneConvert op,:nalist] for [op,:alist] in oplist | nalist := koCatOps1(alist)]
koCatOps1 alist == [x for item in alist | x := pair] where
- pair ==
+ pair() ==
[sig,:r] := item
null r => [sig,true]
[key,:options] := r
@@ -662,7 +665,7 @@ dbHeading(items,which,heading,:options) ==
[:prefix,'" for ",:heading]
koaPageFilterByCategory1(htPage,i) ==
- ancestor := htpProperty(htPage,'ancestors) . i
+ ancestor := (htpProperty(htPage,'ancestors)) . i
ancestorList := [ancestor,:ASSOCLEFT ancestorsOf(ancestor,nil)]
newOpAlist := nil
which := htpProperty(htPage,'which)
@@ -673,7 +676,7 @@ koaPageFilterByCategory1(htPage,i) ==
docTable := dbDocTable(domname or conform)
for [op,:alist] in opAlist repeat
nalist := [[origin,:item] for item in alist | split]
- where split ==
+ where split() ==
[sig,pred,:aux] := item
u := dbGetDocTable(op,sig,docTable,which,aux)
origin := IFCAR u
@@ -707,7 +710,7 @@ opPageFastPath opstring ==
charPosition(char '_*,x,0) < #x => nil --quit if name has * in it
op := (STRINGP x => INTERN x; x)
mmList := getAllModemapsFromDatabase(op,nil) or return nil
- opAlist := [[op,:[item for mm in mmList]]] where item ==
+ opAlist := [[op,:[item for mm in mmList]]] where item() ==
[predList, origin, sig] := modemap2Sig(op, mm)
predicate := predList and MKPF(predList,'AND)
exposed? := isExposedConstructor opOf origin
diff --git a/src/interp/br-saturn.boot.pamphlet b/src/interp/br-saturn.boot.pamphlet
index 673a1dd5..212411af 100644
--- a/src/interp/br-saturn.boot.pamphlet
+++ b/src/interp/br-saturn.boot.pamphlet
@@ -50,6 +50,9 @@
<<*>>=
<<license>>
+import '"bc-util"
+)package "BOOT"
+
--====================> WAS b-saturn.boot <================================
-- New file as of 6/95
$aixTestSaturn := false
@@ -73,7 +76,7 @@ $saturnMacros := '(
"\def\spadtype#1{\lispLink[d]{\verb!(|spadtype| '|#1|)!}{\sf #1}}"_
"\def\spad#1{{\em #1}}"_
"\def\spadfun#1{{\em #1}}"_
-)
+ )
$FormalFunctionParameterList := '(_#_#1 _#_#2 _#_#3 _#_#4 _#_#5 _#_#6 _#_#7 _#_#8 _#_#9 _#_#10 _#_#11 _#_#12 _#_#13 _#_#14 _#_#15)
on() ==
@@ -815,7 +818,7 @@ dbPresentCons(htPage,kind,:exclusions) ==
then htSay '"{\em Abbreviations}"
else htMakePage [['bcLispLinks,['"Abbreviations",'"",'dbShowCons,'abbrs]]]
htSay '"}{"
- if one? or member('conditions,exclusions) or and/[CDR x = true for x in cAlist]
+ if one? or member('conditions,exclusions) or "and"/[CDR x = true for x in cAlist]
then htSay '"{\em Conditions}"
else htMakePage [['bcLispLinks,['"Conditions",'"",'dbShowCons,'conditions]]]
htSay '"}{"
@@ -836,7 +839,7 @@ dbPresentCons(htPage,kind,:exclusions) ==
then htSay '"{\em Names}"
else htMakePage [['bcLispLinks,['"Names",'"",'dbShowCons,'names]]]
htSay '"}{"
- if one? or member('parameters,exclusions) or not or/[CDAR x for x in cAlist]
+ if one? or member('parameters,exclusions) or not "or"/[CDAR x for x in cAlist]
then htSay '"{\em Parameters}"
else htMakePage [['bcLispLinks,['"Parameters",'"",'dbShowCons,'parameters]]]
htSay '"}{"
@@ -866,7 +869,7 @@ dbPresentConsSaturn(htPage,kind,exclusions) ==
if one? or member('abbrs,exclusions)
then htSayCold '"\&Abbreviations"
else htMakePage [['bcLispLinks,['"\&Abbreviations",'"",'dbShowCons,'abbrs]]]
- if one? or member('conditions,exclusions) or and/[CDR x = true for x in cAlist]
+ if one? or member('conditions,exclusions) or "and"/[CDR x = true for x in cAlist]
then htSayCold '"\&Conditions"
else htMakePage [['bcLispLinks,['"\&Conditions",'"",'dbShowCons,'conditions]]]
if empty? or member('documentation,exclusions)
@@ -881,7 +884,7 @@ dbPresentConsSaturn(htPage,kind,exclusions) ==
if one? or member('names,exclusions)
then htSayCold '"\&Names"
else htMakePage [['bcLispLinks,['"\&Names",'"",'dbShowCons,'names]]]
- if one? or member('parameters,exclusions) or not or/[CDAR x for x in cAlist]
+ if one? or member('parameters,exclusions) or not "or"/[CDAR x for x in cAlist]
then htSayCold '"\&Parameters"
else htMakePage [['bcLispLinks,['"\&Parameters",'"",'dbShowCons,'parameters]]]
htSaySaturn '"\hrule"
@@ -1784,7 +1787,7 @@ postDoubleSharp sig ==
-- override in br-util.boot.pamphlet
bcConform1 form == main where
- main ==
+ main() ==
form is ['ifp,form1,:pred] =>
hd form1
bcPred pred
diff --git a/src/interp/br-search.boot.pamphlet b/src/interp/br-search.boot.pamphlet
index d8e2cbea..22650a14 100644
--- a/src/interp/br-search.boot.pamphlet
+++ b/src/interp/br-search.boot.pamphlet
@@ -50,6 +50,9 @@
<<*>>=
<<license>>
+import '"bc-util"
+)package "BOOT"
+
--====================> WAS b-search.boot <================================
--=======================================================================
@@ -112,7 +115,7 @@ grepForAbbrev(s,key) ==
someLowerCaseChar or not someUpperCaseChar => false
pattern := DOWNCASE s
['Abbreviations ,:[GETDATABASE(x,'CONSTRUCTORFORM)
- for x in allConstructors() | test]] where test ==
+ for x in allConstructors() | test]] where test() ==
not $includeUnexposed? and not isExposedConstructor x => false
a := GETDATABASE(x,'ABBREVIATION)
match?(pattern,PNAME a) and not HGET($defaultPackageNamesHT,x)
@@ -163,9 +166,9 @@ pmTransFilter s ==
checkPmParse parse ==
STRINGP parse => parse
- fn parse => parse where fn(u) ==
+ (fn parse => parse) where fn(u) ==
u is [op,:args] =>
- MEMQ(op,'(and or not)) and and/[checkPmParse x for x in args]
+ MEMQ(op,'(and or not)) and "and"/[checkPmParse x for x in args]
STRINGP u => true
false
nil
@@ -329,7 +332,7 @@ conform2OutputForm(form) ==
null args => form
cosig := rest GETDATABASE(op,'COSIG)
atypes := rest CDAR GETDATABASE(op,'CONSTRUCTORMODEMAP)
- sargl := [fn for x in args for atype in atypes for pred in cosig] where fn ==
+ sargl := [fn for x in args for atype in atypes for pred in cosig] where fn() ==
pp [x,atype,pred]
pred => conform2OutputForm x
typ := sublisFormal(args,atype)
@@ -377,7 +380,7 @@ looksLikeDomainForm x ==
atom x => k = 1
k ^= #x => false
and/[p for key in rest coSig for arg in rest x] where
- p ==
+ p() ==
key => looksLikeDomainForm arg
not IDENTP arg
@@ -455,7 +458,7 @@ genSearch1(filter,reg,doc) ==
htShowPageStar()
searchDropUnexposedLines alist ==
[[op,[pred for line in lines | pred],:lines] for [op,.,:lines] in alist] where
- pred ==
+ pred() ==
not $exposedOnlyIfTrue or dbExposed?(line,dbKind line) => line
nil
@@ -891,7 +894,7 @@ htButtonOn?(htPage,key) ==
LASSOC(key,htpInputAreaAlist htPage) is [a,:.] and a = '" t"
mkDetailedGrepPattern(kind,name,nargs,argOrSig) == main where
- main ==
+ main() ==
nottick := '"[^`]"
name := replaceGrepStar name
firstPart :=
diff --git a/src/interp/br-util.boot.pamphlet b/src/interp/br-util.boot.pamphlet
index d157054d..9b31f2b5 100644
--- a/src/interp/br-util.boot.pamphlet
+++ b/src/interp/br-util.boot.pamphlet
@@ -50,6 +50,9 @@
<<*>>=
<<license>>
+import '"bc-util"
+)package "BOOT"
+
--====================> WAS b-util.boot <================================
--=======================================================================
@@ -119,7 +122,8 @@ capitalize s ==
("domain" . "Domain")
("category" . "Category")
("package" . "Package")
- ("default package" . "Default Package"))) or
+ ("default package" . "Default Package")))
+ or
res := COPY_-SEQ s
SETELT(res,0,UPCASE res.0)
res
@@ -323,7 +327,7 @@ bcConform(form,:options) ==
bcConform1 form == main where
-----------------> OBSELETE
- main ==
+ main() ==
form is ['ifp,form1,:pred] =>
hd form1
bcPred pred
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-13 06:59:16 +0000